extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-19 08:26:52 +02:00
Code Issues 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 14:25:19 +00:00
parent d1d4e02aad
commit e11b8e5e32
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/inc/class.boetemplate.inc.php
View File

@ -210,7 +210,7 @@
} }
$Ok = False; $Ok = False;
$pat = $org_idx; $pat = $org_idx;
while (!$Ok && ($pat = @strstr($pat,'$'))) while (!$Ok && ($pat = strpos($pat,'$') !== false))
{ {
$pat = substr($pat,$pat[1] == '{' ? 2 : 1); $pat = substr($pat,$pat[1] == '{' ? 2 : 1);

2
etemplate/inc/class.db_tools.inc.php
View File

@ -769,7 +769,7 @@
} }
else // add the tables array else // add the tables array
{ {
if (strstr($fnew,'?>')) // remove a closeing tag if (strpos($fnew,'?>') !== false) // remove a closeing tag
{ {
$fnew = str_replace('?>','',$fnew); $fnew = str_replace('?>','',$fnew);
} }

2
etemplate/inc/class.so_sql.inc.php
View File

@ -328,7 +328,7 @@ class so_sql
{ {
foreach($query as $col => $val) foreach($query as $col => $val)
{ {
if (is_int($col) || strstr($join,$col) === false) continue; if (is_int($col) || strpos($join,$col) === false) continue;
$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val)); $query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
unset($query[$col]); unset($query[$col]);
} }

4
etemplate/inc/class.soetemplate.inc.php
View File

@ -972,7 +972,7 @@
{ {
if (($keys['name'] != $last['name'] || // write only newest version if (($keys['name'] != $last['name'] || // write only newest version
$keys['template'] != $last['template']) && $keys['template'] != $last['template']) &&
!strstr($keys['name'],'test')) strpos($keys['name'],'test') === false)
{ {
$tpl->read($keys); $tpl->read($keys);
$to_trans += $tpl->getToTranslate(); $to_trans += $tpl->getToTranslate();
@ -1340,7 +1340,7 @@
foreach($strings as $str) foreach($strings as $str)
{ {
if (strlen($str) > 1 && $str{0} != '@' && $str{0} != '$' && if (strlen($str) > 1 && $str{0} != '@' && $str{0} != '$' &&
strstr($str,'$row') === false && strstr($str,'$cont') === false) strpos($str,'$row') === false && strpos($str,'$cont') === false)
{ {
$to_trans[trim(strtolower($str))] = $str; $to_trans[trim(strtolower($str))] = $str;
} }

6
etemplate/inc/class.tab_widget.inc.php
View File

@ -89,13 +89,13 @@
$tab_widget =& new etemplate('etemplate.tab_widget'); $tab_widget =& new etemplate('etemplate.tab_widget');
$tab_widget->no_onclick = true; $tab_widget->no_onclick = true;
if ($value && !strstr($value,'.')) if ($value && strpos($value,'.') === false)
{ {
$value = $tmpl->name . '.' . $value; $value = $tmpl->name . '.' . $value;
} }
foreach($names as $k => $name) foreach($names as $k => $name)
{ {
if (!strstr($name,'.')) if (strpos($name,'.') === false)
{ {
$name = $names[$k] = $tmpl->name . '.' . $name; $name = $names[$k] = $tmpl->name . '.' . $name;
} }
@ -112,7 +112,7 @@
foreach($names as $k => $name) foreach($names as $k => $name)
{ {
if (!strstr($name,'.')) if (strpos($name,'.') === false)
{ {
$name = $names[$k] = $tmpl->name . '.' . $name; $name = $names[$k] = $tmpl->name . '.' . $name;
} }

8
etemplate/inc/class.xmltool.inc.php
View File

@ -304,8 +304,8 @@
if($this->data_type != 'node') if($this->data_type != 'node')
{ {
$found_at = strstr($this->data,'PHP_SERIALIZED_OBJECT&:'); $found_at = strpos($this->data,'PHP_SERIALIZED_OBJECT&:');
if($found_at != False) if($found_at !== False)
{ {
return unserialize(str_replace ('PHP_SERIALIZED_OBJECT&:', '', $this->data)); return unserialize(str_replace ('PHP_SERIALIZED_OBJECT&:', '', $this->data));
} }
@ -359,8 +359,8 @@
$retval['attributes'] = $this->attributes; $retval['attributes'] = $this->attributes;
if($this->data_type != 'node') if($this->data_type != 'node')
{ {
$found_at = strstr($this->data,'PHP_SERIALIZED_OBJECT&:'); $found_at = strpos($this->data,'PHP_SERIALIZED_OBJECT&:');
if($found_at != False) if($found_at !== False)
{ {
$retval['value'] = unserialize(str_replace ('PHP_SERIALIZED_OBJECT&:', '', $this->data)); $retval['value'] = unserialize(str_replace ('PHP_SERIALIZED_OBJECT&:', '', $this->data));
} }