diff --git a/api/src/Etemplate/Widget/Select.php b/api/src/Etemplate/Widget/Select.php index d2c613556b..4d03db5832 100644 --- a/api/src/Etemplate/Widget/Select.php +++ b/api/src/Etemplate/Widget/Select.php @@ -174,7 +174,7 @@ class Select extends Etemplate\Widget { case 'select-account': // If in allowed options, skip account check to support app-specific options - if(count($allowed) > 0 && in_array($val,$allowed)) continue; + if(count($allowed) > 0 && in_array($val, $allowed)) continue 2; // +1 for switch // validate accounts independent of options know to server $account_type = $this->attrs['account_type'] ? $this->attrs['account_type'] : 'accounts'; diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index b03b61e022..d8fd5da112 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -542,7 +542,7 @@ class calendar_ical extends calendar_boupdate break; case 'CLASS': - if ($event['public']) continue; // public is default, no need to export, fails CalDAVTester if added as default + if ($event['public']) continue 2; // public is default, no need to export, fails CalDAVTester if added as default $attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE'; // Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!) if (!$event['public'] && $this->productManufacturer == 'groupdav') @@ -689,7 +689,7 @@ class calendar_ical extends calendar_boupdate break; case 'PRIORITY': - if (!$event['priority']) continue; // 0=undefined is default, no need to export, fails CalDAVTester if our default is added + if (!$event['priority']) continue 2; // 0=undefined is default, no need to export, fails CalDAVTester if our default is added if ($this->productManufacturer == 'funambol' && (strpos($this->productName, 'outlook') !== false || strpos($this->productName, 'pocket pc') !== false)) @@ -703,7 +703,7 @@ class calendar_ical extends calendar_boupdate break; case 'TRANSP': - if (!$event['non_blocking']) continue; // OPAQUE is default, no need to export, fails CalDAVTester if added as default + if (!$event['non_blocking']) continue 2; // OPAQUE is default, no need to export, fails CalDAVTester if added as default if ($version == '1.0') { $attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0); @@ -822,7 +822,7 @@ class calendar_ical extends calendar_boupdate } //Horde::logMessage("vCalendar $icalFieldName omitted due to maximum size $size", // __FILE__, __LINE__, PEAR_LOG_WARNING); - continue; // skip field + continue 2; // skip field } // truncate the value to size $value = substr($value, 0, $size - 1); @@ -1301,7 +1301,7 @@ class calendar_ical extends calendar_boupdate switch ($key) { case 'participants_types': - continue; + continue 2; // +1 for switch case 'participants': foreach ($event_info['stored_event']['participants'] as $uid => $status) @@ -2848,11 +2848,11 @@ class calendar_ical extends calendar_boupdate } $status = 'U'; // keep the group } - else continue; // can't find this group + else continue 2; // can't find this group } elseif (empty($searcharray)) { - continue; // participants without email AND CN --> ignore it + continue 2; // participants without email AND CN --> ignore it } elseif ((list($data) = $this->addressbook->search($searcharray, array('id','egw_addressbook.account_id as account_id','n_fn'), diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php index d9f43dd0d9..e06c114d62 100644 --- a/calendar/inc/class.calendar_so.inc.php +++ b/calendar/inc/class.calendar_so.inc.php @@ -2888,42 +2888,42 @@ ORDER BY cal_user_type, cal_usre_id if ($status != 'U') { unset($participants[$uid]); - continue; + continue 2; // +1 for switch } break; case 'accepted': if ($status != 'A') { unset($participants[$uid]); - continue; + continue 2; // +1 for switch } break; case 'tentative': if ($status != 'T') { unset($participants[$uid]); - continue; + continue 2; // +1 for switch } break; case 'rejected': if ($status != 'R') { unset($participants[$uid]); - continue; + continue 2; // +1 for switch } break; case 'delegated': if ($status != 'D') { unset($participants[$uid]); - continue; + continue 2; // +1 for switch } break; case 'default': if ($status == 'R') { unset($participants[$uid]); - continue; + continue 2; // +1 for switch } break; default: diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php index 0386c35a27..ed57f45271 100644 --- a/calendar/inc/class.calendar_uilist.inc.php +++ b/calendar/inc/class.calendar_uilist.inc.php @@ -768,7 +768,7 @@ class calendar_uilist extends calendar_ui if(!$event) { $failed++; - continue; + continue 2; // +1 for switch } $timesheet = array( 'ts_title' => $event['title'], diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php index 55b332c2f4..6578e9b6d4 100644 --- a/infolog/inc/class.infolog_bo.inc.php +++ b/infolog/inc/class.infolog_bo.inc.php @@ -2049,7 +2049,7 @@ class infolog_bo . '()[location mismatch]: ' . $infoData['info_location'] . ' <> ' . $egwData['info_location']); } - continue; + continue 2; // +1 for switch } default: if (!empty($egwData['info_des'])) @@ -2066,7 +2066,7 @@ class infolog_bo . '()[description mismatch]: ' . $infoData['info_des'] . ' <> ' . $egwData['info_des']); } - continue; + continue 2; // +1 for switch } // no further criteria to match $foundInfoLogs[$egwData['info_id']] = $egwData['info_id']; diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php index 353bf3bb09..d37de7d0f7 100644 --- a/infolog/inc/class.infolog_so.inc.php +++ b/infolog/inc/class.infolog_so.inc.php @@ -852,7 +852,7 @@ class infolog_so { case 'info_responsible': $data = (int) $data; - if (!$data) continue; + if (!$data) continue 2; // +1 for switch $filtermethod .= ' AND ('.$this->responsible_filter($data)." OR $this->users_table.account_id IS NULL AND ". $this->db->expression($this->info_table,array( 'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data,true)