Changeset 8232 for branches/2.5/admin/inc/class.uiconfig.inc.php

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:

• branches/2.5/admin/inc/class.uiconfig.inc.php (modified) (3 diffs)

branches/2.5/admin/inc/class.uiconfig.inc.php

@@ -59 +59 @@
                         $t = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir($appname));
                         $t->set_unknowns('keep');
-                        $template_file = $config_appname == "migra" ? 'migra.tpl' : 'config.tpl';        
-                        $t->set_file(array('config' => $template_file)); 
+                        $template_file = $config_appname == "migra" ? 'migra.tpl' : 'config.tpl';       
+                        $t->set_file(array('config' => $template_file));
                         $t->set_block('config','header','header');
                         $t->set_block('config','body','body');
@@ -73 +73 @@
                         }
         
-                if($appname === "expressoCalendar"){ 
- 
-            if($config_appname == 'expressoCalendar' ) 
-            { 
-                $t->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname)); 
- 
-            }; 
- 
-            if($_POST['newsettings']['expressoCalendar_autoImportCalendars'] == 'true') 
-            { 
-                $db = $GLOBALS['phpgw']->db; 
-                $calendars = array(); 
-                $db->query('SELECT calendar_signature.user_uidnumber as "user",calendar.id as "calendar" FROM calendar,calendar_signature WHERE calendar.id = calendar_signature.calendar_id AND calendar.type = 0 AND calendar_signature.is_owner = 1 AND (SELECT id from module_preference WHERE user_uidnumber = calendar_signature.user_uidnumber AND module_preference.module = \'expressoCalendar\' AND module_preference.name = \'dafaultImportCalendar\'  ) IS NULL'); 
-                while( $db->next_record() ) 
-                { 
-                    $calendars[] = $db->row(); 
-                } 
- 
-                foreach($calendars as $v) 
-                { 
-                    $db->query('INSERT INTO module_preference ("user_uidnumber","value","name","module") VALUES ( \''.$v['user'].'\' , \''.$v['calendar'].'\',\'dafaultImportCalendar\' , \'expressoCalendar\')'); 
-                } 
-            } 
- 
+                if($appname === "expressoCalendar"){
+
+            if($config_appname == 'expressoCalendar' )
+            {
+                $t->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname));
+
+            };
+
+            if($_POST['newsettings']['expressoCalendar_autoImportCalendars'] == 'true')
+            {
+                $db = $GLOBALS['phpgw']->db;
+                $calendars = array();
+                $db->query('SELECT calendar_signature.user_uidnumber as "user",calendar.id as "calendar" FROM calendar,calendar_signature WHERE calendar.id = calendar_signature.calendar_id AND calendar.type = 0 AND calendar_signature.is_owner = 1 AND (SELECT id from module_preference WHERE user_uidnumber = calendar_signature.user_uidnumber AND module_preference.module = \'expressoCalendar\' AND module_preference.name = \'dafaultImportCalendar\'  ) IS NULL');
+                while( $db->next_record() )
+                {
+                    $calendars[] = $db->row();
+                }
+
+                foreach($calendars as $v)
+                {
+                    $db->query('INSERT INTO module_preference ("user_uidnumber","value","name","module") VALUES ( \''.$v['user'].'\' , \''.$v['calendar'].'\',\'dafaultImportCalendar\' , \'expressoCalendar\')');
+                }
+            }
+
                         if (isset($_POST['migration']) && ($_POST['migration']  == "true")){
                         
@@ -104 +104 @@
                                 $migratrion->calendar();
                         }
- 
+
                 }