EGroupware /
egroupware
| @@ 2078-2096 (lines=19) @@ | ||
| 2075 | } |
|
| 2076 | ||
| 2077 | $cat_id_list = array(); |
|
| 2078 | foreach ((array)$catname_list as $cat_name) |
|
| 2079 | { |
|
| 2080 | $cat_name = trim($cat_name); |
|
| 2081 | $cat_id = $this->categories->name2id($cat_name, 'X-'); |
|
| 2082 | if (!$cat_id) |
|
| 2083 | { |
|
| 2084 | // some SyncML clients (mostly phones) add an X- to the category names |
|
| 2085 | if (strncmp($cat_name, 'X-', 2) == 0) |
|
| 2086 | { |
|
| 2087 | $cat_name = substr($cat_name, 2); |
|
| 2088 | } |
|
| 2089 | $cat_id = $this->categories->add(array('name' => $cat_name, 'descr' => $cat_name, 'access' => 'private')); |
|
| 2090 | } |
|
| 2091 | ||
| 2092 | if ($cat_id) |
|
| 2093 | { |
|
| 2094 | $cat_id_list[] = $cat_id; |
|
| 2095 | } |
|
| 2096 | } |
|
| 2097 | ||
| 2098 | if (is_array($old_cats_preserve) && count($old_cats_preserve) > 0) |
|
| 2099 | { |
|
| @@ 1494-1513 (lines=20) @@ | ||
| 1491 | } |
|
| 1492 | ||
| 1493 | $cat_id_list = array(); |
|
| 1494 | foreach ((array)$catname_list as $cat_name) |
|
| 1495 | { |
|
| 1496 | $cat_name = trim($cat_name); |
|
| 1497 | $cat_id = $this->categories->name2id($cat_name, 'X-'); |
|
| 1498 | ||
| 1499 | if (!$cat_id) |
|
| 1500 | { |
|
| 1501 | // some SyncML clients (mostly phones) add an X- to the category names |
|
| 1502 | if (strncmp($cat_name, 'X-', 2) == 0) |
|
| 1503 | { |
|
| 1504 | $cat_name = substr($cat_name, 2); |
|
| 1505 | } |
|
| 1506 | $cat_id = $this->categories->add(array('name' => $cat_name, 'descr' => $cat_name, 'access' => 'private')); |
|
| 1507 | } |
|
| 1508 | ||
| 1509 | if ($cat_id) |
|
| 1510 | { |
|
| 1511 | $cat_id_list[] = $cat_id; |
|
| 1512 | } |
|
| 1513 | } |
|
| 1514 | ||
| 1515 | if (count($old_cats_preserve) > 0) |
|
| 1516 | { |
|
| @@ 2110-2129 (lines=20) @@ | ||
| 2107 | } |
|
| 2108 | ||
| 2109 | $cat_id_list = array(); |
|
| 2110 | foreach ((array)$catname_list as $cat_name) |
|
| 2111 | { |
|
| 2112 | $cat_name = trim($cat_name); |
|
| 2113 | $cat_id = $this->categories->name2id($cat_name, 'X-'); |
|
| 2114 | ||
| 2115 | if (!$cat_id) |
|
| 2116 | { |
|
| 2117 | // some SyncML clients (mostly phones) add an X- to the category names |
|
| 2118 | if (strncmp($cat_name, 'X-', 2) == 0) |
|
| 2119 | { |
|
| 2120 | $cat_name = substr($cat_name, 2); |
|
| 2121 | } |
|
| 2122 | $cat_id = $this->categories->add(array('name' => $cat_name, 'descr' => $cat_name, 'access' => 'private')); |
|
| 2123 | } |
|
| 2124 | ||
| 2125 | if ($cat_id) |
|
| 2126 | { |
|
| 2127 | $cat_id_list[] = $cat_id; |
|
| 2128 | } |
|
| 2129 | } |
|
| 2130 | ||
| 2131 | if (is_array($old_cats_preserve) && count($old_cats_preserve) > 0) |
|
| 2132 | { |
|
