Inspection of "getId() redundante" - prinick96/Ocrend-Framework - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Branch — beta (48f425)

by Brayan

created 2017-09-14 01:37 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -3,8 +3,8 @@
 block discarded – undo
 spl_autoload_register('__ocrend_autoload');
 
 function __ocrend_autoload(string $class) {
-    $class = API_INTERFACE . str_replace('\\','/',$class);
-    if(is_readable($class . '.php')) {
+    $class = API_INTERFACE . str_replace('\\', '/', $class);
+    if (is_readable($class . '.php')) {
         require_once $class . '.php';
     }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Ocrend/Kernel/Config/Start.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -46,7 +46,7 @@  discard block
 block discarded – undo
 /**
   * Lectura y escritura de caché para Twig
 */
-if(!is_writable(API_INTERFACE . 'app/templates/.cache/') || !is_readable(API_INTERFACE . 'app/templates/.cache/')) {
+if (!is_writable(API_INTERFACE . 'app/templates/.cache/') || !is_readable(API_INTERFACE . 'app/templates/.cache/')) {
   throw new \RuntimeException('Debe conceder permisos de escritura y lectura a la ruta ' . API_INTERFACE . 'app/templates/.cache/ ó crearla si no existe.');
 }
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
 /**
   * Estatus del DEBUG
 */
-if($config['framework']['debug']) {
+if ($config['framework']['debug']) {
   Debug::enable();
 }
 

Please login to merge, or discard this patch.

Ocrend/Kernel/Controllers/Controllers.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -114,7 +114,7 @@  discard block
 block discarded – undo
         $this->template->addGlobal('is_logged', $this->is_logged);
 
         # Datos del usuario actual
-        if($this->is_logged) {
+        if ($this->is_logged) {
           $this->user = (new Model\Users)->getOwnerUser();
           $this->template->addGlobal('owner_user', $this->user);
         }
@@ -145,17 +145,17 @@  discard block
 block discarded – undo
       $this->controllerConfig['users_not_logged'] = false;
 
       # Establecer las configuraciones pasadas
-      if(null != $config) {
+      if (null != $config) {
         # Configura el autoreload del caché de twig
-        if(array_key_exists('twig_cache_reload',$config)) {
+        if (array_key_exists('twig_cache_reload', $config)) {
           $this->controllerConfig['twig_cache_reload'] = (bool) $config['twig_cache_reload'];
         }
         # Configura el controlador para solo ser visto por usuarios logeados
-        if(array_key_exists('users_logged',$config)) {
+        if (array_key_exists('users_logged', $config)) {
           $this->controllerConfig['users_logged'] = (bool) $config['users_logged'];
         }
         # Configura el controlador para solo ser visto por usuario no logeados
-        if(array_key_exists('users_not_logged',$config)) {
+        if (array_key_exists('users_not_logged', $config)) {
           $this->controllerConfig['users_not_logged'] = (bool) $config['users_not_logged'];
         }
       }
@@ -168,12 +168,12 @@  discard block
 block discarded – undo
     */
     private function knowVisitorPermissions() {
       # Sólamente usuarios logeados
-      if($this->controllerConfig['users_logged'] && !$this->is_logged) {
+      if ($this->controllerConfig['users_logged'] && !$this->is_logged) {
         $this->functions->redir();
       }
 
       # Sólamente usuarios no logeados
-      if($this->controllerConfig['users_not_logged'] && $this->is_logged) {
+      if ($this->controllerConfig['users_not_logged'] && $this->is_logged) {
         $this->functions->redir();
       }
     }

Please login to merge, or discard this patch.

Ocrend/Kernel/Helpers/Emails.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -35,7 +35,7 @@  discard block
 block discarded – undo
     $mail->CharSet = "UTF-8";
     $mail->Encoding = "quoted-printable";
 
-    if($is_smtp) {
+    if ($is_smtp) {
       $mail->isSMTP();
       $mail->SMTPAuth = true;
       $mail->Host = $config['phpmailer']['host'];
@@ -88,13 +88,13 @@  discard block
 block discarded – undo
     $mail->Subject = $titulo;
     $mail->Body    = $HTML;
 
-    if(sizeof($adj)) {
+    if (sizeof($adj)) {
       foreach ($adj as $ruta) {
         $mail->AddAttachment($ruta);
       }
     }
 
-    if(!$mail->send()) {
+    if (!$mail->send()) {
       return $mail->ErrorInfo;
     }
 
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
     </head>
     <body style="font-family: Verdana;">
       <section>
-        '.$content.'
+        '.$content . '
       </section>
     </body>
     </html>';

Please login to merge, or discard this patch.

Ocrend/Kernel/Models/Traits/DBModel.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -55,16 +55,16 @@
 block discarded – undo
         $this->databaseConfig['new_instance'] = false;
 
         # Añadir según lo pasado por $databaseConfig
-        if(is_array($databaseConfig)) {
-            if(array_key_exists('name',$databaseConfig)) {
-               $this->databaseConfig['name'] =  $databaseConfig['name'];
+        if (is_array($databaseConfig)) {
+            if (array_key_exists('name', $databaseConfig)) {
+               $this->databaseConfig['name'] = $databaseConfig['name'];
             } 
 
-            if(array_key_exists('motor',$databaseConfig)) {
-                $this->databaseConfig['motor'] =  $databaseConfig['motor'];
+            if (array_key_exists('motor', $databaseConfig)) {
+                $this->databaseConfig['motor'] = $databaseConfig['motor'];
             } 
 
-            if(array_key_exists('new_instance',$databaseConfig)) {
+            if (array_key_exists('new_instance', $databaseConfig)) {
                 $this->databaseConfig['new_instance'] = (bool) $databaseConfig['new_instance'];
             }
         }

Please login to merge, or discard this patch.

app/models/Users.php 1 patch

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

@@ -73,7 +73,7 @@  discard block
 block discarded – undo
       * @throws ModelsException cuando las contraseñas no coinciden
     */
     private function checkPassMatch(string $pass, string $pass_repeat) {
-        if($pass != $pass_repeat) {
+        if ($pass != $pass_repeat) {
             throw new ModelsException('Las contraseñas no coinciden.');
         }
     }
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
     */
     private function checkEmail(string $email) {
         # Formato de email
-        if(!Strings::is_email($email)) {
+        if (!Strings::is_email($email)) {
             throw new ModelsException('El email no tiene un formato válido.');
         }
         # Existencia de email
         $email = $this->db->scape($email);
-        $query = $this->db->select('id_user','users',"email='$email'",'LIMIT 1');
-        if(false !== $query) {
+        $query = $this->db->select('id_user', 'users', "email='$email'", 'LIMIT 1');
+        if (false !== $query) {
             throw new ModelsException('El email introducido ya existe.');
         }
     }
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
       * @return void
     */
     private function restoreAttempts(string $email) {       
-        if(array_key_exists($email,$this->recentAttempts)) {
+        if (array_key_exists($email, $this->recentAttempts)) {
             $this->recentAttempts[$email]['attempts'] = 0;
             $this->recentAttempts[$email]['time'] = null;
             $this->updateSessionAttempts();
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
     private function generateSession(array $user_data) {
         global $session, $config;
 
-        $session->set('user_id',(int) $user_data['id_user']);
+        $session->set('user_id', (int) $user_data['id_user']);
         $session->set('unique_session', $config['sessions']['unique']);
     }
 
@@ -140,12 +140,12 @@  discard block
 block discarded – undo
       * @return bool true: Cuando el inicio de sesión es correcto 
       *              false: Cuando el inicio de sesión no es correcto
     */
-    private function authentication(string $email,string $pass) : bool {
+    private function authentication(string $email, string $pass) : bool {
         $email = $this->db->scape($email);
-        $query = $this->db->select('id_user,pass','users',"email='$email'",'LIMIT 1');
+        $query = $this->db->select('id_user,pass', 'users', "email='$email'", 'LIMIT 1');
         
         # Incio de sesión con éxito
-        if(false !== $query && Strings::chash($query[0]['pass'],$pass)) {
+        if (false !== $query && Strings::chash($query[0]['pass'], $pass)) {
 
             # Restaurar intentos
             $this->restoreAttempts($email);
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
     private function setDefaultAttempts() {
         global $session;
 
-        if(null != $session->get('login_user_recentAttempts')) {
+        if (null != $session->get('login_user_recentAttempts')) {
             $this->recentAttempts = $session->get('login_user_recentAttempts');
         }
     }
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
       * @return void
     */
     private function setNewAttempt(string $email) {
-        if(!array_key_exists($email,$this->recentAttempts)) {
+        if (!array_key_exists($email, $this->recentAttempts)) {
             $this->recentAttempts[$email] = array(
                 'attempts' => 0, # Intentos
                 'time' => null # Tiempo 
@@ -200,14 +200,14 @@  discard block
 block discarded – undo
       * @return void
     */
     private function maximumAttempts(string $email) {
-        if($this->recentAttempts[$email]['attempts'] >= self::MAX_ATTEMPTS) {
+        if ($this->recentAttempts[$email]['attempts'] >= self::MAX_ATTEMPTS) {
             
             # Colocar timestamp para recuperar más adelante la posibilidad de acceso
-            if(null == $this->recentAttempts[$email]['time']) {
+            if (null == $this->recentAttempts[$email]['time']) {
                 $this->recentAttempts[$email]['time'] = time() + self::MAX_ATTEMPTS_TIME;
             }
             
-            if(time() < $this->recentAttempts[$email]['time']) {
+            if (time() < $this->recentAttempts[$email]['time']) {
                 # Setear sesión
                 $this->updateSessionAttempts();
                 # Lanzar excepción
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
             $pass = $http->request->get('pass');
 
             # Verificar que no están vacíos
-            if($this->functions->e($email,$pass)) {
+            if ($this->functions->e($email, $pass)) {
                 throw new ModelsException('Credenciales incompletas.');
             }
             
@@ -246,13 +246,13 @@  discard block
 block discarded – undo
             $this->maximumAttempts($email);
 
             # Autentificar
-            if($this->authentication($email,$pass)) {
+            if ($this->authentication($email, $pass)) {
                 return array('success' => 1, 'message' => 'Conectado con éxito.');
             }
             
             throw new ModelsException('Credenciales incorrectas.');
 
-        } catch(ModelsException $e) {
+        } catch (ModelsException $e) {
             return array('success' => 0, 'message' => $e->getMessage());
         }        
     }
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
             $pass_repeat = $http->request->get('pass_repeat');
 
             # Verificar que no están vacíos
-            if($this->functions->e($name,$email,$pass,$pass_repeat)) {
+            if ($this->functions->e($name, $email, $pass, $pass_repeat)) {
                 throw new ModelsException('Todos los datos son necesarios');
             }
 
@@ -281,10 +281,10 @@  discard block
 block discarded – undo
             $this->checkEmail($email);
 
             # Veriricar contraseñas
-            $this->checkPassMatch($pass,$pass_repeat);
+            $this->checkPassMatch($pass, $pass_repeat);
 
             # Registrar al usuario
-            $this->db->insert('users',array(
+            $this->db->insert('users', array(
                 'name' => $name,
                 'email' => $email,
                 'pass' => Strings::hash($pass)
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
             ));
 
             return array('success' => 1, 'message' => 'Registrado con éxito.');
-        } catch(ModelsException $e) {
+        } catch (ModelsException $e) {
             return array('success' => 0, 'message' => $e->getMessage());
         }        
     }
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
             $email = $http->request->get('email');
             
             # Campo lleno
-            if($this->functions->emp($email)) {
+            if ($this->functions->emp($email)) {
                 throw new ModelsException('El campo email debe estar lleno.');
             }
 
@@ -323,10 +323,10 @@  discard block
 block discarded – undo
             $email = $this->db->scape($email);
 
             # Obtener información del usuario 
-            $user_data = $this->db->select('id_user,name','users',"email='$email'",'LIMIT 1');
+            $user_data = $this->db->select('id_user,name', 'users', "email='$email'", 'LIMIT 1');
 
             # Verificar correo en base de datos 
-            if(false === $user_data) {
+            if (false === $user_data) {
                 throw new ModelsException('El email no está registrado en el sistema.');
             }
 
@@ -335,30 +335,30 @@  discard block
 block discarded – undo
             $pass = uniqid();
 
             # Construir mensaje y enviar mensaje
-            $HTML = 'Hola <b>'. $user_data[0]['name'] .'</b>, ha solicitado recuperar su contraseña perdida, si no ha realizado esta acción no necesita hacer nada.
+            $HTML = 'Hola <b>' . $user_data[0]['name'] . '</b>, ha solicitado recuperar su contraseña perdida, si no ha realizado esta acción no necesita hacer nada.
 					<br />
 					<br />
-					Para cambiar su contraseña por <b>'. $pass .'</b> haga <a href="'. $config['site']['url'] . 'lostpass/cambiar/&token='.$token.'&user='.$user_data[0]['id_user'].'" target="_blank">clic aquí</a>.';
+					Para cambiar su contraseña por <b>'. $pass . '</b> haga <a href="' . $config['site']['url'] . 'lostpass/cambiar/&token=' . $token . '&user=' . $user_data[0]['id_user'] . '" target="_blank">clic aquí</a>.';
 
             # Enviar el correo electrónico
             $dest = array();
 			$dest[$email] = $user_data[0]['name'];
-			$email = Emails::send_mail($dest,Emails::plantilla($HTML),'Recuperar contraseña perdida');
+			$email = Emails::send_mail($dest, Emails::plantilla($HTML), 'Recuperar contraseña perdida');
 
             # Verificar si hubo algún problema con el envío del correo
-            if(false === $email) {
+            if (false === $email) {
                 throw new ModelsException('No se ha podido enviar el correo electrónico.');
             }
 
             # Actualizar datos 
             $id_user = $user_data[0]['id_user'];
-            $this->db->update('users',array(
+            $this->db->update('users', array(
                 'tmp_pass' => Strings::hash($pass),
                 'token' => $token
-            ),"id_user='$id_user'",'LIMIT 1');
+            ), "id_user='$id_user'", 'LIMIT 1');
 
             return array('success' => 1, 'message' => 'Se ha enviado un enlace a su correo electrónico.');
-        } catch(ModelsException $e) {
+        } catch (ModelsException $e) {
             return array('success' => 0, 'message' => $e->getMessage());
         }
     }
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
         $id_user = $http->query->get('user');
         $token = $http->query->get('token');
 
-        if(!$this->functions->emp($token) && is_numeric($id_user) && $id_user >= 1) {
+        if (!$this->functions->emp($token) && is_numeric($id_user) && $id_user >= 1) {
             # Filtros a los datos
             $id_user = $this->db->scape($id_user);
             $token = $this->db->scape($token);
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
     public function logout() {
         global $session;
 
-        if(null != $session->get('user_id')) {
+        if (null != $session->get('user_id')) {
             $session->remove('user_id');
         }
 
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
       * @return false|array con información del usuario
     */   
     public function getUserById(int $id, string $select = '*') {
-       return $this->db->select($select,'users',"id_user='$id'",'LIMIT 1');
+       return $this->db->select($select, 'users', "id_user='$id'", 'LIMIT 1');
     }
     
     /**
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
       * @return false|array con información de los usuarios
     */  
     public function getUsers(string $select = '*') {
-       return $this->db->select($select,'users');
+       return $this->db->select($select, 'users');
     }
 
     /**
@@ -440,12 +440,12 @@  discard block
 block discarded – undo
       * @return array con datos del usuario conectado
     */
     public function getOwnerUser(string $select = '*') : array {
-        if(null !== $this->id_user) {    
+        if (null !== $this->id_user) {    
                
-            $user = $this->db->select($select,'users',"id_user='$this->id_user'",'LIMIT 1');
+            $user = $this->db->select($select, 'users', "id_user='$this->id_user'", 'LIMIT 1');
 
             # Si se borra al usuario desde la base de datos y sigue con la sesión activa
-            if(false === $user) {
+            if (false === $user) {
                 $this->logout();
             }
 
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
       * @throws \RuntimeException si no se puede realizar la query
     */
     public function install() {
-        if(!$this->db->query("
+        if (!$this->db->query("
             CREATE TABLE IF NOT EXISTS `users` (
                 `id_user` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
                 `name` varchar(100) NOT NULL,

Please login to merge, or discard this patch.

Ocrend/Kernel/Database/Database.php 1 patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -39,7 +39,7 @@  discard block
 block discarded – undo
   final public static function Start($name = null, $motor = null, bool $new_instance = false) : Database {
     global $config;
 
-    if(!self::$inst instanceof self or $new_instance) {
+    if (!self::$inst instanceof self or $new_instance) {
       self::$inst = new self(
           null === $name ? $config['database']['name'] : $name,
           null === $motor ? $config['database']['motor'] : $motor
@@ -72,63 +72,63 @@  discard block
 block discarded – undo
     try {
       switch ($motor) {
         case 'sqlite':
-          parent::__construct('sqlite:'.$name);
+          parent::__construct('sqlite:' . $name);
         break;
         case 'cubrid':
-          parent::__construct('cubrid:host='.$config['database']['host'].';dbname='.$name.';port='.$config['database']['port'],
+          parent::__construct('cubrid:host=' . $config['database']['host'] . ';dbname=' . $name . ';port=' . $config['database']['port'],
           $config['database']['user'],
           $config['database']['pass'],
           $comun_config);
         break;
         case 'firebird':
-          parent::__construct('firebird:dbname='.$config['database']['host'].':'.$name,
+          parent::__construct('firebird:dbname=' . $config['database']['host'] . ':' . $name,
           $config['database']['user'],
           $config['database']['pass'],
           $comun_config);
         break;
         case 'odbc';
-          parent::__construct('odbc:'.$name,
+          parent::__construct('odbc:' . $name,
           $config['database']['user'],
           $config['database']['pass']);
         break;
         case 'oracle':
           parent::__construct('oci:dbname=(DESCRIPTION =
             (ADDRESS_LIST =
-              (ADDRESS = (PROTOCOL = '.$config['database']['protocol'].')(HOST = '.$motor.')(PORT = '.$config['database']['port'].'))
+              (ADDRESS = (PROTOCOL = '.$config['database']['protocol'] . ')(HOST = ' . $motor . ')(PORT = ' . $config['database']['port'] . '))
             )
             (CONNECT_DATA =
-              (SERVICE_NAME = '.$name.')
+              (SERVICE_NAME = '.$name . ')
             )
           );charset=utf8',
           $config['database']['user'],
           $config['database']['pass'],
-          array_merge(array(\PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC),$comun_config));
+          array_merge(array(\PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC), $comun_config));
         break;
         case 'postgresql':
-          parent::__construct('pgsql:host='.$config['database']['host'].';dbname='.$name.';charset=utf8',
+          parent::__construct('pgsql:host=' . $config['database']['host'] . ';dbname=' . $name . ';charset=utf8',
           $config['database']['user'],
           $config['database']['pass'],
           $comun_config);
         break;
         case 'mysql':
-          parent::__construct('mysql:host='.$config['database']['host'].';dbname='.$name,
+          parent::__construct('mysql:host=' . $config['database']['host'] . ';dbname=' . $name,
           $config['database']['user'],
           $config['database']['pass'],
-          array_merge(array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'),$comun_config));
+          array_merge(array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'), $comun_config));
         break;
         case 'mssql':
           # Añadido por marc2684
           # DOC: https://github.com/prinick96/Ocrend-Framework/issues/7
-          parent::__construct('sqlsrv:Server='.$config['database']['host'].';Database='.$name.';ConnectionPooling=0',
+          parent::__construct('sqlsrv:Server=' . $config['database']['host'] . ';Database=' . $name . ';ConnectionPooling=0',
           $config['database']['user'],
           $config['database']['pass'],
           $comun_config);
         break;
         default:
-          throw new \RuntimeException('Motor '. $motor .' de conexión no identificado.');
+          throw new \RuntimeException('Motor ' . $motor . ' de conexión no identificado.');
         break;
       }
-    } catch(\PDOException $e) {
+    } catch (\PDOException $e) {
       throw new \RuntimeException('Problema al conectar con la base de datos: ' . $e->getMessage());
     } 
   }
@@ -163,18 +163,18 @@  discard block
 block discarded – undo
     * @return mixed elemento sano
   */
   final public function scape($e) {
-    if(null === $e) {
+    if (null === $e) {
       return '';
     }
 
-    if(is_numeric($e) and $e <= 2147483647) {
-      if(explode('.',$e)[0] != $e) {
+    if (is_numeric($e) and $e <= 2147483647) {
+      if (explode('.', $e)[0] != $e) {
         return (float) $e;
       }
       return (int) $e;
     }
 
-    return (string) trim(str_replace(['\\',"\x00",'\n','\r',"'",'"',"\x1a"],['\\\\','\\0','\\n','\\r',"\'",'\"','\\Z'],$e));
+    return (string) trim(str_replace(['\\', "\x00", '\n', '\r', "'", '"', "\x1a"], ['\\\\', '\\0', '\\n', '\\r', "\'", '\"', '\\Z'], $e));
   }
 
   /**
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
   */
   final public function insert(string $table, array $e) : \PDOStatement {
       if (sizeof($e) == 0) {
-          throw new \RuntimeException('El arreglo pasado por $this->db->insert(\''.$table.'\',...) está vacío.');
+          throw new \RuntimeException('El arreglo pasado por $this->db->insert(\'' . $table . '\',...) está vacío.');
       }
 
       $query = "INSERT INTO $table (";
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
   */
   final public function update(string $table, array $e, string $where, string $limit = '') : \PDOStatement {
       if (sizeof($e) == 0) {
-          throw new \RuntimeException('El arreglo pasado por $this->db->update(\''.$table.'\'...) está vacío.');
+          throw new \RuntimeException('El arreglo pasado por $this->db->update(\'' . $table . '\'...) está vacío.');
       }
 
       $query = "UPDATE $table SET ";
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
     $result = $sql->fetchAll();
     $sql->closeCursor();
 
-    if(sizeof($result) > 0) {
+    if (sizeof($result) > 0) {
       return $result;
     }
 

Please login to merge, or discard this patch.

Ocrend/Kernel/Helpers/Files.php 1 patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -48,7 +48,7 @@  discard block
 block discarded – undo
     * @return int catidad de bytes escritos en el archivo
   */
   final public static function write_file(string $dir, string $content) : int {
-    $f = new \SplFileObject($dir,'w');
+    $f = new \SplFileObject($dir, 'w');
     return (int) $f->fwrite($content);
   }
 
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
     * @return bool true si borró el fichero, false si no (porque no existía)
   */
   final public static function delete_file(string $route) : bool {
-    if(file_exists($route)) {
+    if (file_exists($route)) {
       unlink($route);
 
       return true;
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
     * @return bool true si es una imagen, false si no lo es
   */
   final public static function is_image(string $file_name) : bool {
-    return (bool) in_array(self::get_file_ext($file_name),['jpg','png','jpeg','gif','JPG','PNG','JPEG','GIF']);
+    return (bool) in_array(self::get_file_ext($file_name), ['jpg', 'png', 'jpeg', 'gif', 'JPG', 'PNG', 'JPEG', 'GIF']);
   }
 
   //------------------------------------------------
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
   */
   final public static function get_files_in_dir(string $dir, string $types = '') : array {
     $array = array();
-    if(is_dir($dir)) {
+    if (is_dir($dir)) {
       foreach (glob($dir . '*' . $types) as $file) {
         $array[] = $file;
       }
@@ -154,11 +154,11 @@  discard block
 block discarded – undo
     * @return bool con true si fue creado con éxito, false si el directorio ya existía o hubo algún error
   */
   final public static function create_dir(string $dir, int $permisos = 0755) : bool {
-    if(is_dir($dir)) {
+    if (is_dir($dir)) {
       return false;
     }
     
-    return (bool) mkdir($dir,$permisos,true);
+    return (bool) mkdir($dir, $permisos, true);
   }
 
   //------------------------------------------------
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
   final public static function rm_dir(string $dir) {
 
     # Evitar una desgracia
-    if(in_array($dir,[
+    if (in_array($dir, [
       'Ocrend/',
       'Ocrend/Kernel/',
       'Ocrend/vendor/',
@@ -188,10 +188,10 @@  discard block
 block discarded – undo
       throw new \RuntimeException('No puede eliminar la ruta ' . $dir . ' ya que es crítica.');
     }
 
-    foreach(glob($dir . "/*") as $archivos_carpeta)   { 
-        if (is_dir($archivos_carpeta))   {
+    foreach (glob($dir . "/*") as $archivos_carpeta) { 
+        if (is_dir($archivos_carpeta)) {
             self::rm_dir($archivos_carpeta);
-        } else  {
+        } else {
             unlink($archivos_carpeta);
         }
     }
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
     * @return int cantidad de  imágenes
   */
   final public static function images_in_dir(string $dir) : int {
-    return sizeof(glob($dir . '{*.jpg,*.gif,*.png,*.gif,*.jpeg,*.JPG,*.GIF,*.PNG,*.JPEG}',GLOB_BRACE));
+    return sizeof(glob($dir . '{*.jpg,*.gif,*.png,*.gif,*.jpeg,*.JPG,*.GIF,*.PNG,*.JPEG}', GLOB_BRACE));
   }
 
   //------------------------------------------------
@@ -230,16 +230,16 @@  discard block
 block discarded – undo
 
     self::create_dir($new_dir);
 
-    foreach(glob($old_dir . ($only_images ? '{*.jpg,*.gif,*.png,*.gif,*.jpeg,*.JPG,*.GIF,*.PNG,*.JPEG}' : '*'),GLOB_BRACE) as $file) {
-      if(file_exists($file)) {
+    foreach (glob($old_dir . ($only_images ? '{*.jpg,*.gif,*.png,*.gif,*.jpeg,*.JPG,*.GIF,*.PNG,*.JPEG}' : '*'), GLOB_BRACE) as $file) {
+      if (file_exists($file)) {
           unlink($file);
       }
       
-      $name = explode('/',$file);
+      $name = explode('/', $file);
       $name = end($file);
-      copy($file,$new_dir . $name);
+      copy($file, $new_dir . $name);
 
-      if($delete_old) {
+      if ($delete_old) {
         unlink($file);
       }
     }

Please login to merge, or discard this patch.

Ocrend/Kernel/Helpers/Arrays.php 1 patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -43,32 +43,32 @@  discard block
 block discarded – undo
   */
   final public static function arrays_sum(array $a, array $b) : array {
     # Si alguno está vacío
-    if(sizeof($a) == 0) {
+    if (sizeof($a) == 0) {
       return $b;
-    } else if(sizeof($b) == 0) {
+    } else if (sizeof($b) == 0) {
       return $a;
     }
 
     # Recorrer el segundo arreglo
-    foreach($b as $llave => $contenido) {
+    foreach ($b as $llave => $contenido) {
 
       # Desnivel
-      if(is_array($contenido)) {
-        throw new \RuntimeException('El arreglo $b en la llave '.$llave.' es un arreglo y no puede operar.');
+      if (is_array($contenido)) {
+        throw new \RuntimeException('El arreglo $b en la llave ' . $llave . ' es un arreglo y no puede operar.');
         break;
       }
 
       # Existencia de la llave
-      if(array_key_exists($llave,$a)) {
+      if (array_key_exists($llave, $a)) {
         # Excepciones de uso
-        if(is_array($a[$llave])) {
-          throw new \RuntimeException('El arreglo $a en la llave '.$llave.' es un arreglo y no puede operar.');
+        if (is_array($a[$llave])) {
+          throw new \RuntimeException('El arreglo $a en la llave ' . $llave . ' es un arreglo y no puede operar.');
           break;
-        } else if(!is_numeric($a[$llave]) && null !== $a[$llave]) {
-          throw new \RuntimeException('El arreglo $a en la llave '.$llave.' no es un número y no puede operar.');
+        } else if (!is_numeric($a[$llave]) && null !== $a[$llave]) {
+          throw new \RuntimeException('El arreglo $a en la llave ' . $llave . ' no es un número y no puede operar.');
           break;
-        } else if(!is_numeric($b[$llave]) && null !== $b[$llave]) {
-          throw new \RuntimeException('El arreglo $b en la llave '.$llave.' no es un número y no puede operar.');
+        } else if (!is_numeric($b[$llave]) && null !== $b[$llave]) {
+          throw new \RuntimeException('El arreglo $b en la llave ' . $llave . ' no es un número y no puede operar.');
           break;
         }
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
   final public static function get_key_by_index(string $index, array $a) : int {
     $i = 0;
     foreach ($a as $key => $val) {
-      if($key == $index) {
+      if ($key == $index) {
         return (int) $i;
       }
       $i++;
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
     * @return bool false si no lo es, true si lo es
   */
   final public static function is_assoc(array $a) : bool {
-    if(sizeof($a) === 0) {
+    if (sizeof($a) === 0) {
       return false;
     }
 

Please login to merge, or discard this patch.

		@@ -114,7 +114,7 @@ discard block
		block discarded – undo
114	114	$this->template->addGlobal('is_logged', $this->is_logged);
115	115
116	116	# Datos del usuario actual
117		- if($this->is_logged) {
	117	+ if ($this->is_logged) {
118	118	$this->user = (new Model\Users)->getOwnerUser();
119	119	$this->template->addGlobal('owner_user', $this->user);
120	120	}
		@@ -145,17 +145,17 @@ discard block
		block discarded – undo
145	145	$this->controllerConfig['users_not_logged'] = false;
146	146
147	147	# Establecer las configuraciones pasadas
148		- if(null != $config) {
	148	+ if (null != $config) {
149	149	# Configura el autoreload del caché de twig
150		- if(array_key_exists('twig_cache_reload',$config)) {
	150	+ if (array_key_exists('twig_cache_reload', $config)) {
151	151	$this->controllerConfig['twig_cache_reload'] = (bool) $config['twig_cache_reload'];
152	152	}
153	153	# Configura el controlador para solo ser visto por usuarios logeados
154		- if(array_key_exists('users_logged',$config)) {
	154	+ if (array_key_exists('users_logged', $config)) {
155	155	$this->controllerConfig['users_logged'] = (bool) $config['users_logged'];
156	156	}
157	157	# Configura el controlador para solo ser visto por usuario no logeados
158		- if(array_key_exists('users_not_logged',$config)) {
	158	+ if (array_key_exists('users_not_logged', $config)) {
159	159	$this->controllerConfig['users_not_logged'] = (bool) $config['users_not_logged'];
160	160	}
161	161	}
		@@ -168,12 +168,12 @@ discard block
		block discarded – undo
168	168	*/
169	169	private function knowVisitorPermissions() {
170	170	# Sólamente usuarios logeados
171		- if($this->controllerConfig['users_logged'] && !$this->is_logged) {
	171	+ if ($this->controllerConfig['users_logged'] && !$this->is_logged) {
172	172	$this->functions->redir();
173	173	}
174	174
175	175	# Sólamente usuarios no logeados
176		- if($this->controllerConfig['users_not_logged'] && $this->is_logged) {
	176	+ if ($this->controllerConfig['users_not_logged'] && $this->is_logged) {
177	177	$this->functions->redir();
178	178	}
179	179	}

		@@ -3,8 +3,8 @@
		block discarded – undo
3	3	spl_autoload_register('__ocrend_autoload');
4	4
5	5	function __ocrend_autoload(string $class) {
6		- $class = API_INTERFACE . str_replace('\\','/',$class);
7		- if(is_readable($class . '.php')) {
	6	+ $class = API_INTERFACE . str_replace('\\', '/', $class);
	7	+ if (is_readable($class . '.php')) {
8	8	require_once $class . '.php';
9	9	}
10	10	}
11	11	\ No newline at end of file

		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	/**
47	47	* Lectura y escritura de caché para Twig
48	48	*/
49		-if(!is_writable(API_INTERFACE . 'app/templates/.cache/') \|\| !is_readable(API_INTERFACE . 'app/templates/.cache/')) {
	49	+if (!is_writable(API_INTERFACE . 'app/templates/.cache/') \|\| !is_readable(API_INTERFACE . 'app/templates/.cache/')) {
50	50	throw new \RuntimeException('Debe conceder permisos de escritura y lectura a la ruta ' . API_INTERFACE . 'app/templates/.cache/ ó crearla si no existe.');
51	51	}
52	52
		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82	/**
83	83	* Estatus del DEBUG
84	84	*/
85		-if($config['framework']['debug']) {
	85	+if ($config['framework']['debug']) {
86	86	Debug::enable();
87	87	}
88	88

		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	$mail->CharSet = "UTF-8";
36	36	$mail->Encoding = "quoted-printable";
37	37
38		- if($is_smtp) {
	38	+ if ($is_smtp) {
39	39	$mail->isSMTP();
40	40	$mail->SMTPAuth = true;
41	41	$mail->Host = $config['phpmailer']['host'];
		@@ -88,13 +88,13 @@ discard block
		block discarded – undo
88	88	$mail->Subject = $titulo;
89	89	$mail->Body = $HTML;
90	90
91		- if(sizeof($adj)) {
	91	+ if (sizeof($adj)) {
92	92	foreach ($adj as $ruta) {
93	93	$mail->AddAttachment($ruta);
94	94	}
95	95	}
96	96
97		- if(!$mail->send()) {
	97	+ if (!$mail->send()) {
98	98	return $mail->ErrorInfo;
99	99	}
100	100
		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	</head>
119	119	<body style="font-family: Verdana;">
120	120	<section>
121		- '.$content.'
	121	+ '.$content . '
122	122	</section>
123	123	</body>
124	124	</html>';

		@@ -55,16 +55,16 @@
		block discarded – undo
55	55	$this->databaseConfig['new_instance'] = false;
56	56
57	57	# Añadir según lo pasado por $databaseConfig
58		- if(is_array($databaseConfig)) {
59		- if(array_key_exists('name',$databaseConfig)) {
60		- $this->databaseConfig['name'] = $databaseConfig['name'];
	58	+ if (is_array($databaseConfig)) {
	59	+ if (array_key_exists('name', $databaseConfig)) {
	60	+ $this->databaseConfig['name'] = $databaseConfig['name'];
61	61	}
62	62
63		- if(array_key_exists('motor',$databaseConfig)) {
64		- $this->databaseConfig['motor'] = $databaseConfig['motor'];
	63	+ if (array_key_exists('motor', $databaseConfig)) {
	64	+ $this->databaseConfig['motor'] = $databaseConfig['motor'];
65	65	}
66	66
67		- if(array_key_exists('new_instance',$databaseConfig)) {
	67	+ if (array_key_exists('new_instance', $databaseConfig)) {
68	68	$this->databaseConfig['new_instance'] = (bool) $databaseConfig['new_instance'];
69	69	}
70	70	}

		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	* @throws ModelsException cuando las contraseñas no coinciden
74	74	*/
75	75	private function checkPassMatch(string $pass, string $pass_repeat) {
76		- if($pass != $pass_repeat) {
	76	+ if ($pass != $pass_repeat) {
77	77	throw new ModelsException('Las contraseñas no coinciden.');
78	78	}
79	79	}
		@@ -87,13 +87,13 @@ discard block
		block discarded – undo
87	87	*/
88	88	private function checkEmail(string $email) {
89	89	# Formato de email
90		- if(!Strings::is_email($email)) {
	90	+ if (!Strings::is_email($email)) {
91	91	throw new ModelsException('El email no tiene un formato válido.');
92	92	}
93	93	# Existencia de email
94	94	$email = $this->db->scape($email);
95		- $query = $this->db->select('id_user','users',"email='$email'",'LIMIT 1');
96		- if(false !== $query) {
	95	+ $query = $this->db->select('id_user', 'users', "email='$email'", 'LIMIT 1');
	96	+ if (false !== $query) {
97	97	throw new ModelsException('El email introducido ya existe.');
98	98	}
99	99	}
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	* @return void
108	108	*/
109	109	private function restoreAttempts(string $email) {
110		- if(array_key_exists($email,$this->recentAttempts)) {
	110	+ if (array_key_exists($email, $this->recentAttempts)) {
111	111	$this->recentAttempts[$email]['attempts'] = 0;
112	112	$this->recentAttempts[$email]['time'] = null;
113	113	$this->updateSessionAttempts();
		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127	private function generateSession(array $user_data) {
128	128	global $session, $config;
129	129
130		- $session->set('user_id',(int) $user_data['id_user']);
	130	+ $session->set('user_id', (int) $user_data['id_user']);
131	131	$session->set('unique_session', $config['sessions']['unique']);
132	132	}
133	133
		@@ -140,12 +140,12 @@ discard block
		block discarded – undo
140	140	* @return bool true: Cuando el inicio de sesión es correcto
141	141	* false: Cuando el inicio de sesión no es correcto
142	142	*/
143		- private function authentication(string $email,string $pass) : bool {
	143	+ private function authentication(string $email, string $pass) : bool {
144	144	$email = $this->db->scape($email);
145		- $query = $this->db->select('id_user,pass','users',"email='$email'",'LIMIT 1');
	145	+ $query = $this->db->select('id_user,pass', 'users', "email='$email'", 'LIMIT 1');
146	146
147	147	# Incio de sesión con éxito
148		- if(false !== $query && Strings::chash($query[0]['pass'],$pass)) {
	148	+ if (false !== $query && Strings::chash($query[0]['pass'], $pass)) {
149	149
150	150	# Restaurar intentos
151	151	$this->restoreAttempts($email);
		@@ -166,7 +166,7 @@ discard block
		block discarded – undo
166	166	private function setDefaultAttempts() {
167	167	global $session;
168	168
169		- if(null != $session->get('login_user_recentAttempts')) {
	169	+ if (null != $session->get('login_user_recentAttempts')) {
170	170	$this->recentAttempts = $session->get('login_user_recentAttempts');
171	171	}
172	172	}
		@@ -179,7 +179,7 @@ discard block
		block discarded – undo
179	179	* @return void
180	180	*/
181	181	private function setNewAttempt(string $email) {
182		- if(!array_key_exists($email,$this->recentAttempts)) {
	182	+ if (!array_key_exists($email, $this->recentAttempts)) {
183	183	$this->recentAttempts[$email] = array(
184	184	'attempts' => 0, # Intentos
185	185	'time' => null # Tiempo
		@@ -200,14 +200,14 @@ discard block
		block discarded – undo
200	200	* @return void
201	201	*/
202	202	private function maximumAttempts(string $email) {
203		- if($this->recentAttempts[$email]['attempts'] >= self::MAX_ATTEMPTS) {
	203	+ if ($this->recentAttempts[$email]['attempts'] >= self::MAX_ATTEMPTS) {
204	204
205	205	# Colocar timestamp para recuperar más adelante la posibilidad de acceso
206		- if(null == $this->recentAttempts[$email]['time']) {
	206	+ if (null == $this->recentAttempts[$email]['time']) {
207	207	$this->recentAttempts[$email]['time'] = time() + self::MAX_ATTEMPTS_TIME;
208	208	}
209	209
210		- if(time() < $this->recentAttempts[$email]['time']) {
	210	+ if (time() < $this->recentAttempts[$email]['time']) {
211	211	# Setear sesión
212	212	$this->updateSessionAttempts();
213	213	# Lanzar excepción
		@@ -235,7 +235,7 @@ discard block
		block discarded – undo
235	235	$pass = $http->request->get('pass');
236	236
237	237	# Verificar que no están vacíos
238		- if($this->functions->e($email,$pass)) {
	238	+ if ($this->functions->e($email, $pass)) {
239	239	throw new ModelsException('Credenciales incompletas.');
240	240	}
241	241
		@@ -246,13 +246,13 @@ discard block
		block discarded – undo
246	246	$this->maximumAttempts($email);
247	247
248	248	# Autentificar
249		- if($this->authentication($email,$pass)) {
	249	+ if ($this->authentication($email, $pass)) {
250	250	return array('success' => 1, 'message' => 'Conectado con éxito.');
251	251	}
252	252
253	253	throw new ModelsException('Credenciales incorrectas.');
254	254
255		- } catch(ModelsException $e) {
	255	+ } catch (ModelsException $e) {
256	256	return array('success' => 0, 'message' => $e->getMessage());
257	257	}
258	258	}
		@@ -273,7 +273,7 @@ discard block
		block discarded – undo
273	273	$pass_repeat = $http->request->get('pass_repeat');
274	274
275	275	# Verificar que no están vacíos
276		- if($this->functions->e($name,$email,$pass,$pass_repeat)) {
	276	+ if ($this->functions->e($name, $email, $pass, $pass_repeat)) {
277	277	throw new ModelsException('Todos los datos son necesarios');
278	278	}
279	279
		@@ -281,10 +281,10 @@ discard block
		block discarded – undo
281	281	$this->checkEmail($email);
282	282
283	283	# Veriricar contraseñas
284		- $this->checkPassMatch($pass,$pass_repeat);
	284	+ $this->checkPassMatch($pass, $pass_repeat);
285	285
286	286	# Registrar al usuario
287		- $this->db->insert('users',array(
	287	+ $this->db->insert('users', array(
288	288	'name' => $name,
289	289	'email' => $email,
290	290	'pass' => Strings::hash($pass)
		@@ -296,7 +296,7 @@ discard block
		block discarded – undo
296	296	));
297	297
298	298	return array('success' => 1, 'message' => 'Registrado con éxito.');
299		- } catch(ModelsException $e) {
	299	+ } catch (ModelsException $e) {
300	300	return array('success' => 0, 'message' => $e->getMessage());
301	301	}
302	302	}
		@@ -315,7 +315,7 @@ discard block
		block discarded – undo
315	315	$email = $http->request->get('email');
316	316
317	317	# Campo lleno
318		- if($this->functions->emp($email)) {
	318	+ if ($this->functions->emp($email)) {
319	319	throw new ModelsException('El campo email debe estar lleno.');
320	320	}
321	321
		@@ -323,10 +323,10 @@ discard block
		block discarded – undo
323	323	$email = $this->db->scape($email);
324	324
325	325	# Obtener información del usuario
326		- $user_data = $this->db->select('id_user,name','users',"email='$email'",'LIMIT 1');
	326	+ $user_data = $this->db->select('id_user,name', 'users', "email='$email'", 'LIMIT 1');
327	327
328	328	# Verificar correo en base de datos
329		- if(false === $user_data) {
	329	+ if (false === $user_data) {
330	330	throw new ModelsException('El email no está registrado en el sistema.');
331	331	}
332	332
		@@ -335,30 +335,30 @@ discard block
		block discarded – undo
335	335	$pass = uniqid();
336	336
337	337	# Construir mensaje y enviar mensaje
338		- $HTML = 'Hola <b>'. $user_data[0]['name'] .'</b>, ha solicitado recuperar su contraseña perdida, si no ha realizado esta acción no necesita hacer nada.
	338	+ $HTML = 'Hola <b>' . $user_data[0]['name'] . '</b>, ha solicitado recuperar su contraseña perdida, si no ha realizado esta acción no necesita hacer nada.
339	339	<br />
340	340	<br />
341		- Para cambiar su contraseña por <b>'. $pass .'</b> haga <a href="'. $config['site']['url'] . 'lostpass/cambiar/&token='.$token.'&user='.$user_data[0]['id_user'].'" target="_blank">clic aquí</a>.';
	341	+ Para cambiar su contraseña por <b>'. $pass . '</b> haga <a href="' . $config['site']['url'] . 'lostpass/cambiar/&token=' . $token . '&user=' . $user_data[0]['id_user'] . '" target="_blank">clic aquí</a>.';
342	342
343	343	# Enviar el correo electrónico
344	344	$dest = array();
345	345	$dest[$email] = $user_data[0]['name'];
346		- $email = Emails::send_mail($dest,Emails::plantilla($HTML),'Recuperar contraseña perdida');
	346	+ $email = Emails::send_mail($dest, Emails::plantilla($HTML), 'Recuperar contraseña perdida');
347	347
348	348	# Verificar si hubo algún problema con el envío del correo
349		- if(false === $email) {
	349	+ if (false === $email) {
350	350	throw new ModelsException('No se ha podido enviar el correo electrónico.');
351	351	}
352	352
353	353	# Actualizar datos
354	354	$id_user = $user_data[0]['id_user'];
355		- $this->db->update('users',array(
	355	+ $this->db->update('users', array(
356	356	'tmp_pass' => Strings::hash($pass),
357	357	'token' => $token
358		- ),"id_user='$id_user'",'LIMIT 1');
	358	+ ), "id_user='$id_user'", 'LIMIT 1');
359	359
360	360	return array('success' => 1, 'message' => 'Se ha enviado un enlace a su correo electrónico.');
361		- } catch(ModelsException $e) {
	361	+ } catch (ModelsException $e) {
362	362	return array('success' => 0, 'message' => $e->getMessage());
363	363	}
364	364	}
		@@ -378,7 +378,7 @@ discard block
		block discarded – undo
378	378	$id_user = $http->query->get('user');
379	379	$token = $http->query->get('token');
380	380
381		- if(!$this->functions->emp($token) && is_numeric($id_user) && $id_user >= 1) {
	381	+ if (!$this->functions->emp($token) && is_numeric($id_user) && $id_user >= 1) {
382	382	# Filtros a los datos
383	383	$id_user = $this->db->scape($id_user);
384	384	$token = $this->db->scape($token);
		@@ -401,7 +401,7 @@ discard block
		block discarded – undo
401	401	public function logout() {
402	402	global $session;
403	403
404		- if(null != $session->get('user_id')) {
	404	+ if (null != $session->get('user_id')) {
405	405	$session->remove('user_id');
406	406	}
407	407
		@@ -417,7 +417,7 @@ discard block
		block discarded – undo
417	417	* @return false\|array con información del usuario
418	418	*/
419	419	public function getUserById(int $id, string $select = '*') {
420		- return $this->db->select($select,'users',"id_user='$id'",'LIMIT 1');
	420	+ return $this->db->select($select, 'users', "id_user='$id'", 'LIMIT 1');
421	421	}
422	422
423	423	/**
		@@ -428,7 +428,7 @@ discard block
		block discarded – undo
428	428	* @return false\|array con información de los usuarios
429	429	*/
430	430	public function getUsers(string $select = '*') {
431		- return $this->db->select($select,'users');
	431	+ return $this->db->select($select, 'users');
432	432	}
433	433
434	434	/**
		@@ -440,12 +440,12 @@ discard block
		block discarded – undo
440	440	* @return array con datos del usuario conectado
441	441	*/
442	442	public function getOwnerUser(string $select = '*') : array {
443		- if(null !== $this->id_user) {
	443	+ if (null !== $this->id_user) {
444	444
445		- $user = $this->db->select($select,'users',"id_user='$this->id_user'",'LIMIT 1');
	445	+ $user = $this->db->select($select, 'users', "id_user='$this->id_user'", 'LIMIT 1');
446	446
447	447	# Si se borra al usuario desde la base de datos y sigue con la sesión activa
448		- if(false === $user) {
	448	+ if (false === $user) {
449	449	$this->logout();
450	450	}
451	451
		@@ -461,7 +461,7 @@ discard block
		block discarded – undo
461	461	* @throws \RuntimeException si no se puede realizar la query
462	462	*/
463	463	public function install() {
464		- if(!$this->db->query("
	464	+ if (!$this->db->query("
465	465	CREATE TABLE IF NOT EXISTS `users` (
466	466	`id_user` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
467	467	`name` varchar(100) NOT NULL,

		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	final public static function Start($name = null, $motor = null, bool $new_instance = false) : Database {
40	40	global $config;
41	41
42		- if(!self::$inst instanceof self or $new_instance) {
	42	+ if (!self::$inst instanceof self or $new_instance) {
43	43	self::$inst = new self(
44	44	null === $name ? $config['database']['name'] : $name,
45	45	null === $motor ? $config['database']['motor'] : $motor
		@@ -72,63 +72,63 @@ discard block
		block discarded – undo
72	72	try {
73	73	switch ($motor) {
74	74	case 'sqlite':
75		- parent::__construct('sqlite:'.$name);
	75	+ parent::__construct('sqlite:' . $name);
76	76	break;
77	77	case 'cubrid':
78		- parent::__construct('cubrid:host='.$config['database']['host'].';dbname='.$name.';port='.$config['database']['port'],
	78	+ parent::__construct('cubrid:host=' . $config['database']['host'] . ';dbname=' . $name . ';port=' . $config['database']['port'],
79	79	$config['database']['user'],
80	80	$config['database']['pass'],
81	81	$comun_config);
82	82	break;
83	83	case 'firebird':
84		- parent::__construct('firebird:dbname='.$config['database']['host'].':'.$name,
	84	+ parent::__construct('firebird:dbname=' . $config['database']['host'] . ':' . $name,
85	85	$config['database']['user'],
86	86	$config['database']['pass'],
87	87	$comun_config);
88	88	break;
89	89	case 'odbc';
90		- parent::__construct('odbc:'.$name,
	90	+ parent::__construct('odbc:' . $name,
91	91	$config['database']['user'],
92	92	$config['database']['pass']);
93	93	break;
94	94	case 'oracle':
95	95	parent::__construct('oci:dbname=(DESCRIPTION =
96	96	(ADDRESS_LIST =
97		- (ADDRESS = (PROTOCOL = '.$config['database']['protocol'].')(HOST = '.$motor.')(PORT = '.$config['database']['port'].'))
	97	+ (ADDRESS = (PROTOCOL = '.$config['database']['protocol'] . ')(HOST = ' . $motor . ')(PORT = ' . $config['database']['port'] . '))
98	98	)
99	99	(CONNECT_DATA =
100		- (SERVICE_NAME = '.$name.')
	100	+ (SERVICE_NAME = '.$name . ')
101	101	)
102	102	);charset=utf8',
103	103	$config['database']['user'],
104	104	$config['database']['pass'],
105		- array_merge(array(\PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC),$comun_config));
	105	+ array_merge(array(\PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC), $comun_config));
106	106	break;
107	107	case 'postgresql':
108		- parent::__construct('pgsql:host='.$config['database']['host'].';dbname='.$name.';charset=utf8',
	108	+ parent::__construct('pgsql:host=' . $config['database']['host'] . ';dbname=' . $name . ';charset=utf8',
109	109	$config['database']['user'],
110	110	$config['database']['pass'],
111	111	$comun_config);
112	112	break;
113	113	case 'mysql':
114		- parent::__construct('mysql:host='.$config['database']['host'].';dbname='.$name,
	114	+ parent::__construct('mysql:host=' . $config['database']['host'] . ';dbname=' . $name,
115	115	$config['database']['user'],
116	116	$config['database']['pass'],
117		- array_merge(array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'),$comun_config));
	117	+ array_merge(array(\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'), $comun_config));
118	118	break;
119	119	case 'mssql':
120	120	# Añadido por marc2684
121	121	# DOC: https://github.com/prinick96/Ocrend-Framework/issues/7
122		- parent::__construct('sqlsrv:Server='.$config['database']['host'].';Database='.$name.';ConnectionPooling=0',
	122	+ parent::__construct('sqlsrv:Server=' . $config['database']['host'] . ';Database=' . $name . ';ConnectionPooling=0',
123	123	$config['database']['user'],
124	124	$config['database']['pass'],
125	125	$comun_config);
126	126	break;
127	127	default:
128		- throw new \RuntimeException('Motor '. $motor .' de conexión no identificado.');
	128	+ throw new \RuntimeException('Motor ' . $motor . ' de conexión no identificado.');
129	129	break;
130	130	}
131		- } catch(\PDOException $e) {
	131	+ } catch (\PDOException $e) {
132	132	throw new \RuntimeException('Problema al conectar con la base de datos: ' . $e->getMessage());
133	133	}
134	134	}
		@@ -163,18 +163,18 @@ discard block
		block discarded – undo
163	163	* @return mixed elemento sano
164	164	*/
165	165	final public function scape($e) {
166		- if(null === $e) {
	166	+ if (null === $e) {
167	167	return '';
168	168	}
169	169
170		- if(is_numeric($e) and $e <= 2147483647) {
171		- if(explode('.',$e)[0] != $e) {
	170	+ if (is_numeric($e) and $e <= 2147483647) {
	171	+ if (explode('.', $e)[0] != $e) {
172	172	return (float) $e;
173	173	}
174	174	return (int) $e;
175	175	}
176	176
177		- return (string) trim(str_replace(['\\',"\x00",'\n','\r',"'",'"',"\x1a"],['\\\\','\\0','\\n','\\r',"\'",'\"','\\Z'],$e));
	177	+ return (string) trim(str_replace(['\\', "\x00", '\n', '\r', "'", '"', "\x1a"], ['\\\\', '\\0', '\\n', '\\r', "\'", '\"', '\\Z'], $e));
178	178	}
179	179
180	180	/**
		@@ -202,7 +202,7 @@ discard block
		block discarded – undo
202	202	*/
203	203	final public function insert(string $table, array $e) : \PDOStatement {
204	204	if (sizeof($e) == 0) {
205		- throw new \RuntimeException('El arreglo pasado por $this->db->insert(\''.$table.'\',...) está vacío.');
	205	+ throw new \RuntimeException('El arreglo pasado por $this->db->insert(\'' . $table . '\',...) está vacío.');
206	206	}
207	207
208	208	$query = "INSERT INTO $table (";
		@@ -232,7 +232,7 @@ discard block
		block discarded – undo
232	232	*/
233	233	final public function update(string $table, array $e, string $where, string $limit = '') : \PDOStatement {
234	234	if (sizeof($e) == 0) {
235		- throw new \RuntimeException('El arreglo pasado por $this->db->update(\''.$table.'\'...) está vacío.');
	235	+ throw new \RuntimeException('El arreglo pasado por $this->db->update(\'' . $table . '\'...) está vacío.');
236	236	}
237	237
238	238	$query = "UPDATE $table SET ";
		@@ -269,7 +269,7 @@ discard block
		block discarded – undo
269	269	$result = $sql->fetchAll();
270	270	$sql->closeCursor();
271	271
272		- if(sizeof($result) > 0) {
	272	+ if (sizeof($result) > 0) {
273	273	return $result;
274	274	}
275	275

		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	* @return int catidad de bytes escritos en el archivo
49	49	*/
50	50	final public static function write_file(string $dir, string $content) : int {
51		- $f = new \SplFileObject($dir,'w');
	51	+ $f = new \SplFileObject($dir, 'w');
52	52	return (int) $f->fwrite($content);
53	53	}
54	54
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	* @return bool true si borró el fichero, false si no (porque no existía)
63	63	*/
64	64	final public static function delete_file(string $route) : bool {
65		- if(file_exists($route)) {
	65	+ if (file_exists($route)) {
66	66	unlink($route);
67	67
68	68	return true;
		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	* @return bool true si es una imagen, false si no lo es
95	95	*/
96	96	final public static function is_image(string $file_name) : bool {
97		- return (bool) in_array(self::get_file_ext($file_name),['jpg','png','jpeg','gif','JPG','PNG','JPEG','GIF']);
	97	+ return (bool) in_array(self::get_file_ext($file_name), ['jpg', 'png', 'jpeg', 'gif', 'JPG', 'PNG', 'JPEG', 'GIF']);
98	98	}
99	99
100	100	//------------------------------------------------
		@@ -135,7 +135,7 @@ discard block
		block discarded – undo
135	135	*/
136	136	final public static function get_files_in_dir(string $dir, string $types = '') : array {
137	137	$array = array();
138		- if(is_dir($dir)) {
	138	+ if (is_dir($dir)) {
139	139	foreach (glob($dir . '*' . $types) as $file) {
140	140	$array[] = $file;
141	141	}
		@@ -154,11 +154,11 @@ discard block
		block discarded – undo
154	154	* @return bool con true si fue creado con éxito, false si el directorio ya existía o hubo algún error
155	155	*/
156	156	final public static function create_dir(string $dir, int $permisos = 0755) : bool {
157		- if(is_dir($dir)) {
	157	+ if (is_dir($dir)) {
158	158	return false;
159	159	}
160	160
161		- return (bool) mkdir($dir,$permisos,true);
	161	+ return (bool) mkdir($dir, $permisos, true);
162	162	}
163	163
164	164	//------------------------------------------------
		@@ -175,7 +175,7 @@ discard block
		block discarded – undo
175	175	final public static function rm_dir(string $dir) {
176	176
177	177	# Evitar una desgracia
178		- if(in_array($dir,[
	178	+ if (in_array($dir, [
179	179	'Ocrend/',
180	180	'Ocrend/Kernel/',
181	181	'Ocrend/vendor/',
		@@ -188,10 +188,10 @@ discard block
		block discarded – undo
188	188	throw new \RuntimeException('No puede eliminar la ruta ' . $dir . ' ya que es crítica.');
189	189	}
190	190
191		- foreach(glob($dir . "/*") as $archivos_carpeta) {
192		- if (is_dir($archivos_carpeta)) {
	191	+ foreach (glob($dir . "/*") as $archivos_carpeta) {
	192	+ if (is_dir($archivos_carpeta)) {
193	193	self::rm_dir($archivos_carpeta);
194		- } else {
	194	+ } else {
195	195	unlink($archivos_carpeta);
196	196	}
197	197	}
		@@ -210,7 +210,7 @@ discard block
		block discarded – undo
210	210	* @return int cantidad de imágenes
211	211	*/
212	212	final public static function images_in_dir(string $dir) : int {
213		- return sizeof(glob($dir . '{.jpg,.gif,.png,.gif,.jpeg,.JPG,.GIF,.PNG,*.JPEG}',GLOB_BRACE));
	213	+ return sizeof(glob($dir . '{.jpg,.gif,.png,.gif,.jpeg,.JPG,.GIF,.PNG,*.JPEG}', GLOB_BRACE));
214	214	}
215	215
216	216	//------------------------------------------------
		@@ -230,16 +230,16 @@ discard block
		block discarded – undo
230	230
231	231	self::create_dir($new_dir);
232	232
233		- foreach(glob($old_dir . ($only_images ? '{.jpg,.gif,.png,.gif,.jpeg,.JPG,.GIF,.PNG,.JPEG}' : ''),GLOB_BRACE) as $file) {
234		- if(file_exists($file)) {
	233	+ foreach (glob($old_dir . ($only_images ? '{.jpg,.gif,.png,.gif,.jpeg,.JPG,.GIF,.PNG,.JPEG}' : ''), GLOB_BRACE) as $file) {
	234	+ if (file_exists($file)) {
235	235	unlink($file);
236	236	}
237	237
238		- $name = explode('/',$file);
	238	+ $name = explode('/', $file);
239	239	$name = end($file);
240		- copy($file,$new_dir . $name);
	240	+ copy($file, $new_dir . $name);
241	241
242		- if($delete_old) {
	242	+ if ($delete_old) {
243	243	unlink($file);
244	244	}
245	245	}

		@@ -43,32 +43,32 @@ discard block
		block discarded – undo
43	43	*/
44	44	final public static function arrays_sum(array $a, array $b) : array {
45	45	# Si alguno está vacío
46		- if(sizeof($a) == 0) {
	46	+ if (sizeof($a) == 0) {
47	47	return $b;
48		- } else if(sizeof($b) == 0) {
	48	+ } else if (sizeof($b) == 0) {
49	49	return $a;
50	50	}
51	51
52	52	# Recorrer el segundo arreglo
53		- foreach($b as $llave => $contenido) {
	53	+ foreach ($b as $llave => $contenido) {
54	54
55	55	# Desnivel
56		- if(is_array($contenido)) {
57		- throw new \RuntimeException('El arreglo $b en la llave '.$llave.' es un arreglo y no puede operar.');
	56	+ if (is_array($contenido)) {
	57	+ throw new \RuntimeException('El arreglo $b en la llave ' . $llave . ' es un arreglo y no puede operar.');
58	58	break;
59	59	}
60	60
61	61	# Existencia de la llave
62		- if(array_key_exists($llave,$a)) {
	62	+ if (array_key_exists($llave, $a)) {
63	63	# Excepciones de uso
64		- if(is_array($a[$llave])) {
65		- throw new \RuntimeException('El arreglo $a en la llave '.$llave.' es un arreglo y no puede operar.');
	64	+ if (is_array($a[$llave])) {
	65	+ throw new \RuntimeException('El arreglo $a en la llave ' . $llave . ' es un arreglo y no puede operar.');
66	66	break;
67		- } else if(!is_numeric($a[$llave]) && null !== $a[$llave]) {
68		- throw new \RuntimeException('El arreglo $a en la llave '.$llave.' no es un número y no puede operar.');
	67	+ } else if (!is_numeric($a[$llave]) && null !== $a[$llave]) {
	68	+ throw new \RuntimeException('El arreglo $a en la llave ' . $llave . ' no es un número y no puede operar.');
69	69	break;
70		- } else if(!is_numeric($b[$llave]) && null !== $b[$llave]) {
71		- throw new \RuntimeException('El arreglo $b en la llave '.$llave.' no es un número y no puede operar.');
	70	+ } else if (!is_numeric($b[$llave]) && null !== $b[$llave]) {
	71	+ throw new \RuntimeException('El arreglo $b en la llave ' . $llave . ' no es un número y no puede operar.');
72	72	break;
73	73	}
74	74
		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	final public static function get_key_by_index(string $index, array $a) : int {
95	95	$i = 0;
96	96	foreach ($a as $key => $val) {
97		- if($key == $index) {
	97	+ if ($key == $index) {
98	98	return (int) $i;
99	99	}
100	100	$i++;
		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127	* @return bool false si no lo es, true si lo es
128	128	*/
129	129	final public static function is_assoc(array $a) : bool {
130		- if(sizeof($a) === 0) {
	130	+ if (sizeof($a) === 0) {
131	131	return false;
132	132	}
133	133

prinick96 / Ocrend-Framework

Branch — beta (48f425)

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch