smtech / canvas-ics-sync

include/class/CanvasApiProcess.class.php

Doc Comments +6 added lines

@@ -240,6 +240,9 @@ 
 		return $this->call(CANVAS_API_PUT, $path, $data, $throwsExceptions);
 	}
 	
+	/**
+	 * @param string $page
+	 */
 	private function pageLink($page) {
 		if (array_key_exists($page, $this->lastCall['pagination'])) {
 			$this->pagePest = new Pest($this->lastCall['pagination'][$page]);
@@ -264,6 +267,9 @@ 
 		return $this->pageLink('last');
 	}
 	
+	/**
+	 * @param string $page
+	 */
 	private function getPageNumber($page) {
 		if (array_key_exists($page, $this->lastCall['pagination'])) {
 			parse_str(parse_url($this->lastCall['pagination'][$page], PHP_URL_QUERY), $query);

Spacing +15 added lines, -15 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
-require_once(__DIR__ . '/../../config.inc.php');
-require_once(APP_PATH . '/include/debug.inc.php');
+require_once(__DIR__.'/../../config.inc.php');
+require_once(APP_PATH.'/include/debug.inc.php');
 
-if(!defined('API_CLIENT_ERROR_RETRIES')) {
+if (!defined('API_CLIENT_ERROR_RETRIES')) {
 	define('API_CLIENT_ERROR_RETRIES', 5);
-	debug_log('Using default API_CLIENT_ERROR_RETRIES = ' . API_CLIENT_ERROR_RETRIES);
+	debug_log('Using default API_CLIENT_ERROR_RETRIES = '.API_CLIENT_ERROR_RETRIES);
 }
-if(!defined('API_SERVER_ERROR_RETRIES')) {
-	define('API_SERVER_ERROR_RETRIES', API_CLIENT_ERROR_RETRIES * 5);
-	debug_log('Using default API_SERVER_ERROR_RETRIES = ' . API_SERVER_ERROR_RETRIES);
+if (!defined('API_SERVER_ERROR_RETRIES')) {
+	define('API_SERVER_ERROR_RETRIES', API_CLIENT_ERROR_RETRIES*5);
+	debug_log('Using default API_SERVER_ERROR_RETRIES = '.API_SERVER_ERROR_RETRIES);
 }
 
 /* the verbs available within the Canvas REST API */
@@ -35,10 +35,10 @@ 
 // TODO: we could extend this to include more specificity about the Pest exceptions...
 
 /* we use Pest to interact with the RESTful API */
-require_once(APP_PATH . '/include/Pest.php');
+require_once(APP_PATH.'/include/Pest.php');
 
 /* handles HTML page generation */
-require_once(APP_PATH . '/include/page-generator.inc.php');
+require_once(APP_PATH.'/include/page-generator.inc.php');
 
 class CanvasApiProcess {
 	
@@ -85,7 +85,7 @@ 
 	}
 	
 	private function buildCanvasAuthorizationHeader() {
-		return array ('Authorization' => 'Bearer ' . $this->authorizationToken);
+		return array('Authorization' => 'Bearer '.$this->authorizationToken);
 	}
 
 	
@@ -136,7 +136,7 @@ 
 					/* who knows what goes on in the server's mind... try again */
 					$serverRetryCount++;
 					$retry = true;
-					debug_log('Retrying after Canvas API server error. ' . substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH));
+					debug_log('Retrying after Canvas API server error. '.substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH));
 				}
 			} catch (Pest_ClientError $e) {
 				if ($throwsExceptions & CANVAS_API_EXCEPTION_CLIENT) {
@@ -146,14 +146,14 @@ 
 					   I was authorized. Everything gets retried a few times before I give up */
 					$clientRetryCount++;
 					$retry = true;
-					debug_log('Retrying after Canvas API client error. ' . substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH)); 
+					debug_log('Retrying after Canvas API client error. '.substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH)); 
 				}
 			} catch (Exception $e) {
 				// treat an empty reply as a server error (which, BTW, it dang well is)
 				if ($e->getMessage() == 'Empty reply from server') {
 					$serverRetryCount++;
 					$retry = true;
-					debug_log('Retrying after empty reply from server. ' . substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH));
+					debug_log('Retrying after empty reply from server. '.substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH));
 				} else {
 					displayError(
 						array(
@@ -182,7 +182,7 @@ 
 				),
 				true,
 				'Probable Client Error',
-				'After trying ' . API_CLIENT_ERROR_RETRIES . ' times, we still got this error message from the API. (Remember to check to be sure that the object ID passed to the API is valid and exists if the API tells you that you\'re not authorized... because you\'re not authorized to work with things that don\'t exist!)'
+				'After trying '.API_CLIENT_ERROR_RETRIES.' times, we still got this error message from the API. (Remember to check to be sure that the object ID passed to the API is valid and exists if the API tells you that you\'re not authorized... because you\'re not authorized to work with things that don\'t exist!)'
 			);
 			exit;
 		}
@@ -198,7 +198,7 @@ 
 				),
 				true,
 				'Probable Server Error',
-				'After trying ' . API_CLIENT_ERROR_RETRIES . ' times, we still got this error message from the API.'
+				'After trying '.API_CLIENT_ERROR_RETRIES.' times, we still got this error message from the API.'
 			);
 			exit;
 		}

include/Pest.php

Doc Comments +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
     /**
      * Do CURL request
      * @param resource $curl
-     * @return mixed
+     * @return string
      * @throws Pest_Curl_Exec
      * @throws Pest_Curl_Meta
      */

Indentation +500 added lines, -500 removed lines

