webcol / Calima

vendor/symfony/console/Symfony/Component/Console/Formatter/OutputFormatterStyle.php

Doc Comments +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
      *
      * @param string|null $foreground The style foreground color name
      * @param string|null $background The style background color name
-     * @param array       $options    The style options
+     * @param string[]       $options    The style options
      *
      * @api
      */

vendor/symfony/console/Symfony/Component/Console/Helper/DialogHelper.php

Doc Comments +7 added lines, -7 removed lines

@@ -32,14 +32,14 @@ 
      * Asks the user to select a value.
      *
      * @param OutputInterface $output       An Output instance
-     * @param string|array    $question     The question to ask
-     * @param array           $choices      List of choices to pick from
+     * @param string    $question     The question to ask
+     * @param string[]           $choices      List of choices to pick from
      * @param bool|string     $default      The default answer if the user enters nothing
      * @param bool|int        $attempts     Max number of times to ask before giving up (false by default, which means infinite)
      * @param string          $errorMessage Message which will be shown if invalid value from choice list would be picked
      * @param bool            $multiselect  Select more than one value separated by comma
      *
-     * @return int|string|array The selected value or values (the key of the choices array)
+     * @return string The selected value or values (the key of the choices array)
      *
      * @throws \InvalidArgumentException
      */
@@ -230,7 +230,7 @@ 
      * The question will be asked until the user answers by nothing, yes, or no.
      *
      * @param OutputInterface $output   An Output instance
-     * @param string|array    $question The question to ask
+     * @param string    $question The question to ask
      * @param bool            $default  The default answer if the user enters nothing
      *
      * @return bool true if the user has confirmed, false otherwise
@@ -327,13 +327,13 @@ 
      * otherwise.
      *
      * @param OutputInterface $output       An Output instance
-     * @param string|array    $question     The question to ask
+     * @param string    $question     The question to ask
      * @param callable        $validator    A PHP callback
      * @param int|false       $attempts     Max number of times to ask before giving up (false by default, which means infinite)
      * @param string          $default      The default answer if none is given by the user
      * @param array           $autocomplete List of values to autocomplete
      *
-     * @return mixed
+     * @return string
      *
      * @throws \Exception When any of the validators return an error
      */
