Fixed some more php53 Warnings after latest fix_depricated.php

improvment.
This commit is contained in:
Ralf Becker 2010-03-21 09:37:52 +00:00
parent 40168aca6a
commit 71960a6d02
12 changed files with 17 additions and 17 deletions

View File

@ -31,7 +31,7 @@
while (list(,$value) = @each($values))
{
if (ereg('@',$value['session_lid']))
if (strpos($value['session_lid'],'@') !== false)
{
$t = explode('@',$value['session_lid']);
$session_lid = $t[0];

View File

@ -94,7 +94,7 @@
if(isset($_REQUEST['query']))
{
// limit query to limit characters
//if(eregi('^[a-z_0-9]+$',$_REQUEST['query']))
//if(preg_match('/^[a-z_0-9]+$/i',$_REQUEST['query']))
$GLOBALS['query'] = $_REQUEST['query'];
}

View File

@ -442,7 +442,7 @@ case 'import':
// convert german DD.MM.YYYY format into ISO YYYY-MM-DD format
$values[$date] = preg_replace('/([0-9]{1,2}).([0-9]{1,2}).([0-9]{4})/','\3-\2-\1',$values[$date]);
// remove fractures of seconds if present at the end of the string
if (ereg('(.*)\.[0-9]+',$values[$date],$parts)) $values[$date] = $parts[1];
if (preg_match('/(.*)\.[0-9]+/',$values[$date],$parts)) $values[$date] = $parts[1];
$values[$date] = strtotime($values[$date]);
}
}

View File

@ -216,7 +216,7 @@ class module_calendar_list extends Module
{
$is_group = false;
$has_read_permissions = false;
$acl =& new acl($entry['account_id']);
$acl = new acl($entry['account_id']);
$acl->read_repository();
// get the rights for each account to check whether the anon user has read permissions.
$rights = $acl->get_rights($anon_user,'calendar');
@ -272,8 +272,8 @@ class module_calendar_list extends Module
{
$html = "";
$GLOBALS['egw']->translation->add_app('calendar');
$this->bo =& new calendar_bo();
$this->ui =& new calendar_uiviews();
$this->bo = new calendar_bo();
$this->ui = new calendar_uiviews();
$this->ui->allowEdit = false;
$this->ui->use_time_grid = isset($arguments['grid']) ? $arguments['grid'] : false;

View File

@ -46,7 +46,7 @@ class module_calendar_month extends Module
function module_calendar_month()
{
$this->bo =& new calendar_bo();
$this->bo = new calendar_bo();
$this->arguments = array(
'category' => array(
'type' => 'select',
@ -166,7 +166,7 @@ class module_calendar_month extends Module
{
$is_group = false;
$has_read_permissions = false;
$acl =& new acl($entry['account_id']);
$acl = new acl($entry['account_id']);
$acl->read_repository();
// get the rights for each account to check whether the anon user has read permissions.
$rights = $acl->get_rights($anon_user,'calendar');
@ -222,7 +222,7 @@ class module_calendar_month extends Module
{
$html = "";
$GLOBALS['egw']->translation->add_app('calendar');
$this->ui =& new calendar_uiviews();
$this->ui = new calendar_uiviews();
$this->ui->allowEdit = false;
$this->ui->use_time_grid = isset($arguments['grid']) ? $arguments['grid'] : false;

View File

@ -62,7 +62,7 @@ class ajax_captcha_widget
//sets main etemplate cell with data created in etemplate.captcha_widget
$cell['type'] = 'template';
$cell['size'] = $cell['name'];
$widget =& new etemplate('etemplate.captcha_widget');
$widget = new etemplate('etemplate.captcha_widget');
$widget->no_onclick = True;
$cell['obj'] = &$widget;

View File

@ -466,7 +466,7 @@ case 'import':
{
if (isset($values[$date]) && !is_numeric($date))
{
if (ereg('(.*)\.[0-9]+',$values[$date],$parts)) $values[$date] = $parts[1];
if (preg_match('/(.*)\.[0-9]+/',$values[$date],$parts)) $values[$date] = $parts[1];
$values[$date] = strtotime($values[$date]);
}
}

View File

@ -618,7 +618,7 @@ class PHPMailer {
/* Retry while there is no connection */
while($index < count($hosts) && $connection == false) {
$hostinfo = array();
if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
if(preg_match('/^(.+):([0-9]+)$/i', $hosts[$index], $hostinfo)) {
$host = $hostinfo[1];
$port = $hostinfo[2];
} else {

View File

@ -144,7 +144,7 @@
if(@$uris[$url_elements['scheme']])
{
//echo ' is valid<br>host ' . $url_elements['host'];
if(eregi("[a-z]", $url_elements['host']))
if(preg_match('/[a-z]/i', $url_elements['host']))
{
//echo ' is name<br>';
return $this->is_hostname($url_elements['host']);

View File

@ -167,7 +167,7 @@ function MakeFontDescriptor($fm,$symbolic)
//StemV
if(isset($fm['StdVW']))
$stemv=$fm['StdVW'];
elseif(isset($fm['Weight']) and eregi('(bold|black)',$fm['Weight']))
elseif(isset($fm['Weight']) and preg_match('/(bold|black)/i',$fm['Weight']))
$stemv=120;
else
$stemv=70;

View File

@ -390,7 +390,7 @@
{
// we have a DOUBLE
// we must check that only 0123456789-.<space> are characters here
if (!ereg("^[+-]?[eE0123456789 \\t\\.]+$", $GLOBALS['_xh'][$parser]['ac']))
if (!preg_match('/^[+-]?[eE0123456789 \\t\\.]+$/', $GLOBALS['_xh'][$parser]['ac']))
{
// TODO: find a better way of throwing an error
// than this!
@ -407,7 +407,7 @@
{
// we have an I4/INT
// we must check that only 0123456789-<space> are characters here
if (!ereg("^[+-]?[0123456789 \\t]+$", $GLOBALS['_xh'][$parser]['ac']))
if (!preg_match('/^[+-]?[0123456789 \\t]+$/', $GLOBALS['_xh'][$parser]['ac']))
{
// TODO: find a better way of throwing an error
// than this!

View File

@ -54,7 +54,7 @@
}
$headers = getallheaders();
if(ereg('Basic',$headers['Authorization']))
if(strpos($headers['Authorization'],'Basic') !== false)
{
$tmp = $headers['Authorization'];
$tmp = str_replace(' ','',$tmp);