las93 / venus3

bundles/lib/Form/Input.php

Indentation +4 added lines, -4 removed lines

@@ -174,10 +174,10 @@
 		$sContent = '';
 
 		if ($this->getType() === 'text' || $this->getType() === 'password' || $this->getType() === 'file'
-            || $this->getType() === 'tel' || $this->getType() === 'url' || $this->getType() === 'email'
-            || $this->getType() === 'search' || $this->getType() === 'date' || $this->getType() === 'time'
-            || $this->getType() === 'datetime' || $this->getType() === 'month' || $this->getType() === 'week'
-            || $this->getType() === 'number' || $this->getType() === 'range' || $this->getType() === 'color') {
+			|| $this->getType() === 'tel' || $this->getType() === 'url' || $this->getType() === 'email'
+			|| $this->getType() === 'search' || $this->getType() === 'date' || $this->getType() === 'time'
+			|| $this->getType() === 'datetime' || $this->getType() === 'month' || $this->getType() === 'week'
+			|| $this->getType() === 'number' || $this->getType() === 'range' || $this->getType() === 'color') {
 
 			$sContent .= '<label>'.$this->getLabel().'</label> ';
 		}

bundles/lib/Form/Container.php

Indentation +50 added lines, -50 removed lines

@@ -73,24 +73,24 @@ 
 	 */
 	public function createView()
 	{
-	    $oView = new \stdClass;
-	    $oView->form = $this->_sView;
-	    $oView->form_start = $this->_oForm->getFormInObject()->start;
-	    $oView->form_end = $this->_oForm->getFormInObject()->end;
-	    $oView->form_row = array();
+		$oView = new \stdClass;
+		$oView->form = $this->_sView;
+		$oView->form_start = $this->_oForm->getFormInObject()->start;
+		$oView->form_end = $this->_oForm->getFormInObject()->end;
+		$oView->form_row = array();
 	    
-	    foreach ($this->_oForm->getFormInObject()->form as $sKey => $mValue) {
+		foreach ($this->_oForm->getFormInObject()->form as $sKey => $mValue) {
 	        
-	        if ($mValue instanceof Container) {
+			if ($mValue instanceof Container) {
 	            
-	            $oNewForm = $mValue->createView();
-	            $oView->form_row[$sKey] = $oNewForm->form_row;
-	        }
-	        else {
+				$oNewForm = $mValue->createView();
+				$oView->form_row[$sKey] = $oNewForm->form_row;
+			}
+			else {
 	            
-	           $oView->form_row[$sKey] = $mValue;
-	        }
-	    }
+			   $oView->form_row[$sKey] = $mValue;
+			}
+		}
 	       
 		return $oView;
 	}
