smtech / canvas-ics-sync

phpicalendar/lib/HTTP/CalDAV/Server.php

Spacing +12 added lines, -12 removed lines

@@ -53,7 +53,7 @@ 
      *               string property name
      *               string property value
      */
-    function calDavProp($name, $value=null, $status=null) {
+    function calDavProp($name, $value = null, $status = null) {
         return $this->mkprop('urn:ietf:params:xml:ns:caldav', $name, $value,
             $status);
     }
@@ -209,7 +209,7 @@ 
             foreach ($response['ns_hash'] as $name => $prefix) {
                 $ns_defs[] = "xmlns:$prefix=\"$name\"";
             }
-            echo ' <D:response ' . implode(' ', $ns_defs) . ">\n";
+            echo ' <D:response '.implode(' ', $ns_defs).">\n";
             echo "  <D:href>$response[href]</D:href>\n";
 
             // report all found properties and their values (if any)
@@ -236,8 +236,8 @@ 
                             }
 
                             if (!empty($prop['ns'])) {
-                                echo '    <' .
-                                    $response['ns_hash'][$prop['ns']] .
+                                echo '    <'.
+                                    $response['ns_hash'][$prop['ns']].
                                     ":$prop[name]/>\n";
                                 continue;
                             }
@@ -252,13 +252,13 @@ 
                             switch ($prop['name']) {
                             case 'creationdate':
                                 echo "    <D:creationdate ns0:dt=\"dateTime.tz\">\n";
-                                echo '     ' . gmdate('Y-m-d\TH:i:s\Z', $prop['value']) . "\n";
+                                echo '     '.gmdate('Y-m-d\TH:i:s\Z', $prop['value'])."\n";
                                 echo "    </D:creationdate>\n";
                                 break;
 
                             case 'getlastmodified':
                                 echo "    <D:getlastmodified ns0:dt=\"dateTime.rfc1123\">\n";
-                                echo '     ' . gmdate('D, d M Y H:i:s', $prop['value']) . " GMT\n";
+                                echo '     '.gmdate('D, d M Y H:i:s', $prop['value'])." GMT\n";
                                 echo "    </D:getlastmodified>\n";
                                 break;
 
@@ -290,7 +290,7 @@ 
 
                             default:
                                 echo "    <D:$prop[name]>\n";
-                                echo '     ' . $this->_prop_encode(htmlspecialchars($prop['value'])) . "\n";
+                                echo '     '.$this->_prop_encode(htmlspecialchars($prop['value']))."\n";
                                 echo "    </D:$prop[name]>\n";
                             }
 
@@ -303,15 +303,15 @@ 
                         }
 
                         if (!empty($prop['ns'])) {
-                            echo '    <' . $response['ns_hash'][$prop['ns']] . ":$prop[name]>\n";
-                            echo '     ' . $this->_prop_encode(htmlspecialchars($prop['value'])) . "\n";
-                            echo '    </' . $response['ns_hash'][$prop['ns']] . ":$prop[name]>\n";
+                            echo '    <'.$response['ns_hash'][$prop['ns']].":$prop[name]>\n";
+                            echo '     '.$this->_prop_encode(htmlspecialchars($prop['value']))."\n";
+                            echo '    </'.$response['ns_hash'][$prop['ns']].":$prop[name]>\n";
 
                             continue;
                         }
 
                         echo "    <$prop[name] xmlns=\"\">\n";
-                        echo '     ' . $this->_prop_encode(htmlspecialchars($prop['value'])) . "\n";
+                        echo '     '.$this->_prop_encode(htmlspecialchars($prop['value']))."\n";
                         echo "    </$prop[name]>\n";
                     }
 
@@ -327,7 +327,7 @@ 
 
             if (isset($response['responsedescription'])) {
                 echo "  <D:responsedescription>\n";
-                echo '   ' . $this->_prop_encode(htmlspecialchars($response['responsedescription'])) . "\n";
+                echo '   '.$this->_prop_encode(htmlspecialchars($response['responsedescription']))."\n";
                 echo "  </D:responsedescription>\n";
             }
 

phpicalendar/lib/HTTP/CalDAV/Tools/ICalendarParser.php

Spacing +2 added lines, -2 removed lines

@@ -151,7 +151,7 @@ 
      * @param resource input stream handle
      * @access public
      */
-    function ICalendarParser($handle, $offsets=null, $value=null, $filters=null)
+    function ICalendarParser($handle, $offsets = null, $value = null, $filters = null)
     {
         $this->_handle = $handle;
         $this->_offsetStack[] = $offsets;
@@ -233,7 +233,7 @@ 
             return;
         }
 