@@ -9,514 +9,514 @@
  */
 class Pest
 {
-    /**
-     * @var array Default CURL options
-     */
-    public $curl_opts = array(
-        CURLOPT_RETURNTRANSFER => true, // return result instead of echoing
-        CURLOPT_SSL_VERIFYPEER => false, // stop cURL from verifying the peer's certificate
-        CURLOPT_FOLLOWLOCATION => false, // follow redirects, Location: headers
-        CURLOPT_MAXREDIRS => 10, // but dont redirect more than 10 times
-        CURLOPT_HTTPHEADER => array()
-    );
-
-    /**
-     * @var string Base URL
-     */
-    public $base_url;
-
-    /**
-     * @var array Last response
-     */
-    public $last_response;
-
-    /**
-     * @var array Last request
-     */
-    public $last_request;
-
-    /**
-     * @var array Last headers
-     */
-    public $last_headers;
-
-    /**
-     * @var bool Throw exceptions on HTTP error codes
-     */
-    public $throw_exceptions = true;
-
-
-    /**
-     * Class constructor
-     * @param string $base_url
-     * @throws Exception
-     */
-    public function __construct($base_url)
-    {
-        if (!function_exists('curl_init')) {
-            throw new Exception('CURL module not available! Pest requires CURL. See http://php.net/manual/en/book.curl.php');
-        }
-
-        /*
+	/**
+	 * @var array Default CURL options
+	 */
+	public $curl_opts = array(
+		CURLOPT_RETURNTRANSFER => true, // return result instead of echoing
+		CURLOPT_SSL_VERIFYPEER => false, // stop cURL from verifying the peer's certificate
+		CURLOPT_FOLLOWLOCATION => false, // follow redirects, Location: headers
+		CURLOPT_MAXREDIRS => 10, // but dont redirect more than 10 times
+		CURLOPT_HTTPHEADER => array()
+	);
+
+	/**
+	 * @var string Base URL
+	 */
+	public $base_url;
+
+	/**
+	 * @var array Last response
+	 */
+	public $last_response;
+
+	/**
+	 * @var array Last request
+	 */
+	public $last_request;
+
+	/**
+	 * @var array Last headers
+	 */
+	public $last_headers;
+
+	/**
+	 * @var bool Throw exceptions on HTTP error codes
+	 */
+	public $throw_exceptions = true;
+
+
+	/**
+	 * Class constructor
+	 * @param string $base_url
+	 * @throws Exception
+	 */
+	public function __construct($base_url)
+	{
+		if (!function_exists('curl_init')) {
+			throw new Exception('CURL module not available! Pest requires CURL. See http://php.net/manual/en/book.curl.php');
+		}
+
+		/*
          * Only enable CURLOPT_FOLLOWLOCATION if safe_mode and open_base_dir are
          * not in use
          */
-        if (ini_get('open_basedir') == '' && strtolower(ini_get('safe_mode')) == 'off') {
-            $this->curl_opts['CURLOPT_FOLLOWLOCATION'] = true;
-        }
-
-        $this->base_url = $base_url;
-
-        // The callback to handle return headers
-        // Using PHP 5.2, it cannot be initialised in the static context
-        $this->curl_opts[CURLOPT_HEADERFUNCTION] = array($this, 'handle_header');
-    }
-
-    /**
-     * Setup authentication
-     *
-     * @param string $user
-     * @param string $pass
-     * @param string $auth  Can be 'basic' or 'digest'
-     */
-    public function setupAuth($user, $pass, $auth = 'basic')
-    {
-        $this->curl_opts[CURLOPT_HTTPAUTH] = constant('CURLAUTH_' . strtoupper($auth));
-        $this->curl_opts[CURLOPT_USERPWD] = $user . ":" . $pass;
-    }
-
-    /**
-     * Setup proxy
-     * @param string $host
-     * @param int $port
-     * @param string $user Optional.
-     * @param string $pass Optional.
-     */
-    public function setupProxy($host, $port, $user = NULL, $pass = NULL)
-    {
-        $this->curl_opts[CURLOPT_PROXYTYPE] = 'HTTP';
-        $this->curl_opts[CURLOPT_PROXY] = $host;
-        $this->curl_opts[CURLOPT_PROXYPORT] = $port;
-        if ($user && $pass) {
-            $this->curl_opts[CURLOPT_PROXYUSERPWD] = $user . ":" . $pass;
-        }
-    }
-
-    /**
-     * Perform HTTP GET request
-     *
-     * @param string $url
-     * @param array $data
-     * @param array $headers
-     * @return string
-     */
-    public function get($url, $data = array(), $headers=array())
-    {
-        if (!empty($data)) {
-            $pos = strpos($url, '?');
-            if ($pos !== false) {
-                $url = substr($url, 0, $pos);
-            }
-            $url .= '?' . http_build_query($data);
-        }
-
-        $curl_opts = $this->curl_opts;
+		if (ini_get('open_basedir') == '' && strtolower(ini_get('safe_mode')) == 'off') {
+			$this->curl_opts['CURLOPT_FOLLOWLOCATION'] = true;
+		}
+
+		$this->base_url = $base_url;
+
+		// The callback to handle return headers
+		// Using PHP 5.2, it cannot be initialised in the static context
+		$this->curl_opts[CURLOPT_HEADERFUNCTION] = array($this, 'handle_header');
+	}
+
+	/**
+	 * Setup authentication
+	 *
+	 * @param string $user
+	 * @param string $pass
+	 * @param string $auth  Can be 'basic' or 'digest'
+	 */
+	public function setupAuth($user, $pass, $auth = 'basic')
+	{
+		$this->curl_opts[CURLOPT_HTTPAUTH] = constant('CURLAUTH_' . strtoupper($auth));
+		$this->curl_opts[CURLOPT_USERPWD] = $user . ":" . $pass;
+	}
+
+	/**
+	 * Setup proxy
+	 * @param string $host
+	 * @param int $port
+	 * @param string $user Optional.
+	 * @param string $pass Optional.
+	 */
+	public function setupProxy($host, $port, $user = NULL, $pass = NULL)
+	{
+		$this->curl_opts[CURLOPT_PROXYTYPE] = 'HTTP';
+		$this->curl_opts[CURLOPT_PROXY] = $host;
+		$this->curl_opts[CURLOPT_PROXYPORT] = $port;
+		if ($user && $pass) {
+			$this->curl_opts[CURLOPT_PROXYUSERPWD] = $user . ":" . $pass;
+		}
+	}
+
+	/**
+	 * Perform HTTP GET request
+	 *
+	 * @param string $url
+	 * @param array $data
+	 * @param array $headers
+	 * @return string
+	 */
+	public function get($url, $data = array(), $headers=array())
+	{
+		if (!empty($data)) {
+			$pos = strpos($url, '?');
+			if ($pos !== false) {
+				$url = substr($url, 0, $pos);
+			}
+			$url .= '?' . http_build_query($data);
+		}
+
+		$curl_opts = $this->curl_opts;
         
-        $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
-
-        $curl = $this->prepRequest($curl_opts, $url);
-        $body = $this->doRequest($curl);
-        $body = $this->processBody($body);
-
-        return $body;
-    }
-
-    /**
-     * Prepare request
-     *
-     * @param array $opts
-     * @param string $url
-     * @return resource
-     * @throws Pest_Curl_Init
-     */
-    protected function prepRequest($opts, $url)
-    {
-        if (strncmp($url, $this->base_url, strlen($this->base_url)) != 0) {
-            $url = rtrim($this->base_url, '/') . '/' . ltrim($url, '/');
-        }
-
-        $curl = curl_init($url);
-        if ($curl === false) {
-            throw new Pest_Curl_Init($this->processError(curl_error($curl), 'curl'));
-        }
-
-        foreach ($opts as $opt => $val)
-            curl_setopt($curl, $opt, $val);
-
-        $this->last_request = array(
-            'url' => $url
-        );
-
-        if (isset($opts[CURLOPT_CUSTOMREQUEST]))
-            $this->last_request['method'] = $opts[CURLOPT_CUSTOMREQUEST];
-        else
-            $this->last_request['method'] = 'GET';
-
-        if (isset($opts[CURLOPT_POSTFIELDS]))
-            $this->last_request['data'] = $opts[CURLOPT_POSTFIELDS];
-
-        return $curl;
-    }
+		$curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
+
+		$curl = $this->prepRequest($curl_opts, $url);
+		$body = $this->doRequest($curl);
+		$body = $this->processBody($body);
+
+		return $body;
+	}
+
+	/**
+	 * Prepare request
+	 *
+	 * @param array $opts
+	 * @param string $url
+	 * @return resource
+	 * @throws Pest_Curl_Init
+	 */
+	protected function prepRequest($opts, $url)
+	{
+		if (strncmp($url, $this->base_url, strlen($this->base_url)) != 0) {
+			$url = rtrim($this->base_url, '/') . '/' . ltrim($url, '/');
+		}
+
+		$curl = curl_init($url);
+		if ($curl === false) {
+			throw new Pest_Curl_Init($this->processError(curl_error($curl), 'curl'));
+		}
+
+		foreach ($opts as $opt => $val)
+			curl_setopt($curl, $opt, $val);
+
+		$this->last_request = array(
+			'url' => $url
+		);
+
+		if (isset($opts[CURLOPT_CUSTOMREQUEST]))
+			$this->last_request['method'] = $opts[CURLOPT_CUSTOMREQUEST];
+		else
+			$this->last_request['method'] = 'GET';
+
+		if (isset($opts[CURLOPT_POSTFIELDS]))
+			$this->last_request['data'] = $opts[CURLOPT_POSTFIELDS];
+
+		return $curl;
+	}
     
-    /**
-     * Determines if a given array is numerically indexed or not
-     *
-     * @param array $array
-     * @return boolean
-     */
-    protected function _isNumericallyIndexedArray($array)
-    {
-        return !(bool)count(array_filter(array_keys($array), 'is_string'));
-    }
+	/**
+	 * Determines if a given array is numerically indexed or not
+	 *
+	 * @param array $array
+	 * @return boolean
+	 */
+	protected function _isNumericallyIndexedArray($array)
+	{
+		return !(bool)count(array_filter(array_keys($array), 'is_string'));
+	}
     
-    /**
-     * Flatten headers from an associative array to a numerically indexed array of "Name: Value"
-     * style entries like CURLOPT_HTTPHEADER expects. Numerically indexed arrays are not modified.
-     *
-     * @param array $headers
-     * @return array
-     */
-    protected function prepHeaders($headers)
-    {
-        if ($this->_isNumericallyIndexedArray($headers)) {
-            return $headers;
-        }
+	/**
+	 * Flatten headers from an associative array to a numerically indexed array of "Name: Value"
+	 * style entries like CURLOPT_HTTPHEADER expects. Numerically indexed arrays are not modified.
+	 *
+	 * @param array $headers
+	 * @return array
+	 */
+	protected function prepHeaders($headers)
+	{
+		if ($this->_isNumericallyIndexedArray($headers)) {
+			return $headers;
+		}
         
-        $flattened = array();
-        foreach ($headers as $name => $value) {
-             $flattened[] = $name . ': ' . $value;
-        }
+		$flattened = array();
+		foreach ($headers as $name => $value) {
+			 $flattened[] = $name . ': ' . $value;
+		}
         
-        return $flattened;
-    }
-
-    /**
-     * Process error
-     * @param string $body
-     * @return string
-     */
-    protected function processError($body)
-    {
-        // Override this in classes that extend Pest.
-        // The body of every erroneous (non-2xx/3xx) GET/POST/PUT/DELETE
-        // response goes through here prior to being used as the 'message'
-        // of the resulting Pest_Exception
-        return $body;
-    }
-
-    /**
-     * Do CURL request
-     * @param resource $curl
-     * @return mixed
-     * @throws Pest_Curl_Exec
-     * @throws Pest_Curl_Meta
-     */
-    private function doRequest($curl)
-    {
-        $this->last_headers = array();
-        $this->last_response = array();
-
-        // curl_error() needs to be tested right after function failure
-        $this->last_response["body"] = curl_exec($curl);
-        if ($this->last_response["body"] === false && $this->throw_exceptions) {
-            throw new Pest_Curl_Exec(curl_error($curl));
-        }
-
-        $this->last_response["meta"] = curl_getinfo($curl);
-        if ($this->last_response["meta"] === false && $this->throw_exceptions) {
-            throw new Pest_Curl_Meta(curl_error($curl));
-        }
-
-        curl_close($curl);
-
-        $this->checkLastResponseForError();
-
-        return $this->last_response["body"];
-    }
-
-    /**
-     * Check last response for error
-     *
-     * @throws Pest_Conflict
-     * @throws Pest_Gone
-     * @throws Pest_Unauthorized
-     * @throws Pest_ClientError
-     * @throws Pest_MethodNotAllowed
-     * @throws Pest_NotFound
-     * @throws Pest_BadRequest
-     * @throws Pest_UnknownResponse
-     * @throws Pest_InvalidRecord
-     * @throws Pest_ServerError
-     * @throws Pest_Forbidden
-     */
-    protected function checkLastResponseForError()
-    {
-        if (!$this->throw_exceptions)
-            return;
-
-        $meta = $this->last_response['meta'];
-        $body = $this->last_response['body'];
-
-        if ($meta === false)
-            return;
-
-        $err = null;
-        switch ($meta['http_code']) {
-            case 400:
-                throw new Pest_BadRequest($this->processError($body));
-                break;
-            case 401:
-                throw new Pest_Unauthorized($this->processError($body));
-                break;
-            case 403:
-                throw new Pest_Forbidden($this->processError($body));
-                break;
-            case 404:
-                throw new Pest_NotFound($this->processError($body));
-                break;
-            case 405:
-                throw new Pest_MethodNotAllowed($this->processError($body));
-                break;
-            case 409:
-                throw new Pest_Conflict($this->processError($body));
-                break;
-            case 410:
-                throw new Pest_Gone($this->processError($body));
-                break;
-            case 422:
-                // Unprocessable Entity -- see http://www.iana.org/assignments/http-status-codes
-                // This is now commonly used (in Rails, at least) to indicate
-                // a response to a request that is syntactically correct,
-                // but semantically invalid (for example, when trying to
-                // create a resource with some required fields missing)
-                throw new Pest_InvalidRecord($this->processError($body));
-                break;
-            default:
-                if ($meta['http_code'] >= 400 && $meta['http_code'] <= 499)
-                    throw new Pest_ClientError($this->processError($body));
-                elseif ($meta['http_code'] >= 500 && $meta['http_code'] <= 599)
-                    throw new Pest_ServerError($this->processError($body)); elseif (!isset($meta['http_code']) || $meta['http_code'] >= 600) {
-                    throw new Pest_UnknownResponse($this->processError($body));
-                }
-        }
-    }
-
-    /**
-     * Process body
-     * @param string $body
-     * @return string
-     */
-    protected function processBody($body)
-    {
-        // Override this in classes that extend Pest.
-        // The body of every GET/POST/PUT/DELETE response goes through
-        // here prior to being returned.
-        return $body;
-    }
-
-    /**
-     * Perform HTTP HEAD request
-     * @param string $url
-     * @return string
-     */
-    public function head($url)
-    {
-        $curl_opts = $this->curl_opts;
-        $curl_opts[CURLOPT_NOBODY] = true;
-
-        $curl = $this->prepRequest($this->curl_opts, $url);
-        $body = $this->doRequest($curl);
-
-        $body = $this->processBody($body);
-
-        return $body;
-    }
-
-    /**
-     * Perform HTTP POST request
-     *
-     * @param string $url
-     * @param array $data
-     * @param array $headers
-     * @return string
-     */
-    public function post($url, $data, $headers = array())
-    {
-        $data = $this->prepData($data);
-
-        $curl_opts = $this->curl_opts;
-        $curl_opts[CURLOPT_CUSTOMREQUEST] = 'POST';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
-        $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
-        $curl_opts[CURLOPT_POSTFIELDS] = $data;
-
-        $curl = $this->prepRequest($curl_opts, $url);
-        $body = $this->doRequest($curl);
-
-        $body = $this->processBody($body);
-
-        return $body;
-    }
-
-    /**
-     * Prepare data
-     * @param array $data
-     * @return array|string
-     */
-    public function prepData($data)
-    {
-        if (is_array($data)) {
-            $multipart = false;
-
-            foreach ($data as $item) {
-                if (is_string($item) && strncmp($item, "@", 1) == 0 && is_file(substr($item, 1))) {
-                    $multipart = true;
-                    break;
-                }
-            }
-
-            return ($multipart) ? $data : http_build_query($data);
-        } else {
-            return $data;
-        }
-    }
-
-    /**
-     * Perform HTTP PUT request
-     *
-     * @param string $url
-     * @param array $data
-     * @param array $headers
-     * @return string
-     */
-    public function put($url, $data, $headers = array())
-    {
-        $data = $this->prepData($data);
-
-        $curl_opts = $this->curl_opts;
-        $curl_opts[CURLOPT_CUSTOMREQUEST] = 'PUT';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
-        $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
-        $curl_opts[CURLOPT_POSTFIELDS] = $data;
-
-        $curl = $this->prepRequest($curl_opts, $url);
-        $body = $this->doRequest($curl);
-
-        $body = $this->processBody($body);
-
-        return $body;
-    }
-
-    /**
-     * Perform HTTP PATCH request
-     *
-     * @param string $url
-     * @param array $data
-     * @param array $headers
-     * @return string
-     */
-    public function patch($url, $data, $headers = array())
-    {
-        $data = (is_array($data)) ? http_build_query($data) : $data;
-
-        $curl_opts = $this->curl_opts;
-        $curl_opts[CURLOPT_CUSTOMREQUEST] = 'PATCH';
-        $headers[] = 'Content-Length: ' . strlen($data);
-        $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
-        $curl_opts[CURLOPT_POSTFIELDS] = $data;
-
-        $curl = $this->prepRequest($curl_opts, $url);
-        $body = $this->doRequest($curl);
-
-        $body = $this->processBody($body);
-
-        return $body;
-    }
-
-    /**
-     * Perform HTTP DELETE request
-     *
-     * @param string $url
-     * @param array $headers
-     * @return string
-     */
-    public function delete($url, $data, $headers=array())
-    {
-        $data = $this->prepData($data);
-
-        $curl_opts = $this->curl_opts;
-        $curl_opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
-        $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
-        $curl_opts[CURLOPT_POSTFIELDS] = $data;
-
-        $curl = $this->prepRequest($curl_opts, $url);
-        $body = $this->doRequest($curl);
-
-        $body = $this->processBody($body);
-
-        return $body;
-    }
-
-    /**
-     * Get last response body
-     *
-     * @return string
-     */
-    public function lastBody()
-    {
-        return $this->last_response['body'];
-    }
-
-    /**
-     * Get last response status
-     *
-     * @return int
-     */
-    public function lastStatus()
-    {
-        return $this->last_response['meta']['http_code'];
-    }
-
-    /**
-     * Return the last response header (case insensitive) or NULL if not present.
-     * HTTP allows empty headers (e.g. RFC 2616, Section 14.23), thus is_null()
-     * and not negation or empty() should be used.
-     *
-     * @param string $header
-     * @return string
-     */
-    public function lastHeader($header)
-    {
-        if (empty($this->last_headers[strtolower($header)])) {
-            return NULL;
-        }
-        return $this->last_headers[strtolower($header)];
-    }
-
-    /**
-     * Handle header
-     * @param $ch
-     * @param $str
-     * @return int
-     */
-    private function handle_header($ch, $str)
-    {
-        if (preg_match('/([^:]+):\s(.+)/m', $str, $match)) {
-            $this->last_headers[strtolower($match[1])] = trim($match[2]);
-        }
-        return strlen($str);
-    }
+		return $flattened;
+	}
+
+	/**
+	 * Process error
+	 * @param string $body
+	 * @return string
+	 */
+	protected function processError($body)
+	{
+		// Override this in classes that extend Pest.
+		// The body of every erroneous (non-2xx/3xx) GET/POST/PUT/DELETE
+		// response goes through here prior to being used as the 'message'
+		// of the resulting Pest_Exception
+		return $body;
+	}
+
+	/**
+	 * Do CURL request
+	 * @param resource $curl
+	 * @return mixed
+	 * @throws Pest_Curl_Exec
+	 * @throws Pest_Curl_Meta
+	 */
+	private function doRequest($curl)
+	{
+		$this->last_headers = array();
+		$this->last_response = array();
+
+		// curl_error() needs to be tested right after function failure
+		$this->last_response["body"] = curl_exec($curl);
+		if ($this->last_response["body"] === false && $this->throw_exceptions) {
+			throw new Pest_Curl_Exec(curl_error($curl));
+		}
+
+		$this->last_response["meta"] = curl_getinfo($curl);
+		if ($this->last_response["meta"] === false && $this->throw_exceptions) {
+			throw new Pest_Curl_Meta(curl_error($curl));
+		}
+
+		curl_close($curl);
+
+		$this->checkLastResponseForError();
+
+		return $this->last_response["body"];
+	}
+
+	/**
+	 * Check last response for error
+	 *
+	 * @throws Pest_Conflict
+	 * @throws Pest_Gone
+	 * @throws Pest_Unauthorized
+	 * @throws Pest_ClientError
+	 * @throws Pest_MethodNotAllowed
+	 * @throws Pest_NotFound
+	 * @throws Pest_BadRequest
+	 * @throws Pest_UnknownResponse
+	 * @throws Pest_InvalidRecord
+	 * @throws Pest_ServerError
+	 * @throws Pest_Forbidden
+	 */
+	protected function checkLastResponseForError()
+	{
+		if (!$this->throw_exceptions)
+			return;
+
+		$meta = $this->last_response['meta'];
+		$body = $this->last_response['body'];
+
+		if ($meta === false)
+			return;
+
+		$err = null;
+		switch ($meta['http_code']) {
+			case 400:
+				throw new Pest_BadRequest($this->processError($body));
+				break;
+			case 401:
+				throw new Pest_Unauthorized($this->processError($body));
+				break;
+			case 403:
+				throw new Pest_Forbidden($this->processError($body));
+				break;
+			case 404:
+				throw new Pest_NotFound($this->processError($body));
+				break;
+			case 405:
+				throw new Pest_MethodNotAllowed($this->processError($body));
+				break;
+			case 409:
+				throw new Pest_Conflict($this->processError($body));
+				break;
+			case 410:
+				throw new Pest_Gone($this->processError($body));
+				break;
+			case 422:
+				// Unprocessable Entity -- see http://www.iana.org/assignments/http-status-codes
+				// This is now commonly used (in Rails, at least) to indicate
+				// a response to a request that is syntactically correct,
+				// but semantically invalid (for example, when trying to
+				// create a resource with some required fields missing)
+				throw new Pest_InvalidRecord($this->processError($body));
+				break;
+			default:
+				if ($meta['http_code'] >= 400 && $meta['http_code'] <= 499)
+					throw new Pest_ClientError($this->processError($body));
+				elseif ($meta['http_code'] >= 500 && $meta['http_code'] <= 599)
+					throw new Pest_ServerError($this->processError($body)); elseif (!isset($meta['http_code']) || $meta['http_code'] >= 600) {
+					throw new Pest_UnknownResponse($this->processError($body));
+				}
+		}
+	}
+
+	/**
+	 * Process body
+	 * @param string $body
+	 * @return string
+	 */
+	protected function processBody($body)
+	{
+		// Override this in classes that extend Pest.
+		// The body of every GET/POST/PUT/DELETE response goes through
+		// here prior to being returned.
+		return $body;
+	}
+
+	/**
+	 * Perform HTTP HEAD request
+	 * @param string $url
+	 * @return string
+	 */
+	public function head($url)
+	{
+		$curl_opts = $this->curl_opts;
+		$curl_opts[CURLOPT_NOBODY] = true;
+
+		$curl = $this->prepRequest($this->curl_opts, $url);
+		$body = $this->doRequest($curl);
+
+		$body = $this->processBody($body);
+
+		return $body;
+	}
+
+	/**
+	 * Perform HTTP POST request
+	 *
+	 * @param string $url
+	 * @param array $data
+	 * @param array $headers
+	 * @return string
+	 */
+	public function post($url, $data, $headers = array())
+	{
+		$data = $this->prepData($data);
+
+		$curl_opts = $this->curl_opts;
+		$curl_opts[CURLOPT_CUSTOMREQUEST] = 'POST';
+		if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+		$curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
+		$curl_opts[CURLOPT_POSTFIELDS] = $data;
+
+		$curl = $this->prepRequest($curl_opts, $url);
+		$body = $this->doRequest($curl);
+
+		$body = $this->processBody($body);
+
+		return $body;
+	}
+
+	/**
+	 * Prepare data
+	 * @param array $data
+	 * @return array|string
+	 */
+	public function prepData($data)
+	{
+		if (is_array($data)) {
+			$multipart = false;
+
+			foreach ($data as $item) {
+				if (is_string($item) && strncmp($item, "@", 1) == 0 && is_file(substr($item, 1))) {
+					$multipart = true;
+					break;
+				}
+			}
+
+			return ($multipart) ? $data : http_build_query($data);
+		} else {
+			return $data;
+		}
+	}
+
+	/**
+	 * Perform HTTP PUT request
+	 *
+	 * @param string $url
+	 * @param array $data
+	 * @param array $headers
+	 * @return string
+	 */
+	public function put($url, $data, $headers = array())
+	{
+		$data = $this->prepData($data);
+
+		$curl_opts = $this->curl_opts;
+		$curl_opts[CURLOPT_CUSTOMREQUEST] = 'PUT';
+		if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+		$curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
+		$curl_opts[CURLOPT_POSTFIELDS] = $data;
+
+		$curl = $this->prepRequest($curl_opts, $url);
+		$body = $this->doRequest($curl);
+
+		$body = $this->processBody($body);
+
+		return $body;
+	}
+
+	/**
+	 * Perform HTTP PATCH request
+	 *
+	 * @param string $url
+	 * @param array $data
+	 * @param array $headers
+	 * @return string
+	 */
+	public function patch($url, $data, $headers = array())
+	{
+		$data = (is_array($data)) ? http_build_query($data) : $data;
+
+		$curl_opts = $this->curl_opts;
+		$curl_opts[CURLOPT_CUSTOMREQUEST] = 'PATCH';
+		$headers[] = 'Content-Length: ' . strlen($data);
+		$curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
+		$curl_opts[CURLOPT_POSTFIELDS] = $data;
+
+		$curl = $this->prepRequest($curl_opts, $url);
+		$body = $this->doRequest($curl);
+
+		$body = $this->processBody($body);
+
+		return $body;
+	}
+
+	/**
+	 * Perform HTTP DELETE request
+	 *
+	 * @param string $url
+	 * @param array $headers
+	 * @return string
+	 */
+	public function delete($url, $data, $headers=array())
+	{
+		$data = $this->prepData($data);
+
+		$curl_opts = $this->curl_opts;
+		$curl_opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
+		if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+		$curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
+		$curl_opts[CURLOPT_POSTFIELDS] = $data;
+
+		$curl = $this->prepRequest($curl_opts, $url);
+		$body = $this->doRequest($curl);
+
+		$body = $this->processBody($body);
+
+		return $body;
+	}
+
+	/**
+	 * Get last response body
+	 *
+	 * @return string
+	 */
+	public function lastBody()
+	{
+		return $this->last_response['body'];
+	}
+
+	/**
+	 * Get last response status
+	 *
+	 * @return int
+	 */
+	public function lastStatus()
+	{
+		return $this->last_response['meta']['http_code'];
+	}
+
+	/**
+	 * Return the last response header (case insensitive) or NULL if not present.
+	 * HTTP allows empty headers (e.g. RFC 2616, Section 14.23), thus is_null()
+	 * and not negation or empty() should be used.
+	 *
+	 * @param string $header
+	 * @return string
+	 */
+	public function lastHeader($header)
+	{
+		if (empty($this->last_headers[strtolower($header)])) {
+			return NULL;
+		}
+		return $this->last_headers[strtolower($header)];
+	}
+
+	/**
+	 * Handle header
+	 * @param $ch
+	 * @param $str
+	 * @return int
+	 */
+	private function handle_header($ch, $str)
+	{
+		if (preg_match('/([^:]+):\s(.+)/m', $str, $match)) {
+			$this->last_headers[strtolower($match[1])] = trim($match[2]);
+		}
+		return strlen($str);
+	}
 }
 
 class Pest_Exception extends Exception

