holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More path fixes

Browse Source
This commit is contained in:
jengo 2001-02-06 13:49:08 +00:00
parent 7f244941f1
commit 907e34c001
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -621,19 +621,29 @@
/* First include the ordered apps hook file */ /* First include the ordered apps hook file */
reset ($order); reset ($order);
while (list (, $appname) = each ($order)){ while (list (, $appname) = each ($order)){
$f = $phpgw_info["server"]["server_root"] . "/" . $appname . "/inc/hook_".$phpgw_info["flags"]["currentapp"]; $f = PHPGW_SERVER_ROOT . "/" . $appname . "/inc/hook_".$phpgw_info["flags"]["currentapp"];
if ($location != ""){$f .= "_".$location.".inc.php";}else{$f .= ".inc.php"; } if ($location != "") {
$f .= "_".$location.".inc.php";
} else {
$f .= ".inc.php";
}
if (file_exists($f)) {include($f);} if (file_exists($f)) {include($f);}
$completed_hooks[$appname] = True; $completed_hooks[$appname] = True;
} }
/* Then add the rest */ /* Then add the rest */
reset ($phpgw_info["user"]["apps"]); reset ($phpgw_info["user"]["apps"]);
while ($permission = each($phpgw_info["user"]["apps"])) { while ($permission = each($phpgw_info["user"]["apps"])) {
if ($completed_hooks[$permission[0]] != True){ if ($completed_hooks[$permission[0]] != True){
$appname = $permission[0]; $appname = $permission[0];
$f = $phpgw_info["server"]["server_root"] . "/" . $permission[0] . "/inc/hook_".$phpgw_info["flags"]["currentapp"]; $f = PHPGW_SERVER_ROOT . "/" . $permission[0] . "/inc/hook_".$phpgw_info["flags"]["currentapp"];
if ($location != ""){$f .= "_".$location.".inc.php";}else{$f .= ".inc.php"; } if ($location != "") {
if (file_exists($f)) {include($f);} $f .= "_".$location.".inc.php";
} else {
$f .= ".inc.php";
}
if (file_exists($f)) {
include($f);
}
} }
} }
} }
@ -646,7 +656,7 @@
} }
$s = $phpgw->common->filesystem_separator(); $s = $phpgw->common->filesystem_separator();
/* First include the ordered apps hook file */ /* First include the ordered apps hook file */
$f = $phpgw_info["server"]["server_root"] . $s . $appname . $s . "inc" . $s . "hook_".$appname; $f = PHPGW_SERVER_ROOT . $s . $appname . $s . "inc" . $s . "hook_".$appname;
if ($location != "") { if ($location != "") {
$f .= "_".$location.".inc.php"; $f .= "_".$location.".inc.php";
} else { } else {
@ -665,7 +675,7 @@
$count = 0; $count = 0;
reset($phpgw_info["user"]["apps"]); reset($phpgw_info["user"]["apps"]);
while ($permission = each($phpgw_info["user"]["apps"])) { while ($permission = each($phpgw_info["user"]["apps"])) {
$f = $phpgw_info["server"]["server_root"] . "/" . $permission[0] . "/inc/hook_".$phpgw_info["flags"]["currentapp"]; $f = PHPGW_SERVER_ROOT . "/" . $permission[0] . "/inc/hook_".$phpgw_info["flags"]["currentapp"];
if ($location != ""){$f .= "_".$location.".inc.php";}else{$f .= ".inc.php"; } if ($location != ""){$f .= "_".$location.".inc.php";}else{$f .= ".inc.php"; }
if (file_exists($f)) {++$count;} if (file_exists($f)) {++$count;}
} }
@ -931,11 +941,9 @@
// This will return a list of functions in the API // This will return a list of functions in the API
function debug_list_core_functions() function debug_list_core_functions()
{ {
global $phpgw_info;
echo "<br><b>core functions</b><br>"; echo "<br><b>core functions</b><br>";
echo "<pre>"; echo "<pre>";
chdir($phpgw_info["server"]["include_root"]."/phpgwapi"); chdir(PHPGW_INCLUDE_ROOT . "/phpgwapi");
system("grep -r '^[ \t]*function' *"); system("grep -r '^[ \t]*function' *");
echo "</pre>"; echo "</pre>";
} }