c-harris / phpquery

src/Plugin/WebBrowser.php

Indentation +125 added lines, -125 removed lines

@@ -14,15 +14,15 @@ 
 	 */
 	public static $PhpQueryMethods = null;
 
-    /**
-     * Enter description here...
-     *
-     * @param \PhpQuery\PhpQueryObject $self
-     * @param null                     $callback
-     * @param null                     $location
-     * @throws \Exception
-     * @todo support 'reset' event
-     */
+	/**
+	 * Enter description here...
+	 *
+	 * @param \PhpQuery\PhpQueryObject $self
+	 * @param null                     $callback
+	 * @param null                     $location
+	 * @throws \Exception
+	 * @todo support 'reset' event
+	 */
 	public static function WebBrowser($self, $callback = null, $location = null) {
 		$self = $self->_clone()->toRoot();
 		$location = $location
@@ -66,13 +66,13 @@ 
 		return $self;
 	}
 
-    /**
-     * Method changing browser location.
-     * Fires callback registered with WebBrowser(), if any.
-     * @param $self
-     * @param $url
-     * @return bool
-     */
+	/**
+	 * Method changing browser location.
+	 * Fires callback registered with WebBrowser(), if any.
+	 * @param $self
+	 * @param $url
+	 * @return bool
+	 */
 	public static function location($self, $url = null) {
 		// TODO if ! $url return actual location ???
 		$xhr = isset($self->document->xhr)
@@ -94,8 +94,8 @@ 
 	}
         
         
