Changeset 618571

Timestamp:

10/29/2012 10:52:10 AM (13 years ago)

Author:

niccolo_tapparo

Message:

fix default options part 2

Location:

wordpress-social-ring/trunk

Files:

• admin/admin.php (modified) (1 diff)
• includes/library.php (modified) (1 diff)
• langs/wp_social_ring-es_ES.mo (deleted)
• langs/wp_social_ring-es_ES.po (deleted)
• readme.txt (modified) (1 diff)
• wp-social-ring.php (modified) (1 diff)

wordpress-social-ring/trunk/admin/admin.php

@@ -161 +161 @@
     function __construct() {
         $this->options = get_option(WP_SOCIAL_RING.'_options');
+        $this->set_default_options();
         add_action('admin_menu', array($this, 'register_option_page'));
         add_action('admin_init', array($this, 'register_options'));
+    }
+    
+    function set_default_options() {
+        if(!isset($this->options['language'])) {
+            $this->options['language'] = 'English';
+        }
+        if(!isset($this->options['facebook_language'])) {
+            $this->options['facebook_language'] = 'en_US';
+        }
+        if(!isset($this->options['google_language'])) {
+            $this->options['google_language'] = 'en-US';
+        }
+        if(!isset($this->options['twitter_language'])) {
+            $this->options['twitter_language'] = 'en';
+        }
     }
     

wordpress-social-ring/trunk/includes/library.php

@@ -12 +12 @@
     function __construct() {
         $this->options = get_option(WP_SOCIAL_RING.'_options');
+        $this->set_default_options();
         add_action('wp_head', array($this, 'frontend_css'));
         add_filter('the_content', array($this, 'add_sharing_buttons'));
         add_action('wp_footer', array($this, 'add_footer_js'));
         add_shortcode('socialring', array($this, 'shortcode'));
+    }
+    
+    function set_default_options() {
+        if(!isset($this->options['social_facebook_like_button'])) {
+            $this->options['social_facebook_like_button'] = 1;
+        }
+        if(!isset($this->options['social_twitter_button'])) {
+            $this->options['social_twitter_button'] = 1;
+        }
+        if(!isset($this->options['social_facebook_share_button'])) {
+            $this->options['social_facebook_share_button'] = 0;
+        }
+        if(!isset($this->options['social_google_button'])) {
+            $this->options['social_google_button'] = 1;
+        }
+        if(!isset($this->options['social_pin_it_button'])) {
+            $this->options['social_pin_it_button'] = 0;
+        }
+        if(!isset($this->options['social_linkedin_button'])) {
+            $this->options['social_linkedin_button'] = 0;
+        }
+        if(!isset($this->options['social_stumble_button'])) {
+            $this->options['social_stumble_button'] = 0;
+        }
+        if(!isset($this->options['social_on_home'])) {
+            $this->options['social_on_home'] = 0;
+        }
+        if(!isset($this->options['social_on_pages'])) {
+            $this->options['social_on_pages'] = 0;
+        }
+        if(!isset($this->options['social_on_posts'])) {
+            $this->options['social_on_posts'] = 1;
+        }
+        if(!isset($this->options['social_on_category'])) {
+            $this->options['social_on_category'] = 0;
+        }
+        if(!isset($this->options['social_on_archive'])) {
+            $this->options['social_on_archive'] = 0;
+        }
+        if(!isset($this->options['social_before_content'])) {
+            $this->options['social_before_content'] = 1;
+        }
+        if(!isset($this->options['social_after_content'])) {
+            $this->options['social_after_content'] = 0;
+        }
+        if(!isset($this->options['language'])) {
+            $this->options['language'] = 'English';
+        }
+        if(!isset($this->options['facebook_language'])) {
+            $this->options['facebook_language'] = 'en_US';
+        }
+        if(!isset($this->options['google_language'])) {
+            $this->options['google_language'] = 'en-US';
+        }
+        if(!isset($this->options['twitter_language'])) {
+            $this->options['twitter_language'] = 'en';
+        }
+        if(!isset($this->options['button_counter'])) {
+            $this->options['button_counter'] = 'horizontal';
+        }
     }
     

wordpress-social-ring/trunk/readme.txt

@@ -34 +34 @@
 
 == Changelog ==
+
+= 1.2.1 =
+
+* Bugfix
+
+= 1.2.0 =
+
+* Totally rewritten with object oriented approach
+* Added StumbleUpon Button
+* Added Button Language
+* Added Counter Style
+* Changed Facebook Share Button
+* Bugfix
 
 = 1.1.9 =

wordpress-social-ring/trunk/wp-social-ring.php

@@ -56 +56 @@
                 'button_counter' => 'horizontal'
             );
-        } else {
-            if(!isset($wp_social_ring_options['language'])) {
-                $wp_social_ring_options['language'] = 'English';
-            }
-            if(!isset($wp_social_ring_options['facebook_language'])) {
-                $wp_social_ring_options['facebook_language'] = 'en_US';
-            }
-            if(!isset($wp_social_ring_options['google_language'])) {
-                $wp_social_ring_options['google_language'] = 'en-US';
-            }
-            if(!isset($wp_social_ring_options['twitter_language'])) {
-                $wp_social_ring_options['twitter_language'] = 'en';
-            }
-            if(!isset($wp_social_ring_options['button_counter'])) {
-                $wp_social_ring_options['button_counter'] = 'horizontal';
-            }
+            update_option(WP_SOCIAL_RING.'_options', $wp_social_ring_options);
         }
-        update_option(WP_SOCIAL_RING.'_options', $wp_social_ring_options);
+        
     }
 }