[Phpgroupware-cvs] sitemgr/inc/class.Common_BO.inc.php, 1.6

[nomail]

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

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

Log Message:
merge from 16
=====================================================================
Index: sitemgr/inc/class.Common_BO.inc.php
diff -u sitemgr/inc/class.Common_BO.inc.php:1.5 
sitemgr/inc/class.Common_BO.inc.php:1.6
--- sitemgr/inc/class.Common_BO.inc.php:1.5     Fri Jun  6 02:14:55 2003
+++ sitemgr/inc/class.Common_BO.inc.php Tue Jul 20 23:22:53 2004
@@ -90,20 +90,29 @@
                {
                        if ($GLOBALS['Common_BO']->acl->is_admin())
                        {
-                               $file['Configure Website'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Common_UI.DisplayPrefs');
+                               $file[] = array('text'  => 'Configure Website',
+                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Common_UI.DisplayPrefs'));
                                $link_data['cat_id'] = CURRENT_SITE_ID;
                                $link_data['menuaction'] = 
"sitemgr.Modules_UI.manage";
-                               $file['Manage site-wide module properties'] = 
$GLOBALS['phpgw']->link('/index.php',$link_data);
+                               $file[] = array('text' => 'Manage site-wide 
module properties',
+                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php',$link_data));
+                                               
                                $link_data['page_id'] = 0;
                                $link_data['menuaction'] = 
"sitemgr.Content_UI.manage";
-                               $file['Manage site-wide content'] = 
$GLOBALS['phpgw']->link('/index.php',$link_data);
+                               $file[] = array('text' => 'Manage site-wide 
content',
+                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php',$link_data));
                        }
-                       $file['Manage Categories and pages'] = 
$GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Outline_UI.manage');
-                       $file['Manage Translations'] = 
$GLOBALS['phpgw']->link('/index.php', 
'menuaction=sitemgr.Translations_UI.manage');
-                       $file['Commit Changes'] = 
$GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Content_UI.commit');
-                       $file['Manage archived content'] = 
$GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Content_UI.archive');
-                       $file['_NewLine_'] ='';
-                       $file['View Generated Site'] = 
$GLOBALS['phpgw']->link('/sitemgr-link/');
+                       $file[] = array('text' => 'Manage Categories and pages',
+                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Outline_UI.manage'));
+                       $file[] = array('text' => 'Manage Translations', 
+                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', 
'menuaction=sitemgr.Translations_UI.manage'));
+                       $file[] = array('text' => 'Commit Changes', 
+                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Content_UI.commit'));
+                       $file[] = array('text' => 'Manage archived content',
+                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', 'menuaction=sitemgr.Content_UI.archive'));
+                       $file[] = array('text' => '_NewLine_');
+                       $file[] = array('text' => 'View Generated Site', 
+                                       'url' => 
$GLOBALS['phpgw']->link('/sitemgr-link/', array('site_id' => CURRENT_SITE_ID)));
                        return $file;
                }
 
@@ -125,17 +134,19 @@
                                        if ($site_id != CURRENT_SITE_ID)
                                        {
                                                $link_data['siteswitch'] = 
$site_id;
-                                               $file[$site['site_name']] = 
$GLOBALS['phpgw']->link('/index.php',$link_data);
+                                               $file[] = array('text' => 
$site['site_name'],
+                                                               'url' => 
$GLOBALS['phpgw']->link('/index.php',$link_data));
                                        }
                                }
                        }
                        if ($numberofsites > 1 && $isadmin)
                        {
-                               $file['_NewLine_'] ='';
+                               $file[] = array ('text' => '_NewLine_');
                        }
                        if ($isadmin)
                        {
-                               $file['Define websites'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Sites_UI.list_sites');
+                               $file[] = array('text' => 'Define websites',
+                                               'url'  => 
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Sites_UI.list_sites'));
                        }
                        return $file;
                }