xpressengine / xe-core

classes/cache/CacheMemcache.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 *
 	 * Do not use this directly. You can use getInstance() instead.
 	 * @param string $url url of memcache
-	 * @return void
+	 * @return false|null
 	 */
 	function CacheMemcache($url)
 	{

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	function getInstance($url)
 	{
-		if(!$GLOBALS['__CacheMemcache__'])
+		if (!$GLOBALS['__CacheMemcache__'])
 		{
 			$GLOBALS['__CacheMemcache__'] = new CacheMemcache($url);
 		}
@@ -41,12 +41,12 @@ 
 	{
 		//$config['url'] = array('memcache://localhost:11211');
 		$config['url'] = is_array($url) ? $url : array($url);
-		if(class_exists('Memcached'))
+		if (class_exists('Memcached'))
 		{
 			$this->Memcache = new Memcached;
 			$this->SelectedExtension = 'Memcached';
 		}
-		elseif(class_exists('Memcache'))
+		elseif (class_exists('Memcache'))
 		{
 			$this->Memcache = new Memcache;
 			$this->SelectedExtension = 'Memcache';
@@ -56,7 +56,7 @@ 
 			return false;
 		}
 
-		foreach($config['url'] as $url)
+		foreach ($config['url'] as $url)
 		{
 			$info = parse_url($url);
 			$this->Memcache->addServer($info['host'], $info['port']);
@@ -70,15 +70,15 @@ 
 	 */
 	function isSupport()
 	{
-		if(isset($GLOBALS['XE_MEMCACHE_SUPPORT']))
+		if (isset($GLOBALS['XE_MEMCACHE_SUPPORT']))
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'];
 		}
-		if($this->SelectedExtension === 'Memcached')
+		if ($this->SelectedExtension === 'Memcached')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', 1); 
 		}
-		elseif($this->SelectedExtension === 'Memcache')
+		elseif ($this->SelectedExtension === 'Memcache')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1); 
 		}
@@ -96,7 +96,7 @@ 
 	 */
 	function getKey($key)
 	{
-		return md5(_XE_PATH_ . $key);
+		return md5(_XE_PATH_.$key);
 	}
 
 	/**
@@ -118,11 +118,11 @@ 
 	 */
 	function put($key, $buff, $valid_time = 0)
 	{
-		if($valid_time == 0)
+		if ($valid_time == 0)
 		{
 			$valid_time = $this->valid_time;
 		}
-		if($this->SelectedExtension === 'Memcached')
+		if ($this->SelectedExtension === 'Memcached')
 		{
 			return $this->Memcache->set($this->getKey($key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time);
 		}
@@ -145,13 +145,13 @@ 
 		$_key = $this->getKey($key);
 
 		$obj = $this->Memcache->get($_key);
-		if(!$obj || !is_array($obj))
+		if (!$obj || !is_array($obj))
 		{
 			return false;
 		}
 		unset($obj[1]);
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->_delete($_key);
 			return false;
@@ -174,12 +174,12 @@ 
 	{
 		$_key = $this->getKey($key);
 		$obj = $this->Memcache->get($_key);
-		if(!$obj || !is_array($obj))
+		if (!$obj || !is_array($obj))
 		{
 			return false;
 		}
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->_delete($_key);
 			return false;

Braces +5 added lines, -10 removed lines

@@ -45,13 +45,11 @@ 
 		{
 			$this->Memcache = new Memcached;
 			$this->SelectedExtension = 'Memcached';
-		}
-		elseif(class_exists('Memcache'))
+		} elseif(class_exists('Memcache'))
 		{
 			$this->Memcache = new Memcache;
 			$this->SelectedExtension = 'Memcache';
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -77,12 +75,10 @@ 
 		if($this->SelectedExtension === 'Memcached')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', 1); 
-		}
-		elseif($this->SelectedExtension === 'Memcache')
+		} elseif($this->SelectedExtension === 'Memcache')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1); 
-		}
-		else
+		} else
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = false;
 		}
