Merge branch 'dev'

Dj1b · Feb 1, 2021 · ce4920d · ce4920d
2 parents b48820c + c755774
commit ce4920d
Show file tree

Hide file tree

Showing 159 changed files with 13,745 additions and 12,981 deletions.
diff --git a/Camyks.php.inc b/Camyks.php.inc
@@ -3,10 +3,10 @@
  * @brief CaMykS CMS master class.
  * @details Engine / Main Object
  * @author CaMykS Team <camyks.contact@gmail.com>
- * @version 1.0.21.1
+ * @version 1.0.21.2
  * @date Creation: Jun 2005
- * @date Modification: Dec 2020
- * @copyright 2005 - 2020 CaMykS Team
+ * @date Modification: Jan 2021
+ * @copyright 2005 - 2021 CaMykS Team
  * @note This program is distributed as is - WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
@@ -2108,7 +2108,7 @@ final class Camyks {
      * @return string
      */
     public function get_siteCurrentLink($lg='', $params=null) {
-        return $this->get_siteLink($this->contentPage->id, $this->contentPage->name, $lg, $params!=null ? $params : $this->contentPage->params);
+        return $this->get_siteLink($this->contentPage->id, $this->contentPage->name, $lg, !is_null($params) ? $params : $this->contentPage->params);
     }
 
     /**
@@ -2144,7 +2144,7 @@ final class Camyks {
      * @param string $params
      * @return array
      */
-    function get_siteLinkDecodeParams($params) {
+    public function get_siteLinkDecodeParams($params) {
         $p = array();
         $params = explode('_', $params);
         for ($i=1; $i<count($params); $i+=2) {
@@ -2160,7 +2160,7 @@ final class Camyks {
      * @return void
      */
     private function get_pageContent() {
-        if ($this->benchMode!==false) $this->benchMode->start('CaMykS page loading');
+        if ($this->benchMode !== false) $this->benchMode->start('CaMykS page loading');
 
         switch ($this->mode) {
             case CAMYKS_MODE_SITE:
@@ -2432,7 +2432,7 @@ final class Camyks {
      * @param array $params
      * @return string
      */
-    public function get_siteLinkByName ($name, $lg='', $params=array()) {
+    public function get_siteLinkByName($name, $lg='', $params=array()) {
         $page = ContentPage::static_get_pageBasicInfoByName($name);
         return $this->get_rootBaseURL().$this->get_siteLink($page->id, $page->name, $lg, $params);
     }

diff --git a/documents/changelogs/Release-20210101.md b/documents/changelogs/Release-20210101.md
@@ -0,0 +1,21 @@
+# CaMykS Changelog
+## Release 20210101
+
+* [2020-12-01 10:30:38 +0100 | JB Lebrun] Adds December 2020 release history in changelogs. [#View details](https://github.com/Dj1b/CaMykS/commit/c6197628158ca1184404785c3f498c288bab5ec6)
+* [2020-12-01 12:33:05 +0100 | JB Lebrun] Normalises files format, indents more nicely the code and makes the Admin_Group module, ready to be parsed by Doxygen. [#View details](https://github.com/Dj1b/CaMykS/commit/825d80428bae45050150f5a47bc3ffeec60c4721)
+* [2020-12-02 12:33:17 +0100 | Dj1b] Normalises files format, indents more nicely the code and makes the Admin_GenericBlogsManager module, ready to be parsed by Doxygen. [#View details](https://github.com/Dj1b/CaMykS/commit/1554e22bd9265a5d9fcf310a7549bbf876778f09)
+* [2020-12-02 12:37:12 +0100 | Dj1b] Fixes PHP 8 Fatal error while calling vsprintf with textual parameters instead of an array in CaMykS main library. [#View details](https://github.com/Dj1b/CaMykS/commit/22a6e4dda1eed14090e6dd073364673a91a38176)
+* [2020-12-02 12:43:05 +0100 | Dj1b] Fixes PHP deprecated constructor, keeping old websites compatibility in Input library. [#View details](https://github.com/Dj1b/CaMykS/commit/0a33d7e38dbcb4c0076257000557162eb6283f9d)
+* [2020-12-03 17:57:47 +0100 | Dj1b] Normalises files format, indents more nicely the code and makes the Admin_GenericDownloadManager module, ready to be parsed by Doxygen. [#View details](https://github.com/Dj1b/CaMykS/commit/1f1ef7c917caa113dd5fc7b5dcae223b320bea45)
+* [2020-12-04 09:28:31 +0100 | Dj1b] Fixes PHP Notice when buttons value is not properly set in HTMLForm library. [#View details](https://github.com/Dj1b/CaMykS/commit/6b055692c39a0782311dd4417ba8b3f3ed0aff41)
+* [2020-12-07 20:28:55 +0100 | Dj1b] Updates PEAR Mail Mime libraries. [#View details](https://github.com/Dj1b/CaMykS/commit/da4fbcd75d89ee32f47d658013e54e50bf705901)
+* [2020-12-07 20:33:10 +0100 | Dj1b] Fixes PHP warnings (Division by zero) in tab sub layouts in Admin_Statistics module. [#View details](https://github.com/Dj1b/CaMykS/commit/a81010880d7f28c398efa84458e0cd5ccc227305)
+* [2020-12-12 11:09:58 +0100 | Dj1b] Inserts IPGeolocator input. [#View details](https://github.com/Dj1b/CaMykS/commit/64e4280557db26c4df6782a85d2765b81c238b8c)
+* [2020-12-14 11:16:05 +0100 | Dj1b] Adds english locales and does some enhancements to IPGeolocator input. [#View details](https://github.com/Dj1b/CaMykS/commit/5df849f01641dac6add3e8a7cbdbf6388010b4e3)
+* [2020-12-15 20:38:03 +0100 | Dj1b] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/b36885d9832bd46d91d5b16c92e074b013c6f8e9)
+* [2020-12-16 17:58:54 +0100 | Dj1b] Adds Opcode status and cache reset features in Admin_Site module. [#View details](https://github.com/Dj1b/CaMykS/commit/e227ad46018c95bff5291cca2f35d2be05c848cc)
+* [2020-12-21 17:10:43 +0100 | Dj1b] Updates FPDF library. [#View details](https://github.com/Dj1b/CaMykS/commit/ec3304d8414597fb984767184a871e004302fcf9)
+* [2020-12-24 12:16:37 +0100 | Dj1b] Adds a parameter to insert an intermediate folder in social networks icon path in SocialNetworksSharingPanel input. [#View details](https://github.com/Dj1b/CaMykS/commit/32a75a55870bde8ac9b73e5d520d35040167a595)
+* [2020-12-24 14:22:23 +0100 | Dj1b] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/08b41e5121630f0caf12d11a21da93243fabd853)
+* [2020-12-24 14:23:04 +0100 | Dj1b] Does some files cleaning. [#View details](https://github.com/Dj1b/CaMykS/commit/5c3a934201acc0c018eb3cdd0b0a920f03c0df80)
+* [2021-01-05 11:50:55 +0100 | Dj1b] Prepares release. [#View details](https://github.com/Dj1b/CaMykS/commit/b48820ce0941616d4a01888dc4301184ead1aa50)
diff --git a/engine/etc/dynamic.php.inc b/engine/etc/dynamic.php.inc
@@ -3,16 +3,15 @@
  * @brief CaMykS dynamic configuration
  * @brief Automatically loaded by CaMykS object.
  * @details Engine / Configuration file
- * @file engine/etc/dynamic.php.inc
  * @author CaMykS Team <camyks.contact@gmail.com>
- * @version 1.0
+ * @version 1.0.0.1
  * @date Creation: Sep 2005
- * @date Modification: Apr 2018
- * @copyright 2005 - 2018 CaMykS Team
- * @note This program is distributed as is - WITHOUT ANY WARRANTY; 
+ * @date Modification: Jan 2021
+ * @copyright 2005 - 2021 CaMykS Team
+ * @note This program is distributed as is - WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
- 
+
 /**
  * @var array $this->_conf
  * @brief CaMykS Configuration
@@ -30,16 +29,16 @@
  */
 $this->_conf = array(
     'server_encoding'   => 'utf8',
-    'database_driver'   => '', 
-    'database_host'     => '', 
-    'database_login'    => '', 
-    'database_password' => '', 
+    'database_driver'   => '',
+    'database_host'     => '',
+    'database_login'    => '',
+    'database_password' => '',
     'ModuleActionDelay' => 4,
     'TimeZone'          => 'Europe/Paris',
     'UserAgent'         => 'Mozilla/5.0 (compatible; CaMykSRequest/1.0; +http://www.camyks.net/request_bot.html)',
 );
 
 /* load locale configuration */
 if (file_exists($this->camyks_path.'/engine/etc/dynamic.local.php.inc'))
-  require($this->camyks_path.'/engine/etc/dynamic.local.php.inc');
+  require $this->camyks_path.'/engine/etc/dynamic.local.php.inc';
 ?>
diff --git a/engine/etc/static.php.inc b/engine/etc/static.php.inc
@@ -4,10 +4,10 @@
  * @brief Automatically loaded by CaMykS object.
  * @details Engine / Configuration file
  * @author CaMykS Team <camyks.contact@gmail.com>
- * @version 1.0.26
+ * @version 1.0.27
  * @date Creation: Sep 2005
- * @date Modification: Dec 2020
- * @copyright 2005 - 2020 CaMykS Team
+ * @date Modification: Feb 2021
+ * @copyright 2005 - 2021 CaMykS Team
  * @note This program is distributed as is - WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
@@ -22,7 +22,7 @@ $this->website = 'https://www.camyks.net';
  * @var string $this->version
  * @brief CaMykS full version
  */
-$this->version = '1.0-20210101';
+$this->version = '1.0-20210201';
 
 /**
  * @var string $this->mversion
@@ -34,13 +34,13 @@ $this->mversion = '1.0';
  * @var string $this->nversion
  * @brief CaMykS minor version
  */
-$this->nversion = '20210101';
+$this->nversion = '20210201';
 
 /**
  * @var integer $this->last_modification_date
  * @brief CaMykS last modification date
  */
-$this->last_modification_date = mktime(0, 0, 0, 1, 1, 2021);
+$this->last_modification_date = mktime(0, 0, 0, 2, 1, 2021);
 
 /**
  * @var string $this->engine_folder

diff --git a/engine/lib/object/Plugin.php.inc b/engine/lib/object/Plugin.php.inc
@@ -3,12 +3,11 @@
  * @brief Plugin object
  * <br />Parent object for Module, Input, Template, Theme
  * @details Engine / Object Library
- * @file engine/lib/object/Plugin.php.inc
  * @author CaMykS Team <camyks.contact@gmail.com>
- * @version 1.0.8
+ * @version 1.0.8.1
  * @date Creation: Jun 2005
- * @date Modification: Jun 2019
- * @copyright 2005 - 2019 CaMykS Team
+ * @date Modification: Jan 2021
+ * @copyright 2005 - 2021 CaMykS Team
  * @note This program is distributed as is - WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
@@ -364,7 +363,7 @@ abstract class Plugin {
      */
     protected function add_meta($name, $content, $method='name') {
         global $camyks;
-         $camyks->HTMLPage->add_meta ($name, $content, $method);
+         $camyks->HTMLPage->add_meta($name, $content, $method);
     }
 
     /***************** JS & CSS METHODS ******************/