Request 3277 (accepted)

Overview

Request 3277 (accepted)

New release 0.4.8.3

Created by mollekopf 11 months ago
In state accepted
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit iRony

Submit package Kolab:16:Testing / iRony to package Kolab:16 / iRony

iRony.spec Changed

debian.changelog Changed

iRony-0.4.8.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php Changed

@@ -972,7 +972,8 @@
      * Checks if specified message part is a vcalendar data
      *
      * @param rcube_message_part Part object
-     * @return boolean True if part is of type vcard
+     *
+     * @return bool True if part is of type vcard
      */
     protected static function part_is_itip($part)
     {
@@ -1025,6 +1026,7 @@
      * Parse the given iCal string into a hash array kolab_format_event can handle
      *
      * @param string iCal data block
+     *
      * @return array Hash array with event properties or null on failure
      */
     private function parse_calendar_data($calendarData, $uid)
@@ -1111,7 +1113,8 @@
     /**
      * Provide basic query for kolab_storage_folder::select()
      *
-     * @param boolean Filter for inbox events (i.e. status=NEEDS-ACTION)
+     * @param bool Filter for inbox events (i.e. status=NEEDS-ACTION)
+     *
      * @return array  List of query parameters for kolab_storage_folder::select()
      */
     private function _event_filter_query($inbox = false)
@@ -1141,9 +1144,10 @@
     /**
      * Check the given event if it matches the filter
      *
-     * @param array    Hash array with event properties
-     * @param boolean  Filter for inbox events (i.e. status=NEEDS-ACTION)
-     * @return boolean True if matches, false if not
+     * @param array Hash array with event properties
+     * @param bool  Filter for inbox events (i.e. status=NEEDS-ACTION)
+     *
+     * @return bool True if matches, false if not
      */
     private function _event_filter_compare($event, $inbox = false)
     {
@@ -1153,14 +1157,14 @@
             $user_emails = $this->get_user_emails();
         }
 
-        if (is_array($event'attendees')) {
+        if (!empty($event'attendees') && is_array($event'attendees')) {
             foreach ($event'attendees' as $attendee) {
                 if (in_array($attendee'email', $user_emails)) {
                     $status = !empty($attendee'status') ? $attendee'status' : null;
                     if ($status == 'DECLINED') {
                         return false;
                     }
-                    else if ($inbox && $status == 'NEEDS-ACTION') {
+                    if ($inbox && $status == 'NEEDS-ACTION') {
                         return true;
                     }
                 }
@@ -1174,6 +1178,7 @@
      * Generate an Etag string from the given event data
      *
      * @param array Hash array with event properties from libkolab
+     *
      * @return string Etag string
      */
     private static function _get_etag($event)

iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php Changed

@@ -751,36 +751,48 @@
             }
         }
 
-        foreach ((array)$contact'email' as $email) {
-            $types = array('INTERNET');
-            if (!empty($email'type'))
-                $types = array_merge($types, explode(',', strtoupper($email'type')));
-            $vc->add('EMAIL', $email'address', array('type' => $types));
+        if (!empty($contact'email')) {
+            foreach ((array)$contact'email' as $email) {
+                $types = array('INTERNET');
+                if (!empty($email'type'))
+                    $types = array_merge($types, explode(',', strtoupper($email'type')));
+                $vc->add('EMAIL', $email'address', array('type' => $types));
+            }
         }
 
-        foreach ((array)$contact'phone' as $phone) {
-            $type = $this->phonetypes$phone'type' ?: $phone'type';
-            $params = !empty($type) ? array('type' => explode(',', strtoupper($type))) : array();
-            $vc->add('TEL', $phone'number', $params);
+        if (!empty($contact'email')) {
+            foreach ((array)$contact'phone' as $phone) {
+                $type = $this->phonetypes$phone'type' ?? $phone'type';
+                $params = !empty($type) ? array('type' => explode(',', strtoupper($type))) : array();
+                $vc->add('TEL', $phone'number', $params);
+            }
         }
 
-        foreach ((array)$contact'website' as $website) {
-            $params = !empty($website'type') ? array('type' => explode(',', strtoupper($website'type'))) : array();
-            $vc->add('URL', $website'url', $params);
+        if (!empty($contact'website')) {
+            if (!empty($contact'website')) {
+                foreach ((array)$contact'website' as $website) {
+                    $params = !empty($website'type') ? array('type' => explode(',', strtoupper($website'type'))) : array();
+                    $vc->add('URL', $website'url', $params);
+                }
+            }
         }
 
-        $improtocolmap = array_flip($this->improtocols);
-        foreach ((array)$contact'im' as $im) {
-            list($prot, $val) = explode(':', $im, 2);
-            if ($val && !$v4) $vc->add('x-' . ($improtocolmap$prot ?: $prot), $val);
-            else              $vc->add('IMPP', $im);
+        if (!empty($contact'im')) {
+            $improtocolmap = array_flip($this->improtocols);
+            foreach ((array)$contact'im' as $im) {
+                list($prot, $val) = explode(':', $im, 2);
+                if ($val && !$v4) $vc->add('x-' . ($improtocolmap$prot ?: $prot), $val);
+                else              $vc->add('IMPP', $im);
+            }
         }
 
-        foreach ((array)$contact'address' as $adr) {
-            $params = !empty($adr'type') ? array('type' => strtoupper($adr'type')) : array();
-            $vadr = $vc->create('ADR', null, $params);
-            $vadr->setParts(array('','', $adr'street', $adr'locality', $adr'region', $adr'code', $adr'country'));
-            $vc->add($vadr);
+        if (!empty($contact'address')) {
+            foreach ((array)$contact'address' as $adr) {
+                $params = !empty($adr'type') ? array('type' => strtoupper($adr'type')) : array();
+                $vadr = $vc->create('ADR', null, $params);
+                $vadr->setParts(array('','', $adr'street', $adr'locality', $adr'region', $adr'code', $adr'country'));
+                $vc->add($vadr);
+            }
         }
 
         if (!empty($contact'notes'))
@@ -821,7 +833,7 @@
             $vc->add('FBURL', $contact'freebusyurl');
         }
 
-        if (is_array($contact'lang')) {
+        if (!empty($contact'lang') && is_array($contact'lang')) {
             foreach ($contact'lang' as $value) {
                 $vc->add('LANG', $value);
             }
@@ -834,8 +846,10 @@
         }
 
         // add custom properties
-        foreach ((array)$contact'x-custom' as $prop) {
-            $vc->add($prop0, $prop1);
+        if (!empty($contact'x-custom')) {
+            foreach ((array)$contact'x-custom' as $prop) {
+                $vc->add($prop0, $prop1);
+            }
         }
 
         // send some known fields as itemN.X-AB* for Apple clients
@@ -1141,9 +1155,9 @@
     /**
      * Extract array values by a filter
      *
-     * @param array Array to filter
-     * @param keys Array or comma separated list of values to keep
-     * @param boolean Invert key selection: remove the listed values
+     * @param array        $arr     Array to filter
+     * @param array|string $values  Array or comma separated list of values to keep
+     * @param bool         $inverse Invert key selection: remove the listed values
      *
      * @return array The filtered array
      */
@@ -1153,15 +1167,15 @@
             $values = explode(',', $values);
         }
 
-        // explode single, comma-separated value
-        if (count($arr) == 1 && strpos($arr0, ',')) {
-            $arr = explode(',', $arr0);
-        }
-
         $result = array();
         $keep   = array_flip((array)$values);
 
         if (!empty($arr)) {
+            // explode single, comma-separated value
+            if (count($arr) == 1 && strpos($arr0, ',')) {
+                $arr = explode(',', $arr0);
+            }
+
             foreach ($arr as $key => $val) {
                 if ($inverse != isset($keepstrtolower($val))) {
                     $result$key = $val;

iRony-0.4.8.tar.gz/public_html/index.php Changed

iRony.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3277 0

Request History

mollekopf created request 11 months ago

New release 0.4.8.3

mollekopf accepted request 11 months ago