Changeset 1405773

Timestamp:

04/27/2016 04:24:05 PM (10 years ago)

Author:

strider72

Message:

• Split out get_styles() as function. A bit less spaghetti code for the Admin page.
• Clean and clarify some comments and FIXMEs

File:

• graceful-pull-quotes/trunk/graceful-pull-quotes.php (modified) (5 diffs)

graceful-pull-quotes/trunk/graceful-pull-quotes.php

@@ -19 +19 @@
         - replace $style_path and $style_url with user options
     TODO:   add optional "Uninstall" routine to deactivation hook
-    TODO:   find better way to combine style and "core" CSS files into single call
+    TODO:   find better way to combine style and "core" CSS files into single HTTP call
     TODO:   (??) Allow for semi-random styling
     TODO:   Option: [B]racket-capitalize quotes starting with lowercase letter
@@ -199 +199 @@
 // ========================
 
+// FIXME: Bug -- If only one style present in Styles folder, it uses backup Default copy regardless of existing style.  Style not set in Settings when saved. Should be: If only one style in Styles folder, use it.
 // Fetch the stylesheet URL used for the active pullquote style
     function get_pqcss( $theStyle = null ) {
@@ -298 +299 @@
     }
 
+    /**
+     *
+     * @return array
+     */
+    public function get_styles() {
+        $arrStyles = array();
+        if ( file_exists( $this->style_dir ) && $handle = opendir( $this->style_dir ) ) {
+            while ( false !== ( $file = readdir( $handle ) ) ) {
+                if ( substr( $file, 0, 1 ) != '.' ) {
+                    $filename = basename( $file, '.css' );
+                    if ( is_dir( trailingslashit( $this->style_dir ) . $file ) ) {
+                        $file .= '/pullquote.css';
+                    }
+                    $arrStyles[ ] = array( 'name' => $filename, 'file' => $file );
+                }
+            }
+            closedir( $handle );
+
+        }
+        asort( $arrStyles);
+        return $arrStyles;
+    }
+
+
 // finally, the Settings Page itself
     function settings_page() {  
@@ -314 +339 @@
         // get options for use in form-setting functions
         $opts = $this->get_options();
-
         // Get array of CSS files for Style dropdown
-        if ( file_exists( $this->style_dir ) && $handle = opendir( $this->style_dir ) ) {
-            $arrStyles = array();
-            while ( false !== ( $file = readdir( $handle ) ) ) {
-                if ( substr( $file, 0, 1) != '.' ) {
-                    $filename = basename( $file, '.css' );
-                    if( is_dir( trailingslashit( $this->style_dir ) . $file ) )
-                        $file .= '/pullquote.css';
-                    $arrStyles[] = array( 'name' => $filename, 'file'=> $file );
-                }
-            }
-            closedir( $handle );
-            unset( $handle, $file, $filename, $fileurl );
-        }
+        $arrStyles = $this->get_styles();
+
         if ( ! isset( $arrStyles[0] ) ) {
         // If no styles, use the core Default style
@@ -428 +441 @@
     }
 
+
     // DEPRECATED -- maybe safe to remove