@@ -117,48 +117,48 @@ 
 	 */
 	public function handleRequest(array $aRequest) : bool
 	{
-	    if (!count($_POST)) { return true; }
+		if (!count($_POST)) { return true; }
 	    
-	    // Validation
-	    foreach ($this->_oForm->getElement() as $sKey => $sValue) {
+		// Validation
+		foreach ($this->_oForm->getElement() as $sKey => $sValue) {
 	    
-	        if (!$sValue instanceof self && !$this->_validate($sValue)) {
+			if (!$sValue instanceof self && !$this->_validate($sValue)) {
 
-	            return false;
-	        }
-	    }
+				return false;
+			}
+		}
 	    
-	    // Save
+		// Save
 		if ($this->_oForm->getIdEntity() > 0 && $this->_oForm->getSynchronizeEntity() !== null && count($aRequest) > 0) {
 		
-		    $sModelName = str_replace('Entity', 'Model', $this->_oForm->getSynchronizeEntity());
-		    $oModel = new $sModelName;
+			$sModelName = str_replace('Entity', 'Model', $this->_oForm->getSynchronizeEntity());
+			$oModel = new $sModelName;
 		
-		    $oEntity = new $this->_oForm->getSynchronizeEntity();
-		    $sPrimaryKey = LibEntity::getPrimaryKeyNameWithoutMapping($oEntity);
-		    $sMethodName = 'set_'.$sPrimaryKey;
+			$oEntity = new $this->_oForm->getSynchronizeEntity();
+			$sPrimaryKey = LibEntity::getPrimaryKeyNameWithoutMapping($oEntity);
+			$sMethodName = 'set_'.$sPrimaryKey;
 		
-		    call_user_func_array(array(&$oEntity, $sMethodName), array($this->_oForm->getIdEntity()));
+			call_user_func_array(array(&$oEntity, $sMethodName), array($this->_oForm->getIdEntity()));
 		
-		    foreach ($this->_oForm->getElement() as $sKey => $sValue) {
+			foreach ($this->_oForm->getElement() as $sKey => $sValue) {
 		
-		        $sMethodName = 'set_'.$sValue->getName().'';
-		        call_user_func_array(array(&$oEntity, $sMethodName), array($aRequest[$sValue->getName()]));
-		    }
+				$sMethodName = 'set_'.$sValue->getName().'';
+				call_user_func_array(array(&$oEntity, $sMethodName), array($aRequest[$sValue->getName()]));
+			}
 		
-		    $oEntity->save();
+			$oEntity->save();
 		}
 		else if ($this->_oForm->getSynchronizeEntity() !== null && isset($aRequest) && count($aRequest) > 0) {
 		
-		    $oEntity = new $this->_oForm->_sSynchronizeEntity;
+			$oEntity = new $this->_oForm->_sSynchronizeEntity;
 		
-		    foreach ($this->_oForm->getElement() as $sKey => $sValue) {
+			foreach ($this->_oForm->getElement() as $sKey => $sValue) {
 		
-		        $sMethodName = 'set_'.$sValue->getName().'';
-		        call_user_func_array(array(&$oEntity, $sMethodName), array($aRequest[$sValue->getName()]));
-		    }
+				$sMethodName = 'set_'.$sValue->getName().'';
+				call_user_func_array(array(&$oEntity, $sMethodName), array($aRequest[$sValue->getName()]));
+			}
 		
-		    $this->_oForm->setIdEntityCreated($oEntity->save());
+			$this->_oForm->setIdEntityCreated($oEntity->save());
 		}
 		
 		$this->_bHandleRequestActivate = true;
@@ -199,13 +199,13 @@ 
 	 */
 	public function isSubmitted() : bool
 	{
-	    if (isset($_POST['validform'.$this->_oForm->getFormNumber()]) && $_POST['validform'.$this->_oForm->getFormNumber()] == 1) {
+		if (isset($_POST['validform'.$this->_oForm->getFormNumber()]) && $_POST['validform'.$this->_oForm->getFormNumber()] == 1) {
 	        
-	        return true;
-	    }
+			return true;
+		}
 		else { 
 		    
-		    return false;
+			return false;
 		}
 	}
 
@@ -218,7 +218,7 @@ 
 	 */
 	public function isClicked(string $sElementName) : bool
 	{
-	    if (isset($_POST[$sElementName]) && $_POST[$sElementName]) { return true; }
+		if (isset($_POST[$sElementName]) && $_POST[$sElementName]) { return true; }
 		else { return false; }
 	}
 
@@ -231,14 +231,14 @@ 
 	 */
 	private function _validate($oElement) : bool
 	{
-	    foreach ($oElement->getConstraint() as $oConstraint) {
+		foreach ($oElement->getConstraint() as $oConstraint) {
 	        
-	        if (!$oConstraint->validate($_POST[$oElement->getName()])) {
+			if (!$oConstraint->validate($_POST[$oElement->getName()])) {
 	            
-	            return false;
-	        }
-	    }
+				return false;
+			}
+		}
 	    
-	    return true;
+		return true;
 	}
 }

bundles/lib/Session.php

Indentation +7 added lines, -7 removed lines

@@ -49,8 +49,8 @@ 
   	 */
   	public function set(string $sName, $mValue) : Session
 	{
-    	$_SESSION[$sName] = $mValue;
-    	return $this;
+		$_SESSION[$sName] = $mValue;
+		return $this;
   	}
 
   	/**
@@ -84,7 +84,7 @@ 
   	 * @param  string $sName name of the session
   	 * @param  string $sValue value of this sesion var
   	 * @return \Venus\lib\Session
-	 */
+  	 */
  	 public function setFlashBag($sName, $sValue)
 	 {
   		if (!isset($_SESSION['flashbag'])) { $_SESSION['flashbag'] = array(); }
@@ -109,10 +109,10 @@ 
 		    
 			$aParams = session_get_cookie_params();
 		    
-		    setcookie(session_name(), '', time() - 42000,
-		        $aParams["path"], $aParams["domain"],
-		        $aParams["secure"], $aParams["httponly"]
-		    );
+			setcookie(session_name(), '', time() - 42000,
+				$aParams["path"], $aParams["domain"],
+				$aParams["secure"], $aParams["httponly"]
+			);
 		}
 
 		session_destroy();

