extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed legecy variables that should have been removed before

Browse Source
This commit is contained in:
jengo 2001-06-26 21:40:45 +00:00
parent 83db6d7fb0
commit 7e538b6df2
3 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
phpgwapi/inc/functions.inc.php
View File

@ -334,10 +334,7 @@
* This is a global constant that should be used *
* instead of / or \ in file paths *
\****************************************************************************/
define("SEP",filesystem_separator());
/* Legacy vars that can be delete after 0.9.11 is release (Seek3r) */
$sep = SEP;
$phpgw_info['server']['dir_separator'] = SEP;
define('SEP',filesystem_separator());
/****************************************************************************\
* Stuff to use if logging in or logging out *
@ -376,24 +373,13 @@
define('PHPGW_APP_TPL', $phpgw->common->get_tpl_dir());
define('PHPGW_IMAGES', $phpgw->common->get_image_path());
define('PHPGW_APP_IMAGES_DIR', $phpgw->common->get_image_dir());
define('PHPGW_ACL_READ',1);
define('PHPGW_ACL_ADD',2);
define('PHPGW_ACL_EDIT',4);
define('PHPGW_ACL_DELETE',8);
define('PHPGW_ACL_PRIVATE',16);
/********* Load up additional phpgw_info["server"] values *********/
/* LEGACY SUPPORT!!! WILL BE DELETED AFTER 0.9.11 IS RELEASED !!! */
$phpgw_info['server']['template_dir'] = PHPGW_TEMPLATE_DIR;
$phpgw_info['server']['images_dir'] = PHPGW_IMAGES_DIR;
$phpgw_info['server']['images_filedir'] = PHPGW_IMAGES_FILEDIR;
$phpgw_info['server']['app_root'] = PHPGW_APP_ROOT;
$phpgw_info['server']['app_inc'] = PHPGW_APP_INC;
$phpgw_info['server']['app_tpl'] = PHPGW_APP_TPL;
$phpgw_info['server']['app_images'] = PHPGW_IMAGES;
$phpgw_info['server']['app_images_dir'] = PHPGW_IMAGES_DIR;
/* END LEGACY SUPPORT!!!*/
/********* This sets the user variables *********/
$phpgw_info['user']['private_dir'] = $phpgw_info['server']['files_dir']
. '/users/'.$phpgw_info['user']['userid'];

30
phpgwapi/templates/justweb/navbar.inc.php
View File

@ -15,8 +15,7 @@
{
global $phpgw_info, $phpgw, $PHP_SELF;
$tpl = new Template($phpgw_info["server"]["template_dir"]);
$tpl->set_unknowns("remove");
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_file(array("navbar" => "navbar.tpl"));
@ -88,10 +87,6 @@
$tpl->set_var("messages",$api_messages . "<br>" . checkcode($cd));
} */
// If the application has a header include, we now include it
if ($phpgw_info["flags"]["noheader"] && ! $phpgw_info["flags"]["noappheader"]) {
}
$tpl->pfp('out','navbar');
$phpgw->common->hook('after_navbar');
return;
@ -100,17 +95,18 @@
function parse_navbar_end()
{
global $phpgw_info, $phpgw;
$tpl = new Template($phpgw_info["server"]["template_dir"]);
$tpl->set_unknowns("remove");
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_file(array("footer" => "footer.tpl"));
$tpl->set_var("img_root",$phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/justweb/images");
$tpl->set_var("table_bg_color",$phpgw_info["theme"]["navbar_bg"]);
$tpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]);
$tpl->set_var("user_info",$phpgw->common->display_fullname() . " - "
. lang($phpgw->common->show_date(time(),"l")) . " "
. lang($phpgw->common->show_date(time(),"F")) . " "
. $phpgw->common->show_date(time(),"d, Y"));
$tpl->set_file(array(
'footer' => 'footer.tpl'
));
$tpl->set_var('img_root',$phpgw_info['server']['webserver_url'] . '/phpgwapi/templates/justweb/images');
$tpl->set_var('table_bg_color',$phpgw_info['theme']['navbar_bg']);
$tpl->set_var('version',$phpgw_info['server']['versions']['phpgwapi']);
$tpl->set_var('user_info',$phpgw->common->display_fullname() . " - "
. lang($phpgw->common->show_date(time(),'l')) . " "
. lang($phpgw->common->show_date(time(),'F')) . " "
. $phpgw->common->show_date(time(),'d, Y'));
$phpgw->common->hook('navbar_end');
echo $tpl->finish($tpl->parse("out","footer"));
echo $tpl->pfp('out','footer');
}

4
phpgwapi/templates/verdilak/navbar.inc.php
View File

@ -15,7 +15,7 @@
{
global $phpgw_info, $phpgw, $PHP_SELF;
$tpl = createobject('phpgwapi.Template',$phpgw_info['server']['template_dir']);
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_file(array(
'navbar' => 'navbar.tpl'
@ -125,7 +125,7 @@
function parse_navbar_end()
{
global $phpgw_info, $phpgw;
$tpl = createobject('phpgwapi.Template',$phpgw_info['server']['template_dir']);
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_file(array(
'footer' => 'footer.tpl'