-        $class = 'iCalendar_' . ltrim(strtolower($name), 'v');
+        $class = 'iCalendar_'.ltrim(strtolower($name), 'v');
         if ($name == 'VCALENDAR') {
             $class = 'iCalendar';
         }

phpicalendar/lib/HTTP/CalDAV/Tools/ReportParser.php

Spacing +4 added lines, -4 removed lines

@@ -171,7 +171,7 @@ 
 
             if ($name == 'calendar-data') {
                 $prop['value'] = array();
-                $this->_comps[] =& $prop['value'];
+                $this->_comps[] = & $prop['value'];
             }
 
             $this->props[] = $prop;
@@ -186,7 +186,7 @@ 
 
             $this->_comps[count($this->_comps) - 1]['comps'][$attrs['name']] =
                 array();
-            $this->_comps[] =& $this->_comps[count($this->_comps) - 1]['comps']
+            $this->_comps[] = & $this->_comps[count($this->_comps) - 1]['comps']
                 [$attrs['name']];
             $this->_names[] = $name;
             return;
@@ -203,7 +203,7 @@ 
         }
 
         if (count($this->_names) == 1 && $name == 'filter') {
-            $this->_comps[] =& $this->filters;
+            $this->_comps[] = & $this->filters;
             $this->_names[] = $name;
             return;
         }
@@ -215,7 +215,7 @@ 
 
             $this->_comps[count($this->_comps) - 1]['comps'][$attrs['name']] =
                 array();
-            $this->_comps[] =& $this->_comps[count($this->_comps) - 1]['comps']
+            $this->_comps[] = & $this->_comps[count($this->_comps) - 1]['comps']
                 [$attrs['name']];
             $this->_names[] = $name;
             return;

phpicalendar/lib/HTTP/WebDAV/Server.php

Spacing +61 added lines, -66 removed lines

@@ -100,9 +100,9 @@ 
     {
         // identify ourselves
         if (empty($this->dav_powered_by)) {
-            $this->dav_powered_by = 'PHP class: ' . get_class($this);
+            $this->dav_powered_by = 'PHP class: '.get_class($this);
         }
-        header('X-Dav-Powered-By: ' . $this->dav_powered_by);
+        header('X-Dav-Powered-By: '.$this->dav_powered_by);
 
         // set path
         if (empty($this->path)) {
@@ -131,7 +131,7 @@ 
             // but Microsoft Clients do not support Digest
             // and we don't support NTLM or Kerberos
             // so we are stuck with Basic here
-            header('WWW-Authenticate: Basic realm="' . ($this->http_auth_realm) . '"');
+            header('WWW-Authenticate: Basic realm="'.($this->http_auth_realm).'"');
 
             // Windows seems to require this being the last header sent
             // (changed according to PECL bug #3138)
@@ -141,14 +141,14 @@ 
         }
 
         // check
-        if (! $this->_check_if_header_conditions()) {
+        if (!$this->_check_if_header_conditions()) {
             $this->http_status('412 Precondition Failed');
             return;
         }
 
         // detect requested method names
         $method = strtolower($_SERVER['REQUEST_METHOD']);
-        $wrapper = $method . '_wrapper';
+        $wrapper = $method.'_wrapper';
 
         // emulate HEAD using GET if no HEAD method found
         if ($wrapper == 'head_wrapper' &&
@@ -170,7 +170,7 @@ 
         }
 
         // tell client what's allowed
-        header('Allow: ' . implode(', ', $this->_allow()));
+        header('Allow: '.implode(', ', $this->_allow()));
         $this->http_status('405 Method Not Allowed');
     }
 
@@ -437,8 +437,8 @@ 
         }
 
         // tell clients what we found
-        header('Allow: ' . implode(', ', $allow));
-        header('DAV: ' . implode(',', $dav));
+        header('Allow: '.implode(', ', $allow));
+        header('DAV: '.implode(',', $dav));
         header('Content-Length: 0');
 
         // Microsoft clients default to the Frontpage protocol
@@ -538,7 +538,7 @@ 
                     }
 
                     // register namespace
-                    $ns_hash[$prop['ns']] = 'ns' . count($ns_hash);
+                    $ns_hash[$prop['ns']] = 'ns'.count($ns_hash);
                 }
             } else if (is_array($file['props'])) {
 
@@ -572,7 +572,7 @@ 
                     }
 
                     // register namespace
-                    $ns_hash[$prop['ns']] = 'ns' . count($ns_hash);
+                    $ns_hash[$prop['ns']] = 'ns'.count($ns_hash);
                 }
             }
 
@@ -604,7 +604,7 @@ 
             foreach ($response['ns_hash'] as $name => $prefix) {
                 $ns_defs[] = "xmlns:$prefix=\"$name\"";
             }
