[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123.2.9,1.1
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123.2.9,1.123.2.9.2.1 functions.inc.php,1.121.2.13.2.2,1.121.2.13.2.3 |
|
Date: |
Fri, 28 Mar 2003 10:08:24 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv10113/inc
Modified Files:
Tag: Version-0_9_16-branch
class.common.inc.php functions.inc.php
Log Message:
now admin can enable/disable the preferences as any other app, fix for bug#2967
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.123.2.9
retrieving revision 1.123.2.9.2.1
diff -C2 -r1.123.2.9 -r1.123.2.9.2.1
*** class.common.inc.php 6 Mar 2003 16:28:42 -0000 1.123.2.9
--- class.common.inc.php 28 Mar 2003 15:08:21 -0000 1.123.2.9.2.1
***************
*** 925,935 ****
$GLOBALS['phpgw_info']['navbar']['home']['icon_hover']
= $this->image_on('phpgwapi',Array('home','nonav'),'-over');
! reset($GLOBALS['phpgw_info']['user']['apps']);
! //ksort($GLOBALS['phpgw_info']['user']['apps']);
!
!
if(is_array($GLOBALS['phpgw_info']['user']['apps']['admin']))
{
$newarray['admin'] =
$GLOBALS['phpgw_info']['user']['apps']['admin'];
! while(list($index,$value) =
each($GLOBALS['phpgw_info']['user']['apps']))
{
if($index != 'admin')
--- 925,933 ----
$GLOBALS['phpgw_info']['navbar']['home']['icon_hover']
= $this->image_on('phpgwapi',Array('home','nonav'),'-over');
! list($first) =
each($GLOBALS['phpgw_info']['user']['apps']);
!
if(is_array($GLOBALS['phpgw_info']['user']['apps']['admin']) && $first !=
'admin')
{
$newarray['admin'] =
$GLOBALS['phpgw_info']['user']['apps']['admin'];
! foreach($GLOBALS['phpgw_info']['user']['apps']
as $index => $value)
{
if($index != 'admin')
***************
*** 945,994 ****
unset($newarray);
! while ($permission =
each($GLOBALS['phpgw_info']['user']['apps']))
{
! if (is_long($permission[0]))
{
continue;
}
! if
($GLOBALS['phpgw_info']['apps'][$permission[0]]['status'] != 2 &&
$GLOBALS['phpgw_info']['apps'][$permission[0]]['status'] != 3)
{
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['title'] =
$GLOBALS['phpgw_info']['apps'][$permission[0]]['title'];
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['url'] =
$GLOBALS['phpgw']->link('/' . $permission[0] . '/index.php');
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['name'] = $permission[0];
! if ($permission[0] !=
$GLOBALS['phpgw_info']['flags']['currentapp'])
{
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon'] =
$this->image($permission[0],Array('navbar','nonav'));
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon_hover'] =
$this->image_on($permission[0],Array('navbar','nonav'),'-over');
}
else
{
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon'] =
$this->image_on($permission[0],Array('navbar','nonav'),'-over');
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon_hover'] =
$this->image($permission[0],Array('navbar','nonav'));
}
! //
if($GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon'] == '')
// {
! //
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon'] =
$this->image('phpgwapi','nonav');
// }
}
}
-
$GLOBALS['phpgw_info']['navbar']['preferences']['title'] = 'preferences';
- $GLOBALS['phpgw_info']['navbar']['preferences']['url']
= $GLOBALS['phpgw']->link('/preferences/index.php');
- $GLOBALS['phpgw_info']['navbar']['preferences']['icon']
= $this->image('preferences',Array('navbar','nonav'));
-
$GLOBALS['phpgw_info']['navbar']['preferences']['icon_hover'] =
$this->image_on('preferences',Array('navbar','nonav'),'-over');
-
if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'home' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences' ||
$GLOBALS['phpgw_info']['flags']['currentapp'] == 'about')
{
! $app = 'phpGroupWare';
}
else
{
$app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
// We handle this here becuase its special
! $GLOBALS['phpgw_info']['navbar']['about']['title'] =
lang('About %1',$app);
$GLOBALS['phpgw_info']['navbar']['about']['url'] =
$GLOBALS['phpgw']->link('/about.php','app='.$app);
--- 943,995 ----
unset($newarray);
! foreach($GLOBALS['phpgw_info']['user']['apps'] as $app
=> $data)
{
! if (is_long($app))
{
continue;
}
! if ($app == 'preferences' ||
$GLOBALS['phpgw_info']['apps'][$app]['status'] != 2 &&
$GLOBALS['phpgw_info']['apps'][$app]['status'] != 3)
{
!
$GLOBALS['phpgw_info']['navbar'][$app]['title'] =
$GLOBALS['phpgw_info']['apps'][$app]['title'];
!
$GLOBALS['phpgw_info']['navbar'][$app]['url'] = $GLOBALS['phpgw']->link('/' .
$app . '/index.php');
!
$GLOBALS['phpgw_info']['navbar'][$app]['name'] = $app;
! if ($app !=
$GLOBALS['phpgw_info']['flags']['currentapp'])
{
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon'] =
$this->image($app,Array('navbar','nonav'));
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover'] =
$this->image_on($app,Array('navbar','nonav'),'-over');
}
else
{
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon'] =
$this->image_on($app,Array('navbar','nonav'),'-over');
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover'] =
$this->image($app,Array('navbar','nonav'));
}
! //
if($GLOBALS['phpgw_info']['navbar'][$app]['icon'] == '')
// {
! //
$GLOBALS['phpgw_info']['navbar'][$app]['icon'] =
$this->image('phpgwapi','nonav');
// }
}
}
if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'home' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences' ||
$GLOBALS['phpgw_info']['flags']['currentapp'] == 'about')
{
! $app = $app_title = 'phpGroupWare';
}
else
{
$app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $app_title =
$GLOBALS['phpgw_info']['apps'][$app]['title'];
+ }
+
+ if
($GLOBALS['phpgw_info']['user']['apps']['preferences']) // preferences last
+ {
+ $prefs =
$GLOBALS['phpgw_info']['navbar']['preferences'];
+
unset($GLOBALS['phpgw_info']['navbar']['preferences']);
+ $GLOBALS['phpgw_info']['navbar']['preferences']
= $prefs;
}
// We handle this here becuase its special
! $GLOBALS['phpgw_info']['navbar']['about']['title'] =
lang('About %1',$app_title);
$GLOBALS['phpgw_info']['navbar']['about']['url'] =
$GLOBALS['phpgw']->link('/about.php','app='.$app);
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.13.2.2
retrieving revision 1.121.2.13.2.3
diff -C2 -r1.121.2.13.2.2 -r1.121.2.13.2.3
*** functions.inc.php 27 Mar 2003 00:38:25 -0000 1.121.2.13.2.2
--- functions.inc.php 28 Mar 2003 15:08:21 -0000 1.121.2.13.2.3
***************
*** 408,412 ****
\*************************************************************************/
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
- $GLOBALS['phpgw_info']['flags']['currentapp'] !=
'preferences' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] !=
'about')
{
--- 408,411 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123.2.9,1.123.2.9.2.1 functions.inc.php,1.121.2.13.2.2,1.121.2.13.2.3,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default head.inc.php,1.11.2.1.2.1,1.11.2.1.2.2navbar.inc.php,1.28.2.3,1.28.2.3.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety head.inc.php,1.11.2.2.2.1,1.11.2.2.2.2 navbar.inc.php,1.30.2.7,1.30.2.7.2.1 navbar.tpl,1.18,1.18.4.1
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default head.inc.php,1.11.2.1.2.1,1.11.2.1.2.2navbar.inc.php,1.28.2.3,1.28.2.3.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety head.inc.php,1.11.2.2.2.1,1.11.2.2.2.2 navbar.inc.php,1.30.2.7,1.30.2.7.2.1 navbar.tpl,1.18,1.18.4.1
- Index(es):