extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 09:58:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug that wasnt loading up default if admin gave users the chioce, and they didnt make one

Browse Source
This commit is contained in:
seek3r 2001-01-07 06:25:34 +00:00
parent a8062d13db
commit 39e22a5202
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/inc/phpgw_common.inc.php
View File

@ -332,7 +332,12 @@
global $phpgw_info; global $phpgw_info;
if ($appname == ""){$appname = $phpgw_info["flags"]["currentapp"];} if ($appname == ""){$appname = $phpgw_info["flags"]["currentapp"];}
if ($appname == "home" || $appname == "logout" || $appname == "login"){$appname = "phpgwapi";} if ($appname == "home" || $appname == "logout" || $appname == "login"){$appname = "phpgwapi";}
if (empty($phpgw_info["server"]["template_set"])){$phpgw_info["server"]["template_set"] = "default";}
if ($phpgw_info["server"]["template_set"] == "user_choice" && isset($phpgw_info["user"]["preferences"]["template_set"])){
$phpgw_info["server"]["template_set"] = $phpgw_info["user"]["preferences"]["template_set"];
}elseif ($phpgw_info["server"]["template_set"] == "user_choice" || empty($phpgw_info["server"]["template_set"])){
$phpgw_info["server"]["template_set"] = "default";
}
$tpldir = $phpgw_info["server"]["server_root"]."/".$appname."/templates/".$phpgw_info["server"]["template_set"]; $tpldir = $phpgw_info["server"]["server_root"]."/".$appname."/templates/".$phpgw_info["server"]["template_set"];
$tpldir_default = $phpgw_info["server"]["server_root"]."/".$appname."/templates/default"; $tpldir_default = $phpgw_info["server"]["server_root"]."/".$appname."/templates/default";

2
phpgwapi/inc/phpgw_info.inc.php
View File

@ -97,8 +97,8 @@
$phpgw_info["server"]["app_root"] = $phpgw->common->get_app_dir(); $phpgw_info["server"]["app_root"] = $phpgw->common->get_app_dir();
$phpgw_info["server"]["app_inc"] = $phpgw->common->get_inc_dir(); $phpgw_info["server"]["app_inc"] = $phpgw->common->get_inc_dir();
$phpgw_info["server"]["app_images"] = $phpgw->common->get_image_path();
$phpgw_info["server"]["app_tpl"] = $phpgw->common->get_tpl_dir(); $phpgw_info["server"]["app_tpl"] = $phpgw->common->get_tpl_dir();
$phpgw_info["server"]["app_images"] = $phpgw->common->get_image_path();
/* ********This sets the user variables******** */ /* ********This sets the user variables******** */
$phpgw_info["user"]["private_dir"] = $phpgw_info["server"]["files_dir"] . "/users/" $phpgw_info["user"]["private_dir"] = $phpgw_info["server"]["files_dir"] . "/users/"