webcol / Calima

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

Spacing +18 added lines, -18 removed lines

@@ -193,27 +193,27 @@ 
 		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.'">';
+		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> ';
+		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
@@ -275,7 +275,7 @@ 
 		
 		// Saving changes
 		$this->first_record = $start;
-		$this->limit = ' LIMIT '.$start.','.$records.' ';
+		$this->limit = ' LIMIT ' . $start . ',' . $records . ' ';
 	}
 	
 	/**
@@ -296,17 +296,17 @@ 
 					// 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']);
+					$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];
+						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_start = '?' . $query_string[0];
 					}
 					
 					$this->url_end = isset($query_string[1]) ? $query_string[1] : '';
@@ -318,7 +318,7 @@ 
 					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 .= '?';
@@ -333,16 +333,16 @@ 
 						$this->url_start = $tmp_start;
 						$this->url_end = $tmp;
 					}
-					else $this->url_start = '?'.$tmp;
+					else $this->url_start = '?' . $tmp;
 				}
-			} else{
+			} else {
 				// Non recicle
 				$this->url_start = '?';
 				$this->url_end = ''; 
 			}
 			
 			// Add the pagination
-			$this->url_start .= $this->get_name.'=';
+			$this->url_start .= $this->get_name . '=';
 		}
 	}
 }

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

Sistema/Ayudantes/CFPHPVinculos.php

Indentation +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 class CFPHPVinculos {
     
-    function get_dominio(){
+    function get_dominio() {
     
     $dominio = "http://www.my-site-domain.com/";
     return $dominio;

Sistema/Nucleo/CFBootstrap.php

Spacing +7 added lines, -7 removed lines

@@ -32,31 +32,31 @@
     {
         $controlador = $peticion->getControlador() . 'Controlador';
         //definimos la ruta al controlador
-        $rutaControlador = SITE_ROOT . 'mvc' . DS .'controladores' . DS . $controlador . '.php';
+        $rutaControlador = SITE_ROOT . 'mvc' . DS . 'controladores' . DS . $controlador . '.php';
         $metodo = $peticion->getMetodo();
         $args = $peticion->getArgumentos();
         
         //verifcamos que el archivo existe con la funcion de PHP is_readable
-        if(is_readable($rutaControlador)){
+        if (is_readable($rutaControlador)) {
             require_once $rutaControlador;
             $controlador = new $controlador;
             
-            if(is_callable(array($controlador, $metodo))){
+            if (is_callable(array($controlador, $metodo))) {
                 $metodo = $peticion->getMetodo();
             }
-            else{
+            else {
                 $metodo = 'index';
             }
             
-            if(isset($args)){
+            if (isset($args)) {
                 call_user_func_array(array($controlador, $metodo), $args);
             }
-            else{
+            else {
                 call_user_func(array($controlador, $metodo));
             }
             
         } else {
-            header('Location: '.  Cf_BASE_URL.'error/');           
+            header('Location: ' . Cf_BASE_URL . 'error/');           
         }
     }
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -43,15 +43,13 @@
             
             if(is_callable(array($controlador, $metodo))){
                 $metodo = $peticion->getMetodo();
-            }
-            else{
+            } else{
                 $metodo = 'index';
             }
             
             if(isset($args)){
                 call_user_func_array(array($controlador, $metodo), $args);
-            }
-            else{
+            } else{
                 call_user_func(array($controlador, $metodo));
             }
             

Sistema/Nucleo/CFConfiguracion.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 define('Cf_KEY_MD5', 'P0L1');
 
 /*  en el controlador concatena la constante con el llamado a la funcion generarCadenaAleatoria() de Cf_PHPSeguridad */
-define('Cf_CSRF_SECRET','Cfbeta');
+define('Cf_CSRF_SECRET', 'Cfbeta');
 
 /* #base de datos */
 

Sistema/Nucleo/CFControlador.php

Indentation +5 added lines, -5 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -34,9 +34,9 @@ 
         $this->_vista = new CFVista(new CFSolicitud);
     }
     
-    protected function cargaLib($libreria){
+    protected function cargaLib($libreria) {
         $rutaLib = RUTA_LIBS . $libreria . '.php';
-        if(is_readable($rutaLib)){
+        if (is_readable($rutaLib)) {
             require_once $rutaLib;
            //echo 'libreria cargada';
         }
@@ -45,10 +45,10 @@ 
         }
     }
     
-    protected function cargaModelo($modelo){
-        $modelo=$modelo.'Modelo';
+    protected function cargaModelo($modelo) {
+        $modelo = $modelo . 'Modelo';
        $rutaMod = RUTA_MOD . $modelo . '.php';
-        if(is_readable($rutaMod)){
+        if (is_readable($rutaMod)) {
             require_once $rutaMod;
             $modelo = new $modelo;
             return $modelo;
@@ -63,9 +63,9 @@ 
         }
     }
     
-    protected function cargaAyudante($ayudante){
+    protected function cargaAyudante($ayudante) {
        $rutaAyudante = RUTA_AYUDANTES . $ayudante . '.php';
-        if(is_readable($rutaAyudante)){
+        if (is_readable($rutaAyudante)) {
             require_once $rutaAyudante;
            //echo 'libreria cargada';
         }

Braces +3 added lines, -6 removed lines

@@ -39,8 +39,7 @@ 
         if(is_readable($rutaLib)){
             require_once $rutaLib;
            //echo 'libreria cargada';
-        }
-        else {
+        } else {
             throw new Exception("houston tenemos un problema! al cargar libreria");
         }
     }
@@ -53,8 +52,7 @@ 
             $modelo = new $modelo;
             return $modelo;
            //echo 'modelo cargado';
-        }
-        else {
+        } else {
             //echo $rutaMod;
             
             
@@ -68,8 +66,7 @@ 
         if(is_readable($rutaAyudante)){
             require_once $rutaAyudante;
            //echo 'libreria cargada';
-        }
-        else {
+        } else {
             throw new Exception("houston tenemos un problema! al cargar ayudante");
         }
     }

Sistema/Nucleo/CFSolicitud.php

Spacing +4 added lines, -4 removed lines

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

Sistema/Nucleo/CFVista.php

Spacing +2 added lines, -2 removed lines

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

Braces +1 added lines, -2 removed lines

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

index.php

Indentation +13 added lines, -13 removed lines

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

Spacing +17 added lines, -17 removed lines

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

Braces +3 added lines, -6 removed lines

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

mvc/controladores/blogControlador.php

Indentation +5 added lines, -5 removed lines

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

Spacing +17 added lines, -17 removed lines

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