Changeset 1180470

Timestamp:

06/13/2015 11:28:08 PM (11 years ago)

Author:

sebwordpress

Message:

Updated trunk - fixed activation bug

Location:

the-welcomizer/trunk

Files:

• includes/twiz.admin.class.php (modified) (1 diff)
• includes/twiz.class.php (modified) (4 diffs)
• includes/twiz.installation.class.php (modified) (4 diffs)
• twiz-index.php (modified) (2 diffs)

the-welcomizer/trunk/includes/twiz.admin.class.php

@@ -744 +744 @@
         
             $this->override_network_settings = '0'; 
-            
-            if( ( !is_multisite() ) or ( $this->override_network_settings == '1' ) ){
-            
-                $code = update_option('twiz_override_network_settings', $this->override_network_settings);
-                $this->override_network_settings = get_option('twiz_override_network_settings');
-                
-            }else{
-            
-                $this->override_network_settings = '0'; 
-            }
+            $code = update_option('twiz_override_network_settings', $this->override_network_settings);
         }
         

the-welcomizer/trunk/includes/twiz.class.php

@@ -938 +938 @@
         
         $this->override_network_settings = get_option('twiz_override_network_settings'); //  Main switch between get_option and get_site_option
+
+        if( $this->override_network_settings == '' ) {
+        
+            $this->override_network_settings = '0';
+        }
+        
         $ok = $this->setDefaultSectionArrayValues();
-        
+
         if( ( $this->user_id == '' ) or ($this->user_id == '0' ) ){ // for the front-end or installation only
 
@@ -1169 +1175 @@
         $jquery = '<script>
 //<![CDATA[
-jQuery(document).ready(function($) {
+jQuery(document).ready(function($) {';
+
+
+        if( ( $this->admin_option[self::KEY_DISPLAY_VAR_DUMP] == true ) or ( TWIZ_FORCE_VARDUMP ==  true ) ){
+        
+         $jquery .= '
+         $("#twiz_var_dump").css({"display":"block","height":$(window).height()-65, "width":$(window).width()-720});';
+         
+        }
+        $jquery .= '
         $.ajaxSetup({ cache: false });
         $("#twiz_privacy_save").click(function(){
@@ -1190 +1205 @@
 </script>';
 
+        if( ( $this->admin_option[self::KEY_DISPLAY_VAR_DUMP] == true ) or ( TWIZ_FORCE_VARDUMP ==  true ) ){
+        
+            $myTwizMenu = new TwizMenu();
+            $html .= '<div id="twiz_var_dump" title="'.__('Click to Refresh', 'the-welcomizer').'">'.$myTwizMenu->getVarDump().'</div>';
+        }
         return $html.$jquery;
     }
@@ -4006 +4026 @@
                     
                         $code = update_option('twiz_override_network_settings',  '1');
-                        
+ 
                     }else{
                     

the-welcomizer/trunk/includes/twiz.installation.class.php

@@ -159 +159 @@
      
         }else{ // UPDATE TO NEW VERSION, or install new separatly
-               
+        
             $is_overriding_network_settings = get_option('twiz_override_network_settings');
 
             if( ( is_multisite() ) and ( $network_activation  == '' ) ){ // blog activated separately on network         
-
                 
                 $twiz_privacy_question_answered = get_option('twiz_privacy_question_answered');
@@ -176 +175 @@
                
             }else if( is_multisite() and ( $network_activation  == '1' ) ){  // network activated after blog activated separately on network 
-     
+            
                 $is_overriding_network_settings = ($is_overriding_network_settings == '') ? '0' : $is_overriding_network_settings ;
                 $twiz_privacy_question_answered = get_site_option('twiz_privacy_question_answered');
@@ -729 +728 @@
         }
         
+        if( !isset($this->admin_option[parent::KEY_DELETE_ALL] ) ) { $this->admin_option[parent::KEY_DELETE_ALL] = ''; }
+        if( !isset($admin_option[parent::KEY_DELETE_ALL] ) ) { $admin_option[parent::KEY_DELETE_ALL] = ''; }
+        if( $this->admin_option[parent::KEY_DELETE_ALL] == '' ) { $this->admin_option[parent::KEY_DELETE_ALL] = '1'; }
+        if( $admin_option[parent::KEY_DELETE_ALL] == '' ) { $admin_option[parent::KEY_DELETE_ALL] = '1'; }
        
         if( ( $this->admin_option[parent::KEY_DELETE_ALL] == '1' ) or ( $admin_option[parent::KEY_DELETE_ALL] == '1' ) ){
@@ -741 +744 @@
                     $reset_stored_request = $wpdb->get_var( "show tables like '".$this->table."'" );                       
                 }
+                
+                if( !isset($this->admin_option[parent::KEY_REMOVE_CREATED_DIRECTORIES] ) ) { $this->admin_option[parent::KEY_REMOVE_CREATED_DIRECTORIES] = ''; }
+                if( $this->admin_option[parent::KEY_REMOVE_CREATED_DIRECTORIES] == '' ) { $this->admin_option[parent::KEY_REMOVE_CREATED_DIRECTORIES] = '1'; }    
                 
                 // remove directories

the-welcomizer/trunk/twiz-index.php

@@ -108 +108 @@
         }else{
         
-            if( !is_multisite() ){  // On network activation, twizInstall is called a first time with no params. 
+            if ( ! function_exists( 'is_plugin_active_for_network' ) ){ require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); }
+             
+            // On network activation, twizInstall is called a first time with no params. 
+            if ( ( !is_multisite() ) or( is_plugin_active_for_network( plugin_dir_url( __FILE__ ) ) ) ) {  
 
                 $TwizInstallation  = new TwizInstallation();
                 $ok = $TwizInstallation->install( $network_activation );
             }
+
         }            
         
@@ -121 +125 @@
         }
     }}
+    
+ 
     // uninstall the plugin, drop table etc... 
     if(!function_exists('twizUninstall')){