@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | array('"quoted"', array('quoted'), '->tokenize() parses quoted arguments'), |
| 66 | 66 | array("'quoted'", array('quoted'), '->tokenize() parses quoted arguments'), |
| 67 | 67 | array("'a\rb\nc\td'", array("a\rb\nc\td"), '->tokenize() parses whitespace chars in strings'), |
| 68 | - array("'a'\r'b'\n'c'\t'd'", array('a','b','c','d'), '->tokenize() parses whitespace chars between args as spaces'), |
|
| 68 | + array("'a'\r'b'\n'c'\t'd'", array('a', 'b', 'c', 'd'), '->tokenize() parses whitespace chars between args as spaces'), |
|
| 69 | 69 | array('\"quoted\"', array('"quoted"'), '->tokenize() parses escaped-quoted arguments'), |
| 70 | 70 | array("\'quoted\'", array('\'quoted\''), '->tokenize() parses escaped-quoted arguments'), |
| 71 | 71 | array('-a', array('-a'), '->tokenize() parses short options'), |
@@ -93,9 +93,9 @@ discard block |
||
| 93 | 93 | $this->assertEquals('-f foo', (string) $input); |
| 94 | 94 | |
| 95 | 95 | $input = new StringInput('-f --bar=foo "a b c d"'); |
| 96 | - $this->assertEquals('-f --bar=foo '.escapeshellarg('a b c d'), (string) $input); |
|
| 96 | + $this->assertEquals('-f --bar=foo ' . escapeshellarg('a b c d'), (string) $input); |
|
| 97 | 97 | |
| 98 | - $input = new StringInput('-f --bar=foo \'a b c d\' '."'A\nB\\'C'"); |
|
| 99 | - $this->assertEquals('-f --bar=foo '.escapeshellarg('a b c d').' '.escapeshellarg("A\nB'C"), (string) $input); |
|
| 98 | + $input = new StringInput('-f --bar=foo \'a b c d\' ' . "'A\nB\\'C'"); |
|
| 99 | + $this->assertEquals('-f --bar=foo ' . escapeshellarg('a b c d') . ' ' . escapeshellarg("A\nB'C"), (string) $input); |
|
| 100 | 100 | } |
| 101 | 101 | } |
@@ -151,6 +151,6 @@ |
||
| 151 | 151 | |
| 152 | 152 | protected function doWrite($message, $newline) |
| 153 | 153 | { |
| 154 | - $this->output .= $message.($newline ? "\n" : ''); |
|
| 154 | + $this->output .= $message . ($newline ? "\n" : ''); |
|
| 155 | 155 | } |
| 156 | 156 | } |
@@ -55,6 +55,6 @@ |
||
| 55 | 55 | $output = new StreamOutput($this->stream); |
| 56 | 56 | $output->writeln('foo'); |
| 57 | 57 | rewind($output->getStream()); |
| 58 | - $this->assertEquals('foo'.PHP_EOL, stream_get_contents($output->getStream()), '->doWrite() writes to the stream'); |
|
| 58 | + $this->assertEquals('foo' . PHP_EOL, stream_get_contents($output->getStream()), '->doWrite() writes to the stream'); |
|
| 59 | 59 | } |
| 60 | 60 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | $this->application->setAutoExit(false); |
| 27 | 27 | $this->application->register('foo') |
| 28 | 28 | ->addArgument('foo') |
| 29 | - ->setCode(function ($input, $output) { $output->writeln('foo'); }) |
|
| 29 | + ->setCode(function($input, $output) { $output->writeln('foo'); }) |
|
| 30 | 30 | ; |
| 31 | 31 | |
| 32 | 32 | $this->tester = new ApplicationTester($this->application); |
@@ -54,12 +54,12 @@ discard block |
||
| 54 | 54 | public function testGetOutput() |
| 55 | 55 | { |
| 56 | 56 | rewind($this->tester->getOutput()->getStream()); |
| 57 | - $this->assertEquals('foo'.PHP_EOL, stream_get_contents($this->tester->getOutput()->getStream()), '->getOutput() returns the current output instance'); |
|
| 57 | + $this->assertEquals('foo' . PHP_EOL, stream_get_contents($this->tester->getOutput()->getStream()), '->getOutput() returns the current output instance'); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | public function testGetDisplay() |
| 61 | 61 | { |
| 62 | - $this->assertEquals('foo'.PHP_EOL, $this->tester->getDisplay(), '->getDisplay() returns the display of the last execution'); |
|
| 62 | + $this->assertEquals('foo' . PHP_EOL, $this->tester->getDisplay(), '->getDisplay() returns the display of the last execution'); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | public function testGetStatusCode() |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | $this->command = new Command('foo'); |
| 27 | 27 | $this->command->addArgument('command'); |
| 28 | 28 | $this->command->addArgument('foo'); |
| 29 | - $this->command->setCode(function ($input, $output) { $output->writeln('foo'); }); |
|
| 29 | + $this->command->setCode(function($input, $output) { $output->writeln('foo'); }); |
|
| 30 | 30 | |
| 31 | 31 | $this->tester = new CommandTester($this->command); |
| 32 | 32 | $this->tester->execute(array('foo' => 'bar'), array('interactive' => false, 'decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE)); |
@@ -53,12 +53,12 @@ discard block |
||
| 53 | 53 | public function testGetOutput() |
| 54 | 54 | { |
| 55 | 55 | rewind($this->tester->getOutput()->getStream()); |
| 56 | - $this->assertEquals('foo'.PHP_EOL, stream_get_contents($this->tester->getOutput()->getStream()), '->getOutput() returns the current output instance'); |
|
| 56 | + $this->assertEquals('foo' . PHP_EOL, stream_get_contents($this->tester->getOutput()->getStream()), '->getOutput() returns the current output instance'); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | public function testGetDisplay() |
| 60 | 60 | { |
| 61 | - $this->assertEquals('foo'.PHP_EOL, $this->tester->getDisplay(), '->getDisplay() returns the display of the last execution'); |
|
| 61 | + $this->assertEquals('foo' . PHP_EOL, $this->tester->getDisplay(), '->getDisplay() returns the display of the last execution'); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | public function testGetStatusCode() |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $application->setAutoExit(false); |
| 73 | 73 | |
| 74 | 74 | $command = new Command('foo'); |
| 75 | - $command->setCode(function ($input, $output) { $output->writeln('foo'); }); |
|
| 75 | + $command->setCode(function($input, $output) { $output->writeln('foo'); }); |
|
| 76 | 76 | |
| 77 | 77 | $application->add($command); |
| 78 | 78 | |
@@ -4,49 +4,49 @@ |
||
| 4 | 4 | |
| 5 | 5 | class MySqlProvider extends DatabaseProvider |
| 6 | 6 | {
|
| 7 | - public function connect($host, $user, $pass, $dbname){
|
|
| 7 | + public function connect($host, $user, $pass, $dbname) {
|
|
| 8 | 8 | $this->resource = new mysqli($host, $user, $pass, $dbname); |
| 9 | 9 | |
| 10 | - if ($this->resource->connect_errno){ // Connection fails
|
|
| 10 | + if ($this->resource->connect_errno) { // Connection fails
|
|
| 11 | 11 | error_log($this->resource->connect_error); |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | return $this->resource; |
| 15 | 15 | } |
| 16 | - public function disconnect(){
|
|
| 16 | + public function disconnect() {
|
|
| 17 | 17 | return $this->resource->close(); |
| 18 | 18 | } |
| 19 | - public function getErrorNo(){
|
|
| 19 | + public function getErrorNo() {
|
|
| 20 | 20 | return $this->resource->errno; |
| 21 | 21 | } |
| 22 | - public function getError(){
|
|
| 22 | + public function getError() {
|
|
| 23 | 23 | return $this->resource->error; |
| 24 | 24 | } |
| 25 | - public function query($q){
|
|
| 25 | + public function query($q) {
|
|
| 26 | 26 | return $this->resource->query($q); |
| 27 | 27 | } |
| 28 | - public function numRows($resource){
|
|
| 28 | + public function numRows($resource) {
|
|
| 29 | 29 | $num_rows = 0; |
| 30 | 30 | |
| 31 | - if ($resource){
|
|
| 31 | + if ($resource) {
|
|
| 32 | 32 | $num_rows = $resource->num_rows; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | return $num_rows; |
| 36 | 36 | } |
| 37 | - public function fetchArray($result){
|
|
| 37 | + public function fetchArray($result) {
|
|
| 38 | 38 | return $result->fetch_assoc(); |
| 39 | 39 | } |
| 40 | - public function isConnected(){
|
|
| 40 | + public function isConnected() {
|
|
| 41 | 41 | return !is_null($this->resource); |
| 42 | 42 | } |
| 43 | - public function escape($var){
|
|
| 43 | + public function escape($var) {
|
|
| 44 | 44 | return $this->resource->real_escape_string($var); |
| 45 | 45 | } |
| 46 | - public function getInsertedID(){
|
|
| 46 | + public function getInsertedID() {
|
|
| 47 | 47 | return $this->resource->insert_id; |
| 48 | 48 | } |
| 49 | - public function changeDB ($database){
|
|
| 49 | + public function changeDB($database) {
|
|
| 50 | 50 | return $this->resource->select_db($database); |
| 51 | 51 | } |
| 52 | 52 | public function setCharset($charset) {
|
@@ -173,7 +173,7 @@ |
||
| 173 | 173 | $dialog->setHelperSet($helperSet); |
| 174 | 174 | |
| 175 | 175 | $error = 'This is not a color!'; |
| 176 | - $validator = function ($color) use ($error) { |
|
| 176 | + $validator = function($color) use ($error) { |
|
| 177 | 177 | if (!in_array($color, array('white', 'black'))) { |
| 178 | 178 | throw new \InvalidArgumentException($error); |
| 179 | 179 | } |
@@ -10,12 +10,12 @@ discard block |
||
| 10 | 10 | parent::__construct(); |
| 11 | 11 | |
| 12 | 12 | // cargamos la clase ayudantes para usar sus metodos de ayuda |
| 13 | - $this->_ayuda= new Sistema\Ayudantes\CFPHPAyuda; |
|
| 14 | - $this->_seg= new Sistema\Ayudantes\CFPHPSeguridad; |
|
| 15 | - $this->_sesion=new Sistema\Nucleo\CFSesion(); |
|
| 13 | + $this->_ayuda = new Sistema\Ayudantes\CFPHPAyuda; |
|
| 14 | + $this->_seg = new Sistema\Ayudantes\CFPHPSeguridad; |
|
| 15 | + $this->_sesion = new Sistema\Nucleo\CFSesion(); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | - public function index(){ |
|
| 18 | + public function index() { |
|
| 19 | 19 | $this->_sesion->iniciarSesion('_s', Cf_SESION_PARAMETRO_SEGURO); |
| 20 | 20 | session_destroy(); |
| 21 | 21 | $this->_vista->titulo = 'CalimaFramework Login'; |
@@ -23,19 +23,19 @@ discard block |
||
| 23 | 23 | $this->_vista->imprimirVista('index', 'usuario'); |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - public function registro(){ |
|
| 26 | + public function registro() { |
|
| 27 | 27 | $this->_vista->titulo = 'CalimaFramework registro'; |
| 28 | 28 | $this->_vista->imprimirVista('registro', 'usuario'); |
| 29 | 29 | |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - public function crearRegistro(){ |
|
| 32 | + public function crearRegistro() { |
|
| 33 | 33 | $datas = $this->cargaModelo('usuario'); |
| 34 | - if(isset($_POST['nombre'])){ |
|
| 35 | - $nombre=$_POST['nombre']; |
|
| 36 | - $email=$_POST['email']; |
|
| 37 | - $usuario=$_POST['nombre']; |
|
| 38 | - $clave=$this->_seg->cifrado($this->_seg->filtrarTexto($_POST['clave'])); |
|
| 34 | + if (isset($_POST['nombre'])) { |
|
| 35 | + $nombre = $_POST['nombre']; |
|
| 36 | + $email = $_POST['email']; |
|
| 37 | + $usuario = $_POST['nombre']; |
|
| 38 | + $clave = $this->_seg->cifrado($this->_seg->filtrarTexto($_POST['clave'])); |
|
| 39 | 39 | |
| 40 | 40 | $datas->insertarRegistro( |
| 41 | 41 | $this->_seg->filtrarTexto($_POST['nombre']), |
@@ -45,24 +45,24 @@ discard block |
||
| 45 | 45 | ); |
| 46 | 46 | $this->_ayuda->redireccionUrl('usuario'); |
| 47 | 47 | } |
| 48 | - else{ |
|
| 48 | + else { |
|
| 49 | 49 | $this->_ayuda->redireccionUrl('usuario/registro'); |
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - public function valida(){ |
|
| 54 | - if(isset($_POST['usuario'])){ |
|
| 55 | - $usuario=$_POST['usuario']; |
|
| 56 | - echo $clave=$this->_seg->cifrado($this->_seg->filtrarTexto($_POST['clave'])); |
|
| 53 | + public function valida() { |
|
| 54 | + if (isset($_POST['usuario'])) { |
|
| 55 | + $usuario = $_POST['usuario']; |
|
| 56 | + echo $clave = $this->_seg->cifrado($this->_seg->filtrarTexto($_POST['clave'])); |
|
| 57 | 57 | |
| 58 | 58 | $datosUser = $this->cargaModelo('usuario'); |
| 59 | - $valida=$datosUser->seleccionUsuario($usuario, $clave); |
|
| 59 | + $valida = $datosUser->seleccionUsuario($usuario, $clave); |
|
| 60 | 60 | |
| 61 | - if(isset($valida)){ |
|
| 61 | + if (isset($valida)) { |
|
| 62 | 62 | $this->_sesion->iniciarSesion('_s', Cf_SESION_PARAMETRO_SEGURO); |
| 63 | - $_SESSION['usuario']=$usuario; |
|
| 64 | - $_SESSION['id_usuario']=$valida['id_usuario']; |
|
| 65 | - $_SESSION['nivel']=$valida['nivel']; |
|
| 63 | + $_SESSION['usuario'] = $usuario; |
|
| 64 | + $_SESSION['id_usuario'] = $valida['id_usuario']; |
|
| 65 | + $_SESSION['nivel'] = $valida['nivel']; |
|
| 66 | 66 | $this->_ayuda->redireccionUrl('data/index'); |
| 67 | 67 | } |
| 68 | 68 | $this->_ayuda->redireccionUrl('usuario'); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function cerrarSesion(){ |
|
| 73 | + public function cerrarSesion() { |
|
| 74 | 74 | $this->_sesion->iniciarSesion('_s', false); |
| 75 | 75 | session_destroy(); |
| 76 | 76 | $this->_sesion->destruir('usuario'); |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | //verificamos la version de php en tu servidor web o local |
| 28 | 28 | if (version_compare(PHP_VERSION, '5.3.20', '<')) |
| 29 | 29 | { |
| 30 | - die('Su Hosting tiene una version < a PHP 5.3.20 debes actualizar para esta version de Calima. su version actual de PHP es: '.PHP_VERSION); |
|
| 30 | + die('Su Hosting tiene una version < a PHP 5.3.20 debes actualizar para esta version de Calima. su version actual de PHP es: ' . PHP_VERSION); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | //Cargamos los Espacios de nombres para el nucleo y los ayudantes |
@@ -46,12 +46,12 @@ discard block |
||
| 46 | 46 | public function __construct() { |
| 47 | 47 | parent::__construct(); |
| 48 | 48 | |
| 49 | - $this->_ayuda= new Sisayu\CFPHPAyuda; |
|
| 49 | + $this->_ayuda = new Sisayu\CFPHPAyuda; |
|
| 50 | 50 | //$this->cargaAyudante('CfPHPAyuda'); |
| 51 | 51 | //$this->cargaAyudante('CfPHPSeguridad'); |
| 52 | - $this->_seg= new Sisayu\CfPHPSeguridad; |
|
| 52 | + $this->_seg = new Sisayu\CfPHPSeguridad; |
|
| 53 | 53 | |
| 54 | - $this->_sesion=new Sisnuc\CFSesion(); |
|
| 54 | + $this->_sesion = new Sisnuc\CFSesion(); |
|
| 55 | 55 | |
| 56 | 56 | } |
| 57 | 57 | |
@@ -59,16 +59,16 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | // Se verifica que en el archivo de configuracion.php la constante Cf_CONFIG_INICIO==true |
| 61 | 61 | //Si esta en True se lanza el instalador de Cf |
| 62 | - if(Cf_CONFIG_INICIO==true){ |
|
| 62 | + if (Cf_CONFIG_INICIO == true) { |
|
| 63 | 63 | $this->_sesion->iniciarSesion('_s', false); |
| 64 | - if($_SESSION['nivel']==1){ |
|
| 64 | + if ($_SESSION['nivel'] == 1) { |
|
| 65 | 65 | $this->_vista->titulo = 'CalimaFramework'; |
| 66 | 66 | $this->_vista->imprimirVista('index', 'data'); |
| 67 | - }else{ |
|
| 67 | + } else { |
|
| 68 | 68 | $this->_ayuda->redireccionUrl('usuario'); |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - }elseif (Cf_CONFIG_INICIO=='false') { |
|
| 71 | + }elseif (Cf_CONFIG_INICIO == 'false') { |
|
| 72 | 72 | |
| 73 | 73 | $this->_vista->titulo = 'CalimaFramework'; |
| 74 | 74 | $this->_vista->imprimirVista('index', 'data'); |