Skip to content
Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
JB Lebrun
JB Lebrun committed Apr 1, 2019
2 parents 9df9f60 + 56e18ce commit 601a9ab8461d40dd1176269cffcb7f3a7dc5d6f0
Showing with 3,798 additions and 2,253 deletions.
  1. +8 −4 Camyks.php.inc
  2. +20 −0 documents/changelogs/Release-20190301.md
  3. +5 −5 engine/etc/static.php.inc
  4. +17 −4 engine/lib/object/MLDatabaseItem.php.inc
  5. +315 −366 engine/lib/tool/client.php.inc
  6. +57 −7 engine/lib/tool/clientBots/Bots.php.inc
  7. +32 −2 engine/lib/tool/clientBots/Generics.php.inc
  8. +12 −2 engine/lib/tool/clientBots/Unknowns.php.inc
  9. +45 −0 engine/lib/tool/clientDevices/Accent.php.inc
  10. +6 −2 engine/lib/tool/clientDevices/Acer.php.inc
  11. +4 −2 engine/lib/tool/clientDevices/Alcatel.php.inc
  12. +3 −3 engine/lib/tool/clientDevices/Blackview.php.inc
  13. +10 −4 engine/lib/tool/clientDevices/Carrefour.php.inc
  14. +8 −3 engine/lib/tool/clientDevices/Cat.php.inc
  15. +45 −0 engine/lib/tool/clientDevices/Cubot.php.inc
  16. +45 −0 engine/lib/tool/clientDevices/FNF.php.inc
  17. +45 −0 engine/lib/tool/clientDevices/Gigabyte.php.inc
  18. +3 −2 engine/lib/tool/clientDevices/Google.php.inc
  19. +49 −0 engine/lib/tool/clientDevices/Haier.php.inc
  20. +3 −2 engine/lib/tool/clientDevices/HiSense.php.inc
  21. +43 −14 engine/lib/tool/clientDevices/Huawei.php.inc
  22. +45 −0 engine/lib/tool/clientDevices/Kazam.php.inc
  23. +3 −2 engine/lib/tool/clientDevices/LG.php.inc
  24. +7 −4 engine/lib/tool/clientDevices/Lava.php.inc
  25. +4 −3 engine/lib/tool/clientDevices/Lenovo.php.inc
  26. +45 −0 engine/lib/tool/clientDevices/Maximus.php.inc
  27. +45 −0 engine/lib/tool/clientDevices/Memup.php.inc
  28. +45 −0 engine/lib/tool/clientDevices/MobiWire.php.inc
  29. +3 −2 engine/lib/tool/clientDevices/Motorola.php.inc
  30. +45 −0 engine/lib/tool/clientDevices/Neffos.php.inc
  31. +14 −11 engine/lib/tool/clientDevices/Nokia.php.inc
  32. +46 −0 engine/lib/tool/clientDevices/Nomu.php.inc
  33. +3 −2 engine/lib/tool/clientDevices/Oppo.php.inc
  34. +14 −6 engine/lib/tool/clientDevices/Orange.php.inc
  35. +45 −0 engine/lib/tool/clientDevices/Polaroid.php.inc
  36. +46 −0 engine/lib/tool/clientDevices/QMobile.php.inc
  37. +45 −0 engine/lib/tool/clientDevices/Quantum.php.inc
  38. +45 −0 engine/lib/tool/clientDevices/SFR.php.inc
  39. +11 −2 engine/lib/tool/clientDevices/Samsung.php.inc
  40. +45 −0 engine/lib/tool/clientDevices/Smartisan.php.inc
  41. +3 −2 engine/lib/tool/clientDevices/Sony.php.inc
  42. +45 −0 engine/lib/tool/clientDevices/SpiceMobility.php.inc
  43. +9 −6 engine/lib/tool/clientDevices/Tecno.php.inc
  44. +45 −0 engine/lib/tool/clientDevices/Ulefone.php.inc
  45. +45 −0 engine/lib/tool/clientDevices/Umi.php.inc
  46. +45 −0 engine/lib/tool/clientDevices/Verykool.php.inc
  47. +45 −0 engine/lib/tool/clientDevices/Vestel.php.inc
  48. +45 −0 engine/lib/tool/clientDevices/Vodafone.php.inc
  49. +45 −0 engine/lib/tool/clientDevices/Wing.php.inc
  50. +49 −0 engine/lib/tool/clientDevices/Wortmann.php.inc
  51. +4 −2 engine/lib/tool/clientDevices/Xiaomi.php.inc
  52. +84 −0 engine/lib/tool/clientDevices/Yezz.php.inc
  53. +125 −24 engine/lib/tool/france.php.inc
  54. +42 −19 engine/lib/tool/password.php.inc
  55. +77 −0 engine/locale/frenchsocioprofessionaldata/translation_fr.php.inc
  56. +4 −4 plugin/input/FileManager/FileManager.php.inc
  57. +59 −59 plugin/module/Admin_Statistics/Admin_Statistics.php.inc
  58. +428 −410 plugin/module/Admin_User/Admin_User.php.inc
  59. +200 −201 plugin/module/Admin_User/html/admin_edit.html.inc
  60. +156 −156 plugin/module/Admin_User/html/admin_list.html.inc
  61. +123 −123 plugin/module/Admin_User/html/admin_view.html.inc
  62. +709 −713 plugin/module/Admin_User/lib/AdminUser.php.inc
  63. +54 −51 plugin/module/Admin_User/lib/Admin_UserListParams.php.inc
  64. +13 −15 plugin/module/Admin_User/locale/translation_en.php.inc
  65. +13 −14 plugin/module/Admin_User/locale/translation_fr.php.inc
