pradosoft / prado

framework/Web/UI/WebControls/TDatePicker.php

Braces +2 added lines, -4 removed lines

@@ -425,8 +425,7 @@ 
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
-		}
-		else
+		} else
 		{
 			$this->renderDropDownListCalendar($writer);
 			if($this->hasDayPattern())
@@ -473,8 +472,7 @@ 
 		{
 			$this->setText($value);
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

Doc Comments +7 added lines, -2 removed lines

@@ -110,6 +110,7 @@ 
 	/**
 	 * Sets the format of the date string.
 	 * @param string the format of the date string
+	 * @param string $value
 	 */
 	public function setDateFormat($value)
 	{
@@ -249,6 +250,7 @@ 
 
 	/**
 	 * @param integer date picker starting year, default is 2000.
+	 * @param integer $value
 	 */
 	public function setFromYear($value)
 	{
@@ -358,6 +360,7 @@ 
 
 	/**
 	 * @param string date string
+	 * @param string $value
 	 */
 	public function setDate($value)
 	{
@@ -481,7 +484,7 @@ 
 	 * Loads date from drop down list data.
 	 * @param string the key that can be used to retrieve data from the input data collection
 	 * @param array the input data collection
-	 * @return array the date selected
+	 * @return string the date selected
 	 */
 	protected function getDateFromPostData($key, $values)
 	{
@@ -587,7 +590,7 @@ 
 	}
 
 	/**
-	 * @return DateTimeFormatInfo date time format information for the current culture.
+	 * @return \Prado\I18N\core\DateTimeFormatInfo date time format information for the current culture.
 	 */
 	protected function getLocalizedCalendarInfo()
 	{
@@ -637,6 +640,7 @@ 
 	 * Renders the calendar drop down list depending on the DateFormat pattern.
 	 * @param THtmlWriter the Html writer to render the drop down lists.
 	 * @param array the current selected date
+	 * @param \DateTime $date
 	 */
 	protected function renderCalendarSelections($writer, $date)
 	{
@@ -741,6 +745,7 @@ 
 	 * "MMMM" will return the month names, "MM" or "MMM" return abbr. month names
 	 * and "M" return month digits.
 	 * @param DateTimeFormatInfo localized date format information.
+	 * @param \Prado\I18N\core\DateTimeFormatInfo $info
 	 * @return array localized month names.
 	 */
 	protected function getLocalizedMonthNames($info)

Spacing +114 added lines, -114 removed lines

@@ -85,7 +85,7 @@ 
 	/**
 	 * Script path relative to the TClientScriptManager::SCRIPT_PATH
 	 */
-	const SCRIPT_PATH = 'datepicker';
+	const SCRIPT_PATH='datepicker';
 
 	/**
 	 * @var TDatePickerClientScript validator client-script options.
@@ -301,7 +301,7 @@ 
 	 */
 	public function getTimeStamp()
 	{
-		if(trim($this->getText()) === '')
+		if(trim($this->getText())==='')
 			return null;
 		else
 			return $this->getTimeStampFromText();
@@ -313,12 +313,12 @@ 
 	 */
 	public function setTimeStamp($value)
 	{
-		if($value === null || (is_string($value) && trim($value) === ''))
+		if($value===null || (is_string($value) && trim($value)===''))
 			$this->setText('');
 		else
 		{
-			$date = TPropertyValue::ensureFloat($value);
-			$formatter = new TSimpleDateFormatter($this->getDateFormat());
+			$date=TPropertyValue::ensureFloat($value);
+			$formatter=new TSimpleDateFormatter($this->getDateFormat());
 			$this->setText($formatter->format($date));
 		}
 	}
@@ -377,8 +377,8 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript === null)
-			$this->_clientScript = $this->createClientScript();
+		if($this->_clientScript===null)
+			$this->_clientScript=$this->createClientScript();
 		return $this->_clientScript;
 	}
 
@@ -397,10 +397,10 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if(($text=$this->getText())==='')
 			return '';
-		$date = $this->getTimeStamp();
-		return $date == null ? $text : $date;
+		$date=$this->getTimeStamp();
+		return $date==null ? $text : $date;
 	}
 
 	/**
@@ -421,7 +421,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if($this->getInputMode()==TDatePickerInputMode::TextBox)
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
@@ -444,7 +444,7 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			switch ($this->getMode())
+			switch($this->getMode())
 			{
 				case TDatePickerMode::Button:
 					$this->renderButtonDatePicker($writer);
@@ -466,10 +466,10 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if($this->getInputMode()==TDatePickerInputMode::TextBox)
 			return parent::loadPostData($key, $values);
-		$value = $this->getDateFromPostData($key, $values);
-		if(!$this->getReadOnly() && $this->getText() !== $value)
+		$value=$this->getDateFromPostData($key, $values);
+		if(!$this->getReadOnly() && $this->getText()!==$value)
 		{
 			$this->setText($value);
 			return true;
@@ -486,42 +486,42 @@ 
 	 */
 	protected function getDateFromPostData($key, $values)
 	{
-		$date = @getdate();
+		$date=@getdate();
 
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(['MMMM', 'MMM'], ['MM','MM'], $pattern);
-		$formatter = new TSimpleDateFormatter($pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(['MMMM', 'MMM'], ['MM', 'MM'], $pattern);
+		$formatter=new TSimpleDateFormatter($pattern);
 
-		$order = $formatter->getDayMonthYearOrdering();
+		$order=$formatter->getDayMonthYearOrdering();
 
-		if(isset($values[$key . '$day'])) {
-			$day = intval($values[$key . '$day']);
+		if(isset($values[$key.'$day'])) {
+			$day=intval($values[$key.'$day']);
 		} elseif(in_array('day', $order)) {
-			$day = $date['mday'];
+			$day=$date['mday'];
 		} else {
-			$day = 1;
+			$day=1;
 		}
 
-		if(isset($values[$key . '$month']))
-			$month = intval($values[$key . '$month']) + 1;
+		if(isset($values[$key.'$month']))
+			$month=intval($values[$key.'$month']) + 1;
 		else
-			$month = $date['mon'];
+			$month=$date['mon'];
 
-		if(isset($values[$key . '$year']))
-			$year = intval($values[$key . '$year']);
+		if(isset($values[$key.'$year']))
+			$year=intval($values[$key.'$year']);
 		else
-			$year = $date['year'];
+			$year=$date['year'];
 
-		$s = new \DateTime;
+		$s=new \DateTime;
 		$s->setDate($year, $month, $day);
 		$s->setTime(0, 0, 0);
-		$date = $s->getTimeStamp();
+		$date=$s->getTimeStamp();
 		//$date = @mktime(0, 0, 0, $month, $day, $year);
 
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(['MMMM', 'MMM'], ['MM','MM'], $pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(['MMMM', 'MMM'], ['MM', 'MM'], $pattern);
 
-		$formatter = new TSimpleDateFormatter($pattern);
+		$formatter=new TSimpleDateFormatter($pattern);
 		return $formatter->format($date);
 	}
 
@@ -531,31 +531,31 @@ 
 	 */
 	protected function getDatePickerOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['InputMode'] = $this->getInputMode();
-		$options['Format'] = $this->getDateFormat();
-		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
-		if(($cssClass = $this->getCssClass()) !== '')
-			$options['ClassName'] = $cssClass;
-		$options['CalendarStyle'] = $this->getCalendarStyle();
-		$options['FromYear'] = $this->getFromYear();
-		$options['UpToYear'] = $this->getUpToYear();
+		$options['ID']=$this->getClientID();
+		$options['InputMode']=$this->getInputMode();
+		$options['Format']=$this->getDateFormat();
+		$options['FirstDayOfWeek']=$this->getFirstDayOfWeek();
+		if(($cssClass=$this->getCssClass())!=='')
+			$options['ClassName']=$cssClass;
+		$options['CalendarStyle']=$this->getCalendarStyle();
+		$options['FromYear']=$this->getFromYear();
+		$options['UpToYear']=$this->getUpToYear();
 		switch($this->getMode())
 		{
 			case TDatePickerMode::Basic:
 				break;
 			case TDatePickerMode::Clickable:
-				$options['TriggerEvent'] = "click";
+				$options['TriggerEvent']="click";
 				break;
 			default:
-				$options['Trigger'] = $this->getDatePickerButtonID();
+				$options['Trigger']=$this->getDatePickerButtonID();
 				break;
 		}
-		$options['PositionMode'] = $this->getPositionMode();
+		$options['PositionMode']=$this->getPositionMode();
 
-		$options = array_merge($options, $this->getCulturalOptions());
-		if($this->_clientScript !== null)
-			$options = array_merge($options,
+		$options=array_merge($options, $this->getCulturalOptions());
+		if($this->_clientScript!==null)
+			$options=array_merge($options,
 				$this->_clientScript->getOptions()->toArray());
 		return $options;
 	}
@@ -566,13 +566,13 @@ 
 	 */
 	protected function getCulturalOptions()
 	{
-		if($this->getCurrentCulture() == 'en')
+		if($this->getCurrentCulture()=='en')
 			return [];
 
-		$date = $this->getLocalizedCalendarInfo();
-		$options['MonthNames'] = $date->getMonthNames();
-		$options['AbbreviatedMonthNames'] = $date->getAbbreviatedMonthNames();
-		$options['ShortWeekDayNames'] = $date->getAbbreviatedDayNames();
+		$date=$this->getLocalizedCalendarInfo();
+		$options['MonthNames']=$date->getMonthNames();
+		$options['AbbreviatedMonthNames']=$date->getAbbreviatedMonthNames();
+		$options['ShortWeekDayNames']=$date->getAbbreviatedDayNames();
 
 		return $options;
 	}
@@ -582,8 +582,8 @@ 
 	 */
 	protected function getCurrentCulture()
 	{
-		$app = $this->getApplication()->getGlobalization(false);
-		return $this->getCulture() == '' ?
+		$app=$this->getApplication()->getGlobalization(false);
+		return $this->getCulture()=='' ?
 				($app ? $app->getCulture() : 'en') : $this->getCulture();
 	}
 
@@ -593,8 +593,8 @@ 
 	protected function getLocalizedCalendarInfo()
 	{
 		//expensive operations
-		$culture = $this->getCurrentCulture();
-		$info = new CultureInfo($culture);
+		$culture=$this->getCurrentCulture();
+		$info=new CultureInfo($culture);
 		return $info->getDateTimeFormat();
 	}
 
@@ -603,18 +603,18 @@ 
 	 */
 	protected function renderDropDownListCalendar($writer)
 	{
-		if($this->getMode() == TDatePickerMode::Basic)
+		if($this->getMode()==TDatePickerMode::Basic)
 			$this->setMode(TDatePickerMode::ImageButton);
 		parent::addAttributesToRender($writer);
 		$writer->removeAttribute('name');
 		$writer->removeAttribute('type');
 		$writer->addAttribute('id', $this->getClientID());
 
-		if(strlen($class = $this->getCssClass()) > 0)
+		if(strlen($class=$this->getCssClass()) > 0)
 			$writer->addAttribute('class', $class);
 		$writer->renderBeginTag('span');
 
-		$date = new \DateTime;
+		$date=new \DateTime;
 		$date->setTimeStamp($this->getTimeStampFromText());
 		$this->renderCalendarSelections($writer, $date);
 
@@ -630,8 +630,8 @@ 
 
 	protected function hasDayPattern()
 	{
-		$formatter = new TSimpleDateFormatter($this->getDateFormat());
-		return ($formatter->getDayPattern() !== null);
+		$formatter=new TSimpleDateFormatter($this->getDateFormat());
+		return ($formatter->getDayPattern()!==null);
 	}
 
 	/**
@@ -641,15 +641,15 @@ 
 	 */
 	protected function renderCalendarSelections($writer, $date)
 	{
-		$formatter = new TSimpleDateFormatter($this->getDateFormat());
+		$formatter=new TSimpleDateFormatter($this->getDateFormat());
 
 		foreach($formatter->getDayMonthYearOrdering() as $type)
 		{
-			if($type == 'day')
+			if($type=='day')
 				$this->renderCalendarDayOptions($writer, $date->format('j'));
-			elseif($type == 'month')
+			elseif($type=='month')
 				$this->renderCalendarMonthOptions($writer, $date->format('n'));
-			elseif($type == 'year')
+			elseif($type=='year')
 				$this->renderCalendarYearOptions($writer, $date->format('Y'));
 		}
 	}
@@ -660,9 +660,9 @@ 
 	 */
 	protected function getTimeStampFromText()
 	{
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(['MMMM', 'MMM'], ['MM','MM'], $pattern);
-		$formatter = new TSimpleDateFormatter($pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(['MMMM', 'MMM'], ['MM', 'MM'], $pattern);
+		$formatter=new TSimpleDateFormatter($pattern);
 		return $formatter->parse($this->getText());
 	}
 
@@ -672,12 +672,12 @@ 
 	 * @param array list of selection options
 	 * @param mixed selected key.
 	 */
-	private function renderDropDownListOptions($writer, $options, $selected = null)
+	private function renderDropDownListOptions($writer, $options, $selected=null)
 	{
 		foreach($options as $k => $v)
 		{
 			$writer->addAttribute('value', $k);
-			if($k == $selected)
+			if($k==$selected)
 				$writer->addAttribute('selected', 'selected');
 			$writer->renderBeginTag('option');
 			$writer->write($v);
@@ -690,11 +690,11 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 * @param mixed selected day.
 	 */
-	protected function renderCalendarDayOptions($writer, $selected = null)
+	protected function renderCalendarDayOptions($writer, $selected=null)
 	{
-		$days = $this->getDropDownDayOptions();
-		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'day');
-		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'day');
+		$days=$this->getDropDownDayOptions();
+		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'day');
+		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'day');
 		$writer->addAttribute('class', 'datepicker_day_options');
 		if($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
@@ -708,12 +708,12 @@ 
 	 */
 	protected function getDropDownDayOptions()
 	{
-		$formatter = new TSimpleDateFormatter($this->getDateFormat());
-		$days = [];
-		$requiresPadding = $formatter->getDayPattern() === 'dd';
-		for($i = 1;$i <= 31;$i++)
+		$formatter=new TSimpleDateFormatter($this->getDateFormat());
+		$days=[];
+		$requiresPadding=$formatter->getDayPattern()==='dd';
+		for($i=1; $i <= 31; $i++)
 		{
-			$days[$i] = $requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
+			$days[$i]=$requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
 		}
 		return $days;
 	}
@@ -723,11 +723,11 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 * @param mixed selected month.
 	 */
-	protected function renderCalendarMonthOptions($writer, $selected = null)
+	protected function renderCalendarMonthOptions($writer, $selected=null)
 	{
-		$info = $this->getLocalizedCalendarInfo();
-		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'month');
-		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'month');
+		$info=$this->getLocalizedCalendarInfo();
+		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'month');
+		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'month');
 		$writer->addAttribute('class', 'datepicker_month_options');
 		if($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
@@ -746,17 +746,17 @@ 
 	 */
 	protected function getLocalizedMonthNames($info)
 	{
-		$formatter = new TSimpleDateFormatter($this->getDateFormat());
+		$formatter=new TSimpleDateFormatter($this->getDateFormat());
 		switch($formatter->getMonthPattern())
 		{
 			case 'MMM': return $info->getAbbreviatedMonthNames();
 			case 'MM':
-				$array = [];
-				for($i = 1;$i <= 12;$i++)
-						$array[$i - 1] = $i < 10 ? '0' . $i : $i;
+				$array=[];
+				for($i=1; $i <= 12; $i++)
+						$array[$i - 1]=$i < 10 ? '0'.$i : $i;
 				return $array;
 			case 'M':
-				$array = []; for($i = 1;$i <= 12;$i++) $array[$i - 1] = $i;
+				$array=[]; for($i=1; $i <= 12; $i++) $array[$i - 1]=$i;
 				return $array;
 			default :	return $info->getMonthNames();
 		}
@@ -767,13 +767,13 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 * @param mixed selected year.
 	 */
-	protected function renderCalendarYearOptions($writer, $selected = null)
+	protected function renderCalendarYearOptions($writer, $selected=null)
 	{
-		$years = [];
-		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
-			$years[$i] = $i;
-		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'year');
-		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'year');
+		$years=[];
+		for($i=$this->getFromYear(); $i <= $this->getUpToYear(); $i++)
+			$years[$i]=$i;
+		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'year');
+		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'year');
 		$writer->addAttribute('class', 'datepicker_year_options');
 		if($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
@@ -788,7 +788,7 @@ 
 	 */
 	protected function getDatePickerButtonID()
 	{
-		return $this->getClientID() . 'button';
+		return $this->getClientID().'button';
 	}
 
 	/**
@@ -799,7 +799,7 @@ 
 	{
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('type', 'button');
-		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerButton');
+		$writer->addAttribute('class', $this->getCssClass().' TDatePickerButton');
 		$writer->addAttribute('value', $this->getButtonText());
 		if(!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
@@ -813,12 +813,12 @@ 
 	 */
 	 protected function renderImageButtonDatePicker($writer)
 	{
-		$url = $this->getButtonImageUrl();
-		$url = empty($url) ? $this->getAssetUrl('calendar.png') : $url;
+		$url=$this->getButtonImageUrl();
+		$url=empty($url) ? $this->getAssetUrl('calendar.png') : $url;
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('src', $url);
 		$writer->addAttribute('alt', ' ');
-		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerImageButton');
+		$writer->addAttribute('class', $this->getCssClass().' TDatePickerImageButton');
 		if(!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->addAttribute('type', 'image');
@@ -831,10 +831,10 @@ 
 	 * @param string date picker asset file in the self::SCRIPT_PATH directory.
 	 * @return string date picker asset url.
 	 */
-	protected function getAssetUrl($file = '')
+	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
-		return $base . '/' . self::SCRIPT_PATH . '/' . $file;
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
 	/**
@@ -843,8 +843,8 @@ 
 	 */
 	protected function publishCalendarStyle()
 	{
-		$url = $this->getAssetUrl($this->getCalendarStyle() . '.css');
-		$cs = $this->getPage()->getClientScript();
+		$url=$this->getAssetUrl($this->getCalendarStyle().'.css');
+		$cs=$this->getPage()->getClientScript();
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
@@ -867,7 +867,7 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			$cs = $this->getPage()->getClientScript();
+			$cs=$this->getPage()->getClientScript();
 			$cs->registerPradoScript("datepicker");
 		}
 	}
@@ -876,17 +876,17 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			$cs = $this->getPage()->getClientScript();
+			$cs=$this->getPage()->getClientScript();
 			if(!$cs->isEndScriptRegistered('TDatePicker.spacer'))
 			{
-				$spacer = $this->getAssetUrl('spacer.gif');
-				$code = "Prado.WebUI.TDatePicker.spacer = '$spacer';";
+				$spacer=$this->getAssetUrl('spacer.gif');
+				$code="Prado.WebUI.TDatePicker.spacer = '$spacer';";
 				$cs->registerEndScript('TDatePicker.spacer', $code);
 			}
 
-			$options = TJavaScript::encode($this->getDatePickerOptions());
-			$code = "new Prado.WebUI.TDatePicker($options);";
-			$cs->registerEndScript("prado:" . $this->getClientID(), $code);
+			$options=TJavaScript::encode($this->getDatePickerOptions());
+			$code="new Prado.WebUI.TDatePicker($options);";
+			$cs->registerEndScript("prado:".$this->getClientID(), $code);
 		}
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TLiteral.php

Braces +1 added lines, -2 removed lines

@@ -106,8 +106,7 @@
 				$writer->write(THttpUtility::htmlEncode($text));
 			else
 				$writer->write($text);
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 }

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 	 */
 	public function render($writer)
 	{
-		if(($text = $this->getText()) !== '')
+		if(($text=$this->getText())!=='')
 		{
 			if($this->getEncode())
 				$writer->write(THttpUtility::htmlEncode($text));

framework/Web/UI/WebControls/THyperLink.php

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
 				parent::renderContents($writer);
 			else
 				$writer->write(THttpUtility::htmlEncode($this->getNavigateUrl()));
-		}
-		else
+		} else
 		{
 			$this->createImage($imageUrl)->renderControl($writer);
 		}

Spacing +11 added lines, -11 removed lines

@@ -49,13 +49,13 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$isEnabled = $this->getEnabled(true);
+		$isEnabled=$this->getEnabled(true);
 		if($this->getEnabled() && !$isEnabled)
 			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
-		if(($url = $this->getNavigateUrl()) !== '' && $isEnabled)
+		if(($url=$this->getNavigateUrl())!=='' && $isEnabled)
 			$writer->addAttribute('href', $url);
-		if(($target = $this->getTarget()) !== '')
+		if(($target=$this->getTarget())!=='')
 			$writer->addAttribute('target', $target);
 	}
 
@@ -65,9 +65,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($imageUrl = $this->getImageUrl()) === '')
+		if(($imageUrl=$this->getImageUrl())==='')
 		{
-			if(($text = $this->getText()) !== '')
+			if(($text=$this->getText())!=='')
 				$writer->write(THttpUtility::htmlEncode($text));
 			elseif($this->getHasControls())
 				parent::renderContents($writer);
@@ -88,17 +88,17 @@ 
 	 */
 	protected function createImage($imageUrl)
 	{
-		$image = new TImage;
+		$image=new TImage;
 		$image->setImageUrl($imageUrl);
-		if(($width = $this->getImageWidth()) !== '')
+		if(($width=$this->getImageWidth())!=='')
 			$image->setWidth($width);
-		if(($height = $this->getImageHeight()) !== '')
+		if(($height=$this->getImageHeight())!=='')
 			$image->setHeight($height);
-		if(($toolTip = $this->getToolTip()) !== '')
+		if(($toolTip=$this->getToolTip())!=='')
 			$image->setToolTip($toolTip);
-		if(($text = $this->getText()) !== '')
+		if(($text=$this->getText())!=='')
 			$image->setAlternateText($text);
-		if(($align = $this->getImageAlign()) !== '')
+		if(($align=$this->getImageAlign())!=='')
 			$image->setImageAlign($align);
 		$image->setBorderWidth('0');
 		return $image;

framework/Web/UI/JuiControls/TJuiAutoCompleteTemplate.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
 	public function __construct($template)
 	{
-		$this->_template = $template;
+		$this->_template=$template;
 	}
 	/**
 	 * Instantiates the template.

framework/Web/UI/TForm.php

Braces +1 added lines, -2 removed lines

@@ -92,8 +92,7 @@
 
 			$cs->renderScriptFilesEnd($writer);
 			$cs->renderEndScripts($writer);
-		}
-		else
+		} else
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 

Spacing +7 added lines, -7 removed lines

@@ -50,18 +50,18 @@ 
 	{
 		$writer->addAttribute('id', $this->getClientID());
 		$writer->addAttribute('method', $this->getMethod());
-		$uri = $this->getRequest()->getRequestURI();
+		$uri=$this->getRequest()->getRequestURI();
 		$writer->addAttribute('action', str_replace('&', '&', str_replace('&', '&', $uri)));
-		if(($enctype = $this->getEnctype()) !== '')
+		if(($enctype=$this->getEnctype())!=='')
 			$writer->addAttribute('enctype', $enctype);
 
-		$attributes = $this->getAttributes();
+		$attributes=$this->getAttributes();
 		$attributes->remove('action');
 		$writer->addAttributes($attributes);
 
-		if(($butt = $this->getDefaultButton()) !== '')
+		if(($butt=$this->getDefaultButton())!=='')
 		{
-			if(($button = $this->findControl($butt)) !== null)
+			if(($button=$this->findControl($butt))!==null)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 			else
 				throw new TInvalidDataValueException('form_defaultbutton_invalid', $butt);
@@ -74,12 +74,12 @@ 
 	 */
 	public function render($writer)
 	{
-		$page = $this->getPage();
+		$page=$this->getPage();
 
 		$this->addAttributesToRender($writer);
 		$writer->renderBeginTag('form');
 
-		$cs = $page->getClientScript();
+		$cs=$page->getClientScript();
 		if($page->getClientSupportsJavaScript())
 		{
 			$cs->renderHiddenFieldsBegin($writer);

framework/Web/UI/ActiveControls/TActiveImageButton.php

Doc Comments +2 added lines

@@ -48,6 +48,7 @@ 
 	/**
 	 * Sets the alternative text to be displayed in the TImage when the image is unavailable.
 	 * @param string the alternative text
+	 * @param string $value
 	 */
 	public function setAlternateText($value)
 	{
@@ -78,6 +79,7 @@ 
 
 	/**
 	 * @param string the URL of the image file
+	 * @param string $value
 	 */
 	public function setImageUrl($value)
 	{

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		if(parent::getAlternateText() === $value)
+		if(parent::getAlternateText()===$value)
 			return;
 
 		parent::setAlternateText($value);
@@ -65,7 +65,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		if(parent::getImageAlign() === $value)
+		if(parent::getImageAlign()===$value)
 			return;
 
 		parent::setImageAlign($value);
@@ -78,7 +78,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
@@ -91,7 +91,7 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		if(parent::getDescriptionUrl() === $value)
+		if(parent::getDescriptionUrl()===$value)
 			return;
 
 		parent::setDescriptionUrl($value);

framework/Web/UI/WebControls/THiddenField.php

Doc Comments +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by \Prado\Web\UI\IValidatable interface.
-	 * @return mixed the value of the property to be validated.
+	 * @return string the value of the property to be validated.
 	 */
 	public function getValidationPropertyValue()
 	{

Spacing +10 added lines, -10 removed lines

@@ -28,8 +28,8 @@ 
  */
 class THiddenField extends \Prado\Web\UI\TControl implements \Prado\Web\UI\IPostBackDataHandler, \Prado\Web\UI\IValidatable, \Prado\IDataRenderer
 {
-	private $_dataChanged = false;
-	private $_isValid = true;
+	private $_dataChanged=false;
+	private $_isValid=true;
 
 	/**
 	 * @return string tag name of the hidden field.
@@ -56,14 +56,14 @@ 
 	 */
 	public function render($writer)
 	{
-		$uniqueID = $this->getUniqueID();
+		$uniqueID=$this->getUniqueID();
 		$this->getPage()->ensureRenderInForm($this);
 		$writer->addAttribute('type', 'hidden');
-		if($uniqueID !== '')
+		if($uniqueID!=='')
 			$writer->addAttribute('name', $uniqueID);
-		if($this->getID() !== '')
+		if($this->getID()!=='')
 			$writer->addAttribute('id', $this->getClientID());
-		if(($value = $this->getValue()) !== '')
+		if(($value=$this->getValue())!=='')
 			$writer->addAttribute('value', $value);
 
 		if($this->getHasAttributes())
@@ -85,13 +85,13 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		$value = $values[$key];
-		if($value === $this->getValue())
+		$value=$values[$key];
+		if($value===$this->getValue())
 			return false;
 		else
 		{
 			$this->setValue($value);
-			return $this->_dataChanged = true;
+			return $this->_dataChanged=true;
 		}
 	}
 
@@ -129,7 +129,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid = TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

framework/Web/UI/WebControls/TListBox.php

Doc Comments +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by \Prado\Web\UI\IValidatable interface.
-	 * @return mixed the value of the property to be validated.
+	 * @return string the value of the property to be validated.
 	 */
 	public function getValidationPropertyValue()
 	{

Spacing +31 added lines, -31 removed lines

@@ -35,8 +35,8 @@ 
  */
 class TListBox extends TListControl implements \Prado\Web\UI\IPostBackDataHandler, \Prado\Web\UI\IValidatable
 {
-	private $_dataChanged = false;
-	private $_isValid = true;
+	private $_dataChanged=false;
+	private $_isValid=true;
 
 	/**
 	 * Adds attribute name-value pairs to renderer.
@@ -45,10 +45,10 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$rows = $this->getRows();
+		$rows=$this->getRows();
 		$writer->addAttribute('size', "$rows");
-		if($this->getSelectionMode() === TListSelectionMode::Multiple)
-			$writer->addAttribute('name', $this->getUniqueID() . '[]');
+		if($this->getSelectionMode()===TListSelectionMode::Multiple)
+			$writer->addAttribute('name', $this->getUniqueID().'[]');
 		else
 			$writer->addAttribute('name', $this->getUniqueID());
 		parent::addAttributesToRender($writer);
@@ -88,55 +88,55 @@ 
 		if(!$this->getEnabled(true))
 			return false;
 		$this->ensureDataBound();
-		$selections = isset($values[$key])?$values[$key]:null;
-		if($selections !== null)
+		$selections=isset($values[$key]) ? $values[$key] : null;
+		if($selections!==null)
 		{
-			$items = $this->getItems();
-			if($this->getSelectionMode() === TListSelectionMode::Single)
+			$items=$this->getItems();
+			if($this->getSelectionMode()===TListSelectionMode::Single)
 			{
-				$selection = is_array($selections)?$selections[0]:$selections;
-				$index = $items->findIndexByValue($selection, false);
-				if($this->getSelectedIndex() !== $index)
+				$selection=is_array($selections) ? $selections[0] : $selections;
+				$index=$items->findIndexByValue($selection, false);
+				if($this->getSelectedIndex()!==$index)
 				{
 					$this->setSelectedIndex($index);
-					return $this->_dataChanged = true;
+					return $this->_dataChanged=true;
 				}
 				else
 					return false;
 			}
 			if(!is_array($selections))
-				$selections = [$selections];
-			$list = [];
+				$selections=[$selections];
+			$list=[];
 			foreach($selections as $selection)
-				$list[] = $items->findIndexByValue($selection, false);
-			$list2 = $this->getSelectedIndices();
-			$n = count($list);
-			$flag = false;
-			if($n === count($list2))
+				$list[]=$items->findIndexByValue($selection, false);
+			$list2=$this->getSelectedIndices();
+			$n=count($list);
+			$flag=false;
+			if($n===count($list2))
 			{
 				sort($list, SORT_NUMERIC);
-				for($i = 0;$i < $n;++$i)
+				for($i=0; $i < $n; ++$i)
 				{
-					if($list[$i] !== $list2[$i])
+					if($list[$i]!==$list2[$i])
 					{
-						$flag = true;
+						$flag=true;
 						break;
 					}
 				}
 			}
 			else
-				$flag = true;
+				$flag=true;
 			if($flag)
 			{
 				$this->setSelectedIndices($list);
-				$this->_dataChanged = true;
+				$this->_dataChanged=true;
 			}
 			return $flag;
 		}
-		elseif($this->getSelectedIndex() !== -1)
+		elseif($this->getSelectedIndex()!==-1)
 		{
 			$this->clearSelection();
-			return $this->_dataChanged = true;
+			return $this->_dataChanged=true;
 		}
 		else
 			return false;
@@ -171,7 +171,7 @@ 
 	 */
 	protected function getIsMultiSelect()
 	{
-		return $this->getSelectionMode() === TListSelectionMode::Multiple;
+		return $this->getSelectionMode()===TListSelectionMode::Multiple;
 	}
 
 	/**
@@ -187,9 +187,9 @@ 
 	 */
 	public function setRows($value)
 	{
-		$value = TPropertyValue::ensureInteger($value);
+		$value=TPropertyValue::ensureInteger($value);
 		if($value <= 0)
-			$value = 4;
+			$value=4;
 		$this->setViewState('Rows', $value, 4);
 	}
 
@@ -233,6 +233,6 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid = TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 }
\ No newline at end of file

Braces +4 added lines, -8 removed lines

@@ -100,8 +100,7 @@ 
 				{
 					$this->setSelectedIndex($index);
 					return $this->_dataChanged = true;
-				}
-				else
+				} else
 					return false;
 			}
 			if(!is_array($selections))
@@ -123,8 +122,7 @@ 
 						break;
 					}
 				}
-			}
-			else
+			} else
 				$flag = true;
 			if($flag)
 			{
@@ -132,13 +130,11 @@ 
 				$this->_dataChanged = true;
 			}
 			return $flag;
-		}
-		elseif($this->getSelectedIndex() !== -1)
+		} elseif($this->getSelectedIndex() !== -1)
 		{
 			$this->clearSelection();
 			return $this->_dataChanged = true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/I18N/core/MessageSource_PHP.php

Doc Comments +6 added lines

@@ -246,6 +246,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	protected function internalSaveFile($php, $filename, $variant)
 	{
 		$php['info']['date'] = @date('Y-m-d\TH:i:s\Z');
@@ -377,6 +380,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $catalogue
+	 */
 	protected function createMessageTemplate($catalogue)
 	{
 		if($catalogue === null) {

Spacing +79 added lines, -79 removed lines

@@ -40,13 +40,13 @@ 
 	 * Message data filename extension.
 	 * @var string
 	 */
-	protected $dataExt = '.php';
+	protected $dataExt='.php';
 
 	/**
 	 * Separator between culture name and source.
 	 * @var string
 	 */
-	protected $dataSeparator = '.';
+	protected $dataSeparator='.';
 
 	/**
 	 * Constructor.
@@ -55,7 +55,7 @@ 
 	 */
 	public function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source=(string) $source;
 	}
 
 	/**
@@ -66,20 +66,20 @@ 
 	protected function &loadData($filename)
 	{
 		//load it.
-		if(false === ($php = include($filename))) {
+		if(false===($php=include($filename))) {
 			return false;
 		}
 
-		$translationUnit = $php['trans-unit'];
+		$translationUnit=$php['trans-unit'];
 
-		$translations = [];
+		$translations=[];
 
 		foreach($translationUnit as $k => $unit)
 		{
-			$source = (string)$unit['source'];
-			$translations[$source][] = (string)$unit['target'];
-			$translations[$source][] = (string)$k;
-			$translations[$source][] = array_key_exists('note', $unit) ? (string)$unit['note'] : '';
+			$source=(string) $unit['source'];
+			$translations[$source][]=(string) $unit['target'];
+			$translations[$source][]=(string) $k;
+			$translations[$source][]=array_key_exists('note', $unit) ? (string) $unit['note'] : '';
 		}
 
 		return $translations;
@@ -104,7 +104,7 @@ 
 	 */
 	protected function getSource($variant)
 	{
-		return $this->source . '/' . $variant;
+		return $this->source.'/'.$variant;
 	}
 
 	/**
@@ -124,21 +124,21 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_', $this->culture);
-		$source = $catalogue . $this->dataExt;
-		$catalogues = [$source];
-		$variant = null;
+		$variants=explode('_', $this->culture);
+		$source=$catalogue.$this->dataExt;
+		$catalogues=[$source];
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue . $this->dataSeparator . $variant . $this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.$this->dataSeparator.$variant.$this->dataExt;
 			}
 		}
 
-		$byDir = $this->getCatalogueByDir($catalogue);
+		$byDir=$this->getCatalogueByDir($catalogue);
 		return array_merge($byDir, array_reverse($catalogues));
 	}
 
@@ -151,16 +151,16 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_', $this->culture);
-		$catalogues = [];
-		$variant = null;
+		$variants=explode('_', $this->culture);
+		$catalogues=[];
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
-				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$variant.'/'.$catalogue.$this->dataExt;
 			}
 		}
 
@@ -184,38 +184,38 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir = null, $variant = null)
+	protected function getCatalogues($dir=null, $variant=null)
 	{
-		$dir = $dir?$dir:$this->source;
-		$files = scandir($dir);
-		$catalogue = [];
+		$dir=$dir ? $dir : $this->source;
+		$files=scandir($dir);
+		$catalogue=[];
 
 		foreach($files as $file)
 		{
-			if(is_dir($dir . '/' . $file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
-				$catalogue = array_merge(
+			if(is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
+				$catalogue=array_merge(
 					$catalogue,
-					$this->getCatalogues($dir . '/' . $file, $file)
+					$this->getCatalogues($dir.'/'.$file, $file)
 				);
 			}
 
-			$pos = strpos($file, $this->dataExt);
-			if($pos > 0 && substr($file, -1 * strlen($this->dataExt)) == $this->dataExt)
+			$pos=strpos($file, $this->dataExt);
+			if($pos > 0 && substr($file, -1 * strlen($this->dataExt))==$this->dataExt)
 			{
-				$name = substr($file, 0, $pos);
-				$dot = strrpos($name, $this->dataSeparator);
-				$culture = $variant;
-				$cat = $name;
+				$name=substr($file, 0, $pos);
+				$dot=strrpos($name, $this->dataSeparator);
+				$culture=$variant;
+				$cat=$name;
 
 				if(is_int($dot))
 				{
-					$culture = substr($name, $dot + 1, strlen($name));
-					$cat = substr($name, 0, $dot);
+					$culture=substr($name, $dot + 1, strlen($name));
+					$cat=substr($name, 0, $dot);
 				}
 
-				$details[0] = $cat;
-				$details[1] = $culture;
-				$catalogue[] = $details;
+				$details[0]=$cat;
+				$details[1]=$culture;
+				$catalogue[]=$details;
 			}
 		}
 		sort($catalogue);
@@ -230,15 +230,15 @@ 
 	 * @see update()
 	 * @see delete()
 	 */
-	private function getVariants($catalogue = 'messages')
+	private function getVariants($catalogue='messages')
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 
 		foreach($this->getCatalogueList($catalogue) as $variant)
 		{
-			$file = $this->getSource($variant);
+			$file=$this->getSource($variant);
 			if(is_file($file)) {
 				return [$variant, $file];
 			}
@@ -248,10 +248,10 @@ 
 
 	protected function internalSaveFile($php, $filename, $variant)
 	{
-		$php['info']['date'] = @date('Y-m-d\TH:i:s\Z');
+		$php['info']['date']=@date('Y-m-d\TH:i:s\Z');
 
 		//save it and clear the cache for this variant
-		if(false === file_put_contents($filename, "<?php\nreturn " . var_export($php, true) . ';'))
+		if(false===file_put_contents($filename, "<?php\nreturn ".var_export($php, true).';'))
 			return false;
 
 		if(!empty($this->cache))
@@ -267,32 +267,32 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	public function save($catalogue = 'messages')
+	public function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 		if(count($messages) <= 0) {
 			return false;
 		}
 
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants) {
-			list($variant, $filename) = $variants;
+			list($variant, $filename)=$variants;
 		} else {
-			list($variant, $filename) = $this->createMessageTemplate($catalogue);
+			list($variant, $filename)=$this->createMessageTemplate($catalogue);
 		}
 
-		if(is_writable($filename) == false) {
+		if(is_writable($filename)==false) {
 			throw new TIOException("Unable to save to file {$filename}, file must be writable.");
 		}
 
 		//import the existing php file
-		$php = include($filename);
+		$php=include($filename);
 
 		//for each message add it to the XML file using DOM
 		foreach($messages as $message)
 		{
-			$php['trans-unit'][] = [
+			$php['trans-unit'][]=[
 				'source' => $message,
 				'target' => '',
 			];
@@ -309,31 +309,31 @@ 
 	 * @param string the catalogue to save to.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	public function update($text, $target, $comments, $catalogue = 'messages')
+	public function update($text, $target, $comments, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants) {
-			list($variant, $filename) = $variants;
+			list($variant, $filename)=$variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if(is_writable($filename)==false) {
 			throw new TIOException("Unable to update file {$filename}, file must be writable.");
 		}
 
 		//import the existing php file
-		$php = include($filename);
+		$php=include($filename);
 
 		//for each of the existin units
 		foreach($php['trans-unit'] as $k => $unit)
 		{
-			if($unit['source'] == $text)
+			if($unit['source']==$text)
 			{
-				$php['trans-unit'][$k]['target'] = $target;
+				$php['trans-unit'][$k]['target']=$target;
 				if(!empty($comments))
-					$php['trans-unit'][$k]['note'] = $comments;
+					$php['trans-unit'][$k]['note']=$comments;
 
 				break;
 			}
@@ -348,26 +348,26 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	public function delete($message, $catalogue = 'messages')
+	public function delete($message, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants) {
-			list($variant, $filename) = $variants;
+			list($variant, $filename)=$variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if(is_writable($filename)==false) {
 			throw new TIOException("Unable to modify file {$filename}, file must be writable.");
 		}
 
 		//import the existing php file
-		$php = include($filename);
+		$php=include($filename);
 
 		//for each of the existin units
 		foreach($php['trans-unit'] as $k => $unit)
 		{
-			if($unit['source'] == $message)
+			if($unit['source']==$message)
 			{
 				unset($php['trans-unit'][$k]);
 				return $this->internalSaveFile($php, $filename, $variant);
@@ -379,14 +379,14 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 		
-		$variants = $this->getCatalogueList($catalogue);
-		$variant = array_shift($variants);
-		$file = $this->getSource($variant);
-		$dir = dirname($file);
+		$variants=$this->getCatalogueList($catalogue);
+		$variant=array_shift($variants);
+		$file=$this->getSource($variant);
+		$dir=dirname($file);
 
 		if(!is_dir($dir)) {
 			@mkdir($dir);
@@ -405,8 +405,8 @@ 
 
 	protected function getTemplate($catalogue)
 	{
-		$date = @date('Y-m-d\TH:i:s\Z');
-		$php = <<<EOD
+		$date=@date('Y-m-d\TH:i:s\Z');
+		$php=<<<EOD
 <?php
 return array(
 	'info' => array(