bundles/lib/Mail.php

Indentation +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	 * the from of mail
 	 * @access private
 	 * @var    string
-	*/
+	 */
 	private $_sFrom = "no-reply@iscreenway.com";
 
 	/**

bundles/lib/Benchmark.php

Indentation +3 added lines, -3 removed lines

@@ -81,11 +81,11 @@ 
 	 */
 	public static function setPointInLog(string $sName = 'default')
 	{
-	    $oLogger = Debug::getInstance();
+		$oLogger = Debug::getInstance();
 		$oLogger->setLogger($oLogger);
 
 		$oLogger->getLogger()
-	         	->log('BENCHMARK: Time at this point '.(microtime(true) - self::$_fStart).' - '.$sName);
+			 	->log('BENCHMARK: Time at this point '.(microtime(true) - self::$_fStart).' - '.$sName);
 	}
 	
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	public function setLogger(LoggerInterface $logger)
 	{
-	    if ($this->_oLogger === null) { $this->_oLogger = $logger; }
+		if ($this->_oLogger === null) { $this->_oLogger = $logger; }
 	}
 
 	/**

bundles/lib/Vendor.php

Indentation +26 added lines, -26 removed lines

@@ -30,13 +30,13 @@ 
  */
 class Vendor
 {
-    /**
-     * cache of the vendor available
-     * 
-     * @access private
-     * @var    array
-     */
-    private static $_aCache = null;
+	/**
+	 * cache of the vendor available
+	 * 
+	 * @access private
+	 * @var    array
+	 */
+	private static $_aCache = null;
     
 	/**
 	 * constructor - factory
@@ -54,31 +54,31 @@ 
 
 	public static function getVendor(string $sVendorName, $mParam = null, $mParam2 = null)
 	{
-	    if ($sVendorName === 'Apollina\Template') { 
+		if ($sVendorName === 'Apollina\Template') { 
 
-	        $oApollina = new $sVendorName($mParam, str_replace('lib', '', __DIR__), 
-	            str_replace('bundles'.DIRECTORY_SEPARATOR.'lib', CACHE_DIR, __DIR__), $mParam2);
+			$oApollina = new $sVendorName($mParam, str_replace('lib', '', __DIR__), 
+				str_replace('bundles'.DIRECTORY_SEPARATOR.'lib', CACHE_DIR, __DIR__), $mParam2);
 
-	        return $oApollina->addFunctionPath(__DIR__.DIRECTORY_SEPARATOR.'Functions', '\Venus\lib\Functions\\');
-	    }
-	    else if ($sVendorName === 'Attila\Orm') {
+			return $oApollina->addFunctionPath(__DIR__.DIRECTORY_SEPARATOR.'Functions', '\Venus\lib\Functions\\');
+		}
+		else if ($sVendorName === 'Attila\Orm') {
 
-	        $oDbConfig = Config::get('Db')->configuration;
+			$oDbConfig = Config::get('Db')->configuration;
 
-	        return new $sVendorName($oDbConfig->db, $oDbConfig->type, $oDbConfig->host, $oDbConfig->user, $oDbConfig->password, 
-	            $oDbConfig->db);
-	    }
-	    else if (isset($mParam) && isset($mParam2)) { 
+			return new $sVendorName($oDbConfig->db, $oDbConfig->type, $oDbConfig->host, $oDbConfig->user, $oDbConfig->password, 
+				$oDbConfig->db);
+		}
+		else if (isset($mParam) && isset($mParam2)) { 
 	        
-	        return new $sVendorName($mParam, $mParam2);
-	    }
-	    else if (isset($mParam)) { 
+			return new $sVendorName($mParam, $mParam2);
+		}
+		else if (isset($mParam)) { 
 	        
-	        return new $sVendorName($mParam);
-	    }
-	    else { 
+			return new $sVendorName($mParam);
+		}
+		else { 
 	        
-	        return new $sVendorName;
-	    }
+			return new $sVendorName;
+		}
 	}
 }

bundles/lib/Validator/Type.php

Indentation +32 added lines, -32 removed lines

@@ -30,41 +30,41 @@
  */
 class Type extends Common
 {
-    /**
-     * type
-     * @var type
-     */
-    private $_sType = '';
+	/**
+	 * type
+	 * @var type
+	 */
+	private $_sType = '';
     
-    /**
-     * constructor
-     *
-     * @access public
-     * @param  string $sType type
-     * @return Type
-     */
-    public function __construct(string $sType)
-    {
-        $this->_sType = $sType;
-    }
+	/**
+	 * constructor
+	 *
+	 * @access public
+	 * @param  string $sType type
+	 * @return Type
+	 */
+	public function __construct(string $sType)
+	{
+		$this->_sType = $sType;
+	}
     
-    /**
-     * validate the Type
-     *
-     * @access public
-     * @param  string $sValue
-     * @return bool
-     */
-    public function validate(string $sValue = null) : bool
-    {
-        if ($this->_sType == 'DateTime') {
+	/**
+	 * validate the Type
+	 *
+	 * @access public
+	 * @param  string $sValue
+	 * @return bool
+	 */
+	public function validate(string $sValue = null) : bool
+	{
+		if ($this->_sType == 'DateTime') {
             
-            if (preg_match('#^[0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}#', $sValue)) {
+			if (preg_match('#^[0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}#', $sValue)) {
                 
-                return true;
-            }
-        }
+				return true;
+			}
+		}
         
-        return false;
-    }
+		return false;
+	}
 }

bundles/lib/Di.php

Indentation +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 		}
 		else if (isset($this->_aDependencyInjectorContener[md5($sNameOfDi)])) {
 		    
-		    return $this->_aDependencyInjectorContener[md5($sNameOfDi)];
+			return $this->_aDependencyInjectorContener[md5($sNameOfDi)];
 		}
 
 		return false;