@@ -4,9 +4,9 @@
* @details Engine / Main Object
* @file Camyks.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.11
* @version 1.0.13
* @date Creation: Jun 2005
* @date Modification: Feb 2019
* @date Modification: Mar 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.
@@ -1236,7 +1236,7 @@ final class Camyks {
/* load current adminUser */
if (isset($this->modules['Admin_User'])) {
$this->adminUser = new AdminUser($this->get_sessionValue('admin_user'));
$this->adminUser->get_fromDatabase();
$this->adminUser->get();
}
}
@@ -1483,7 +1483,7 @@ final class Camyks {
return;
/* update global statistics for visitors only */
if ($this->check_adminUser()===true)
if ($this->check_adminUser() === true)
return;
/* update global statistics only if statistic engine is available */
@@ -2111,6 +2111,9 @@ final class Camyks {
/* get internal locales */
$this->HTMLPage->set_pageInformations($this->contentPage->title, $this->contentPage->description, $this->contentPage->keywords, $this->current_language);
/* update statistics */
$this->update_siteStatistics();
/* set mobile configuration values */
if ($this->deviceMode == 'handheld')
$this->HTMLPage->set_mobileMeta(true, $this->get_confValue('mobileConfig'));
@@ -2220,6 +2223,7 @@ final class Camyks {
if (($plugin = template_get($_GET['template'], 'site')) === false)
$plugin = template_get($_GET['template'], 'camyks');
}
/* get plugin init & display */
if ($plugin !== false) {
$plugin->execute_request();
@@ -0,0 +1,20 @@
# CaMykS Changelog
## Release 20190301

* [2019-02-01 10:47:33 +0100 | JB Lebrun] Adds February 2019 release history in changelogs. [#View details](https://github.com/Dj1b/CaMykS/commit/5a91caaf28d60a5badc0a85ea5687c0c4d60b074)
* [2019-02-08 11:14:59 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/f5cb17037e0d2c929b87b2a3ab17874b630cc2fa)
* [2019-02-11 14:27:50 +0100 | JB Lebrun] Fixes a bug in PluginConfigItem library. [#View details](https://github.com/Dj1b/CaMykS/commit/3eea074cf2d8d68f2fb54c7851c834ae3ec70d8c)
* [2019-02-11 14:39:16 +0100 | JB Lebrun] Enhances id support for buttons in Theme library. [#View details](https://github.com/Dj1b/CaMykS/commit/0065dcf46816025859c7ae0a055ef1576f9f44f7)
* [2019-02-11 14:44:27 +0100 | JB Lebrun] Fixes a bug in folder_isInPath method in folder library. [#View details](https://github.com/Dj1b/CaMykS/commit/e2c9afb9bfdd3c886abe7b57ede28e2bd17cc82d)
* [2019-02-11 14:51:46 +0100 | JB Lebrun] Inserts new locale group and its dedicated library. [#View details](https://github.com/Dj1b/CaMykS/commit/0be1aa86cd8a0d8907c9233bd183846f6cc89f31)
* [2019-02-11 15:08:24 +0100 | JB Lebrun] Inserts new Input to create automatic sitemap. [#View details](https://github.com/Dj1b/CaMykS/commit/d768b1e8f13fb2b82e9b84feca7b21666d1d9b9d)
* [2019-02-11 16:14:13 +0100 | JB Lebrun] Inserts robots meta selection and makes Admin_ContentPage module compatible with GenericSitemap module. [#View details](https://github.com/Dj1b/CaMykS/commit/08aadde4fe1347bccc2a8c74554cc32c078133bc)
* [2019-02-11 17:09:35 +0100 | JB Lebrun] Fixes Theme library to remove ugly traces following 0065dcf46816025859c7ae0a055ef1576f9f44f7. [#View details](https://github.com/Dj1b/CaMykS/commit/9b51f6544845b18160cbb2121fa56ea6d2693a78)
* [2019-02-11 17:11:51 +0100 | JB Lebrun] Enhances URL creation in get_sitemapLlinks method of Admin_ContentPage module to manage single or multi languages. [#View details](https://github.com/Dj1b/CaMykS/commit/cf4f16c28d85ff50cbe4fb585d0273a8e9289dde)
* [2019-02-13 10:15:45 +0100 | JB Lebrun] Fixes bugs in page creation in ContentPage library following 08aadde4fe1347bccc2a8c74554cc32c078133bc. [#View details](https://github.com/Dj1b/CaMykS/commit/9e92607493809948689392b4fdc52713b0e123aa)
* [2019-02-13 10:47:24 +0100 | JB Lebrun] Avoids having visit statistics on 404 error in CaMykS master object. [#View details](https://github.com/Dj1b/CaMykS/commit/cb2fd4da18c3439f70ed998db72764499f106527)
* [2019-02-13 10:57:52 +0100 | JB Lebrun] Avoids having visit statistics on 404 error in CaMykS master object. [#View details](https://github.com/Dj1b/CaMykS/commit/b09462322b470f56d5fcbe69025e6b525b8d620b)
* [2019-02-21 18:19:23 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/afc10c01c26bdef5a0f820e2ec9186540132c864)
* [2019-02-28 09:48:44 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/11c959f466d0eafa9b366c43174b40c8801b4d86)
* [2019-02-28 09:50:18 +0100 | JB Lebrun] Does some files cleaning and enhancement. [#View details](https://github.com/Dj1b/CaMykS/commit/7e67054d06ed917d86c2c63deea03610c2c73419)
* [2019-03-01 12:36:13 +0100 | JB Lebrun] Prepares release. [#View details](https://github.com/Dj1b/CaMykS/commit/03a511022e3b53524f3554d7c53213c639f27e20)
@@ -5,9 +5,9 @@
* @details Engine / Configuration file
* @file engine/etc/static.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.8
* @version 1.0.9
* @date Creation: Sep 2005
* @date Modification: Mar 2019
* @date Modification: Apr 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-20190301';
$this->version = '1.0-20190401';
/**
* @var string $this->mversion
@@ -35,13 +35,13 @@ $this->mversion = '1.0';
* @var string $this->nversion
* @brief CaMykS minor version
*/
$this->nversion = '20190301';
$this->nversion = '20190401';
/**
* @var integer $this->last_modification_date
* @brief CaMykS last modification date
*/
$this->last_modification_date = mktime(0, 0, 0, 1, 3, 2019);
$this->last_modification_date = mktime(0, 0, 0, 1, 4, 2019);
/**
* @var string $this->engine_folder
@@ -4,10 +4,10 @@
* @details Engine / Object Library
* @file engine/lib/object/MLDatabaseItem.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.1
* @version 1.0.2
* @date Creation: Apr 2007
* @date Modification: Oct 2018
* @copyright 2007 - 2018 CaMykS Team
* @date Modification: Mar 2019
* @copyright 2007 - 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.
*/
@@ -143,6 +143,16 @@ class MLDatabaseItem extends ModuleLibraryItem {
* @return mixed
*/
public function get_databaseDescription() {
if ($this->datatype == 'password' and $this->datadesc != 'varchar') {
return array(
'name' => $this->name,
'type' => $this->datatype,
'desc1' => 'varchar',
'desc2' => '140',
'default' => $this->default,
);
}
return array(
'name' => $this->name,
'type' => $this->datatype,
@@ -169,7 +179,10 @@ class MLDatabaseItem extends ModuleLibraryItem {
case 'etext':
return '"'.$camyks->encode_value($this->value). '"';
case 'password':
return '"'.$this->value.'"';
if ($this->datadesc == 'varchar')
return '"'.$this->value.'"';
else
return '"'.password_encode($this->value, $this->datadesc, $this->datadesc2).'"';
case 'list':
return '"'.$this->compile_listValue($this->value).'"';
}
Oops, something went wrong.

0 comments on commit 601a9ab

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