-            echo ' <D:response ' . implode(' ', $ns_defs) . ">\n";
+            echo ' <D:response '.implode(' ', $ns_defs).">\n";
             echo "  <D:href>$response[href]</D:href>\n";
 
             // report all found properties and their values (if any)
@@ -631,8 +631,8 @@ 
                             }
 
                             if (!empty($prop['ns'])) {
-                                echo '    <' .
-                                    $response['ns_hash'][$prop['ns']] .
+                                echo '    <'.
+                                    $response['ns_hash'][$prop['ns']].
                                     ":$prop[name]/>\n";
                                 continue;
                             }
@@ -647,13 +647,13 @@ 
                             switch ($prop['name']) {
                             case 'creationdate':
                                 echo "    <D:creationdate ns0:dt=\"dateTime.tz\">\n";
-                                echo '     ' . gmdate('Y-m-d\TH:i:s\Z', $prop['value']) . "\n";
+                                echo '     '.gmdate('Y-m-d\TH:i:s\Z', $prop['value'])."\n";
                                 echo "    </D:creationdate>\n";
                                 break;
 
                             case 'getlastmodified':
                                 echo "    <D:getlastmodified ns0:dt=\"dateTime.rfc1123\">\n";
-                                echo '     ' . gmdate('D, d M Y H:i:s', $prop['value']) . " GMT\n";
+                                echo '     '.gmdate('D, d M Y H:i:s', $prop['value'])." GMT\n";
                                 echo "    </D:getlastmodified>\n";
                                 break;
 
@@ -685,7 +685,7 @@ 
 
                             default:
                                 echo "    <D:$prop[name]>\n";
-                                echo '     ' . $this->_prop_encode(htmlspecialchars($prop['value'])) . "\n";
+                                echo '     '.$this->_prop_encode(htmlspecialchars($prop['value']))."\n";
                                 echo "    </D:$prop[name]>\n";
                             }
 
@@ -693,15 +693,15 @@ 
                         }
 
                         if (!empty($prop['ns'])) {
-                            echo '    <' . $response['ns_hash'][$prop['ns']] . ":$prop[name]>\n";
-                            echo '     ' . $this->_prop_encode(htmlspecialchars($prop['value'])) . "\n";
-                            echo '    </' . $response['ns_hash'][$prop['ns']] . ":$prop[name]>\n";
+                            echo '    <'.$response['ns_hash'][$prop['ns']].":$prop[name]>\n";
+                            echo '     '.$this->_prop_encode(htmlspecialchars($prop['value']))."\n";
+                            echo '    </'.$response['ns_hash'][$prop['ns']].":$prop[name]>\n";
 
                             continue;
                         }
 
                         echo "    <$prop[name] xmlns=\"\">\n";
-                        echo '     ' . $this->_prop_encode(htmlspecialchars($prop['value'])) . "\n";
+                        echo '     '.$this->_prop_encode(htmlspecialchars($prop['value']))."\n";
                         echo "    </$prop[name]>\n";
                     }
 
@@ -717,7 +717,7 @@ 
 
             if (isset($response['responsedescription'])) {
                 echo "  <D:responsedescription>\n";
-                echo '   ' . $this->_prop_encode(htmlspecialchars($response['responsedescription'])) . "\n";
+                echo '   '.$this->_prop_encode(htmlspecialchars($response['responsedescription']))."\n";
                 echo "  </D:responsedescription>\n";
             }
 
@@ -791,7 +791,7 @@ 
      * @param responsedescr
      * @return void
      */
-    function proppatch_response_helper($options, $responsedescription=null)
+    function proppatch_response_helper($options, $responsedescription = null)
     {
         $response = array();
 
@@ -826,7 +826,7 @@ 
                 }
 
                 // register namespace
-                $ns_hash[$prop['ns']] = 'ns' . count($ns_hash);
+                $ns_hash[$prop['ns']] = 'ns'.count($ns_hash);
             }
         }
 