@@ -76,8 +76,8 @@ 
 	 */
 	public function set(string $sNameOfDi, callable $cFunction, bool $bShared = false) : Di
 	{
-	    if ($bShared === true) { self::$_aSharedDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
-	    else { $this->_aDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
+		if ($bShared === true) { self::$_aSharedDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
+		else { $this->_aDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
 		return $this;
 	}
 }

bundles/lib/Form.php

Indentation +52 added lines, -52 removed lines

@@ -141,14 +141,14 @@ 
 	 */
 	public function add($sName, $mType, $sLabel = null, $mValue = null, $mOptions = null)
 	{
-	    if ($mType instanceof Container) {
+		if ($mType instanceof Container) {
 	        
-	        $this->_aElement[$sName] = $mType;
-	    }
+			$this->_aElement[$sName] = $mType;
+		}
 		else if ($mType === 'text' || $mType === 'submit' || $mType === 'password' || $mType === 'file' || $mType === 'tel'
-	        || $mType === 'url' || $mType === 'email' || $mType === 'search' || $mType === 'date' || $mType === 'time'
-	        || $mType === 'datetime' || $mType === 'month' || $mType === 'week' || $mType === 'number' || $mType === 'range'
-	        || $mType === 'color') {
+			|| $mType === 'url' || $mType === 'email' || $mType === 'search' || $mType === 'date' || $mType === 'time'
+			|| $mType === 'datetime' || $mType === 'month' || $mType === 'week' || $mType === 'number' || $mType === 'range'
+			|| $mType === 'color') {
 
 			$this->_aElement[$sName] = new Input($sName, $mType, $sLabel, $mValue);
 		}
@@ -294,7 +294,7 @@ 
 
 		$oContainer = new Container;
 		$oContainer->setView($sFormContent)
-		           ->setForm($this);
+				   ->setForm($this);
 		
 		return $oContainer;
 	}
@@ -308,67 +308,67 @@ 
 	 */
 	public function getFormInObject()
 	{
-	    if ($this->_iIdEntity > 0 && $this->_sSynchronizeEntity !== null && count($_POST) < 1) {
+		if ($this->_iIdEntity > 0 && $this->_sSynchronizeEntity !== null && count($_POST) < 1) {
 	
-	        $sModelName = str_replace('Entity', 'Model', $this->_sSynchronizeEntity);
-	        $oModel = new $sModelName;
+			$sModelName = str_replace('Entity', 'Model', $this->_sSynchronizeEntity);
+			$oModel = new $sModelName;
 	        	
-	        $oEntity = new $this->_sSynchronizeEntity;
-	        $sPrimaryKey = LibEntity::getPrimaryKeyNameWithoutMapping($oEntity);
-	        $sMethodName = 'findOneBy'.$sPrimaryKey;
-	        $oCompleteEntity = call_user_func_array(array(&$oModel, $sMethodName), array($this->_iIdEntity));
+			$oEntity = new $this->_sSynchronizeEntity;
+			$sPrimaryKey = LibEntity::getPrimaryKeyNameWithoutMapping($oEntity);
+			$sMethodName = 'findOneBy'.$sPrimaryKey;
+			$oCompleteEntity = call_user_func_array(array(&$oModel, $sMethodName), array($this->_iIdEntity));
 	
-	        if (is_object($oCompleteEntity)) {
+			if (is_object($oCompleteEntity)) {
 	
-	            foreach ($this->_aElement as $sKey => $sValue) {
+				foreach ($this->_aElement as $sKey => $sValue) {
 	
-	                if ($sValue instanceof \Venus\lib\Form\Radio) {
+					if ($sValue instanceof \Venus\lib\Form\Radio) {
 	
-	                    $sExKey = $sKey;
-	                    $sKey = substr($sKey, 0, -6);
-	                }
+						$sExKey = $sKey;
+						$sKey = substr($sKey, 0, -6);
+					}
 	                	
-	                if ($sValue instanceof Form) {
+					if ($sValue instanceof Form) {
 	                    
-	                    ;
-	                }
-	                else {
+						;
+					}
+					else {
 	                 
-    	                $sMethodNameInEntity = 'get_'.$sKey;
-    	                $mValue = $oCompleteEntity->$sMethodNameInEntity();
+						$sMethodNameInEntity = 'get_'.$sKey;
+						$mValue = $oCompleteEntity->$sMethodNameInEntity();
     	
-    	                if ($sValue instanceof \Venus\lib\Form\Radio && method_exists($this->_aElement[$sExKey], 'setValueChecked')) {
+						if ($sValue instanceof \Venus\lib\Form\Radio && method_exists($this->_aElement[$sExKey], 'setValueChecked')) {
     	
-    	                    $this->_aElement[$sExKey]->setValueChecked($mValue);
-    	                }
-    	                else if (isset($mValue) && method_exists($this->_aElement[$sKey], 'setValue')) {
+							$this->_aElement[$sExKey]->setValueChecked($mValue);
+						}
+						else if (isset($mValue) && method_exists($this->_aElement[$sKey], 'setValue')) {
     	
-    	                    $this->_aElement[$sKey]->setValue($mValue);
-    	                }
-	                }
-	            }
-	        }
-	    }
+							$this->_aElement[$sKey]->setValue($mValue);
+						}
+					}
+				}
+			}
+		}
 	
-	    $oForm = new \StdClass();
-	    $oForm->start = '<form name="form'.$this->_iFormNumber.'" method="post"><input type="hidden" value="1" name="validform'.$this->_iFormNumber.'">';
-	    $oForm->form = array();
+		$oForm = new \StdClass();
+		$oForm->start = '<form name="form'.$this->_iFormNumber.'" method="post"><input type="hidden" value="1" name="validform'.$this->_iFormNumber.'">';
+		$oForm->form = array();
 	
-	    foreach ($this->_aElement as $sKey => $sValue) {
+		foreach ($this->_aElement as $sKey => $sValue) {
 
-	        if ($sValue instanceof Container) {
+			if ($sValue instanceof Container) {
 	        
-	            $oForm->form[$sKey] = $sValue;
-	        }
-	        else {
+				$oForm->form[$sKey] = $sValue;
+			}
+			else {
 	            
-	            $oForm->form[$sKey] = $sValue->fetch();
-	        }
-	    }
+				$oForm->form[$sKey] = $sValue->fetch();
+			}
+		}
 	
-	    $oForm->end = '</form>';
+		$oForm->end = '</form>';
 	
-	    return $oForm;
+		return $oForm;
 	}
 
 	/**
@@ -449,7 +449,7 @@ 
 	 */
 	public function getElement() {
 	    
-	    return $this->_aElement;
+		return $this->_aElement;
 	}
 	
 	/**
@@ -460,7 +460,7 @@ 
 	 */
 	public function getIdEntity() {
 	    
-	    return $this->_iIdEntity;
+		return $this->_iIdEntity;
 	}
 	
 	/**
@@ -471,6 +471,6 @@ 
 	 */
 	public function getSynchronizeEntity() {
 	    
-	    return $this->_sSynchronizeEntity;
+		return $this->_sSynchronizeEntity;
 	}
 }