v24.2.3

xech · Mar 11, 2024 · 8da6a6e · 8da6a6e
1 parent 5c0edae
commit 8da6a6e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git a/app/Common/DbUpdate.php b/app/Common/DbUpdate.php
@@ -81,10 +81,10 @@ public static function lauchUpdate()
 			Req::verifPhpVersion();
 			if(is_writable(PATH_DATAS."config.inc.php")==false)  {throw new Exception("Update error : Config.inc.php is not writable");}
 			////	VERROUILAGE DE LA MISE A JOUR
-			$lockedUpdate=PATH_DATAS."lockedUpdate.log";
+			$lockedUpdate="UPDATE_LOCK.log";
 			if(is_file($lockedUpdate)==false)				{file_put_contents($lockedUpdate,"LOCKED UPDATE - VERROUILAGE DE MISE A JOUR");}
 			elseif((time()-filemtime($lockedUpdate))<10)	{throw new Exception("Update in progress : please wait a few seconds");}
-			else											{throw new Exception("Update error : check Apache/PHP logs for details. If the issue is resolved : delete the '/DATAS/lockedUpdate.log' file.");}
+			else											{throw new Exception("Update error : check Apache/PHP logs for details. When the issue is resolved : delete the '".$lockedUpdate."' file.");}
 			////	ALLONGE L'EXECUTION DU SCRIPT  &&  SAUVEGARDE LA DB
 			ignore_user_abort(true);
 			@set_time_limit(120);//pas en safemode 
@@ -889,7 +889,7 @@ public static function lauchUpdate()
 				if(self::fieldExist("ap_contact","picture"))		{self::query("ALTER TABLE `ap_contact` DROP `picture`");}
 			}
 
-			if(self::updateVersion("24.2.1"))
+			if(self::updateVersion("24.2.3"))
 			{
 				//Agendas d'espace : ajoute la description "Agenda partagé de l'espace"
 				foreach(self::getLine("SELECT `name` FROM ap_space") as $tmpSpaceName){
@@ -903,8 +903,8 @@ public static function lauchUpdate()
 				self::query("ALTER TABLE `ap_task` CHANGE `dateBegin` `dateBegin` DATE NULL DEFAULT NULL");
 				self::query("ALTER TABLE `ap_task` CHANGE `dateEnd` `dateEnd` DATE NULL DEFAULT NULL");
 				//Task Kanban :  Créé le champ `_idStatus` dans la table "ap_task"  &&  Créé la table "ap_TaskStatus" des statuts/colonnes Kanban  &&   Créé les satuts/colonnes kanban de base
-				self::fieldExist(MdlTask::dbTable, "_idStatus",  "ALTER TABLE ".MdlTask::dbTable." ADD `_idStatus` int DEFAULT NULL AFTER `description`");
-				self::tableExist(MdlTaskStatus::dbTable,  "CREATE TABLE ".MdlTaskStatus::dbTable." (`_id` int NOT NULL AUTO_INCREMENT,  `_idSpaces` text,  `title` varchar(255) DEFAULT NULL,  `description` text,  `color` varchar(255) DEFAULT NULL,  `rank` smallint DEFAULT NULL,  `dateCrea` datetime DEFAULT NOW(),  `_idUser` int DEFAULT NULL,  `dateModif` datetime DEFAULT NULL,  `_idUserModif` int DEFAULT NULL,  PRIMARY KEY (`_id`))  ENGINE=InnoDB DEFAULT CHARSET=utf8");
+				self::fieldExist(MdlTask::dbTable, "_idStatus",  "ALTER TABLE ap_task ADD `_idStatus` int DEFAULT NULL AFTER `description`");
+				self::tableExist(MdlTaskStatus::dbTable,  "CREATE TABLE ap_taskStatus (`_id` int NOT NULL AUTO_INCREMENT,  `_idSpaces` text,  `title` varchar(255) DEFAULT NULL,  `description` text,  `color` varchar(255) DEFAULT NULL,  `rank` smallint DEFAULT NULL,  `dateCrea` datetime DEFAULT NULL,  `_idUser` int DEFAULT NULL,  `dateModif` datetime DEFAULT NULL,  `_idUserModif` int DEFAULT NULL,  PRIMARY KEY (`_id`))  ENGINE=InnoDB DEFAULT CHARSET=utf8");
 				MdlTaskStatus::dbFirstRecord();
 				//Catégories d'evt  &&  Themes du forum : créé le champ `rank`
 				self::fieldExist(MdlCalendarEventCategory::dbTable, "rank", "ALTER TABLE ".MdlCalendarEventCategory::dbTable." ADD `rank` smallint DEFAULT NULL AFTER `color`");

diff --git a/app/Common/MdlObject.php b/app/Common/MdlObject.php
@@ -7,6 +7,10 @@
 */
 
 
+/** Autorise la création dynamique de propriétés récupérées en bdd, dans "__construct()" **/
+#[\AllowDynamicProperties]
+
+
 /*
  * Classe principale des Objects
  */

diff --git a/app/ModCalendar/MdlCalendar.php b/app/ModCalendar/MdlCalendar.php
@@ -294,8 +294,8 @@ public static function sortCalendars($calendarsTab)
 			elseif($tmpCal->isPersonalCalendar())	{$tmpCal->sortField="C__".$tmpCal->$userSortField;}
 			else									{$tmpCal->sortField="D__".$tmpCal->$userSortField;}
 		}
-		//Tri les agendas via "self::sortCompareCalendars()"
-		usort($calendarsTab,["self","sortCompareCalendars"]);
+		//Tri les agendas via "MdlCalendar::sortCompareCalendars()"  (pas de "self::sortCompareCalendars()")
+		usort($calendarsTab,["MdlCalendar","sortCompareCalendars"]);
 		return $calendarsTab;
 	}
 	//// Comparaison binaire de caractere, mais insensible à la casse

