Skip to content
Permalink
Browse files

Merge branch 'dev'

  • Loading branch information
JB Lebrun
JB Lebrun committed Oct 1, 2019
2 parents d45b71e + 878cd59 commit af316a54186e84596f477998243fff320e1c933f
Showing with 19,623 additions and 214 deletions.
  1. +15 −0 documents/changelogs/Release-20190901.md
  2. BIN engine/data/img/flag/id.gif
  3. +6 −6 engine/etc/static.php.inc
  4. +4 −4 engine/lib/object/CPDF.php.inc
  5. +10 −6 engine/lib/object/HTMLForm.php.inc
  6. +134 −56 engine/lib/tool/client.php.inc
  7. +54 −4 engine/lib/tool/clientBots/Bots.php.inc
  8. +22 −2 engine/lib/tool/clientBots/Generics.php.inc
  9. +4 −3 engine/lib/tool/clientBots/Tools.php.inc
  10. +13 −3 engine/lib/tool/clientBots/Unknowns.php.inc
  11. +6 −5 engine/lib/tool/clientDevices/Advan.php.inc
  12. +5 −2 engine/lib/tool/clientDevices/Asus.php.inc
  13. +3 −2 engine/lib/tool/clientDevices/BlackBerry.php.inc
  14. +3 −2 engine/lib/tool/clientDevices/Cat.php.inc
  15. +47 −0 engine/lib/tool/clientDevices/Chuwi.php.inc
  16. +7 −8 engine/lib/tool/clientDevices/Cubot.php.inc
  17. +50 −0 engine/lib/tool/clientDevices/Danew.php.inc
  18. +46 −0 engine/lib/tool/clientDevices/Dexp.php.inc
  19. +3 −2 engine/lib/tool/clientDevices/HTC.php.inc
  20. +9 −2 engine/lib/tool/clientDevices/Huawei.php.inc
  21. +46 −0 engine/lib/tool/clientDevices/Hyundai.php.inc
  22. +12 −8 engine/lib/tool/clientDevices/Infinix.php.inc
  23. +47 −0 engine/lib/tool/clientDevices/Intex.php.inc
  24. +4 −3 engine/lib/tool/clientDevices/Konrow.php.inc
  25. +3 −2 engine/lib/tool/clientDevices/LG.php.inc
  26. +3 −3 engine/lib/tool/clientDevices/Lenovo.php.inc
  27. +3 −2 engine/lib/tool/clientDevices/Logicom.php.inc
  28. +4 −2 engine/lib/tool/clientDevices/Meizu.php.inc
  29. +4 −2 engine/lib/tool/clientDevices/Motorola.php.inc
  30. +3 −2 engine/lib/tool/clientDevices/OnePlus.php.inc
  31. +3 −2 engine/lib/tool/clientDevices/Orange.php.inc
  32. +4 −3 engine/lib/tool/clientDevices/Qilive.php.inc
  33. +46 −0 engine/lib/tool/clientDevices/SPC.php.inc
  34. +15 −3 engine/lib/tool/clientDevices/Samsung.php.inc
  35. +6 −2 engine/lib/tool/clientDevices/Sony.php.inc
  36. +6 −2 engine/lib/tool/clientDevices/Tecno.php.inc
  37. +4 −3 engine/lib/tool/clientDevices/Ulefone.php.inc
  38. +46 −0 engine/lib/tool/clientDevices/Vertex.php.inc
  39. +3 −2 engine/lib/tool/clientDevices/Wiko.php.inc
  40. +8 −4 engine/lib/tool/clientDevices/Xiaomi.php.inc
  41. +28 −10 engine/lib/tool/folder.php.inc
  42. +3 −3 plugin/module/Admin_GenericEmailingManager/Admin_GenericEmailingManager.php.inc
  43. +135 −9 plugin/module/Admin_SecurityTools/Admin_SecurityTools.php.inc
  44. +24 −2 plugin/module/Admin_SecurityTools/html/admin.html.inc
  45. +171 −0 plugin/module/Admin_SecurityTools/html/admin_check_CaMykSIntegrity.html.inc
  46. +18,461 −0 plugin/module/Admin_SecurityTools/lib/Admin_SecurityToolsCaMykSIntegrityDescription.php.inc
  47. +39 −3 plugin/module/Admin_SecurityTools/locale/translation_fr.php.inc
  48. +9 −3 plugin/module/Admin_Site/Admin_Site.php.inc
  49. +31 −23 plugin/module/Admin_Site/html/admin_view_site_config.html.inc
  50. +4 −3 plugin/module/Admin_Site/locale/translation_en.php.inc
  51. +4 −3 plugin/module/Admin_Site/locale/translation_fr.php.inc
  52. +3 −3 plugin/theme/IndigoFlatStyle/css/style.css
@@ -0,0 +1,15 @@
# CaMykS Changelog
## Release 20190901

