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

worked around stupid php5.2 empty haystack warnings

Browse Source
This commit is contained in:
Ralf Becker 2007-04-29 15:13:54 +00:00
parent 12f80f139b
commit 0cd6ab53b4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup/admin_account.php
View File

@ -10,7 +10,7 @@
* @version $Id$ * @version $Id$
*/ */
if (!strstr($_SERVER['PHP_SELF'],'setup-cli.php')) if (strpos($_SERVER['PHP_SELF'],'setup-cli.php') === false)
{ {
$GLOBALS['egw_info'] = array( $GLOBALS['egw_info'] = array(
'flags' => array( 'flags' => array(
@ -114,7 +114,7 @@
if (!$defaultgroupid || !$admingroupid) if (!$defaultgroupid || !$admingroupid)
{ {
if (strstr($_SERVER['PHP_SELF'],'setup-cli.php')) if (strpos($_SERVER['PHP_SELF'],'setup-cli.php') !== false)
{ {
return 42; //lang('Error in group-creation !!!'); // dont exit on setup-cli return 42; //lang('Error in group-creation !!!'); // dont exit on setup-cli
} }
@ -201,7 +201,7 @@
$accountid = $GLOBALS['egw_setup']->add_account($username,$fname,$lname,$passwd,'Admins',True,$email); $accountid = $GLOBALS['egw_setup']->add_account($username,$fname,$lname,$passwd,'Admins',True,$email);
if (!$accountid) if (!$accountid)
{ {
if (strstr($_SERVER['PHP_SELF'],'setup-cli.php')) if (strpos($_SERVER['PHP_SELF'],'setup-cli.php') !== false)
{ {
return 41; //lang('Error in admin-creation !!!'); // dont exit on setup-cli return 41; //lang('Error in admin-creation !!!'); // dont exit on setup-cli
} }
@ -214,7 +214,7 @@
$GLOBALS['egw_setup']->db->transaction_commit(); $GLOBALS['egw_setup']->db->transaction_commit();
if (!strstr($_SERVER['PHP_SELF'],'setup-cli.php')) if (strpos($_SERVER['PHP_SELF'],'setup-cli.php') === false)
{ {
Header('Location: index.php'); Header('Location: index.php');
} }

2
setup/check_install.php
View File

@ -465,7 +465,7 @@
// add a ../ for non-absolute pathes // add a ../ for non-absolute pathes
$rel_name = $name; $rel_name = $name;
if (substr($name,0,3) != '../' && $name{0} != '/' && $name{0} != '\\' && strstr($name,':') === false) if (substr($name,0,3) != '../' && $name{0} != '/' && $name{0} != '\\' && strpos($name,':') === false)
{ {
$name = '../'.$name; $name = '../'.$name;
} }

2
setup/setup-cli.php
View File

@ -815,7 +815,7 @@ function _set_value(&$arr,$index,$name,$value)
{ {
$var =& $var[$name]; $var =& $var[$name];
} }
$var = strstr($name,'passw') ? md5($value) : $value; $var = strpos($name,'passw') !== false ? md5($value) : $value;
} }
/** /**