las93 / venus3

bundles/lib/Form/Container.php

Indentation +203 added lines, -203 removed lines

@@ -33,207 +33,207 @@
  */
 class Container
 {
-    /**
-     * complete view
-     *
-     * @access private
-     * @var    string
-     */
-    private $_sView = null;
-
-    /**
-     * form library with its entity
-     *
-     * @access private
-     * @var    Form
-     */
-    private $_oForm = null;
-
-    /**
-     * Block the save in the entity if you don't call handleRequest
-     *
-     * @access private
-     * @var    bool
-     */
-    private $_bHandleRequestActivate = false;
-
-    /**
-     * Request of the formular
-     *
-     * @access private
-     * @var    array
-     */
-    private $_aRequest = null;
-
-    /**
-     * get the Value
-     *
-     * @access public
-     * @return \stdClass
-     */
-    public function createView() : \stdClass
-    {
-        $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) {
-
-            if ($mValue instanceof Container) {
-
-                $oNewForm = $mValue->createView();
-                $oView->form_row[$sKey] = $oNewForm->form_row;
-            } else {
-
-               $oView->form_row[$sKey] = $mValue;
-            }
-        }
-
-        return $oView;
-    }
-
-    /**
-     * set the Value
-     *
-     * @access public
-     * @param  string $sView Display of form;
-     * @return \Venus\lib\Form\Container
-     */
-    public function setView(string $sView) : Container
-    {
-        $this->_sView = $sView;
-        return $this;
-    }
-
-    /**
-     * handle the request to do many actions on it
-     *
-     * @access public
-     * @param  array $aRequest request like $_POST
-     * @return bool
-     */
-    public function handleRequest(array $aRequest) : bool
-    {
-        if (!count($_POST)) { return true; }
-
-        // Validation
-        foreach ($this->_oForm->getElement() as $sKey => $sValue) {
-
-            if (!$sValue instanceof self && !$this->_validate($sValue)) {
-
-                return false;
-            }
-        }
-
-        // Save
-        if ($this->_oForm->getIdEntity() > 0 && $this->_oForm->getSynchronizeEntity() !== null && count($aRequest) > 0) {
-
-            $sModelName = str_replace('Entity', 'Model', $this->_oForm->getSynchronizeEntity());
-            $oModel = new $sModelName;
-
-            $oEntity = new $this->_oForm->getSynchronizeEntity();
-            $sPrimaryKey = LibEntity::getPrimaryKeyNameWithoutMapping($oEntity);
-            $sMethodName = 'set_'.$sPrimaryKey;
-
-            call_user_func_array(array(&$oEntity, $sMethodName), array($this->_oForm->getIdEntity()));
-
-            foreach ($this->_oForm->getElement() as $sKey => $sValue) {
-
-                $sMethodName = 'set_'.$sValue->getName().'';
-                call_user_func_array(array(&$oEntity, $sMethodName), array($aRequest[$sValue->getName()]));
-            }
-
-            $oEntity->save();
-        } else if ($this->_oForm->getSynchronizeEntity() !== null && isset($aRequest) && count($aRequest) > 0) {
-
-            $oEntity = new $this->_oForm->_sSynchronizeEntity;
-
-            foreach ($this->_oForm->getElement() as $sKey => $sValue) {
-
-                $sMethodName = 'set_'.$sValue->getName().'';
-                call_user_func_array(array(&$oEntity, $sMethodName), array($aRequest[$sValue->getName()]));
-            }
-
-            $this->_oForm->setIdEntityCreated($oEntity->save());
-        }
-
-        $this->_bHandleRequestActivate = true;
-        $this->_aRequest = $aRequest;
-        return true;
-    }
-
-    /**
-     * set Form lib with its entity
-     *
-     * @access public
-     * @param  Form $oForm request like $_POST
-     * @return \Venus\lib\Form\Container
-     */
-    public function setForm(Form $oForm) : Container
-    {
-        $this->_oForm = $oForm;
-        return $this;
-    }
-
-    /**
-     * if this form is validate and save
-     *
-     * @access public
-     * @return boolean
-     */
-    public function isValid() : bool
-    {
-        if ($this->_bHandleRequestActivate === true) { return true; } else { return false; }
-    }
-
-    /**
-     * if this form is validate and save
-     *
-     * @access public
-     * @return boolean
-     */
-    public function isSubmitted() : bool
-    {
-        if (isset($_POST['validform'.$this->_oForm->getFormNumber()]) && $_POST['validform'.$this->_oForm->getFormNumber()] == 1) {
-
-            return true;
-        } else {
-
-            return false;
-        }
-    }
-
-    /**
-     * if this form is validate and save
-     *
-     * @access public
-     * @param  string $sElementName element name what we want test the click
-     * @return boolean
-     */
-    public function isClicked(string $sElementName) : bool
-    {
-        if (isset($_POST[$sElementName]) && $_POST[$sElementName]) { return true; } else { return false; }
-    }
-
-    /**
-     * if the element is valide or not (with the constraint)
-     *
-     * @access private
-     * @param  object $oElement element of formular
-     * @return boolean
-     */
-    private function _validate($oElement) : bool
-    {
-        foreach ($oElement->getConstraint() as $oConstraint) {
-
-            if (!$oConstraint->validate($_POST[$oElement->getName()])) {
-
-                return false;
-            }
-        }
-
-        return true;
-    }
+	/**
+	 * complete view
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	private $_sView = null;
+
+	/**
+	 * form library with its entity
+	 *
+	 * @access private
+	 * @var    Form
+	 */
+	private $_oForm = null;
+
+	/**
+	 * Block the save in the entity if you don't call handleRequest
+	 *
+	 * @access private
+	 * @var    bool
+	 */
+	private $_bHandleRequestActivate = false;
+
+	/**
+	 * Request of the formular
+	 *
+	 * @access private
+	 * @var    array
+	 */
+	private $_aRequest = null;
+
+	/**
+	 * get the Value
+	 *
+	 * @access public
+	 * @return \stdClass
+	 */
+	public function createView() : \stdClass
+	{
+		$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) {
+
+			if ($mValue instanceof Container) {
+
+				$oNewForm = $mValue->createView();
+				$oView->form_row[$sKey] = $oNewForm->form_row;
+			} else {
+
+			   $oView->form_row[$sKey] = $mValue;
+			}
+		}
+
+		return $oView;
+	}
+
+	/**
+	 * set the Value
+	 *
+	 * @access public
+	 * @param  string $sView Display of form;
+	 * @return \Venus\lib\Form\Container
+	 */
+	public function setView(string $sView) : Container
+	{
+		$this->_sView = $sView;
+		return $this;
+	}
+
+	/**
+	 * handle the request to do many actions on it
+	 *
+	 * @access public
+	 * @param  array $aRequest request like $_POST
+	 * @return bool
+	 */
+	public function handleRequest(array $aRequest) : bool
+	{
+		if (!count($_POST)) { return true; }
+
+		// Validation
+		foreach ($this->_oForm->getElement() as $sKey => $sValue) {
+
+			if (!$sValue instanceof self && !$this->_validate($sValue)) {
+
+				return false;
+			}
+		}
+
+		// Save
+		if ($this->_oForm->getIdEntity() > 0 && $this->_oForm->getSynchronizeEntity() !== null && count($aRequest) > 0) {
+
+			$sModelName = str_replace('Entity', 'Model', $this->_oForm->getSynchronizeEntity());
+			$oModel = new $sModelName;
+
+			$oEntity = new $this->_oForm->getSynchronizeEntity();
+			$sPrimaryKey = LibEntity::getPrimaryKeyNameWithoutMapping($oEntity);
+			$sMethodName = 'set_'.$sPrimaryKey;
+
+			call_user_func_array(array(&$oEntity, $sMethodName), array($this->_oForm->getIdEntity()));
+
+			foreach ($this->_oForm->getElement() as $sKey => $sValue) {
+
+				$sMethodName = 'set_'.$sValue->getName().'';
+				call_user_func_array(array(&$oEntity, $sMethodName), array($aRequest[$sValue->getName()]));
+			}
+
+			$oEntity->save();
+		} else if ($this->_oForm->getSynchronizeEntity() !== null && isset($aRequest) && count($aRequest) > 0) {
+
+			$oEntity = new $this->_oForm->_sSynchronizeEntity;
+
+			foreach ($this->_oForm->getElement() as $sKey => $sValue) {
+
+				$sMethodName = 'set_'.$sValue->getName().'';
+				call_user_func_array(array(&$oEntity, $sMethodName), array($aRequest[$sValue->getName()]));
+			}
+
+			$this->_oForm->setIdEntityCreated($oEntity->save());
+		}
+
+		$this->_bHandleRequestActivate = true;
+		$this->_aRequest = $aRequest;
+		return true;
+	}
+
+	/**
+	 * set Form lib with its entity
+	 *
+	 * @access public
+	 * @param  Form $oForm request like $_POST
+	 * @return \Venus\lib\Form\Container
+	 */
+	public function setForm(Form $oForm) : Container
+	{
+		$this->_oForm = $oForm;
+		return $this;
+	}
+
+	/**
+	 * if this form is validate and save
+	 *
+	 * @access public
+	 * @return boolean
+	 */
+	public function isValid() : bool
+	{
+		if ($this->_bHandleRequestActivate === true) { return true; } else { return false; }
+	}
+
+	/**
+	 * if this form is validate and save
+	 *
+	 * @access public
+	 * @return boolean
+	 */
+	public function isSubmitted() : bool
+	{
+		if (isset($_POST['validform'.$this->_oForm->getFormNumber()]) && $_POST['validform'.$this->_oForm->getFormNumber()] == 1) {
+
+			return true;
+		} else {
+
+			return false;
+		}
+	}
+
+	/**
+	 * if this form is validate and save
+	 *
+	 * @access public
+	 * @param  string $sElementName element name what we want test the click
+	 * @return boolean
+	 */
+	public function isClicked(string $sElementName) : bool
+	{
+		if (isset($_POST[$sElementName]) && $_POST[$sElementName]) { return true; } else { return false; }
+	}
+
+	/**
+	 * if the element is valide or not (with the constraint)
+	 *
+	 * @access private
+	 * @param  object $oElement element of formular
+	 * @return boolean
+	 */
+	private function _validate($oElement) : bool
+	{
+		foreach ($oElement->getConstraint() as $oConstraint) {
+
+			if (!$oConstraint->validate($_POST[$oElement->getName()])) {
+
+				return false;
+			}
+		}
+
+		return true;
+	}
 }