* [2019-07-01 12:16:32 +0200 | JB Lebrun] Adds July 2019 release history in changelogs. [#View details](https://github.com/Dj1b/CaMykS/commit/4c5da037b7241d96fa6055037f7e12900313aaf7)
* [2019-07-05 17:20:59 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/9fc93d68266af642bd7d4bcc5479f0bae366cdc1)
* [2019-07-12 18:12:42 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/2a3c6bfb92a3fb9b7ccaf2d907f31efe17e9c2e2)
* [2019-07-17 12:12:38 +0200 | JB Lebrun] Fixes a bug with keyup feature in GenericMediaPopup input client side scripts. [#View details](https://github.com/Dj1b/CaMykS/commit/f9cc68eadfa340aff242d644fba539c00adc076b)
* [2019-07-19 17:28:00 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/69bc6d171a9ffedc4219a257041fe7ebf48b99a2)
* [2019-07-26 16:45:14 +0200 | JB Lebrun] Inserts new Input ClicAndPayPayment as interface to ClicAndPay payment system. [#View details](https://github.com/Dj1b/CaMykS/commit/3d71b1993597ac9111c2e5448024c96f0c3bf754)
* [2019-07-26 16:47:28 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/504e72b71f308ac9034c8f19307ecdeb178c3edd)
* [2019-08-28 17:04:56 +0200 | JB Lebrun] Updates visibility on load_config method in Admin_GenericEmailingManagerEmailing library to be accessed by parent Admin_GenericEmailingManager module. [#View details](https://github.com/Dj1b/CaMykS/commit/dabe06809672f33cd5c11b0d27172d045d3493be)
* [2019-08-29 12:43:25 +0200 | JB Lebrun] Updates user agent text length display in Admin_MonitoringUserAgentChecker module record list parameters. [#View details](https://github.com/Dj1b/CaMykS/commit/5440fe179c26f13784577c44e1fac5baf2b7c1bc)
* [2019-09-02 11:15:22 +0200 | JB Lebrun] Does some files cleaning for Doxygen compatibility. [#View details](https://github.com/Dj1b/CaMykS/commit/88064cd25b1b8725e9aac86d9aa66c5c2ca4ecca)
* [2019-09-02 11:21:50 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/23daf557699358107a4c79905595be5ee949797c)
* [2019-09-02 11:29:23 +0200 | JB Lebrun] Prepares release. [#View details](https://github.com/Dj1b/CaMykS/commit/b8fa67b373504e292b157209853558d1ba6fa724)
BIN +1005 Bytes engine/data/img/flag/id.gif
Binary file not shown.
@@ -5,9 +5,9 @@
* @details Engine / Configuration file
* @file engine/etc/static.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.13
* @version 1.0.14
* @date Creation: Sep 2005
* @date Modification: Sep 2019
* @date Modification: Oct 2019
* @copyright 2005 - 2019 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.
@@ -23,7 +23,7 @@ $this->website = 'https://www.camyks.net';
* @var string $this->version
* @brief CaMykS full version
*/
$this->version = '1.0-20190901';
$this->version = '1.0-20191001';
/**
* @var string $this->mversion
@@ -35,13 +35,13 @@ $this->mversion = '1.0';
* @var string $this->nversion
* @brief CaMykS minor version
*/
$this->nversion = '201907901';
$this->nversion = '20191001';
/**
* @var integer $this->last_modification_date
* @brief CaMykS last modification date
*/
$this->last_modification_date = mktime(0, 0, 0, 1, 9, 2019);
$this->last_modification_date = mktime(0, 0, 0, 1, 10, 2019);
/**
* @var string $this->engine_folder
@@ -71,7 +71,7 @@ $this->var_folder = 'var';
* @var string $this->cache_folder
* @brief CaMykS cache folder
*/
$this->cache_folder= 'cache';
$this->cache_folder = 'cache';
/**
* @var string $this->file_extension
@@ -4,10 +4,10 @@
* @details Engine / Object Library
* @file engine/lib/object/CPDF.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.2
* @version 1.0.3
* @date Creation: May 2010
* @date Modification: Oct 2018
* @copyright 2010 - 2018 CaMykS Team
* @date Modification: Sep 2019
* @copyright 2010 - 2019 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.
* @warning This library is not loaded with CaMykS initialisation.
@@ -79,7 +79,7 @@ class CPDF extends FPDF {
*/
public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $maxLines=0) {
if ($maxLines == 0) {
parent::MultiCell($w, $h, $txt, $border, $align, $fill=false);
parent::MultiCell($w, $h, $txt, $border, $align, $fill);
return '';
}
@@ -4,9 +4,9 @@
* @details Engine / Object Library
* @file engine/lib/object/HTMLForm.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.1.6
* @version 1.1.7
* @date Creation: Jun 2005
* @date Modification: Jun 2019
* @date Modification: Sep 2019
* @copyright 2005 - 2019 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.
@@ -312,13 +312,17 @@ class HTMLForm {
/* check object params */
if ($params['default'] === '') {
$n = $params['name'];
if (isset($this->object->vars[$n]) and ($this->object->vars[$n] > 3600 or $this->object->vars[$n] < 0))
$params['default'] = $this->object->vars[$n];
elseif ($params['hasEmptyFirstOption'] === true)
if (isset($this->object->vars[$n])) {
if ($this->object->vars[$n] > 3600 or $this->object->vars[$n] < 0)
$params['default'] = $this->object->vars[$n];
elseif ($params['hasEmptyFirstOption'] === true)
$params['default'] = '';
else
$params['default'] = 0;
} elseif ($params['hasEmptyFirstOption'] === true)
$params['default'] = '';
else
$params['default'] = TODAY;
}
if ($params['objects'] === null)
$params['objects'] = array('day','month','year','hours','minutes');

0 comments on commit af316a5

Please sign in to comment.
You can’t perform that action at this time.