[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.179,1.180 cl
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.179,1.180 class.hooks.inc.php,1.13,1.14 |
|
Date: |
Fri, 15 Nov 2002 00:15:42 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv25075/inc
Modified Files:
class.common.inc.php class.hooks.inc.php
Log Message:
added funkwerk layout
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -r1.179 -r1.180
*** class.common.inc.php 8 Nov 2002 22:42:14 -0000 1.179
--- class.common.inc.php 15 Nov 2002 05:15:39 -0000 1.180
***************
*** 1169,1183 ****
break;
}
- $var['home_link'] =
$GLOBALS['phpgw_info']['navbar']['home']['url'];
- $var['prefs_link'] =
$GLOBALS['phpgw_info']['navbar']['preferences']['url'];
- $var['logout_link'] =
$GLOBALS['phpgw_info']['navbar']['logout']['url'];
- $var['about_link'] =
$GLOBALS['phpgw_info']['navbar']['about']['url'];
-
- $var['home_title'] =
$GLOBALS['phpgw_info']['navbar']['home']['title'];
- $var['prefs_title'] =
$GLOBALS['phpgw_info']['navbar']['preferences']['title'];
- $var['logout_title'] =
$GLOBALS['phpgw_info']['navbar']['logout']['title'];
- $var['about_title'] =
$GLOBALS['phpgw_info']['navbar']['about']['title'];
! if (isset($GLOBALS['phpgw_info']['navbar']['admin']) &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
{
$GLOBALS['phpgw']->db->query('select
count(session_id) from phpgw_sessions');
--- 1169,1189 ----
break;
}
! $var['home_link'] =
$GLOBALS['phpgw_info']['navbar']['home']['url'];
! $var['prefs_link'] =
$GLOBALS['phpgw_info']['navbar']['preferences']['url'];
! $var['logout_link'] =
$GLOBALS['phpgw_info']['navbar']['logout']['url'];
! $var['about_link'] =
$GLOBALS['phpgw_info']['navbar']['about']['url'];
!
! $var['home_title'] =
$GLOBALS['phpgw_info']['navbar']['home']['title'];
! $var['prefs_title'] =
$GLOBALS['phpgw_info']['navbar']['preferences']['title'];
! $var['logout_title'] =
$GLOBALS['phpgw_info']['navbar']['logout']['title'];
! $var['about_title'] =
$GLOBALS['phpgw_info']['navbar']['about']['title'];
!
! $var['home_statustext'] =
$GLOBALS['phpgw_info']['navbar']['home']['title'];
! $var['prefs_statustext'] =
$GLOBALS['phpgw_info']['navbar']['preferences']['title'];
! $var['logout_statustext'] =
$GLOBALS['phpgw_info']['navbar']['logout']['title'];
! $var['about_statustext'] =
$GLOBALS['phpgw_info']['navbar']['about']['title'];
!
! if (isset($GLOBALS['phpgw_ifo']['navbar']['admin']) &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
{
$GLOBALS['phpgw']->db->query('select
count(session_id) from phpgw_sessions');
***************
*** 1203,1207 ****
'img_src_over' =>
$data['icon_hover'],
'url' =>
$data['url'],
! 'name' =>
str_replace('-','_',$app)
);
--- 1209,1214 ----
'img_src_over' =>
$data['icon_hover'],
'url' =>
$data['url'],
! 'name' =>
str_replace('-','_',$app),
! 'statustext' =>
$data['title']
);
***************
*** 1277,1281 ****
$var['lang_phpgw_statustext'] = lang('phpGroupWare
--> homepage');
$var['top_spacer_middle_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle');
! $var['navbar_format'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'];
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var);
--- 1284,1288 ----
$var['lang_phpgw_statustext'] = lang('phpGroupWare
--> homepage');
$var['top_spacer_middle_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle');
! $var['navbar_format'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'];
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var);
***************
*** 1365,1369 ****
/* We handle this here becuase its special */
! $GLOBALS['phpgw_info']['navbar']['about']['title']
= lang('about x',lang($app));
$GLOBALS['phpgw_info']['navbar']['about']['url']
= $GLOBALS['phpgw']->link('/about.php','app='.$app);
$GLOBALS['phpgw_info']['navbar']['about']['icon']
= $this->image('phpgwapi',Array('about','nonav'));
--- 1372,1376 ----
/* We handle this here becuase its special */
! $GLOBALS['phpgw_info']['navbar']['about']['title']
= lang('about');
$GLOBALS['phpgw_info']['navbar']['about']['url']
= $GLOBALS['phpgw']->link('/about.php','app='.$app);
$GLOBALS['phpgw_info']['navbar']['about']['icon']
= $this->image('phpgwapi',Array('about','nonav'));
***************
*** 1415,1421 ****
. SEP . 'css' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css';
}
! elseif(@file_exists(PHPGW_SERVER_ROOT . SEP .
'phpgwapi' . SEP . 'templates' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP .
'css' . SEP . 'submarine.css'))
{
! $css_file =
$GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP .
'templates' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP .
'css' . SEP . 'submarine.css';
}
else
--- 1422,1430 ----
. SEP . 'css' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css';
}
! elseif(@file_exists(PHPGW_SERVER_ROOT . SEP .
'phpgwapi' . SEP . 'templates' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP
! . 'css' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] .
'.css'))
{
! $css_file =
$GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP .
'templates' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']
! . SEP . 'css' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] .
'.css';
}
else
Index: class.hooks.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.hooks.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.hooks.inc.php 16 Feb 2002 14:30:40 -0000 1.13
--- class.hooks.inc.php 15 Nov 2002 05:15:39 -0000 1.14
***************
*** 1,26 ****
<?php
! /**************************************************************************\
! * phpGroupWare API - Hooks *
! * This file written by Dan Kuykendall <address@hidden> *
! * Allows applications to "hook" into each other *
! * Copyright (C) 2000, 2001 Dan Kuykendall *
! * -------------------------------------------------------------------------*
! * This library is part of the phpGroupWare API *
! * http://www.phpgroupware.org/api
*
! * ------------------------------------------------------------------------ *
! * This library is free software; you can redistribute it and/or modify it *
! * under the terms of the GNU Lesser General Public License as published by *
! * the Free Software Foundation; either version 2.1 of the License, *
! * or any later version. *
! * This library is distributed in the hope that it will be useful, but *
! * WITHOUT ANY WARRANTY; without even the implied warranty of *
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
! * See the GNU Lesser General Public License for more details. *
! * You should have received a copy of the GNU Lesser General Public License *
! * along with this library; if not, write to the Free Software Foundation, *
! * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
! \**************************************************************************/
!
! /* $Id$ */
/*!
--- 1,25 ----
<?php
!
/**************************************************************************\
! * phpGroupWare API - Hooks
*
! * This file written by Dan Kuykendall <address@hidden> *
! * Allows applications to "hook" into each other
*
! * Copyright (C) 2000 - 2002 Dan Kuykendall
*
! *
------------------------------------------------------------------------ *
! * This library is part of the phpGroupWare API
*
! * http://www.phpgroupware.org/api
*
! *
------------------------------------------------------------------------ *
! * This library is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU Lesser General Public License as published
by *
! * the Free Software Foundation; either version 2.1 of the License,
*
! * or any later version.
*
! * This library is distributed in the hope that it will be useful, but
*
! * WITHOUT ANY WARRANTY; without even the implied warranty of
*
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
! * See the GNU Lesser General Public License for more details.
*
! * You should have received a copy of the GNU Lesser General Public
License *
! * along with this library; if not, write to the Free Software
Foundation, *
! * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
!
\**************************************************************************/
! /* $Id$ */
/*!
***************
*** 57,61 ****
function process($location, $order = '', $no_permission_check =
False)
{
- $SEP = filesystem_separator();
if ($order == '')
{
--- 56,59 ----
***************
*** 70,74 ****
if
(isset($this->found_hooks[$appname][$location]))
{
! $f = PHPGW_SERVER_ROOT . $SEP .
$appname . $SEP . 'inc' . $SEP . $this->found_hooks[$appname][$location];
if (file_exists($f) &&
(
$GLOBALS['phpgw_info']['user']['apps'][$appname] || (($no_permission_check ||
$appname == 'preferences') && $appname)) )
--- 68,72 ----
if
(isset($this->found_hooks[$appname][$location]))
{
! $f = PHPGW_SERVER_ROOT . SEP . $appname
. SEP . 'inc' . SEP . $this->found_hooks[$appname][$location];
if (file_exists($f) &&
(
$GLOBALS['phpgw_info']['user']['apps'][$appname] || (($no_permission_check ||
$appname == 'preferences') && $appname)) )
***************
*** 92,96 ****
if
(isset($this->found_hooks[$appname][$location]))
{
! $f = PHPGW_SERVER_ROOT
. $SEP . $appname . $SEP . 'inc' . $SEP .
$this->found_hooks[$appname][$location];
if (file_exists($f))
{
--- 90,94 ----
if
(isset($this->found_hooks[$appname][$location]))
{
! $f = PHPGW_SERVER_ROOT
. SEP . $appname . SEP . 'inc' . SEP . $this->found_hooks[$appname][$location];
if (file_exists($f))
{
***************
*** 111,115 ****
if
(isset($this->found_hooks[$appname][$location]))
{
! $f = PHPGW_SERVER_ROOT
. $SEP . $appname . $SEP . 'inc' . $SEP .
$this->found_hooks[$appname][$location];
if (file_exists($f))
{
--- 109,113 ----
if
(isset($this->found_hooks[$appname][$location]))
{
! $f = PHPGW_SERVER_ROOT
. SEP . $appname . SEP . 'inc' . SEP . $this->found_hooks[$appname][$location];
if (file_exists($f))
{
***************
*** 135,144 ****
$appname =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
- $SEP = filesystem_separator();
/* First include the ordered apps hook file */
if (isset($this->found_hooks[$appname][$location]))
{
! $f = PHPGW_SERVER_ROOT . $SEP . $appname . $SEP
. 'inc' . $SEP . $this->found_hooks[$appname][$location];
if (file_exists($f) &&
(
$GLOBALS['phpgw_info']['user']['apps'][$appname] || (($no_permission_check ||
$location == 'config' || $appname == 'phpgwapi') && $appname)) )
--- 133,141 ----
$appname =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
/* First include the ordered apps hook file */
if (isset($this->found_hooks[$appname][$location]))
{
! $f = PHPGW_SERVER_ROOT . SEP . $appname . SEP .
'inc' . SEP . $this->found_hooks[$appname][$location];
if (file_exists($f) &&
(
$GLOBALS['phpgw_info']['user']['apps'][$appname] || (($no_permission_check ||
$location == 'config' || $appname == 'phpgwapi') && $appname)) )
***************
*** 171,179 ****
$appname =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
- $SEP = filesystem_separator();
if(@isset($this->found_hooks[$appname][$location]))
{
! $f = PHPGW_SERVER_ROOT . $SEP . $appname . $SEP
. 'inc' . $SEP . $this->found_hooks[$appname][$location];
if(@file_exists($f) &&
(
$GLOBALS['phpgw_info']['user']['apps'][$appname] || (($no_permission_check ||
$location == 'config' || $appname == 'phpgwapi') && $appname)) )
--- 168,175 ----
$appname =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
if(@isset($this->found_hooks[$appname][$location]))
{
! $f = PHPGW_SERVER_ROOT . SEP . $appname . SEP .
'inc' . SEP . $this->found_hooks[$appname][$location];
if(@file_exists($f) &&
(
$GLOBALS['phpgw_info']['user']['apps'][$appname] || (($no_permission_check ||
$location == 'config' || $appname == 'phpgwapi') && $appname)) )
***************
*** 201,205 ****
$count = 0;
reset($GLOBALS['phpgw_info']['user']['apps']);
- $SEP = filesystem_separator();
while ($permission =
each($GLOBALS['phpgw_info']['user']['apps']))
{
--- 197,200 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.179,1.180 class.hooks.inc.php,1.13,1.14,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/funkwerk/css funkwerk.css,NONE,1.1 phpgw.css,NONE,1.1
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default app_header.xsl,1.4,1.5
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/funkwerk/css funkwerk.css,NONE,1.1 phpgw.css,NONE,1.1
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default app_header.xsl,1.4,1.5
- Index(es):