bundles/lib/Date.php

Indentation +197 added lines, -197 removed lines

@@ -30,201 +30,201 @@
  */
 class Date
 {
-    /**
-     * set name of image
-     *
-     * @access public
-     * @param  int $iWeek number of week
-     * @param  int $iYear year
-     * @param string $sFormat
-     * @return Date
-     */
-    public static function getWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : Date
-    {
-        $iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
-
-        if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } else { $iShift = (8 - $iFirstDayInYear) * 86400; }
-
-        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } else { $iWeekInSeconds = 0; }
-
-        $iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift;
-        $iTimestampLastDay = mktime(0, 0, 0, 1, 6, $iYear) + $iWeekInSeconds + $iShift + 604800;
-
-        return array(date($sFormat, $iTimestamp), date($sFormat, $iTimestampLastDay));
-    }
-
-    /**
-     * set name of image
-     *
-     * @access public
-     * @return \Venus\lib\Date
-     */
-    public static function getActualWeek() : Date
-    {
-        return self::getWeek(date('W'), date('Y'));
-    }
-
-    /**
-     * set name of image
-     *
-     * @access public
-     * @param  string $sMonth number of week
-     * @param  string $sLanguage language
-     * @return \Venus\lib\Date
-     */
-    public static function getMonthInWord(string $sMonth, string $sLanguage = 'fr') : Date
-    {
-        if ($sLanguage == 'fr') {
-
-            if ($sMonth == '01' || $sMonth == 1) { return 'Janvier'; }
-            else if ($sMonth == '02' || $sMonth == 2) { return 'Février'; }
-            else if ($sMonth == '03' || $sMonth == 3) { return 'Mars'; }
-            else if ($sMonth == '04' || $sMonth == 4) { return 'Avril'; }
-            else if ($sMonth == '05' || $sMonth == 5) { return 'Mai'; }
-            else if ($sMonth == '06' || $sMonth == 6) { return 'Juin'; }
-            else if ($sMonth == '07' || $sMonth == 7) { return 'Juillet'; }
-            else if ($sMonth == '08' || $sMonth == 8) { return 'Août'; }
-            else if ($sMonth == '09' || $sMonth == 9) { return 'Septembre'; }
-            else if ($sMonth == 10) { return 'Octobre'; }
-            else if ($sMonth == 11) { return 'Novembre'; }
-            else if ($sMonth == 12) { return 'Décembre'; }
-        }
-    }
-
-    /**
-     * set name of image
-     *
-     * @access public
-     * @param  mixed $sDay number of day
-     * @param  string $sLanguage language
-     * @return \Venus\lib\Date
-     */
-    public static function getDayInWord(string $sDay, string $sLanguage = 'fr') : Date
-    {
-        if ($sLanguage == 'fr') {
-
-            if ($sDay == 0) { return 'dimanche'; }
-            else if ($sDay == 1) { return 'lundi'; }
-            else if ($sDay == 2) { return 'mardi'; }
-            else if ($sDay == 3) { return 'mercredi'; }
-            else if ($sDay == 4) { return 'jeudi'; }
-            else if ($sDay == 5) { return 'vendredi'; }
-            else if ($sDay == 6) { return 'samedi'; }
-        }
-    }
-
-    /**
-     * get age by date
-     *
-     * @access public
-     * @param unknown $sBirthday
-     * @return int
-     */
-    public static function getAgeByDate(string $sBirthday) : int
-    {
-        list($iYear, $iMonth, $iDay) = preg_split('/[-.]/', $sBirthday);
-
-        $aToday = array();
-        $aToday['mois'] = date('n');
-        $aToday['jour'] = date('j');
-        $aToday['annee'] = date('Y');
-
-        $iYears = $aToday['annee'] - $iYear;
-
-        if ($aToday['mois'] <= $iMonth) {
-
-            if ($iMonth == $aToday['mois']) {
-
-                if ($iDay > $aToday['jour']) { $iYears--; }
-            }
-            else {
-
-                $iYears--;
-            }
-        }
-
-        return $iYears;
-    }
-
-    /**
-     * set name of image
-     *
-     * @access public
-     * @param  int $iWeek number of week
-     * @param  int $iYear year
-     * @return \Venus\lib\Date
-     */
-    public static function getMiddleWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : array
-    {
-        $iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
-
-        if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
-        else { $iShift = (8 - $iFirstDayInYear) * 86400; }
-
-        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
-        else { $iWeekInSeconds = 0; }
-
-        if (date('N') > 2) {
-
-            $iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift + 172800;
-            $iTimestampLastDay = $iTimestamp + 604800;
-        }
-        else {
-
-            $iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift - 432000;
-            $iTimestampLastDay = $iTimestamp + 604800;
-        }
-
-        $aDates = array(date($sFormat, $iTimestamp), date($sFormat, $iTimestampLastDay));
-
-        if (preg_replace('/^([0-9]+)-[0-9]+-[0-9]+$/', '$1', $aDates[0]) != date('Y')) {
-
-            $aDates[0] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', date('Y').'$1', $aDates[0]);
-            $aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y')+1).'$1', $aDates[1]);
-        }
-
-        return $aDates;
-    }
-
-    /**
-     * set name of image
-     *
-     * @access public
-     * @return array
-     */
-    public static function getActualMiddleWeek() : array
-    {
-        return self::getMiddleWeek(date('W'), date('Y'));
-    }
-
-    /**
-     * get time of kind "X hour ago"
-     *
-     * @access public
-     * @param  string $sDateTime datetime to convert
-     * @param  string $sLanguage language
-     * @return string
-     */
-    public static function getTimeAgoInString(string $sDateTime, string $sLanguage = 'fr') : string
-    {
-        if ($sLanguage == 'fr') {
-
-            $sStartReturn = 'Il y a';
-            $sEndReturn = '';
-            $sMinutes = 'minute(s) ';
-            $sHours = 'heure(s) ';
-            $sDays = 'jour(s) ';
-            $sMonths = 'mois ';
-            $sYears = 'mois ';
-        }
-
-        $oDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $sDateTime);
-        $iTimeStamp = time() - $oDateTime->getTimestamp();
-
-        if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp/60).' '.$sMinutes.$sEndReturn; }
-        if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp/3600).' '.$sHours.$sEndReturn; }
-        if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp/86400).' '.$sDays.$sEndReturn; }
-        if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; }
-        else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
-    }
+	/**
+	 * set name of image
+	 *
+	 * @access public
+	 * @param  int $iWeek number of week
+	 * @param  int $iYear year
+	 * @param string $sFormat
+	 * @return Date
+	 */
+	public static function getWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : Date
+	{
+		$iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
+
+		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } else { $iShift = (8 - $iFirstDayInYear) * 86400; }
+
+		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } else { $iWeekInSeconds = 0; }
+
+		$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift;
+		$iTimestampLastDay = mktime(0, 0, 0, 1, 6, $iYear) + $iWeekInSeconds + $iShift + 604800;
+
+		return array(date($sFormat, $iTimestamp), date($sFormat, $iTimestampLastDay));
+	}
+
+	/**
+	 * set name of image
+	 *
+	 * @access public
+	 * @return \Venus\lib\Date
+	 */
+	public static function getActualWeek() : Date
+	{
+		return self::getWeek(date('W'), date('Y'));
+	}
+
+	/**
+	 * set name of image
+	 *
+	 * @access public
+	 * @param  string $sMonth number of week
+	 * @param  string $sLanguage language
+	 * @return \Venus\lib\Date
+	 */
+	public static function getMonthInWord(string $sMonth, string $sLanguage = 'fr') : Date
+	{
+		if ($sLanguage == 'fr') {
+
+			if ($sMonth == '01' || $sMonth == 1) { return 'Janvier'; }
+			else if ($sMonth == '02' || $sMonth == 2) { return 'Février'; }
+			else if ($sMonth == '03' || $sMonth == 3) { return 'Mars'; }
+			else if ($sMonth == '04' || $sMonth == 4) { return 'Avril'; }
+			else if ($sMonth == '05' || $sMonth == 5) { return 'Mai'; }
+			else if ($sMonth == '06' || $sMonth == 6) { return 'Juin'; }
+			else if ($sMonth == '07' || $sMonth == 7) { return 'Juillet'; }
+			else if ($sMonth == '08' || $sMonth == 8) { return 'Août'; }
+			else if ($sMonth == '09' || $sMonth == 9) { return 'Septembre'; }
+			else if ($sMonth == 10) { return 'Octobre'; }
+			else if ($sMonth == 11) { return 'Novembre'; }
+			else if ($sMonth == 12) { return 'Décembre'; }
+		}
+	}
+
+	/**
+	 * set name of image
+	 *
+	 * @access public
+	 * @param  mixed $sDay number of day
+	 * @param  string $sLanguage language
+	 * @return \Venus\lib\Date
+	 */
+	public static function getDayInWord(string $sDay, string $sLanguage = 'fr') : Date
+	{
+		if ($sLanguage == 'fr') {
+
+			if ($sDay == 0) { return 'dimanche'; }
+			else if ($sDay == 1) { return 'lundi'; }
+			else if ($sDay == 2) { return 'mardi'; }
+			else if ($sDay == 3) { return 'mercredi'; }
+			else if ($sDay == 4) { return 'jeudi'; }
+			else if ($sDay == 5) { return 'vendredi'; }
+			else if ($sDay == 6) { return 'samedi'; }
+		}
+	}
+
+	/**
+	 * get age by date
+	 *
+	 * @access public
+	 * @param unknown $sBirthday
+	 * @return int
+	 */
+	public static function getAgeByDate(string $sBirthday) : int
+	{
+		list($iYear, $iMonth, $iDay) = preg_split('/[-.]/', $sBirthday);
+
+		$aToday = array();
+		$aToday['mois'] = date('n');
+		$aToday['jour'] = date('j');
+		$aToday['annee'] = date('Y');
+
+		$iYears = $aToday['annee'] - $iYear;
+
+		if ($aToday['mois'] <= $iMonth) {
+
+			if ($iMonth == $aToday['mois']) {
+
+				if ($iDay > $aToday['jour']) { $iYears--; }
+			}
+			else {
+
+				$iYears--;
+			}
+		}
+
+		return $iYears;
+	}
+
+	/**
+	 * set name of image
+	 *
+	 * @access public
+	 * @param  int $iWeek number of week
+	 * @param  int $iYear year
+	 * @return \Venus\lib\Date
+	 */
+	public static function getMiddleWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : array
+	{
+		$iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
+
+		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
+		else { $iShift = (8 - $iFirstDayInYear) * 86400; }
+
+		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
+		else { $iWeekInSeconds = 0; }
+
+		if (date('N') > 2) {
+
+			$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift + 172800;
+			$iTimestampLastDay = $iTimestamp + 604800;
+		}
+		else {
+
+			$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift - 432000;
+			$iTimestampLastDay = $iTimestamp + 604800;
+		}
+
+		$aDates = array(date($sFormat, $iTimestamp), date($sFormat, $iTimestampLastDay));
+
+		if (preg_replace('/^([0-9]+)-[0-9]+-[0-9]+$/', '$1', $aDates[0]) != date('Y')) {
+
+			$aDates[0] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', date('Y').'$1', $aDates[0]);
+			$aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y')+1).'$1', $aDates[1]);
+		}
+
+		return $aDates;
+	}
+
+	/**
+	 * set name of image
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public static function getActualMiddleWeek() : array
+	{
+		return self::getMiddleWeek(date('W'), date('Y'));
+	}
+
+	/**
+	 * get time of kind "X hour ago"
+	 *
+	 * @access public
+	 * @param  string $sDateTime datetime to convert
+	 * @param  string $sLanguage language
+	 * @return string
+	 */
+	public static function getTimeAgoInString(string $sDateTime, string $sLanguage = 'fr') : string
+	{
+		if ($sLanguage == 'fr') {
+
+			$sStartReturn = 'Il y a';
+			$sEndReturn = '';
+			$sMinutes = 'minute(s) ';
+			$sHours = 'heure(s) ';
+			$sDays = 'jour(s) ';
+			$sMonths = 'mois ';
+			$sYears = 'mois ';
+		}
+
+		$oDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $sDateTime);
+		$iTimeStamp = time() - $oDateTime->getTimestamp();
+
+		if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp/60).' '.$sMinutes.$sEndReturn; }
+		if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp/3600).' '.$sHours.$sEndReturn; }
+		if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp/86400).' '.$sDays.$sEndReturn; }
+		if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; }
+		else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -41,11 +41,11 @@ 
      */
     public static function getWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : Date
     {
-        $iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
+        $iFirstDayInYear = date("N", mktime(0, 0, 0, 1, 1, $iYear));
 
         if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } else { $iWeekInSeconds = 0; }
