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

Fixed functions.inc.php being included instead of the apps functions.inc.php file

Browse Source
This commit is contained in:
jengo 2001-02-06 14:11:44 +00:00
parent b161971275
commit 58bb2a282f
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
phpgwapi/inc/class.common.inc.php
View File

@ -333,25 +333,27 @@
} }
} }
function get_inc_dir($appname = ""){ function get_inc_dir($appname = "")
global $phpgw_info; {
if (! $appname){ global $phpgw_info;
$appname = $phpgw_info["flags"]["currentapp"];
} if (! $appname){
if ($appname == "home" || $appname == "logout" || $appname == "login") { $appname = $phpgw_info["flags"]["currentapp"];
$appname = "phpgwapi"; }
} if ($appname == "home" || $appname == "logout" || $appname == "login") {
$appname = "phpgwapi";
$incdir = PHPGW_INCLUDE_ROOT . "/" . $appname . "/inc"; }
$incdir_default = PHPGW_SERVER_ROOT . "/" . $appname . "/inc";
$incdir = PHPGW_INCLUDE_ROOT . "/" . $appname . "/inc";
if (is_dir ($incdir)){ $incdir_default = PHPGW_SERVER_ROOT . "/" . $appname . "/inc";
return $incdir;
}elseif (is_dir ($incdir_default)){ if (is_dir ($incdir)) {
return $incdir_default; return $incdir;
}else{ } elseif (is_dir ($incdir_default)) {
return False; return $incdir_default;
} } else {
return False;
}
} }
function list_themes() function list_themes()
@ -486,7 +488,7 @@
$phpgw_info["navbar"][$permission[0]]["title"] = $phpgw_info["apps"][$permission[0]]["title"]; $phpgw_info["navbar"][$permission[0]]["title"] = $phpgw_info["apps"][$permission[0]]["title"];
$phpgw_info["navbar"][$permission[0]]["url"] = $phpgw->link($phpgw_info["server"]["webserver_url"] $phpgw_info["navbar"][$permission[0]]["url"] = $phpgw->link($phpgw_info["server"]["webserver_url"]
. "/" . $permission[0] . "/index.php"); . "/" . $permission[0] . "/index.php");
$icon_file = $phpgw_info["server"]["server_root"]."/".$permission[0] . "/templates/". $phpgw_info["server"]["template_set"]. "/images/navbar.gif"; $icon_file = PHPGW_SERVER_ROOT . "/".$permission[0] . "/templates/". $phpgw_info["server"]["template_set"]. "/images/navbar.gif";
if (file_exists($icon_file)){ if (file_exists($icon_file)){
$phpgw_info["navbar"][$permission[0]]["icon"] = $phpgw_info["server"]["webserver_url"] . "/" $phpgw_info["navbar"][$permission[0]]["icon"] = $phpgw_info["server"]["webserver_url"] . "/"
. $permission[0] . "/templates/" . $phpgw_info["server"]["template_set"] . "/images/navbar.gif"; . $permission[0] . "/templates/" . $phpgw_info["server"]["template_set"] . "/images/navbar.gif";

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

@ -364,13 +364,12 @@
* Load the app include files if the exists * * Load the app include files if the exists *
\*************************************************************************/ \*************************************************************************/
/* Then the include file */ /* Then the include file */
if (!preg_match ("/phpgwapi/i", $phpgw_info["server"]["app_inc"]) && file_exists ($phpgw_info["server"]["app_inc"]."/functions.inc.php")){ if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && file_exists(PHPGW_APP_INC."/functions.inc.php")){
include(PHPGW_API_INC."/functions.inc.php"); include(PHPGW_APP_INC . "/functions.inc.php");
} }
if (!$phpgw_info["flags"]["noheader"] && if (!$phpgw_info["flags"]["noheader"] && ! $phpgw_info["flags"]["noappheader"] &&
!$phpgw_info["flags"]["noappheader"] && file_exists(PHPGW_APP_INC . "/header.inc.php")) {
file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) { include(PHPGW_APP_INC . "/header.inc.php");
include(PHPGW_API_INC."/header.inc.php");
} }
} }
error_reporting(7); error_reporting(7);