Changeset 7223 for trunk/expressoAdmin1_2

Timestamp:

09/14/12 16:44:16 (12 years ago)

Author:

acoutinho

Message:

Ticket #3102 - Atualizar versionamento do Expresso e dos modulos para a versao 2.4.2

Location:

trunk/expressoAdmin1_2

Files:

• inc/class.user.inc.php (modified) (1 diff)
• setup/setup.inc.php (modified) (2 diffs)
• setup/tables_update.inc.php (modified) (1 diff)

trunk/expressoAdmin1_2/inc/class.user.inc.php

@@ -79 +79 @@
                         
                                 // Cria array para incluir no LDAP
-                                $dn = 'uid=' . $params['uid'] . ',' . $params['context'];               
-                        
-                                $user_info = array();
+                                $dn = 'uid=' . $params['uid'] . ',' . $params['context'];
+
+                ob_start();
+                print_r($params);
+                $output = ob_get_clean();
+                file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+
+
+                $user_info = array();
                                 $user_info['accountStatus']                     = $params['accountstatus'] == 1 ? 'active' : 'desactive';
                                 $user_info['cn']                                                = $params['givenname'] . ' ' . $params['sn'];

trunk/expressoAdmin1_2/setup/setup.inc.php

@@ -13 +13 @@
         $setup_info['expressoAdmin1_2']['title']        = 'Expresso Admin';
         /* Ao incrementar versão, não esquecer de declarar função do tables_update.inc.php*/
-        $setup_info['expressoAdmin1_2']['version']      = '2.4.1';
+        $setup_info['expressoAdmin1_2']['version']      = '2.4.2';
         $setup_info['expressoAdmin1_2']['app_order']    = 1;
         $setup_info['expressoAdmin1_2']['tables'][]             = 'phpgw_expressoadmin';
@@ -37 +37 @@
         $setup_info['expressoAdmin1_2']['depends'][] = array(
                 'appname' => 'phpgwapi',
-                'versions' => Array('2.4.1')
+                'versions' => Array('2.4.2')
         );
 ?>

trunk/expressoAdmin1_2/setup/tables_update.inc.php

@@ -330 +330 @@
                 $GLOBALS['setup_info']['expressoAdmin1_2']['currentver'] = '2.4.1';
                 return $GLOBALS['setup_info']['expressoAdmin1_2']['currentver'];
-        }        
+        }
+
+    $test[] = '2.4.1';
+        function expressoAdmin1_2_upgrade2_4_1()
+        {
+                $GLOBALS['setup_info']['expressoAdmin1_2']['currentver'] = '2.4.2';
+                return $GLOBALS['setup_info']['expressoAdmin1_2']['currentver'];
+        }
 ?>