webcol / Calima

mvc/controladores/usuarioControlador.php

Spacing +20 added lines, -20 removed lines

@@ -10,12 +10,12 @@ 
         parent::__construct();
                
         // cargamos la clase ayudantes para usar sus metodos de ayuda       
-        $this->_ayuda= new Sistema\Ayudantes\CFPHPAyuda;        
-        $this->_seg= new Sistema\Ayudantes\CFPHPSeguridad;
-        $this->_sesion=new Sistema\Nucleo\CFSesion();       
+        $this->_ayuda = new Sistema\Ayudantes\CFPHPAyuda;        
+        $this->_seg = new Sistema\Ayudantes\CFPHPSeguridad;
+        $this->_sesion = new Sistema\Nucleo\CFSesion();       
     }    
     
-    public function index(){        
+    public function index() {        
         $this->_vista->titulo = 'CalimaFramework Login';
         $this->_vista->error = 'CalimaFramework Login';
         $this->_vista->imprimirVista('index', 'usuario');  
@@ -23,7 +23,7 @@ 
         
     }  
     
-    public function registro(){ 
+    public function registro() { 
         
         $this->_vista->titulo = 'CalimaFramework registro';
         $this->_vista->imprimirVista('registro', 'usuario');
@@ -32,13 +32,13 @@ 
         //echo$_SESSION['something'];
     }
     
-    public function crearRegistro(){
+    public function crearRegistro() {
         $datas = $this->cargaModelo('usuario');    
-        if(isset($_POST['nombre'])){
-        $nombre=$_POST['nombre'];
-        $email=$_POST['email'];
-        $usuario=$_POST['nombre'];
-         $clave=$this->_seg->cifrado($this->_seg->filtrarTexto($_POST['clave']));
+        if (isset($_POST['nombre'])) {
+        $nombre = $_POST['nombre'];
+        $email = $_POST['email'];
+        $usuario = $_POST['nombre'];
+         $clave = $this->_seg->cifrado($this->_seg->filtrarTexto($_POST['clave']));
         
          $datas->insertarRegistro(
                      $this->_seg->filtrarTexto($_POST['nombre']),
@@ -49,22 +49,22 @@ 
                 $this->_ayuda->redireccionUrl('usuario');
                 //$_POST['option1']=false;
         }
-        else{
+        else {
             $this->_ayuda->redireccionUrl('usuario/registro');
         }
     }
     
-    public function valida(){
-        if(isset($_POST['usuario'])){
-        $usuario=$_POST['usuario'];
-        echo $clave=$this->_seg->cifrado($this->_seg->filtrarTexto($_POST['clave']));
+    public function valida() {
+        if (isset($_POST['usuario'])) {
+        $usuario = $_POST['usuario'];
+        echo $clave = $this->_seg->cifrado($this->_seg->filtrarTexto($_POST['clave']));
         
         $datosUser = $this->cargaModelo('usuario');
-        $valida=$datosUser->seleccionUsuario($usuario, $clave);  
+        $valida = $datosUser->seleccionUsuario($usuario, $clave);  
         
-        if(isset($valida)){
+        if (isset($valida)) {
             $this->_sesion->iniciarSesion('_s', false);
-            $_SESSION['usuario']=$usuario;
+            $_SESSION['usuario'] = $usuario;
             $this->_ayuda->redireccionUrl('index');         
         }
        $this->_ayuda->redireccionUrl('usuario');
@@ -72,7 +72,7 @@ 
         }
     }
     
-     public function cerrarSesion(){
+     public function cerrarSesion() {
         $this->_sesion->iniciarSesion('_s', false);
         session_destroy();
         $this->_sesion->destruir('usuario');

mvc/modelos/blogModelo.php

Spacing +29 added lines, -29 removed lines

@@ -13,67 +13,67 @@
         parent::__construct();
     }
     
-    public function insertarDatos($id_blog, $nombre,  $email, $comentario){
+    public function insertarDatos($id_blog, $nombre, $email, $comentario) {
         
-        $post=$this->_bd->consulta('INSERT INTO comentarios (id_blog, nombre, email, comentario) VALUES (:id_blog, :nombre, :email, :comentario)');
-        $post=$this->_bd->enlace(':id_blog', $id_blog);
-        $post=$this->_bd->enlace(':nombre',$nombre);
-        $post=$this->_bd->enlace(':email', $email);
-        $post=$this->_bd->enlace(':comentario', $comentario);
-        $post=$this->_bd->ejecucion();
-        return $post=$this->_bd->resultset();
+        $post = $this->_bd->consulta('INSERT INTO comentarios (id_blog, nombre, email, comentario) VALUES (:id_blog, :nombre, :email, :comentario)');
+        $post = $this->_bd->enlace(':id_blog', $id_blog);
+        $post = $this->_bd->enlace(':nombre', $nombre);
+        $post = $this->_bd->enlace(':email', $email);
+        $post = $this->_bd->enlace(':comentario', $comentario);
+        $post = $this->_bd->ejecucion();
+        return $post = $this->_bd->resultset();
         
     }
     
-    public function llamarDatosCategoria(){
+    public function llamarDatosCategoria() {
         //echo DB_HOST;
-        $cate=$this->_bd->consulta('select * from categoria ');
-        return $cate=$this->_bd->resultset();//=$this->_bd->resultset();$post->fetchall();
+        $cate = $this->_bd->consulta('select * from categoria ');
+        return $cate = $this->_bd->resultset(); //=$this->_bd->resultset();$post->fetchall();
         
        
     }
     
-    public function llamarDatosTags(){
+    public function llamarDatosTags() {
         //echo DB_HOST;
-        $post=$this->_bd->consulta('select * from tags ');
-        return $post=$this->_bd->resultset();//=$this->_bd->resultset();$post->fetchall();
+        $post = $this->_bd->consulta('select * from tags ');
+        return $post = $this->_bd->resultset(); //=$this->_bd->resultset();$post->fetchall();
         
        
     }
     
     
-    public function llamarDatosBlog(){
+    public function llamarDatosBlog() {
         //echo DB_HOST;
-        $post=$this->_bd->consulta('select * from blog ');
-        return $post=$this->_bd->resultset();//=$this->_bd->resultset();$post->fetchall();
+        $post = $this->_bd->consulta('select * from blog ');
+        return $post = $this->_bd->resultset(); //=$this->_bd->resultset();$post->fetchall();
         
        
     }
     
-    public function llamarDatosBlogId($id){
+    public function llamarDatosBlogId($id) {
         //echo DB_HOST;
-        $idvideo=$id;
-        $datosQuery="select idvideo from blog where id = :idvideo";
-        $gsent=$this->_bd->consulta('SELECT idvideo FROM blog WHERE id = :idvideo');
-        $gsent=$this->_bd->enlace(':idvideo', $idvideo);
+        $idvideo = $id;
+        $datosQuery = "select idvideo from blog where id = :idvideo";
+        $gsent = $this->_bd->consulta('SELECT idvideo FROM blog WHERE id = :idvideo');
+        $gsent = $this->_bd->enlace(':idvideo', $idvideo);
         //$gsent=$this->_bd->ejecucion();
-        $row = $gsent=$this->_bd->single();
+        $row = $gsent = $this->_bd->single();
         return  $row;
        
     }
     
-    public function llamarComentarios(){
+    public function llamarComentarios() {
         //echo DB_HOST;
-        $post=$this->_bd->consulta('select * from comentarios ');
-        return $post=$this->_bd->resultset();//=$this->_bd->resultset();$post->fetchall();
+        $post = $this->_bd->consulta('select * from comentarios ');
+        return $post = $this->_bd->resultset(); //=$this->_bd->resultset();$post->fetchall();
         
        
     }
     
-    public function contarComentarios($id){
+    public function contarComentarios($id) {
         //echo DB_HOST;
-        $post=$this->_bd->consulta('SELECT COUNT(*) FROM comentarios');
-        return $post=$this->_bd->resultset();//=$this->_bd->resultset();$post->fetchall();
+        $post = $this->_bd->consulta('SELECT COUNT(*) FROM comentarios');
+        return $post = $this->_bd->resultset(); //=$this->_bd->resultset();$post->fetchall();
         
        
     }

mvc/modelos/instaladorModelo.php

Spacing +3 added lines, -3 removed lines

@@ -14,9 +14,9 @@ 
         parent::__construct();
     }
     
-    public function verificarBdM($bd,$usuario,$contraseña){
+    public function verificarBdM($bd, $usuario, $contraseña) {
        try {
-        $gbd = new PDO("mysql:host=localhost;dbname=".$bd, $usuario, $contraseña);
+        $gbd = new PDO("mysql:host=localhost;dbname=" . $bd, $usuario, $contraseña);
         $gbd = null;
         return true;
         
@@ -26,7 +26,7 @@ 
         }
     }
     
-    public function crearTablas(){
+    public function crearTablas() {
         
         $this->_bd->consulta('CREATE TABLE IF NOT EXISTS `menu` (
   `id` int(5) NOT NULL,

mvc/modelos/usuarioModelo.php

Spacing +24 added lines, -24 removed lines

@@ -2,47 +2,47 @@
 class usuarioModelo extends Sistema\Nucleo\CFModelo
 {
     
-    function ValidarUsuario($email,$password){          //  Consulta Mysql para buscar en la tabla Usuario aquellos usuarios que coincidan con el mail y password ingresados en pantalla de login
-        $query = $this->db->where('Usuario',$email);  //  La consulta se efectúa mediante Active Record. Una manera alternativa, y en lenguaje más sencillo, de generar las consultas Sql.
-        $query = $this->db->where('Password',$password);
+    function ValidarUsuario($email, $password) {          //  Consulta Mysql para buscar en la tabla Usuario aquellos usuarios que coincidan con el mail y password ingresados en pantalla de login
+        $query = $this->db->where('Usuario', $email); //  La consulta se efectúa mediante Active Record. Una manera alternativa, y en lenguaje más sencillo, de generar las consultas Sql.
+        $query = $this->db->where('Password', $password);
         $query = $this->db->get('Usuarios');
-        return $query->row();    //  Devolvemos al controlador la fila que coincide con la búsqueda. (FALSE en caso que no existir coincidencias)
+        return $query->row(); //  Devolvemos al controlador la fila que coincide con la búsqueda. (FALSE en caso que no existir coincidencias)
     }
     
-    public function insertarUsuario($id_usuario, $nombre,  $email, $clave){
+    public function insertarUsuario($id_usuario, $nombre, $email, $clave) {
         
-        $post=$this->_bd->consulta('INSERT INTO comentarios (id_usuario, nombre, email, clave) VALUES (:id_usuario, :nombre, :email, :clave)');
-        $post=$this->_bd->enlace(':id_usuario', $id_usuariio);
-        $post=$this->_bd->enlace(':nombre',$nombre);
-        $post=$this->_bd->enlace(':email', $email);
-        $post=$this->_bd->enlace(':clave', $clave);
-        $post=$this->_bd->ejecucion();
-        return $post=$this->_bd->resultset();
+        $post = $this->_bd->consulta('INSERT INTO comentarios (id_usuario, nombre, email, clave) VALUES (:id_usuario, :nombre, :email, :clave)');
+        $post = $this->_bd->enlace(':id_usuario', $id_usuariio);
+        $post = $this->_bd->enlace(':nombre', $nombre);
+        $post = $this->_bd->enlace(':email', $email);
+        $post = $this->_bd->enlace(':clave', $clave);
+        $post = $this->_bd->ejecucion();
+        return $post = $this->_bd->resultset();
         
     }
     
-     public function seleccionUsuario($email, $clave){
+     public function seleccionUsuario($email, $clave) {
         //echo DB_HOST;
         
         //$datosQuery="select usuario, email, nivel from usuarios where usuario = :usuario";
-        $gsent=$this->_bd->consulta('select nombre, email, nivel from usuarios where email = :email and clave = :clave');
-        $gsent=$this->_bd->enlace(':email', $email);
-        $gsent=$this->_bd->enlace(':clave', $clave);
+        $gsent = $this->_bd->consulta('select nombre, email, nivel from usuarios where email = :email and clave = :clave');
+        $gsent = $this->_bd->enlace(':email', $email);
+        $gsent = $this->_bd->enlace(':clave', $clave);
         //$gsent=$this->_bd->ejecucion();
-        $row = $gsent=$this->_bd->single();
+        $row = $gsent = $this->_bd->single();
         return  $row;
        
     }  
     
-    public function insertarRegistro($nombre,  $email, $nivel, $clave){
+    public function insertarRegistro($nombre, $email, $nivel, $clave) {
         
-        $post=$this->_bd->consulta('INSERT INTO usuarios (nombre, email, nivel, clave) VALUES (:nombre, :email, :nivel, :clave)');
+        $post = $this->_bd->consulta('INSERT INTO usuarios (nombre, email, nivel, clave) VALUES (:nombre, :email, :nivel, :clave)');
         
-        $post=$this->_bd->enlace(':nombre',$nombre);
-        $post=$this->_bd->enlace(':email', $email);
-        $post=$this->_bd->enlace(':nivel', $nivel);
-        $post=$this->_bd->enlace(':clave', $clave);
-        $post=$this->_bd->ejecucion();
+        $post = $this->_bd->enlace(':nombre', $nombre);
+        $post = $this->_bd->enlace(':email', $email);
+        $post = $this->_bd->enlace(':nivel', $nivel);
+        $post = $this->_bd->enlace(':clave', $clave);
+        $post = $this->_bd->ejecucion();
         //return $post=$this->_bd->contarFilas();
         
     }

mvc/vistas/adicionales/encabezado.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 </script>
 <!-- End Google Analytics -->
 
-    <title><?php if(isset($this->titulo)) echo $this->titulo; ?></title>
+    <title><?php if (isset($this->titulo)) echo $this->titulo; ?></title>
 
     
     

mvc/vistas/adicionales/pie_de_pagina.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
  <!-- Site footer -->
       
  
-            <div class="footer fixedCf"> <?php echo CF_AP_CREDITOS;  ?> --- Theme Inspinia </div>
+            <div class="footer fixedCf"> <?php echo CF_AP_CREDITOS; ?> --- Theme Inspinia </div>
             
       
       

sistema/librerias/ORMbasico/DatabaseProvider.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 {

     protected $resource;

     public abstract function connect($host, $user, $pass, $dbname);

-    public abstract function disconnect ();

+    public abstract function disconnect();

     public abstract function getErrorNo();

     public abstract function getError();

     public abstract function query($q);

sistema/librerias/ORMbasico/MySqlProvider.php

Spacing +13 added lines, -13 removed lines

@@ -4,49 +4,49 @@
  

 class MySqlProvider extends DatabaseProvider

 {

-    public function connect($host, $user, $pass, $dbname){

+    public function connect($host, $user, $pass, $dbname) {

         $this->resource = new mysqli($host, $user, $pass, $dbname);

  

-        if ($this->resource->connect_errno){ // Connection fails

+        if ($this->resource->connect_errno) { // Connection fails

             error_log($this->resource->connect_error);

         }

  

         return $this->resource;

     }

-    public function disconnect(){

+    public function disconnect() {

         return $this->resource->close();

     }

-    public function getErrorNo(){

+    public function getErrorNo() {

         return $this->resource->errno;

     }

-    public function getError(){

+    public function getError() {

         return $this->resource->error;

     }

-    public function query($q){

+    public function query($q) {

         return $this->resource->query($q);

     }

-    public function numRows($resource){

+    public function numRows($resource) {

         $num_rows = 0;

  

-        if ($resource){

+        if ($resource) {

             $num_rows = $resource->num_rows;

         }

  

         return $num_rows;

     }

-    public function fetchArray($result){

+    public function fetchArray($result) {

         return $result->fetch_assoc();

     }

-    public function isConnected(){

+    public function isConnected() {

         return !is_null($this->resource);

     }

-    public function escape($var){

+    public function escape($var) {

         return $this->resource->real_escape_string($var);

     }

-    public function getInsertedID(){

+    public function getInsertedID() {

         return $this->resource->insert_id;

     }

-    public function changeDB ($database){

+    public function changeDB($database) {

         return $this->resource->select_db($database);

     }

     public function setCharset($charset) {

sistema/librerias/ORMbasico/ORM.php

Spacing +20 added lines, -20 removed lines

@@ -8,23 +8,23 @@ 
         self::getConnection();

     }

  

-    private static function getConnection (){

+    private static function getConnection() {

         require_once('Database.php');

         self::$database = Database::getConnection(DB_PROVIDER, DB_HOST, DB_USER, DB_PASSWORD, DB_DB);

     }

  

     public static function find($id) {

-        $results = self::where('id',$id);

+        $results = self::where('id', $id);

         return $results[0];

     }

      

     public static function where($field, $value) {  

         $obj = null;

         self::getConnection();

-        $query = "SELECT * FROM ".static::$table." WHERE ".$field." = ?";

-        $results = self::$database->execute($query,null,array($value));

+        $query = "SELECT * FROM " . static::$table . " WHERE " . $field . " = ?";

+        $results = self::$database->execute($query, null, array($value));

  

-        if ($results){

+        if ($results) {

             $class = get_called_class();

             for ($i = 0; $i < sizeof($results); $i++) {

                 $obj[] = new $class($results[$i]);

@@ -38,17 +38,17 @@ 
         $objs = null;

         self::getConnection();

  

-        $query = "SELECT * FROM ".static::$table;

+        $query = "SELECT * FROM " . static::$table;

  

-        if ($order){

+        if ($order) {

             $query .= $order;

         }

  

-        $results = self::$database->execute($query,null, null);

+        $results = self::$database->execute($query, null, null);

  

-        if ($results){

+        if ($results) {

             $class = get_called_class();

-            foreach ($results as $index => $obj){

+            foreach ($results as $index => $obj) {

                 $objs[] = new $class($obj);

             }

         }

@@ -56,33 +56,33 @@ 
         return $objs;

     }

  

-    public function save(){

+    public function save() {

         $values = get_object_vars($this);

         $filtered = null;

  

-        foreach ($values as $key => $value){

-            if ($value !== null && $value !== '' && strpos($key,'obj_') === false

-                && $key !== 'id'){

+        foreach ($values as $key => $value) {

+            if ($value !== null && $value !== '' && strpos($key, 'obj_') === false

+                && $key !== 'id') {

                 if ($value === false) { $value = 0; }

                 $filtered[$key] = $value;

             }

         }

         $columns = array_keys($filtered);

  

-        if ($this->id){

-            $columns = join (" = ?, ", $columns);

+        if ($this->id) {

+            $columns = join(" = ?, ", $columns);

             $columns .= ' = ?';

-            $query = "UPDATE ".static::$table." SET $columns WHERE id =".$this->id;

+            $query = "UPDATE " . static::$table . " SET $columns WHERE id =" . $this->id;

         }

         else {

             $params = join(", ", array_fill(0, count($columns), "?"));

             $columns = join(", ", $columns);

-            $query = "INSERT INTO ".static::$table." ($columns) VALUES ($params)";

+            $query = "INSERT INTO " . static::$table . " ($columns) VALUES ($params)";

         }

  

-        $result = self::$database->execute($query,null,$filtered);

+        $result = self::$database->execute($query, null, $filtered);

  

-        if ($result){

+        if ($result) {

             $result = array('error' => false, 'message' => self::$database->getInsertedID());

         }

         else {