pradosoft / prado

framework/Web/UI/ActiveControls/TActiveFileUpload.php

Braces +4 added lines, -8 removed lines

@@ -223,14 +223,12 @@ 
 				// this is the most secure method, file info can't be forged from client side, no matter what
 				$token = md5('TActiveFileUpload::Params::'.$this->ClientID.'::'+rand(1000*1000,9999*1000));
 				$cache->set($token, serialize($params), 5*60); // expire in 5 minutes - the callback should arrive back in seconds, actually
-			}
-		else
+			} else
 		if ($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				// this is a less secure method, file info can be still forged from client side, but only if attacker knows the secret application key
 				$token = urlencode(base64_encode($mgr->encrypt(serialize($params))));
-			}
-		else
+			} else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
 		return $token;
@@ -244,14 +242,12 @@ 
 				assert($v!='');
 				$cache->delete($token); // remove it from cache so it can't be used again and won't take up space either
 				$params = unserialize($v);
-			}
-		else
+			} else
 		if ($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				$v = $mgr->decrypt(base64_decode(urldecode($token)));
 				$params = unserialize($v);
-			}
-		else
+			} else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
 		assert($params instanceof TActiveFileUploadCallbackParams);

Spacing +86 added lines, -86 removed lines

@@ -43,7 +43,7 @@ 
 class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallbackEventHandler, INamingContainer
 {
 
-	const SCRIPT_PATH = 'prado/activefileupload';
+	const SCRIPT_PATH='prado/activefileupload';
 
 	/**
 	 * @var THiddenField a flag to tell which component is doing the callback.
@@ -72,7 +72,7 @@ 
 	 * TActiveControlAdapter. If you override this class, be sure to set the
 	 * adapter appropriately by, for example, by calling this constructor.
 	 */
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
@@ -97,17 +97,17 @@ 
 	 */
 	public function onFileUpload($param)
 	{
-		if ($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param == $this->_target->getUniqueID()){
+		if($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param==$this->_target->getUniqueID()) {
 			// save the file so that it will persist past the end of this return.
-			$localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
+			$localName=str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()), ''));
 			parent::saveAs($localName);
 
-			$params = new TActiveFileUploadCallbackParams;
-			$params->localName = $localName;
-			$params->fileName = addslashes($this->getFileName());
-			$params->fileSize = $this->getFileSize();
-			$params->fileType = $this->getFileType();
-			$params->errorCode = $this->getErrorCode();
+			$params=new TActiveFileUploadCallbackParams;
+			$params->localName=$localName;
+			$params->fileName=addslashes($this->getFileName());
+			$params->fileSize=$this->getFileSize();
+			$params->fileType=$this->getFileType();
+			$params->errorCode=$this->getErrorCode();
 
 			// return some javascript to display a completion status.
 			echo <<<EOS
@@ -132,7 +132,7 @@ 
 	 * @return string the path where the uploaded file will be stored temporarily, in namespace format
 	 * default "Application.runtime.*"
 	 */
-	public function getTempPath(){
+	public function getTempPath() {
 		return $this->getViewState('TempPath', 'Application.runtime.*');
 	}
 
@@ -140,15 +140,15 @@ 
 	 * @param string the path where the uploaded file will be stored temporarily in namespace format
 	 * default "Application.runtime.*"
 	 */
-	public function setTempPath($value){
-		$this->setViewState('TempPath',$value,'Application.runtime.*');
+	public function setTempPath($value) {
+		$this->setViewState('TempPath', $value, 'Application.runtime.*');
 	}
 
 	/**
 	 * @return boolean a value indicating whether an automatic callback to the server will occur whenever the user modifies the text in the TTextBox control and then tabs out of the component. Defaults to true.
 	 * Note: When set to false, you will need to trigger the callback yourself.
 	 */
-	public function getAutoPostBack(){
+	public function getAutoPostBack() {
 		return $this->getViewState('AutoPostBack', true);
 	}
 
@@ -156,28 +156,28 @@ 
 	 * @param boolean a value indicating whether an automatic callback to the server will occur whenever the user modifies the text in the TTextBox control and then tabs out of the component. Defaults to true.
 	 * Note: When set to false, you will need to trigger the callback yourself.
 	 */
-	public function setAutoPostBack($value){
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),true);
+	public function setAutoPostBack($value) {
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
 	 * @return string A chuck of javascript that will need to be called if {{@link getAutoPostBack AutoPostBack} is set to false}
 	 */
-	public function getCallbackJavascript(){
+	public function getCallbackJavascript() {
 		return "Prado.WebUI.TActiveFileUpload.fileChanged(\"{$this->getClientID()}\")";
 	}
 
 	/**
 	 * @throws TInvalidDataValueException if the {@link getTempPath TempPath} is not writable.
 	 */
-	public function onInit($sender){
+	public function onInit($sender) {
 		parent::onInit($sender);
 
-		if (!Prado::getApplication()->getCache())
-		  if (!Prado::getApplication()->getSecurityManager())
+		if(!Prado::getApplication()->getCache())
+		  if(!Prado::getApplication()->getSecurityManager())
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
-		if (!is_writable(Prado::getPathOfNamespace($this->getTempPath()))){
+		if(!is_writable(Prado::getPathOfNamespace($this->getTempPath()))) {
 			throw new TInvalidDataValueException("activefileupload_temppath_invalid", $this->getTempPath());
 		}
 	}
@@ -189,17 +189,17 @@ 
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
 	 */
- 	public function raiseCallbackEvent($param){
- 		$cp = $param->getCallbackParameter();
-		if ($key = $cp->targetID == $this->_target->getUniqueID()){
+ 	public function raiseCallbackEvent($param) {
+ 		$cp=$param->getCallbackParameter();
+		if($key=$cp->targetID==$this->_target->getUniqueID()) {
 
-			$params = $this->popParamsByToken($cp->callbackToken);
+			$params=$this->popParamsByToken($cp->callbackToken);
 
-			$_FILES[$key]['name'] = stripslashes($params->fileName);
-			$_FILES[$key]['size'] = intval($params->fileSize);
-			$_FILES[$key]['type'] = $params->fileType;
-			$_FILES[$key]['error'] = intval($params->errorCode);
-			$_FILES[$key]['tmp_name'] = $params->localName;
+			$_FILES[$key]['name']=stripslashes($params->fileName);
+			$_FILES[$key]['size']=intval($params->fileSize);
+			$_FILES[$key]['type']=$params->fileType;
+			$_FILES[$key]['error']=intval($params->errorCode);
+			$_FILES[$key]['tmp_name']=$params->localName;
 			$this->loadPostData($key, null);
 
 			$this->raiseEvent('OnFileUpload', $this, $param);
@@ -218,17 +218,17 @@ 
 
 	protected function pushParamsAndGetToken(TActiveFileUploadCallbackParams $params)
 	{
-		if ($cache = Prado::getApplication()->getCache())
+		if($cache=Prado::getApplication()->getCache())
 			{
 				// this is the most secure method, file info can't be forged from client side, no matter what
-				$token = md5('TActiveFileUpload::Params::'.$this->ClientID.'::'+rand(1000*1000,9999*1000));
-				$cache->set($token, serialize($params), 5*60); // expire in 5 minutes - the callback should arrive back in seconds, actually
+				$token=md5('TActiveFileUpload::Params::'.$this->ClientID.'::'+rand(1000 * 1000, 9999 * 1000));
+				$cache->set($token, serialize($params), 5 * 60); // expire in 5 minutes - the callback should arrive back in seconds, actually
 			}
 		else
-		if ($mgr = Prado::getApplication()->getSecurityManager())
+		if($mgr=Prado::getApplication()->getSecurityManager())
 			{
 				// this is a less secure method, file info can be still forged from client side, but only if attacker knows the secret application key
-				$token = urlencode(base64_encode($mgr->encrypt(serialize($params))));
+				$token=urlencode(base64_encode($mgr->encrypt(serialize($params))));
 			}
 		else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
@@ -238,18 +238,18 @@ 
 
 	protected function popParamsByToken($token)
 	{
-		if ($cache = Prado::getApplication()->getCache())
+		if($cache=Prado::getApplication()->getCache())
 			{
-				$v = $cache->get($token);
+				$v=$cache->get($token);
 				assert($v!='');
 				$cache->delete($token); // remove it from cache so it can't be used again and won't take up space either
-				$params = unserialize($v);
+				$params=unserialize($v);
 			}
 		else
-		if ($mgr = Prado::getApplication()->getSecurityManager())
+		if($mgr=Prado::getApplication()->getSecurityManager())
 			{
-				$v = $mgr->decrypt(base64_decode(urldecode($token)));
-				$params = unserialize($v);
+				$v=$mgr->decrypt(base64_decode(urldecode($token)));
+				$params=unserialize($v);
 			}
 		else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
@@ -266,19 +266,19 @@ 
 	{
 		parent::onPreRender($param);
 
-		if(!$this->getPage()->getIsPostBack() && isset($_GET['TActiveFileUpload_InputId']) && isset($_GET['TActiveFileUpload_TargetId']) && $_GET['TActiveFileUpload_InputId'] == $this->getClientID())
+		if(!$this->getPage()->getIsPostBack() && isset($_GET['TActiveFileUpload_InputId']) && isset($_GET['TActiveFileUpload_TargetId']) && $_GET['TActiveFileUpload_InputId']==$this->getClientID())
 		{
 			// tricky workaround to intercept "uploaded file too big" error: real uploads happens in onFileUpload instead
-			$this->_errorCode = UPLOAD_ERR_FORM_SIZE;
-			$localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
-			$fileName = addslashes($this->getFileName());
+			$this->_errorCode=UPLOAD_ERR_FORM_SIZE;
+			$localName=str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()), ''));
+			$fileName=addslashes($this->getFileName());
 
-			$params = new TActiveFileUploadCallbackParams;
-			$params->localName = $localName;
-			$params->fileName = $fileName;
-			$params->fileSize = $this->getFileSize();
-			$params->fileType = $this->getFileType();
-			$params->errorCode = $this->getErrorCode();
+			$params=new TActiveFileUploadCallbackParams;
+			$params->localName=$localName;
+			$params->fileName=$fileName;
+			$params->fileSize=$this->getFileSize();
+			$params->fileType=$this->getFileType();
+			$params->errorCode=$this->getErrorCode();
 
 			echo <<<EOS
 <script language="Javascript">
@@ -296,30 +296,30 @@ 
 		}
 	}
 
-	public function createChildControls(){
-		$this->_flag = Prado::createComponent('THiddenField');
+	public function createChildControls() {
+		$this->_flag=Prado::createComponent('THiddenField');
 		$this->_flag->setID('Flag');
 		$this->getControls()->add($this->_flag);
 
-		$this->_busy = Prado::createComponent('TImage');
+		$this->_busy=Prado::createComponent('TImage');
 		$this->_busy->setID('Busy');
 		$this->_busy->setImageUrl($this->getAssetUrl('ActiveFileUploadIndicator.gif'));
 		$this->_busy->setStyle("display:none");
 		$this->getControls()->add($this->_busy);
 
-		$this->_success = Prado::createComponent('TImage');
+		$this->_success=Prado::createComponent('TImage');
 		$this->_success->setID('Success');
 		$this->_success->setImageUrl($this->getAssetUrl('ActiveFileUploadComplete.png'));
 		$this->_success->setStyle("display:none");
 		$this->getControls()->add($this->_success);
 
-		$this->_error = Prado::createComponent('TImage');
+		$this->_error=Prado::createComponent('TImage');
 		$this->_error->setID('Error');
 		$this->_error->setImageUrl($this->getAssetUrl('ActiveFileUploadError.png'));
 		$this->_error->setStyle("display:none");
 		$this->getControls()->add($this->_error);
 
-		$this->_target = Prado::createComponent('TInlineFrame');
+		$this->_target=Prado::createComponent('TInlineFrame');
 		$this->_target->setID('Target');
 		$this->_target->setFrameUrl($this->getAssetUrl('ActiveFileUploadBlank.html'));
 		$this->_target->setStyle("width:0px; height:0px;");
@@ -331,10 +331,10 @@ 
 	/**
 	 * Removes localfile on ending of the callback.
 	 */
-	public function onUnload($param){
-		if ($this->getPage()->getIsCallback() &&
+	public function onUnload($param) {
+		if($this->getPage()->getIsCallback() &&
 			$this->getHasFile() &&
-			file_exists($this->getLocalName())){
+			file_exists($this->getLocalName())) {
 				unlink($this->getLocalName());
 		}
 		parent::onUnload($param);
@@ -343,7 +343,7 @@ 
 	/**
 	 * @return TBaseActiveCallbackControl standard callback control options.
 	 */
-	public function getActiveControl(){
+	public function getActiveControl() {
 		return $this->getAdapter()->getBaseActiveControl();
 	}
 
@@ -359,18 +359,18 @@ 
 	 * Adds ID attribute, and renders the javascript for active component.
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
-	public function addAttributesToRender($writer){
+	public function addAttributesToRender($writer) {
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		$this->getPage()->getClientScript()->registerPradoScript('activefileupload');
-		$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(),$this->getClientOptions());
+		$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getClientOptions());
 	}
 
 	/**
 	 * @return string corresponding javascript class name for this control.
 	 */
-	protected function getClientClassName(){
+	protected function getClientClassName() {
 		return 'Prado.WebUI.TActiveFileUpload';
 	}
 
@@ -384,18 +384,18 @@ 
 	 * 					completeID => complete client ID,
 	 * 					errorID => error client ID)
 	 */
-	protected function getClientOptions(){
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-
-		$options['inputID'] = $this->getClientID();
-		$options['flagID'] = $this->_flag->getClientID();
-		$options['targetID'] = $this->_target->getUniqueID();
-		$options['formID'] = $this->getPage()->getForm()->getClientID();
-		$options['indicatorID'] = $this->_busy->getClientID();
-		$options['completeID'] = $this->_success->getClientID();
-		$options['errorID'] = $this->_error->getClientID();
-		$options['autoPostBack'] = $this->getAutoPostBack();
+	protected function getClientOptions() {
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+
+		$options['inputID']=$this->getClientID();
+		$options['flagID']=$this->_flag->getClientID();
+		$options['targetID']=$this->_target->getUniqueID();
+		$options['formID']=$this->getPage()->getForm()->getClientID();
+		$options['indicatorID']=$this->_busy->getClientID();
+		$options['completeID']=$this->_success->getClientID();
+		$options['errorID']=$this->_error->getClientID();
+		$options['autoPostBack']=$this->getAutoPostBack();
 		return $options;
 	}
 
@@ -406,12 +406,12 @@ 
 	 * If true, you will not be able to save the uploaded file again.
 	 * @return boolean true if the file saving is successful
 	 */
-	public function saveAs($fileName,$deleteTempFile=true){
-		if (($this->getErrorCode()===UPLOAD_ERR_OK) && (file_exists($this->getLocalName()))){
-			if ($deleteTempFile)
-				return rename($this->getLocalName(),$fileName);
+	public function saveAs($fileName, $deleteTempFile=true) {
+		if(($this->getErrorCode()===UPLOAD_ERR_OK) && (file_exists($this->getLocalName()))) {
+			if($deleteTempFile)
+				return rename($this->getLocalName(), $fileName);
 			else
-				return copy($this->getLocalName(),$fileName);
+				return copy($this->getLocalName(), $fileName);
 		} else
 			return false;
 	}
@@ -420,7 +420,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		completes successfully.
 	 */
-	public function getSuccessImage(){
+	public function getSuccessImage() {
 		$this->ensureChildControls();
 		return $this->_success;
 	}
@@ -429,7 +429,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		does not complete successfully.
 	 */
-	public function getErrorImage(){
+	public function getErrorImage() {
 		$this->ensureChildControls();
 		return $this->_error;
 	}
@@ -438,7 +438,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		is in progress.
 	 */
-	public function getBusyImage(){
+	public function getBusyImage() {
 		$this->ensureChildControls();
 		return $this->_busy;
 	}

framework/Web/UI/ActiveControls/TActivePager.php

Braces +3 added lines, -6 removed lines

@@ -127,8 +127,7 @@ 
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
-		}
-		else if($buttonType===TPagerButtonType::ImageButton)
+		} else if($buttonType===TPagerButtonType::ImageButton)
 		{
 			$button = new TActiveImageButton;
 			$button->setImageUrl($this->getPageImageUrl($text,$commandName));
@@ -136,8 +135,7 @@ 
 				$button->Visible = true;
 			else
 				$button->Visible = false;
-		}
-		else
+		} else
 		{
 			$button=new TActiveButton;
 			if(!$enabled)
@@ -197,8 +195,7 @@ 
 			TWebControl::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
-		}
-		else
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}

Spacing +15 added lines, -15 removed lines

@@ -94,11 +94,11 @@ 
 		);
 
 		$this->getControls()->add($list);
-		$list->setDataSource(range(1,$this->getPageCount()));
+		$list->setDataSource(range(1, $this->getPageCount()));
 		$list->dataBind();
 		$list->setSelectedIndex($this->getCurrentPageIndex());
 		$list->setAutoPostBack(true);
-		$list->attachEventHandler('OnSelectedIndexChanged',array($this,'listIndexChanged'));
+		$list->attachEventHandler('OnSelectedIndexChanged', array($this, 'listIndexChanged'));
 		$list->attachEventHandler('OnCallback', array($this, 'handleCallback'));
 	}
 
@@ -114,7 +114,7 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($buttonType,$enabled,$text,$commandName,$commandParameter)
+	protected function createPagerButton($buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
 		if($buttonType===TPagerButtonType::LinkButton)
 		{
@@ -130,12 +130,12 @@ 
 		}
 		else if($buttonType===TPagerButtonType::ImageButton)
 		{
-			$button = new TActiveImageButton;
-			$button->setImageUrl($this->getPageImageUrl($text,$commandName));
+			$button=new TActiveImageButton;
+			$button->setImageUrl($this->getPageImageUrl($text, $commandName));
 			if($enabled)
-				$button->Visible = true;
+				$button->Visible=true;
 			else
-				$button->Visible = false;
+				$button->Visible=false;
 		}
 		else
 		{
@@ -146,7 +146,7 @@ 
 
 		if($buttonType===TPagerButtonType::ImageButton)
 		{
-			$button->ImageUrl = $text;
+			$button->ImageUrl=$text;
 		}
 
 		$button->setText($text);
@@ -170,14 +170,14 @@ 
 	 * @param mixed $sender
 	 * @param TCallbackEventParameter $param
 	 */
-	public function handleCallback ($sender,$param)
+	public function handleCallback($sender, $param)
 	{
 		// Update all the buttons pagers attached to the same control.
 		// Dropdown pagers doesn't need to be re-rendered.
 		$controlToPaginate=$this->getControlToPaginate();
-		foreach ($this->getNamingContainer()->findControlsByType('TActivePager', false) as $control)
+		foreach($this->getNamingContainer()->findControlsByType('TActivePager', false) as $control)
 		{
-			if ($control->getMode() !== TPagerMode::DropDownList && $control->getControlToPaginate()===$controlToPaginate)
+			if($control->getMode()!==TPagerMode::DropDownList && $control->getControlToPaginate()===$controlToPaginate)
 			{
 				$control->render($param->getNewWriter());
 				// FIXME : With some very fast machine, the getNewWriter() consecutive calls are in the same microsecond, resulting
@@ -189,18 +189,18 @@ 
 		$this->onCallback($param);
 	}
 
-	public function render ($writer)
+	public function render($writer)
 	{
 		if($this->getHasPreRendered())
 		{
-			$this->setDisplay(($this->getPageCount()==1)?TDisplayStyle::None:TDisplayStyle::Dynamic);
+			$this->setDisplay(($this->getPageCount()==1) ? TDisplayStyle::None : TDisplayStyle::Dynamic);
 			TWebControl::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
+				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
 		}
 		else
 		{
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 }

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TActivePager class file.
- *
- * @author "gevik" (forum contributor) and Christophe Boulain (Christophe.Boulain@gmail.com)
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TActivePager class file.
+	 *
+	 * @author "gevik" (forum contributor) and Christophe Boulain (Christophe.Boulain@gmail.com)
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 /**
  * Load active control adapter.

framework/Web/UI/ActiveControls/TActiveRepeater.php

Braces +1 added lines, -2 removed lines

@@ -95,8 +95,7 @@
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}
 	}

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
 		parent::setDataSource($value);
 		if($this->getActiveControl()->canUpdateClientSide()) {
 			$this->renderPager();
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 		}
 	}
 
@@ -94,10 +94,10 @@ 
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
+			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
 		}
 		else {
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 
@@ -111,7 +111,7 @@ 
 		foreach($pager as $item) {
 			if($item->ControlToPaginate==$this->ID) {
 				$writer=$this->getResponse()->createHtmlWriter();
-				$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 			}
 		}
 	}
@@ -123,7 +123,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	private function renderRepeater($writer) {
-		$writer->addAttribute('id',$this->getSurroundingTagID());
+		$writer->addAttribute('id', $this->getSurroundingTagID());
 		$writer->renderBeginTag($this->getSurroundingTag());
 		parent::render($writer);
 		$writer->renderEndTag();

framework/Collections/TQueue.php

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
 				$this->_d[]=$item;
 				++$this->_c;
 			}
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
  * @package System.Collections
  * @since 3.1
  */
-class TQueue extends TComponent implements IteratorAggregate,Countable
+class TQueue extends TComponent implements IteratorAggregate, Countable
 {
 	/**
 	 * internal data storage
@@ -101,7 +101,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item,$this->_d,true)!==false;
+		return array_search($item, $this->_d, true)!==false;
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	public function enqueue($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_i<$this->_c;
+		return $this->_i < $this->_c;
 	}
 }
 

framework/Xml/TXmlDocument.php

Doc Comments +5 added lines

@@ -66,6 +66,7 @@ 
 
 	/**
 	 * @param TXmlElement parent element of this element
+	 * @param TXmlElement|null $parent
 	 */
 	public function setParent($parent)
 	{
@@ -175,6 +176,7 @@ 
 	}
 
 	/**
+	 * @param string $tagName
 	 * @return TList list of all child elements that have the specified tag-name
 	 */
 	public function getElementsByTagName($tagName)
@@ -334,6 +336,7 @@ 
 
 	/**
 	 * @param string version of this XML document
+	 * @param string $version
 	 */
 	public function setVersion($version)
 	{
@@ -350,6 +353,7 @@ 
 
 	/**
 	 * @param string encoding of this XML document
+	 * @param string $encoding
 	 */
 	public function setEncoding($encoding)
 	{
@@ -473,6 +477,7 @@ 
 	/**
 	 * Recursively converts DOM XML nodes into TXmlElement
 	 * @param DOMXmlNode the node to be converted
+	 * @param DOMElement $node
 	 * @return TXmlElement the converted TXmlElement
 	 */
 	protected function buildElement($node)

Spacing +24 added lines, -24 removed lines

@@ -109,7 +109,7 @@ 
 	 */
 	public function getHasElement()
 	{
-		return $this->_elements!==null && $this->_elements->getCount()>0;
+		return $this->_elements!==null && $this->_elements->getCount() > 0;
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function getHasAttribute()
 	{
-		return $this->_attributes!==null && $this->_attributes->getCount()>0;
+		return $this->_attributes!==null && $this->_attributes->getCount() > 0;
 	}
 
 	/**
@@ -135,9 +135,9 @@ 
 	 * @param string attribute name
 	 * @param string attribute value
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,TPropertyValue::ensureString($value));
+		$this->getAttributes()->add($name, TPropertyValue::ensureString($value));
 	}
 
 	/**
@@ -203,12 +203,12 @@ 
 				$attr.=" $name=\"$value\"";
 			}
 		}
-		$prefix=str_repeat(' ',$indent*4);
+		$prefix=str_repeat(' ', $indent * 4);
 		if($this->getHasElement())
 		{
 			$str=$prefix."<{$this->_tagName}$attr>\n";
 			foreach($this->getElements() as $element)
-				$str.=$element->toString($indent+1)."\n";
+				$str.=$element->toString($indent + 1)."\n";
 			$str.=$prefix."</{$this->_tagName}>";
 			return $str;
 		}
@@ -241,7 +241,7 @@ 
 
 	private function xmlEncode($str)
 	{
-		return strtr($str,array(
+		return strtr($str, array(
 			'>'=>'&gt;',
 			'<'=>'&lt;',
 			'&'=>'&amp;',
@@ -317,7 +317,7 @@ 
 	 * @param string version of this XML document
 	 * @param string encoding of this XML document
 	 */
-	public function __construct($version='1.0',$encoding='')
+	public function __construct($version='1.0', $encoding='')
 	{
 		parent::__construct('');
 		$this->setVersion($version);
@@ -367,7 +367,7 @@ 
 		if(($str=@file_get_contents($file))!==false)
 			return $this->loadFromString($str);
 		else
-			throw new TIOException('xmldocument_file_read_failed',$file);
+			throw new TIOException('xmldocument_file_read_failed', $file);
 	}
 
 	/**
@@ -395,17 +395,17 @@ 
 		$attributes->clear();
 
 		static $bSimpleXml;
-		if($bSimpleXml === null)
-			$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		if($bSimpleXml===null)
+			$bSimpleXml=(boolean) function_exists('simplexml_load_string');
 
 		if($bSimpleXml)
 		{
-			$simpleDoc = simplexml_load_string($string);
-			$docNamespaces = $simpleDoc->getDocNamespaces(false);
-			$simpleDoc = null;
+			$simpleDoc=simplexml_load_string($string);
+			$docNamespaces=$simpleDoc->getDocNamespaces(false);
+			$simpleDoc=null;
 			foreach($docNamespaces as $prefix => $uri)
 			{
- 				if($prefix === '')
+ 				if($prefix==='')
    					$attributes->add('xmlns', $uri);
    				else
    					$attributes->add('xmlns:'.$prefix, $uri);
@@ -413,7 +413,7 @@ 
 		}
 
 		foreach($element->attributes as $name=>$attr)
-			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') .$name,$attr->value);
+			$attributes->add(($attr->prefix==='' ? '' : $attr->prefix.':').$name, $attr->value);
 		foreach($element->childNodes as $child)
 		{
 			if($child instanceof DOMElement)
@@ -430,13 +430,13 @@ 
 	 */
 	public function saveToFile($file)
 	{
-		if(($fw=fopen($file,'w'))!==false)
+		if(($fw=fopen($file, 'w'))!==false)
 		{
-			fwrite($fw,$this->saveToString());
+			fwrite($fw, $this->saveToString());
 			fclose($fw);
 		}
 		else
-			throw new TIOException('xmldocument_file_write_failed',$file);
+			throw new TIOException('xmldocument_file_write_failed', $file);
 	}
 
 	/**
@@ -445,8 +445,8 @@ 
 	 */
 	public function saveToString()
 	{
-		$version=empty($this->_version)?' version="1.0"':' version="'.$this->_version.'"';
-		$encoding=empty($this->_encoding)?'':' encoding="'.$this->_encoding.'"';
+		$version=empty($this->_version) ? ' version="1.0"' : ' version="'.$this->_version.'"';
+		$encoding=empty($this->_encoding) ? '' : ' encoding="'.$this->_encoding.'"';
 		return "<?xml{$version}{$encoding}?>\n".$this->toString(0);
 	}
 
@@ -480,7 +480,7 @@ 
 		$element=new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
 		foreach($node->attributes as $name=>$attr)
-			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name,$attr->value);
+			$element->getAttributes()->add(($attr->prefix==='' ? '' : $attr->prefix.':').$name, $attr->value);
 
 		foreach($node->childNodes as $child)
 		{
@@ -534,11 +534,11 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TXmlElement object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TXmlElement)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			if($item->getParent()!==null)
 				$item->getParent()->getElements()->remove($item);
 			$item->setParent($this->_o);

Braces +4 added lines, -8 removed lines

@@ -211,13 +211,11 @@ 
 				$str.=$element->toString($indent+1)."\n";
 			$str.=$prefix."</{$this->_tagName}>";
 			return $str;
-		}
-		else if(($value=$this->getValue())!=='')
+		} else if(($value=$this->getValue())!=='')
 		{
 			$value=$this->xmlEncode($value);
 			return $prefix."<{$this->_tagName}$attr>$value</{$this->_tagName}>";
-		}
-		else
+		} else
 			return $prefix."<{$this->_tagName}$attr />";
 	}
 
@@ -434,8 +432,7 @@ 
 		{
 			fwrite($fw,$this->saveToString());
 			fclose($fw);
-		}
-		else
+		} else
 			throw new TIOException('xmldocument_file_write_failed',$file);
 	}
 
@@ -542,8 +539,7 @@ 
 			if($item->getParent()!==null)
 				$item->getParent()->getElements()->remove($item);
 			$item->setParent($this->_o);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 	}
 

framework/Web/Javascripts/packages.php

Spacing +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@ 
 //$Id: packages.php 3319 2013-09-08 20:59:44Z ctrlaltca $
 
 // To make future upgrades easier
-if (!defined('PROTOTYPE_DIR')) define ('PROTOTYPE_DIR', 'prototype-1.7');
-if (!defined('JQUERY_DIR')) define ('JQUERY_DIR', 'jquery');
-if (!defined('BOOTSTRAP_DIR')) define ('BOOTSTRAP_DIR', 'bootstrap3');
-if (!defined('SCRIPTACULOUS_DIR')) define ('SCRIPTACULOUS_DIR', 'scriptaculous-1.9.0');
+if(!defined('PROTOTYPE_DIR')) define('PROTOTYPE_DIR', 'prototype-1.7');
+if(!defined('JQUERY_DIR')) define('JQUERY_DIR', 'jquery');
+if(!defined('BOOTSTRAP_DIR')) define('BOOTSTRAP_DIR', 'bootstrap3');
+if(!defined('SCRIPTACULOUS_DIR')) define('SCRIPTACULOUS_DIR', 'scriptaculous-1.9.0');
 
 //package names and its contents (files relative to the current directory)
-$packages = array(
+$packages=array(
 	// base prado scripts
 	'prado' => array(
 		'prado/prado.js',
@@ -115,7 +115,7 @@ 
 
 
 //package names and their dependencies
-$dependencies = array(
+$dependencies=array(
 		'jquery'			=> array('jquery'),
 		'prado'				=> array('jquery', 'prado'),
 		'bootstrap'			=> array('jquery', 'bootstrap'),
@@ -138,7 +138,7 @@ 
 		'jqueryui'			=> array('jquery', 'jqueryui'),
 		'prototype'			=> array('prototype'),
 		'dragdrop'			=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop'),
-		'dragdropextra'		=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop','dragdropextra'),
+		'dragdropextra'		=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop', 'dragdropextra'),
 		'autocomplete'		=> array('prototype', 'jquery', 'prado', 'ajax', 'autocomplete'),
 );
 

framework/Web/TUrlManager.php

Spacing +11 added lines, -11 removed lines

@@ -64,10 +64,10 @@ 
 	 * @return string URL
 	 * @see parseUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		$url=$serviceID.'='.urlencode($serviceParam);
-		$amp=$encodeAmpersand?'&':'&';
+		$amp=$encodeAmpersand ? '&' : '&';
 		$request=$this->getRequest();
 		if(is_array($getItems) || $getItems instanceof Traversable)
 		{
@@ -103,9 +103,9 @@ 
 		switch($request->getUrlFormat())
 		{
 			case THttpRequestUrlFormat::Path:
-				return $request->getApplicationUrl().'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return $request->getApplicationUrl().'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			case THttpRequestUrlFormat::HiddenPath:
-				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			default:
 				return $request->getApplicationUrl().'?'.$url;
 		}
@@ -127,24 +127,24 @@ 
 	public function parseUrl()
 	{
 		$request=$this->getRequest();
-		$pathInfo=trim($request->getPathInfo(),'/');
+		$pathInfo=trim($request->getPathInfo(), '/');
 		if(($request->getUrlFormat()===THttpRequestUrlFormat::Path ||
 			$request->getUrlFormat()===THttpRequestUrlFormat::HiddenPath) &&
 			$pathInfo!=='')
 		{
 			$separator=$request->getUrlParamSeparator();
-			$paths=explode('/',$pathInfo);
+			$paths=explode('/', $pathInfo);
 			$getVariables=array();
 			foreach($paths as $path)
 			{
 				if(($path=trim($path))!=='')
 				{
-					if(($pos=strpos($path,$separator))!==false)
+					if(($pos=strpos($path, $separator))!==false)
 					{
-						$name=substr($path,0,$pos);
-						$value=substr($path,$pos+1);
-						if(($pos=strpos($name,'[]'))!==false)
-							$getVariables[substr($name,0,$pos)][]=$value;
+						$name=substr($path, 0, $pos);
+						$value=substr($path, $pos + 1);
+						if(($pos=strpos($name, '[]'))!==false)
+							$getVariables[substr($name, 0, $pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
 					}

Braces +5 added lines, -10 removed lines

@@ -80,12 +80,10 @@ 
 						$name=urlencode($name.'[]');
 						foreach($value as $v)
 							$url.=$amp.$name.'='.urlencode($v);
-					}
-					else
+					} else
 						$url.=$amp.urlencode($name).'='.urlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($getItems as $name=>$value)
 				{
@@ -93,8 +91,7 @@ 
 					{
 						foreach($value as $v)
 							$url.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url.=$amp.$name.'='.$value;
 				}
 			}
@@ -147,14 +144,12 @@ 
 							$getVariables[substr($name,0,$pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
-					}
-					else
+					} else
 						$getVariables[$path]='';
 				}
 			}
 			return $getVariables;
-		}
-		else
+		} else
 			return array();
 	}
 }

framework/Web/Services/TSoapService.php

Spacing +35 added lines, -35 removed lines

@@ -120,7 +120,7 @@ 
 				$this->loadConfig($dom);
 			}
 			else
-				throw new TConfigurationException('soapservice_configfile_invalid',$this->_configFile);
+				throw new TConfigurationException('soapservice_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
 
@@ -137,16 +137,16 @@ 
 	protected function resolveRequest()
 	{
 		$serverID=$this->getRequest()->getServiceParameter();
-		if(($pos=strrpos($serverID,'.wsdl'))===strlen($serverID)-5)
+		if(($pos=strrpos($serverID, '.wsdl'))===strlen($serverID) - 5)
 		{
-			$serverID=substr($serverID,0,$pos);
+			$serverID=substr($serverID, 0, $pos);
 			$this->_wsdlRequest=true;
 		}
 		else
 			$this->_wsdlRequest=false;
 		$this->_serverID=$serverID;
 		if(!isset($this->_servers[$serverID]))
-			throw new THttpException(400,'soapservice_request_invalid',$serverID);
+			throw new THttpException(400, 'soapservice_request_invalid', $serverID);
 	}
 
 	/**
@@ -162,9 +162,9 @@ 
 			{
 				foreach($config['soap'] as $id => $server)
 				{
-					$properties = isset($server['properties'])?$server['properties']:array();
+					$properties=isset($server['properties']) ? $server['properties'] : array();
 					if(isset($this->_servers[$id]))
-						throw new TConfigurationException('soapservice_serverid_duplicated',$id);
+						throw new TConfigurationException('soapservice_serverid_duplicated', $id);
 					$this->_servers[$id]=$properties;
 				}
 			}
@@ -177,7 +177,7 @@ 
 				if(($id=$properties->remove('id'))===null)
 					throw new TConfigurationException('soapservice_serverid_required');
 				if(isset($this->_servers[$id]))
-					throw new TConfigurationException('soapservice_serverid_duplicated',$id);
+					throw new TConfigurationException('soapservice_serverid_duplicated', $id);
 				$this->_servers[$id]=$properties;
 			}
 		}
@@ -198,8 +198,8 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,Prado::getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('soapservice_configfile_invalid',$value);
+		if(($this->_configFile=Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt()))===null)
+			throw new TConfigurationException('soapservice_configfile_invalid', $value);
 	}
 
 	/**
@@ -210,9 +210,9 @@ 
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
 	 * @return string URL for the page and GET parameters
 	 */
-	public function constructUrl($serverID,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serverID, $getParams=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		return $this->getRequest()->constructUrl($this->getID(),$serverID,$getParams,$encodeAmpersand,$encodeGetItems);
+		return $this->getRequest()->constructUrl($this->getID(), $serverID, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
 
 	/**
@@ -248,13 +248,13 @@ 
 		if($serverClass===null)
 			$serverClass=self::DEFAULT_SOAP_SERVER;
 		Prado::using($serverClass);
-		$className=($pos=strrpos($serverClass,'.'))!==false?substr($serverClass,$pos+1):$serverClass;
-		if($className!==self::DEFAULT_SOAP_SERVER && !is_subclass_of($className,self::DEFAULT_SOAP_SERVER))
-			throw new TConfigurationException('soapservice_server_invalid',$serverClass);
+		$className=($pos=strrpos($serverClass, '.'))!==false ? substr($serverClass, $pos + 1) : $serverClass;
+		if($className!==self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
+			throw new TConfigurationException('soapservice_server_invalid', $serverClass);
 		$server=new $className;
 		$server->setID($this->_serverID);
 		foreach($properties as $name=>$value)
-			$server->setSubproperty($name,$value);
+			$server->setSubproperty($name, $value);
 		return $server;
 	}
 
@@ -266,21 +266,21 @@ 
 	 */
 	public function run()
 	{
-		Prado::trace("Running SOAP service",'System.Web.Services.TSoapService');
+		Prado::trace("Running SOAP service", 'System.Web.Services.TSoapService');
 		$server=$this->createServer();
 		$this->getResponse()->setContentType('text/xml');
 		$this->getResponse()->setCharset($server->getEncoding());
 		if($this->getIsWsdlRequest())
 		{
 			// server WSDL file
-			Prado::trace("Generating WSDL",'System.Web.Services.TSoapService');
+			Prado::trace("Generating WSDL", 'System.Web.Services.TSoapService');
 			$this->getResponse()->clear();
 			$this->getResponse()->write($server->getWsdl());
 		}
 		else
 		{
 			// provide SOAP service
-			Prado::trace("Handling SOAP request",'System.Web.Services.TSoapService');
+			Prado::trace("Handling SOAP request", 'System.Web.Services.TSoapService');
 			$server->run();
 		}
 	}
@@ -331,8 +331,8 @@ 
 	 */
 	public function setID($id)
 	{
-		if(strrpos($this->_id,'.wsdl')===strlen($this->_id)-5)
-			throw new TInvalidDataValueException('soapserver_id_invalid',$id);
+		if(strrpos($this->_id, '.wsdl')===strlen($this->_id) - 5)
+			throw new TInvalidDataValueException('soapserver_id_invalid', $id);
 		$this->_id=$id;
 	}
 
@@ -344,7 +344,7 @@ 
 		if(($provider=$this->getProvider())!==null)
 		{
 			Prado::using($provider);
-			$providerClass=($pos=strrpos($provider,'.'))!==false?substr($provider,$pos+1):$provider;
+			$providerClass=($pos=strrpos($provider, '.'))!==false ? substr($provider, $pos + 1) : $provider;
 			$this->guessMethodCallRequested($providerClass);
 			$server=$this->createServer();
 			$server->setClass($providerClass, $this);
@@ -357,7 +357,7 @@ 
 		{
 			$server->handle();
 		}
-		catch (Exception $e)
+		catch(Exception $e)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
@@ -376,7 +376,7 @@ 
 	 */
 	public function fault($title, $details='', $code='SERVER', $actor='', $name='')
 	{
-		Prado::trace('SOAP-Fault '.$code. ' '.$title.' : '.$details, 'System.Web.Services.TSoapService');
+		Prado::trace('SOAP-Fault '.$code.' '.$title.' : '.$details, 'System.Web.Services.TSoapService');
 		$this->_server->fault($code, $title, $actor, $details, $name);
 	}
 
@@ -387,14 +387,14 @@ 
 	 */
 	protected function guessMethodCallRequested($class)
 	{
-		$namespace = $class.'wsdl';
-		$message = file_get_contents("php://input");
-		$matches= array();
+		$namespace=$class.'wsdl';
+		$message=file_get_contents("php://input");
+		$matches=array();
 		if(preg_match('/xmlns:([^=]+)="urn:'.$namespace.'"/', $message, $matches))
 		{
 			if(preg_match('/<'.$matches[1].':([a-zA-Z_]+[a-zA-Z0-9_]+)/', $message, $method))
 			{
-				$this->_requestedMethod = $method[1];
+				$this->_requestedMethod=$method[1];
 			}
 		}
 	}
@@ -417,8 +417,8 @@ 
 		if($this->_server===null)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
-				ini_set("soap.wsdl_cache_enabled",0);
-			$this->_server = new SoapServer($this->getWsdlUri(),$this->getOptions());
+				ini_set("soap.wsdl_cache_enabled", 0);
+			$this->_server=new SoapServer($this->getWsdlUri(), $this->getOptions());
 		}
 		return $this->_server;
 	}
@@ -459,7 +459,7 @@ 
 		if($this->_wsdlUri==='')
 		{
 			$provider=$this->getProvider();
-			$providerClass=($pos=strrpos($provider,'.'))!==false?substr($provider,$pos+1):$provider;
+			$providerClass=($pos=strrpos($provider, '.'))!==false ? substr($provider, $pos + 1) : $provider;
 			Prado::using($provider);
 			if($this->getApplication()->getMode()===TApplicationMode::Performance && ($cache=$this->getApplication()->getCache())!==null)
 			{
@@ -468,7 +468,7 @@ 
 					return $wsdl;
 				Prado::using('System.3rdParty.WsdlGen.WsdlGenerator');
 				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
-				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl);
+				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass, $wsdl);
 				return $wsdl;
 			}
 			else
@@ -487,7 +487,7 @@ 
 	public function getWsdlUri()
 	{
 		if($this->_wsdlUri==='')
-			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl',false);
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl', false);
 		else
 			return $this->_wsdlUri;
 	}
@@ -506,7 +506,7 @@ 
 	public function getUri()
 	{
 		if($this->_uri==='')
-			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(),false);
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(), false);
 		else
 			return $this->_uri;
 	}
@@ -552,7 +552,7 @@ 
 		if($value==='1.1' || $value==='1.2' || $value==='')
 			$this->_version=$value;
 		else
-			throw new TInvalidDataValueException('soapserver_version_invalid',$value);
+			throw new TInvalidDataValueException('soapserver_version_invalid', $value);
 	}
 
 	/**
@@ -616,7 +616,7 @@ 
 	 */
 	public function setClassMaps($classes)
 	{
-		$this->_classMap = $classes;
+		$this->_classMap=$classes;
 	}
 }
 

Braces +8 added lines, -16 removed lines

@@ -118,8 +118,7 @@ 
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadConfig($dom);
-			}
-			else
+			} else
 				throw new TConfigurationException('soapservice_configfile_invalid',$this->_configFile);
 		}
 		$this->loadConfig($config);
@@ -141,8 +140,7 @@ 
 		{
 			$serverID=substr($serverID,0,$pos);
 			$this->_wsdlRequest=true;
-		}
-		else
+		} else
 			$this->_wsdlRequest=false;
 		$this->_serverID=$serverID;
 		if(!isset($this->_servers[$serverID]))
@@ -168,8 +166,7 @@ 
 					$this->_servers[$id]=$properties;
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('soap') as $serverXML)
 			{
@@ -276,8 +273,7 @@ 
 			Prado::trace("Generating WSDL",'System.Web.Services.TSoapService');
 			$this->getResponse()->clear();
 			$this->getResponse()->write($server->getWsdl());
-		}
-		else
+		} else
 		{
 			// provide SOAP service
 			Prado::trace("Handling SOAP request",'System.Web.Services.TSoapService');
@@ -350,14 +346,12 @@ 
 			$server->setClass($providerClass, $this);
 			if($this->_persistent)
 				$server->setPersistence(SOAP_PERSISTENCE_SESSION);
-		}
-		else
+		} else
 			$server=$this->createServer();
 		try
 		{
 			$server->handle();
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
@@ -470,14 +464,12 @@ 
 				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl);
 				return $wsdl;
-			}
-			else
+			} else
 			{
 				Prado::using('System.3rdParty.WsdlGen.WsdlGenerator');
 				return WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 			}
-		}
-		else
+		} else
 			return file_get_contents($this->_wsdlUri);
 	}
 

framework/Web/Services/TFeedService.php

Spacing +10 added lines, -10 removed lines

@@ -72,7 +72,7 @@ 
 			if(is_array($config))
 			{
 				foreach($config as $id => $feed)
-					$this->_feeds[$id] = $feed;
+					$this->_feeds[$id]=$feed;
 			}
 		}
 		else
@@ -105,20 +105,20 @@ 
 		if(isset($this->_feeds[$id]))
 		{
 			$feedConfig=$this->_feeds[$id];
-			$properties = array();
-			$feed = null;
+			$properties=array();
+			$feed=null;
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
 				if(isset($feedConfig['class']))
 				{
 					$feed=Prado::createComponent($feedConfig['class']);
 					if($service instanceof IFeedContentProvider)
-						$properties=isset($feedConfig['properties'])?$feedConfig['properties']:array();
+						$properties=isset($feedConfig['properties']) ? $feedConfig['properties'] : array();
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 			else
 			{
@@ -127,15 +127,15 @@ 
 				{
 					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
-						throw new TConfigurationException('feedservice_feedtype_invalid',$id);
+						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('feedservice_class_required',$id);
+					throw new TConfigurationException('feedservice_class_required', $id);
 			}
 
 			// init feed properties
 			foreach($properties as $name=>$value)
-				$feed->setSubproperty($name,$value);
+				$feed->setSubproperty($name, $value);
 			$feed->init($feedConfig);
 
 			$content=$feed->getFeedContent();
@@ -144,7 +144,7 @@ 
 		    $this->getResponse()->write($content);
 		}
 		else
-			throw new THttpException(404,'feedservice_feed_unknown',$id);
+			throw new THttpException(404, 'feedservice_feed_unknown', $id);
 	}
 }
 

Braces +5 added lines, -10 removed lines

@@ -74,8 +74,7 @@ 
 				foreach($config as $id => $feed)
 					$this->_feeds[$id] = $feed;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
@@ -116,11 +115,9 @@ 
 						$properties=isset($feedConfig['properties'])?$feedConfig['properties']:array();
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
-			}
-			else
+			} else
 			{
 				$properties=$feedConfig->getAttributes();
 				if(($class=$properties->remove('class'))!==null)
@@ -128,8 +125,7 @@ 
 					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
 						throw new TConfigurationException('feedservice_feedtype_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('feedservice_class_required',$id);
 			}
 
@@ -142,8 +138,7 @@ 
 		    //$this->getResponse()->setContentType('application/rss+xml');
 		    $this->getResponse()->setContentType($feed->getContentType());
 		    $this->getResponse()->write($content);
-		}
-		else
+		} else
 			throw new THttpException(404,'feedservice_feed_unknown',$id);
 	}
 }

Indentation +13 added lines, -13 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /**
- * TFeedService and TFeed class file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Knut Urdalen <knut.urdalen@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @version $Id$
- * @package System.Web.Services
- */
+	 * TFeedService and TFeed class file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @author Knut Urdalen <knut.urdalen@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @version $Id$
+	 * @package System.Web.Services
+	 */
 
 /**
  * TFeedService class
@@ -139,9 +139,9 @@ 
 			$feed->init($feedConfig);
 
 			$content=$feed->getFeedContent();
-		    //$this->getResponse()->setContentType('application/rss+xml');
-		    $this->getResponse()->setContentType($feed->getContentType());
-		    $this->getResponse()->write($content);
+			//$this->getResponse()->setContentType('application/rss+xml');
+			$this->getResponse()->setContentType($feed->getContentType());
+			$this->getResponse()->write($content);
 		}
 		else
 			throw new THttpException(404,'feedservice_feed_unknown',$id);