webcol / Calima

Sistema/Ayudantes/CFPHPAyuda.php

Spacing +16 added lines, -16 removed lines

@@ -36,17 +36,17 @@ 
     public function __construct() {
         //parent::__construct();
     
-    $this->_sesion=new \Sistema\Nucleo\CFSesion();
+    $this->_sesion = new \Sistema\Nucleo\CFSesion();
     }
-    public function enviarCorreo($para, $titulo= 'Asunto', $mensaje= 'cuerpo del correo'){
+    public function enviarCorreo($para, $titulo = 'Asunto', $mensaje = 'cuerpo del correo') {
         return mail($para, $titulo, $mensaje);
     }
     
     
      // filtros Email
     
-    function filtroEmail($email){
-        if (!filter_input(INPUT_POST, $email, FILTER_VALIDATE_EMAIL)){
+    function filtroEmail($email) {
+        if (!filter_input(INPUT_POST, $email, FILTER_VALIDATE_EMAIL)) {
             echo "E-Mail no es valido";
         }
         else
@@ -58,44 +58,44 @@ 
     
     //cadenas
     
-    function rangoTexto($texto, $inicio, $cantidad){
+    function rangoTexto($texto, $inicio, $cantidad) {
         
-        return $limite= substr($texto, $inicio, $cantidad); 
+        return $limite = substr($texto, $inicio, $cantidad); 
         
     }
     
     //Redirecionar
     
-    function Redireccion($url, $permanent = false){
+    function Redireccion($url, $permanent = false) {
     header('Location: ' . $url, true, $permanent ? 301 : 302);
 
     exit();
     }
     
-    function redireccionUrl($url){
-        $url=Cf_BASE_URL.$url;
+    function redireccionUrl($url) {
+        $url = Cf_BASE_URL . $url;
     header('Location: ' . $url);
     exit();
     }
     
-    function redireccionUrlMsj($controlador){
+    function redireccionUrlMsj($controlador) {
         $this->_sesion->iniciarSesion('_s', false);
-        $_SESSION[error_ingreso]='Error en el intento de ingreso';
-        $controlador=Cf_BASE_URL.$controlador;
+        $_SESSION[error_ingreso] = 'Error en el intento de ingreso';
+        $controlador = Cf_BASE_URL . $controlador;
     header('Location: ' . $controlador);
     exit();
     }
     
-    function redireccion_($url, $statusCode = 303){
+    function redireccion_($url, $statusCode = 303) {
     header('Location: ' . $url, true, $statusCode);
     die();
     }
     
-    function redirect($controller,$method = "index",$args = array())
+    function redirect($controller, $method = "index", $args = array())
 {
     global $core; /* Guess Obviously */
 
-    $location = $core->Cf_BASE_URL . "/" . $controller . "/" . $method . "/" . implode("/",$args);
+    $location = $core->Cf_BASE_URL . "/" . $controller . "/" . $method . "/" . implode("/", $args);
 
     /*
         * Use @header to redirect the page:
@@ -107,7 +107,7 @@ 
     
     
     //texto
-    public function filtrarEntero($int){
+    public function filtrarEntero($int) {
         
        return filter_var($int, FILTER_VALIDATE_INT);
        

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
     function filtroEmail($email){
         if (!filter_input(INPUT_POST, $email, FILTER_VALIDATE_EMAIL)){
             echo "E-Mail no es valido";
-        }
-        else
+        } else
         {
             echo "E-Mail es valido";
         }

Sistema/Ayudantes/CFPHPCache.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
 	);
 	
 	public static function configurar($clave, $valor = null) {
-		if( is_array($clave) ) {
+		if (is_array($clave)) {
 			foreach ($clave as $config_name => $config_value) {
 				self::$configuracion[$config_name] = $config_value;
 			}
@@ -63,7 +63,7 @@ 
 	 * @param string $clave	 
 	 */
 	public static function obtener($clave, $raw = false, $tiempo_personalizado = null) {
-		if( ! self::file_expired($archivo = self::obtenerRuta($clave), $tiempo_personalizado)) {
+		if (!self::file_expired($archivo = self::obtenerRuta($clave), $tiempo_personalizado)) {
 			$contenido = file_get_contents($archivo);
 			return $raw ? $contenido : unserialize($contenido);
 		}
@@ -90,7 +90,7 @@ 
 	 * @return bool true if the data was removed successfully
 	 */
 	public static function eliminar($clave) {
-		if( ! file_exists($archivo = self::obtenerRuta($clave)) ) {
+		if (!file_exists($archivo = self::obtenerRuta($clave))) {
 			return true;
 		}
 		return @unlink($archivo);
@@ -117,7 +117,7 @@ 
 	 * @return bool if the file has expired or not
 	 */
 	public static function file_expired($archivo, $fecha = null) {
-		if( ! file_exists($archivo) ) {
+		if (!file_exists($archivo)) {
 			return true;
 		}
 		return (time() > (filemtime($archivo) + 60 * ($fecha ? $fecha : self::$configuracion['expires'])));

Sistema/Ayudantes/CFPHPFormularios.php

Spacing +31 added lines, -31 removed lines

@@ -161,7 +161,7 @@ 
 							break;
 					}
 				echo '</div>';
-			echo '</div>'.PHP_EOL;
+			echo '</div>' . PHP_EOL;
 		}
 		
 		// Closing form
@@ -191,7 +191,7 @@ 
 		
 		// Asignamos las claves conviritiendo el array
 		foreach ($data as $attr=>$value) {
-			$r .= $attr.'="'.$value.'" ';
+			$r .= $attr . '="' . $value . '" ';
 		}
 		
 		$r .= '/>';
@@ -209,7 +209,7 @@ 
 		
 		// Asignamos las claves conviritiendo el array
 		foreach ($data as $attr=>$value) {
-			$base .= $attr.'="'.$value.'" ';
+			$base .= $attr . '="' . $value . '" ';
 		}
 		
 		
@@ -221,7 +221,7 @@ 
 		if (!is_array($values)) {
 			// Comprobamos el value, es posible que el usuario este intentando crear los Radio (option) de forma separada
 			if (!is_array($values) and $selected == $values) $base .= ' checked="checked" ';
-			return $base . ' value="'.$values.'" />';
+			return $base . ' value="' . $values . '" />';
 		} 
 
 		// Por el contrario, tenemos 1 o m�s value con lo que es un posible texto
@@ -230,7 +230,7 @@ 
 		foreach ($values as $id=>$text) {
 			$r .= $base;
 			if ($selected !== null and $id == $selected) $r .= ' checked="checked" ';
-			$r .= ' value="'. $id .'" />'.$text.'</label>';
+			$r .= ' value="' . $id . '" />' . $text . '</label>';
 		}
 		
 		return $r;
@@ -249,7 +249,7 @@ 
 		$r = '<select ';
 			// Convert array to input string
 			foreach ($data as $attr=>$value) {
-				$r .= $attr.'="'.$value.'" ';
+				$r .= $attr . '="' . $value . '" ';
 			}
 			// Return end input
 		$r .= '>';
@@ -287,7 +287,7 @@ 
 		
 		// Asignamos las claves conviritiendo el array
 		foreach ($data as $attr=>$value) {
-			$r .= $attr.'="'.$value.'" ';
+			$r .= $attr . '="' . $value . '" ';
 		}
 		
 		$r .= '>';
@@ -304,14 +304,14 @@ 
 	 */
 	private function showStartForm() {
 		$r = '<form ';
-		if ($this->action!= '') $r .= 'action="'.$this->action.'" ';
-		if ($this->method != '') $r .= 'method="'.$this->method .'" ';
-		if ($this->name != '') $r .= 'name="'.$this->name .'" ';
-		if ($this->on_submit != '') $r .= 'onSubmit="'.$this->on_submit  .'" ';
-		if ($this->id != '') $r .= 'id="'.$this->id .'" ';
-		if ($this->class != '') $r .= 'class="'.$this->class .'" ';
-	
-		return $r . '>'.PHP_EOL;
+		if ($this->action != '') $r .= 'action="' . $this->action . '" ';
+		if ($this->method != '') $r .= 'method="' . $this->method . '" ';
+		if ($this->name != '') $r .= 'name="' . $this->name . '" ';
+		if ($this->on_submit != '') $r .= 'onSubmit="' . $this->on_submit . '" ';
+		if ($this->id != '') $r .= 'id="' . $this->id . '" ';
+		if ($this->class != '') $r .= 'class="' . $this->class . '" ';
+	
+		return $r . '>' . PHP_EOL;
 	}
 	
 	/**
@@ -408,14 +408,14 @@ 
 				if (isset($data['maxlength']) and is_numeric($data['maxlength']) and $data['maxlength'] > -1 
 					and strlen($readValue) > $data['maxlength']) {
 					
-					$this->log('is too long. Maximum' . ' ' . $data['maxlength'] . ' ' . 'characters', $data );
+					$this->log('is too long. Maximum' . ' ' . $data['maxlength'] . ' ' . 'characters', $data);
 					return false;
 				}
 				
 				if (isset($data['pattern']) and is_numeric($data['pattern']) and $data['maxlength'] != '' 
 					and preg_match($data['pattern'], $readValue) === FALSE) {
 					
-					$this->log('pattern error' . ' (' . $data['pattern'] . ')' , $data);
+					$this->log('pattern error' . ' (' . $data['pattern'] . ')', $data);
 					return false;
 				}
 				break;
@@ -429,20 +429,20 @@ 
 				
 				// MIN
 				if (isset($data['min']) and $readValue < $data['min']) {
-					$this->log('The number have to be greather than' . ' ' . $data['min'].'.', $data);
+					$this->log('The number have to be greather than' . ' ' . $data['min'] . '.', $data);
 					return false;
 				}
 				
 				// MAX
 				if (isset($data['max']) and $readValue > $data['max']) {
-					$this->log('The number have to be less than' . ' ' . $data['max'].'.', $data);
+					$this->log('The number have to be less than' . ' ' . $data['max'] . '.', $data);
 					return false;
 				}
 				
 				// STEP http://www.w3schools.com/tags/att_input_step.asp
 				// Value 0 ever is valid (and if you try Divide to Zero, it will take error because the result is inifinite
 				if (isset($data['step']) and $readValue != 0 and $readValue % $data['step'] !== 0) {
-					$this->log('The number have to be multiple of' . ' ' . $data['step'].'.', $data);
+					$this->log('The number have to be multiple of' . ' ' . $data['step'] . '.', $data);
 					return false;
 				}
 				
@@ -451,7 +451,7 @@ 
 				//min | max
 				echo $readValue;
 				if (!is_date($readValue)) {
-					$this->log('The date' . ' ' .$readValue.' '. 'must have format' . ' mm/dd/yyyy '.'.', $data);
+					$this->log('The date' . ' ' . $readValue . ' ' . 'must have format' . ' mm/dd/yyyy ' . '.', $data);
 					return false;
 				}
 				break;
@@ -489,14 +489,14 @@ 
 				if (is_array($value)) {
 					$this->log('Values don\'t match.', $data);
 				} else {
-					$this->log('ID ' .$value.' ' . 'don\'t match', $data);
+					$this->log('ID ' . $value . ' ' . 'don\'t match', $data);
 				}
 				return false;
 			}
 		} else {
 			// Is string
 			if ($readValue == $values) {
-				$this->log('The value' . ' ' . $value.' ' . 'is not available', $data);
+				$this->log('The value' . ' ' . $value . ' ' . 'is not available', $data);
 				return false;
 			}
 		}
@@ -605,7 +605,7 @@ 
 	 * 
 	 * @example $fr->addInput('text', 'Username', '', true, 'Type here your username', array('class'=>'text red', id => 'text1'), array())
 	 */
-	public function addInput($label = '', $type = 'text', $name = '', $value = '', $required = false, $placeholder = '',  $attributes = array()) {
+	public function addInput($label = '', $type = 'text', $name = '', $value = '', $required = false, $placeholder = '', $attributes = array()) {
 		// Creating main data
 		$data = array(
 			'type' => $type,
@@ -642,10 +642,10 @@ 
 	 * @param string $placeholder Default text to show if box is empty
 	 * @param unknown $attributes Additional attributes
 	 */
-	public function addNumber($label = '', $name = '', $value = '', $range = false, $required = false, $min = '', $max = '', $step = '',  $placeholder = '',  $attributes = array()) {
+	public function addNumber($label = '', $name = '', $value = '', $range = false, $required = false, $min = '', $max = '', $step = '', $placeholder = '', $attributes = array()) {
 		// Creating main data
 		$data = array(
-			'type' => (! $range) ? 'number' : 'range',
+			'type' => (!$range) ? 'number' : 'range',
 			'name' => $name,
 			'value' => $value,
 		);
@@ -680,7 +680,7 @@ 
 	 * @param string $placeholder Default text to show if box is empty
 	 * @param unknown $attributes Additional attributes
 	 */
-	public function addDate($label = '', $name = '', $value = '', $required = false, $min = '', $max = '', $step = '',  $placeholder = '',  $attributes = array()) {
+	public function addDate($label = '', $name = '', $value = '', $required = false, $min = '', $max = '', $step = '', $placeholder = '', $attributes = array()) {
 		// Creating main data
 		$data = array(
 			'type' => 'date',
@@ -896,7 +896,7 @@ 
 			$this->errors .= ' ' . $message . '.';
 			
 			// Extra message (title attribute)
-			if (isset($data['title']) and $data['title'] != '') $this->errors .= ' | '. 'MESSAGE' .': ' . $data['title'];
+			if (isset($data['title']) and $data['title'] != '') $this->errors .= ' | ' . 'MESSAGE' . ': ' . $data['title'];
 			
 			$this->errors .= '<br />';
 		}
@@ -913,11 +913,11 @@ 
  */
 // More examples:
 // http://us2.php.net/manual/es/function.checkdate.php
-function is_date( $str ) {
+function is_date($str) {
 	// Try to execute date creator
 	try {
-		$dt = new DateTime( trim($str) );
-	} catch( Exception $e ) {
+		$dt = new DateTime(trim($str));
+	} catch (Exception $e) {
 		// If fails, it return false, date is incorrect
 		return false;
 	}

Braces +162 added lines, -55 removed lines

@@ -130,14 +130,18 @@ 
 		// Itearate all inputs
 		foreach ($toShow as $input) {
 			// Reading data
-			if (isset($input['data'])) $data = $input['data'];
+			if (isset($input['data'])) {
+			    $data = $input['data'];
+			}
 			
 			// New row
 			echo '<div>';
 				// Showing labels
 				if ($this->show_labels) {
 					echo '<div>';
-						if (isset($input['label']) and $input['label'] != '') echo $input['label'];
+						if (isset($input['label']) and $input['label'] != '') {
+						    echo $input['label'];
+						}
 					echo '</div>';
 				}
 				
@@ -182,7 +186,9 @@ 
 	private function showInput($data) {
 		$r = '';
 		// Number start if is range
-		if ($data['type'] == 'range' and isset($data['min'])) $r .= $data['min'] . ' '; 
+		if ($data['type'] == 'range' and isset($data['min'])) {
+		    $r .= $data['min'] . ' ';
+		}
 		
 		$r .= '<input ';
 		
@@ -197,7 +203,9 @@ 
 		$r .= '/>';
 		
 		// Number end if is range
-		if ($data['type'] == 'range' and isset($data['max'])) $r .= $data['max'] . ' ';
+		if ($data['type'] == 'range' and isset($data['max'])) {
+		    $r .= $data['max'] . ' ';
+		}
 		
 		// Return
 		return $r;
@@ -220,7 +228,9 @@ 
 		// Si no tiene m�ltiples valores (es un string), lo retornamos de golpe 
 		if (!is_array($values)) {
 			// Comprobamos el value, es posible que el usuario este intentando crear los Radio (option) de forma separada
-			if (!is_array($values) and $selected == $values) $base .= ' checked="checked" ';
+			if (!is_array($values) and $selected == $values) {
+			    $base .= ' checked="checked" ';
+			}
 			return $base . ' value="'.$values.'" />';
 		} 
 
@@ -229,7 +239,9 @@ 
 		$r = '';
 		foreach ($values as $id=>$text) {
 			$r .= $base;
-			if ($selected !== null and $id == $selected) $r .= ' checked="checked" ';
+			if ($selected !== null and $id == $selected) {
+			    $r .= ' checked="checked" ';
+			}
 			$r .= ' value="'. $id .'" />'.$text.'</label>';
 		}
 		
@@ -263,7 +275,9 @@ 
 		if ($selected != '') {
 			foreach ($values as $val=>$txt) {
 				$r .= '<option value="' . $val . '"';
-					if ($val == $selected) $r .= ' selected ';
+					if ($val == $selected) {
+					    $r .= ' selected ';
+					}
 				$r .= '>' . $txt . '</option>';
 			}
 		} else {
@@ -304,12 +318,24 @@ 
 	 */
 	private function showStartForm() {
 		$r = '<form ';
-		if ($this->action!= '') $r .= 'action="'.$this->action.'" ';
-		if ($this->method != '') $r .= 'method="'.$this->method .'" ';
-		if ($this->name != '') $r .= 'name="'.$this->name .'" ';
-		if ($this->on_submit != '') $r .= 'onSubmit="'.$this->on_submit  .'" ';
-		if ($this->id != '') $r .= 'id="'.$this->id .'" ';
-		if ($this->class != '') $r .= 'class="'.$this->class .'" ';
+		if ($this->action!= '') {
+		    $r .= 'action="'.$this->action.'" ';
+		}
+		if ($this->method != '') {
+		    $r .= 'method="'.$this->method .'" ';
+		}
+		if ($this->name != '') {
+		    $r .= 'name="'.$this->name .'" ';
+		}
+		if ($this->on_submit != '') {
+		    $r .= 'onSubmit="'.$this->on_submit  .'" ';
+		}
+		if ($this->id != '') {
+		    $r .= 'id="'.$this->id .'" ';
+		}
+		if ($this->class != '') {
+		    $r .= 'class="'.$this->class .'" ';
+		}
 	
 		return $r . '>'.PHP_EOL;
 	}
@@ -370,7 +396,9 @@ 
 			}
 		}
 		
-		if ($success >= $total) return true;
+		if ($success >= $total) {
+		    return true;
+		}
 		return false;
 	}
 	
@@ -570,8 +598,11 @@ 
 	 * @return string/null Return the value, if don't exist, return null
 	 */
 	private function getData($key, $default = null) {
-		if ($this->method == "post") return isset($_POST[$key]) ? $_POST[$key] : $default;
-		else return isset($_GET[$key]) ? $_GET[$key] : $default;
+		if ($this->method == "post") {
+		    return isset($_POST[$key]) ? $_POST[$key] : $default;
+		} else {
+		    return isset($_GET[$key]) ? $_GET[$key] : $default;
+		}
 	}
 	
 	/*
@@ -614,9 +645,15 @@ 
 		);
 		
 		
-		if ($required) $data['required'] = 'required';
-		if ($placeholder != '') $data['placeholder'] = $placeholder;
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($placeholder != '') {
+		    $data['placeholder'] = $placeholder;
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		
 		// Saving data to object
@@ -624,7 +661,9 @@ 
 			'type' => 'input',
 			'data' => $data	
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		 
 		$this->content[] = $content;
 	}
@@ -651,19 +690,33 @@ 
 		);
 	
 		
-		if ($required) $data['required'] = 'required';
-		if ($min) $data['min'] = $min;
-		if ($max) $data['max'] = $max;
-		if ($step) $data['step'] = $step;
-		if ($placeholder != '') $data['placeholder'] = $placeholder;
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($min) {
+		    $data['min'] = $min;
+		}
+		if ($max) {
+		    $data['max'] = $max;
+		}
+		if ($step) {
+		    $data['step'] = $step;
+		}
+		if ($placeholder != '') {
+		    $data['placeholder'] = $placeholder;
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 	
 		// Saving data to object
 		$content = array(
 			'type' => 'input',
 			'data' => $data
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -688,19 +741,33 @@ 
 			'value' => $value,
 		);
 	
-		if ($required) $data['required'] = 'required';
-		if ($min) $data['min'] = $min;
-		if ($max) $data['max'] = $max;
-		if ($step) $data['step'] = $step;
-		if ($placeholder != '') $data['placeholder'] = $placeholder;
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($min) {
+		    $data['min'] = $min;
+		}
+		if ($max) {
+		    $data['max'] = $max;
+		}
+		if ($step) {
+		    $data['step'] = $step;
+		}
+		if ($placeholder != '') {
+		    $data['placeholder'] = $placeholder;
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 	
 		// Saving data to object
 		$content = array(
 			'type' => 'input',
 			'data' => $data
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -721,14 +788,20 @@ 
 			'name' => $name,
 			'value' => $value
 		);
-		if ($required) $data['required'] = 'required';
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		$content = array(
 			'type' => 'input',
 			'data' => $data 
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -746,13 +819,19 @@ 
 	 * @param array $attributes Optional atributes not listened (in array). This will be applicated to all radioButton
 	 */
 	public function addRadio($label = '', $name = '', $values = array(), $selected = null, $required = false, $attributes = array()) {
-		if (!is_array($values)) die('FATAL ERROR: Trying to create "RadioButton" with string VALUE, is requried use ARRAY()');
+		if (!is_array($values)) {
+		    die('FATAL ERROR: Trying to create "RadioButton" with string VALUE, is requried use ARRAY()');
+		}
 		$data = array(
 			'name' => $name,
 		);
 		
-		if ($required) $data['required'] = 'required';		
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		
 		
@@ -762,7 +841,9 @@ 
 			'values' => $values,
 			'selected' => $selected
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -783,9 +864,15 @@ 
 			'name' => $name,
 			'required' => $required,
 		);
-		if ($required) $data['required'] = 'required';
-		if ($multiple) $data['multiple'] = 'multiple';
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($multiple) {
+		    $data['multiple'] = 'multiple';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		
 		// In this case, the values are saved in the main of array to speed up select loader
@@ -795,7 +882,9 @@ 
 			'values' => $values,
 			'selected' => $selected
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -813,7 +902,9 @@ 
 			'name' => $name,
 			'value' => $value
 		);
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		$this->content[] = array(
 			'type' => 'input',
@@ -836,7 +927,9 @@ 
 			'value' => $value,
 			'onClick' => $onClick
 		);
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		$this->content[] = array(
 			'type' => 'input',
@@ -858,8 +951,12 @@ 
 			'name' => $name,
 		);
 		
-		if ($required) $data['required'] = 'required';
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		// Saving data to object
 		$content = array(
@@ -867,7 +964,9 @@ 
 			'text' => $value,
 			'data' => $data	
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		 
 		$this->content[] = $content;
 	}
@@ -885,18 +984,26 @@ 
 		if ($this->logErrors) {
 			// Try to get a name (label or name)
 			if (class_exists('kw')) {
-				if (isset($data['label'])) $this->errors .= 'Found an error in field' . ': "' . $data['label'] . '": ';
-				elseif (isset($data['name'])) $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				if (isset($data['label'])) {
+				    $this->errors .= 'Found an error in field' . ': "' . $data['label'] . '": ';
+				} elseif (isset($data['name'])) {
+				    $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				}
 			} else {
-				if (isset($data['label'])) $this->errors .= 'Found an error in field' . $data['label'] . '": ';
-				elseif (isset($data['name'])) $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				if (isset($data['label'])) {
+				    $this->errors .= 'Found an error in field' . $data['label'] . '": ';
+				} elseif (isset($data['name'])) {
+				    $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				}
 			}
 			
 			// preparing message
 			$this->errors .= ' ' . $message . '.';
 			
 			// Extra message (title attribute)
-			if (isset($data['title']) and $data['title'] != '') $this->errors .= ' | '. 'MESSAGE' .': ' . $data['title'];
+			if (isset($data['title']) and $data['title'] != '') {
+			    $this->errors .= ' | '. 'MESSAGE' .': ' . $data['title'];
+			}
 			
 			$this->errors .= '<br />';
 		}

Sistema/Ayudantes/CFPHPMenu.php

Spacing +12 added lines, -12 removed lines

@@ -53,14 +53,14 @@ 
             )
         );
         
-        $menu = '<ul class="inline" >'.  PHP_EOL;
-        foreach($items as $item)
+        $menu = '<ul class="inline" >' . PHP_EOL;
+        foreach ($items as $item)
         {
             $current = (in_array($sel, $item)) ? ' class="current"' : '';
-            $id = (!empty($item['id'])) ? ' id="'.$item['id'].'"' : '';
-            $menu .= '<li'.$current.'><a href="'.$item['link'].'"'.$id.'>'.$item['title'].'</a></li>'."\n";
+            $id = (!empty($item['id'])) ? ' id="' . $item['id'] . '"' : '';
+            $menu .= '<li' . $current . '><a href="' . $item['link'] . '"' . $id . '>' . $item['title'] . '</a></li>' . "\n";
         }
-        $menu .= '</ul>'. PHP_EOL . PHP_EOL;
+        $menu .= '</ul>' . PHP_EOL . PHP_EOL;
         return $menu;
     }
     
@@ -91,19 +91,19 @@ 
 
         $count = count($items);
         $i = 0;
-        $menu =  PHP_EOL .'<p class="bottom_nav">';
-        foreach($items as $item)
+        $menu = PHP_EOL . '<p class="bottom_nav">';
+        foreach ($items as $item)
         {
             $current = (in_array($sel, $item)) ? ' class="current"' : '';
-            $id = (!empty($item['id'])) ? ' id="'.$item['id'].'"' : '';
-            $menu .= '<a'.$current.' href="'.$item['link'].'"'.$id.'>'.$item['title'].'</a>';
+            $id = (!empty($item['id'])) ? ' id="' . $item['id'] . '"' : '';
+            $menu .= '<a' . $current . ' href="' . $item['link'] . '"' . $id . '>' . $item['title'] . '</a>';
             $i++;
-            if($count != $i)
+            if ($count != $i)
             {
-                $menu .= ' '.$separador.' ';
+                $menu .= ' ' . $separador . ' ';
             }
         }
-        $menu .= '</p>'. PHP_EOL ;
+        $menu .= '</p>' . PHP_EOL;
         return $menu;
     }
     

Sistema/Ayudantes/CFPHPPaginador.php

Spacing +18 added lines, -18 removed lines

@@ -193,27 +193,27 @@ 
 		if ($end > $this->total_pages) $end = $this->total_pages;
 		
 		// Showing all clickable pages (create div if class is defined)
-		if ($this->style != '') $r = '<div class="'.$this->style.'">';
+		if ($this->style != '') $r = '<div class="' . $this->style . '">';
 		else $r = '';
 		
 		
 		// First / previous
 		if ($this->cur_page > 1) {
-			if ($this->first != '') $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">'.$this->first.'</a> ';
-			if ($this->previous != '') $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">'.$this->previous.'</a> ';
+			if ($this->first != '') $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">' . $this->first . '</a> ';
+			if ($this->previous != '') $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">' . $this->previous . '</a> ';
 		}
 		
 		// You can optimize this separating BEFORE and AFTER current page in two for (to avoid load "if" in each loop)
 		// but it would be difficult on changes
-		for ($n=$start; $n<=$end; $n++) {
-			if ($n != $cur_page) $r .= '<a class="link" href="'. $url_start . $n . $url_end . '">'.$n.'</a> ';
-			else $r .= '<a class="current">'.$n.'</a> ';
+		for ($n = $start; $n <= $end; $n++) {
+			if ($n != $cur_page) $r .= '<a class="link" href="' . $url_start . $n . $url_end . '">' . $n . '</a> ';
+			else $r .= '<a class="current">' . $n . '</a> ';
 		}
 		
 		// next / last
 		if ($this->cur_page < $this->total_pages) {
-			if ($this->next != '') $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">'.$this->next.'</a> ';
-			if ($this->last != '') $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end .'">'.$this->last.'</a> ';
+			if ($this->next != '') $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">' . $this->next . '</a> ';
+			if ($this->last != '') $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end . '">' . $this->last . '</a> ';
 		}
 		
 		// End div (if exist)
@@ -253,7 +253,7 @@ 
 		$records = $this->records;
 		
 		// Force maxium records loaded (only if is specified by user)
-		if ($max_records  > 0 and $max_records  > $total_records) 
+		if ($max_records > 0 and $max_records > $total_records) 
 			$this->total_records = $max_records;
 		
 		// Calculate total pages that have
@@ -275,7 +275,7 @@ 
 		
 		// Saving changes
 		$this->first_record = $start;
-		$this->limit = ' LIMIT '.$start.','.$records.' ';
+		$this->limit = ' LIMIT ' . $start . ',' . $records . ' ';
 	}
 	
 	/**
@@ -296,17 +296,17 @@ 
 					// And is empty, we have to Recicle ALL GET
 					// To know that page needs to be replaced we will use the "original_page" (the real get)
 					// Cortamos "pag=2" para obtener lo que va antes y despues, as� poder modificar directamente ese pag=2 por la pagina actual
-					$query_string = explode($this->get_name.'='.$this->original_page, $_SERVER['QUERY_STRING']);
+					$query_string = explode($this->get_name . '=' . $this->original_page, $_SERVER['QUERY_STRING']);
 					
 					// How start the new URL? To know it, we need to see the last character from current string
 					if (!in_array(substr($query_string[0], -1), array('?', '&'))) {
 						// Current string haven't any at end and it isn't "&" or "?" ?
 						// If initial string have one character at least it means that not is the first index 
-						if (isset($query_string[0][0])) $this->url_start = '?'.$query_string[0].'&';
-						else $this->url_start = '?'.$query_string[0];
+						if (isset($query_string[0][0])) $this->url_start = '?' . $query_string[0] . '&';
+						else $this->url_start = '?' . $query_string[0];
 					} else {
 						// Current string already have ? or &,
-						$this->url_start = '?'.$query_string[0];
+						$this->url_start = '?' . $query_string[0];
 					}
 					
 					$this->url_end = isset($query_string[1]) ? $query_string[1] : '';
@@ -318,7 +318,7 @@ 
 					foreach ($gets as $get) {
 						if ($get != $get_name) {
 							// Trying to get the GET
-							if (isset($_GET[$get])) $tmp .= $get.'='.$_GET[$get].'&';
+							if (isset($_GET[$get])) $tmp .= $get . '=' . $_GET[$get] . '&';
 						} else {
 							// Pour the $tmp content to $tmp_start
 							if ($tmp_start == '') $tmp_start .= '?';
@@ -333,16 +333,16 @@ 
 						$this->url_start = $tmp_start;
 						$this->url_end = $tmp;
 					}
-					else $this->url_start = '?'.$tmp;
+					else $this->url_start = '?' . $tmp;
 				}
-			} else{
+			} else {
 				// Non recicle
 				$this->url_start = '?';
 				$this->url_end = ''; 
 			}
 			
 			// Add the pagination
-			$this->url_start .= $this->get_name.'=';
+			$this->url_start .= $this->get_name . '=';
 		}
 	}
 }

Braces +53 added lines, -20 removed lines

@@ -189,35 +189,55 @@ 
 		$start = $cur_page - $this->max_links;
 		$end = $cur_page + $this->max_links;
 		
-		if ($start < 1) $start = 1;
-		if ($end > $this->total_pages) $end = $this->total_pages;
+		if ($start < 1) {
+		    $start = 1;
+		}
+		if ($end > $this->total_pages) {
+		    $end = $this->total_pages;
+		}
 		
 		// Showing all clickable pages (create div if class is defined)
-		if ($this->style != '') $r = '<div class="'.$this->style.'">';
-		else $r = '';
+		if ($this->style != '') {
+		    $r = '<div class="'.$this->style.'">';
+		} else {
+		    $r = '';
+		}
 		
 		
 		// First / previous
 		if ($this->cur_page > 1) {
-			if ($this->first != '') $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">'.$this->first.'</a> ';
-			if ($this->previous != '') $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">'.$this->previous.'</a> ';
+			if ($this->first != '') {
+			    $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">'.$this->first.'</a> ';
+			}
+			if ($this->previous != '') {
+			    $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">'.$this->previous.'</a> ';
+			}
 		}
 		
 		// You can optimize this separating BEFORE and AFTER current page in two for (to avoid load "if" in each loop)
 		// but it would be difficult on changes
 		for ($n=$start; $n<=$end; $n++) {
-			if ($n != $cur_page) $r .= '<a class="link" href="'. $url_start . $n . $url_end . '">'.$n.'</a> ';
-			else $r .= '<a class="current">'.$n.'</a> ';
+			if ($n != $cur_page) {
+			    $r .= '<a class="link" href="'. $url_start . $n . $url_end . '">'.$n.'</a> ';
+			} else {
+			    $r .= '<a class="current">'.$n.'</a> ';
+			}
 		}
 		
 		// next / last
 		if ($this->cur_page < $this->total_pages) {
-			if ($this->next != '') $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">'.$this->next.'</a> ';
-			if ($this->last != '') $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end .'">'.$this->last.'</a> ';
+			if ($this->next != '') {
+			    $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">'.$this->next.'</a> ';
+			}
+			if ($this->last != '') {
+			    $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end .'">'.$this->last.'</a> ';
+			}
 		}
 		
 		// End div (if exist)
-		if ($this->style != '') $r .= '</div>';
+		if ($this->style != '') {
+		    $r .= '</div>';
+		}
 		
 		return $r;
 	}
@@ -234,7 +254,9 @@ 
 			$this->original_page = $cur_page;
 			
 			// Filter values
-			if (!is_numeric($cur_page) or $cur_page < 1) $cur_page = 1;
+			if (!is_numeric($cur_page) or $cur_page < 1) {
+			    $cur_page = 1;
+			}
 			
 			// Set new filtered values (is faster this method)
 			$this->cur_page = $cur_page;
@@ -253,14 +275,17 @@ 
 		$records = $this->records;
 		
 		// Force maxium records loaded (only if is specified by user)
-		if ($max_records  > 0 and $max_records  > $total_records) 
-			$this->total_records = $max_records;
+		if ($max_records  > 0 and $max_records  > $total_records) {
+					$this->total_records = $max_records;
+		}
 		
 		// Calculate total pages that have
 		$total_pages = ceil($this->total_records / $records);
 		
 		// Is correct current page?
-		if ($this->cur_page > $total_pages) $this->cur_page = $total_pages;
+		if ($this->cur_page > $total_pages) {
+		    $this->cur_page = $total_pages;
+		}
 		$this->total_pages = $total_pages;
 		
 		// Specify LIMIT to do a query
@@ -302,8 +327,11 @@ 
 					if (!in_array(substr($query_string[0], -1), array('?', '&'))) {
 						// Current string haven't any at end and it isn't "&" or "?" ?
 						// If initial string have one character at least it means that not is the first index 
-						if (isset($query_string[0][0])) $this->url_start = '?'.$query_string[0].'&';
-						else $this->url_start = '?'.$query_string[0];
+						if (isset($query_string[0][0])) {
+						    $this->url_start = '?'.$query_string[0].'&';
+						} else {
+						    $this->url_start = '?'.$query_string[0];
+						}
 					} else {
 						// Current string already have ? or &,
 						$this->url_start = '?'.$query_string[0];
@@ -318,10 +346,14 @@ 
 					foreach ($gets as $get) {
 						if ($get != $get_name) {
 							// Trying to get the GET
-							if (isset($_GET[$get])) $tmp .= $get.'='.$_GET[$get].'&';
+							if (isset($_GET[$get])) {
+							    $tmp .= $get.'='.$_GET[$get].'&';
+							}
 						} else {
 							// Pour the $tmp content to $tmp_start
-							if ($tmp_start == '') $tmp_start .= '?';
+							if ($tmp_start == '') {
+							    $tmp_start .= '?';
+							}
 							$tmp_start .= $tmp;
 							$tmp = '';
 						}
@@ -332,8 +364,9 @@ 
 						// If have start and end
 						$this->url_start = $tmp_start;
 						$this->url_end = $tmp;
+					} else {
+					    $this->url_start = '?'.$tmp;
 					}
-					else $this->url_start = '?'.$tmp;
 				}
 			} else{
 				// Non recicle

Sistema/Ayudantes/CFPHPSeguridad.php

Spacing +28 added lines, -28 removed lines

@@ -30,20 +30,20 @@ 
 //Seguridad
     
     //xss funciones de mitigacion
-    function xsseguro($texto,$encoding='UTF-8'){
-       return htmlspecialchars($texto,ENT_QUOTES | ENT_HTML401,$encoding);
+    function xsseguro($texto, $encoding = 'UTF-8') {
+       return htmlspecialchars($texto, ENT_QUOTES | ENT_HTML401, $encoding);
     }
-    function xecho($texto){
+    function xecho($texto) {
        echo xsseguro($texto);
     }
     
-    public function filtrarTexto($texto){
+    public function filtrarTexto($texto) {
         return strip_tags($texto);
     }
     
      
     
-    public function filtrarCaracteresEspeciales($texto){
+    public function filtrarCaracteresEspeciales($texto) {
         return htmlspecialchars($texto, ENT_QUOTES);
     }
     
@@ -59,67 +59,67 @@ 
         return $cadenaAleatoria;
     }
     // encriptacion
-    function cifrado($clave){
-        $cfi=sha1(md5($clave));
-        return $clave=Cf_KEY_MD5.$cfi;
+    function cifrado($clave) {
+        $cfi = sha1(md5($clave));
+        return $clave = Cf_KEY_MD5 . $cfi;
     }
     // Protecion CSRF
     public function generoTokenDeFormulario($formulario) {
-        $secreta =  Cf_CSRF_SECRET.$this->generarCadenaAleatoria();
+        $secreta = Cf_CSRF_SECRET . $this->generarCadenaAleatoria();
         $sid = session_id();
-        $token = md5($secreta.$sid.$formulario);
+        $token = md5($secreta . $sid . $formulario);
         return $token;
     }
     
     public function verificoTokenDeFormulario($formulario, $token) {
-        $secreta =  Cf_CSRF_SECRET.$this->generarCadenaAleatoria();
+        $secreta = Cf_CSRF_SECRET . $this->generarCadenaAleatoria();
         $sid = session_id();
-        $correcta = md5($secreta.$sid.$formulario);
+        $correcta = md5($secreta . $sid . $formulario);
         return ($token == $correcta);
     }
     
-    function obtenerDireccionIP(){
-    if (!empty($_SERVER ['HTTP_CLIENT_IP'] ))
-      $ip=$_SERVER ['HTTP_CLIENT_IP'];
-    elseif (!empty($_SERVER ['HTTP_X_FORWARDED_FOR'] ))
-      $ip=$_SERVER ['HTTP_X_FORWARDED_FOR'];
+    function obtenerDireccionIP() {
+    if (!empty($_SERVER ['HTTP_CLIENT_IP']))
+      $ip = $_SERVER ['HTTP_CLIENT_IP'];
+    elseif (!empty($_SERVER ['HTTP_X_FORWARDED_FOR']))
+      $ip = $_SERVER ['HTTP_X_FORWARDED_FOR'];
     else
-      $ip=$_SERVER ['REMOTE_ADDR'];
+      $ip = $_SERVER ['REMOTE_ADDR'];
 
     return $ip;
 	}
 	
-    function restringirIp($ip){
+    function restringirIp($ip) {
         $ipCliente = $this->obtenerDireccionIP();
 
-        if($ipCliente == $ip){
+        if ($ipCliente == $ip) {
         return true;
         }
-        else{
+        else {
         header('location: http://www.tusitioweb/redireccion');
         exit;
         }
     }
 	
-	function restringirConjuntoIps($ips){
+	function restringirConjuntoIps($ips) {
     $ipCliente = obtenerDireccionIP();
 
-    if (in_array($ipCliente,$ips)){
+    if (in_array($ipCliente, $ips)) {
         return true;
     }
-    else{
+    else {
         header('location: http://direccion_envio_salida');
         exit;
     }
 	}
 	
-	function restringirRango(){
+	function restringirRango() {
     $ipCliente = obtenerDireccionIP();
 
-    if(substr($ipCliente, 0, 8 ) == "150.214."){
+    if (substr($ipCliente, 0, 8) == "150.214.") {
         return true;
     }
-    else{
+    else {
         header('location: http://direccion_envio_salida');
         exit;
     }
@@ -136,7 +136,7 @@ 
  *
  */
 function emailSeguro($cadena) {
-     return  preg_replace( '((?:\n|\r|\t|%0A|%0D|%08|%09)+)i' , '', $cadena );
+     return  preg_replace('((?:\n|\r|\t|%0A|%0D|%08|%09)+)i', '', $cadena);
 }
 
 /*** example usage 

Braces +10 added lines, -12 removed lines

@@ -79,12 +79,13 @@ 
     }
     
     function obtenerDireccionIP(){
-    if (!empty($_SERVER ['HTTP_CLIENT_IP'] ))
-      $ip=$_SERVER ['HTTP_CLIENT_IP'];
-    elseif (!empty($_SERVER ['HTTP_X_FORWARDED_FOR'] ))
-      $ip=$_SERVER ['HTTP_X_FORWARDED_FOR'];
-    else
-      $ip=$_SERVER ['REMOTE_ADDR'];
+    if (!empty($_SERVER ['HTTP_CLIENT_IP'] )) {
+          $ip=$_SERVER ['HTTP_CLIENT_IP'];
+    } elseif (!empty($_SERVER ['HTTP_X_FORWARDED_FOR'] )) {
+          $ip=$_SERVER ['HTTP_X_FORWARDED_FOR'];
+    } else {
+          $ip=$_SERVER ['REMOTE_ADDR'];
+    }
 
     return $ip;
 	}
@@ -94,8 +95,7 @@ 
 
         if($ipCliente == $ip){
         return true;
-        }
-        else{
+        } else{
         header('location: http://www.tusitioweb/redireccion');
         exit;
         }
@@ -106,8 +106,7 @@ 
 
     if (in_array($ipCliente,$ips)){
         return true;
-    }
-    else{
+    } else{
         header('location: http://direccion_envio_salida');
         exit;
     }
@@ -118,8 +117,7 @@ 
 
     if(substr($ipCliente, 0, 8 ) == "150.214."){
         return true;
-    }
-    else{
+    } else{
         header('location: http://direccion_envio_salida');
         exit;
     }

Sistema/Ayudantes/CFPHPVinculos.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 class CFPHPVinculos {
     
-    function get_dominio(){
+    function get_dominio() {
     
     $dominio = "http://www.my-site-domain.com/";
     return $dominio;

Sistema/Nucleo/CFBootstrap.php

Spacing +7 added lines, -7 removed lines

@@ -32,31 +32,31 @@
     {
         $controlador = $peticion->getControlador() . 'Controlador';
         //definimos la ruta al controlador
-        $rutaControlador = SITE_ROOT . 'mvc' . DS .'controladores' . DS . $controlador . '.php';
+        $rutaControlador = SITE_ROOT . 'mvc' . DS . 'controladores' . DS . $controlador . '.php';
         $metodo = $peticion->getMetodo();
         $args = $peticion->getArgumentos();
         
         //verifcamos que el archivo existe con la funcion de PHP is_readable
-        if(is_readable($rutaControlador)){
+        if (is_readable($rutaControlador)) {
             require_once $rutaControlador;
             $controlador = new $controlador;
             
-            if(is_callable(array($controlador, $metodo))){
+            if (is_callable(array($controlador, $metodo))) {
                 $metodo = $peticion->getMetodo();
             }
-            else{
+            else {
                 $metodo = 'index';
             }
             
-            if(isset($args)){
+            if (isset($args)) {
                 call_user_func_array(array($controlador, $metodo), $args);
             }
-            else{
+            else {
                 call_user_func(array($controlador, $metodo));
             }
             
         } else {
-            header('Location: '.  Cf_BASE_URL.'error/');           
+            header('Location: ' . Cf_BASE_URL . 'error/');           
         }
     }
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -43,15 +43,13 @@
             
             if(is_callable(array($controlador, $metodo))){
                 $metodo = $peticion->getMetodo();
-            }
-            else{
+            } else{
                 $metodo = 'index';
             }
             
             if(isset($args)){
                 call_user_func_array(array($controlador, $metodo), $args);
-            }
-            else{
+            } else{
                 call_user_func(array($controlador, $metodo));
             }
             

Sistema/Nucleo/CFControlador.php

Spacing +7 added lines, -7 removed lines

@@ -34,9 +34,9 @@ 
         $this->_vista = new CFVista(new CFSolicitud);
     }
     
-    protected function cargaLib($libreria){
+    protected function cargaLib($libreria) {
         $rutaLib = RUTA_LIBS . $libreria . '.php';
-        if(is_readable($rutaLib)){
+        if (is_readable($rutaLib)) {
             require_once $rutaLib;
            //echo 'libreria cargada';
         }
@@ -45,10 +45,10 @@ 
         }
     }
     
-    protected function cargaModelo($modelo){
-        $modelo=$modelo.'Modelo';
+    protected function cargaModelo($modelo) {
+        $modelo = $modelo . 'Modelo';
        $rutaMod = RUTA_MOD . $modelo . '.php';
-        if(is_readable($rutaMod)){
+        if (is_readable($rutaMod)) {
             require_once $rutaMod;
             $modelo = new $modelo;
             return $modelo;
@@ -63,9 +63,9 @@ 
         }
     }
     
-    protected function cargaAyudante($ayudante){
+    protected function cargaAyudante($ayudante) {
        $rutaAyudante = RUTA_AYUDANTES . $ayudante . '.php';
-        if(is_readable($rutaAyudante)){
+        if (is_readable($rutaAyudante)) {
             require_once $rutaAyudante;
            //echo 'libreria cargada';
         }

Braces +3 added lines, -6 removed lines

@@ -39,8 +39,7 @@ 
         if(is_readable($rutaLib)){
             require_once $rutaLib;
            //echo 'libreria cargada';
-        }
-        else {
+        } else {
             throw new Exception("houston tenemos un problema! al cargar libreria");
         }
     }
@@ -53,8 +52,7 @@ 
             $modelo = new $modelo;
             return $modelo;
            //echo 'modelo cargado';
-        }
-        else {
+        } else {
             //echo $rutaMod;
             
             
@@ -68,8 +66,7 @@ 
         if(is_readable($rutaAyudante)){
             require_once $rutaAyudante;
            //echo 'libreria cargada';
-        }
-        else {
+        } else {
             throw new Exception("houston tenemos un problema! al cargar ayudante");
         }
     }