Bugfix db pagination total, fonts directory in Captcha class is publi…

…c and can be changed
exacti · Nov 18, 2019 · 488ac37 · 488ac37
1 parent 8332e0b
commit 488ac37
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/system/captcha/autoload.php b/system/captcha/autoload.php
@@ -9,6 +9,7 @@ class Captcha {
 	protected $perturbation = 0.90;
 	protected $noise_level = 1;
 	protected $background = 'black';
+	public $fonts = __DIR__."/fonts/*/*.ttf";
 	public $pos = 'ABCDEFGHJKLMNOPQRSTUWVXZ0123456789abcdefhijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUWVXZ0123456789';
 
 	function __construct($width = NULL, $height = NULL, $numChar = 6, $background = 'black') {
@@ -31,8 +32,6 @@ function __construct($width = NULL, $height = NULL, $numChar = 6, $background =
 		$this->width = ($width != NULL) ? $width : $this->width;
 		$this->height = ($height != NULL) ? $height : $this->height;
 
-		$this->ttfFonts = glob(__DIR__."/fonts/*/*.ttf");
-
 	}
 
 	public function __help() {
@@ -125,8 +124,9 @@ function showImage($format = 'png') {
         imagefilledrectangle($image, $width - 1, 0, $width - 1, $height - 1, $black);
         imagefilledrectangle($image, 0, 0, 0, $height - 1, $black);
         imagefilledrectangle($image, 0, $height - 1, $width, $height - 1, $black);
-
 
+
+        $this->ttfFonts = glob($this->fonts);
 
         $space = ($this->width - 10) / $this->numChar;
 

diff --git a/system/captcha/fonts/party-time/Party Time.pdf b/system/captcha/fonts/party-time/Party Time.pdf
diff --git a/system/database/library/db.php b/system/database/library/db.php
@@ -59,6 +59,12 @@ public function pagination($sql, $pageNum_exibe = 1, $maxRows_exibe = 10, $cache
         $all_exibe = $this->query($all_exibe_query, $cache);
         $totalRows_exibe = (isset($all_exibe->row['__TOTALdeREG_DB_Pagination'])) ? $all_exibe->row['__TOTALdeREG_DB_Pagination'] : $all_exibe->num_rows;
 
+        if($totalRows_exibe <= 0){
+            $all_exibe_query = $query_exibe;
+            $all_exibe = $this->query($all_exibe_query, $cache);
+            $totalRows_exibe = (isset($all_exibe->row['__TOTALdeREG_DB_Pagination'])) ? $all_exibe->row['__TOTALdeREG_DB_Pagination'] : $all_exibe->num_rows;
+        }
+
         $totalPages_exibe = ceil($totalRows_exibe/$maxRows_exibe);
 
         $exibe->totalPages_exibe = $totalPages_exibe;

diff --git a/system/engine/VERSION b/system/engine/VERSION
@@ -1 +1 @@
-1.4.2
+1.4.3