pradosoft / prado

framework/Web/UI/WebControls/TFileUploadItem.php

Indentation +31 added lines, -32 removed lines

@@ -18,7 +18,6 @@ 
  * is especially needed when {@link TFileUpload::setMultiple} is set to true.
  *
  * See {@link TFileUpload} documentation for more details.
-
  * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
  * @package Prado\Web\UI\WebControls
  * @since 4.0
@@ -48,11 +47,11 @@ 
 
   public function __construct($fileName, $fileSize, $fileType, $errorCode, $localName)
   {
-    $this->_fileName = $fileName;
-    $this->_fileSize = $fileSize;
-    $this->_fileType = $fileType;
-    $this->_errorCode = $errorCode;
-    $this->_localName = $localName;
+	$this->_fileName = $fileName;
+	$this->_fileSize = $fileSize;
+	$this->_fileType = $fileType;
+	$this->_errorCode = $errorCode;
+	$this->_localName = $localName;
   }
 
   /**
@@ -60,7 +59,7 @@ 
    */
   public function getFileName()
   {
-    return $this->_fileName;
+	return $this->_fileName;
   }
 
   /**
@@ -68,7 +67,7 @@ 
    */
   public function getFileSize()
   {
-    return $this->_fileSize;
+	return $this->_fileSize;
   }
 
   /**
@@ -77,7 +76,7 @@ 
    */
   public function getFileType()
   {
-    return $this->_fileType;
+	return $this->_fileType;
   }
 
   /**
@@ -86,7 +85,7 @@ 
    */
   public function getLocalName()
   {
-    return $this->_localName;
+	return $this->_localName;
   }
 
   /**
@@ -94,7 +93,7 @@ 
    */
   public function setLocalName($value)
   {
-    $this->_localName = $value;
+	$this->_localName = $value;
   }
 
   /**
@@ -104,7 +103,7 @@ 
    */
   public function getErrorCode()
   {
-    return $this->_errorCode;
+	return $this->_errorCode;
   }
 
   /**
@@ -114,7 +113,7 @@ 
    */
   public function setErrorCode($value)
   {
-    $this->_errorCode = $value;
+	$this->_errorCode = $value;
   }
 
   /**
@@ -122,7 +121,7 @@ 
    */
   public function getHasFile()
   {
-    return $this->_errorCode===UPLOAD_ERR_OK;
+	return $this->_errorCode===UPLOAD_ERR_OK;
   }
 
   /**
@@ -134,17 +133,17 @@ 
    */
   public function saveAs($fileName,$deleteTempFile=true)
   {
-    if($this->_errorCode===UPLOAD_ERR_OK)
-    {
-      if($deleteTempFile)
-        return move_uploaded_file($this->_localName,$fileName);
-      else if(is_uploaded_file($this->_localName))
-        return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
-      else
-        return false;
-    }
-    else
-      return false;
+	if($this->_errorCode===UPLOAD_ERR_OK)
+	{
+	  if($deleteTempFile)
+		return move_uploaded_file($this->_localName,$fileName);
+	  else if(is_uploaded_file($this->_localName))
+		return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
+	  else
+		return false;
+	}
+	else
+	  return false;
   }
 
   /**
@@ -152,13 +151,13 @@ 
    */
   public function toArray()
   {
-    return array(
-      'fileName' => $this->_fileName,
-      'fileSize' => $this->_fileSize,
-      'fileType' => $this->_fileType,
-      'errorCode' => $this->_errorCode,
-      'localName' => $this->_localName
-    );
+	return array(
+	  'fileName' => $this->_fileName,
+	  'fileSize' => $this->_fileSize,
+	  'fileType' => $this->_fileType,
+	  'errorCode' => $this->_errorCode,
+	  'localName' => $this->_localName
+	);
   }
 
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveFileUpload.php

Spacing +87 added lines, -87 removed lines

