Changeset 423 for trunk/jabberit_messenger/inc

Timestamp:

09/12/08 16:53:27 (16 years ago)

Author:

niltonneto

Message:

Vide changelog do módulo.
http://www.expressolivre.org/dev/wiki/jabberit/changelog
Alterações feitas por Alexandre Correia
email: alexandrecorreia@…

Location:

trunk/jabberit_messenger/inc

Files:

• class.uimodule.inc.php (modified) (3 diffs)
• hook_admin.inc.php (modified) (1 diff)
• jabberit_acl.inc.php (modified) (1 diff)

trunk/jabberit_messenger/inc/class.uimodule.inc.php

@@ -54 +54 @@
                 {
                         $apps_list = unserialize($apps_list);
-                        foreach($apps_list as $tmp)
-                                $apps_en .= "<option value='".$tmp."'>".substr($tmp,strpos($tmp, ";")+1)."</option>";
+                        if(is_array($apps_list))
+                        {
+                                foreach($apps_list as $tmp)
+                                        $apps_en .= "<option value='".$tmp."'>".substr($tmp,strpos($tmp, ";")+1)."</option>";
+                        }
                 }
 
                 if( $apps_enabled = $this->bo->getApplicationsList() )
                 {
-                        foreach($apps_enabled as $tmp )
-                                $apps .= "<option value='".$tmp['name'].";".$tmp['title']."'>".$tmp['title']."</option>";
+                        if(is_array($apps_enabled))
+                        {
+                                foreach($apps_enabled as $tmp )
+                                        $apps .= "<option value='".$tmp['name'].";".$tmp['title']."'>".$tmp['title']."</option>";
+                        }
                 }
 
-                
                 $GLOBALS['phpgw']->template->set_file(array('jabberit_messenger'=>'module.tpl'));
                 $GLOBALS['phpgw']->template->set_block('jabberit_messenger','module');  
@@ -71 +76 @@
                                                                                 'apps_enabled' => $apps_en,
                                                                                 'apps_list' => $apps,
-                                                                                'lang_Settings_Use_Module_Expresso_Messenger' => 'Configurar o uso do módulo Expresso Messenger',
-                                                                                'lang_Applications_List' => 'Lista de Aplicativos',
-                                                                                'lang_Applications_habilitadas' => 'Aplicativos Habilitados',
+                                                                                'lang_Select_the_modules_where_the_Expresso_Messenger_will_be_loaded' => lang('Select the modules where the Expresso Messenger will be loaded.'),                                                                               
+                                                                                'lang_Enable_the_Expresso_Messenger_module' => lang('Enable the Expresso Messenger module'),
+                                                                                'lang_Modules_List' => lang('Modules List'),
+                                                                                'lang_Modules_Enabled' => lang('Modules Enabled'),
                                                                                 'lang_save' => lang('Save'),
                                                                                 'lang_cancel' => lang('Cancel')
@@ -97 +103 @@
                         if(is_array($_POST['apps_enabled']))
                                 $this->bo->setApplications($_POST['apps_enabled']);
+                        else
+                                $this->bo->setApplications("");
                 }
 

trunk/jabberit_messenger/inc/hook_admin.inc.php

@@ -15 +15 @@
         $file = array(
                 'Site Configuration'    => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
-                'Configurar o Uso do Módulo' => $GLOBALS['phpgw']->link('/index.php','menuaction=jabberit_messenger.uimodule.edit_conf')
+                'Enable the Expresso Messenger inside of the modules' => $GLOBALS['phpgw']->link('/index.php','menuaction=jabberit_messenger.uimodule.edit_conf')
         );
         

trunk/jabberit_messenger/inc/jabberit_acl.inc.php

@@ -17 +17 @@
         $apps = unserialize($GLOBALS['phpgw_info']['server']['apps_jabberit']);
         $flag = false;
-        
-        foreach($apps as $tmp)
+
+        if( is_array($apps) )
         {
-                $app_enabled = substr($tmp,0,strpos($tmp,";"));
- 
-                if( $GLOBALS['phpgw_info']['flags']['currentapp'] == $app_enabled )
-                        $flag = true;
-        }       
+                foreach($apps as $tmp)
+                {
+                        $app_enabled = substr($tmp,0,strpos($tmp,";"));
+                        if( $GLOBALS['phpgw_info']['flags']['currentapp'] == $app_enabled )
+                                $flag = true;
+                }       
+        }
         
         if ( $GLOBALS['phpgw_info']['user']['acl'][$i]['appname'] == 'jabberit_messenger' && ( $flag || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'jabberit_messenger' ))