+        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek - 1) * 604800; } else { $iWeekInSeconds = 0; }
 
         $iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift;
         $iTimestampLastDay = mktime(0, 0, 0, 1, 6, $iYear) + $iWeekInSeconds + $iShift + 604800;
@@ -156,12 +156,12 @@ 
      */
     public static function getMiddleWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : array
     {
-        $iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
+        $iFirstDayInYear = date("N", mktime(0, 0, 0, 1, 1, $iYear));
 
         if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
         else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
+        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek - 1) * 604800; }
         else { $iWeekInSeconds = 0; }
 
         if (date('N') > 2) {
@@ -180,7 +180,7 @@ 
         if (preg_replace('/^([0-9]+)-[0-9]+-[0-9]+$/', '$1', $aDates[0]) != date('Y')) {
 
             $aDates[0] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', date('Y').'$1', $aDates[0]);
-            $aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y')+1).'$1', $aDates[1]);
+            $aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y') + 1).'$1', $aDates[1]);
         }
 
         return $aDates;
@@ -221,10 +221,10 @@ 
         $oDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $sDateTime);
         $iTimeStamp = time() - $oDateTime->getTimestamp();
 
-        if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp/60).' '.$sMinutes.$sEndReturn; }
-        if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp/3600).' '.$sHours.$sEndReturn; }
-        if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp/86400).' '.$sDays.$sEndReturn; }
-        if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; }
-        else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
+        if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp / 60).' '.$sMinutes.$sEndReturn; }
+        if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp / 3600).' '.$sHours.$sEndReturn; }
+        if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp / 86400).' '.$sDays.$sEndReturn; }
+        if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp / 2592000).' '.$sMonths.$sEndReturn; }
+        else { return $sStartReturn.' '.(int)($iTimeStamp / 31536000).' '.$sYears.$sEndReturn; }
     }
 }

