Changeset 368919

Timestamp:

04/05/2011 03:58:51 AM (15 years ago)

Author:

gluten

Message:

load default options from a function instead of using multiple globals

File:

• galleria-galleria/trunk/galleria-galleria.php (modified) (14 diffs)

galleria-galleria/trunk/galleria-galleria.php

@@ -2 +2 @@
 /*
 Plugin Name: Galleria Galleria
-Plugin URI: 
+Plugin URI: https://github.com/samargulies/galleria-galleria/
 Description: Transform standard WordPress galleries into galleria slideshows.
 Version: 0.1.1
@@ -17 +17 @@
 http://galleria.aino.se/
 
-Mr. Philip Arthur Moore for IE debugging
+Mr. Philip Arthur Moore for IE debugging of Photo Galleria
 http://www.philiparthurmoore.com
 
@@ -74 +74 @@
 }
 
-function galleria_galleria_admin_head() {
-
 /**
  * Prints out the inline javascript needed for the colorpicker and choosing
@@ -81 +79 @@
  */
  
-?>
-
-<script type="text/javascript">
-    jQuery(document).ready(function($) {
-            
-        // Color Picker
-        $('.colorSelector').each(function(){
-            var Othis = this; //cache a copy of the this variable for use inside nested function
-            var initialColor = $(Othis).next('input').attr('value');
-            $(this).ColorPicker({
-            color: initialColor,
-            onShow: function (colpkr) {
-            $(colpkr).fadeIn(500);
-            return false;
-            },
-            onHide: function (colpkr) {
-            $(colpkr).fadeOut(500);
-            return false;
-            },
-            onChange: function (hsb, hex, rgb) {
-            $(Othis).children('div').css('backgroundColor', '#' + hex);
-            $(Othis).next('input').attr('value','#' + hex);
-        }
-        });
-        }); //end color picker
-    });//end document ready functions
-</script>
-
-<?php
-}
-
+function galleria_galleria_admin_head() {
+    ?>
+    <script type="text/javascript">
+        jQuery(document).ready(function($) {
+                
+            // Color Picker
+            $('.colorSelector').each(function(){
+                var Othis = this; //cache a copy of the this variable for use inside nested function
+                var initialColor = $(Othis).next('input').attr('value');
+                $(this).ColorPicker({
+                color: initialColor,
+                onShow: function (colpkr) {
+                $(colpkr).fadeIn(500);
+                return false;
+                },
+                onHide: function (colpkr) {
+                $(colpkr).fadeOut(500);
+                return false;
+                },
+                onChange: function (hsb, hex, rgb) {
+                $(Othis).children('div').css('backgroundColor', '#' + hex);
+                $(Othis).next('input').attr('value','#' + hex);
+            }
+            });
+            }); //end color picker
+        });//end document ready functions
+    </script>
+    <?php
+}
 
 /**
@@ -117 +113 @@
  */
 