-        public static function download($self, $url = null) {
-            $xhr = isset($self->document->xhr)
+		public static function download($self, $url = null) {
+			$xhr = isset($self->document->xhr)
 			? $self->document->xhr
 			: null;
 		$xhr = PhpQuery::ajax(array(
@@ -111,19 +111,19 @@ 
 				);
 		}
 		return $return;
-        }
+		}
 }
 class UtilWebBrowser {
-    /**
-     *
-     * @param $url
-     * @param $callback
-     * @param $param1
-     * @param $param2
-     * @param $param3
-     * @throws \Exception
-     * @return \Zend_Http_Client
-     */
+	/**
+	 *
+	 * @param $url
+	 * @param $callback
+	 * @param $param1
+	 * @param $param2
+	 * @param $param3
+	 * @throws \Exception
+	 * @return \Zend_Http_Client
+	 */
 	public static function browserGet($url, $callback,
 		$param1 = null, $param2 = null, $param3 = null) {
 		PhpQuery::debug("[WebBrowser] GET: $url");
@@ -275,9 +275,9 @@ 
 			return $pq;
 	}
         
-        /**
-	 * @param Zend_Http_Client $xhr
-	 */
+		/**
+		 * @param Zend_Http_Client $xhr
+		 */
 	public static function browserDownload($xhr) {
 		PhpQuery::debug("[WebBrowser] Received from ".$xhr->getUri(true));
 		// TODO handle meta redirects
@@ -286,11 +286,11 @@ 
 		return $body;
 	}
 
-    /**
-     * @param      $e
-     * @param null $callback
-     */
-    public static function hadleClick($e, $callback = null) {
+	/**
+	 * @param      $e
+	 * @param null $callback
+	 */
+	public static function hadleClick($e, $callback = null) {
 		$node = PhpQuery::pq($e->target);
 		$type = null;
 		if ($node->is('a[href]')) {
@@ -312,13 +312,13 @@ 
 			$node->parents('form')->trigger('submit', array($e));
 	}
 
-    /**
-     * Enter description here...
-     *
-     * @TODO trigger submit for form after form's  submit button has a click event
-     * @param      $e
-     * @param null $callback
-     */
+	/**
+	 * Enter description here...
+	 *
+	 * @TODO trigger submit for form after form's  submit button has a click event
+	 * @param      $e
+	 * @param null $callback
+	 */
 	public static function handleSubmit($e, $callback = null) {
 		$node = PhpQuery::pq($e->target);
 		if (!$node->is('form') || !$node->is('[action]'))
@@ -363,91 +363,91 @@ 
  * @author stevenlewis at hotmail dot com
  */
 function glue_url($parsed)
-    {
-    if (! is_array($parsed)) return false;
-    $uri = isset($parsed['scheme']) ? $parsed['scheme'].':'.((strtolower($parsed['scheme']) == 'mailto') ? '':'//'): '';
-    $uri .= isset($parsed['user']) ? $parsed['user'].($parsed['pass']? ':'.$parsed['pass']:'').'@':'';
-    $uri .= isset($parsed['host']) ? $parsed['host'] : '';
-    $uri .= isset($parsed['port']) ? ':'.$parsed['port'] : '';
-    if(isset($parsed['path']))
-        {
-        $uri .= (substr($parsed['path'],0,1) == '/')?$parsed['path']:'/'.$parsed['path'];
-        }
-    $uri .= isset($parsed['query']) ? '?'.$parsed['query'] : '';
-    $uri .= isset($parsed['fragment']) ? '#'.$parsed['fragment'] : '';
-    return $uri;
-    }
+	{
+	if (! is_array($parsed)) return false;
+	$uri = isset($parsed['scheme']) ? $parsed['scheme'].':'.((strtolower($parsed['scheme']) == 'mailto') ? '':'//'): '';
+	$uri .= isset($parsed['user']) ? $parsed['user'].($parsed['pass']? ':'.$parsed['pass']:'').'@':'';
+	$uri .= isset($parsed['host']) ? $parsed['host'] : '';
+	$uri .= isset($parsed['port']) ? ':'.$parsed['port'] : '';
+	if(isset($parsed['path']))
+		{
+		$uri .= (substr($parsed['path'],0,1) == '/')?$parsed['path']:'/'.$parsed['path'];
+		}
+	$uri .= isset($parsed['query']) ? '?'.$parsed['query'] : '';
+	$uri .= isset($parsed['fragment']) ? '#'.$parsed['fragment'] : '';
+	return $uri;
+	}
 /**
- * Enter description here...
- *
- * @author adrian-php at sixfingeredman dot net
- */
+	 * Enter description here...
+	 *
+	 * @author adrian-php at sixfingeredman dot net
+	 */
 function resolve_url($base, $url) {
-        if (!strlen($base)) return $url;
-        // Step 2
-        if (!strlen($url)) return $base;
-        // Step 3
-        if (preg_match('!^[a-z]+:!i', $url)) return $url;
-        $base = parse_url($base);
-        if ($url{0} == "#") {
-                // Step 2 (fragment)
-                $base['fragment'] = substr($url, 1);
-                return unparse_url($base);
-        }
-        unset($base['fragment']);
-        unset($base['query']);
-        if (substr($url, 0, 2) == "//") {
-                // Step 4
-                return unparse_url(array(
-                        'scheme'=>$base['scheme'],
-                        'path'=>substr($url,2),
-                ));
-        } else if ($url{0} == "/") {
-                // Step 5
-                $base['path'] = $url;
-        } else {
-                // Step 6
-                $path = explode('/', $base['path']);
-                $url_path = explode('/', $url);
-                // Step 6a: drop file from base
-                array_pop($path);
-                // Step 6b, 6c, 6e: append url while removing "." and ".." from
-                // the directory portion
-                $end = array_pop($url_path);
-                foreach ($url_path as $segment) {
-                        if ($segment == '.') {
-                                // skip
-                        } else if ($segment == '..' && $path && $path[sizeof($path)-1] != '..') {
-                                array_pop($path);
-                        } else {
-                                $path[] = $segment;
-                        }
-                }
-                // Step 6d, 6f: remove "." and ".." from file portion
-                if ($end == '.') {
-                        $path[] = '';
-                } else if ($end == '..' && $path && $path[sizeof($path)-1] != '..') {
-                        $path[sizeof($path)-1] = '';
-                } else {
-                        $path[] = $end;
-                }
-                // Step 6h
-                $base['path'] = join('/', $path);
+		if (!strlen($base)) return $url;
+		// Step 2
+		if (!strlen($url)) return $base;
+		// Step 3
+		if (preg_match('!^[a-z]+:!i', $url)) return $url;
+		$base = parse_url($base);
+		if ($url{0} == "#") {
+				// Step 2 (fragment)
+				$base['fragment'] = substr($url, 1);
+				return unparse_url($base);
+		}
+		unset($base['fragment']);
+		unset($base['query']);
+		if (substr($url, 0, 2) == "//") {
+				// Step 4
+				return unparse_url(array(
+						'scheme'=>$base['scheme'],
+						'path'=>substr($url,2),
+				));
+		} else if ($url{0} == "/") {
+				// Step 5
+				$base['path'] = $url;
+		} else {
+				// Step 6
+				$path = explode('/', $base['path']);
+				$url_path = explode('/', $url);
+				// Step 6a: drop file from base
+				array_pop($path);
+				// Step 6b, 6c, 6e: append url while removing "." and ".." from
+				// the directory portion
+				$end = array_pop($url_path);
+				foreach ($url_path as $segment) {
+						if ($segment == '.') {
+								// skip
+						} else if ($segment == '..' && $path && $path[sizeof($path)-1] != '..') {
+								array_pop($path);
+						} else {
+								$path[] = $segment;
+						}
+				}
+				// Step 6d, 6f: remove "." and ".." from file portion
+				if ($end == '.') {
+						$path[] = '';
+				} else if ($end == '..' && $path && $path[sizeof($path)-1] != '..') {
+						$path[sizeof($path)-1] = '';
+				} else {
+						$path[] = $end;
+				}
+				// Step 6h
+				$base['path'] = join('/', $path);
 
-        }
-        // Step 7
-        return glue_url($base);
+		}
+		// Step 7
+		return glue_url($base);
 }
 
 function unparse_url($parsed_url) {
-    $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
-    $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
-    $port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
-    $user     = isset($parsed_url['user']) ? $parsed_url['user'] : '';
-    $pass     = isset($parsed_url['pass']) ? ':' . $parsed_url['pass']  : '';
-    $pass     = ($user || $pass) ? "$pass@" : '';
-    $path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
-    $query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
-    $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
-    return "$scheme$user$pass$host$port$path$query$fragment";
+	$scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
+	$host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
+	$port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
+	$user     = isset($parsed_url['user']) ? $parsed_url['user'] : '';
+	$pass     = isset($parsed_url['pass']) ? ':' . $parsed_url['pass']  : '';
+	$pass     = ($user || $pass) ? "$pass@" : '';
+	$path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
+	$query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
+	$fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
+	return "$scheme$user$pass$host$port$path$query$fragment";
 }
\ No newline at end of file

Spacing +22 added lines, -22 removed lines

@@ -31,7 +31,7 @@ 
 			: $self->document->xhr->getUri(true);
 		// FIXME tmp
 		$self->document->WebBrowserCallback = $callback;
-		if (! $location)
+		if (!$location)
 			throw new \Exception('Location needed to activate WebBrowser plugin !');
 		else {
 			$self->bind('click', array($location, $callback), array('\PhpQuery\Plugin\UtilWebBrowser', 'hadleClick'));
@@ -49,10 +49,10 @@ 
 			$url = $self->find('a')->attr('href');
 		if ($url) {
 			$url = resolve_url($self->document->location, $url);
-			if (! $dir)
+			if (!$dir)
 				$dir = getcwd();
 			// TODO resolv name from response headers
-			if (! $filename) {
+			if (!$filename) {
 				$matches = null;
 				preg_match('@/([^/]+)$@', $url, $matches);
 				$filename = $matches[1];
@@ -254,7 +254,7 @@ 
 			PhpQuery::debug("Meta redirect... '{$refresh->attr('content')}'\n");
 			// there is a refresh, so get the new url
 			$content = $refresh->attr('content');
-			$urlRefresh = substr($content, strpos($content, '=')+1);
+			$urlRefresh = substr($content, strpos($content, '=') + 1);
 			$urlRefresh = trim($urlRefresh, '\'"');
 			// XXX not secure ?!
 			PhpQuery::ajaxAllowURL($urlRefresh);
@@ -302,7 +302,7 @@ 
 				'url' => resolve_url($e->data[0], $node->attr('href')),
 				'referer' => $node->document->location,
 			), $xhr);
-			if ((! $callback || !($callback instanceof \Callback)) && $e->data[1])
+			if ((!$callback || !($callback instanceof \Callback)) && $e->data[1])
 				$callback = $e->data[1];
 			if ($xhr->getLastResponse()->isSuccessful() && $callback)
 				PhpQuery::callbackRun($callback, array(
@@ -333,10 +333,10 @@ 
 //			: $node->find(':submit:first')->get(0);
 			: $node->find('*:submit:first')->get(0);
 		$data = array();
-		foreach($node->serializeArray($submit) as $r)
+		foreach ($node->serializeArray($submit) as $r)
 		// XXXt.c maybe $node->not(':submit')->add($sumit) would be better ?
 //		foreach($node->serializeArray($submit) as $r)
-			$data[ $r['name'] ] = $r['value'];
+			$data[$r['name']] = $r['value'];
 		$options = array(
 			'type' => $node->attr('method')
 				? $node->attr('method')
@@ -349,7 +349,7 @@ 
 		if ($node->attr('enctype'))
 			$options['contentType'] = $node->attr('enctype');
 		$xhr = PhpQuery::ajax($options, $xhr);
-		if ((! $callback || !($callback instanceof Callback)) && $e->data[1])
+		if ((!$callback || !($callback instanceof Callback)) && $e->data[1])
 			$callback = $e->data[1];
 		if ($xhr->getLastResponse()->isSuccessful() && $callback)
 			PhpQuery::callbackRun($callback, array(
@@ -364,14 +364,14 @@ 
  */
 function glue_url($parsed)
     {
-    if (! is_array($parsed)) return false;
-    $uri = isset($parsed['scheme']) ? $parsed['scheme'].':'.((strtolower($parsed['scheme']) == 'mailto') ? '':'//'): '';
-    $uri .= isset($parsed['user']) ? $parsed['user'].($parsed['pass']? ':'.$parsed['pass']:'').'@':'';
+    if (!is_array($parsed)) return false;
+    $uri = isset($parsed['scheme']) ? $parsed['scheme'].':'.((strtolower($parsed['scheme']) == 'mailto') ? '' : '//') : '';
+    $uri .= isset($parsed['user']) ? $parsed['user'].($parsed['pass'] ? ':'.$parsed['pass'] : '').'@' : '';
     $uri .= isset($parsed['host']) ? $parsed['host'] : '';
     $uri .= isset($parsed['port']) ? ':'.$parsed['port'] : '';
-    if(isset($parsed['path']))
+    if (isset($parsed['path']))
         {
-        $uri .= (substr($parsed['path'],0,1) == '/')?$parsed['path']:'/'.$parsed['path'];
+        $uri .= (substr($parsed['path'], 0, 1) == '/') ? $parsed['path'] : '/'.$parsed['path'];
         }
     $uri .= isset($parsed['query']) ? '?'.$parsed['query'] : '';
     $uri .= isset($parsed['fragment']) ? '#'.$parsed['fragment'] : '';
@@ -400,7 +400,7 @@ 
                 // Step 4
                 return unparse_url(array(
                         'scheme'=>$base['scheme'],
-                        'path'=>substr($url,2),
+                        'path'=>substr($url, 2),
                 ));
         } else if ($url{0} == "/") {
                 // Step 5
@@ -417,7 +417,7 @@ 
                 foreach ($url_path as $segment) {
                         if ($segment == '.') {
                                 // skip
-                        } else if ($segment == '..' && $path && $path[sizeof($path)-1] != '..') {
+                        } else if ($segment == '..' && $path && $path[sizeof($path) - 1] != '..') {
                                 array_pop($path);
                         } else {
                                 $path[] = $segment;
@@ -426,8 +426,8 @@ 
                 // Step 6d, 6f: remove "." and ".." from file portion
                 if ($end == '.') {
                         $path[] = '';
-                } else if ($end == '..' && $path && $path[sizeof($path)-1] != '..') {
-                        $path[sizeof($path)-1] = '';
+                } else if ($end == '..' && $path && $path[sizeof($path) - 1] != '..') {
+                        $path[sizeof($path) - 1] = '';
                 } else {
                         $path[] = $end;
                 }
@@ -440,14 +440,14 @@ 
 }
 
 function unparse_url($parsed_url) {
-    $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
+    $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : '';
     $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
-    $port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
+    $port     = isset($parsed_url['port']) ? ':'.$parsed_url['port'] : '';
     $user     = isset($parsed_url['user']) ? $parsed_url['user'] : '';
-    $pass     = isset($parsed_url['pass']) ? ':' . $parsed_url['pass']  : '';
+    $pass     = isset($parsed_url['pass']) ? ':'.$parsed_url['pass'] : '';
     $pass     = ($user || $pass) ? "$pass@" : '';
     $path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
-    $query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
-    $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
+    $query    = isset($parsed_url['query']) ? '?'.$parsed_url['query'] : '';
+    $fragment = isset($parsed_url['fragment']) ? '#'.$parsed_url['fragment'] : '';
     return "$scheme$user$pass$host$port$path$query$fragment";
 }
\ No newline at end of file

Braces +65 added lines, -41 removed lines

@@ -31,9 +31,9 @@ 
 			: $self->document->xhr->getUri(true);
 		// FIXME tmp
 		$self->document->WebBrowserCallback = $callback;
-		if (! $location)
-			throw new \Exception('Location needed to activate WebBrowser plugin !');
-		else {
+		if (! $location) {
+					throw new \Exception('Location needed to activate WebBrowser plugin !');
+		} else {
 			$self->bind('click', array($location, $callback), array('\PhpQuery\Plugin\UtilWebBrowser', 'hadleClick'));
 			$self->bind('submit', array($location, $callback), array('\PhpQuery\Plugin\UtilWebBrowser', 'handleSubmit'));
 		}
@@ -43,14 +43,16 @@ 
 	}
 	public static function downloadTo($self, $dir = null, $filename = null) {
 		$url = null;
-		if ($self->is('a[href]'))
-			$url = $self->attr('href');
-		else if ($self->find('a')->length)
-			$url = $self->find('a')->attr('href');
+		if ($self->is('a[href]')) {
+					$url = $self->attr('href');
+		} else if ($self->find('a')->length) {
+					$url = $self->find('a')->attr('href');
+		}
 		if ($url) {
 			$url = resolve_url($self->document->location, $url);
-			if (! $dir)
-				$dir = getcwd();
+			if (! $dir) {
+							$dir = getcwd();
+			}
 			// TODO resolv name from response headers
 			if (! $filename) {
 				$matches = null;
@@ -84,11 +86,12 @@ 
 		$return = false;
 		if ($xhr->getLastResponse()->isSuccessful()) {
 			$return = \PhpQuery\Plugin\UtilWebBrowser::browserReceive($xhr);
-			if (isset($self->document->WebBrowserCallback))
-				PhpQuery::callbackRun(
+			if (isset($self->document->WebBrowserCallback)) {
+							PhpQuery::callbackRun(
 					$self->document->WebBrowserCallback,
 					array($return)
 				);
+			}
 		}
 		return $return;
 	}
@@ -104,11 +107,12 @@ 
 		$return = false;
 		if ($xhr->getLastResponse()->isSuccessful()) {
 			$return = \PhpQuery\Plugin\UtilWebBrowser::browserDownload($xhr);
-			if (isset($self->document->WebBrowserCallback))
-				PhpQuery::callbackRun(
+			if (isset($self->document->WebBrowserCallback)) {
+							PhpQuery::callbackRun(
 					$self->document->WebBrowserCallback,
 					array($return)
 				);
+			}
 		}
 		return $return;
         }
@@ -184,8 +188,9 @@ 
 //				self::browserReceive($xhr)//->WebBrowser($callback)
 //			));
 			return $xhr;
-		} else
-			return false;
+		} else {
+					return false;
+		}
 	}
 	/**
 	 *
@@ -216,13 +221,15 @@ 
 //				self::browserReceive($xhr)//->WebBrowser($callback)
 //			));
 			return $xhr;
-		} else
-			return false;
+		} else {
+					return false;
+		}
 	}
 	protected static function authorizeHost($url) {
 		$host = parse_url($url, PHP_URL_HOST);
-		if ($host)
-			PhpQuery::ajaxAllowHost($host);
+		if ($host) {
+					PhpQuery::ajaxAllowHost($host);
+		}
 	}
 	protected static function ajaxSettingsPrepare($settings) {
 		unset($settings['success']);
@@ -271,8 +278,9 @@ 
 					array('\PhpQuery\Plugin\UtilWebBrowser', 'browserReceive'), array($xhr)
 				);
 			}
-		} else
-			return $pq;
+		} else {
+					return $pq;
+		}
 	}
         
         /**
@@ -302,14 +310,17 @@ 
 				'url' => resolve_url($e->data[0], $node->attr('href')),
 				'referer' => $node->document->location,
 			), $xhr);
-			if ((! $callback || !($callback instanceof \Callback)) && $e->data[1])
-				$callback = $e->data[1];
-			if ($xhr->getLastResponse()->isSuccessful() && $callback)
-				PhpQuery::callbackRun($callback, array(
+			if ((! $callback || !($callback instanceof \Callback)) && $e->data[1]) {
+							$callback = $e->data[1];
+			}
+			if ($xhr->getLastResponse()->isSuccessful() && $callback) {
+							PhpQuery::callbackRun($callback, array(
 					self::browserReceive($xhr)
 				));
-		} else if ($node->is(':submit') && $node->parents('form')->size())
-			$node->parents('form')->trigger('submit', array($e));
+			}
+		} else if ($node->is(':submit') && $node->parents('form')->size()) {
+					$node->parents('form')->trigger('submit', array($e));
+		}
 	}
 
     /**
@@ -321,8 +332,9 @@ 
      */
 	public static function handleSubmit($e, $callback = null) {
 		$node = PhpQuery::pq($e->target);
-		if (!$node->is('form') || !$node->is('[action]'))
-			return;
+		if (!$node->is('form') || !$node->is('[action]')) {
+					return;
+		}
 		// TODO document.location
 		$xhr = isset($node->document->xhr)
 			? $node->document->xhr
@@ -333,10 +345,11 @@ 
 //			: $node->find(':submit:first')->get(0);
 			: $node->find('*:submit:first')->get(0);
 		$data = array();
-		foreach($node->serializeArray($submit) as $r)
-		// XXXt.c maybe $node->not(':submit')->add($sumit) would be better ?
+		foreach($node->serializeArray($submit) as $r) {
+				// XXXt.c maybe $node->not(':submit')->add($sumit) would be better ?
 //		foreach($node->serializeArray($submit) as $r)
 			$data[ $r['name'] ] = $r['value'];
+		}
 		$options = array(
 			'type' => $node->attr('method')
 				? $node->attr('method')
@@ -346,15 +359,18 @@ 
 			'referer' => $node->document->location,
 //			'success' => $e->data[1],
 		);
-		if ($node->attr('enctype'))
-			$options['contentType'] = $node->attr('enctype');
+		if ($node->attr('enctype')) {
+					$options['contentType'] = $node->attr('enctype');
+		}
 		$xhr = PhpQuery::ajax($options, $xhr);
-		if ((! $callback || !($callback instanceof Callback)) && $e->data[1])
-			$callback = $e->data[1];
-		if ($xhr->getLastResponse()->isSuccessful() && $callback)
-			PhpQuery::callbackRun($callback, array(
+		if ((! $callback || !($callback instanceof Callback)) && $e->data[1]) {
+					$callback = $e->data[1];
+		}
+		if ($xhr->getLastResponse()->isSuccessful() && $callback) {
+					PhpQuery::callbackRun($callback, array(
 				self::browserReceive($xhr)
 			));
+		}
 	}
 }
 /**
@@ -364,7 +380,9 @@ 
  */
 function glue_url($parsed)
     {
-    if (! is_array($parsed)) return false;
+    if (! is_array($parsed)) {
+    	return false;
+    }
     $uri = isset($parsed['scheme']) ? $parsed['scheme'].':'.((strtolower($parsed['scheme']) == 'mailto') ? '':'//'): '';
     $uri .= isset($parsed['user']) ? $parsed['user'].($parsed['pass']? ':'.$parsed['pass']:'').'@':'';
     $uri .= isset($parsed['host']) ? $parsed['host'] : '';
@@ -383,11 +401,17 @@ 
  * @author adrian-php at sixfingeredman dot net
  */
 function resolve_url($base, $url) {
-        if (!strlen($base)) return $url;
+        if (!strlen($base)) {
+        	return $url;
+        }
         // Step 2
-        if (!strlen($url)) return $base;
+        if (!strlen($url)) {
+        	return $base;
+        }
         // Step 3
-        if (preg_match('!^[a-z]+:!i', $url)) return $url;
+        if (preg_match('!^[a-z]+:!i', $url)) {
+        	return $url;
+        }
         $base = parse_url($base);
         if ($url{0} == "#") {
                 // Step 2 (fragment)

src/Proxy/jQueryServer.php

Indentation +76 added lines, -76 removed lines

@@ -20,89 +20,89 @@
  */
 class jQueryServer {
   public $config = array(
-    'allowedRefererHosts' => array(
-      '.'
-    ),
-    'refererMustMatch' => true,
+	'allowedRefererHosts' => array(
+	  '.'
+	),
+	'refererMustMatch' => true,
   );
   public $calls = null;
   public $options = null;
   public $allowedHosts = null;
   function __construct($data) {
-    $pq = null;
-    include_once(dirname(__FILE__) . '/../PhpQuery/PhpQuery.php');
-    if (file_exists(dirname(__FILE__) . '/jQueryServer.config.php')) {
-      include_once(dirname(__FILE__) . '/jQueryServer.config.php');
-      if ($jQueryServerConfig)
-        $this->config = array_merge_recursive($this->config, $jQueryServerConfig);
-    }
-    if ($this->config['refererMustMatch']) {
-      foreach ($this->config['allowedRefererHosts'] as $i => $host)
-        if ($host == '.')
-          $this->config['allowedRefererHosts'][$i] = $_SERVER['HTTP_HOST'];
-      $referer = parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
-      $authorized = $referer
-        && in_array($referer, $this->config['allowedRefererHosts']);
-      if (!$authorized) {
-        throw new \Exception("Host '{$_SERVER['HTTP_REFERER']}' not authorized to make requests.");
-        return;
-      }
-    }
-    //		PhpQueryClass::$debug = true;
-    //		if (! function_exists('json_decode')) {
-    //			include_once(dirname(__FILE__).'/JSON.php');
-    //			$this->json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
-    //		}
-    //		$data = $this->jsonDecode($data);
-    $data = PhpQuery::parseJSON($data);
-    // load document (required for first $data element)
-    if (is_array($data[0]) && isset($data[0]['url'])) {
-      $this->options = $data[0];
-      $ajax = $this->options;
-      $this->calls = array_slice($data, 1);
-      $ajax['success'] = array(
-        $this,
-        'success'
-      );
-      PhpQuery::ajax($ajax);
-    }
-    else {
-      throw new \Exception("URL needed to download content");
-    }
+	$pq = null;
+	include_once(dirname(__FILE__) . '/../PhpQuery/PhpQuery.php');
+	if (file_exists(dirname(__FILE__) . '/jQueryServer.config.php')) {
+	  include_once(dirname(__FILE__) . '/jQueryServer.config.php');
+	  if ($jQueryServerConfig)
+		$this->config = array_merge_recursive($this->config, $jQueryServerConfig);
+	}
+	if ($this->config['refererMustMatch']) {
+	  foreach ($this->config['allowedRefererHosts'] as $i => $host)
+		if ($host == '.')
+		  $this->config['allowedRefererHosts'][$i] = $_SERVER['HTTP_HOST'];
+	  $referer = parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
+	  $authorized = $referer
+		&& in_array($referer, $this->config['allowedRefererHosts']);
+	  if (!$authorized) {
+		throw new \Exception("Host '{$_SERVER['HTTP_REFERER']}' not authorized to make requests.");
+		return;
+	  }
+	}
+	//		PhpQueryClass::$debug = true;
+	//		if (! function_exists('json_decode')) {
+	//			include_once(dirname(__FILE__).'/JSON.php');
+	//			$this->json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
+	//		}
+	//		$data = $this->jsonDecode($data);
+	$data = PhpQuery::parseJSON($data);
+	// load document (required for first $data element)
+	if (is_array($data[0]) && isset($data[0]['url'])) {
+	  $this->options = $data[0];
+	  $ajax = $this->options;
+	  $this->calls = array_slice($data, 1);
+	  $ajax['success'] = array(
+		$this,
+		'success'
+	  );
+	  PhpQuery::ajax($ajax);
+	}
+	else {
+	  throw new \Exception("URL needed to download content");
+	}
   }
   public function success($response) {
-    $pq = PhpQuery::newDocument($response);
-    foreach ($this->calls as $k => $r) {
-      // check if method exists
-      if (!method_exists(get_class($pq), $r['method'])) {
-        throw new \Exception("Method '{$r['method']}' not implemented in PhpQuery, sorry...");
-        // execute method
-      }
-      else {
-        $pq = call_user_func_array(array(
-          $pq,
-          $r['method']
-        ), $r['arguments']);
-      }
-    }
-    if (!isset($this->options['dataType']))
-      $this->options['dataType'] = '';
-    switch (strtolower($this->options['dataType'])) {
-      case 'json':
-        if ($pq instanceof PhpQueryObject) {
-          $results = array();
-          foreach ($pq as $node)
-            $results[] = pq($node)->htmlOuter();
-          print PhpQuery::toJSON($results);
-        }
-        else {
-          print PhpQuery::toJSON($pq);
-        }
-        break;
-      default:
-        print $pq;
-    }
-    // output results
+	$pq = PhpQuery::newDocument($response);
+	foreach ($this->calls as $k => $r) {
+	  // check if method exists
+	  if (!method_exists(get_class($pq), $r['method'])) {
+		throw new \Exception("Method '{$r['method']}' not implemented in PhpQuery, sorry...");
+		// execute method
+	  }
+	  else {
+		$pq = call_user_func_array(array(
+		  $pq,
+		  $r['method']
+		), $r['arguments']);
+	  }
+	}
+	if (!isset($this->options['dataType']))
+	  $this->options['dataType'] = '';
+	switch (strtolower($this->options['dataType'])) {
+	  case 'json':
+		if ($pq instanceof PhpQueryObject) {
+		  $results = array();
+		  foreach ($pq as $node)
+			$results[] = pq($node)->htmlOuter();
+		  print PhpQuery::toJSON($results);
+		}
+		else {
+		  print PhpQuery::toJSON($pq);
+		}
+		break;
+	  default:
+		print $pq;
+	}
+	// output results
   }
   //	public function jsonEncode($data) {
   //		return function_exists('json_encode')

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@
   public $allowedHosts = null;
   function __construct($data) {
     $pq = null;
-    include_once(dirname(__FILE__) . '/../PhpQuery/PhpQuery.php');
-    if (file_exists(dirname(__FILE__) . '/jQueryServer.config.php')) {
-      include_once(dirname(__FILE__) . '/jQueryServer.config.php');
+    include_once(dirname(__FILE__).'/../PhpQuery/PhpQuery.php');
+    if (file_exists(dirname(__FILE__).'/jQueryServer.config.php')) {
+      include_once(dirname(__FILE__).'/jQueryServer.config.php');
       if ($jQueryServerConfig)
         $this->config = array_merge_recursive($this->config, $jQueryServerConfig);
     }

Braces +15 added lines, -14 removed lines

@@ -33,13 +33,15 @@ 
     include_once(dirname(__FILE__) . '/../PhpQuery/PhpQuery.php');
     if (file_exists(dirname(__FILE__) . '/jQueryServer.config.php')) {
       include_once(dirname(__FILE__) . '/jQueryServer.config.php');
-      if ($jQueryServerConfig)
-        $this->config = array_merge_recursive($this->config, $jQueryServerConfig);
+      if ($jQueryServerConfig) {
+              $this->config = array_merge_recursive($this->config, $jQueryServerConfig);
+      }
     }
     if ($this->config['refererMustMatch']) {
-      foreach ($this->config['allowedRefererHosts'] as $i => $host)
-        if ($host == '.')
+      foreach ($this->config['allowedRefererHosts'] as $i => $host) {
+              if ($host == '.')
           $this->config['allowedRefererHosts'][$i] = $_SERVER['HTTP_HOST'];
+      }
       $referer = parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
       $authorized = $referer
         && in_array($referer, $this->config['allowedRefererHosts']);
@@ -65,8 +67,7 @@ 
         'success'
       );
       PhpQuery::ajax($ajax);
-    }
-    else {
+    } else {
       throw new \Exception("URL needed to download content");
     }
   }
@@ -77,25 +78,25 @@ 
       if (!method_exists(get_class($pq), $r['method'])) {
         throw new \Exception("Method '{$r['method']}' not implemented in PhpQuery, sorry...");
         // execute method
-      }
-      else {
+      } else {
         $pq = call_user_func_array(array(
           $pq,
           $r['method']
         ), $r['arguments']);
       }
     }
-    if (!isset($this->options['dataType']))
-      $this->options['dataType'] = '';
+    if (!isset($this->options['dataType'])) {
+          $this->options['dataType'] = '';
+    }
     switch (strtolower($this->options['dataType'])) {
       case 'json':
         if ($pq instanceof PhpQueryObject) {
           $results = array();
-          foreach ($pq as $node)
-            $results[] = pq($node)->htmlOuter();
+          foreach ($pq as $node) {
+                      $results[] = pq($node)->htmlOuter();
+          }
           print PhpQuery::toJSON($results);
-        }
-        else {
+        } else {
           print PhpQuery::toJSON($pq);
         }
         break;

src/Dom/DOMEvent.php

Indentation +99 added lines, -99 removed lines

@@ -12,106 +12,106 @@
  */
 class DOMEvent
 {
-    /**
-     * Returns a boolean indicating whether the event bubbles up through the DOM or not.
-     *
-     * @var bool
-     */
-    public $bubbles = true;
-    /**
-     * Returns a boolean indicating whether the event is cancelable.
-     *
-     * @var bool
-     */
-    public $cancelable = true;
-    /**
-     * Returns a reference to the currently registered target for the event.
-     *
-     * @var bool
-     */
-    public $currentTarget;
-    /**
-     * Returns detail about the event, depending on the type of event.
-     *
-     * @var string
-     * @link http://developer.mozilla.org/en/DOM/event.detail
-     */
-    public $detail; // ???
-    /**
-     * Used to indicate which phase of the event flow is currently being evaluated.
-     *
-     * NOT IMPLEMENTED
-     *
-     * @var string
-     * @link http://developer.mozilla.org/en/DOM/event.eventPhase
-     */
-    public $eventPhase; // ???
-    /**
-     * The explicit original target of the event (Mozilla-specific).
-     *
-     * NOT IMPLEMENTED
-     *
-     * @var string
-     */
-    public $explicitOriginalTarget; // moz only
-    /**
-     * The original target of the event, before any retargetings (Mozilla-specific).
-     *
-     * NOT IMPLEMENTED
-     *
-     * @var string
-     */
-    public $originalTarget; // moz only
-    /**
-     * Identifies a secondary target for the event.
-     *
-     * @var string
-     */
-    public $relatedTarget;
-    /**
-     * Returns a reference to the target to which the event was originally dispatched.
-     *
-     * @var string
-     */
-    public $target;
-    /**
-     * Returns the time that the event was created.
-     *
-     * @var string
-     */
-    public $timeStamp;
-    /**
-     * Returns the name of the event (case-insensitive).
-     */
-    public $type;
-    public $runDefault = true;
-    public $data = null;
+	/**
+	 * Returns a boolean indicating whether the event bubbles up through the DOM or not.
+	 *
+	 * @var bool
+	 */
+	public $bubbles = true;
+	/**
+	 * Returns a boolean indicating whether the event is cancelable.
+	 *
+	 * @var bool
+	 */
+	public $cancelable = true;
+	/**
+	 * Returns a reference to the currently registered target for the event.
+	 *
+	 * @var bool
+	 */
+	public $currentTarget;
+	/**
+	 * Returns detail about the event, depending on the type of event.
+	 *
+	 * @var string
+	 * @link http://developer.mozilla.org/en/DOM/event.detail
+	 */
+	public $detail; // ???
+	/**
+	 * Used to indicate which phase of the event flow is currently being evaluated.
+	 *
+	 * NOT IMPLEMENTED
+	 *
+	 * @var string
+	 * @link http://developer.mozilla.org/en/DOM/event.eventPhase
+	 */
+	public $eventPhase; // ???
+	/**
+	 * The explicit original target of the event (Mozilla-specific).
+	 *
+	 * NOT IMPLEMENTED
+	 *
+	 * @var string
+	 */
+	public $explicitOriginalTarget; // moz only
+	/**
+	 * The original target of the event, before any retargetings (Mozilla-specific).
+	 *
+	 * NOT IMPLEMENTED
+	 *
+	 * @var string
+	 */
+	public $originalTarget; // moz only
+	/**
+	 * Identifies a secondary target for the event.
+	 *
+	 * @var string
+	 */
+	public $relatedTarget;
+	/**
+	 * Returns a reference to the target to which the event was originally dispatched.
+	 *
+	 * @var string
+	 */
+	public $target;
+	/**
+	 * Returns the time that the event was created.
+	 *
+	 * @var string
+	 */
+	public $timeStamp;
+	/**
+	 * Returns the name of the event (case-insensitive).
+	 */
+	public $type;
+	public $runDefault = true;
+	public $data = null;
 
-    public function __construct($data)
-    {
-        foreach ($data as $k => $v) {
-            $this->$k = $v;
-        }
-        if (!$this->timeStamp) {
-            $this->timeStamp = time();
-        }
-    }
+	public function __construct($data)
+	{
+		foreach ($data as $k => $v) {
+			$this->$k = $v;
+		}
+		if (!$this->timeStamp) {
+			$this->timeStamp = time();
+		}
+	}
 
-    /**
-     * Cancels the event (if it is cancelable).
-     *
-     */
-    public function preventDefault()
-    {
-        $this->runDefault = false;
-    }
+	/**
+	 * Cancels the event (if it is cancelable).
+	 *
+	 */
+	public function preventDefault()
+	{
+		$this->runDefault = false;
+	}
 
-    /**
-     * Stops the propagation of events further along in the DOM.
-     *
-     */
-    public function stopPropagation()
-    {
-        $this->bubbles = false;
-    }
+	/**
+	 * Stops the propagation of events further along in the DOM.
+	 *
+	 */
+	public function stopPropagation()
+	{
+		$this->bubbles = false;
+	}
 }

src/Tests/_archive/test_webbrowser.php

Indentation +8 added lines, -8 removed lines

@@ -13,10 +13,10 @@ 
 if (0) {
 	PhpQuery::$plugins->browserGet('http://google.com/', 'success1');
 	/**
-	*
-	* @param $pq PhpQueryObject
-	* @return unknown_type
-	*/
+	 *
+	 * @param $pq PhpQueryObject
+	 * @return unknown_type
+	 */
 	function success1($pq) {
 		print 'success1 callback';
 		$pq
@@ -28,10 +28,10 @@ 
 		;
 	}
 	/**
-	*
-	* @param $html PhpQueryObject
-	* @return unknown_type
-	*/
+	 *
+	 * @param $html PhpQueryObject
+	 * @return unknown_type
+	 */
 	function success2($pq) {
 		print 'success2 callback';
 		print $pq

src/Tests/_archive/test_ajax.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 ));
 function a789fhasdui3124($html) {
 	$testName = 'AJAX request text node';
-	if ( $html == 'hello world' )
+	if ($html == 'hello world')
 		print "Test '$testName' PASSED :)";
 	else {
 		print "Test '$testName' <strong>FAILED</strong> !!! ";

Braces +5 added lines, -5 removed lines

@@ -35,9 +35,9 @@ 
 $test = PhpQuery::newDocumentFile('test.html')
 	->find('div:first')
 	->load('http://wikipedia.org/ div[lang]');
-if (pq('div[lang]')->size())
+if (pq('div[lang]')->size()) {
 	print "Test '$testName' PASSED :)";
-else {
+} else {
 	print "Test '$testName' <strong>FAILED</strong> !!! ";
 	print "<pre>";
 	print "</pre>\n";
@@ -53,9 +53,9 @@ 
 ));
 function a789fhasdui3124($html) {
 	$testName = 'AJAX request text node';
-	if ( $html == 'hello world' )
-		print "Test '$testName' PASSED :)";
-	else {
+	if ( $html == 'hello world' ) {
+			print "Test '$testName' PASSED :)";
+	} else {
 		print "Test '$testName' <strong>FAILED</strong> !!! ";
 	}
 	print "\n";

src/Tests/_archive/document-types/document-utf8.php

Spacing +1 added lines, -1 removed lines

@@ -8,6 +8,6 @@
 	<body>
 		<span>Hello World!</span>
 		<span>ąśżźć</span>
-		<a href='<?php foreach($foo as $bar) { print $foo['1'] } ?>'>Attr test</a>
+		<a href='<?php foreach ($foo as $bar) { print $foo['1'] } ?>'>Attr test</a>
 	</body>
 </html>

src/Tests/_archive/test_scripts.php

Braces +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@ 
 $testName = 'Scripts/example';
 $doc = PhpQuery::newDocumentFile('test.html');
 $testResult = 10;
-if ($doc->script('example', 'p')->length == $testResult)
+if ($doc->script('example', 'p')->length == $testResult) {
 	print "Test '$testName' PASSED :)";
-else {
+} else {
 	print "Test '$testName' <strong>FAILED</strong> !!! ";
 	print "<pre>";
 	var_dump($doc->whois());
@@ -26,9 +26,9 @@ 
 $editor = PhpQuery::newDocument('<div/>')
 	->script('google_login')
 	->location($url);
-if ($editor->find('textarea#content')->length == $testResult)
+if ($editor->find('textarea#content')->length == $testResult) {
 	print "Test '$testName' PASSED :)";
-else {
+} else {
 	print "Test '$testName' <strong>FAILED</strong> !!! ";
 	print "<pre>";
 	var_dump($doc->whois());

src/Tests/_archive/test_attr.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 $testName = 'Attribute change in iteration';
 $expected = 'new attr value';
 $doc = PhpQuery::newDocumentFile('test.html');
-foreach($doc['p[rel]:first'] as $p)
+foreach ($doc['p[rel]:first'] as $p)
 	pq($p)->attr('rel', $expected);
 if ($doc['p[rel]:first']->attr('rel') == $expected)
 	print "Test '{$testName}' passed :)";

Braces +8 added lines, -5 removed lines

@@ -7,20 +7,23 @@
 $result = PhpQuery::newDocumentFile('test.html')
 	->find('p[rel]:first')
 		->attr('rel', $expected);
-if ($result->attr('rel') == $expected)
+if ($result->attr('rel') == $expected) {
 	print "Test '{$testName}' passed :)";
-else
+} else {
 	print "Test '{$testName}' <strong>FAILED</strong> !!!";
+}
 print "\n";
 
 
 $testName = 'Attribute change in iteration';
 $expected = 'new attr value';
 $doc = PhpQuery::newDocumentFile('test.html');
-foreach($doc['p[rel]:first'] as $p)
+foreach($doc['p[rel]:first'] as $p) {
 	pq($p)->attr('rel', $expected);
-if ($doc['p[rel]:first']->attr('rel') == $expected)
+}
+if ($doc['p[rel]:first']->attr('rel') == $expected) {
 	print "Test '{$testName}' passed :)";
-else
+} else {
 	print "Test '{$testName}' <strong>FAILED</strong> !!!";
+}
 print "\n";
\ No newline at end of file

src/Tests/_archive/test_events.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 // 	create_function('$node', 'return $node->getAttribute("name");')
 // );
 $results = array();
-foreach($inputs as $node) {
+foreach ($inputs as $node) {
 	$node = pq($node);
 	$name = $node->attr('name');
 	$results[$name] = false;
@@ -42,7 +42,7 @@ 
 		->val(array('foo'))
 	->end()
 ;
-foreach($results as $name => $result) {
+foreach ($results as $name => $result) {
 	print $result
 		? "Test for '$name' PASSED :)<br />\n"
 		: "Test for '$name' <strong>FAILED</strong> !!!<br />\n";