Changeset 8231 for sandbox/2.5.1-evolucao/expressoAdmin1_2

Timestamp:

10/08/13 11:59:12 (11 years ago)

Author:

angelo

Message:

Ticket #3491 - Compatibilizar Expresso com novas versoes do PHP

Location:

sandbox/2.5.1-evolucao/expressoAdmin1_2

Files:

• controller.php (modified) (2 diffs)
• inc/class.db_functions.inc.php (modified) (1 diff)
• inc/class.functions.inc.php (modified) (3 diffs)

sandbox/2.5.1-evolucao/expressoAdmin1_2/controller.php

@@ -22 +22 @@
         //      Explode action from cExecuteForm function
         $cExecuteFormReturn = false;
-        if($_POST['_action']) {                 
+        if(isset($_POST['_action'])) {          
                 if($_FILES) {
                         $count_files = $_POST['countFiles'];
@@ -36 +36 @@
         }
         //      Explode action from cExecute function
-        else if($_GET['action'])
-                list($app,$class,$method) = explode('.',@$_GET['action']);
+        else if($_GET['action']){
+                $exp = explode('.',@$_GET['action']);
+                //avoiding undefined offsets
+                if (count($exp) > 1)
+                        list($app,$class,$method) = explode('.',@$_GET['action']);
+                else
+                        $app = $exp[0];
+        }
         // NO ACTION
         else
                 return $_SESSION['response'] = 'false';
-        
         // Load dinamically class file.
         if($app == '$this')

sandbox/2.5.1-evolucao/expressoAdmin1_2/inc/class.db_functions.inc.php

@@ -10 +10 @@
                 \**************************************************************************/ 
                 
-define('PHPGW_INCLUDE_ROOT','../');     
-define('PHPGW_API_INC','../phpgwapi/inc');
+if (!defined('PHPGW_INCLUDE_ROOT')) define('PHPGW_INCLUDE_ROOT','../'); 
+if (!defined('PHPGW_API_INC')) define('PHPGW_API_INC','../phpgwapi/inc');
 include_once(PHPGW_API_INC.'/class.db.inc.php');
 

sandbox/2.5.1-evolucao/expressoAdmin1_2/inc/class.functions.inc.php

@@ -833 +833 @@
                                 if (($i +1) % 3 == 1)
                                 {
-                                        $checked = $user_applications[$app] ? 'CHECKED' : '';
+                                        $checked = is_array($user_applications) && $user_applications[$app] ? 'CHECKED' : '';
                                         $app_col1 = sprintf("<td>%s</td><td width='10'><input type='checkbox' name='apps[%s]' value='1' %s %s></td>\n",
                                         $data['title'],$app,$checked, $disabled);
@@ -843 +843 @@
                                 if (($i +1) % 3 == 2)
                                 {
-                                        $checked = $user_applications[$app] ? 'CHECKED' : '';
+                                        $checked = is_array($user_applications) && $user_applications[$app] ? 'CHECKED' : '';
                                         $app_col2 = sprintf("<td>%s</td><td width='10'><input type='checkbox' name='apps[%s]' value='1' %s %s></td>\n",
                                         $data['title'],$app,$checked, $disabled);
@@ -853 +853 @@
                                 if (($i +1) % 3 == 0)
                                 {
-                                        $checked = $user_applications[$app] ? 'CHECKED' : '';
+                                        $checked = is_array($user_applications) && $user_applications[$app] ? 'CHECKED' : '';
                                         $app_col3 = sprintf("<td>%s</td><td width='10'><input type='checkbox' name='apps[%s]' value='1' %s %s></td>\n",
                                         $data['title'],$app,$checked, $disabled);