-$design_options = array(
-    'classic' => array(
-        'value' =>  'classic',
-        'label' => __( 'Classic' )
-    ),
-    'dots' => array(
-        'value' =>  'dots',
-        'label' => __( 'Dots' )
-    ),
-/*
-        'fullscreen' => array(
-        'value' =>  'fullscreen',
-        'label' => __( 'Fullscreen' )
-    )
-*/
-);
-
-$transition_options = array(
-    'fade' => array(
-        'value' =>  'fade',
-        'label' => __( 'Fade' )
-    ),
-    'flash' => array(
-        'value' =>  'flash',
-        'label' => __( 'Flash' )
-    ),
-    'slide' => array(
-        'value' => 'slide',
-        'label' => __( 'Slide' )
-    ),
-    'fadeslide' => array(
-        'value' => 'fadeslide',
-        'label' => __( 'Fade & Slide' )
-    )
-);
-
-$image_options = array(
-    'medium' => array(
-        'value' =>  'medium',
-        'label' => __( 'Medium' )
-    ),
-    'large' => array(
-        'value' =>  'large',
-        'label' => __( 'Large' )
-    )
-);
+function galleria_galleria_default_options() {
+
+    $options['design'] = array(
+        'classic' => array(
+            'value' =>  'classic',
+            'label' => __( 'Classic' )
+        ),
+        'dots' => array(
+            'value' =>  'dots',
+            'label' => __( 'Dots' )
+        ),
+    /*
+            'fullscreen' => array(
+            'value' =>  'fullscreen',
+            'label' => __( 'Fullscreen' )
+        )
+    */
+    );
+    
+    $options['transition'] = array(
+        'fade' => array(
+            'value' =>  'fade',
+            'label' => __( 'Fade' )
+        ),
+        'flash' => array(
+            'value' =>  'flash',
+            'label' => __( 'Flash' )
+        ),
+        'slide' => array(
+            'value' => 'slide',
+            'label' => __( 'Slide' )
+        ),
+        'fadeslide' => array(
+            'value' => 'fadeslide',
+            'label' => __( 'Fade & Slide' )
+        )
+    );
+    
+    $options['image'] = array(
+        'medium' => array(
+            'value' =>  'medium',
+            'label' => __( 'Medium' )
+        ),
+        'large' => array(
+            'value' =>  'large',
+            'label' => __( 'Large' )
+        )
+    );
+    
+    return $options;
+}
+
 
 /**
@@ -169 +171 @@
  
 function galleria_galleria_options_do_page() {
-    global $design_options, $transition_options, $image_options;
+    $defaults = galleria_galleria_default_options();
 
     if ( ! isset( $_REQUEST['updated'] ) )
@@ -199 +201 @@
                                 $r = '';
 
-                                foreach ( $design_options as $option ) {
+                                foreach ( $defaults['design'] as $option ) {
                                     $label = $option['label'];
                                     if ( $selected == $option['value'] ) // Make default first in list
@@ -227 +229 @@
                                 $r = '';
 
-                                foreach ( $transition_options as $option ) {
+                                foreach ( $defaults['transition'] as $option ) {
                                     $label = $option['label'];
                                     if ( $selected == $option['value'] ) // Make default first in list
@@ -285 +287 @@
                                 $r = '';
 
-                                foreach ( $image_options as $option ) {
+                                foreach ( $defaults['image'] as $option ) {
                                     $label = $option['label'];
                                     if ( $selected == $option['value'] ) // Make default first in list
@@ -325 +327 @@
  */
 function galleria_galleria_options_validate( $input ) {
-    global $design_options, $transition_options;
+    $defaults = galleria_galleria_default_options();
 
     // Our checkbox value is either 0 or 1
@@ -333 +335 @@
     
     if ( ! isset( $input['color'] ) ) {
-        $input['color'] = '#000';
+        $input['color'] = '#000000';
     }
     
@@ -343 +345 @@
     
     // Our select option must actually be in our array of select options
-    if ( ! array_key_exists( $input['design'], $design_options ) )
+    if ( ! array_key_exists( $input['design'], $defaults['design'] ) )
         $input['design'] = null;
 
     // Our select option must actually be in our array of select options
-    if ( ! array_key_exists( $input['transition'], $transition_options ) )
+    if ( ! array_key_exists( $input['transition'], $defaults['transition'] ) )
         $input['transition'] = null;
 
@@ -365 +367 @@
     wp_enqueue_script('galleria', plugins_url( '/js/galleria-1.2.2.min.js', __FILE__ ), array('jquery'));
     wp_print_scripts('galleria');
-    galleria_galleria_scripts_head();
+    galleria_galleria_script_options();
 }
 add_action('wp_footer', 'galleria_galleria_load_scripts' );
@@ -372 +374 @@
  * Add scripts to head
  */
-function galleria_galleria_scripts_head(){
+ 
+function galleria_galleria_script_options(){
     // Retreive our plugin options
     $galleria_galleria = get_option( 'galleria_galleria' );