diff --git a/system/captcha/autoload.php b/system/captcha/autoload.php index f580948..8ab0a38 100644 --- 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 @@ class Captcha { $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 @@ class Captcha { 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 deleted file mode 100644 index 7f9b400..0000000 Binary files a/system/captcha/fonts/party-time/Party Time.pdf and /dev/null differ diff --git a/system/database/library/db.php b/system/database/library/db.php index 1dee502..680ab19 100644 --- a/system/database/library/db.php +++ b/system/database/library/db.php @@ -59,6 +59,12 @@ final class DB { $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 index c9929e3..3c80e4f 100644 --- a/system/engine/VERSION +++ b/system/engine/VERSION @@ -1 +1 @@ -1.4.2 \ No newline at end of file +1.4.3 \ No newline at end of file