@@ -392,7 +392,7 @@ 
     /**
      * Returns the helper's input stream.
      *
-     * @return string
+     * @return resource
      */
     public function getInputStream()
     {

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 
         $output->writeln($messages);
 
-        $result = $this->askAndValidate($output, '> ', function ($picked) use ($choices, $errorMessage, $multiselect) {
+        $result = $this->askAndValidate($output, '> ', function($picked) use ($choices, $errorMessage, $multiselect) {
             // Collapse all spaces.
             $selectedChoices = str_replace(' ', '', $picked);
 
@@ -341,7 +341,7 @@ 
     {
         $that = $this;
 
-        $interviewer = function () use ($output, $question, $default, $autocomplete, $that) {
+        $interviewer = function() use ($output, $question, $default, $autocomplete, $that) {
             return $that->ask($output, $question, $default, $autocomplete);
         };
 
@@ -370,7 +370,7 @@ 
     {
         $that = $this;
 
-        $interviewer = function () use ($output, $question, $fallback, $that) {
+        $interviewer = function() use ($output, $question, $fallback, $that) {
             return $that->askHiddenResponse($output, $question, $fallback);
         };
 

vendor/symfony/console/Symfony/Component/Console/Helper/ProcessHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
      * @param Process         $process  The Process
      * @param callable|null   $callback A PHP callable
      *
-     * @return callable
+     * @return \Closure
      */
     public function wrapCallback(OutputInterface $output, Process $process, $callback = null)
     {

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 
         $that = $this;
 
-        return function ($type, $buffer) use ($output, $process, $callback, $formatter, $that) {
+        return function($type, $buffer) use ($output, $process, $callback, $formatter, $that) {
             $output->write($formatter->progress(spl_object_hash($process), $that->escapeString($buffer), Process::ERR === $type));
 
             if (null !== $callback) {

vendor/symfony/console/Symfony/Component/Console/Helper/ProgressBar.php

Doc Comments +4 added lines

@@ -138,6 +138,9 @@ 
         return isset(self::$formats[$name]) ? self::$formats[$name] : null;
     }
 
+    /**
+     * @param string $message
+     */
     public function setMessage($message, $name = 'message')
     {
         $this->messages[$name] = $message;
@@ -473,6 +476,7 @@ 
      * Sets the progress bar maximal steps.
      *
      * @param int     The progress bar max steps
+     * @param integer $max
      */
     private function setMaxSteps($max)
     {

Spacing +9 added lines, -9 removed lines

@@ -436,7 +436,7 @@ 
         $self = $this;
         $output = $this->output;
         $messages = $this->messages;
-        $this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) use ($self, $output, $messages) {
+        $this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function($matches) use ($self, $output, $messages) {
             if ($formatter = $self::getPlaceholderFormatterDefinition($matches[1])) {
                 $text = call_user_func($formatter, $self, $output);
             } elseif (isset($messages[$matches[1]])) {
@@ -538,7 +538,7 @@ 
     private static function initPlaceholderFormatters()
     {
         return array(
-            'bar' => function (ProgressBar $bar, OutputInterface $output) {
+            'bar' => function(ProgressBar $bar, OutputInterface $output) {
                 $completeBars = floor($bar->getMaxSteps() > 0 ? $bar->getProgressPercent() * $bar->getBarWidth() : $bar->getProgress() % $bar->getBarWidth());
                 $display = str_repeat($bar->getBarCharacter(), $completeBars);
                 if ($completeBars < $bar->getBarWidth()) {
@@ -548,10 +548,10 @@ 
 
                 return $display;
             },
-            'elapsed' => function (ProgressBar $bar) {
+            'elapsed' => function(ProgressBar $bar) {
                 return Helper::formatTime(time() - $bar->getStartTime());
             },
-            'remaining' => function (ProgressBar $bar) {
+            'remaining' => function(ProgressBar $bar) {
                 if (!$bar->getMaxSteps()) {
                     throw new \LogicException('Unable to display the remaining time if the maximum number of steps is not set.');
                 }
@@ -564,7 +564,7 @@ 
 
                 return Helper::formatTime($remaining);
             },
-            'estimated' => function (ProgressBar $bar) {
+            'estimated' => function(ProgressBar $bar) {
                 if (!$bar->getMaxSteps()) {
                     throw new \LogicException('Unable to display the estimated time if the maximum number of steps is not set.');
                 }
@@ -577,16 +577,16 @@ 
 
                 return Helper::formatTime($estimated);
             },
-            'memory' => function (ProgressBar $bar) {
+            'memory' => function(ProgressBar $bar) {
                 return Helper::formatMemory(memory_get_usage(true));
             },
-            'current' => function (ProgressBar $bar) {
+            'current' => function(ProgressBar $bar) {
                 return str_pad($bar->getProgress(), $bar->getStepWidth(), ' ', STR_PAD_LEFT);
             },
-            'max' => function (ProgressBar $bar) {
+            'max' => function(ProgressBar $bar) {
                 return $bar->getMaxSteps();
             },
-            'percent' => function (ProgressBar $bar) {
+            'percent' => function(ProgressBar $bar) {
                 return floor($bar->getProgressPercent() * 100);
             },
         );

vendor/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php

Doc Comments +3 added lines

@@ -49,6 +49,9 @@
         require_once self::$fixturesPath.'/FooSubnamespaced2Command.php';
     }
 
+    /**
+     * @param string $text
+     */
     protected function normalizeLineBreaks($text)
     {
         return str_replace(PHP_EOL, "\n", $text);

Indentation +4 added lines, -4 removed lines

@@ -708,8 +708,8 @@ 
         $application = $this->getMock('Symfony\Component\Console\Application', array('doRun'));
         $application->setAutoExit(false);
         $application->expects($this->once())
-             ->method('doRun')
-             ->will($this->throwException($exception));
+                ->method('doRun')
+                ->will($this->throwException($exception));
 
         $exitCode = $application->run(new ArrayInput(array()), new NullOutput());
 
@@ -723,8 +723,8 @@ 
         $application = $this->getMock('Symfony\Component\Console\Application', array('doRun'));
         $application->setAutoExit(false);
         $application->expects($this->once())
-             ->method('doRun')
-             ->will($this->throwException($exception));
+                ->method('doRun')
+                ->will($this->throwException($exception));
 
         $exitCode = $application->run(new ArrayInput(array()), new NullOutput());
 

Spacing +10 added lines, -10 removed lines

@@ -562,7 +562,7 @@ 
         $application->expects($this->any())
             ->method('getTerminalWidth')
             ->will($this->returnValue(120));
-        $application->register('foo')->setCode(function () {
+        $application->register('foo')->setCode(function() {
             throw new \Exception('エラーメッセージ');
         });
         $tester = new ApplicationTester($application);
@@ -578,7 +578,7 @@ 
         $application->expects($this->any())
             ->method('getTerminalWidth')
             ->will($this->returnValue(32));
-        $application->register('foo')->setCode(function () {
+        $application->register('foo')->setCode(function() {
             throw new \Exception('コマンドの実行中にエラーが発生しました。');
         });
         $tester = new ApplicationTester($application);
@@ -743,7 +743,7 @@ 
         $application
             ->register('foo')
             ->setDefinition(array($def))
-            ->setCode(function (InputInterface $input, OutputInterface $output) {})
+            ->setCode(function(InputInterface $input, OutputInterface $output) {})
         ;
 
         $input = new ArrayInput(array('command' => 'foo'));
@@ -878,7 +878,7 @@ 
         $application->setAutoExit(false);
         $application->setDispatcher($this->getDispatcher());
 
-        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+        $application->register('foo')->setCode(function(InputInterface $input, OutputInterface $output) {
             $output->write('foo.');
         });
 
@@ -898,7 +898,7 @@ 
         $application->setAutoExit(false);
         $application->setCatchExceptions(false);
 
-        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+        $application->register('foo')->setCode(function(InputInterface $input, OutputInterface $output) {
             throw new \RuntimeException('foo');
         });
 
@@ -912,7 +912,7 @@ 
         $application->setDispatcher($this->getDispatcher());
         $application->setAutoExit(false);
 
-        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+        $application->register('foo')->setCode(function(InputInterface $input, OutputInterface $output) {
             $output->write('foo.');
 
             throw new \RuntimeException('foo');
@@ -929,7 +929,7 @@ 
         $application->setDispatcher($this->getDispatcher(true));
         $application->setAutoExit(false);
 
-        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+        $application->register('foo')->setCode(function(InputInterface $input, OutputInterface $output) {
             $output->write('foo.');
         });
 
@@ -957,21 +957,21 @@ 
     protected function getDispatcher($skipCommand = false)
     {
         $dispatcher = new EventDispatcher();
-        $dispatcher->addListener('console.command', function (ConsoleCommandEvent $event) use ($skipCommand) {
+        $dispatcher->addListener('console.command', function(ConsoleCommandEvent $event) use ($skipCommand) {
             $event->getOutput()->write('before.');
 
             if ($skipCommand) {
                 $event->disableCommand();
             }
         });
-        $dispatcher->addListener('console.terminate', function (ConsoleTerminateEvent $event) use ($skipCommand) {
+        $dispatcher->addListener('console.terminate', function(ConsoleTerminateEvent $event) use ($skipCommand) {
             $event->getOutput()->write('after.');
 
             if (!$skipCommand) {
                 $event->setExitCode(113);
             }
         });
-        $dispatcher->addListener('console.exception', function (ConsoleExceptionEvent $event) {
+        $dispatcher->addListener('console.exception', function(ConsoleExceptionEvent $event) {
             $event->getOutput()->writeln('caught.');
 
             $event->setException(new \LogicException('caught.', $event->getExitCode(), $event->getException()));

vendor/symfony/console/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php

Doc Comments +3 added lines

@@ -177,6 +177,9 @@
         $this->assertEquals('not yet', $dialog->ask($this->getOutputStream(), 'Do you have a job?', 'not yet'));
     }
 
+    /**
+     * @param string $input
+     */
     protected function getInputStream($input)
     {
         $stream = fopen('php://memory', 'r+', false);

Spacing +1 added lines, -1 removed lines

@@ -173,7 +173,7 @@
         $dialog->setHelperSet($helperSet);
 
         $error = 'This is not a color!';
-        $validator = function ($color) use ($error) {
+        $validator = function($color) use ($error) {
             if (!in_array($color, array('white', 'black'))) {
                 throw new \InvalidArgumentException($error);
             }

vendor/symfony/console/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php

Doc Comments +3 added lines

@@ -589,6 +589,9 @@
         return new StreamOutput(fopen('php://memory', 'r+', false), $verbosity, $decorated);
     }
 
+    /**
+     * @param string $expected
+     */
     protected function generateOutput($expected)
     {
         $count = substr_count($expected, "\n");

Spacing +2 added lines, -2 removed lines

@@ -453,7 +453,7 @@ 
 
     public function testAddingPlaceholderFormatter()
     {
-        ProgressBar::setPlaceholderFormatterDefinition('remaining_steps', function (ProgressBar $bar) {
+        ProgressBar::setPlaceholderFormatterDefinition('remaining_steps', function(ProgressBar $bar) {
             return $bar->getMaxSteps() - $bar->getProgress();
         });
         $bar = new ProgressBar($output = $this->getOutputStream(), 3);
@@ -495,7 +495,7 @@ 
     public function testAnsiColorsAndEmojis()
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 15);
-        ProgressBar::setPlaceholderFormatterDefinition('memory', function (ProgressBar $bar) {
+        ProgressBar::setPlaceholderFormatterDefinition('memory', function(ProgressBar $bar) {
             static $i = 0;
             $mem = 100000 * $i;
             $colors = $i++ ? '41;37' : '44;37';

Sistema/Ayudantes/CFPHPMenu.php

Indentation +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     
     
     function menu_ul($sel = 'inicio')
-   {
+    {
         $items = array(
             'inicio' => array(
                 'id'     => 'inicio',
@@ -65,7 +65,7 @@ 
     }
     
     function menu_p($sel = 'inicio', $separador = '')
-   {
+    {
         //$CI =& get_instance();
         $items = array(
             'inicio' => array(

Spacing +7 added lines, -7 removed lines

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

Sistema/Ayudantes/CFPHPPaginador.php

Indentation +236 added lines, -236 removed lines

@@ -39,311 +39,311 @@
  * (you can pass the most critical GETs manually if you like)
  */
  
- //Esta clase fue editada por programadores de Cf con la aprobacion de Ruben Arroyo
+    //Esta clase fue editada por programadores de Cf con la aprobacion de Ruben Arroyo
 
 namespace Sistema\Ayudantes;
 
 class Cf_PHPPaginator {
-	/*
+    /*
 	 * MAIN Settings (required)
 	 */
 	
-	/**
-	 * 
-	 * @total_records string Total of records to paginate (specify manually)
-	 */
-	public $total_records = 0;
+    /**
+     * 
+     * @total_records string Total of records to paginate (specify manually)
+     */
+    public $total_records = 0;
 	
 	
-	/*
+    /*
 	 * MAIN Settings (optional)
 	 */
 	
-	/**
-	 * @style string  Specify Class to define
-	 * @tutorial If is specified, it would create <div class="style"> otherwise it not create div
-	 */
-	public $style = '';
+    /**
+     * @style string  Specify Class to define
+     * @tutorial If is specified, it would create <div class="style"> otherwise it not create div
+     */
+    public $style = '';
 	
-	/**
-	 * @records number Max records to show on every page
-	 */
-	public $records = 20;
+    /**
+     * @records number Max records to show on every page
+     */
+    public $records = 20;
 	
-	/** 
-	 * @max_links number Maxium quantity of links to show before and after actual page
-	 * @example If current page is 4 and MAX is 2, it show "2 3 4 5 6"
-	 */
-	public $max_links = 3;
+    /** 
+     * @max_links number Maxium quantity of links to show before and after actual page
+     * @example If current page is 4 and MAX is 2, it show "2 3 4 5 6"
+     */
+    public $max_links = 3;
 	
-	/**
-	 * @get_name string Specify INDEX of GET that is used
-	 * 
-	 * It will load automatically the current page. 
-	 * If you like, you can specify manually in "$cur_page" 
-	 * (if you like filter previously or the script will not load directly from URL)  
-	 */
-	public $get_name = 'pag';
+    /**
+     * @get_name string Specify INDEX of GET that is used
+     * 
+     * It will load automatically the current page. 
+     * If you like, you can specify manually in "$cur_page" 
+     * (if you like filter previously or the script will not load directly from URL)  
+     */
+    public $get_name = 'pag';
 	
-	/**
-	 * @max_records number Specify maxium quantity of registers will be loaded. "0" disable this
-	 */
-	public $max_records = 0;
+    /**
+     * @max_records number Specify maxium quantity of registers will be loaded. "0" disable this
+     */
+    public $max_records = 0;
 	
 	
-	/**
-	 * @recicle_url boolean If is true, modify directly tue current URL to put the pagination (if not exist any, add &pag= to the end)
-	 * If is true, $url_start and $url_end will be ignored
-	 */
-	public $recicle_url = true;
+    /**
+     * @recicle_url boolean If is true, modify directly tue current URL to put the pagination (if not exist any, add &pag= to the end)
+     * If is true, $url_start and $url_end will be ignored
+     */
+    public $recicle_url = true;
 	
-	/**
-	 * @specific_get array Specify what GETs (and order) you like recicle.
-	 * Set array() to ALL (not recomended to avoid atacks DoS)  
-	 * Set '' for any
-	 * @example array('section', 'pag', 'subsection');
-	 * If you don't need 'pag' in the midle, you can ignore it.
-	 * WARNING: If the order is very important, use the pag at THE END of url   
-	 */
-	public $specific_get = '';
+    /**
+     * @specific_get array Specify what GETs (and order) you like recicle.
+     * Set array() to ALL (not recomended to avoid atacks DoS)  
+     * Set '' for any
+     * @example array('section', 'pag', 'subsection');
+     * If you don't need 'pag' in the midle, you can ignore it.
+     * WARNING: If the order is very important, use the pag at THE END of url   
+     */
+    public $specific_get = '';
 	
-	/**
-	 * @url_start string specify how the URL of every link start. IF $recicle_url is TRUE, this will be ignored 
-	 * @example If you use MOD_REWRITE or JAVASCRIPT, you can put "http://mywebsite.com/subdir/pag-" or "javascript:paginate("
-	 * 
-	 * This value will auto completed if you leave empty 
-	 */
-	public $url_start = '';
+    /**
+     * @url_start string specify how the URL of every link start. IF $recicle_url is TRUE, this will be ignored 
+     * @example If you use MOD_REWRITE or JAVASCRIPT, you can put "http://mywebsite.com/subdir/pag-" or "javascript:paginate("
+     * 
+     * This value will auto completed if you leave empty 
+     */
+    public $url_start = '';
 	
-	/**
-	 * @url_end string specify how the URL of every link ends. IF $recicle_url is TRUE, this will be ignored
-	 * @example If you use MOD_REWRITE or JAVASCRIPT, you can put "/" or ");"
-	 * 
-	 * This value will auto completed if you leave empty
-	 */
-	public $url_end = '';
+    /**
+     * @url_end string specify how the URL of every link ends. IF $recicle_url is TRUE, this will be ignored
+     * @example If you use MOD_REWRITE or JAVASCRIPT, you can put "/" or ");"
+     * 
+     * This value will auto completed if you leave empty
+     */
+    public $url_end = '';
 	
 	
 	
-	/*
+    /*
 	 * Design settings
 	 */
 	
-	// Icons to show "First | Previous | Next | Last"
-	//& laquo; = � | & lt; = <
+    // Icons to show "First | Previous | Next | Last"
+    //& laquo; = � | & lt; = <
     //& raquo; = � | & gt; = >
     // Leave empty '' to not show or ' ' to show empty
-	public $first = '[&lt;&lt;]';
-	public $previous = '[&lt;]';
-	public $next = '[&gt;]';
-	public $last = '[&gt;&gt;]';
+    public $first = '[&lt;&lt;]';
+    public $previous = '[&lt;]';
+    public $next = '[&gt;]';
+    public $last = '[&gt;&gt;]';
 	
 	
-	/*
+    /*
 	 * RETURNS FROM PAGINATOR and internal use
 	 */
-	// Return current page (auto loaded)
-	public $cur_page;
+    // Return current page (auto loaded)
+    public $cur_page;
 	
-	// original page loaded
-	// it contains the real value in GET (ex: -1, 5...) to compare later
-	public $original_page;
+    // original page loaded
+    // it contains the real value in GET (ex: -1, 5...) to compare later
+    public $original_page;
 	
-	// Return total pages
-	public $total_pages;
+    // Return total pages
+    public $total_pages;
 	
-	// LIMIT_START / Specify the first record of the page (ex, in page 3 and 20 records is record num 40)
-	// Limit max is $records
-	public $first_record;
+    // LIMIT_START / Specify the first record of the page (ex, in page 3 and 20 records is record num 40)
+    // Limit max is $records
+    public $first_record;
 	
-	// Specify limit to put directly in mysql query ( LIMIT 0,20 )
-	public $limit;
+    // Specify limit to put directly in mysql query ( LIMIT 0,20 )
+    public $limit;
 	
 	
 /*
  * Functions
  */
-	/**
-	 * @name paginate
-	 * @tutorial This function is called directly to load all params
-	 * @example $pag->paginate();
-	 */
-	public function paginate() {
-		$this->get(); // Filtering and obtaining variables
-		$this->calculate(); // Calc current page
-		$this->prepareUrl(); // Preparing URL to show
-	}
+    /**
+     * @name paginate
+     * @tutorial This function is called directly to load all params
+     * @example $pag->paginate();
+     */
+    public function paginate() {
+        $this->get(); // Filtering and obtaining variables
+        $this->calculate(); // Calc current page
+        $this->prepareUrl(); // Preparing URL to show
+    }
 	
-	/**
-	 * @name show
-	 * @tutorial Show links of pagination
-	 * @example $pag->show();
-	 */
-	public function show() {
-		// Prepare string with links
-		// Reading here variables is faster than "$this->var"
-		$cur_page = $this->cur_page; 
-		$url_start = $this->url_start;
-		$url_end = $this->url_end;
+    /**
+     * @name show
+     * @tutorial Show links of pagination
+     * @example $pag->show();
+     */
+    public function show() {
+        // Prepare string with links
+        // Reading here variables is faster than "$this->var"
+        $cur_page = $this->cur_page; 
+        $url_start = $this->url_start;
+        $url_end = $this->url_end;
 		
-		$start = $cur_page - $this->max_links;
-		$end = $cur_page + $this->max_links;
+        $start = $cur_page - $this->max_links;
+        $end = $cur_page + $this->max_links;
 		
-		if ($start < 1) $start = 1;
-		if ($end > $this->total_pages) $end = $this->total_pages;
+        if ($start < 1) $start = 1;
+        if ($end > $this->total_pages) $end = $this->total_pages;
 		
-		// Showing all clickable pages (create div if class is defined)
-		if ($this->style != '') $r = '<div class="'.$this->style.'">';
-		else $r = '';
+        // Showing all clickable pages (create div if class is defined)
+        if ($this->style != '') $r = '<div class="'.$this->style.'">';
+        else $r = '';
 		
 		
-		// First / previous
-		if ($this->cur_page > 1) {
-			if ($this->first != '') $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">'.$this->first.'</a> ';
-			if ($this->previous != '') $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">'.$this->previous.'</a> ';
-		}
+        // First / previous
+        if ($this->cur_page > 1) {
+            if ($this->first != '') $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">'.$this->first.'</a> ';
+            if ($this->previous != '') $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">'.$this->previous.'</a> ';
+        }
 		
-		// You can optimize this separating BEFORE and AFTER current page in two for (to avoid load "if" in each loop)
-		// but it would be difficult on changes
-		for ($n=$start; $n<=$end; $n++) {
-			if ($n != $cur_page) $r .= '<a class="link" href="'. $url_start . $n . $url_end . '">'.$n.'</a> ';
-			else $r .= '<a class="current">'.$n.'</a> ';
-		}
+        // You can optimize this separating BEFORE and AFTER current page in two for (to avoid load "if" in each loop)
+        // but it would be difficult on changes
+        for ($n=$start; $n<=$end; $n++) {
+            if ($n != $cur_page) $r .= '<a class="link" href="'. $url_start . $n . $url_end . '">'.$n.'</a> ';
+            else $r .= '<a class="current">'.$n.'</a> ';
+        }
 		
-		// next / last
-		if ($this->cur_page < $this->total_pages) {
-			if ($this->next != '') $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">'.$this->next.'</a> ';
-			if ($this->last != '') $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end .'">'.$this->last.'</a> ';
-		}
+        // next / last
+        if ($this->cur_page < $this->total_pages) {
+            if ($this->next != '') $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">'.$this->next.'</a> ';
+            if ($this->last != '') $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end .'">'.$this->last.'</a> ';
+        }
 		
-		// End div (if exist)
-		if ($this->style != '') $r .= '</div>';
+        // End div (if exist)
+        if ($this->style != '') $r .= '</div>';
 		
-		return $r;
-	}
+        return $r;
+    }
 	
 	
-	/**
-	 * @name get
-	 * @tutorial This function is autoloaded, it get the current page and filter number to avoid hackers
-	 */	 
-	private function get() {
-		if (!is_numeric($this->cur_page)) {
-			// First get the actual page, by default 1
-			$cur_page = isset($_GET[$this->get_name]) ? $_GET[$this->get_name] : 1;
-			$this->original_page = $cur_page;
+    /**
+     * @name get
+     * @tutorial This function is autoloaded, it get the current page and filter number to avoid hackers
+     */	 
+    private function get() {
+        if (!is_numeric($this->cur_page)) {
+            // First get the actual page, by default 1
+            $cur_page = isset($_GET[$this->get_name]) ? $_GET[$this->get_name] : 1;
+            $this->original_page = $cur_page;
 			
-			// Filter values
-			if (!is_numeric($cur_page) or $cur_page < 1) $cur_page = 1;
+            // Filter values
+            if (!is_numeric($cur_page) or $cur_page < 1) $cur_page = 1;
 			
-			// Set new filtered values (is faster this method)
-			$this->cur_page = $cur_page;
-		} else {
-			$this->original_page = $cur_page;
-		}
-	}
+            // Set new filtered values (is faster this method)
+            $this->cur_page = $cur_page;
+        } else {
+            $this->original_page = $cur_page;
+        }
+    }
 	
-	/**
-	 * @name calculate
-	 * @tutorial Do all calcs about current and last page
-	 */
-	private function calculate() {
-		// This vars are very used, so is faster do this
-		$max_records = $this->max_records;
-		$records = $this->records;
+    /**
+     * @name calculate
+     * @tutorial Do all calcs about current and last page
+     */
+    private function calculate() {
+        // This vars are very used, so is faster do this
+        $max_records = $this->max_records;
+        $records = $this->records;
 		
-		// Force maxium records loaded (only if is specified by user)
-		if ($max_records  > 0 and $max_records  > $total_records) 
-			$this->total_records = $max_records;
+        // Force maxium records loaded (only if is specified by user)
+        if ($max_records  > 0 and $max_records  > $total_records) 
+            $this->total_records = $max_records;
 		
-		// Calculate total pages that have
-		$total_pages = ceil($this->total_records / $records);
+        // Calculate total pages that have
+        $total_pages = ceil($this->total_records / $records);
 		
-		// Is correct current page?
-		if ($this->cur_page > $total_pages) $this->cur_page = $total_pages;
-		$this->total_pages = $total_pages;
+        // Is correct current page?
+        if ($this->cur_page > $total_pages) $this->cur_page = $total_pages;
+        $this->total_pages = $total_pages;
 		
-		// Specify LIMIT to do a query
-		$start = ($this->cur_page - 1) * $records;
+        // Specify LIMIT to do a query
+        $start = ($this->cur_page - 1) * $records;
 		
-		// Forcing maixum records to show (only if is specified by user)
-		if ($max_records > 0 and $records > $max_records) {
-			$records = $max_records;
-			$this->records = $records;
-		}
+        // Forcing maixum records to show (only if is specified by user)
+        if ($max_records > 0 and $records > $max_records) {
+            $records = $max_records;
+            $this->records = $records;
+        }
 			
 		
-		// Saving changes
-		$this->first_record = $start;
-		$this->limit = ' LIMIT '.$start.','.$records.' ';
-	}
+        // Saving changes
+        $this->first_record = $start;
+        $this->limit = ' LIMIT '.$start.','.$records.' ';
+    }
 	
-	/**
-	 * @name prepareUrl
-	 * @tutorial It prepare the url to show in each link, specified by user
-	 * If recicle URL is false, it will auto load $url_start and $url_end
-	 */
-	private function prepareUrl() {
-		// This script use three methods to recicle GET depending user selection
-		if ($this->recicle_url) {
-			// gonna to recicle the URL
-			$gets = $this->specific_get;
-			$get_name = $this->get_name;
+    /**
+     * @name prepareUrl
+     * @tutorial It prepare the url to show in each link, specified by user
+     * If recicle URL is false, it will auto load $url_start and $url_end
+     */
+    private function prepareUrl() {
+        // This script use three methods to recicle GET depending user selection
+        if ($this->recicle_url) {
+            // gonna to recicle the URL
+            $gets = $this->specific_get;
+            $get_name = $this->get_name;
 			
-			// If user specified an array
-			if (is_array($gets)) {
-				if (empty($gets)) {
-					// And is empty, we have to Recicle ALL GET
-					// To know that page needs to be replaced we will use the "original_page" (the real get)
-					// Cortamos "pag=2" para obtener lo que va antes y despues, as� poder modificar directamente ese pag=2 por la pagina actual
-					$query_string = explode($this->get_name.'='.$this->original_page, $_SERVER['QUERY_STRING']);
+            // If user specified an array
+            if (is_array($gets)) {
+                if (empty($gets)) {
+                    // And is empty, we have to Recicle ALL GET
+                    // To know that page needs to be replaced we will use the "original_page" (the real get)
+                    // Cortamos "pag=2" para obtener lo que va antes y despues, as� poder modificar directamente ese pag=2 por la pagina actual
+                    $query_string = explode($this->get_name.'='.$this->original_page, $_SERVER['QUERY_STRING']);
 					
-					// How start the new URL? To know it, we need to see the last character from current string
-					if (!in_array(substr($query_string[0], -1), array('?', '&'))) {
-						// Current string haven't any at end and it isn't "&" or "?" ?
-						// If initial string have one character at least it means that not is the first index 
-						if (isset($query_string[0][0])) $this->url_start = '?'.$query_string[0].'&';
-						else $this->url_start = '?'.$query_string[0];
-					} else {
-						// Current string already have ? or &,
-						$this->url_start = '?'.$query_string[0];
-					}
+                    // How start the new URL? To know it, we need to see the last character from current string
+                    if (!in_array(substr($query_string[0], -1), array('?', '&'))) {
+                        // Current string haven't any at end and it isn't "&" or "?" ?
+                        // If initial string have one character at least it means that not is the first index 
+                        if (isset($query_string[0][0])) $this->url_start = '?'.$query_string[0].'&';
+                        else $this->url_start = '?'.$query_string[0];
+                    } else {
+                        // Current string already have ? or &,
+                        $this->url_start = '?'.$query_string[0];
+                    }
 					
-					$this->url_end = isset($query_string[1]) ? $query_string[1] : '';
-				} else {
-					// Only specifics GET, reading all and finally leave in the same order
-					// With this we can clean all GET that we don't need (like hacker attempts)
-					$tmp = '';
-					$tmp_start = ''; // If we found the current page, we move here all $tmp
-					foreach ($gets as $get) {
-						if ($get != $get_name) {
-							// Trying to get the GET
-							if (isset($_GET[$get])) $tmp .= $get.'='.$_GET[$get].'&';
-						} else {
-							// Pour the $tmp content to $tmp_start
-							if ($tmp_start == '') $tmp_start .= '?';
-							$tmp_start .= $tmp;
-							$tmp = '';
-						}
-					}
+                    $this->url_end = isset($query_string[1]) ? $query_string[1] : '';
+                } else {
+                    // Only specifics GET, reading all and finally leave in the same order
+                    // With this we can clean all GET that we don't need (like hacker attempts)
+                    $tmp = '';
+                    $tmp_start = ''; // If we found the current page, we move here all $tmp
+                    foreach ($gets as $get) {
+                        if ($get != $get_name) {
+                            // Trying to get the GET
+                            if (isset($_GET[$get])) $tmp .= $get.'='.$_GET[$get].'&';
+                        } else {
+                            // Pour the $tmp content to $tmp_start
+                            if ($tmp_start == '') $tmp_start .= '?';
+                            $tmp_start .= $tmp;
+                            $tmp = '';
+                        }
+                    }
 					
-					// Finally, write the changes in the object
-					if ($tmp_start != '') {
-						// If have start and end
-						$this->url_start = $tmp_start;
-						$this->url_end = $tmp;
-					}
-					else $this->url_start = '?'.$tmp;
-				}
-			} else{
-				// Non recicle
-				$this->url_start = '?';
-				$this->url_end = ''; 
-			}
+                    // Finally, write the changes in the object
+                    if ($tmp_start != '') {
+                        // If have start and end
+                        $this->url_start = $tmp_start;
+                        $this->url_end = $tmp;
+                    }
+                    else $this->url_start = '?'.$tmp;
+                }
+            } else{
+                // Non recicle
+                $this->url_start = '?';
+                $this->url_end = ''; 
+            }
 			
-			// Add the pagination
-			$this->url_start .= $this->get_name.'=';
-		}
-	}
+            // Add the pagination
+            $this->url_start .= $this->get_name.'=';
+        }
+    }
 }
 ?>
\ No newline at end of file

Braces +53 added lines, -20 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -199,21 +199,21 @@ 
 		
 		// First / previous
 		if ($this->cur_page > 1) {
-			if ($this->first != '') $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">'.$this->first.'</a> ';
-			if ($this->previous != '') $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">'.$this->previous.'</a> ';
+			if ($this->first != '') $r .= '<a class="first" href="'.$url_start.'1'.$url_end.'">'.$this->first.'</a> ';
+			if ($this->previous != '') $r .= '<a class="previous" href="'.$url_start.($cur_page - 1).$url_end.'">'.$this->previous.'</a> ';
 		}
 		
 		// You can optimize this separating BEFORE and AFTER current page in two for (to avoid load "if" in each loop)
 		// but it would be difficult on changes
-		for ($n=$start; $n<=$end; $n++) {
-			if ($n != $cur_page) $r .= '<a class="link" href="'. $url_start . $n . $url_end . '">'.$n.'</a> ';
+		for ($n = $start; $n <= $end; $n++) {
+			if ($n != $cur_page) $r .= '<a class="link" href="'.$url_start.$n.$url_end.'">'.$n.'</a> ';
 			else $r .= '<a class="current">'.$n.'</a> ';
 		}
 		
 		// next / last
 		if ($this->cur_page < $this->total_pages) {
-			if ($this->next != '') $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">'.$this->next.'</a> ';
-			if ($this->last != '') $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end .'">'.$this->last.'</a> ';
+			if ($this->next != '') $r .= '<a class="next" href="'.$url_start.($cur_page + 1).$url_end.'">'.$this->next.'</a> ';
+			if ($this->last != '') $r .= '<a class="last" href="'.$url_start.$this->total_pages.$url_end.'">'.$this->last.'</a> ';
 		}
 		
 		// End div (if exist)
@@ -253,7 +253,7 @@ 
 		$records = $this->records;
 		
 		// Force maxium records loaded (only if is specified by user)
-		if ($max_records  > 0 and $max_records  > $total_records) 
+		if ($max_records > 0 and $max_records > $total_records) 
 			$this->total_records = $max_records;
 		
 		// Calculate total pages that have
@@ -335,7 +335,7 @@ 
 					}
 					else $this->url_start = '?'.$tmp;
 				}
-			} else{
+			} else {
 				// Non recicle
 				$this->url_start = '?';
 				$this->url_end = '';