Braces +7 added lines, -29 removed lines

@@ -76,18 +76,7 @@ 
     {
         if ($sLanguage == 'fr') {
 
-            if ($sMonth == '01' || $sMonth == 1) { return 'Janvier'; }
-            else if ($sMonth == '02' || $sMonth == 2) { return 'Février'; }
-            else if ($sMonth == '03' || $sMonth == 3) { return 'Mars'; }
-            else if ($sMonth == '04' || $sMonth == 4) { return 'Avril'; }
-            else if ($sMonth == '05' || $sMonth == 5) { return 'Mai'; }
-            else if ($sMonth == '06' || $sMonth == 6) { return 'Juin'; }
-            else if ($sMonth == '07' || $sMonth == 7) { return 'Juillet'; }
-            else if ($sMonth == '08' || $sMonth == 8) { return 'Août'; }
-            else if ($sMonth == '09' || $sMonth == 9) { return 'Septembre'; }
-            else if ($sMonth == 10) { return 'Octobre'; }
-            else if ($sMonth == 11) { return 'Novembre'; }
-            else if ($sMonth == 12) { return 'Décembre'; }
+            if ($sMonth == '01' || $sMonth == 1) { return 'Janvier'; } else if ($sMonth == '02' || $sMonth == 2) { return 'Février'; } else if ($sMonth == '03' || $sMonth == 3) { return 'Mars'; } else if ($sMonth == '04' || $sMonth == 4) { return 'Avril'; } else if ($sMonth == '05' || $sMonth == 5) { return 'Mai'; } else if ($sMonth == '06' || $sMonth == 6) { return 'Juin'; } else if ($sMonth == '07' || $sMonth == 7) { return 'Juillet'; } else if ($sMonth == '08' || $sMonth == 8) { return 'Août'; } else if ($sMonth == '09' || $sMonth == 9) { return 'Septembre'; } else if ($sMonth == 10) { return 'Octobre'; } else if ($sMonth == 11) { return 'Novembre'; } else if ($sMonth == 12) { return 'Décembre'; }
         }
     }
 
@@ -103,13 +92,7 @@ 
     {
         if ($sLanguage == 'fr') {
 
-            if ($sDay == 0) { return 'dimanche'; }
-            else if ($sDay == 1) { return 'lundi'; }
-            else if ($sDay == 2) { return 'mardi'; }
-            else if ($sDay == 3) { return 'mercredi'; }
-            else if ($sDay == 4) { return 'jeudi'; }
-            else if ($sDay == 5) { return 'vendredi'; }
-            else if ($sDay == 6) { return 'samedi'; }
+            if ($sDay == 0) { return 'dimanche'; } else if ($sDay == 1) { return 'lundi'; } else if ($sDay == 2) { return 'mardi'; } else if ($sDay == 3) { return 'mercredi'; } else if ($sDay == 4) { return 'jeudi'; } else if ($sDay == 5) { return 'vendredi'; } else if ($sDay == 6) { return 'samedi'; }
         }
     }
 
@@ -136,8 +119,7 @@ 
             if ($iMonth == $aToday['mois']) {
 
                 if ($iDay > $aToday['jour']) { $iYears--; }
-            }
-            else {
+            } else {
 
                 $iYears--;
             }
@@ -158,18 +140,15 @@ 
     {
         $iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
 
-        if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
-        else { $iShift = (8 - $iFirstDayInYear) * 86400; }
+        if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
-        else { $iWeekInSeconds = 0; }
+        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } else { $iWeekInSeconds = 0; }
 
         if (date('N') > 2) {
 
             $iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift + 172800;
             $iTimestampLastDay = $iTimestamp + 604800;
-        }
-        else {
+        } else {
 
             $iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift - 432000;
             $iTimestampLastDay = $iTimestamp + 604800;
@@ -224,7 +203,6 @@ 
         if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp/60).' '.$sMinutes.$sEndReturn; }
         if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp/3600).' '.$sHours.$sEndReturn; }
         if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp/86400).' '.$sDays.$sEndReturn; }
-        if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; }
-        else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
+        if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; } else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
     }
 }

bundles/lib/Form.php

Indentation +401 added lines, -401 removed lines

