Merge branch 'master' of ssh://gogs.vipe.re:6022/KarmaSolutions/KarmaFW

helpers/helpers_array.php

@@ -120,6 +120,8 @@ if (! function_exists('get_csv')) {
 
 if (! function_exists('exportToCsvFile')) {
 	function exportToCsvFile($rows, $export_filename=null, $fields=null) {
+		$csv_content = get_csv($rows, $fields);
+		
 		if (! empty($export_filename)) {
 			// download file
 			header('Content-Type: text/csv');
@@ -131,7 +133,7 @@ if (! function_exists('exportToCsvFile')) {
 			header('Content-Type: text/plain');
 		}
 
-		echo get_csv($rows, $fields);
+		echo $csv_content;
 		exit;
 	}
 }

helpers/helpers_default.php

@@ -49,6 +49,10 @@ if (! function_exists('errorHttp')) {
 
 if (! function_exists('redirect')) {
 	function redirect($url, $http_code=302) {
+		if ($http_code == 'link' || $http_code == 'debug') {
+			echo 'continue to <a href="' . $url . '">' . $url . '</a>';
+			exit;
+		}
 		header('Location: ' . $url, true, $http_code);
 		exit;
 	}

src/App.php

@@ -30,6 +30,16 @@ class App
 
 		// start session
 		if (empty(session_id())) {
+			if (defined('SESSION_NAME') && ! empty(SESSION_NAME)) {
+				session_name(SESSION_NAME);
+			}
+
+			if (defined('SESSION_DURATION') && is_numeric(SESSION_DURATION)) {
+				ini_set('session.gc_maxlifetime', SESSION_DURATION);
+				session_set_cookie_params(SESSION_DURATION);
+				// Note: si cron est actif, il faut modifier la valeur de session.gc_maxlifetime dans /etc/php/7.3/apache2/php.ini (voir /etc/cron.d/php)
+			}
+
 			session_start();
 		}
 

src/Database/Sql/SqlTable.php

@@ -71,6 +71,29 @@ class SqlTable
 			return null;
 		}
 
+		if (! empty($options['on duplicate key updates'])) {
+			$options['on_duplicate_key_updates'] = $options['on duplicate key updates'];
+		}
+		if (! empty($options['on_duplicate_key_update'])) {
+			$options['on_duplicate_key_updates'] = $options['on_duplicate_key_update'];
+		}
+		if (! empty($options['on duplicate key update'])) {
+			$options['on_duplicate_key_updates'] = $options['on duplicate key update'];
+		}
+		if (! empty($options['on duplicate key'])) {
+			$options['on_duplicate_key_updates'] = $options['on duplicate key'];
+		}
+		if (! empty($options['on_duplicate_key'])) {
+			$options['on_duplicate_key_updates'] = $options['on_duplicate_key'];
+		}
+		if (! empty($options['on_duplicate'])) {
+			$options['on_duplicate_key_updates'] = $options['on_duplicate'];
+		}
+		if (! empty($options['on duplicate'])) {
+			$options['on_duplicate_key_updates'] = $options['on duplicate'];
+		}
+
+
 		$inserts_sql = implode(', ', $values_array);
 
 		$ignore_sql = empty($options['ignore']) ? '' : 'ignore';
@@ -202,6 +225,7 @@ class SqlTable
 
 	public function getAllWithFoundRows($where=null, $options=[]) /* : array */
 	{
+		$options['CALC_FOUND_ROWS'] = true;
 		$query = $this->buildQuery($where, $options);
 
 		if (! empty($options['dry'])) {
@@ -268,7 +292,7 @@ class SqlTable
 			$options['select'] = is_array($options['select']) ? $options['select'] : [$options['select']];
 			$select_sql = implode(', ', $options['select']);
 		}
-		if (! empty($options['CALC_FOUND_ROWS'])) {
+		if (! empty($options['CALC_FOUND_ROWS']) && stripos($select_sql, 'SQL_CALC_FOUND_ROWS') === false) {
 			$select_sql = 'SQL_CALC_FOUND_ROWS ' . $select_sql;
 		}
 		if (! empty($options['where'])) {

src/Database/Sql/SqlTableModel.php

@@ -9,6 +9,7 @@ class SqlTableModel
 {
 	public static $table_name = '';
 	public static $primary_key = [];
+	protected static $default_item = [];
 
 
 	public static function getDb()
@@ -67,6 +68,17 @@ class SqlTableModel
 	}
 
 
+	public static function getAllPagination($where=null, $options=[])
+	{
+		$db = static::getDb();
+		static::checkTable();
+		
+		$tuple = $db->getTable(static::$table_name)->getAllWithFoundRows($where, $options);
+		//list($found_rows, $data) = $tuple;
+		return $tuple;
+	}
+
+
 
 	public static function one($where=[], $options=[])
 	{
@@ -158,4 +170,11 @@ class SqlTableModel
 
 	}
 
+
+
+	public static function getDefaultItem()
+	{
+		return array_slice(static::$default_item, 0);
+	}
+
 }

src/Lib/Email/Email_lib.php

@@ -2,8 +2,8 @@
 
 namespace KarmaFW\Lib\Email;
 
-use PHPMailer\PHPMailer\PHPMailer;
-use PHPMailer\PHPMailer\Exception;
+use \PHPMailer\PHPMailer\PHPMailer;
+use \PHPMailer\PHPMailer\Exception;
 
 
 class Email_lib
@@ -85,8 +85,13 @@ class Email_lib
 			$mail->Body = $message_text;
 		}
 
+		//$mail->SMTPDebug = 4;
+
 		if(!$mail->Send()){
-			//echo $mail->ErrorInfo;
+			if (false) {
+				echo $mail->ErrorInfo . PHP_EOL;
+				print_r($mail);
+			}
 			$ok = false;
 		} else {
 			//echo 'Mail envoyé avec succès';

src/Routing/Route.php

@@ -16,6 +16,7 @@ class Route
 	private $prefix = '';
 	private $prefix_callback = null;
 	private $nomatch_patterns = [];
+	private $matched_params = [];
 
 
 	public function __construct()
@@ -67,6 +68,20 @@ class Route
 		$this->regex_params = $regex_params;
 	}
 
+	public function getRegexParams()
+	{
+		return $this->regex_params;
+	}
+
+	public function setMatchedParams(array $matched_params)
+	{
+		$this->matched_params = $matched_params;
+	}
+	public function getMatchedParams()
+	{
+		return $this->matched_params;
+	}
+
 	// Get route name
 	public function getName()
 	{

src/Routing/Router.php

@@ -110,6 +110,8 @@ class Router
 
 	public static function routeRun($route, $callback, $request_method, $request_uri, $match_params)
 	{
+		$route->setMatchedParams($match_params);
+
 		if (gettype($callback) == 'array') {
 			//echo " => ARRAY !<br />" . PHP_EOL;
 			//pre($callback, 1);

src/Templates/PhpTemplate.php

@@ -215,8 +215,8 @@ class PhpTemplate
 						// $variable
 						$replaced = ${$var};
 						$content = str_replace($reg[0], $replaced, $content);
-					} else {
 
+					} else {
 						// if variable not exists, replace with empty string
 						$content = str_replace($reg[0], '', $content);
 					}