diff --git a/app/ModOffline/db.sql b/app/ModOffline/db.sql
@@ -399,7 +399,7 @@ CREATE TABLE `ap_taskStatus` (
   `description` text,
   `color` varchar(255) DEFAULT NULL,
   `rank` smallint DEFAULT NULL,
-  `dateCrea` datetime DEFAULT NOW(),
+  `dateCrea` datetime DEFAULT NULL,
   `_idUser` int DEFAULT NULL,
   `dateModif` datetime DEFAULT NULL,
   `_idUserModif` int DEFAULT NULL,

diff --git a/app/VERSION.txt b/app/VERSION.txt
@@ -1 +1 @@
-24.2.1
+24.2.3
diff --git a/app/css/common-24.2.1.css → app/css/common-24.2.3.css b/app/css/common-24.2.1.css → app/css/common-24.2.3.css
diff --git a/app/js/common-24.2.1.js → app/js/common-24.2.3.js b/app/js/common-24.2.1.js → app/js/common-24.2.3.js
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -4,7 +4,7 @@ CHANGELOG - JOURNAL DES VERSIONS
 #################################
 
 
-VERSION 24.2.1
+VERSION 24.2.3
 ###############
 Nouvelle option des tâches pour attribuer un état "A faire", "En cours", "Terminé", etc
 Nouvelle option pour réordonner les thèmes du forum et catégories d'événement
@@ -13,26 +13,28 @@ Amélioration du menu des "agendas disponibles"
 Amélioration de menu d'édition des événements de l'agenda
 Amélioration de l'affichage en "mode sombre"
 Optimisation du contrôle de l'édition des agendas partagés d'espace
-Optimisation des contrôles de l'installation et mise à jour de l'application (timeZone & Bdd)
+Optimisation des contrôles de l'installation et mise à jour de l'application (time Zone & Bdd)
 Optimisation de l'appel de l'éditeur TinyMce
 Optimisation des contrôles des formulaires principaux
+Optimisation pour PHP 8.3
 Mise à jour de PHPMailer en version 6.7.1
 Mise à jour de TinyMce en version v6.8.2
-Mise à jour de Jquery-UI en version v1.13.2
+Mise à jour de JQuery-UI en version v1.13.2
 -----
 New task option to assign a status "To do", "In progress", "Finished", etc.
 New option to reorder forum themes and event categories
-Improved management of forum themes and event categories, etc. (colorPicker & co)
+Improved management of forum themes and event categories, etc. (color Picker and co)
 Improved "available calendars" menu
 Improved calendar events editing menu
 Improved "dark mode" display
-Optimization of the control of the edition of shared space calendars
-Optimization of application installation & update controls (timeZone & Bdd)
+Optimization of editing control of shared space calendars
+Optimization of application installation & update controls (time Zone and DB)
 Optimization of the TinyMce editor call
 Optimizing main form controls
-PHPMailer updated to v6.7.1
+Optimizing for PHP 8.3
+PHP-Mailer updated to v6.7.1
 TinyMce updated to v6.8.2
-Jquery-UI updated to v1.13.2
+JQuery-UI updated to v1.13.2
 
 
 VERSION 23.10.3