Spacing +12 added lines, -12 removed lines

@@ -81,8 +81,8 @@ 
      */
     public function setupAuth($user, $pass, $auth = 'basic')
     {
-        $this->curl_opts[CURLOPT_HTTPAUTH] = constant('CURLAUTH_' . strtoupper($auth));
-        $this->curl_opts[CURLOPT_USERPWD] = $user . ":" . $pass;
+        $this->curl_opts[CURLOPT_HTTPAUTH] = constant('CURLAUTH_'.strtoupper($auth));
+        $this->curl_opts[CURLOPT_USERPWD] = $user.":".$pass;
     }
 
     /**
@@ -98,7 +98,7 @@ 
         $this->curl_opts[CURLOPT_PROXY] = $host;
         $this->curl_opts[CURLOPT_PROXYPORT] = $port;
         if ($user && $pass) {
-            $this->curl_opts[CURLOPT_PROXYUSERPWD] = $user . ":" . $pass;
+            $this->curl_opts[CURLOPT_PROXYUSERPWD] = $user.":".$pass;
         }
     }
 
@@ -110,14 +110,14 @@ 
      * @param array $headers
      * @return string
      */
-    public function get($url, $data = array(), $headers=array())
+    public function get($url, $data = array(), $headers = array())
     {
         if (!empty($data)) {
             $pos = strpos($url, '?');
             if ($pos !== false) {
                 $url = substr($url, 0, $pos);
             }
-            $url .= '?' . http_build_query($data);
+            $url .= '?'.http_build_query($data);
         }
 
         $curl_opts = $this->curl_opts;
@@ -142,7 +142,7 @@ 
     protected function prepRequest($opts, $url)
     {
         if (strncmp($url, $this->base_url, strlen($this->base_url)) != 0) {
-            $url = rtrim($this->base_url, '/') . '/' . ltrim($url, '/');
+            $url = rtrim($this->base_url, '/').'/'.ltrim($url, '/');
         }
 
         $curl = curl_init($url);
@@ -194,7 +194,7 @@ 
         
         $flattened = array();
         foreach ($headers as $name => $value) {
-             $flattened[] = $name . ': ' . $value;
+             $flattened[] = $name.': '.$value;
         }
         
         return $flattened;
@@ -356,7 +356,7 @@ 
 
         $curl_opts = $this->curl_opts;
         $curl_opts[CURLOPT_CUSTOMREQUEST] = 'POST';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+        if (!is_array($data)) $headers[] = 'Content-Length: '.strlen($data);
         $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
         $curl_opts[CURLOPT_POSTFIELDS] = $data;
 
@@ -405,7 +405,7 @@ 
 
         $curl_opts = $this->curl_opts;
         $curl_opts[CURLOPT_CUSTOMREQUEST] = 'PUT';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+        if (!is_array($data)) $headers[] = 'Content-Length: '.strlen($data);
         $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
         $curl_opts[CURLOPT_POSTFIELDS] = $data;
 
@@ -431,7 +431,7 @@ 
 
         $curl_opts = $this->curl_opts;
         $curl_opts[CURLOPT_CUSTOMREQUEST] = 'PATCH';
-        $headers[] = 'Content-Length: ' . strlen($data);
+        $headers[] = 'Content-Length: '.strlen($data);
         $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
         $curl_opts[CURLOPT_POSTFIELDS] = $data;
 
@@ -450,13 +450,13 @@ 
      * @param array $headers
      * @return string
      */
-    public function delete($url, $data, $headers=array())
+    public function delete($url, $data, $headers = array())
     {
         $data = $this->prepData($data);
 
         $curl_opts = $this->curl_opts;
         $curl_opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+        if (!is_array($data)) $headers[] = 'Content-Length: '.strlen($data);
         $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
         $curl_opts[CURLOPT_POSTFIELDS] = $data;
 

Braces +31 added lines, -19 removed lines

@@ -150,20 +150,23 @@ 
             throw new Pest_Curl_Init($this->processError(curl_error($curl), 'curl'));
         }
 
-        foreach ($opts as $opt => $val)
-            curl_setopt($curl, $opt, $val);
+        foreach ($opts as $opt => $val) {
+                    curl_setopt($curl, $opt, $val);
+        }
 
         $this->last_request = array(
             'url' => $url
         );
 
-        if (isset($opts[CURLOPT_CUSTOMREQUEST]))
-            $this->last_request['method'] = $opts[CURLOPT_CUSTOMREQUEST];
-        else
-            $this->last_request['method'] = 'GET';
+        if (isset($opts[CURLOPT_CUSTOMREQUEST])) {
+                    $this->last_request['method'] = $opts[CURLOPT_CUSTOMREQUEST];
+        } else {
+                    $this->last_request['method'] = 'GET';
+        }
 
-        if (isset($opts[CURLOPT_POSTFIELDS]))
-            $this->last_request['data'] = $opts[CURLOPT_POSTFIELDS];
+        if (isset($opts[CURLOPT_POSTFIELDS])) {
+                    $this->last_request['data'] = $opts[CURLOPT_POSTFIELDS];
+        }
 
         return $curl;
     }
@@ -261,14 +264,16 @@ 
      */
     protected function checkLastResponseForError()
     {
-        if (!$this->throw_exceptions)
-            return;
+        if (!$this->throw_exceptions) {
+                    return;
+        }
 
         $meta = $this->last_response['meta'];
         $body = $this->last_response['body'];
 
-        if ($meta === false)
-            return;
+        if ($meta === false) {
+                    return;
+        }
 
         $err = null;
         switch ($meta['http_code']) {
@@ -302,10 +307,11 @@ 
                 throw new Pest_InvalidRecord($this->processError($body));
                 break;
             default:
-                if ($meta['http_code'] >= 400 && $meta['http_code'] <= 499)
-                    throw new Pest_ClientError($this->processError($body));
-                elseif ($meta['http_code'] >= 500 && $meta['http_code'] <= 599)
-                    throw new Pest_ServerError($this->processError($body)); elseif (!isset($meta['http_code']) || $meta['http_code'] >= 600) {
+                if ($meta['http_code'] >= 400 && $meta['http_code'] <= 499) {
+                                    throw new Pest_ClientError($this->processError($body));
+                } elseif ($meta['http_code'] >= 500 && $meta['http_code'] <= 599) {
+                                    throw new Pest_ServerError($this->processError($body));
+                } elseif (!isset($meta['http_code']) || $meta['http_code'] >= 600) {
                     throw new Pest_UnknownResponse($this->processError($body));
                 }
         }
@@ -356,7 +362,9 @@ 
 
         $curl_opts = $this->curl_opts;
         $curl_opts[CURLOPT_CUSTOMREQUEST] = 'POST';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+        if (!is_array($data)) {
+        	$headers[] = 'Content-Length: ' . strlen($data);
+        }
         $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
         $curl_opts[CURLOPT_POSTFIELDS] = $data;
 
@@ -405,7 +413,9 @@ 
 
         $curl_opts = $this->curl_opts;
         $curl_opts[CURLOPT_CUSTOMREQUEST] = 'PUT';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+        if (!is_array($data)) {
+        	$headers[] = 'Content-Length: ' . strlen($data);
+        }
         $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
         $curl_opts[CURLOPT_POSTFIELDS] = $data;
 
@@ -456,7 +466,9 @@ 
 
         $curl_opts = $this->curl_opts;
         $curl_opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
-        if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data);
+        if (!is_array($data)) {
+        	$headers[] = 'Content-Length: ' . strlen($data);
+        }
         $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers);
         $curl_opts[CURLOPT_POSTFIELDS] = $data;
 

phpicalendar/caldav.php

Doc Comments +3 added lines

@@ -34,6 +34,9 @@
 		return $basePath;
 	}
 