@@ -60,7 +60,7 @@ 
  */
 class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallbackEventHandler, INamingContainer
 {
-	const SCRIPT_PATH = 'activefileupload';
+	const SCRIPT_PATH='activefileupload';
 
 	/**
 	 * @var THiddenField a flag to tell which component is doing the callback.
@@ -89,7 +89,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));
 	}
@@ -101,7 +101,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
@@ -114,14 +114,14 @@ 
 	 */
 	public function onFileUpload($param)
 	{
-		if ($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param == $this->_target->getUniqueID()){
-		  $params = new TActiveFileUploadCallbackParams;
+		if($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param==$this->_target->getUniqueID()) {
+		  $params=new TActiveFileUploadCallbackParams;
 		  // save the files so that they will persist past the end of this return.
-		  foreach ($this->getFiles() as $file) {
-			  $localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
+		  foreach($this->getFiles() as $file) {
+			  $localName=str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()), ''));
 			  $file->saveAs($localName);
 			  $file->setLocalName($localName);
-			  $params->files[] = $file->toArray();
+			  $params->files[]=$file->toArray();
 		  }
 
 			// return some javascript to display a completion status.
@@ -129,12 +129,12 @@ 
           	 Options = new Object();
           	 Options.clientID = '{$this->getClientID()}';
           	 Options.targetID = '{$this->_target->getUniqueID()}';
-          	 Options.errorCode = '" . (int)!$this->getHasAllFiles() . "';
+          	 Options.errorCode = '".(int) !$this->getHasAllFiles()."';
           	 Options.callbackToken = '{$this->pushParamsAndGetToken($params)}';
-          	 Options.fileName = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileName') : $this->getFileName(), JSON_HEX_APOS) . "';
-             Options.fileSize = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileSize') : $this->getFileSize(), JSON_HEX_APOS) . "';
-             Options.fileType = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileType') : $this->getFileType(), JSON_HEX_APOS) . "';
-             Options.errorCode = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'errorCode') : $this->getErrorCode(), JSON_HEX_APOS) . "';
+          	 Options.fileName = '".TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileName') : $this->getFileName(), JSON_HEX_APOS)."';
+             Options.fileSize = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileSize') : $this->getFileSize(), JSON_HEX_APOS)."';
+             Options.fileType = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileType') : $this->getFileType(), JSON_HEX_APOS)."';
+             Options.errorCode = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'errorCode') : $this->getErrorCode(), JSON_HEX_APOS)."';
           	 parent.Prado.WebUI.TActiveFileUpload.onFileUpload(Options);
            </script>";
 
@@ -146,7 +146,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.*');
 	}
 
@@ -154,15 +154,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);
 	}
 
@@ -170,28 +170,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());
 		}
 	}
@@ -203,18 +203,18 @@ 
 	 * 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);
       foreach($params->files as $index => $file)
       {
-  			$_FILES[$key]['name'][$index] = stripslashes($file['fileName']);
-  			$_FILES[$key]['size'][$index] = intval($file['fileSize']);
-  			$_FILES[$key]['type'][$index] = $file['fileType'];
-  			$_FILES[$key]['error'][$index] = intval($file['errorCode']);
-  			$_FILES[$key]['tmp_name'][$index] = $file['localName'];
+  			$_FILES[$key]['name'][$index]=stripslashes($file['fileName']);
+  			$_FILES[$key]['size'][$index]=intval($file['fileSize']);
+  			$_FILES[$key]['type'][$index]=$file['fileType'];
+  			$_FILES[$key]['error'][$index]=intval($file['errorCode']);
+  			$_FILES[$key]['tmp_name'][$index]=$file['localName'];
       }
 			$this->loadPostData($key, null);
 
@@ -234,17 +234,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');
@@ -254,18 +254,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');
@@ -282,27 +282,27 @@ 
 	{
 		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())
 		{
-		  $params = new TActiveFileUploadCallbackParams;
-		  foreach ($this->getFiles() as $file) {
-		    $localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
+		  $params=new TActiveFileUploadCallbackParams;
+		  foreach($this->getFiles() as $file) {
+		    $localName=str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()), ''));
 		    $file->setLocalName($localName);
 		    // tricky workaround to intercept "uploaded file too big" error: real uploads happens in onFileUpload instead
 		    $file->setErrorCode(UPLOAD_ERR_FORM_SIZE);
-		    $params->files[] = $file->toArray();
+		    $params->files[]=$file->toArray();
 		  }
 
 			echo "<script language='Javascript'>
           	 Options = new Object();
           	 Options.clientID = '{$_GET['TActiveFileUpload_InputId']}';
           	 Options.targetID = '{$_GET['TActiveFileUpload_TargetId']}';
-			       Options.errorCode = '" . (int)!$this->getHasAllFiles() . "';
+			       Options.errorCode = '".(int) !$this->getHasAllFiles()."';
           	 Options.callbackToken = '{$this->pushParamsAndGetToken($params)}';
