extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 18:12:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix from Stephen Reindl for open_restrictions error message in setup

Browse Source
This commit is contained in:
reinerj 2004-06-11 10:36:14 +00:00
parent f2c52cc197
commit 4877495957
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.setup_detection.inc.php
View File

@ -21,7 +21,7 @@
$d = dir(PHPGW_SERVER_ROOT);
while($entry=$d->read())
{
if(!ereg('setup',$entry) && is_dir(PHPGW_SERVER_ROOT . '/' . $entry))
if($entry != ".." && !ereg('setup',$entry) && is_dir(PHPGW_SERVER_ROOT . '/' . $entry))
{
$f = PHPGW_SERVER_ROOT . '/' . $entry . '/setup/setup.inc.php';
if (@file_exists ($f))

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

@ -452,7 +452,10 @@
* Load the app include files if the exists *
\*************************************************************************/
/* Then the include file */
if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && file_exists(PHPGW_APP_INC . '/functions.inc.php') && !isset($_GET['menuaction']))
if (PHPGW_APP_INC != "" &&
! preg_match ("/phpgwapi/i", PHPGW_APP_INC) &&
file_exists(PHPGW_APP_INC . '/functions.inc.php') &&
!isset($_GET['menuaction']))
{
include(PHPGW_APP_INC . '/functions.inc.php');
}