[Phpgroupware-cvs] sitemgr/inc/class.Common_UI.inc.php, 1.18

[nomail]

Update of /sitemgr/inc
Modified Files:
        Branch: 
          class.Common_UI.inc.php

date: 2004/07/20 23:22:53;  author: skwashd;  state: Exp;  lines: +39 -14

Log Message:
merge from 16
=====================================================================
Index: sitemgr/inc/class.Common_UI.inc.php
diff -u sitemgr/inc/class.Common_UI.inc.php:1.17 
sitemgr/inc/class.Common_UI.inc.php:1.18
--- sitemgr/inc/class.Common_UI.inc.php:1.17    Wed Jun 18 21:39:55 2003
+++ sitemgr/inc/class.Common_UI.inc.php Tue Jul 20 23:22:53 2004
@@ -40,26 +40,26 @@
                        $this->t->set_block('MainMenu','menuentry','entry');
                        $this->t->set_var('lang_sitemenu',lang('Website') . ' ' 
. $GLOBALS['Common_BO']->sites->current_site['site_name']);
                        reset($GLOBALS['Common_BO']->sitemenu);
-                       while (list($display,$value) = 
@each($GLOBALS['Common_BO']->sitemenu))
+                       foreach($GLOBALS['Common_BO']->sitemenu as $ignored => 
$values)
                        {
-                               if ($display == '_NewLine_')
+                               if ($values['text'] == '_NewLine_')
                                {
                                        continue;
                                }
-                               
$this->t->set_var(array('value'=>$value,'display'=>lang($display)));
+                               
$this->t->set_var(array('value'=>$values['url'],'display'=>lang($values['text'])));
                                $this->t->parse('sitemenu','menuentry', true);
                        }
                        if ($GLOBALS['Common_BO']->othermenu)
                        {
                                $this->t->set_var('lang_othermenu',lang('Other 
websites'));
                                reset($GLOBALS['Common_BO']->othermenu);
-                               while (list($display,$value) = 
@each($GLOBALS['Common_BO']->othermenu))
+                               foreach($GLOBALS['Common_BO']->othermenu as 
$ignored => $values)
                                {
-                                       if ($display == '_NewLine_')
+                                       if ($values['text'] == '_NewLine_')
                                        {
                                                continue;
                                        }
-                                       
$this->t->set_var(array('value'=>$value,'display'=>lang($display)));
+                                       
$this->t->set_var(array('value'=>$values['url'],'display'=>lang($values['text'])));
                                        
$this->t->parse('othermenu','menuentry', true);
                                }
                                $this->t->parse('switchhandle','switch');
@@ -106,6 +106,22 @@
                                {
                                        $oldsitelanguages = 
$GLOBALS['Common_BO']->sites->current_site['site_languages'];
 
+                                       $langs = @explode(',', 
$_POST['pref']['site_languages']);
+                                       if(is_array($langs))
+                                       {
+                                               foreach($langs as $id => $lang)
+                                               {
+                                                       $langs[$id] = 
trim($lang);
+                                               }
+                                               $langs = implode(',', $langs);
+                                       }
+                                       else
+                                       {
+                                               trim($langs);
+                                       }
+                                       $_POST['pref']['site_languages'] = 
$langs;
+                                       unset($langs);
+
                                        if ($oldsitelanguages && 
($oldsitelanguages != $_POST['pref']['site_languages']))
                                        {
                                                $oldsitelanguages = 
explode(',',$oldsitelanguages);
@@ -365,15 +381,20 @@
                function siteselectlist()
                {
                        $selectlist= '<option>' . lang('Other websites') . 
'</option>';
-                       while(list($display,$value) = 
@each($GLOBALS['Common_BO']->othermenu))
+                       if(!is_array($GLOBALS['Common_BO']->othermenu))
                        {
-                               if ($display == '_NewLine_')
+                               return $selectlist;
+                       }
+
+                       foreach($GLOBALS['Common_BO']->othermenu as $ign => 
$values)
+                       {
+                               if ($values['text'] == '_NewLine_')
                                {
                                        continue;
                                }
                                else
                                {
-                                       $selectlist .= '<option 
onClick="location.href=this.value" value="' . $value . '">' . lang($display) . 
'</option>' . "\n";
+                                       $selectlist .= '<option 
onClick="location.href=this.value" value="' . $values['url'] . '">' . 
lang($values['text']) . '</option>' . "\n";
                                }
                        }
                        return $selectlist;
@@ -381,15 +402,19 @@
 
                function menuselectlist()
                {
-                       reset($GLOBALS['Common_BO']->sitemenu);
                        $selectlist= '<option>' . lang('Website') . ' ' . 
$GLOBALS['Common_BO']->sites->current_site['site_name'] . '</option>';
-                       while(list($display,$value) = 
@each($GLOBALS['Common_BO']->sitemenu))
+                       if(!is_array($GLOBALS['Common_BO']->sitemenu))
+                       {
+                               return $selectlist;
+                       }
+                       
+                       foreach($GLOBALS['Common_BO']->sitemenu as $ign => 
$values)
                        {
-                               if ($display == '_NewLine_')
+                               if ($values['text'] == '_NewLine_')
                                {
                                        continue;
                                }
-                               $selectlist .= '<option 
onClick="location.href=this.value" value="' . $value . '">' . lang($display) . 
'</option>' . "\n";
+                               $selectlist .= '<option 
onClick="location.href=this.value" value="' . $values['url'] . '">' . 
lang($values['text']) . '</option>' . "\n";
                        }
                        return $selectlist;
                }