-          	 Options.fileName = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileName') : $this->getFileName(), JSON_HEX_APOS) . "';
-             Options.fileSize = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileSize') : $this->getFileSize(), JSON_HEX_APOS) . "';
-             Options.fileType = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileType') : $this->getFileType(), JSON_HEX_APOS) . "';
-             Options.errorCode = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'errorCode') : $this->getErrorCode(), JSON_HEX_APOS) . "';
+          	 Options.fileName = '".TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileName') : $this->getFileName(), JSON_HEX_APOS)."';
+             Options.fileSize = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileSize') : $this->getFileSize(), JSON_HEX_APOS)."';
+             Options.fileType = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileType') : $this->getFileType(), JSON_HEX_APOS)."';
+             Options.errorCode = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'errorCode') : $this->getErrorCode(), JSON_HEX_APOS)."';
            	 parent.Prado.WebUI.TActiveFileUpload.onFileUpload(Options);
            </script>";
 		}
@@ -312,29 +312,29 @@ 
 	{
 		$this->getPage()->getClientScript()->registerPradoScript('activefileupload');
 
-		$this->_flag = new THiddenField;
+		$this->_flag=new THiddenField;
 		$this->_flag->setID('Flag');
 		$this->getControls()->add($this->_flag);
 
-		$this->_busy = new TImage;
+		$this->_busy=new TImage;
 		$this->_busy->setID('Busy');
 		$this->_busy->setImageUrl($this->getAssetUrl('ActiveFileUploadIndicator.gif'));
 		$this->_busy->setStyle("display:none");
 		$this->getControls()->add($this->_busy);
 
-		$this->_success = new TImage;
+		$this->_success=new TImage;
 		$this->_success->setID('Success');
 		$this->_success->setImageUrl($this->getAssetUrl('ActiveFileUploadComplete.png'));
 		$this->_success->setStyle("display:none");
 		$this->getControls()->add($this->_success);
 
-		$this->_error = new TImage;
+		$this->_error=new TImage;
 		$this->_error->setID('Error');
 		$this->_error->setImageUrl($this->getAssetUrl('ActiveFileUploadError.png'));
 		$this->_error->setStyle("display:none");
 		$this->getControls()->add($this->_error);
 
-		$this->_target = new TInlineFrame;
+		$this->_target=new TInlineFrame;
 		$this->_target->setID('Target');
 		$this->_target->setFrameUrl($this->getAssetUrl('ActiveFileUploadBlank.html'));
 		$this->_target->setStyle("width:0px; height:0px;");
@@ -345,11 +345,11 @@ 
 	/**
 	 * Removes localfile on ending of the callback.
 	 */
-	public function onUnload($param){
-		if ($this->getPage()->getIsCallback())
+	public function onUnload($param) {
+		if($this->getPage()->getIsCallback())
 		{
 		  foreach($this->getFiles() as $file)
-		    if($file->getHasFile() && file_exists($file->getLocalName())){
+		    if($file->getHasFile() && file_exists($file->getLocalName())) {
 		      unlink($file->getLocalName());
 		  }
 		}
@@ -359,7 +359,7 @@ 
 	/**
 	 * @return TBaseActiveCallbackControl standard callback control options.
 	 */
-	public function getActiveControl(){
+	public function getActiveControl() {
 		return $this->getAdapter()->getBaseActiveControl();
 	}
 
@@ -375,17 +375,17 @@ 
 	 * 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->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';
 	}
 
@@ -399,18 +399,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;
 	}
 
@@ -421,12 +421,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,$index=0){
-		if (($this->getErrorCode($index)===UPLOAD_ERR_OK) && (file_exists($this->getLocalName($index)))){
-			if ($deleteTempFile)
-				return rename($this->getLocalName($index),$fileName);
+	public function saveAs($fileName, $deleteTempFile=true, $index=0) {
+		if(($this->getErrorCode($index)===UPLOAD_ERR_OK) && (file_exists($this->getLocalName($index)))) {
+			if($deleteTempFile)
+				return rename($this->getLocalName($index), $fileName);
 			else
-				return copy($this->getLocalName($index),$fileName);
+				return copy($this->getLocalName($index), $fileName);
 		} else
 			return false;
 	}
@@ -435,7 +435,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		completes successfully.
 	 */
-	public function getSuccessImage(){
+	public function getSuccessImage() {
 		$this->ensureChildControls();
 		return $this->_success;
 	}
@@ -444,7 +444,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		does not complete successfully.
 	 */
-	public function getErrorImage(){
+	public function getErrorImage() {
 		$this->ensureChildControls();
 		return $this->_error;
 	}
@@ -453,7 +453,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		is in progress.
 	 */
-	public function getBusyImage(){
+	public function getBusyImage() {
 		$this->ensureChildControls();
 		return $this->_busy;
 	}