@@ -60,406 +60,406 @@
  */
 class Form
 {
-    /**
-     * Elements of the form
-     *
-     *  @access private
-     *  @var    array
-     */
-    private $_aElement = array();
-
-    /**
-     * Increment for form
-     *
-     *  @access private
-     *  @var    int
-     */
-    private static $_iFormIncrement = 0;
-
-    /**
-     * number of form
-     *
-     *  @access private
-     *  @var    int
-     */
-    private $_iFormNumber = 0;
-
-    /**
-     * Separator between fields of form
-     *
-     *  @access private
-     *  @var    string
-     */
-    private $_sSeparator = '<br/>';
-
-    /**
-     * The entity to save with the formular
-     *
-     *  @access private
-     *  @var    string
-     */
-    private $_sSynchronizeEntity = null;
-
-    /**
-     * The id of entity
-     *
-     *  @access private
-     *  @var    int
-     */
-    private $_iIdEntity = null;
-
-    /**
-     * The entity to save with the formular
-     *
-     *  @access private
-     *  @var    int
-     */
-    private $_iIdEntityCreated = null;
-
-    /**
-     * constructor that it increment (static) for all use
-     *
-     * @access public
-     */
-    public function __construct()
-    {
-        self::$_iFormIncrement++;
-        $this->_iFormNumber = self::$_iFormIncrement;
-    }
-
-    /**
-     * add an element in the form
-     *
-     * @access public
-     * @param  string $sName name
-     * @param  string|\Venus\lib\Form $mType type of field
-     * @param  string $sLabel label of field
-     * @param  mixed $mValue value of field
-     * @parma  mixed $mOptions options (for select)
-     * @return \Venus\lib\Form
-     */
-    public function add($sName, $mType, $sLabel = null, $mValue = null, $mOptions = null)
-    {
-        if ($mType instanceof Container) {
-
-            $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') {
-
-            $this->_aElement[$sName] = new Input($sName, $mType, $sLabel, $mValue);
-        } elseif ($mType === 'textarea') {
-
-            $this->_aElement[$sName] = new Textarea($sName, $sLabel, $mValue);
-        } else  if ($mType === 'select') {
-
-            $this->_aElement[$sName] = new Select($sName, $mOptions, $sLabel, $mValue);
-        } else  if ($mType === 'label') {
-
-            $this->_aElement[$sName] = new Label($sName);
-        } else  if ($mType === 'list_checkbox') {
-
-            $i = 0;
-
-            $this->_aElement[$sName.'_'.$i++] = new Label($sLabel);
-
-            foreach ($mValue as $mKey => $sValue) {
-
-                $this->_aElement[$sName.'_'.$i++] = new Checkbox($sName, $sValue, $mKey, $mOptions);
-            }
-        } else  if ($mType === 'checkbox') {
-
-            $this->_aElement[$sName] = new Checkbox($sName, $sLabel, $mValue, $mOptions);
-        } else  if ($mType === 'radio') {
-
-            $this->_aElement[$sName.rand(100000, 999999)] = new Radio($sName, $sLabel, $mValue, $mOptions);
-        } else  if ($mType === 'date') {
-
-            $aDay = array();
-
-            for ($i = 1; $i <= 31; $i++) {
-
-                if ($i < 10) { $aDay['0'.$i] = '0'.$i; }
-                else { $aDay[$i] = $i; }
-            }
-
-            $this->_aElement[$sName.'_day'] = new Select($sName, $aDay);
-
-            $aMonth = array(
-                '01' => 'Jan',
-                '02' => 'Feb',
-                '03' => 'Mar',
-                '04' => 'Apr',
-                '05' => 'May',
-                '06' => 'Jun',
-                '07' => 'Jui',
-                '08' => 'Aug',
-                '09' => 'Sep',
-                '10' => 'Oct',
-                '11' => 'Nov',
-                '12' => 'Dec',
-            );
-
-            $this->_aElement[$sName.'_month'] = new Select($sName, $aMonth);
-
-            $aYear = array();
-
-            for ($i = 1900; $i <= 2013; $i++) {
-
-                $aYear[$i] = $i;
-            }
-
-            $this->_aElement[$sName.'_year'] = new Select($sName, $aMonth);
-        }
-
-        return $this;
-    }
-
-    /**
-     * get id entity created by the formular
-     *
-     * @access public
-     * @return int
-     */
-    public function getIdEntityCreated() : int
-    {
-        return $this->_iIdEntityCreated;
-    }
-
-    /**
-     * set id entity created by the formular
-     *
-     * @access public
-     * @param  int $iIdEntityCreated
-     * @return Form
-     */
-    public function setIdEntityCreated(int $iIdEntityCreated) : Form
-    {
-        $this->_iIdEntityCreated = $iIdEntityCreated;
-        return $this;
-    }
-
-    /**
-     * get form number
-     *
-     * @access public
-     * @return int
-     */
-    public function getFormNumber() : int
-    {
-        return $this->_iFormNumber;
-    }
+	/**
+	 * Elements of the form
+	 *
+	 *  @access private
+	 *  @var    array
+	 */
+	private $_aElement = array();
+
+	/**
+	 * Increment for form
+	 *
+	 *  @access private
+	 *  @var    int
+	 */
+	private static $_iFormIncrement = 0;
+
+	/**
+	 * number of form
+	 *
+	 *  @access private
+	 *  @var    int
+	 */
+	private $_iFormNumber = 0;
+
+	/**
+	 * Separator between fields of form
+	 *
+	 *  @access private
+	 *  @var    string
+	 */
+	private $_sSeparator = '<br/>';
+
+	/**
+	 * The entity to save with the formular
+	 *
+	 *  @access private
+	 *  @var    string
+	 */
+	private $_sSynchronizeEntity = null;
+
+	/**
+	 * The id of entity
+	 *
+	 *  @access private
+	 *  @var    int
+	 */
+	private $_iIdEntity = null;
+
+	/**
+	 * The entity to save with the formular
+	 *
+	 *  @access private
+	 *  @var    int
+	 */
+	private $_iIdEntityCreated = null;
+
+	/**
+	 * constructor that it increment (static) for all use
+	 *
+	 * @access public
+	 */
+	public function __construct()
+	{
+		self::$_iFormIncrement++;
+		$this->_iFormNumber = self::$_iFormIncrement;
+	}
+
+	/**
+	 * add an element in the form
+	 *
+	 * @access public
+	 * @param  string $sName name
+	 * @param  string|\Venus\lib\Form $mType type of field
+	 * @param  string $sLabel label of field
+	 * @param  mixed $mValue value of field
+	 * @parma  mixed $mOptions options (for select)
+	 * @return \Venus\lib\Form
+	 */
+	public function add($sName, $mType, $sLabel = null, $mValue = null, $mOptions = null)
+	{
+		if ($mType instanceof Container) {
+
+			$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') {
+
+			$this->_aElement[$sName] = new Input($sName, $mType, $sLabel, $mValue);
+		} elseif ($mType === 'textarea') {
+
+			$this->_aElement[$sName] = new Textarea($sName, $sLabel, $mValue);
+		} else  if ($mType === 'select') {
+
+			$this->_aElement[$sName] = new Select($sName, $mOptions, $sLabel, $mValue);
+		} else  if ($mType === 'label') {
+
+			$this->_aElement[$sName] = new Label($sName);
+		} else  if ($mType === 'list_checkbox') {
+
+			$i = 0;
+
+			$this->_aElement[$sName.'_'.$i++] = new Label($sLabel);
+
+			foreach ($mValue as $mKey => $sValue) {
+
+				$this->_aElement[$sName.'_'.$i++] = new Checkbox($sName, $sValue, $mKey, $mOptions);
+			}
+		} else  if ($mType === 'checkbox') {
+
+			$this->_aElement[$sName] = new Checkbox($sName, $sLabel, $mValue, $mOptions);
+		} else  if ($mType === 'radio') {
+
+			$this->_aElement[$sName.rand(100000, 999999)] = new Radio($sName, $sLabel, $mValue, $mOptions);
+		} else  if ($mType === 'date') {
+
+			$aDay = array();
+
+			for ($i = 1; $i <= 31; $i++) {
+
+				if ($i < 10) { $aDay['0'.$i] = '0'.$i; }
+				else { $aDay[$i] = $i; }
+			}
+
+			$this->_aElement[$sName.'_day'] = new Select($sName, $aDay);
+
+			$aMonth = array(
+				'01' => 'Jan',
+				'02' => 'Feb',
+				'03' => 'Mar',
+				'04' => 'Apr',
+				'05' => 'May',
+				'06' => 'Jun',
+				'07' => 'Jui',
+				'08' => 'Aug',
+				'09' => 'Sep',
+				'10' => 'Oct',
+				'11' => 'Nov',
+				'12' => 'Dec',
+			);
+
+			$this->_aElement[$sName.'_month'] = new Select($sName, $aMonth);
+
+			$aYear = array();
+
+			for ($i = 1900; $i <= 2013; $i++) {
+
+				$aYear[$i] = $i;
+			}
+
+			$this->_aElement[$sName.'_year'] = new Select($sName, $aMonth);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * get id entity created by the formular
+	 *
+	 * @access public
+	 * @return int
+	 */
+	public function getIdEntityCreated() : int
+	{
+		return $this->_iIdEntityCreated;
+	}
+
+	/**
+	 * set id entity created by the formular
+	 *
+	 * @access public
+	 * @param  int $iIdEntityCreated
+	 * @return Form
+	 */
+	public function setIdEntityCreated(int $iIdEntityCreated) : Form
+	{
+		$this->_iIdEntityCreated = $iIdEntityCreated;
+		return $this;
+	}
+
+	/**
+	 * get form number
+	 *
+	 * @access public
+	 * @return int
+	 */
+	public function getFormNumber() : int
+	{
+		return $this->_iFormNumber;
+	}
 
-    /**
-     * set id entity created by the formular
-     *
-     * @access public
-     * @param  int $iFormNumber
-     * @return Form
-     */
-    public function setFormNumber(int $iFormNumber) : Form
-    {
-        $this->_iFormNumber = $iFormNumber;
-        return $this;
-    }
-
-    /**
-     * get global form
-     *
-     * @access public
-     * @return \Venus\lib\Form\Container
-     */
-    public function getForm()
-    {
-        $oForm = $this->getFormInObject();
-
-        $sFormContent = $oForm->start;
-
-        foreach ($oForm->form as $sValue) {
-
-            $sFormContent .= $sValue.$this->_sSeparator;
-        }
-
-        $sFormContent .= $oForm->end;
-
-        $oContainer = new Container;
-        $oContainer->setView($sFormContent)
-                   ->setForm($this);
-
-        return $oContainer;
-    }
-
-
-    /**
-     * get global object form
-     *
-     * @access public
-     * @return \stdClass
-     */
-    public function getFormInObject()
-    {
-        if ($this->_iIdEntity > 0 && $this->_sSynchronizeEntity !== null && count($_POST) < 1) {
-
-            $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));
-
-            if (is_object($oCompleteEntity)) {
-
-                foreach ($this->_aElement as $sKey => $sValue) {
-
-                    if ($sValue instanceof \Venus\lib\Form\Radio) {
-
-                        $sExKey = $sKey;
-                        $sKey = substr($sKey, 0, -6);
-                    }
-
-                    if ($sValue instanceof Form) {
-
-                        ;
-                    } else {
-
-                        $sMethodNameInEntity = 'get_'.$sKey;
-                        $mValue = $oCompleteEntity->$sMethodNameInEntity();
-
-                        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[$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();
-
-        foreach ($this->_aElement as $sKey => $sValue) {
-
-            if ($sValue instanceof Container) {
-
-                $oForm->form[$sKey] = $sValue;
-            } else {
-
-                $oForm->form[$sKey] = $sValue->fetch();
-            }
-        }
-
-        $oForm->end = '</form>';
-
-        return $oForm;
-    }
-
-    /**
-     * get an element of formular
-     *
-     * @access public
-     * @param  string $sName name
-     * @return object
-     */
-    public function get($sName)
-    {
-        return $this->_aElement[$sName];
-    }
-
-    /**
-     * get the form separator
-     *
-     * @access public
-     * @return string
-     */
-    public function getSeparator()
-    {
-        return $this->_sSeparator;
-    }
-
-    /**
-     * set the form separator
-     *
-     * @access public
-     * @param  string $sSeparator separator between the fields
-     * @return \Venus\lib\Form
-     */
-    public function setSeparator($sSeparator)
-    {
-        $this->_sSeparator = $sSeparator;
-        return $this;
-    }
-
-    /**
-     * set the entity to synchronize with the formular
-     *
-     * @access public
-     * @param $sSynchronizeEntity
-     * @param  int $iId id of the primary key
-     * @return Form
-     * @internal param string $sSeparator separator between the fields
-     */
-    public function synchronizeEntity($sSynchronizeEntity, $iId = null)
-    {
-        if ($iId !== null) { $this->_iIdEntity = $iId; }
-
-        $this->_sSynchronizeEntity = $sSynchronizeEntity;
-        return $this;
-    }
-
-    /**
-     * add constraint
-     *
-     * @access public
-     * @param  string $sName field name
-     * @param  object $oConstraint constraint on the field
-     * @return \Venus\lib\Form
-     */
-    public function addConstraint($sName, $oConstraint)
-    {
-        if ($this->_aElement[$sName] instanceof Input || $this->_aElement[$sName] instanceof Textarea) {
-
-            $this->_aElement[$sName]->setConstraint($oConstraint);
-        }
-
-        return $this;
-    }
-
-    /**
-     * get all elements
-     *
-     * @access public
-     * @return  array
-     */
-    public function getElement() {
-
-        return $this->_aElement;
-    }
-
-    /**
-     * get all elements
-     *
-     * @access public
-     * @return int
-     */
-    public function getIdEntity() {
-
-        return $this->_iIdEntity;
-    }
-
-    /**
-     * get all elements
-     *
-     * @access public
-     * @return string
-     */
-    public function getSynchronizeEntity() {
-
-        return $this->_sSynchronizeEntity;
-    }
+	/**
+	 * set id entity created by the formular
+	 *
+	 * @access public
+	 * @param  int $iFormNumber
+	 * @return Form
+	 */
+	public function setFormNumber(int $iFormNumber) : Form
+	{
+		$this->_iFormNumber = $iFormNumber;
+		return $this;
+	}
+
+	/**
+	 * get global form
+	 *
+	 * @access public
+	 * @return \Venus\lib\Form\Container
+	 */
+	public function getForm()
+	{
+		$oForm = $this->getFormInObject();
+
+		$sFormContent = $oForm->start;
+
+		foreach ($oForm->form as $sValue) {
+
+			$sFormContent .= $sValue.$this->_sSeparator;
+		}
+
+		$sFormContent .= $oForm->end;
+
+		$oContainer = new Container;
+		$oContainer->setView($sFormContent)
+				   ->setForm($this);
+
+		return $oContainer;
+	}
+
+
+	/**
+	 * get global object form
+	 *
+	 * @access public
+	 * @return \stdClass
+	 */
+	public function getFormInObject()
+	{
+		if ($this->_iIdEntity > 0 && $this->_sSynchronizeEntity !== null && count($_POST) < 1) {
+
+			$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));
+
+			if (is_object($oCompleteEntity)) {
+
+				foreach ($this->_aElement as $sKey => $sValue) {
+
+					if ($sValue instanceof \Venus\lib\Form\Radio) {
+
+						$sExKey = $sKey;
+						$sKey = substr($sKey, 0, -6);
+					}
+
+					if ($sValue instanceof Form) {
+
+						;
+					} else {
+
+						$sMethodNameInEntity = 'get_'.$sKey;
+						$mValue = $oCompleteEntity->$sMethodNameInEntity();
+
+						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[$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();
+
+		foreach ($this->_aElement as $sKey => $sValue) {
+
+			if ($sValue instanceof Container) {
+
+				$oForm->form[$sKey] = $sValue;
+			} else {
+
+				$oForm->form[$sKey] = $sValue->fetch();
+			}
+		}
+
+		$oForm->end = '</form>';
+
+		return $oForm;
+	}
+
+	/**
+	 * get an element of formular
+	 *
+	 * @access public
+	 * @param  string $sName name
+	 * @return object
+	 */
+	public function get($sName)
+	{
+		return $this->_aElement[$sName];
+	}
+
+	/**
+	 * get the form separator
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function getSeparator()
+	{
+		return $this->_sSeparator;
+	}
+
+	/**
+	 * set the form separator
+	 *
+	 * @access public
+	 * @param  string $sSeparator separator between the fields
+	 * @return \Venus\lib\Form
+	 */
+	public function setSeparator($sSeparator)
+	{
+		$this->_sSeparator = $sSeparator;
+		return $this;
+	}
+
+	/**
+	 * set the entity to synchronize with the formular
+	 *
+	 * @access public
+	 * @param $sSynchronizeEntity
+	 * @param  int $iId id of the primary key
+	 * @return Form
+	 * @internal param string $sSeparator separator between the fields
+	 */
+	public function synchronizeEntity($sSynchronizeEntity, $iId = null)
+	{
+		if ($iId !== null) { $this->_iIdEntity = $iId; }
+
+		$this->_sSynchronizeEntity = $sSynchronizeEntity;
+		return $this;
+	}
+
+	/**
+	 * add constraint
+	 *
+	 * @access public
+	 * @param  string $sName field name
+	 * @param  object $oConstraint constraint on the field
+	 * @return \Venus\lib\Form
+	 */
+	public function addConstraint($sName, $oConstraint)
+	{
+		if ($this->_aElement[$sName] instanceof Input || $this->_aElement[$sName] instanceof Textarea) {
+
+			$this->_aElement[$sName]->setConstraint($oConstraint);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * get all elements
+	 *
+	 * @access public
+	 * @return  array
+	 */
+	public function getElement() {
+
+		return $this->_aElement;
+	}
+
+	/**
+	 * get all elements
+	 *
+	 * @access public
+	 * @return int
+	 */
+	public function getIdEntity() {
+
+		return $this->_iIdEntity;
+	}
+
+	/**
+	 * get all elements
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function getSynchronizeEntity() {
+
+		return $this->_sSynchronizeEntity;
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -180,8 +180,7 @@
 
             for ($i = 1; $i <= 31; $i++) {
 
-                if ($i < 10) { $aDay['0'.$i] = '0'.$i; }
-                else { $aDay[$i] = $i; }
+                if ($i < 10) { $aDay['0'.$i] = '0'.$i; } else { $aDay[$i] = $i; }
             }
 
             $this->_aElement[$sName.'_day'] = new Select($sName, $aDay);

bundles/lib/Cache/Mock.php

Indentation +61 added lines, -61 removed lines

@@ -30,69 +30,69 @@
  */
 class Mock implements CacheInterface
 {
-    /**
-     * get a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  int $iFlags flags
-     * @param  int $iTimeout expiration of cache
-     * @return boolean
-     */
-    public function get(string $sName, int&$iFlags = null, int $iTimeout = 0)
-    {
-        return false;
-    }
+	/**
+	 * get a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  int $iFlags flags
+	 * @param  int $iTimeout expiration of cache
+	 * @return boolean
+	 */
+	public function get(string $sName, int&$iFlags = null, int $iTimeout = 0)
+	{
+		return false;
+	}
 
-    /**
-     * set a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  mixed $mValue value of this sesion var
-     * @param  int $iFlag unused
-     * @param  int $iExpire expiration of cache
-     * @return boolean
-     */
-    public function set(string $sName, $mValue, int $iFlag = 0, int $iExpire = false)
-    {
-        return true;
-    }
+	/**
+	 * set a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  mixed $mValue value of this sesion var
+	 * @param  int $iFlag unused
+	 * @param  int $iExpire expiration of cache
+	 * @return boolean
+	 */
+	public function set(string $sName, $mValue, int $iFlag = 0, int $iExpire = false)
+	{
+		return true;
+	}
 
-    /**
-     * flush the cache
-     *
-     * @access public
-     * @return boolean
-     */
-    public function flush()
-    {
-        return false;
-    }
+	/**
+	 * flush the cache
+	 *
+	 * @access public
+	 * @return boolean
+	 */
+	public function flush()
+	{
+		return false;
+	}
 
-    /**
-     * delete a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @return boolean
-     */
-    public function delete(string $sName)
-    {
-        return false;
-    }
+	/**
+	 * delete a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @return boolean
+	 */
+	public function delete(string $sName)
+	{
+		return false;
+	}
 
-    /**
-     * add
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  mixed $mValue value of this sesion var
-     * @param  int $iExpire expiration of cache
-     * @return boolean
-     */
-    public function add($sName, $mValue, $iExpire = false)
-    {
-        return true;
-    }
+	/**
+	 * add
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  mixed $mValue value of this sesion var
+	 * @param  int $iExpire expiration of cache
+	 * @return boolean
+	 */
+	public function add($sName, $mValue, $iExpire = false)
+	{
+		return true;
+	}
 }

bundles/core/UrlManager.php

Indentation +110 added lines, -110 removed lines

@@ -30,114 +30,114 @@
  */
 class UrlManager
 {
-    /**
-     * The base Uri to construct the route
-     * @var string
-     */
-    private $_sBaseUri = '';
-
-    /**
-     * create an URL
-     *
-     * @access public
-     * @param  string $sCode code of the url between "routes" and "route" in Route.conf
-     * @param  array $aParams parameters to create the url
-     * @return string
-     *
-     * @tutorial	If I have this route I could make my URL:
-     *
-     * 				"menu_edit": {
-     *					"route": "[/:language]/menu[/:id]/edit/",
-     *					"controller": "\\src\\BackOffice\\Controller\\MenuManager",
-     *					"action": "edit",
-     *					"constraints": {
-     * 						"language": "[a-z]{0,2}",
-     * 						"id": "[0-9]+"
-     *					},
-     *					"content_type": "html"
-     *				},
-     *
-     *				I must write this:
-     *
-     *				$oUrlManager = new \Venus\core\UrlManager;
-     *				$sUrl = $oUrlManager->getUrl('menu_edit', array('language' => 'vn', 'id' => 125));
-     */
-    public function getUrl(string $sCode, array $aParams = array()) : string
-    {
-        if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) {
-
-            foreach (Config::get('Route') as $sHost => $oHost) {
-
-                if ((!strstr($sHost, '/') && $sHost == $_SERVER['HTTP_HOST'])
-                    || (strstr($sHost, '/')
-                    && strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost))) {
-
-                    if (strstr($sHost, '/')
-                        && strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost)) {
-
-                        $this->_sBaseUri = preg_replace('#^[^/]+#', '', $sHost);
-                    }
-
-                    if (isset($oHost->routes)) {
-
-                        $aRoutes = array();
-
-                        foreach($oHost->routes as $sKey => $oRoute) {
-
-                            if ($sKey === $sCode) {
-
-                                $sRoute = $this->_sBaseUri.$oRoute->route;
-
-                                if (isset($oRoute->constraints)) {
-
-                                    foreach ($oRoute->constraints as $sName => $sType) {
-
-                                        if (!isset($aParams[$sName])) { $aParams[$sName] = ''; }
-
-                                        if (preg_match('#'.$sType.'#', $aParams[$sName])) {
-
-                                            if ($aParams[$sName]) { $sRoute = str_replace('[/:'.$sName.']', '/'.$aParams[$sName], $sRoute); } else { $sRoute = str_replace('[/:'.$sName.']', '', $sRoute); }
-                                            $sRoute = str_replace('[:'.$sName.']', $aParams[$sName], $sRoute);
-                                            continue;
-                                        } else if (isset($oRoute->defaults_constraints)
-                                            && isset($oRoute->defaults_constraints->{$sName})
-                                            && preg_match('#'.$sType.'#', $oRoute->defaults_constraints->{$sName})) {
-
-                                            continue;
-                                        }
-
-                                        throw new \Exception('For the route '.$sCode.' the parameter '.$sName.' is not good!');
-                                    }
-                                }
-
-                                return $sRoute;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * encode text for the url
-     *
-     * @access public
-     * @param  string $sStringToEncode text
-     * @return string
-     */
-    public function encodeToUrl(string $sStringToEncode) : string
-    {
-        if (!is_string($sStringToEncode)) {
-
-            throw new \Exception();
-        }
-
-        $sStringToEncode = str_replace(['à','á','â','ã','ä','ç','è','é','ê','ë','ì','í','î','ï','ñ','ò','ó','ô','õ','ö','ù','ú','û','ü','ý','ÿ','À','Á','Â','Ã','Ä','Ç','È','É','Ê','Ë','Ì','Í','Î','Ï','Ñ','Ò','Ó','Ô','Õ','Ö','Ù','Ú','Û','Ü','Ý'],
-            ['a','a','a','a','a','c','e','e','e','e','i','i','i','i','n','o','o','o','o','o','u','u','u','u','y','y','A','A','A','A','A','C','E','E','E','E','I','I','I','I','N','O','O','O','O','O','U','U','U','U','Y'],
-                $sStringToEncode);
-
-        $sStringToEncode = preg_replace('/[^a-zA-Z0-9_]+/', '_', preg_quote($sStringToEncode));
-        return strtolower($sStringToEncode);
-    }
+	/**
+	 * The base Uri to construct the route
+	 * @var string
+	 */
+	private $_sBaseUri = '';
+
+	/**
+	 * create an URL
+	 *
+	 * @access public
+	 * @param  string $sCode code of the url between "routes" and "route" in Route.conf
+	 * @param  array $aParams parameters to create the url
+	 * @return string
+	 *
+	 * @tutorial	If I have this route I could make my URL:
+	 *
+	 * 				"menu_edit": {
+	 *					"route": "[/:language]/menu[/:id]/edit/",
+	 *					"controller": "\\src\\BackOffice\\Controller\\MenuManager",
+	 *					"action": "edit",
+	 *					"constraints": {
+	 * 						"language": "[a-z]{0,2}",
+	 * 						"id": "[0-9]+"
+	 *					},
+	 *					"content_type": "html"
+	 *				},
+	 *
+	 *				I must write this:
+	 *
+	 *				$oUrlManager = new \Venus\core\UrlManager;
+	 *				$sUrl = $oUrlManager->getUrl('menu_edit', array('language' => 'vn', 'id' => 125));
+	 */
+	public function getUrl(string $sCode, array $aParams = array()) : string
+	{
+		if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) {
+
+			foreach (Config::get('Route') as $sHost => $oHost) {
+
+				if ((!strstr($sHost, '/') && $sHost == $_SERVER['HTTP_HOST'])
+					|| (strstr($sHost, '/')
+					&& strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost))) {
+
+					if (strstr($sHost, '/')
+						&& strstr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], $sHost)) {
+
+						$this->_sBaseUri = preg_replace('#^[^/]+#', '', $sHost);
+					}
+
+					if (isset($oHost->routes)) {
+
+						$aRoutes = array();
+
+						foreach($oHost->routes as $sKey => $oRoute) {
+
+							if ($sKey === $sCode) {
+
+								$sRoute = $this->_sBaseUri.$oRoute->route;
+
+								if (isset($oRoute->constraints)) {
+
+									foreach ($oRoute->constraints as $sName => $sType) {
+
+										if (!isset($aParams[$sName])) { $aParams[$sName] = ''; }
+
+										if (preg_match('#'.$sType.'#', $aParams[$sName])) {
+
+											if ($aParams[$sName]) { $sRoute = str_replace('[/:'.$sName.']', '/'.$aParams[$sName], $sRoute); } else { $sRoute = str_replace('[/:'.$sName.']', '', $sRoute); }
+											$sRoute = str_replace('[:'.$sName.']', $aParams[$sName], $sRoute);
+											continue;
+										} else if (isset($oRoute->defaults_constraints)
+											&& isset($oRoute->defaults_constraints->{$sName})
+											&& preg_match('#'.$sType.'#', $oRoute->defaults_constraints->{$sName})) {
+
+											continue;
+										}
+
+										throw new \Exception('For the route '.$sCode.' the parameter '.$sName.' is not good!');
+									}
+								}
+
+								return $sRoute;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * encode text for the url
+	 *
+	 * @access public
+	 * @param  string $sStringToEncode text
+	 * @return string
+	 */
+	public function encodeToUrl(string $sStringToEncode) : string
+	{
+		if (!is_string($sStringToEncode)) {
+
+			throw new \Exception();
+		}
+
+		$sStringToEncode = str_replace(['à','á','â','ã','ä','ç','è','é','ê','ë','ì','í','î','ï','ñ','ò','ó','ô','õ','ö','ù','ú','û','ü','ý','ÿ','À','Á','Â','Ã','Ä','Ç','È','É','Ê','Ë','Ì','Í','Î','Ï','Ñ','Ò','Ó','Ô','Õ','Ö','Ù','Ú','Û','Ü','Ý'],
+			['a','a','a','a','a','c','e','e','e','e','i','i','i','i','n','o','o','o','o','o','u','u','u','u','y','y','A','A','A','A','A','C','E','E','E','E','I','I','I','I','N','O','O','O','O','O','U','U','U','U','Y'],
+				$sStringToEncode);
+
+		$sStringToEncode = preg_replace('/[^a-zA-Z0-9_]+/', '_', preg_quote($sStringToEncode));
+		return strtolower($sStringToEncode);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
 
                         $aRoutes = array();
 
-                        foreach($oHost->routes as $sKey => $oRoute) {
+                        foreach ($oHost->routes as $sKey => $oRoute) {
 
                             if ($sKey === $sCode) {
 
@@ -133,8 +133,8 @@ 
             throw new \Exception();
         }
 
-        $sStringToEncode = str_replace(['à','á','â','ã','ä','ç','è','é','ê','ë','ì','í','î','ï','ñ','ò','ó','ô','õ','ö','ù','ú','û','ü','ý','ÿ','À','Á','Â','Ã','Ä','Ç','È','É','Ê','Ë','Ì','Í','Î','Ï','Ñ','Ò','Ó','Ô','Õ','Ö','Ù','Ú','Û','Ü','Ý'],
-            ['a','a','a','a','a','c','e','e','e','e','i','i','i','i','n','o','o','o','o','o','u','u','u','u','y','y','A','A','A','A','A','C','E','E','E','E','I','I','I','I','N','O','O','O','O','O','U','U','U','U','Y'],
+        $sStringToEncode = str_replace(['à', 'á', 'â', 'ã', 'ä', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', 'ù', 'ú', 'û', 'ü', 'ý', 'ÿ', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ñ', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ù', 'Ú', 'Û', 'Ü', 'Ý'],
+            ['a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'n', 'o', 'o', 'o', 'o', 'o', 'u', 'u', 'u', 'u', 'y', 'y', 'A', 'A', 'A', 'A', 'A', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I', 'N', 'O', 'O', 'O', 'O', 'O', 'U', 'U', 'U', 'U', 'Y'],
                 $sStringToEncode);
 
         $sStringToEncode = preg_replace('/[^a-zA-Z0-9_]+/', '_', preg_quote($sStringToEncode));