+	/**
+	 * @param string $absolutePath
+	 */
 	function deletePath($absolutePath) {
 		$dirs = array();
 		$paths = array();

Spacing +18 added lines, -18 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 define('BASE', './');
-require_once(BASE . 'functions/init.inc.php');
-require_once(BASE . 'functions/calendar_functions.php');
+require_once(BASE.'functions/init.inc.php');
+require_once(BASE.'functions/calendar_functions.php');
 
 //require_once(BASE . 'lib/HTTP/WebDAV/Server.php');
 require_once('/home/jablko/public_html/gallery2/modules/webdav/lib/HTTP/WebDAV/Server.php');
-require_once(BASE . 'lib/HTTP/CalDAV/Server.php');
+require_once(BASE.'lib/HTTP/CalDAV/Server.php');
 
-require_once(BASE . 'lib/bennu/bennu.class.php');
-require_once(BASE . 'lib/bennu/iCalendar_components.php');
-require_once(BASE . 'lib/bennu/iCalendar_parameters.php');
-require_once(BASE . 'lib/bennu/iCalendar_properties.php');
-require_once(BASE . 'lib/bennu/iCalendar_rfc2445.php');
+require_once(BASE.'lib/bennu/bennu.class.php');
+require_once(BASE.'lib/bennu/iCalendar_components.php');
+require_once(BASE.'lib/bennu/iCalendar_parameters.php');
+require_once(BASE.'lib/bennu/iCalendar_properties.php');
+require_once(BASE.'lib/bennu/iCalendar_rfc2445.php');
 
 class HTTP_CalDAV_Server_PHPiCalendar extends HTTP_CalDAV_Server {
 	function getBasePath() {
@@ -69,7 +69,7 @@ 
 	}
 
 	function delete($options) {
-		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() .  '/' .
+		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().'/'.
 			$options['path'];
 		if (!file_exists($absolutePath)) {
 			return '404 Not Found';
@@ -79,7 +79,7 @@ 
 	}
 
 	function get(&$options) {
-		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() . '/' .
+		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().'/'.
 			$options['path'];
 
 		if (!file_exists($absolutePath)) {
@@ -111,7 +111,7 @@ 
 			return '502 Bad Gateway';
 		}
 
-		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() . '/' .
+		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().'/'.
 			$options['path'];
 
 		if (!file_exists($absolutePath)) {
@@ -122,8 +122,8 @@ 
 			return '400 Bad Request';
 		}
 
-		$newAbsolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() .
-			'/' . $options['dest'];
+		$newAbsolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().
+			'/'.$options['dest'];
 		if (!is_dir(dirname($newAbsolutePath))) {
 			return '409 Conflict';
 		}
@@ -158,8 +158,8 @@ 
 			$file = array();
 			$file['path'] = $path;
 
-			$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() .
-				'/' . $path;
+			$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().
+				'/'.$path;
 			$stat = stat($absolutePath);
 			$file['props'] = array();
 			$file['props'][] = $this->mkprop('creationdate', $stat['ctime']);
@@ -197,7 +197,7 @@ 
 	}
 
 	function put(&$options) {
-		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() . '/' .
+		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().'/'.
 			$options['path'];
 		if (!is_dir(dirname($absolutePath))) {
 			return '409 Conflict';
@@ -221,8 +221,8 @@ 
 			$file = array();
 			$file['path'] = $path;
 
-			$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() .
-				'/' . $path;
+			$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().
+				'/'.$path;
 			$stat = stat($absolutePath);
 			$file['props'] = array();
 			$file['props'][] = $this->mkprop('creationdate', $stat['ctime']);

phpicalendar/functions/admin_functions.php

Doc Comments +3 added lines

@@ -208,6 +208,9 @@
 //
 // arg0: string version of php to check against
 // return boolean true if $version is >= current php version
+/**
+ * @param string $version
+ */
 function check_php_version($version) {
 	// intval used for version like "4.0.4pl1"
 	$testVer=intval(str_replace(".", "",$version));

Indentation +9 added lines, -9 removed lines

@@ -222,15 +222,15 @@
 // arg0: string filename
 // returns boolean is the uploaded a file
 function is_uploaded_file_v4 ($filename) {
-    if (!$tmp_file = get_cfg_var('upload_tmp_dir')) {
-        $tmp_file = dirname(tempnam('', ''));
-    }
-    $tmp_file .= '/' . basename($filename);
-    // For Windows compat
-    $filename = str_replace ("\\", "/", $filename);
-    $tmp_file = str_replace ("\\", "/", $tmp_file);
-    // User might have trailing slash in php.ini... 
-    return (ereg_replace('/+', '/', $tmp_file) == $filename);
+	if (!$tmp_file = get_cfg_var('upload_tmp_dir')) {
+		$tmp_file = dirname(tempnam('', ''));
+	}
+	$tmp_file .= '/' . basename($filename);
+	// For Windows compat
+	$filename = str_replace ("\\", "/", $filename);
+	$tmp_file = str_replace ("\\", "/", $tmp_file);
+	// User might have trailing slash in php.ini... 
+	return (ereg_replace('/+', '/', $tmp_file) == $filename);
 }
 
 // return the appropriate error message if the file upload had an error

Spacing +27 added lines, -27 removed lines

@@ -2,7 +2,7 @@ 
 // Is the user logged in
 //
 // returns boolean is the user logged in
-function is_loggedin () {
+function is_loggedin() {
 	global $_SESSION;
 	if (!isset($_SESSION['phpical_loggedin']) || $_SESSION['phpical_loggedin'] == FALSE) {
 		return FALSE;
@@ -16,7 +16,7 @@ 
 // arg0: string username
 // arg1: string password
 // returns boolean was the login successful
-function login ($username, $password) {
+function login($username, $password) {
 	global $_SESSION;
 	global $phpiCal_config;
 	
@@ -46,7 +46,7 @@ 
 // arg0: string username
 // arg1: string password
 // returns boolean was login successful
-function login_ftp ($username, $password) {
+function login_ftp($username, $password) {
 	global $phpiCal_config;
 	
 	// set up basic connection
@@ -71,7 +71,7 @@ 
 // arg0: string username
 // arg1: string password
 // returns boolean was login successful
-function login_internal ($username, $password) {
+function login_internal($username, $password) {
 	global $phpiCal_config;
 	
 	if ($phpiCal_config->auth_internal_username == $username && $phpiCal_config->auth_internal_password == $password)
@@ -84,14 +84,14 @@ 
 //
 // arg0: string calendar file - not the full path
 // returns boolean was delete successful
-function delete_cal ($filename) {
+function delete_cal($filename) {
 	global $_SESSION;
 	global $phpiCal_config;
 	global $calendar_path;
 	echo $filename;
 	
 	if ($phpiCal_config->auth_method == 'ftp') {
-		$filename = get_ftp_calendar_path() . "/" . $filename;
+		$filename = get_ftp_calendar_path()."/".$filename;
 		
 		// set up basic connection
 		$conn_id = @ftp_connect($phpiCal_config->ftp_server); 
@@ -119,11 +119,11 @@ 
 		$delete = unlink($filename); 
 		clearstatcache();
 		if (@file_exists($filename)) { 
-			$filesys = eregi_replace("/","\\", $filename); 
+			$filesys = eregi_replace("/", "\\", $filename); 
 			$delete = system("rm -f $filesys");
 			clearstatcache();
 			if (@file_exists($filename)) { 
-				$delete = chmod ($filename, 0775); 
+				$delete = chmod($filename, 0775); 
 				$delete = unlink($filename); 
 				$delete = system("del $filesys");
 			}
@@ -145,14 +145,14 @@ 
 // arg0: string full path to calendar file
 // arg1: string destination filename
 // returns boolean was copy successful
-function copy_cal ($source, $destination) {
+function copy_cal($source, $destination) {
 	global $_SESSION;
 	global $phpiCal_config;
 	global $calendar_path;
 	
 	if ($phpiCal_config->auth_method == 'ftp') {
-		$destination = get_ftp_calendar_path() . "/" . basename($destination);
-		$destination = str_replace ("\\", "/", realpath($destination));
+		$destination = get_ftp_calendar_path()."/".basename($destination);
+		$destination = str_replace("\\", "/", realpath($destination));
 		
 		// set up basic connection
 		$conn_id = ftp_connect($phpiCal_config->ftp_server); 
@@ -177,7 +177,7 @@ 
 		return TRUE;
 	}
 	else {
-		$destination = $calendar_path . "/" . basename($destination);
+		$destination = $calendar_path."/".basename($destination);
 		
 		if (check_php_version('4.0.3')) {
 			return move_uploaded_file($source, $destination);
@@ -200,7 +200,7 @@ 
 	if ($phpiCal_config->ftp_calendar_path != '')
 		return $phpiCal_config->ftp_calendar_path;
 	else {
-		return str_replace ("\\", "/", realpath($calendar_path));
+		return str_replace("\\", "/", realpath($calendar_path));
 	}
 }
 
@@ -210,9 +210,9 @@ 
 // return boolean true if $version is >= current php version
 function check_php_version($version) {
 	// intval used for version like "4.0.4pl1"
-	$testVer=intval(str_replace(".", "",$version));
-	$curVer=intval(str_replace(".", "",phpversion()));
-	if( $curVer < $testVer )
+	$testVer = intval(str_replace(".", "", $version));
+	$curVer = intval(str_replace(".", "", phpversion()));
+	if ($curVer < $testVer)
 		return FALSE;
 	return TRUE;
 }
@@ -221,14 +221,14 @@ 
 //
 // arg0: string filename
 // returns boolean is the uploaded a file
-function is_uploaded_file_v4 ($filename) {
+function is_uploaded_file_v4($filename) {
     if (!$tmp_file = get_cfg_var('upload_tmp_dir')) {
         $tmp_file = dirname(tempnam('', ''));
     }
-    $tmp_file .= '/' . basename($filename);
+    $tmp_file .= '/'.basename($filename);
     // For Windows compat
-    $filename = str_replace ("\\", "/", $filename);
-    $tmp_file = str_replace ("\\", "/", $tmp_file);
+    $filename = str_replace("\\", "/", $filename);
+    $tmp_file = str_replace("\\", "/", $tmp_file);
     // User might have trailing slash in php.ini... 
     return (ereg_replace('/+', '/', $tmp_file) == $filename);
 }
@@ -237,24 +237,24 @@ 
 //
 // arg0: array error number from $_FILES[file]['error']
 // returns string error message
-function get_upload_error ($upload_error) {
+function get_upload_error($upload_error) {
 	global $php_error_lang;
 	global $upload_error_lang;
 	global $upload_error_gen_lang;
 	
 	if (isset($upload_error)) {
 		// This is only available in PHP >= 4.2.0
-		$error = $php_error_lang . " ";
-		switch($upload_error) {
+		$error = $php_error_lang." ";
+		switch ($upload_error) {
 			case 0: //no error; possible file attack!
 			case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 			case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
 			case 3: //uploaded file was only partially uploaded
 			case 4: //no file was uploaded
-				$error = $error . $upload_error . ": " . $upload_error_lang[$upload_error];
+				$error = $error.$upload_error.": ".$upload_error_lang[$upload_error];
 				break;
 			default: //a default error, just in case!  :)
-				$error = $error . $upload_error . ": " . $upload_error_gen_lang;
+				$error = $error.$upload_error.": ".$upload_error_gen_lang;
 				break;
 		}
 	}
@@ -269,9 +269,9 @@ 
 //
 // arg0: string filename
 // returns booloean does the filename end in .ics
-function is_uploaded_ics ($filename) {
+function is_uploaded_ics($filename) {
 	// Check the file extension for .ics. Can also check the the mime type, but it's not reliable so why bother...
-	if(preg_match("/.ics$/i", $filename)) {
+	if (preg_match("/.ics$/i", $filename)) {
 		return TRUE;
 	}
 	else {

Braces +35 added lines, -32 removed lines

@@ -6,10 +6,10 @@ 
 	global $_SESSION;
 	if (!isset($_SESSION['phpical_loggedin']) || $_SESSION['phpical_loggedin'] == FALSE) {
 		return FALSE;
+	} else {
+			return TRUE;
+	}
 	}
-	else
-		return TRUE;
-}
 
 // Attempt to login. If login is valid, set the session variable 'phpical_loggedin' to TRUE and store the username and password in the session
 //
@@ -51,7 +51,9 @@ 
 	
 	// set up basic connection
 	$conn_id = @ftp_connect($phpiCal_config->ftp_server, $phpiCal_config->ftp_port); 
-	if (!$conn_id) exit(error('Cannot connect to FTP server', $filename));
+	if (!$conn_id) {
+		exit(error('Cannot connect to FTP server', $filename));
+	}
 	// login with username and password
 	$login_result = @ftp_login($conn_id, $username, $password); 
 	
@@ -74,11 +76,12 @@ 
 function login_internal ($username, $password) {
 	global $phpiCal_config;
 	
-	if ($phpiCal_config->auth_internal_username == $username && $phpiCal_config->auth_internal_password == $password)
-		return TRUE;
-	else
-		return FALSE;
-}
+	if ($phpiCal_config->auth_internal_username == $username && $phpiCal_config->auth_internal_password == $password) {
+			return TRUE;
+	} else {
+			return FALSE;
+	}
+	}
 
 // Delete a calendar. If using ftp for authentication, use ftp to delete. Otherwise, use file system functions.
 //
@@ -100,15 +103,17 @@ 
 		$login_result = @ftp_login($conn_id, $_SESSION['phpical_username'], $_SESSION['phpical_password']); 
 		
 		// check connection
-		if ((!$conn_id) || (!$login_result))
-			return FALSE;
+		if ((!$conn_id) || (!$login_result)) {
+					return FALSE;
+		}
 		
 		// delete the file
 		$delete = @ftp_delete($conn_id, $filename); 
 		
 		// check delete status
-		if (!$delete)
-			return FALSE;
+		if (!$delete) {
+					return FALSE;
+		}
 		
 		// close the FTP stream 
 		@ftp_close($conn_id);
@@ -131,8 +136,7 @@ 
 		clearstatcache();
 		if (@file_exists($filename)) {
 			return FALSE;
-		}
-		else {
+		} else {
 			return TRUE;
 		}
 		
@@ -161,28 +165,28 @@ 
 		$login_result = ftp_login($conn_id, $_SESSION['phpical_username'], $_SESSION['phpical_password']); 
 		
 		// check connection
-		if ((!$conn_id) || (!$login_result))
-			return FALSE;
+		if ((!$conn_id) || (!$login_result)) {
+					return FALSE;
+		}
 		
 		// upload the file
 		$upload = ftp_put($conn_id, $destination, $source, FTP_ASCII); 
 		
 		// check upload status
-		if (!$upload)
-			return FALSE;
+		if (!$upload) {
+					return FALSE;
+		}
 		
 		// close the FTP stream 
 		ftp_close($conn_id);
 		
 		return TRUE;
-	}
-	else {
+	} else {
 		$destination = $calendar_path . "/" . basename($destination);
 		
 		if (check_php_version('4.0.3')) {
 			return move_uploaded_file($source, $destination);
-		}
-		else {
+		} else {
 			return copy($source, $destination);
 		}
 	}
@@ -197,9 +201,9 @@ 
 	global $phpiCal_config;
 	global $calendar_path;
 	
-	if ($phpiCal_config->ftp_calendar_path != '')
-		return $phpiCal_config->ftp_calendar_path;
-	else {
+	if ($phpiCal_config->ftp_calendar_path != '') {
+			return $phpiCal_config->ftp_calendar_path;
+	} else {
 		return str_replace ("\\", "/", realpath($calendar_path));
 	}
 }
@@ -212,8 +216,9 @@ 
 	// intval used for version like "4.0.4pl1"
 	$testVer=intval(str_replace(".", "",$version));
 	$curVer=intval(str_replace(".", "",phpversion()));
-	if( $curVer < $testVer )
-		return FALSE;
+	if( $curVer < $testVer ) {
+			return FALSE;
+	}
 	return TRUE;
 }
 
@@ -257,8 +262,7 @@ 
 				$error = $error . $upload_error . ": " . $upload_error_gen_lang;
 				break;
 		}
-	}
-	else {
+	} else {
 		$error = $upload_error_gen_lang;
 	}
 	
@@ -273,8 +277,7 @@ 
 	// Check the file extension for .ics. Can also check the the mime type, but it's not reliable so why bother...
 	if(preg_match("/.ics$/i", $filename)) {
 		return TRUE;
-	}
-	else {
+	} else {
 		return FALSE;
 	}
 }

phpicalendar/functions/date_functions.php

Doc Comments +9 added lines

@@ -75,6 +75,9 @@ 
  * Resolve relative paths
  * Utility function for remote_filemtime()
  */
+/**
+ * @param string $rel_path
+ */
 function resolve_path($url, $rel_path) {
 	if (parse_url($rel_path) !== FALSE) {
 		// Path is a URL
@@ -224,6 +227,9 @@ 
 // $have is the current offset (ie, '-0500')
 // $want is the wanted offset (ie, '-0700')
 // $time is the unixtime relative to $have
+/**
+ * @param integer $time
+ */
 function calcTime($have, $want, $time) {
 	if ($have == 'none' || $want == 'none') return $time;
 	$have_secs = calcOffset($have);
@@ -233,6 +239,9 @@ 
 	return $time;
 }
 
+/**
+ * @param integer $time
+ */
 function chooseOffset($time, $timezone = '') {
 	global $tz_array, $summary;
 	switch ($timezone) {

Spacing +42 added lines, -45 removed lines

@@ -21,20 +21,18 @@ 
 	$uri = parse_url($url);
 	$uri['proto'] = (
 		(isset($uri['proto']) && ($uri['proto'] == 'https')) ?
-		'ssl://' :
-		''
+		'ssl://' : ''
 	);
 	$uri['port'] = isset($uri['port']) ? $uri['port'] : 80;
 	$uri['path'] = isset($uri['path']) ? $uri['path'] : '/';
-	$uri['query'] = isset($uri['query']) ? ('?' . $uri['query']) : '';
-	$path = $uri['path'] . $uri['query'];
+	$uri['query'] = isset($uri['query']) ? ('?'.$uri['query']) : '';
+	$path = $uri['path'].$uri['query'];
 	$auth = (
 		(isset($uri['user']) || isset($uri['pass'])) ?
-		('Authentication: Basic ' . base64_encode(@$uri['user'] . ':' . @$uri['pass']) . "\r\n") :
-		''
+		('Authentication: Basic '.base64_encode(@$uri['user'].':'.@$uri['pass'])."\r\n") : ''
 	);
 
-	$handle = @fsockopen($uri['proto'] . $uri['host'], $uri['port']);
+	$handle = @fsockopen($uri['proto'].$uri['host'], $uri['port']);
 	if (!$handle) {
 		$remote_files[$url] = 0;
 		return 0;
@@ -83,29 +81,28 @@ 
 
 	// Path is relative to this domain
 	$uri = parse_url($url);
-	$uri['proto']	= (isset($uri['proto'])	? $uri['proto']			: 'http://');
-	$uri['port']	= (isset($uri['port'])	? (':' . $uri['port'])	: '');
+	$uri['proto'] = (isset($uri['proto']) ? $uri['proto'] : 'http://');
+	$uri['port'] = (isset($uri['port']) ? (':'.$uri['port']) : '');
 	$auth = (
 		(isset($uri['user']) || isset($uri['pass'])) ?
-		(urlencode(@$uri['user']) . ':' . urlencode(@$uri['pass']) . '@') :
-		''
+		(urlencode(@$uri['user']).':'.urlencode(@$uri['pass']).'@') : ''
 	);
 
 	$rel_path = str_replace('\\', '/', $rel_path);
 	if ($rel_path{0} == '/') {
 		// Absolute path
-		return $uri['proto'] . '://' . $auth . $uri['host'] . $uri['port'] . $rel_path;
+		return $uri['proto'].'://'.$auth.$uri['host'].$uri['port'].$rel_path;
 	}
 
 	// Relative path
-	return $uri['proto'] . '://' . $auth . $uri['host'] . $uri['port'] . @$uri['path'] . '/' . $rel_path;
+	return $uri['proto'].'://'.$auth.$uri['host'].$uri['port'].@$uri['path'].'/'.$rel_path;
 }
 
 // takes iCalendar 2 day format and makes it into 3 characters
 // if $txt is true, it returns the 3 letters, otherwise it returns the
 // integer of that day; 0=Sun, 1=Mon, etc.
-function two2threeCharDays($day, $txt=true) {
-	switch($day) {
+function two2threeCharDays($day, $txt = true) {
+	switch ($day) {
 		case 'SU': return ($txt ? 'sun' : '0');
 		case 'MO': return ($txt ? 'mon' : '1');
 		case 'TU': return ($txt ? 'tue' : '2');
@@ -124,12 +121,12 @@ 
 	if (isset($phpiCal_config->week_start_day)) $week_start_day = $phpiCal_config->week_start_day;
 	$timestamp = strtotime($Ymd);
 	$num = date('w', strtotime($week_start_day));
-	$start_day_time = strtotime((date('w',$timestamp)==$num ? "$week_start_day" : "last $week_start_day"), $timestamp);
-	$ret_unixtime = strtotime($day,$start_day_time);
+	$start_day_time = strtotime((date('w', $timestamp) == $num ? "$week_start_day" : "last $week_start_day"), $timestamp);
+	$ret_unixtime = strtotime($day, $start_day_time);
 	// Fix for 992744
 	// $ret_unixtime = strtotime('+12 hours', $ret_unixtime);
-	$ret_unixtime += (12 * 60 * 60);
-	$ret = date('Ymd',$ret_unixtime);
+	$ret_unixtime += (12*60*60);
+	$ret = date('Ymd', $ret_unixtime);
 	return $ret;
 }
 
@@ -140,7 +137,7 @@ 
 	$sun_now = dateOfWeek($now, "Sunday");
 	$sun_then = dateOfWeek($then, "Sunday");
 	$seconds_now = strtotime($sun_now);
-	$seconds_then =  strtotime($sun_then);
+	$seconds_then = strtotime($sun_then);
 	$diff_weeks = round(($seconds_now - $seconds_then)/(60*60*24*7));
 	return $diff_weeks;
 }
@@ -149,7 +146,7 @@ 
 // that differ between them.
 function dayCompare($now, $then) {
 	$seconds_now = strtotime($now);
-	$seconds_then =  strtotime($then);
+	$seconds_then = strtotime($then);
 	$diff_seconds = $seconds_now - $seconds_then;
 	$diff_minutes = $diff_seconds/60;
 	$diff_hours = $diff_minutes/60;
@@ -161,22 +158,22 @@ 
 // function to compare to dates in Ymd and return the number of months 
 // that differ between them.
 function monthCompare($now, $then) {
-	ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $now, $date_now);
-	ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $then, $date_then);
+	ereg("([0-9]{4})([0-9]{2})([0-9]{2})", $now, $date_now);
+	ereg("([0-9]{4})([0-9]{2})([0-9]{2})", $then, $date_then);
 	$diff_years = $date_now[1] - $date_then[1];
 	$diff_months = $date_now[2] - $date_then[2];
 	if ($date_now[2] < $date_then[2]) {
 		$diff_years -= 1;
-		$diff_months = ($diff_months + 12) % 12;
+		$diff_months = ($diff_months + 12)%12;
 	}
-	$diff_months = ($diff_years * 12) + $diff_months;
+	$diff_months = ($diff_years*12) + $diff_months;
 
 	return $diff_months;
 }
 
 function yearCompare($now, $then) {
-	ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $now, $date_now);
-	ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $then, $date_then);
+	ereg("([0-9]{4})([0-9]{2})([0-9]{2})", $now, $date_now);
+	ereg("([0-9]{4})([0-9]{2})([0-9]{2})", $then, $date_then);
 	$diff_years = $date_now[1] - $date_then[1];
 	return $diff_years;
 }
@@ -192,7 +189,7 @@ 
 function localizeDate($format, $timestamp) {
 	global $daysofweek_lang, $daysofweekshort_lang, $daysofweekreallyshort_lang, $monthsofyear_lang, $monthsofyear_lang, $monthsofyearshort_lang;
 	$year = date("Y", $timestamp);
-	$month = date("n", $timestamp)-1;
+	$month = date("n", $timestamp) - 1;
 	$day = date("j", $timestamp);
 	$dayofweek = date("w", $timestamp);	
 	$weeknumber = date("W", $timestamp);
@@ -215,7 +212,7 @@ 
 	$sign = substr($offset_str, 0, 1);
 	$hours = substr($offset_str, 1, 2);
 	$mins = substr($offset_str, 3, 2);
-	$secs = ((int)$hours * 3600) + ((int)$mins * 60);
+	$secs = ((int)$hours*3600) + ((int)$mins*60);
 	if ($sign == '-') $secs = 0 - $secs;
 	return $secs;
 }
@@ -274,10 +271,10 @@ 
 	}
 
 	if (!empty($arr['location'])) {
-		$title .= "\nLocation: " . chopToWordCount(sanitizeForWeb(urldecode($arr['location'])), 20);
+		$title .= "\nLocation: ".chopToWordCount(sanitizeForWeb(urldecode($arr['location'])), 20);
 	}
 	if (!empty($arr['description'])) {
-		$title .= "\n\n" . chopToWordCount(sanitizeForWeb(urldecode($arr['description'])), 80);
+		$title .= "\n\n".chopToWordCount(sanitizeForWeb(urldecode($arr['description'])), 80);
 	}
 	$title = trim($title);
 
@@ -306,8 +303,8 @@ 
 	# build tooltip
 	$title = makeTitle($arr, $time);
 	# for iCal pseudo tag <http> comptability
-	if (ereg('<([[:alpha:]]+://)([^<>[:space:]]+)>',$event_text,$matches)) {
-		$full_event_text = $matches[1] . $matches[2];
+	if (ereg('<([[:alpha:]]+://)([^<>[:space:]]+)>', $event_text, $matches)) {
+		$full_event_text = $matches[1].$matches[2];
 		$event_text = $matches[2];
 	} else {
 		$full_event_text = $event_text;
@@ -317,7 +314,7 @@ 
 	if (!empty($link_class)) $link_class = ' class="'.$link_class.'"';
 
 	if (!empty($event_text)) {
-		$title = strip_tags(str_replace('<br />',"\n",$title));
+		$title = strip_tags(str_replace('<br />', "\n", $title));
 		if ($lines > 0) {
 			$event_text = word_wrap($event_text, $length, $lines);
 		}
@@ -326,7 +323,7 @@ 
 			$escaped_date = addslashes($event_date);
 			$escaped_time = addslashes($time);
 			$escaped_uid  = addslashes($uid);
-			$event_data   = addslashes(serialize ($arr));
+			$event_data   = addslashes(serialize($arr));
 			// fix for URL-length bug in IE: populate and submit a hidden form on click
 			static $popup_data_index = 0;
 			$return = "
@@ -357,10 +354,10 @@ 
 */
 function extractDateTime($data, $property, $field) {
 	global $tz_array, $phpiCal_config, $calendar_tz;
-	$allday =''; #suppress error on returning undef.
+	$allday = ''; #suppress error on returning undef.
 	// Check for zulu time.
 	$zulu_time = false;
-	if (substr($data,-1) == 'Z') $zulu_time = true;
+	if (substr($data, -1) == 'Z') $zulu_time = true;
 	// Pull out the timezone, or use GMT if zulu time was indicated.
 	if (preg_match('/^'.$property.';TZID=/i', $field)) {
 		$tz_tmp = explode('=', $field);
@@ -370,9 +367,9 @@ 
 	}
 	
 	// Extract date-only values.
-	if ((preg_match('/^'.$property.';VALUE=DATE:/i', $field)) || (ereg ('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data)))  {
+	if ((preg_match('/^'.$property.';VALUE=DATE:/i', $field)) || (ereg('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data))) {
 		// Pull out the date value. Minimum year is 1970.
-		ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dt_check);
+		ereg('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dt_check);
 		if ($dt_check[1] < 1970) { 
 			$dt_check[1] = '1970';
 		}		
@@ -383,13 +380,13 @@ 
 	}
 	// Extract date-time values.
 	// Pull out the date and time values. Minimum year is 1970.
-	preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})T{0,1}([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
+	preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})T{0,1}([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
 	if (!isset ($regs[1])) return;
 	if ($regs[1] < 1970) { 
 		$regs[1] = '1970';
 	}
-	$date = $regs[1] . $regs[2] . $regs[3];
-	$time = $regs[4] . $regs[5];
+	$date = $regs[1].$regs[2].$regs[3];
+	$time = $regs[4].$regs[5];
 	$unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]);
 	# chooseOffset checks for Daylight Saving Time
 	$server_offset_tmp = chooseOffset($unixtime, $phpiCal_config->timezone);
@@ -418,11 +415,11 @@ 
 
 Need to return the part that matches a key in $tz_array
 */
-function match_tz($data){
+function match_tz($data) {
 	global $tz_array;
 	if (isset($tz_array[$data])) return $data;
-	foreach ($tz_array as $key=>$val){
-		if (strpos(" $data",$key) > 0) return $key;
+	foreach ($tz_array as $key=>$val) {
+		if (strpos(" $data", $key) > 0) return $key;
 	}
 	return $data;
 }?>
\ No newline at end of file

Braces +48 added lines, -16 removed lines

@@ -12,11 +12,15 @@ 
  */
 function remote_filemtime($url, $recurse = 0) {
 	// We hate infinite loops!
-	if (++$recurse > 5) return 0;
+	if (++$recurse > 5) {
+		return 0;
+	}
 	
 	// Caching the remote mtime is a Really Good Idea.
 	static $remote_files = array();
-	if (isset($remote_files[$url])) return $remote_files[$url];
+	if (isset($remote_files[$url])) {
+		return $remote_files[$url];
+	}
 
 	$uri = parse_url($url);
 	$uri['proto'] = (
@@ -44,7 +48,9 @@ 
 	$headers = array();
 	while (!feof($handle)) {
 		$line = trim(fgets($handle, 1024));
-		if (empty($line)) break;
+		if (empty($line)) {
+			break;
+		}
 		$headers[] = $line;
 	}
 	fclose($handle);
@@ -64,7 +70,9 @@ 
 				$result = strtotime($value);
 				break;
 		}
-		if ($result) break;
+		if ($result) {
+			break;
+		}
 	}
 
 	$remote_files[$url] = $result;
@@ -121,7 +129,9 @@ 
 function dateOfWeek($Ymd, $day) {
 	global $phpiCal_config;
 	$week_start_day = 'Sunday';
-	if (isset($phpiCal_config->week_start_day)) $week_start_day = $phpiCal_config->week_start_day;
+	if (isset($phpiCal_config->week_start_day)) {
+		$week_start_day = $phpiCal_config->week_start_day;
+	}
 	$timestamp = strtotime($Ymd);
 	$num = date('w', strtotime($week_start_day));
 	$start_day_time = strtotime((date('w',$timestamp)==$num ? "$week_start_day" : "last $week_start_day"), $timestamp);
@@ -216,7 +226,9 @@ 
 	$hours = substr($offset_str, 1, 2);
 	$mins = substr($offset_str, 3, 2);
 	$secs = ((int)$hours * 3600) + ((int)$mins * 60);
-	if ($sign == '-') $secs = 0 - $secs;
+	if ($sign == '-') {
+		$secs = 0 - $secs;
+	}
 	return $secs;
 }
 
@@ -225,7 +237,9 @@ 
 // $want is the wanted offset (ie, '-0700')
 // $time is the unixtime relative to $have
 function calcTime($have, $want, $time) {
-	if ($have == 'none' || $want == 'none') return $time;
+	if ($have == 'none' || $want == 'none') {
+		return $time;
+	}
 	$have_secs = calcOffset($have);
 	$want_secs = calcOffset($want);
 	$diff = $want_secs - $have_secs;
@@ -265,12 +279,16 @@ 
 		$start = localizeDate($dateFormat_week, $arr['start_unixtime']);
 		$end   = localizeDate($dateFormat_week, ($arr['end_unixtime'] - 60));
 		$title = $event_text;
-		if ($start != $end) $title .= "\n$start - $end";
+		if ($start != $end) {
+			$title .= "\n$start - $end";
+		}
 	} else {
 		$start = date($timeFormat, $arr['start_unixtime']);
 		$end   = date($timeFormat, $arr['end_unixtime']);
 		$title = "$start: $event_text";
-		if ($start != $end) $title = "$event_text\n$start - $end";
+		if ($start != $end) {
+			$title = "$event_text\n$start - $end";
+		}
 	}
 
 	if (!empty($arr['location'])) {
@@ -314,7 +332,9 @@ 
 		$event_text = strip_tags($event_text, '<b><i><u><img>');
 	}
 	
-	if (!empty($link_class)) $link_class = ' class="'.$link_class.'"';
+	if (!empty($link_class)) {
+		$link_class = ' class="'.$link_class.'"';
+	}
 
 	if (!empty($event_text)) {
 		$title = strip_tags(str_replace('<br />',"\n",$title));
@@ -360,7 +380,9 @@ 
 	$allday =''; #suppress error on returning undef.
 	// Check for zulu time.
 	$zulu_time = false;
-	if (substr($data,-1) == 'Z') $zulu_time = true;
+	if (substr($data,-1) == 'Z') {
+		$zulu_time = true;
+	}
 	// Pull out the timezone, or use GMT if zulu time was indicated.
 	if (preg_match('/^'.$property.';TZID=/i', $field)) {
 		$tz_tmp = explode('=', $field);
@@ -384,7 +406,9 @@ 
 	// Extract date-time values.
 	// Pull out the date and time values. Minimum year is 1970.
 	preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})T{0,1}([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
-	if (!isset ($regs[1])) return;
+	if (!isset ($regs[1])) {
+		return;
+	}
 	if ($regs[1] < 1970) { 
 		$regs[1] = '1970';
 	}
@@ -403,10 +427,14 @@ 
 		$tz_dt = $phpiCal_config->timezone;
 	}
 	// Set the values.
-	if ($allday == '') $unixtime = calcTime($offset_tmp, $server_offset_tmp, $unixtime);
+	if ($allday == '') {
+		$unixtime = calcTime($offset_tmp, $server_offset_tmp, $unixtime);
+	}
 	#echo "offset_tmp $offset_tmp, server_offset_tmp $server_offset_tmp, $unixtime =".date("Ymd His",$unixtime)." $time<br>";
 	$date = date('Ymd', $unixtime);
-	if ($allday == '') $time = date('Hi', $unixtime);
+	if ($allday == '') {
+		$time = date('Hi', $unixtime);
+	}
 		
 	// Return the results.
 	return array($unixtime, $date, $time, $allday, $tz_dt);
@@ -420,9 +448,13 @@ 
 */
 function match_tz($data){
 	global $tz_array;
-	if (isset($tz_array[$data])) return $data;
+	if (isset($tz_array[$data])) {
+		return $data;
+	}
 	foreach ($tz_array as $key=>$val){
-		if (strpos(" $data",$key) > 0) return $key;
+		if (strpos(" $data",$key) > 0) {
+			return $key;
+		}
 	}
 	return $data;
 }?>
\ No newline at end of file

phpicalendar/functions/draw_functions.php

Doc Comments +7 added lines

@@ -38,6 +38,9 @@ 
 
 // word wrap function that returns specified number of lines
 // when lines is 0, it returns the entire string as wordwrap() does it
+/**
+ * @param integer $length
+ */
 function word_wrap($str, $length, $lines=0) {
 	if ($lines > 0) {
 		$len = $length * $lines;
@@ -51,6 +54,10 @@ 
 
 // String intercept By Bleakwind
 // utf-8:$byte=3 | gb2312:$byte=2 | big5:$byte=2
+/**
+ * @param integer $start
+ * @param double $len
+ */
 function bite_str($string, $start, $len, $byte=3){
 	$str = "";
 	$count = 0;

Spacing +24 added lines, -24 removed lines

@@ -1,76 +1,76 @@
 <?php
 # drawEventTimes returns starttime and endtime and event length for drawing into a grid
-function drawEventTimes ($start, $end, $long_event = FALSE) {
+function drawEventTimes($start, $end, $long_event = FALSE) {
 	global  $phpiCal_config;
 	$sta_h = $sta_min = $end_h = $end_min = "00";
 	$gridLength = $phpiCal_config->gridLength;
-	if (preg_match ('/([0-9]{2})([0-9]{2})/', $start, $time)){
+	if (preg_match('/([0-9]{2})([0-9]{2})/', $start, $time)) {
 		$sta_h   = $time[1];
 		$sta_min = $time[2];
 	}
-	$sta_min = sprintf("%02d", floor($sta_min / $gridLength) * $gridLength);
+	$sta_min = sprintf("%02d", floor($sta_min/$gridLength)*$gridLength);
 	if ($sta_min == 60) {
 		$sta_h = sprintf("%02d", ($sta_h + 1));
 		$sta_min = "00";
 	}
 	
-	if (preg_match ('/([0-9]{2})([0-9]{2})/', $end, $time)){
+	if (preg_match('/([0-9]{2})([0-9]{2})/', $end, $time)) {
 		$end_h   = $time[1];
 		$end_min = $time[2];
 	}
-	$end_min = sprintf("%02d", floor($end_min / $gridLength) * $gridLength);
+	$end_min = sprintf("%02d", floor($end_min/$gridLength)*$gridLength);
 	if ($end_min == 60) {
 		$end_h = sprintf("%02d", ($end_h + 1));
 		$end_min = "00";
 	}
 	
-	if ((!$long_event) && (($sta_h . $sta_min) == ($end_h . $end_min))) {
+	if ((!$long_event) && (($sta_h.$sta_min) == ($end_h.$end_min))) {
 		$end_min += $gridLength;
 		if ($end_min == 60) {
 			$end_h = sprintf("%02d", ($end_h + 1));
 			$end_min = "00";
 		}
 	}
-	$draw_len = ($end_h * 60 + $end_min) - ($sta_h * 60 + $sta_min);
+	$draw_len = ($end_h*60 + $end_min) - ($sta_h*60 + $sta_min);
 
-	return array ("draw_start" => ($sta_h . $sta_min), "draw_end" => ($end_h . $end_min), "draw_length" => $draw_len);
+	return array("draw_start" => ($sta_h.$sta_min), "draw_end" => ($end_h.$end_min), "draw_length" => $draw_len);
 }
 
 // word wrap function that returns specified number of lines
 // when lines is 0, it returns the entire string as wordwrap() does it
-function word_wrap($str, $length, $lines=0) {
+function word_wrap($str, $length, $lines = 0) {
 	if ($lines > 0) {
-		$len = $length * $lines;
+		$len = $length*$lines;
 		//if ($len < strlen($str)) {
 		// $str = substr($str,0,$len).'...';
 		//}
-		$rstr=bite_str($str,0,$len+1);
+		$rstr = bite_str($str, 0, $len + 1);
 	}
 	return $rstr;
 }
 
 // String intercept By Bleakwind
 // utf-8:$byte=3 | gb2312:$byte=2 | big5:$byte=2
-function bite_str($string, $start, $len, $byte=3){
+function bite_str($string, $start, $len, $byte = 3) {
 	$str = "";
 	$count = 0;
 	$str_len = strlen($string);
-	for ($i=0; $i<$str_len; $i++) {
-		if (($count+1-$start)>$len) {
+	for ($i = 0; $i < $str_len; $i++) {
+		if (($count + 1 - $start) > $len) {
 			$str .= "...";
 			break;
-		} elseif ((ord(substr($string,$i,1)) <= 128) && ($count < $start)){
+		} elseif ((ord(substr($string, $i, 1)) <= 128) && ($count < $start)) {
 			$count++;
-		} elseif ((ord(substr($string,$i,1)) > 128) && ($count < $start)){
-			$count = $count+2;
-			$i = $i+$byte-1;
-		} elseif ((ord(substr($string,$i,1)) <= 128) && ($count >= $start)){
-			$str .= substr($string,$i,1);
+		} elseif ((ord(substr($string, $i, 1)) > 128) && ($count < $start)) {
+			$count = $count + 2;
+			$i = $i + $byte - 1;
+		} elseif ((ord(substr($string, $i, 1)) <= 128) && ($count >= $start)) {
+			$str .= substr($string, $i, 1);
 			$count++;
-		} elseif ((ord(substr($string,$i,1)) > 128) && ($count >= $start)){
-			$str .= substr($string,$i,$byte);
-			$count = $count+2;
-			$i = $i+$byte-1;
+		} elseif ((ord(substr($string, $i, 1)) > 128) && ($count >= $start)) {
+			$str .= substr($string, $i, $byte);
+			$count = $count + 2;
+			$i = $i + $byte - 1;
 		}
 	}
 	return $str;

phpicalendar/functions/init/sanitize.php

Doc Comments +2 added lines

@@ -35,6 +35,7 @@ 
 
 /**
  * Truncate a string to a specific number of words
+ * @param integer $count
  */
 function chopToWordCount($string, $count) {
     $wc = str_word_count($string);
@@ -49,6 +50,7 @@ 
 
 /**
  * Strip "dangerous" HTML to make it safe to print to web browsers
+ * @param string $string
  */
 function sanitizeForWeb($string) {
     $string = preg_replace('/<br\s*\/?>/', "\n", $string);

Indentation +30 added lines, -30 removed lines

@@ -14,22 +14,22 @@ 
  * @return mixed
  */
 function recursiveSanitize($value) {
-    if (is_array($value)) {
-        $valmod = array();
-        foreach ($value as $key => $subval) {
-            if (is_array($subval)) {
-                $subval = recursiveSanitize($subval);
-            } else {
-                $subval = strip_tags($subval);
-            }
-            $valmod[$key] = $subval;
-        }
-        $value = $valmod;
-    } else {
-        $value = strip_tags($value);
-    }
+	if (is_array($value)) {
+		$valmod = array();
+		foreach ($value as $key => $subval) {
+			if (is_array($subval)) {
+				$subval = recursiveSanitize($subval);
+			} else {
+				$subval = strip_tags($subval);
+			}
+			$valmod[$key] = $subval;
+		}
+		$value = $valmod;
+	} else {
+		$value = strip_tags($value);
+	}
     
-    return $value;
+	return $value;
 }
 
 
@@ -37,34 +37,34 @@ 
  * Truncate a string to a specific number of words
  */
 function chopToWordCount($string, $count) {
-    $wc = str_word_count($string);
-    if ($wc > $count) {
+	$wc = str_word_count($string);
+	if ($wc > $count) {
 	$words = str_word_count($string, 2);
 	$last_word = array_slice($words, $count, 1, true);
 	$pos = key($last_word);
 	$string = substr($string, 0, $pos) . '...';
-    }
-    return $string;
+	}
+	return $string;
 }
 
 /**
  * Strip "dangerous" HTML to make it safe to print to web browsers
  */
 function sanitizeForWeb($string) {
-    $string = preg_replace('/<br\s*\/?>/', "\n", $string);
+	$string = preg_replace('/<br\s*\/?>/', "\n", $string);
 
-    $string = str_replace('&#36;', '$', $string);
-    $string = str_replace('&', '&amp;', $string);
-    $string = str_replace('<', '&lt;', $string);
-    $string = str_replace('>', '&gt;', $string);
-    $string = str_replace('\'', '&#39;', $string);
-    $string = str_replace('"', '&#34;', $string);
-    $string = str_replace('$', '&#36;', $string);
+	$string = str_replace('&#36;', '$', $string);
+	$string = str_replace('&', '&amp;', $string);
+	$string = str_replace('<', '&lt;', $string);
+	$string = str_replace('>', '&gt;', $string);
+	$string = str_replace('\'', '&#39;', $string);
+	$string = str_replace('"', '&#34;', $string);
+	$string = str_replace('$', '&#36;', $string);
 
-    $string = str_replace("\n", '<br />', $string);
-    $string = str_replace("\t", ' &nbsp; &nbsp; ', $string);
+	$string = str_replace("\n", '<br />', $string);
+	$string = str_replace("\t", ' &nbsp; &nbsp; ', $string);
 
-    return $string;
+	return $string;
 }
 
 

Spacing +16 added lines, -16 removed lines

@@ -42,7 +42,7 @@ 
 	$words = str_word_count($string, 2);
 	$last_word = array_slice($words, $count, 1, true);
 	$pos = key($last_word);
-	$string = substr($string, 0, $pos) . '...';
+	$string = substr($string, 0, $pos).'...';
     }
     return $string;
 }
@@ -72,12 +72,12 @@ 
 	$_SERVER = &$HTTP_SERVER_VARS;
 }
 
-foreach ($_REQUEST as $key=>$val){
-	switch ($key){
+foreach ($_REQUEST as $key=>$val) {
+	switch ($key) {
 		case 'event_data':
 			# modify this to allow or disallow different HTML tags in event popups
 			$allowed = "<p><br><b><i><em><a><img><div><span><ul><ol><li><h1><h2><h3><h4><h5><h6><hr><em><strong><small><table><tr><td><th>";
-			$val = strip_tags($val,$allowed);
+			$val = strip_tags($val, $allowed);
 			break;
 		default:	
 			# cpath
@@ -86,11 +86,11 @@ 
 
 	$_REQUEST[$key] = $val;
 }
-foreach ($_POST as $key=>$val){
-	switch ($key){
+foreach ($_POST as $key=>$val) {
+	switch ($key) {
 		case 'action':
-			$actions = array('login','logout','addupdate','delete');
-			if (!in_array($val,$actions)) $val = '';
+			$actions = array('login', 'logout', 'addupdate', 'delete');
+			if (!in_array($val, $actions)) $val = '';
 			break;
 		case 'date':
 		case 'time':
@@ -102,16 +102,16 @@ 
 	$_POST[$key] = $val;
 
 }
-foreach ($_GET as $key=>$val){
-	switch ($key){
+foreach ($_GET as $key=>$val) {
+	switch ($key) {
 		case 'cal':
-			if (!is_array($val)){
+			if (!is_array($val)) {
 				$val = strip_tags($val);
 				$_GET['cal'] = strip_tags($val);
-			}else{
+			} else {
 				unset ($_GET['cal']);
-				foreach($val as $cal){
-					$_GET['cal'][]= strip_tags($cal);
+				foreach ($val as $cal) {
+					$_GET['cal'][] = strip_tags($cal);
 				}
 			}
 			break;
@@ -124,8 +124,8 @@ 
 	if ($key != 'cal') $_GET[$key] = $val;
 
 }
-foreach ($_COOKIE as $key=>$val){
-	switch ($key){
+foreach ($_COOKIE as $key=>$val) {
+	switch ($key) {
 		case 'time':
 			if (!is_numeric($val)) $val = '';
 			break;

Braces +16 added lines, -6 removed lines

@@ -90,11 +90,15 @@ 
 	switch ($key){
 		case 'action':
 			$actions = array('login','logout','addupdate','delete');
-			if (!in_array($val,$actions)) $val = '';
+			if (!in_array($val,$actions)) {
+				$val = '';
+			}
 			break;
 		case 'date':
 		case 'time':
-			if (!is_numeric($val)) $val = '';
+			if (!is_numeric($val)) {
+				$val = '';
+			}
 			break;
 		default:	
 			$val = recursiveSanitize($val);
@@ -108,7 +112,7 @@ 
 			if (!is_array($val)){
 				$val = strip_tags($val);
 				$_GET['cal'] = strip_tags($val);
-			}else{
+			} else{
 				unset ($_GET['cal']);
 				foreach($val as $cal){
 					$_GET['cal'][]= strip_tags($cal);
@@ -116,18 +120,24 @@ 
 			}
 			break;
 		case 'getdate':
-			if (!is_numeric($val)) $val = ''; 
+			if (!is_numeric($val)) {
+				$val = '';
+			}
 			break;
 		default:	
 			$val = recursiveSanitize($val);
 	}
-	if ($key != 'cal') $_GET[$key] = $val;
+	if ($key != 'cal') {
+		$_GET[$key] = $val;
+	}
 
 }
 foreach ($_COOKIE as $key=>$val){
 	switch ($key){
 		case 'time':
-			if (!is_numeric($val)) $val = '';
+			if (!is_numeric($val)) {
+				$val = '';
+			}
 			break;
 		default:	
 		$val = recursiveSanitize($val);

phpicalendar/functions/is_daylight.php

Doc Comments +3 added lines

@@ -2,6 +2,9 @@
 /* 	values are offset in hhmm (not seconds!) relative to GMT
 	case The first value is for standard, and the second value is for daylight
 */
+/**
+ * @param string $timezone
+ */
 function is_daylight($time, $timezone){
 	global $tz_array, $summary;
 	# default to std time, overwrite if daylight.

Spacing +22 added lines, -22 removed lines

@@ -2,22 +2,22 @@ 
 /* 	values are offset in hhmm (not seconds!) relative to GMT
 	case The first value is for standard, and the second value is for daylight
 */
-function is_daylight($time, $timezone){
+function is_daylight($time, $timezone) {
 	global $tz_array, $summary;
 	# default to std time, overwrite if daylight.
 	$dlst = 0;
 	# Subtract the offset for std time.  This will be slightly off in some cases, but will be closer than using nothing (?).
 	$time = $time - calcOffset($tz_array[$timezone][0]);
 	$year = date("Y", $time);
-	$month = date("m",$time);
-	$day = date("d",$time);
-	$hour = date("H",$time);
+	$month = date("m", $time);
+	$day = date("d", $time);
+	$hour = date("H", $time);
 	
-	if(isset($tz_array[$timezone]['dt_start'][$year]) && isset($tz_array[$timezone]['st_start'][$year])){
-		$start	= $tz_array[$timezone]['dt_start'][$year];
-		$end 	= $tz_array[$timezone]['st_start'][$year];	
-	}else{
-		switch ($timezone){
+	if (isset($tz_array[$timezone]['dt_start'][$year]) && isset($tz_array[$timezone]['st_start'][$year])) {
+		$start = $tz_array[$timezone]['dt_start'][$year];
+		$end = $tz_array[$timezone]['st_start'][$year];	
+	} else {
+		switch ($timezone) {
 			case 'US/Samoa':                     # array('-1100', '-1100');
 			case 'America/Adak':                 # array('-1000', '-0900');
 			case 'America/Atka':    
@@ -80,18 +80,18 @@ 
 			case 'Canada/Newfoundland':
 			case 'America/Godthab':              # array('-0300', '-0200');
 			case 'America/Miquelon':   
-				if ($year < 2007){
-					$start 	= strtotime("+1 Sun",strtotime($year."0331"));
-					$end 	= strtotime("-1 Sun",strtotime($year."1101"));
-				}else{
-					$start 	= strtotime("+2 Sun",strtotime($year."0300"));
-					$end 	= strtotime("+1 Sun",strtotime($year."1031"));
+				if ($year < 2007) {
+					$start 	= strtotime("+1 Sun", strtotime($year."0331"));
+					$end 	= strtotime("-1 Sun", strtotime($year."1101"));
+				} else {
+					$start 	= strtotime("+2 Sun", strtotime($year."0300"));
+					$end 	= strtotime("+1 Sun", strtotime($year."1031"));
 				}
 				break;
 			case 'America/Havana':          
 			case 'Cuba':                   
-				$start 	= strtotime("+3 Sun",strtotime($year."0300"));
-				$end 	= strtotime("-1 Sun",strtotime($year."1101"));	
+				$start = strtotime("+3 Sun", strtotime($year."0300"));
+				$end = strtotime("-1 Sun", strtotime($year."1101"));	
 				break;
 			case 'America/Cancun':     
 			case 'America/Chihuahua':       
@@ -104,8 +104,8 @@ 
 			case 'Mexico/BajaNorte': 
 			case 'Mexico/General':          
 			case 'America/Mazatlan':        
-				$start 	= strtotime("+1 Sun",strtotime($year."0331"));
-				$end 	= strtotime("-1 Sun",strtotime($year."1101"));
+				$start = strtotime("+1 Sun", strtotime($year."0331"));
+				$end = strtotime("-1 Sun", strtotime($year."1101"));
 				break;
 			case 'Chile/EasterIsland':           # array('-0500', '-0600');
 			case 'Pacific/Easter':        
@@ -190,8 +190,8 @@ 
 			case 'Europe/Uzhgorod':   
 			case 'Europe/Zaporozhye': 
 			case 'EET':               
-				$start 	= strtotime("-1 Sun",strtotime($year."0401"));
-				$end 	= strtotime("-1 Sun",strtotime($year."1101"));	
+				$start = strtotime("-1 Sun", strtotime($year."0401"));
+				$end = strtotime("-1 Sun", strtotime($year."1101"));	
 				break;
 			case 'Africa/Windhoek':       	     # array('+0200', '+0100');
 		
@@ -287,7 +287,7 @@ 
 				$dlst = date('I', $time);
 		}
 	}
-	if (isset($start,$end) && $time >= $start && $time < $end) $dlst = 1;
+	if (isset($start, $end) && $time >= $start && $time < $end) $dlst = 1;
 	#echo "$summary $dlst <br>";
 
 	return $dlst;

Braces +5 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 	if(isset($tz_array[$timezone]['dt_start'][$year]) && isset($tz_array[$timezone]['st_start'][$year])){
 		$start	= $tz_array[$timezone]['dt_start'][$year];
 		$end 	= $tz_array[$timezone]['st_start'][$year];	
-	}else{
+	} else{
 		switch ($timezone){
 			case 'US/Samoa':                     # array('-1100', '-1100');
 			case 'America/Adak':                 # array('-1000', '-0900');
@@ -83,7 +83,7 @@ 
 				if ($year < 2007){
 					$start 	= strtotime("+1 Sun",strtotime($year."0331"));
 					$end 	= strtotime("-1 Sun",strtotime($year."1101"));
-				}else{
+				} else{
 					$start 	= strtotime("+2 Sun",strtotime($year."0300"));
 					$end 	= strtotime("+1 Sun",strtotime($year."1031"));
 				}
@@ -287,7 +287,9 @@ 
 				$dlst = date('I', $time);
 		}
 	}
-	if (isset($start,$end) && $time >= $start && $time < $end) $dlst = 1;
+	if (isset($start,$end) && $time >= $start && $time < $end) {
+		$dlst = 1;
+	}
 	#echo "$summary $dlst <br>";
 
 	return $dlst;

phpicalendar/functions/parse/overlapping_events.php

Doc Comments +3 added lines

@@ -1,6 +1,9 @@
 <?php
 // function to determine maximum necessary columns per day
 // actually an algorithm to get the smallest multiple for two numbers
+/**
+ * @param integer $b
+ */
 function kgv($a, $b) {
 	$x = $a;
 	$y = $b;

Braces +23 added lines, -9 removed lines

@@ -5,8 +5,11 @@ 
 	$x = $a;
 	$y = $b;
 	while ($x != $y) {
-		if ($x < $y) $x += $a;
-		else $y += $b;
+		if ($x < $y) {
+			$x += $a;
+		} else {
+			$y += $b;
+		}
 	}
 	return $x;
 }
@@ -63,8 +66,9 @@ 
 
 	$count = 0;
 	foreach ($ol_ranges as $loop_range) {
-		if ($count < $loop_range['count'])
-			$count = $loop_range['count'];
+		if ($count < $loop_range['count']) {
+					$count = $loop_range['count'];
+		}
 	}
 
 	return $count;
@@ -87,8 +91,12 @@ 
 			// check if blocks overlap
 			if (($loop_block['blockStart'] < $new_block['blockEnd']) && ($loop_block['blockEnd'] > $new_block['blockStart'])) {
 				// define start and end of merged overlap block
-				if ($new_block['blockStart'] > $loop_block['blockStart']) $ol_blocks[$new_block_key]['blockStart'] = $loop_block['blockStart'];
-				if ($new_block['blockEnd'] < $loop_block['blockEnd']) $ol_blocks[$new_block_key]['blockEnd'] = $loop_block['blockEnd'];
+				if ($new_block['blockStart'] > $loop_block['blockStart']) {
+					$ol_blocks[$new_block_key]['blockStart'] = $loop_block['blockStart'];
+				}
+				if ($new_block['blockEnd'] < $loop_block['blockEnd']) {
+					$ol_blocks[$new_block_key]['blockEnd'] = $loop_block['blockEnd'];
+				}
 				$ol_blocks[$new_block_key]['events'] = array_merge($new_block['events'], $loop_block['events']);
 				$new_block['events'] = $ol_blocks[$new_block_key]['events'];
 				foreach ($loop_block['overlapRanges'] as $ol_range) {
@@ -134,7 +142,9 @@ 
 	//		'end'	- end_time for the overlap block.
 function checkOverlap($event_date, $event_time, $uid) {
 	global $master_array, $overlap_array;
-	if (!isset($event_date)) return;
+	if (!isset($event_date)) {
+		return;
+	}
 	$event = $master_array[$event_date][$event_time][$uid];
 	// Copy out the array - we replace this at the end.
 	$ol_day_array = @$overlap_array[$event_date];
@@ -150,8 +160,12 @@ 
 				// ... unless it's already in the $ol_block
 				if (!in_array(array('time' => $drawTimes['draw_start'], 'key' => $uid), $loop_ol_block['events'])) {
 					$loop_ol_block['events'][] = array('time' => $drawTimes['draw_start'], 'key' => $uid);
-					if ($loop_ol_block['blockStart'] > $drawTimes['draw_start']) $loop_ol_block['blockStart'] = $drawTimes['draw_start'];
-					if ($loop_ol_block['blockEnd'] < $drawTimes['draw_end']) $loop_ol_block['blockEnd'] = $drawTimes['draw_end'];
+					if ($loop_ol_block['blockStart'] > $drawTimes['draw_start']) {
+						$loop_ol_block['blockStart'] = $drawTimes['draw_start'];
+					}
+					if ($loop_ol_block['blockEnd'] < $drawTimes['draw_end']) {
+						$loop_ol_block['blockEnd'] = $drawTimes['draw_end'];
+					}
 
 					// Merge in the new overlap range
 					$loop_ol_block['overlapRanges'] = merge_range($loop_ol_block['overlapRanges'], $drawTimes['draw_start'], $drawTimes['draw_end']);