extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups for warning messages.

Browse Source
This commit is contained in:
skeeter 2001-06-17 16:55:04 +00:00
parent 6ebdeeb1eb
commit 7e3a1199e6
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/inc/class.datetime.inc.php
View File

@ -25,9 +25,9 @@
/* $Id$ */ /* $Id$ */
$d1 = strtolower(substr($phpgw_info['server']['api_inc'],0,3)); $d1 = strtolower(@substr(PHPGW_API_INC,0,3));
$d2 = strtolower(substr($phpgw_info['server']['server_root'],0,3)); $d2 = strtolower(@substr(PHPGW_SERVER_ROOT,0,3));
$d3 = strtolower(substr($phpgw_info['server']['app_inc'],0,3)); $d3 = strtolower(@substr(PHPGW_APP_INC,0,3));
if($d1 == 'htt' || $d1 == 'ftp' || $d2 == 'htt' || $d2 == 'ftp' || $d3 == 'htt' || $d3 == 'ftp') if($d1 == 'htt' || $d1 == 'ftp' || $d2 == 'htt' || $d2 == 'ftp' || $d3 == 'htt' || $d3 == 'ftp')
{ {
echo 'Failed attempt to break in via an old Security Hole!<br>'."\n"; echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";

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

@ -120,7 +120,7 @@
{ {
global $HTTP_ENV_VARS; global $HTTP_ENV_VARS;
$iis = strpos($HTTP_ENV_VARS["SERVER_SOFTWARE"], "IIS", 0); $iis = @strpos($HTTP_ENV_VARS["SERVER_SOFTWARE"], "IIS", 0);
if ( !$url ) { if ( !$url ) {
$url = $PHP_SELF; $url = $PHP_SELF;

10
phpgwapi/inc/class.sessions.inc.php
View File

@ -97,7 +97,7 @@
$login_array = explode('@', $db->f('session_lid')); $login_array = explode('@', $db->f('session_lid'));
$this->account_lid = $login_array[0]; $this->account_lid = $login_array[0];
if ($login_array[1] != '') if (@$login_array[1] != '')
{ {
$this->account_domain = $login_array[1]; $this->account_domain = $login_array[1];
} }
@ -112,7 +112,7 @@
$phpgw_info['flags'] = $phpgw_info_flags; $phpgw_info['flags'] = $phpgw_info_flags;
$userid_array = explode('@',$db->f('session_lid')); $userid_array = explode('@',$db->f('session_lid'));
// Thinking this might solve auth_http problems // Thinking this might solve auth_http problems
if($userid_array[1] == '') { $userid_array[1] = 'default'; } if(@$userid_array[1] == '') { $userid_array[1] = 'default'; }
$this->account_lid = $userid_array[0]; $this->account_lid = $userid_array[0];
$this->update_dla(); $this->update_dla();
$this->account_id = $phpgw->accounts->name2id($this->account_lid); $this->account_id = $phpgw->accounts->name2id($this->account_lid);
@ -347,7 +347,7 @@
$this->user['account_id'] = $this->account_id; $this->user['account_id'] = $this->account_id;
$this->user['account_lid'] = $this->account_lid; $this->user['account_lid'] = $this->account_lid;
$this->user['userid'] = $this->account_lid; $this->user['userid'] = $this->account_lid;
$this->user['passwd'] = $this->passwd; $this->user['passwd'] = @$this->passwd;
$this->hooks = $phpgw->hooks->read(); $this->hooks = $phpgw->hooks->read();
} }
@ -533,9 +533,9 @@
} }
else else
{ {
$url .= '?sessionid=' . $phpgw_info['user']['sessionid']; $url .= '?sessionid=' . @$phpgw_info['user']['sessionid'];
$url .= '&kp3=' . $kp3; $url .= '&kp3=' . $kp3;
$url .= '&domain=' . $phpgw_info['user']['domain']; $url .= '&domain=' . @$phpgw_info['user']['domain'];
// This doesn't belong in the API. // This doesn't belong in the API.
// Its up to the app to pass this value. (jengo) // Its up to the app to pass this value. (jengo)
// Putting it into the app requires a massive number of updates in email app. // Putting it into the app requires a massive number of updates in email app.

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

@ -107,7 +107,7 @@
{ {
if ($default_id == '') if ($default_id == '')
{ {
return $phpgw_info['user']['account_id']; return (isset($phpgw_info['user']['account_id'])?$phpgw_info['user']['account_id']:0);
} }
elseif (gettype($default_id) == 'string') elseif (gettype($default_id) == 'string')
{ {
@ -215,7 +215,7 @@
} }
} }
if (isset($phpgw_domain[$phpgw_info['user']['domain']])) if (@isset($phpgw_domain[$phpgw_info['user']['domain']]))
{ {
$phpgw_info['server']['db_host'] = $phpgw_domain[$phpgw_info['user']['domain']]['db_host']; $phpgw_info['server']['db_host'] = $phpgw_domain[$phpgw_info['user']['domain']]['db_host'];
$phpgw_info['server']['db_name'] = $phpgw_domain[$phpgw_info['user']['domain']]['db_name']; $phpgw_info['server']['db_name'] = $phpgw_domain[$phpgw_info['user']['domain']]['db_name'];
@ -238,7 +238,7 @@
} }
unset ($domain); // we kill this to save memory unset ($domain); // we kill this to save memory
print_debug('domain: '.$phpgw_info['user']['domain']); @print_debug('domain: '.$phpgw_info['user']['domain']);
/****************************************************************************\ /****************************************************************************\
* These lines load up the API, fill up the $phpgw_info array, etc * * These lines load up the API, fill up the $phpgw_info array, etc *
@ -308,7 +308,7 @@
{ {
if ($phpgw_info['flags']['currentapp'] == 'login') if ($phpgw_info['flags']['currentapp'] == 'login')
{ {
if ($login != '') if (@$login != '')
{ {
$login_array = explode("@",$login); $login_array = explode("@",$login);
$login_id = $phpgw->accounts->name2id($login_array[0]); $login_id = $phpgw->accounts->name2id($login_array[0]);
@ -337,7 +337,7 @@
define('PHPGW_APP_INC', $phpgw->common->get_inc_dir()); define('PHPGW_APP_INC', $phpgw->common->get_inc_dir());
define('PHPGW_APP_TPL', $phpgw->common->get_tpl_dir()); define('PHPGW_APP_TPL', $phpgw->common->get_tpl_dir());
define('PHPGW_IMAGES', $phpgw->common->get_image_path()); define('PHPGW_IMAGES', $phpgw->common->get_image_path());
define('PHPGW_IMAGES_DIR', $phpgw->common->get_image_dir()); define('PHPGW_APP_IMAGES_DIR', $phpgw->common->get_image_dir());
define('PHPGW_ACL_READ',1); define('PHPGW_ACL_READ',1);
define('PHPGW_ACL_ADD',2); define('PHPGW_ACL_ADD',2);
define('PHPGW_ACL_EDIT',4); define('PHPGW_ACL_EDIT',4);