@@ -125,8 +121,7 @@ 
 		if($this->SelectedExtension === 'Memcached')
 		{
 			return $this->Memcache->set($this->getKey($key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time);
-		}
-		else
+		} else
 		{
 			return $this->Memcache->set($this->getKey($key), array($_SERVER['REQUEST_TIME'], $buff), MEMCACHE_COMPRESSED, $valid_time);
 		}

classes/display/DisplayHandler.class.php

Spacing +43 added lines, -43 removed lines

@@ -25,7 +25,7 @@ 
 	function printContent(&$oModule)
 	{
 		// Check if the gzip encoding supported
-		if(
+		if (
 				(defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1) &&
 				strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE &&
 				extension_loaded('zlib') &&
@@ -36,23 +36,23 @@ 
 		}
 
 		// Extract contents to display by the request method
-		if(Context::get('xeVirtualRequestMethod') == 'xml')
+		if (Context::get('xeVirtualRequestMethod') == 'xml')
 		{
 			$handler = new VirtualXMLDisplayHandler();
 		}
-		else if(Context::getRequestMethod() == 'XMLRPC')
+		else if (Context::getRequestMethod() == 'XMLRPC')
 		{
 			$handler = new XMLDisplayHandler();
-			if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 			{
 				$this->gz_enabled = FALSE;
 			}
 		}
-		else if(Context::getRequestMethod() == 'JSON')
+		else if (Context::getRequestMethod() == 'JSON')
 		{
 			$handler = new JSONDisplayHandler();
 		}
-		else if(Context::getRequestMethod() == 'JS_CALLBACK')
+		else if (Context::getRequestMethod() == 'JS_CALLBACK')
 		{
 			$handler = new JSCallbackDisplayHandler();
 		}
@@ -70,9 +70,9 @@ 
 		$called_position = 'before_display_content';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(file_exists($addon_file)) include($addon_file);
+		if (file_exists($addon_file)) include($addon_file);
 
-		if(method_exists($handler, "prepareToPrint"))
+		if (method_exists($handler, "prepareToPrint"))
 		{
 			$handler->prepareToPrint($output);
 		}
@@ -80,17 +80,17 @@ 
 		// header output
 
 		$httpStatusCode = $oModule->getHttpStatusCode();
-		if($httpStatusCode && $httpStatusCode != 200)
+		if ($httpStatusCode && $httpStatusCode != 200)
 		{
 			$this->_printHttpStatusCode($httpStatusCode);
 		}
 		else
 		{
-			if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
+			if (Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
 			{
 				$this->_printJSONHeader();
 			}
-			else if(Context::getResponseMethod() != 'HTML')
+			else if (Context::getResponseMethod() != 'HTML')
 			{
 				$this->_printXMLHeader();
 			}
@@ -106,13 +106,13 @@ 
 
 		// disable gzip if output already exists
 		ob_flush();
-		if(headers_sent())
+		if (headers_sent())
 		{
 			$this->gz_enabled = FALSE;
 		}
 
 		// enable gzip using zlib extension
-		if($this->gz_enabled)
+		if ($this->gz_enabled)
 		{
 			ini_set('zlib.output_compression', true);
 		}
@@ -133,7 +133,7 @@ 
 	 */
 	function _debugOutput()
 	{
-		if(!__DEBUG__)
+		if (!__DEBUG__)
 		{
 			return;
 		}
@@ -141,32 +141,32 @@ 
 		$end = getMicroTime();
 
 		// Firebug console output
-		if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
+		if (__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
 		{
 			static $firephp;
-			if(!isset($firephp))
+			if (!isset($firephp))
 			{
 				$firephp = FirePHP::getInstance(true);
 			}
 
-			if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+			if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 			{
 				$firephp->fb('Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php', 'The IP address is not allowed.');
 				return;
 			}
 			// display total execution time and Request/Response info
-			if(__DEBUG__ & 2)
+			if (__DEBUG__ & 2)
 			{
 				$firephp->fb(
 						array(
-							'Request / Response info >>> ' . $_SERVER['REQUEST_METHOD'] . ' / ' . Context::getResponseMethod(),
+							'Request / Response info >>> '.$_SERVER['REQUEST_METHOD'].' / '.Context::getResponseMethod(),
 							array(
 								array('Request URI', 'Request method', 'Response method', 'Response contents size', 'Memory peak usage'),
 								array(
 									sprintf("%s:%s%s%s%s", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING'] ? '?' : '', $_SERVER['QUERY_STRING']),
 									$_SERVER['REQUEST_METHOD'],
 									Context::getResponseMethod(),
-									$this->content_size . ' byte',
+									$this->content_size.' byte',
 									FileHandler::filesize(memory_get_peak_usage())
 								)
 							)
@@ -175,7 +175,7 @@ 
 				);
 				$firephp->fb(
 						array(
-							'Elapsed time >>> Total : ' . sprintf('%0.5f sec', $end - __StartTime__),
+							'Elapsed time >>> Total : '.sprintf('%0.5f sec', $end - __StartTime__),
 							array(array('DB queries', 'class file load', 'Template compile', 'XmlParse compile', 'PHP', 'Widgets', 'Trans Content'),
 								array(
 									sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
@@ -193,16 +193,16 @@ 
 			}
 
 			// display DB query history
-			if((__DEBUG__ & 4) && $GLOBALS['__db_queries__'])
+			if ((__DEBUG__ & 4) && $GLOBALS['__db_queries__'])
 			{
 				$queries_output = array(array('Result/'.PHP_EOL.'Elapsed time', 'Query ID', 'Query'));
-				foreach($GLOBALS['__db_queries__'] as $query)
+				foreach ($GLOBALS['__db_queries__'] as $query)
 				{
-					$queries_output[] = array($query['result'] . PHP_EOL . sprintf('%0.5f', $query['elapsed_time']), str_replace(_XE_PATH_, '', $query['called_file']) . PHP_EOL . $query['called_method'] . '()' . PHP_EOL . $query['query_id'], $query['query']);
+					$queries_output[] = array($query['result'].PHP_EOL.sprintf('%0.5f', $query['elapsed_time']), str_replace(_XE_PATH_, '', $query['called_file']).PHP_EOL.$query['called_method'].'()'.PHP_EOL.$query['query_id'], $query['query']);
 				}
 				$firephp->fb(
 						array(
-							'DB Queries >>> ' . count($GLOBALS['__db_queries__']) . ' Queries, ' . sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
+							'DB Queries >>> '.count($GLOBALS['__db_queries__']).' Queries, '.sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
 							$queries_output
 						),
 						'TABLE'
@@ -215,9 +215,9 @@ 
 
 			$buff = array();
 			// display total execution time and Request/Response info
-			if(__DEBUG__ & 2)
+			if (__DEBUG__ & 2)
 			{
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					return;
 				}
@@ -248,21 +248,21 @@ 
 				$buff[] = sprintf("\tTrans Content \t\t\t\t\t: %0.5f sec", $GLOBALS['__trans_content_elapsed__']);
 			}
 			// DB Logging
-			if(__DEBUG__ & 4)
+			if (__DEBUG__ & 4)
 			{
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					return;
 				}
 
-				if($GLOBALS['__db_queries__'])
+				if ($GLOBALS['__db_queries__'])
 				{
 					$buff[] = sprintf("\n- DB Queries : %d Queries. %0.5f sec", count($GLOBALS['__db_queries__']), $GLOBALS['__db_elapsed_time__']);
 					$num = 0;
 
-					foreach($GLOBALS['__db_queries__'] as $query)
+					foreach ($GLOBALS['__db_queries__'] as $query)
 					{
-						if($query['result'] == 'Success')
+						if ($query['result'] == 'Success')
 						{
 							$query_result = "Query Success";
 						}
@@ -279,30 +279,30 @@ 
 			}
 
 			// Output in HTML comments
-			if($buff && __DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML')
+			if ($buff && __DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML')
 			{
 				$buff = implode("\r\n", $buff);
 				$buff = sprintf("[%s %s:%d]\r\n%s", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($buff, true));
 
-				if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+				if (__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 				{
 					$buff = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
 				}
 
-				return "<!--\r\n" . $buff . "\r\n-->";
+				return "<!--\r\n".$buff."\r\n-->";
 			}
 
 			// Output to a file
-			if($buff && __DEBUG_OUTPUT__ == 0)
+			if ($buff && __DEBUG_OUTPUT__ == 0)
 			{
-				$debug_file = _XE_PATH_ . 'files/_debug_message.php';
+				$debug_file = _XE_PATH_.'files/_debug_message.php';
 				$buff = implode(PHP_EOL, $buff);
 				$buff = sprintf("[%s]\n%s", date('Y-m-d H:i:s'), print_r($buff, true));
 
-				$buff = str_repeat('=', 80) . "\n" . $buff . "\n" . str_repeat('-', 80);
-				$buff = "\n<?php\n/*" . $buff . "*/\n?>\n";
+				$buff = str_repeat('=', 80)."\n".$buff."\n".str_repeat('-', 80);
+				$buff = "\n<?php\n/*".$buff."*/\n?>\n";
 
-				if (!@file_put_contents($debug_file, $buff, FILE_APPEND|LOCK_EX))
+				if (!@file_put_contents($debug_file, $buff, FILE_APPEND | LOCK_EX))
 				{
 					return;
 				}
@@ -318,7 +318,7 @@ 
 	{
 		header("Content-Type: text/xml; charset=UTF-8");
 		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");
@@ -332,7 +332,7 @@ 
 	{
 		header("Content-Type: text/html; charset=UTF-8");
 		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");
@@ -346,7 +346,7 @@ 
 	{
 		header("Content-Type: text/html; charset=UTF-8");
 		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 		header("Cache-Control: post-check=0, pre-check=0", false);
 		header("Pragma: no-cache");

Braces +12 added lines, -19 removed lines

@@ -39,24 +39,20 @@ 
 		if(Context::get('xeVirtualRequestMethod') == 'xml')
 		{
 			$handler = new VirtualXMLDisplayHandler();
-		}
-		else if(Context::getRequestMethod() == 'XMLRPC')
+		} else if(Context::getRequestMethod() == 'XMLRPC')
 		{
 			$handler = new XMLDisplayHandler();
 			if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 			{
 				$this->gz_enabled = FALSE;
 			}
-		}
-		else if(Context::getRequestMethod() == 'JSON')
+		} else if(Context::getRequestMethod() == 'JSON')
 		{
 			$handler = new JSONDisplayHandler();
-		}
-		else if(Context::getRequestMethod() == 'JS_CALLBACK')
+		} else if(Context::getRequestMethod() == 'JS_CALLBACK')
 		{
 			$handler = new JSCallbackDisplayHandler();
-		}
-		else
+		} else
 		{
 			$handler = new HTMLDisplayHandler();
 		}
@@ -70,7 +66,9 @@ 
 		$called_position = 'before_display_content';
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
-		if(file_exists($addon_file)) include($addon_file);
+		if(file_exists($addon_file)) {
+			include($addon_file);
+		}
 
 		if(method_exists($handler, "prepareToPrint"))
 		{
@@ -83,18 +81,15 @@ 
 		if($httpStatusCode && $httpStatusCode != 200)
 		{
 			$this->_printHttpStatusCode($httpStatusCode);
-		}
-		else
+		} else
 		{
 			if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK')
 			{
 				$this->_printJSONHeader();
-			}
-			else if(Context::getResponseMethod() != 'HTML')
+			} else if(Context::getResponseMethod() != 'HTML')
 			{
 				$this->_printXMLHeader();
-			}
-			else
+			} else
 			{
 				$this->_printHTMLHeader();
 			}
@@ -209,8 +204,7 @@ 
 				);
 			}
 			// dislpay the file and HTML comments
-		}
-		else
+		} else
 		{
 
 			$buff = array();
@@ -265,8 +259,7 @@ 
 						if($query['result'] == 'Success')
 						{
 							$query_result = "Query Success";
-						}
-						else
+						} else
 						{
 							$query_result = sprintf("Query $s : %d\n\t\t\t   %s", $query['result'], $query['errno'], $query['errstr']);
 						}