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

prevent iterating on empty array

Browse Source
This commit is contained in:
Christian Binder 2010-03-02 18:01:41 +00:00
parent ed106c431c
commit fcd731a00b
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1421,24 +1421,27 @@ class calendar_boupdate extends calendar_bo
} }
$cat_id_list = array(); $cat_id_list = array();
foreach ($catname_list as $cat_name) if(is_array($catname_list) && count($catname_list) > 0)
{ {
$cat_name = trim($cat_name); foreach ($catname_list as $cat_name)
$cat_id = $this->categories->name2id($cat_name, 'X-');
if (!$cat_id)
{ {
// some SyncML clients (mostly phones) add an X- to the category names $cat_name = trim($cat_name);
if (strncmp($cat_name, 'X-', 2) == 0) $cat_id = $this->categories->name2id($cat_name, 'X-');
if (!$cat_id)
{ {
$cat_name = substr($cat_name, 2); // some SyncML clients (mostly phones) add an X- to the category names
if (strncmp($cat_name, 'X-', 2) == 0)
{
$cat_name = substr($cat_name, 2);
}
$cat_id = $this->categories->add(array('name' => $cat_name, 'descr' => $cat_name, 'access' => 'private'));
} }
$cat_id = $this->categories->add(array('name' => $cat_name, 'descr' => $cat_name, 'access' => 'private'));
}
if ($cat_id) if ($cat_id)
{ {
$cat_id_list[] = $cat_id; $cat_id_list[] = $cat_id;
}
} }
} }