@@ -965,8 +965,8 @@ 
         header("Content-Type: $options[mimetype]");
 
         if (isset($options['mtime'])) {
-            header('Last-Modified:' .
-                gmdate('D, d M Y H:i:s', $options['mtime']) . 'GMT');
+            header('Last-Modified:'.
+                gmdate('D, d M Y H:i:s', $options['mtime']).'GMT');
         }
 
         if ($options['stream']) {
@@ -990,7 +990,7 @@ 
                             $size = $range['end'] - $range['start'] + 1;
                             $this->http_status('206 Partial');
                             header("Content-Length: $size");
-                            header("Content-Range: $range[start]-$range[end]/" .
+                            header("Content-Range: $range[start]-$range[end]/".
                                 (isset($options['size']) ? $options['size'] : '*'));
                             while ($size && !feof($options['stream'])) {
                                 $buffer = fread($options['stream'], 4096);
@@ -1000,9 +1000,9 @@ 
                         } else {
                             $this->http_status('206 Partial');
                             if (isset($options['size'])) {
-                                header("Content-Length: " .
+                                header("Content-Length: ".
                                     ($options['size'] - $range['start']));
-                                header("Content-Range: $start-$end/" .
+                                header("Content-Range: $start-$end/".
                                     (isset($options['size']) ? $options['size'] : '*'));
                             }
                             fpassthru($options['stream']);
@@ -1046,11 +1046,11 @@ 
 
                 fpassthru($options['stream']);
             }
-        } else if (isset($options['data']))  {
+        } else if (isset($options['data'])) {
             if (is_array($options['data'])) {
                 // reply to partial request
             } else {
-                header("Content-Length: " . strlen($options['data']));
+                header("Content-Length: ".strlen($options['data']));
                 echo $options['data'];
             }
         }
@@ -1077,10 +1077,10 @@ 
                 // init
                 // a little naive, this sequence *might* be part of the content
                 // but it's really not likely and rather expensive to check
-                $this->multipart_separator = 'SEPARATOR_' . md5(microtime());
+                $this->multipart_separator = 'SEPARATOR_'.md5(microtime());
 
                 // generate HTTP header
-                header('Content-Type: multipart/byteranges; boundary=' .
+                header('Content-Type: multipart/byteranges; boundary='.
                     $this->multipart_separator);
 
                 return;
@@ -1097,7 +1097,7 @@ 
         echo "\n--{$this->multipart_separator}\n";
         echo "Content-Type: $mimetype\n";
         echo "Content-Range: $from-$to/"
-            . ($total === false ? "*" : $total) . "\n\n";
+            . ($total === false ? "*" : $total)."\n\n";
     }
 
     // }}}
@@ -1154,8 +1154,8 @@ 
         header("Content-Type: $options[mimetype]");
 
         if (isset($options['mtime'])) {
-            header('Last-Modified:' .
-                gmdate('D, d M Y H:i:s', $options['mtime']) . 'GMT');
+            header('Last-Modified:'.
+                gmdate('D, d M Y H:i:s', $options['mtime']).'GMT');
         }
 
         if (isset($options['stream'])) {
@@ -1179,14 +1179,14 @@ 
                             $size = $range['end'] - $range['start'] + 1;
                             $this->http_status('206 Partial');
                             header("Content-Length: $size");
-                            header("Content-Range: $range[start]-$range[end]/" .
+                            header("Content-Range: $range[start]-$range[end]/".
                                 (isset($options['size']) ? $options['size'] : '*'));
                         } else {
                             $this->http_status('206 Partial');
                             if (isset($options['size'])) {
-                                header("Content-Length: " .
+                                header("Content-Length: ".
                                     ($options['size'] - $range['start']));
-                                header("Content-Range: $start-$end/" .
+                                header("Content-Range: $start-$end/".
                                     (isset($options['size']) ? $options['size'] : '*'));
                             }
                         }
@@ -1201,14 +1201,12 @@ 
                         // TODO what if size unknown? 500?
                         if (isset($range['start'])) {
                             $from = $range['start'];
-                            $to = !empty($range['end']) ? $range['end'] :
-                                $options['size'] - 1;
+                            $to = !empty($range['end']) ? $range['end'] : $options['size'] - 1;
                         } else {
                             $from = $options['size'] - $range['last'] - 1;
                             $to = $options['size'] - 1;
                         }
-                        $total = isset($options['size']) ? $options['size'] :
-                            '*';
+                        $total = isset($options['size']) ? $options['size'] : '*';
                         $size = $to - $from + 1;
                         $this->_multipart_byterange_header($options['mimetype'],
                             $from, $to, $total);
@@ -1223,11 +1221,11 @@ 
                     header("Content-Length: $options[size]");
                 }
             }
-        } else if (isset($options['data']))  {
+        } else if (isset($options['data'])) {
             if (is_array($options['data'])) {
                 // reply to partial request
             } else {
-                header("Content-Length: " . strlen($options['data']));
+                header("Content-Length: ".strlen($options['data']));
             }
         }
     }
@@ -1384,8 +1382,7 @@ 
         } else if (is_resource($status) &&
                 get_resource_type($status) == 'stream') {
             $stream = $status;
-            $status = $options['new'] === false ? '204 No Content' :
-                '201 Created';
+            $status = $options['new'] === false ? '204 No Content' : '201 Created';
 
             if (!empty($options['ranges'])) {
 
@@ -1576,8 +1573,7 @@ 
         // call user handler
         $status = $this->copy($options);
         if ($status === true) {
-            $status = $options['new'] === false ? '204 No Content' :
-                '201 Created';
+            $status = $options['new'] === false ? '204 No Content' : '201 Created';
         }
 
         $this->http_status($status);
@@ -1616,8 +1612,7 @@ 
         // call user handler
         $status = $this->move($options);
         if ($status === true) {
-            $status = $options['new'] === false ? '204 No Content' :
-                '201 Created';
+            $status = $options['new'] === false ? '204 No Content' : '201 Created';
         }
 
         $this->http_status($status);
@@ -1720,7 +1715,7 @@ 
             echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
             echo "<D:prop xmlns:D=\"DAV:\">\n";
             echo " <D:lockdiscovery>\n";
-            echo '  ' . $this->_activelocks(array($options)) . "\n";
+            echo '  '.$this->_activelocks(array($options))."\n";
             echo " </D:lockdiscovery>\n";
             echo "</D:prop>\n";
         }
@@ -1816,7 +1811,7 @@ 
 
     function getHref($path)
     {
-        return $this->base_uri . '/' . $path;
+        return $this->base_uri.'/'.$path;
     }
 
     function getProp($reqprop, $file, $options)
@@ -1875,7 +1870,7 @@ 
         // all other methods need both a method_wrapper() and a method()
         // implementation
         // the base class defines only wrappers
-        foreach(get_class_methods($this) as $method) {
+        foreach (get_class_methods($this) as $method) {
 
             // strncmp breaks with negative len -
             // http://bugs.php.net/bug.php?id=36944
@@ -1977,7 +1972,7 @@ 
         }
 
         // fallback
-        $uuid = md5(microtime() . getmypid()); // this should be random enough for now
+        $uuid = md5(microtime().getmypid()); // this should be random enough for now
 
         // set variant and version fields for 'true' random uuid
         $uuid{12} = '4';
@@ -1986,10 +1981,10 @@ 
         $uuid{16} = $hex{$n};
 
         // return formated uuid
-        return substr($uuid,  0, 8) . '-' .
-            substr($uuid,  8, 4) . '-' .
-            substr($uuid, 12, 4) . '-' .
-            substr($uuid, 16, 4) . '-' .
+        return substr($uuid, 0, 8).'-'.
+            substr($uuid, 8, 4).'-'.
+            substr($uuid, 12, 4).'-'.
+            substr($uuid, 16, 4).'-'.
             substr($uuid, 20);
     }
 
@@ -2001,7 +1996,7 @@ 
      */
     function _new_locktoken()
     {
-        return 'opaquelocktoken:' . $this->_new_uuid();
+        return 'opaquelocktoken:'.$this->_new_uuid();
     }
 
     // }}}
@@ -2123,15 +2118,15 @@ 
                         break;
 
                     case 'URI':
-                        $list[] = $not . "<$token[1]>";
+                        $list[] = $not."<$token[1]>";
                         break;
 
                     case 'ETAG_WEAK':
-                        $list[] = $not . "[W/'$token[1]']>";
+                        $list[] = $not."[W/'$token[1]']>";
                         break;
 
                     case 'ETAG_STRONG':
-                        $list[] = $not . "['$token[1]']>";
+                        $list[] = $not."['$token[1]']>";
                         break;
 
                     default:
@@ -2168,9 +2163,9 @@ 
             $this->_if_header_parser($_SERVER['HTTP_IF']);
 
         // any match is ok
-        foreach($this->_if_header_uris as $uri => $conditions) {
+        foreach ($this->_if_header_uris as $uri => $conditions) {
             if (empty($uri)) {
-                $uri = $this->base_uri . '/' . $this->path;
+                $uri = $this->base_uri.'/'.$this->path;
             }
 
             // all must match
@@ -2280,14 +2275,14 @@ 
             // check for 'timeout' or 'expires'
             $timeout = 'Infinite';
             if (!empty($lock['expires'])) {
-                $timeout = 'Second-' . ($lock['expires'] - time());
+                $timeout = 'Second-'.($lock['expires'] - time());
             } else if (!empty($lock['timeout'])) {
 
                 // more than a million is considered an absolute timestamp
                 // less is more likely a relative value
                 $timeout = "Second-$lock[timeout]";
                 if ($lock['timeout'] > 1000000) {
-                    $timeout = 'Second-' . ($lock['timeout'] - time());
+                    $timeout = 'Second-'.($lock['timeout'] - time());
                 }
             }
 

phpicalendar/lib/HTTP/WebDAV/Tools/_parse_proppatch.php

Spacing +4 added lines, -4 removed lines

@@ -101,7 +101,7 @@ 
         xml_parser_set_option($xml_parser,
                               XML_OPTION_CASE_FOLDING, false);
 
-        while($this->success && !feof($f_in)) {
+        while ($this->success && !feof($f_in)) {
             $line = fgets($f_in);
             if (is_string($line)) {
                 $had_input = true;
@@ -109,7 +109,7 @@ 
             }
         } 
         
-        if($had_input) {
+        if ($had_input) {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -146,14 +146,14 @@ 
             $prop = array("name" => $tag);
             $this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
             if ($this->mode == "set") {
-                $this->current["val"] = "";     // default set val
+                $this->current["val"] = ""; // default set val
             }
         }
 
         if ($this->depth >= 4) {
             $this->current["val"] .= "<$tag";
             foreach ($attr as $key => $val) {
-                $this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
+                $this->current["val"] .= ' '.$key.'="'.str_replace('"', '&quot;', $val).'"';
             }
             $this->current["val"] .= ">";
         }

phpicalendar/lib/HTTP/WebDAV/Tools/_parse_lockinfo.php

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 							  XML_OPTION_CASE_FOLDING, false);
 
 		// parse input
-		while($this->success && !feof($f_in)) {
+		while ($this->success && !feof($f_in)) {
 			$line = fgets($f_in);
 			if (is_string($line)) {
 				$had_input = true;
@@ -114,7 +114,7 @@ 
 		} 
 
 		// finish parsing
-		if($had_input) {
+		if ($had_input) {
 			$this->success &= xml_parse($xml_parser, "", true);
 		}
 

phpicalendar/lib/bennu/bennu.class.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 
 class Bennu {
     function timestamp_to_datetime($t = NULL) {
-        if($t === NULL) {
+        if ($t === NULL) {
             $t = time();
         }
         return gmstrftime('%Y%m%dT%H%M%SZ', $t);
@@ -30,7 +30,7 @@ 
     
         // Need another 14 random octects
         $pool = '';
-        for($i = 0; $i < 7; ++$i) {
+        for ($i = 0; $i < 7; ++$i) {
             $pool .= sprintf('%04x', mt_rand(0, 65535));
         }
     

phpicalendar/lib/bennu/iCalendar_components.php

Spacing +39 added lines, -39 removed lines

@@ -26,9 +26,9 @@ 
 
     function construct() {
         // Initialize the components array
-        if(empty($this->components)) {
+        if (empty($this->components)) {
             $this->components = array();
-            foreach($this->valid_components as $name) {
+            foreach ($this->valid_components as $name) {
                 $this->components[$name] = array();
             }
         }
@@ -45,9 +45,9 @@ 
 
         // Are we trying to add a valid property?
         $xname = false;
-        if(!isset($this->valid_properties[$name])) {
+        if (!isset($this->valid_properties[$name])) {
             // If not, is it an x-name as per RFC 2445?
-            if(!rfc2445_is_xname($name)) {
+            if (!rfc2445_is_xname($name)) {
                 return false;
             }
             // Since this is an xname, all components are supposed to allow this property
@@ -55,7 +55,7 @@ 
         }
 
         // Create a property object of the correct class
-        if($xname) {
+        if ($xname) {
             $property = new iCalendar_property_x;
             $property->set_name($name);
         }
@@ -65,9 +65,9 @@ 
         }
 
         // If $value is NULL, then this property must define a default value.
-        if($value === NULL) {
+        if ($value === NULL) {
             $value = $property->default_value();
-            if($value === NULL) {
+            if ($value === NULL) {
                 return false;
             }
         }
@@ -80,27 +80,27 @@ 
         // accept a VALUE parameter, and thus change their default value type.
 
         // The parameters must be valid according to property specifications
-        if(!empty($parameters)) {
-            foreach($parameters as $paramname => $paramvalue) {
-                if(!$property->set_parameter($paramname, $paramvalue)) {
+        if (!empty($parameters)) {
+            foreach ($parameters as $paramname => $paramvalue) {
+                if (!$property->set_parameter($paramname, $paramvalue)) {
                     return false;
                 }
             }
 
             // Some parameters interact among themselves (e.g. ENCODING and VALUE)
             // so make sure that after the dust settles, these invariants hold true
-            if(!$property->invariant_holds()) {
+            if (!$property->invariant_holds()) {
                 return false;
             }
         }
 
         // $value MUST be valid according to the property data type
-        if(!$property->set_value($value)) {
+        if (!$property->set_value($value)) {
             return false;
         }
 
         // If this property is restricted to only once, blindly overwrite value
-        if(!$xname && $this->valid_properties[$name] & RFC2445_ONCE) {
+        if (!$xname && $this->valid_properties[$name] & RFC2445_ONCE) {
             $this->properties[$name] = array($property);
         }
 
@@ -110,10 +110,10 @@ 
         }
 
         // Finally: after all these, does the component invariant hold?
-        if(!$this->invariant_holds()) {
+        if (!$this->invariant_holds()) {
             // If not, completely undo the property addition
             array_pop($this->properties[$name]);
-            if(empty($this->properties[$name])) {
+            if (empty($this->properties[$name])) {
                 unset($this->properties[$name]);
             }
             return false;
@@ -126,14 +126,14 @@ 
     function add_component($component) {
 
         // With the detailed interface, you can add only components with this function
-        if(!is_object($component) || !is_subclass_of($component, 'iCalendar_component')) {
+        if (!is_object($component) || !is_subclass_of($component, 'iCalendar_component')) {
             return false;
         }
 
         $name = $component->get_name();
 
         // Only valid components as specified by this component are allowed
-        if(!in_array($name, $this->valid_components)) {
+        if (!in_array($name, $this->valid_components)) {
             return false;
         }
 
@@ -152,10 +152,10 @@ 
 
     function is_valid() {
         // If we have any child components, check that they are all valid
-        if(!empty($this->components)) {
-            foreach($this->components as $component => $instances) {
-                foreach($instances as $number => $instance) {
-                    if(!$instance->is_valid()) {
+        if (!empty($this->components)) {
+            foreach ($this->components as $component => $instances) {
+                foreach ($instances as $number => $instance) {
+                    if (!$instance->is_valid()) {
                         return false;
                     }
                 }
@@ -164,11 +164,11 @@ 
 
         // Finally, check the valid property list for any mandatory properties
         // that have not been set and do not have a default value
-        foreach($this->valid_properties as $property => $propdata) {
-            if(($propdata & RFC2445_REQUIRED) && empty($this->properties[$property])) {
+        foreach ($this->valid_properties as $property => $propdata) {
+            if (($propdata & RFC2445_REQUIRED) && empty($this->properties[$property])) {
                 $classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $property));
                 $object    = new $classname;
-                if($object->default_value() === NULL) {
+                if ($object->default_value() === NULL) {
                     return false;
                 }
                 unset($object);
@@ -180,28 +180,28 @@ 
     
     function serialize() {
         // Start tag
-        $string = rfc2445_fold('BEGIN:'.$this->name) . RFC2445_CRLF;
+        $string = rfc2445_fold('BEGIN:'.$this->name).RFC2445_CRLF;
 
         // List of properties
-        if(!empty($this->properties)) {
-            foreach($this->properties as $name => $properties) {
-                foreach($properties as $property) {
+        if (!empty($this->properties)) {
+            foreach ($this->properties as $name => $properties) {
+                foreach ($properties as $property) {
                     $string .= $property->serialize();
                 }
             }
         }
 
         // List of components
-        if(!empty($this->components)) {
-            foreach($this->components as $name => $components) {
-                foreach($components as $component) {
+        if (!empty($this->components)) {
+            foreach ($this->components as $name => $components) {
+                foreach ($components as $component) {
                     $string .= $component->serialize();
                 }
             }
         }
 
         // End tag
-        $string .= rfc2445_fold('END:'.$this->name) . RFC2445_CRLF;
+        $string .= rfc2445_fold('END:'.$this->name).RFC2445_CRLF;
 
         return $string;
     }
@@ -230,7 +230,7 @@ 
 
 class iCalendar_event extends iCalendar_component {
 
-    var $name       = 'VEVENT';
+    var $name = 'VEVENT';
     var $properties;
     
     function construct() {
@@ -283,21 +283,21 @@ 
 
     function invariant_holds() {
         // DTEND and DURATION must not appear together
-        if(isset($this->properties['DTEND']) && isset($this->properties['DURATION'])) {
+        if (isset($this->properties['DTEND']) && isset($this->properties['DURATION'])) {
             return false;
         }
 
         
-        if(isset($this->properties['DTEND']) && isset($this->properties['DTSTART'])) {
+        if (isset($this->properties['DTEND']) && isset($this->properties['DTSTART'])) {
             // DTEND must be later than DTSTART
             // The standard is not clear on how to hande different value types though
             // TODO: handle this correctly even if the value types are different
-            if($this->properties['DTEND'][0]->value <= $this->properties['DTSTART'][0]->value) {
+            if ($this->properties['DTEND'][0]->value <= $this->properties['DTSTART'][0]->value) {
                 return false;
             }
 
             // DTEND and DTSTART must have the same value type
-            if($this->properties['DTEND'][0]->val_type != $this->properties['DTSTART'][0]->val_type) {
+            if ($this->properties['DTEND'][0]->val_type != $this->properties['DTSTART'][0]->val_type) {
                 return false;
             }
 
@@ -307,7 +307,7 @@ 
 }
 
 class iCalendar_todo extends iCalendar_component {
-    var $name       = 'VTODO';
+    var $name = 'VTODO';
     var $properties;
 
     function construct() {
@@ -368,7 +368,7 @@ 
 }
 
 class iCalendar_timezone extends iCalendar_component {
-    var $name       = 'VTIMEZONE';
+    var $name = 'VTIMEZONE';
     var $properties;
 
     function construct() {

phpicalendar/lib/bennu/iCalendar_parameters.php

Spacing +16 added lines, -16 removed lines

@@ -15,7 +15,7 @@ 
 
 class iCalendar_parameter {
     function multiple_values_allowed($parameter) {
-        switch($parameter) {
+        switch ($parameter) {
             case 'DELEGATED-FROM':
             case 'DELEGATED-TO':
             case 'MEMBER':
@@ -26,7 +26,7 @@ 
     }
 
     function default_value($parameter) {
-        switch($parameter) {
+        switch ($parameter) {
             case 'CUTYPE':   return 'INDIVIDUAL';
             case 'FBTYPE':   return 'BUSY';
             case 'PARTSTAT': return 'NEEDS-ACTION';
@@ -39,7 +39,7 @@ 
     }
 
     function is_valid_value(&$parent_property, $parameter, $value) {
-        switch($parameter) {
+        switch ($parameter) {
             // These must all be a URI
             case 'ALTREP':
             case 'DIR':
@@ -104,14 +104,14 @@ 
                         'VIDEO'       => array('MPEG', 'QUICKTIME', 'VND.VIVO', 'VND.MOTOROLA.VIDEO', 'VND.MOTOROLA.VIDEOP')
                 );
                 $value = strtoupper($value);
-                if(rfc2445_is_xname($value)) {
+                if (rfc2445_is_xname($value)) {
                     return true;
                 }
                 @list($type, $subtype) = explode('/', $value);
-                if(empty($type) || empty($subtype)) {
+                if (empty($type) || empty($subtype)) {
                     return false;
                 }
-                if(!isset($fmttypes[$type]) || !in_array($subtype, $fmttypes[$type])) {
+                if (!isset($fmttypes[$type]) || !in_array($subtype, $fmttypes[$type])) {
                     return false;
                 }
                 return true;
@@ -120,11 +120,11 @@ 
             case 'LANGUAGE':
                 $value = strtoupper($value);
                 $parts = explode('-', $value);
-                foreach($parts as $part) {
-                    if(empty($part)) {
+                foreach ($parts as $part) {
+                    if (empty($part)) {
                         return false;
                     }
-                    if(strspn($part, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789') != strlen($part)) {
+                    if (strspn($part, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789') != strlen($part)) {
                         return false;
                     }
                 }
@@ -133,7 +133,7 @@ 
 
             case 'PARTSTAT':
                 $value = strtoupper($value);
-                switch($parent_property->parent_component) {
+                switch ($parent_property->parent_component) {
                     case 'VEVENT':
                         return ($value == 'NEEDS-ACTION' || $value == 'ACCEPTED' || $value == 'DECLINED' || $value == 'TENTATIVE'
                                 || $value == 'DELEGATED' || rfc2445_is_xname($value));
@@ -175,7 +175,7 @@ 
             break;
 
             case 'TZID':
-                if(empty($value)) {
+                if (empty($value)) {
                     return false;
                 }
                 return (strcspn($value, '";:,') == strlen($value));
@@ -183,16 +183,16 @@ 
 
             case 'VALUE':
                 $value = strtoupper($value);
-                return ($value == 'BINARY'    || $value == 'BOOLEAN'    || $value == 'CAL-ADDRESS' || $value == 'DATE'    ||
-                        $value == 'DATE-TIME' || $value == 'DURATION'   || $value == 'FLOAT'       || $value == 'INTEGER' ||
-                        $value == 'PERIOD'    || $value == 'RECUR'      || $value == 'TEXT'        || $value == 'TIME'    ||
-                        $value == 'URI'       || $value == 'UTC-OFFSET' || rfc2445_is_xname($value));
+                return ($value == 'BINARY' || $value == 'BOOLEAN' || $value == 'CAL-ADDRESS' || $value == 'DATE' ||
+                        $value == 'DATE-TIME' || $value == 'DURATION' || $value == 'FLOAT' || $value == 'INTEGER' ||
+                        $value == 'PERIOD' || $value == 'RECUR' || $value == 'TEXT' || $value == 'TIME' ||
+                        $value == 'URI' || $value == 'UTC-OFFSET' || rfc2445_is_xname($value));
             break;
         }
     }
 
     function do_value_formatting($parameter, $value) {
-        switch($parameter) {
+        switch ($parameter) {
             // Parameters of type CAL-ADDRESS or URI MUST be double-quoted
             case 'ALTREP':
             case 'DIR':