webcol / Calima

Sistema/Ayudantes/CFPHPVinculos.php

Indentation +1 added lines, -1 removed lines

@@ -31,5 +31,5 @@
     
     $dominio = "http://www.my-site-domain.com/";
     return $dominio;
-   }
+    }
 }
\ No newline at end of file

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

Indentation +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
         $rutaLib = RUTA_LIBS . $libreria . '.php';
         if(is_readable($rutaLib)){
             require_once $rutaLib;
-           //echo 'libreria cargada';
+            //echo 'libreria cargada';
         }
         else {
             throw new Exception("houston tenemos un problema! al cargar libreria");
@@ -47,12 +47,12 @@ 
     
     protected function cargaModelo($modelo){
         $modelo=$modelo.'Modelo';
-       $rutaMod = RUTA_MOD . $modelo . '.php';
+        $rutaMod = RUTA_MOD . $modelo . '.php';
         if(is_readable($rutaMod)){
             require_once $rutaMod;
             $modelo = new $modelo;
             return $modelo;
-           //echo 'modelo cargado';
+            //echo 'modelo cargado';
         }
         else {
             //echo $rutaMod;
@@ -64,10 +64,10 @@ 
     }
     
     protected function cargaAyudante($ayudante){
-       $rutaAyudante = RUTA_AYUDANTES . $ayudante . '.php';
+        $rutaAyudante = RUTA_AYUDANTES . $ayudante . '.php';
         if(is_readable($rutaAyudante)){
             require_once $rutaAyudante;
-           //echo 'libreria cargada';
+            //echo 'libreria cargada';
         }
         else {
             throw new Exception("houston tenemos un problema! al cargar ayudante");

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");
         }
     }

Sistema/Nucleo/CFSesion.php

Spacing +8 added lines, -8 removed lines

@@ -95,7 +95,7 @@ 
 
 
    function leer($id) {
-      if(!isset($this->read_stmt)) {
+      if (!isset($this->read_stmt)) {
       $this->read_stmt = $this->db->prepare("SELECT data FROM sesiones WHERE id = ? LIMIT 1");
    }
    $this->read_stmt->bind_param('s', $id);
@@ -119,7 +119,7 @@ 
    $data = $this->encrypt($data, $key);
  
    $time = time();
-   if(!isset($this->w_stmt)) {
+   if (!isset($this->w_stmt)) {
       $this->w_stmt = $this->db->prepare("REPLACE INTO sesiones (id, set_time, data, session_key) VALUES (?, ?, ?, ?)");
    }
  
@@ -129,7 +129,7 @@ 
    }
 
    function destruir($id) {
-      if(!isset($this->delete_stmt)) {
+      if (!isset($this->delete_stmt)) {
       $this->delete_stmt = $this->db->prepare("DELETE FROM sesiones WHERE id = ?");
    }
    $this->delete_stmt->bind_param('s', $id);
@@ -138,7 +138,7 @@ 
    }
 
    function gc($max) {
-      if(!isset($this->gc_stmt)) {
+      if (!isset($this->gc_stmt)) {
       $this->gc_stmt = $this->db->prepare("DELETE FROM sesiones WHERE set_time < ?");
    }
    $old = time() - $max;
@@ -150,13 +150,13 @@ 
    private function getkey($id) {
            
       
-      if(!isset($this->key_stmt)) {
+      if (!isset($this->key_stmt)) {
       $this->key_stmt = $this->db->prepare("SELECT session_key FROM sesiones WHERE id = ? LIMIT 1");
    }
    $this->key_stmt->bind_param('s', $id);
    $this->key_stmt->execute();
    $this->key_stmt->store_result();
-   if($this->key_stmt->num_rows == 1) { 
+   if ($this->key_stmt->num_rows == 1) { 
       $this->key_stmt->bind_result($key);
       $this->key_stmt->fetch();
       return $key;
@@ -168,7 +168,7 @@ 
 
    private function encrypt($data, $key) {
       $salt = 'cH!swe!retReGu7W6bEDRup7usuDUh9THeD2CHeGE*ewr4n39=E@rAsp7c-Ph@pH';
-      $key = substr(hash('sha256', $salt.$key.$salt), 0, 32);
+      $key = substr(hash('sha256', $salt . $key . $salt), 0, 32);
       $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
       $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
       $encrypted = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $data, MCRYPT_MODE_ECB, $iv));
@@ -176,7 +176,7 @@ 
    }
    private function decrypt($data, $key) {
       $salt = 'cH!swe!retReGu7W6bEDRup7usuDUh9THeD2CHeGE*ewr4n39=E@rAsp7c-Ph@pH';
-      $key = substr(hash('sha256', $salt.$key.$salt), 0, 32);
+      $key = substr(hash('sha256', $salt . $key . $salt), 0, 32);
       $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
       $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
       $decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, base64_decode($data), MCRYPT_MODE_ECB, $iv);

Indentation +126 added lines, -126 removed lines

@@ -41,155 +41,155 @@
     private $bdchar     = CF_BD_CHAR;
     private $bdconector = CF_BD_CONECTOR;
     
-   public function __construct() {
-       session_regenerate_id(true);
-         // set our custom session functions.
-      session_set_save_handler(array($this, 'abrir'), array($this, 'cerrar'), array($this, 'leer'), array($this, 'escribir'), array($this, 'destruir'), array($this, 'gc'));
-      // This line prevents unexpected effects when using objects as save handlers.
-      register_shutdown_function('session_write_close');      
-   }   
-  /* public function __destruct() {
+    public function __construct() {
+        session_regenerate_id(true);
+            // set our custom session functions.
+        session_set_save_handler(array($this, 'abrir'), array($this, 'cerrar'), array($this, 'leer'), array($this, 'escribir'), array($this, 'destruir'), array($this, 'gc'));
+        // This line prevents unexpected effects when using objects as save handlers.
+        register_shutdown_function('session_write_close');      
+    }   
+    /* public function __destruct() {
       session_regenerate_id(true);
    }*/
-           function iniciarSesion($session_name, $secure) {
-      // Make sure the session cookie is not accessable via javascript.
-      $httpunico = true;
+            function iniciarSesion($session_name, $secure) {
+        // Make sure the session cookie is not accessable via javascript.
+        $httpunico = true;
 
-      // Hash algorithm to use for the sessionid. (use hash_algos() to get a list of available hashes.)
-      $sesion_hash = 'sha512';
+        // Hash algorithm to use for the sessionid. (use hash_algos() to get a list of available hashes.)
+        $sesion_hash = 'sha512';
 
-      // Check if hash is available
-      if (in_array($sesion_hash, hash_algos())) {
+        // Check if hash is available
+        if (in_array($sesion_hash, hash_algos())) {
         // Set the has function.
         ini_set('session.hash_function', $sesion_hash);
-      }
-      // How many bits per character of the hash.
-      // The possible values are '4' (0-9, a-f), '5' (0-9, a-v), and '6' (0-9, a-z, A-Z, "-", ",").
-      ini_set('session.hash_bits_per_character', 5);
-
-      // Force the session to only use cookies, not URL variables.
-      ini_set('session.use_only_cookies', 1);
-
-      // Get session cookie parameters 
-      $cookieParams = session_get_cookie_params(); 
-      // Set the parameters
-      session_set_cookie_params($cookieParams["lifetime"], $cookieParams["path"], $cookieParams["domain"], $secure, $httpunico); 
-      // Change the session name 
-      session_name($session_name);
-      // Now we cat start the session
-      session_start();
+        }
+        // How many bits per character of the hash.
+        // The possible values are '4' (0-9, a-f), '5' (0-9, a-v), and '6' (0-9, a-z, A-Z, "-", ",").
+        ini_set('session.hash_bits_per_character', 5);
+
+        // Force the session to only use cookies, not URL variables.
+        ini_set('session.use_only_cookies', 1);
+
+        // Get session cookie parameters 
+        $cookieParams = session_get_cookie_params(); 
+        // Set the parameters
+        session_set_cookie_params($cookieParams["lifetime"], $cookieParams["path"], $cookieParams["domain"], $secure, $httpunico); 
+        // Change the session name 
+        session_name($session_name);
+        // Now we cat start the session
+        session_start();
      
-      // This line regenerates the session and delete the old one. 
-      // It also generates a new encryption key in the database. 
+        // This line regenerates the session and delete the old one. 
+        // It also generates a new encryption key in the database. 
        
-   }
+    }
 
 // ingrese la informacion de conexion a su base de datos, debe ser igual a la que esta en CFConfiguracion.php
-   function abrir() {
-   $host = $this->host;
-   $user = $this->usuario;
-   $pass = $this->clave;
-   $name = $this->bdnombree;
+    function abrir() {
+    $host = $this->host;
+    $user = $this->usuario;
+    $pass = $this->clave;
+    $name = $this->bdnombree;
    
-   $mysqli = new \mysqli($host, $user, $pass, $name);
-   $this->db = $mysqli;
-   return true;
-   }
+    $mysqli = new \mysqli($host, $user, $pass, $name);
+    $this->db = $mysqli;
+    return true;
+    }
 
-   function cerrar() {
-      $this->db->close();
-      return true;
-   }
+    function cerrar() {
+        $this->db->close();
+        return true;
+    }
 
 
-   function leer($id) {
-      if(!isset($this->read_stmt)) {
-      $this->read_stmt = $this->db->prepare("SELECT data FROM sesiones WHERE id = ? LIMIT 1");
-   }
-   $this->read_stmt->bind_param('s', $id);
-   $this->read_stmt->execute();
-   $this->read_stmt->store_result();
-   $this->read_stmt->bind_result($data);
-   $this->read_stmt->fetch();
-   $key = $this->getkey($id);
-   $data = $this->decrypt($data, $key);
-   return $data;
-   }
+    function leer($id) {
+        if(!isset($this->read_stmt)) {
+        $this->read_stmt = $this->db->prepare("SELECT data FROM sesiones WHERE id = ? LIMIT 1");
+    }
+    $this->read_stmt->bind_param('s', $id);
+    $this->read_stmt->execute();
+    $this->read_stmt->store_result();
+    $this->read_stmt->bind_result($data);
+    $this->read_stmt->fetch();
+    $key = $this->getkey($id);
+    $data = $this->decrypt($data, $key);
+    return $data;
+    }
 
 
 
 
 
-   function escribir($id, $data) {
-      // Get unique key
-   $key = $this->getkey($id);
-   // Encrypt the data
-   $data = $this->encrypt($data, $key);
+    function escribir($id, $data) {
+        // Get unique key
+    $key = $this->getkey($id);
+    // Encrypt the data
+    $data = $this->encrypt($data, $key);
  
-   $time = time();
-   if(!isset($this->w_stmt)) {
-      $this->w_stmt = $this->db->prepare("REPLACE INTO sesiones (id, set_time, data, session_key) VALUES (?, ?, ?, ?)");
-   }
+    $time = time();
+    if(!isset($this->w_stmt)) {
+        $this->w_stmt = $this->db->prepare("REPLACE INTO sesiones (id, set_time, data, session_key) VALUES (?, ?, ?, ?)");
+    }
  
-   $this->w_stmt->bind_param('siss', $id, $time, $data, $key);
-   $this->w_stmt->execute();
-   return true;
-   }
-
-   function destruir($id) {
-      if(!isset($this->delete_stmt)) {
-      $this->delete_stmt = $this->db->prepare("DELETE FROM sesiones WHERE id = ?");
-   }
-   $this->delete_stmt->bind_param('s', $id);
-   $this->delete_stmt->execute();
-   return true;
-   }
-
-   function gc($max) {
-      if(!isset($this->gc_stmt)) {
-      $this->gc_stmt = $this->db->prepare("DELETE FROM sesiones WHERE set_time < ?");
-   }
-   $old = time() - $max;
-   $this->gc_stmt->bind_param('s', $old);
-   $this->gc_stmt->execute();
-   return true;
-   }
-
-   private function getkey($id) {
+    $this->w_stmt->bind_param('siss', $id, $time, $data, $key);
+    $this->w_stmt->execute();
+    return true;
+    }
+
+    function destruir($id) {
+        if(!isset($this->delete_stmt)) {
+        $this->delete_stmt = $this->db->prepare("DELETE FROM sesiones WHERE id = ?");
+    }
+    $this->delete_stmt->bind_param('s', $id);
+    $this->delete_stmt->execute();
+    return true;
+    }
+
+    function gc($max) {
+        if(!isset($this->gc_stmt)) {
+        $this->gc_stmt = $this->db->prepare("DELETE FROM sesiones WHERE set_time < ?");
+    }
+    $old = time() - $max;
+    $this->gc_stmt->bind_param('s', $old);
+    $this->gc_stmt->execute();
+    return true;
+    }
+
+    private function getkey($id) {
            
       
-      if(!isset($this->key_stmt)) {
-      $this->key_stmt = $this->db->prepare("SELECT session_key FROM sesiones WHERE id = ? LIMIT 1");
-   }
-   $this->key_stmt->bind_param('s', $id);
-   $this->key_stmt->execute();
-   $this->key_stmt->store_result();
-   if($this->key_stmt->num_rows == 1) { 
-      $this->key_stmt->bind_result($key);
-      $this->key_stmt->fetch();
-      return $key;
-   } else {
-      $random_key = hash('sha512', uniqid(mt_rand(1, mt_getrandmax()), true));
-      return $random_key;
-   }
-   }
-
-   private function encrypt($data, $key) {
-      $salt = 'cH!swe!retReGu7W6bEDRup7usuDUh9THeD2CHeGE*ewr4n39=E@rAsp7c-Ph@pH';
-      $key = substr(hash('sha256', $salt.$key.$salt), 0, 32);
-      $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-      $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-      $encrypted = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $data, MCRYPT_MODE_ECB, $iv));
-      return $encrypted;
-   }
-   private function decrypt($data, $key) {
-      $salt = 'cH!swe!retReGu7W6bEDRup7usuDUh9THeD2CHeGE*ewr4n39=E@rAsp7c-Ph@pH';
-      $key = substr(hash('sha256', $salt.$key.$salt), 0, 32);
-      $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-      $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-      $decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, base64_decode($data), MCRYPT_MODE_ECB, $iv);
-      return $decrypted;
-   }
+        if(!isset($this->key_stmt)) {
+        $this->key_stmt = $this->db->prepare("SELECT session_key FROM sesiones WHERE id = ? LIMIT 1");
+    }
+    $this->key_stmt->bind_param('s', $id);
+    $this->key_stmt->execute();
+    $this->key_stmt->store_result();
+    if($this->key_stmt->num_rows == 1) { 
+        $this->key_stmt->bind_result($key);
+        $this->key_stmt->fetch();
+        return $key;
+    } else {
+        $random_key = hash('sha512', uniqid(mt_rand(1, mt_getrandmax()), true));
+        return $random_key;
+    }
+    }
+
+    private function encrypt($data, $key) {
+        $salt = 'cH!swe!retReGu7W6bEDRup7usuDUh9THeD2CHeGE*ewr4n39=E@rAsp7c-Ph@pH';
+        $key = substr(hash('sha256', $salt.$key.$salt), 0, 32);
+        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+        $encrypted = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $data, MCRYPT_MODE_ECB, $iv));
+        return $encrypted;
+    }
+    private function decrypt($data, $key) {
+        $salt = 'cH!swe!retReGu7W6bEDRup7usuDUh9THeD2CHeGE*ewr4n39=E@rAsp7c-Ph@pH';
+        $key = substr(hash('sha256', $salt.$key.$salt), 0, 32);
+        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+        $decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, base64_decode($data), MCRYPT_MODE_ECB, $iv);
+        return $decrypted;
+    }
     
 }
 

Doc Comments +8 added lines

@@ -51,6 +51,11 @@ 
   /* public function __destruct() {
       session_regenerate_id(true);
    }*/
+
+           /**
+            * @param string $session_name
+            * @param false|string $secure
+            */
            function iniciarSesion($session_name, $secure) {
       // Make sure the session cookie is not accessable via javascript.
       $httpunico = true;
@@ -136,6 +141,9 @@ 
    return true;
    }
 
+   /**
+    * @param string $id
+    */
    function destruir($id) {
       if(!isset($this->delete_stmt)) {
       $this->delete_stmt = $this->db->prepare("DELETE FROM sesiones WHERE id = ?");

Sistema/Nucleo/CFSolicitud.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
     private $_argumentos;
     
     public function __construct() {
-        if(isset($_GET['url'])){
+        if (isset($_GET['url'])) {
             $url = filter_input(INPUT_GET, 'url', FILTER_SANITIZE_URL);
             $url = explode('/', $url);
             $url = array_filter($url);
@@ -42,15 +42,15 @@ 
             $this->_argumentos = $url;
         }       
         
-        if(!$this->_controlador){
+        if (!$this->_controlador) {
             $this->_controlador = CONTROLADOR_INICIAL;
         }
         
-        if(!$this->_metodo){
+        if (!$this->_metodo) {
             $this->_metodo = 'index';
         }
         
-        if(!isset($this->_argumentos)){
+        if (!isset($this->_argumentos)) {
             $this->_argumentos = array();
         }
     }

Sistema/Nucleo/CFVista.php

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
             
         $ver_ruta = VIEW_PATH . $this->_controlador . DS . $vista . '.phtml';
         
-        if(is_readable($ver_ruta)){
+        if (is_readable($ver_ruta)) {
             include_once SITE_ROOT . 'mvc/vistas' . DS . ADICIONALES_VISTA . DS . 'encabezado.php';
             include_once $ver_ruta;
             include_once SITE_ROOT . 'mvc/vistas' . DS . ADICIONALES_VISTA . DS . 'pie_de_pagina.php';
         } 
         else {
             
-            header('Location: '.  Cf_BASE_URL.'error/index'.'?error='.'vista' );
+            header('Location: ' . Cf_BASE_URL . 'error/index' . '?error=' . 'vista');
             
         }
     }

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
             include_once SITE_ROOT . 'mvc/vistas' . DS . ADICIONALES_VISTA . DS . 'encabezado.php';
             include_once $ver_ruta;
             include_once SITE_ROOT . 'mvc/vistas' . DS . ADICIONALES_VISTA . DS . 'pie_de_pagina.php';
-        } 
-        else {
+        } else {
             
             header('Location: '.  Cf_BASE_URL.'error/index'.'?error='.'vista' );
             

index.php

Indentation +13 added lines, -13 removed lines

@@ -102,31 +102,31 @@
 }
  
 switch ($lang) {
-  case 'en':
+    case 'en':
   $lang_file = 'lang.en.php';
-  break;
+    break;
  
-  case 'de':
+    case 'de':
   $lang_file = 'lang.de.php';
-  break;
+    break;
 
-  case 'zh':
+    case 'zh':
   $lang_file = 'lang.zh.php';
-  break;
+    break;
 
-  case 'pt':
+    case 'pt':
   $lang_file = 'lang.pt.php';
-  break;
+    break;
 
-  case 'pt':
+    case 'pt':
   $lang_file = 'lang.pt.php';
-  break;
+    break;
 
-  case 'es':
+    case 'es':
   $lang_file = 'lang.es.php';
-  break;
+    break;
  
-  default:
+    default:
   $lang_file = 'lang.en.php';
  
 }

Spacing +17 added lines, -17 removed lines

@@ -23,7 +23,7 @@ 
  * <http://www.calimaframework.com>.
  */
 
-require_once __DIR__.'/vendor/autoload.php';
+require_once __DIR__ . '/vendor/autoload.php';
 
 use Sistema\Nucleo;
 use Sistema\Ayudantes;
@@ -42,44 +42,44 @@ 
 /** Cf directorio separador */
 defined('DS') ? null : define('DS', DIRECTORY_SEPARATOR);
 /** Cf raiz del sitio */
-defined('SITE_ROOT')? null: define('SITE_ROOT', realpath(dirname(__FILE__)).DS);
+defined('SITE_ROOT') ? null : define('SITE_ROOT', realpath(dirname(__FILE__)) . DS);
 /** Cf PATH del sitio */
-defined('SITE_PATH') ? NULL : define ('SITE_PATH', realpath(dirname(__FILE__) . DS . '..' . DS) . DS);
+defined('SITE_PATH') ? NULL : define('SITE_PATH', realpath(dirname(__FILE__) . DS . '..' . DS) . DS);
 
 /** Cf definimos constante Ruta directa al nucleo de framework  */
-define('RUTA_NUCLEO', SITE_ROOT . 'Sistema'.DS.'Nucleo' . DS);
+define('RUTA_NUCLEO', SITE_ROOT . 'Sistema' . DS . 'Nucleo' . DS);
 
 # define para mvc erp
 
 /** Cf definimos constante  directa a la vista del framework  */
-define('VIEW_PATH', SITE_ROOT . 'mvc'.DS.'vistas' . DS);
+define('VIEW_PATH', SITE_ROOT . 'mvc' . DS . 'vistas' . DS);
 /** Cf definimos constante  directa a los controladores del framework  */
-define('CONTR_PATH', SITE_ROOT . 'mvc'.DS.'controladores' . DS);
+define('CONTR_PATH', SITE_ROOT . 'mvc' . DS . 'controladores' . DS);
 /** Cf definimos constante  directa a los modelos del framework  */
-define('RUTA_MOD', SITE_ROOT . 'mvc'.DS.'modelos' . DS);
+define('RUTA_MOD', SITE_ROOT . 'mvc' . DS . 'modelos' . DS);
 
 # define ruta a los stilos del public
 
 /** Cf definimos constante  directa a los css dentro del directorio public_ del framework  */
-define('CSS_PATH', SITE_ROOT . 'public_'.DS.'css' . DS);
+define('CSS_PATH', SITE_ROOT . 'public_' . DS . 'css' . DS);
 /** Cf definimos constante  directa a los css dentro del directorio public_ del framework  */
-define('IMG_PATH', SITE_ROOT . 'public_'.DS.'img' . DS);
+define('IMG_PATH', SITE_ROOT . 'public_' . DS . 'img' . DS);
 /** Cf definimos constante  directa a los js dentro del directorio public_ del framework  */
-define('JS_PATH', SITE_ROOT . 'public_'.DS.'js' . DS);
+define('JS_PATH', SITE_ROOT . 'public_' . DS . 'js' . DS);
 /** Cf definimos constante  directa a las librerias dentro  del framework  */
-define('RUTA_LIBS', SITE_ROOT . 'Sistema'.DS.'librerias' . DS);
+define('RUTA_LIBS', SITE_ROOT . 'Sistema' . DS . 'librerias' . DS);
 /** Cf definimos constante  directa a los ayudantes del framework  */
-define('RUTA_AYUDANTES', SITE_ROOT . 'Sistema'.DS.'ayudantes' . DS);
+define('RUTA_AYUDANTES', SITE_ROOT . 'Sistema' . DS . 'ayudantes' . DS);
 
 /** Cf definimos constante  directa a los lenguajes del framework  */
-define('RUTA_LENGUAJES', SITE_ROOT . 'Sistema'.DS.'lenguajes' . DS);
+define('RUTA_LENGUAJES', SITE_ROOT . 'Sistema' . DS . 'lenguajes' . DS);
 
 
 //LENGUAJES
 //En el directorio sistema lenguajes hay varios archivos php cada uno para crear las constantes en el idioma especifico
 //luego por get capturamos la variable lan al inicio de la aplicacion asi: www.tuapp.com/?lang=de
 
-if(isSet($_GET['lang']))
+if (isSet($_GET['lang']))
 {
     $lang = $_GET['lang'];
  
@@ -88,11 +88,11 @@ 
  
     setcookie('lang', $lang, time() + (3600 * 24 * 30));
 }
-else if(isSet($_SESSION['lang']))
+else if (isSet($_SESSION['lang']))
 {
     $lang = $_SESSION['lang'];
 }
-else if(isSet($_COOKIE['lang']))
+else if (isSet($_COOKIE['lang']))
 {
     $lang = $_COOKIE['lang'];
 }
@@ -148,7 +148,7 @@ 
 //require_once RUTA_NUCLEO . 'Cf_Autocarga.php';
 require_once RUTA_NUCLEO . 'CFConfiguracion.php';
 
-try{
+try {
    
     Nucleo\CFBootstrap::actuar(new Nucleo\CFSolicitud);
     //CFBootstrap::actuar(new CFSolicitud);

Braces +3 added lines, -6 removed lines

@@ -87,16 +87,13 @@
     $_SESSION['lang'] = $lang;
  
     setcookie('lang', $lang, time() + (3600 * 24 * 30));
-}
-else if(isSet($_SESSION['lang']))
+} else if(isSet($_SESSION['lang']))
 {
     $lang = $_SESSION['lang'];
-}
-else if(isSet($_COOKIE['lang']))
+} else if(isSet($_COOKIE['lang']))
 {
     $lang = $_COOKIE['lang'];
-}
-else
+} else
 {
     $lang = 'es'; // por defecto el idioma para el app es español puede ser en, bt, de, zh
 }

mvc/controladores/blogControlador.php

Indentation +5 added lines, -5 removed lines

@@ -61,10 +61,10 @@ 
             if (isset($_POST['enviar'])&& isset($_POST['option1'])  ) {
                 
                 $datas->insertarDatos(
-                     $this->_ayuda->filtrarEntero($_POST['id']),
-                     $this->_ayuda->filtrarTexto($_POST['nombre']),
-                     $this->_ayuda->filtrarTexto($_POST['email']),
-                     $this->_ayuda->filtrarTexto($_POST['comentario'])
+                        $this->_ayuda->filtrarEntero($_POST['id']),
+                        $this->_ayuda->filtrarTexto($_POST['nombre']),
+                        $this->_ayuda->filtrarTexto($_POST['email']),
+                        $this->_ayuda->filtrarTexto($_POST['comentario'])
                     );
                 echo $this->_ayuda->filtrarEntero('id');
                 $_POST['option1']=false;
@@ -75,7 +75,7 @@ 
     
     public function insertarComentario(){
         
-         /*$this->_vista->titulo = 'Registro CalimaFramework';
+            /*$this->_vista->titulo = 'Registro CalimaFramework';
             if(isset($_GET['titulo'])){
             $this->_vista->salida_campo = $_GET['titulo'];
             }

Spacing +17 added lines, -17 removed lines

@@ -19,46 +19,46 @@ 
         $this->_ayuda = new Sistema\Ayudantes\CFPHPAyuda();
     }
     
-    public function index(){
+    public function index() {
         $datas = $this->cargaModelo('blog');       
         
-        $this->_vista->postear= $datas->llamarDatosBlog();
-        $this->_vista->categorias= $datas->llamarDatosCategoria();
-        $this->_vista->tags= $datas->llamarDatosTags();
+        $this->_vista->postear = $datas->llamarDatosBlog();
+        $this->_vista->categorias = $datas->llamarDatosCategoria();
+        $this->_vista->tags = $datas->llamarDatosTags();
         $this->_vista->titulo = 'Blog Calima Framework';
         $this->_vista->imprimirVista('index', 'blog');       
         
     }
-    public function crearpost(){
+    public function crearpost() {
         $datas = $this->cargaModelo('blog');       
         
-        $this->_vista->postear= $datas->llamarDatosBlog();
+        $this->_vista->postear = $datas->llamarDatosBlog();
         $this->_vista->titulo = 'Blog Calima Framework crear post';
         $this->_vista->imprimirVista('crearpost', 'blog');  
         
     }
     
-    public function wikipost(){
+    public function wikipost() {
         $datas = $this->cargaModelo('blog');       
         
-        $this->_vista->postear= $datas->llamarDatosBlog();
-        $this->_vista->tags= $datas->llamarDatosTags();
-        $this->_vista->comentarios= $datas->llamarComentarios();
-        $this->_vista->categorias= $datas->llamarDatosCategoria();
-        $this->_vista->contar= $datas->contarComentarios($_GET['id']);
-        $this->_vista->video= $datas->llamarDatosBlogId($_GET['id']);
+        $this->_vista->postear = $datas->llamarDatosBlog();
+        $this->_vista->tags = $datas->llamarDatosTags();
+        $this->_vista->comentarios = $datas->llamarComentarios();
+        $this->_vista->categorias = $datas->llamarDatosCategoria();
+        $this->_vista->contar = $datas->contarComentarios($_GET['id']);
+        $this->_vista->video = $datas->llamarDatosBlogId($_GET['id']);
         $this->_vista->titulo = 'Blog 1 Calima Framework';
         $this->_vista->imprimirVista('wikipost', 'blog');  
         
         
         $this->_vista->titulo = 'Registro CalimaFramework';
-            if(isset($_GET['titulo'])){
+            if (isset($_GET['titulo'])) {
             $this->_vista->salida_campo = $_GET['titulo'];
             }
             
             $this->_vista->imprimirVista('wikipost', 'blog');
             //$datas = $this->cargaModelo('blog');
-            if (isset($_POST['enviar'])&& isset($_POST['option1'])  ) {
+            if (isset($_POST['enviar']) && isset($_POST['option1'])) {
                 
                 $datas->insertarDatos(
                      $this->_ayuda->filtrarEntero($_POST['id']),
@@ -67,13 +67,13 @@ 
                      $this->_ayuda->filtrarTexto($_POST['comentario'])
                     );
                 echo $this->_ayuda->filtrarEntero('id');
-                $_POST['option1']=false;
+                $_POST['option1'] = false;
                 
             }
         
     }
     
-    public function insertarComentario(){
+    public function insertarComentario() {
         
          /*$this->_vista->titulo = 'Registro CalimaFramework';
             if(isset($_GET['titulo'])){

mvc/controladores/contactosControlador.php

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         
                    
        
-       if (isset($_POST['email'])) {
+        if (isset($_POST['email'])) {
         $para="webmaster@webcol.net";
         $this->_ayuda->enviarCorreo(
                 $_POST['email'],

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
         
         // cargamos la clase ayudantes para usar sus metodos de ayuda
        
-        $this->_ayuda= new Sistema\Ayudantes\CFPHPAyuda();
+        $this->_ayuda = new Sistema\Ayudantes\CFPHPAyuda();
     }
     
     public function index()
@@ -19,8 +19,8 @@ 
         $this->_vista->imprimirVista('index', 'inicio');
         
         if (isset($_POST['email'])) {
-            $this->_vista->validar=1;
-        $para="webmaster@webcol.net";
+            $this->_vista->validar = 1;
+        $para = "webmaster@webcol.net";
         $this->_ayuda->enviarCorreo(
                 $_POST['email'],
                 $this->_ayuda->filtrarTexto($_POST['asunto']),
@@ -38,7 +38,7 @@ 
                    
        
        if (isset($_POST['email'])) {
-        $para="webmaster@webcol.net";
+        $para = "webmaster@webcol.net";
         $this->_ayuda->enviarCorreo(
                 $_POST['email'],
                 $this->_ayuda->filtrarTexto($_POST['asunto']),