Skip to content
Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
JB Lebrun
JB Lebrun committed Mar 1, 2019
2 parents aa9362c + 03a5110 commit 9df9f602a5ba59a9a86329168e500f8117395c4d
Showing with 1,781 additions and 210 deletions.
  1. +4 −6 Camyks.php.inc
  2. +27 −0 documents/changelogs/Release-20190201.md
  3. +5 −5 engine/etc/static.php.inc
  4. +5 −5 engine/lib/object/PluginConfigItem.php.inc
  5. +12 −8 engine/lib/object/Theme.php.inc
  6. +54 −53 engine/lib/tool/client.php.inc
  7. +72 −2 engine/lib/tool/clientBots/Bots.php.inc
  8. +12 −2 engine/lib/tool/clientBots/Tools.php.inc
  9. +12 −2 engine/lib/tool/clientBots/Unknowns.php.inc
  10. +8 −7 engine/lib/tool/clientDevices/Acer.php.inc
  11. +2 −1 engine/lib/tool/clientDevices/Asus.php.inc
  12. +8 −7 engine/lib/tool/clientDevices/Blackview.php.inc
  13. +3 −2 engine/lib/tool/clientDevices/Crosscall.php.inc
  14. +45 −0 engine/lib/tool/clientDevices/Evertek.php.inc
  15. +4 −2 engine/lib/tool/clientDevices/HTC.php.inc
  16. +4 −1 engine/lib/tool/clientDevices/Huawei.php.inc
  17. +47 −0 engine/lib/tool/clientDevices/Infinix.php.inc
  18. +3 −3 engine/lib/tool/clientDevices/LG.php.inc
  19. +45 −0 engine/lib/tool/clientDevices/Lemon.php.inc
  20. +8 −7 engine/lib/tool/clientDevices/Lyf.php.inc
  21. +6 −5 engine/lib/tool/clientDevices/Meizu.php.inc
  22. +5 −2 engine/lib/tool/clientDevices/Motorola.php.inc
  23. +3 −2 engine/lib/tool/clientDevices/Nokia.php.inc
  24. +3 −2 engine/lib/tool/clientDevices/Oppo.php.inc
  25. +45 −0 engine/lib/tool/clientDevices/Qilive.php.inc
  26. +11 −2 engine/lib/tool/clientDevices/Samsung.php.inc
  27. +6 −3 engine/lib/tool/clientDevices/Sony.php.inc
  28. +3 −2 engine/lib/tool/clientDevices/Tecno.php.inc
  29. +3 −2 engine/lib/tool/clientDevices/Wiko.php.inc
  30. +4 −2 engine/lib/tool/clientDevices/Xiaomi.php.inc
  31. +4 −5 engine/lib/tool/folder.php.inc
  32. +1 −1 engine/lib/tool/string.php.inc
  33. +48 −0 engine/lib/tool/units.php.inc
  34. +63 −0 engine/locale/units/translation_fr.php.inc
  35. +325 −0 plugin/input/GenericSitemapGenerator/GenericSitemapGenerator.php.inc
  36. +59 −0 plugin/input/GenericSitemapGenerator/html/configuration/edit.html.inc
  37. +108 −0 plugin/input/GenericSitemapGenerator/html/configuration/view.html.inc
  38. +95 −0 plugin/input/GenericSitemapGenerator/js/ConfigEditor.js
  39. +179 −0 plugin/input/GenericSitemapGenerator/js/ConfigViewer.js
  40. +148 −0 plugin/input/GenericSitemapGenerator/lib/GenericSitemapGeneratorConfig.php.inc
  41. +40 −0 plugin/input/GenericSitemapGenerator/locale/translation_fr.php.inc
  42. +95 −8 plugin/module/Admin_ContentPage/Admin_ContentPage.php.inc
  43. +1 −1 plugin/module/Admin_ContentPage/html/admin_edit_config.html.inc
  44. +45 −8 plugin/module/Admin_ContentPage/html/modify.html.inc
  45. +87 −46 plugin/module/Admin_ContentPage/lib/ContentPage.php.inc
  46. +7 −3 plugin/module/Admin_ContentPage/locale/translation_en.php.inc
  47. +7 −3 plugin/module/Admin_ContentPage/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.9
* @version 1.0.11
* @date Creation: Jun 2005
* @date Modification: Jan 2019
* @date Modification: Feb 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.
@@ -1481,9 +1481,11 @@ final class Camyks {
/* update global statistics in site mode only */
if ($this->mode != CAMYKS_MODE_SITE)
return;
/* update global statistics for visitors only */
if ($this->check_adminUser()===true)
return;
/* update global statistics only if statistic engine is available */
if (isset($this->modules['Admin_Statistics']))
$this->modules['Admin_Statistics']->update_siteStatistics();
@@ -2108,7 +2110,6 @@ final class Camyks {
/* get internal locales */
$this->HTMLPage->set_pageInformations($this->contentPage->title, $this->contentPage->description, $this->contentPage->keywords, $this->current_language);
$this->HTMLPage->set_robotInformations();
/* set mobile configuration values */
if ($this->deviceMode == 'handheld')
@@ -2123,9 +2124,6 @@ final class Camyks {
/* add favicon */
$this->HTMLPage->set_favicon();
/* update statistics */
$this->update_siteStatistics();
/* display html header */
$this->HTMLPage->add_HTMLHeader();
@@ -0,0 +1,27 @@
# CaMykS Changelog
## Release 20190201

* [2019-01-03 15:58:48 +0100 | JB Lebrun] Adds January 2019 release history in changelogs. [#View details](https://github.com/Dj1b/CaMykS/commit/aff4cc37892eca3e8ffccf8ca2fb537a887f0d86)
* [2019-01-07 17:32:38 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/452ecaf2c5ff638b569c3ab0286da6dd8aba7612)
* [2019-01-07 17:37:53 +0100 | JB Lebrun] Makes PayBoxPayment input more flexible. [#View details](https://github.com/Dj1b/CaMykS/commit/2d3a5d97745e1c37113344becf407181ac1692a1)
* [2019-01-07 17:45:02 +0100 | JB Lebrun] Inserts PayZenPayment input to handle online payments through PayZen payment system. [#View details](https://github.com/Dj1b/CaMykS/commit/3f1bb88be193b042b950d9843de5d12407c37561)
* [2019-01-08 16:33:16 +0100 | JB Lebrun] Adds logs on page not found error in Admin_ContentPage module. [#View details](https://github.com/Dj1b/CaMykS/commit/955abf1f9267aa17e62a053d68092f98d1740c0a)
* [2019-01-08 16:47:14 +0100 | JB Lebrun] Simplifies pages URL rewriting in skeleton site .htaccess file. [#View details](https://github.com/Dj1b/CaMykS/commit/aabeb1ae9d213f3688c4308b898f8ecaf3bd46fa)
* [2019-01-08 17:00:31 +0100 | JB Lebrun] Adds a URL Filter in Admin_SecurityTools module. [#View details](https://github.com/Dj1b/CaMykS/commit/ff42844f06711a0886ce982ed8684b36658bbeab)
* [2019-01-08 18:00:54 +0100 | JB Lebrun] Moves User Agent filtering from CaMykS master object to Admin_SecurityTools module. [#View details](https://github.com/Dj1b/CaMykS/commit/a9334b34c8176517051ffd29355ee0c1b31aefd8)
* [2019-01-08 18:37:19 +0100 | JB Lebrun] Completes french help with new tools in Admin_SecurityTools module. [#View details](https://github.com/Dj1b/CaMykS/commit/9f7d58d0b74dd0e92aaa6cd169c697988e71b07b)
* [2019-01-09 11:26:17 +0100 | JB Lebrun] Optimises favicon handling and avoid 404 errors on non-existing favicon file. [#View details](https://github.com/Dj1b/CaMykS/commit/281eb49ede7ed49ad9f14ed171f403acf9b1ff9d)
* [2019-01-10 10:39:59 +0100 | JB Lebrun] Fixes a bug in URL filter rule list in Admin_SecurityTools module. [#View details](https://github.com/Dj1b/CaMykS/commit/86e6d1b5111dd0598b1d5bec836f6417fd400f52)
* [2019-01-11 11:27:08 +0100 | JB Lebrun] Adds an inspect status for user agents, and enhances URL detection in Admin_MonitoringUserAgentChecker module. [#View details](https://github.com/Dj1b/CaMykS/commit/38f83cf4110937da7233e9fadac5d9e8dd76665d)
* [2019-01-14 10:44:35 +0100 | JB Lebrun] Enhances Javascript mode in SyntaxColoringEngine input. [#View details](https://github.com/Dj1b/CaMykS/commit/7096d7fa81133630b15c3fe759035971c732582f)
* [2019-01-14 10:54:12 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/994b08cbcfe08cb7fb82994643683fda41831573)
* [2019-01-22 18:17:04 +0100 | JB Lebrun] Adds small enhancements, normalises files format, indents more nicely the code and makes the Content_GenericPageRedirector module, ready to be parsed by Doxygen. [#View details](https://github.com/Dj1b/CaMykS/commit/b5d20dec950684de76cd4bbe90a2c8f1231ddd82)
* [2019-01-22 18:21:18 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/83c4744fd9e944cfbf80f5ef390b0f080895ad4c)
* [2019-01-23 17:50:49 +0100 | JB Lebrun] Fixes false positive fake visits introduced with 83c4744fd9e944cfbf80f5ef390b0f080895ad4c and updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/a452601e0e9191df335f339e0b26ae38bd6c34d5)
* [2019-01-30 14:36:28 +0100 | JB Lebrun] Adds small enhancements, normalises files format, indents more nicely the code and makes the Admin_MyAccount module, ready to be parsed by Doxygen. [#View details](https://github.com/Dj1b/CaMykS/commit/e8192f5af964f64aaea4359a81bff6efea5a6858)
* [2019-01-30 14:39:38 +0100 | JB Lebrun] Adds small enhancements, normalises files format, indents more nicely the code and makes the Admin_MyShortcuts module, ready to be parsed by Doxygen. [#View details](https://github.com/Dj1b/CaMykS/commit/2a9c1930b8624305ce72ebbbd4320d9fbfcb8b22)
* [2019-01-30 15:51:30 +0100 | JB Lebrun] Does some files cleaning. [#View details](https://github.com/Dj1b/CaMykS/commit/966f073d163857a309ef0424989177f2025556f1)
* [2019-01-30 15:55:48 +0100 | JB Lebrun] Updates gitignore file to ignore external libraries. [#View details](https://github.com/Dj1b/CaMykS/commit/3d312af36173cb281e103c5703ccbe66bcf6908b)
* [2019-02-01 09:54:35 +0100 | JB Lebrun] Fixes a small bug with method visibility in Admin_GenericEmailingManager module. [#View details](https://github.com/Dj1b/CaMykS/commit/9b87421e0e17f3d77f030acd3726972b3a641d06)
* [2019-02-01 09:55:53 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/935e9026308b57097bef65f32cca2e0b7899e48b)
* [2019-02-01 10:01:03 +0100 | JB Lebrun] Prepares releases. [#View details](https://github.com/Dj1b/CaMykS/commit/653b239bcfd4db55d036dfd64e42b3db1f2b263f)
@@ -5,9 +5,9 @@
* @details Engine / Configuration file
* @file engine/etc/static.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.7
* @version 1.0.8
* @date Creation: Sep 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.
@@ -23,7 +23,7 @@ $this->website = 'https://www.camyks.net';
* @var string $this->version
* @brief CaMykS full version
*/
$this->version = '1.0-20190201';
$this->version = '1.0-20190301';
/**
* @var string $this->mversion
@@ -35,13 +35,13 @@ $this->mversion = '1.0';
* @var string $this->nversion
* @brief CaMykS minor version
*/
$this->nversion = '20190201';
$this->nversion = '20190301';
/**
* @var integer $this->last_modification_date
* @brief CaMykS last modification date
*/
$this->last_modification_date = mktime(0, 0, 0, 1, 2, 2019);
$this->last_modification_date = mktime(0, 0, 0, 1, 3, 2019);
/**
* @var string $this->engine_folder
@@ -4,10 +4,10 @@
* @details Engine / Object Library
* @file engine/lib/object/PluginConfigItem.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0
* @version 1.0.1
* @date Creation: Oct 2007
* @date Modification: Apr 2018
* @copyright 2007 - 2018 CaMykS Team
* @date Modification: Feb 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.
*/
@@ -100,7 +100,7 @@ final class PluginConfigItem {
if (isset ($_REQUEST[$name])) {
return $_REQUEST[$name] == -1 ? $this->default : $_REQUEST[$name];
} else if (!isset ($_REQUEST[$name.'_year'])) {
return $this->default;
return $this->_default;
} else if ($_REQUEST[$name.'_year'] == 0) {
return 0;
} else {
@@ -166,4 +166,4 @@ final class PluginConfigItem {
}
}
}
?>
?>
@@ -4,9 +4,9 @@
* @details Engine / Object Library
* @file engine/lib/object/Theme.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.1
* @version 1.0.3
* @date Creation: Jun 2005
* @date Modification: Jan 2019
* @date Modification: Feb 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.
@@ -18,7 +18,7 @@ global $global_theme_picts_items, $global_theme_media_types;
* @brief Define available picts items
*/
$global_theme_picts_items = array(
'12' => array(
'12' => array(
'items' => array(
'empty',
'cross',
@@ -38,12 +38,12 @@ $global_theme_picts_items = array(
'valid',
'view',
'action',
),
),
'positions' => array(
'std',
'ovr'
),
),
),
),
);
/**
@@ -653,8 +653,12 @@ abstract class Theme extends Plugin {
public function get_button ($params, $url='', $style='') {
$dParams = array('title'=>'', 'url'=>'', 'id'=>'', 'style'=>'', 'class'=>'', 'target'=>'');
if (!is_array($params))
$params = array('title'=>$params, 'style' => $style, 'url'=>$url);
$params = array('title'=>$params, 'style'=>$style, 'url'=>$url);
$params = array_merge($dParams, $params);
/* check id */
if ($params['id'] !== '' and substr($params['id'], 0, 3) !== 'id=')
$params['id'] = 'id="'.$params['id'].'"';
return $this->get_part('button', array($params['style'], $params['url'], $params['title'], $params['id'], $params['class'], $params['target']));
}
@@ -675,7 +679,7 @@ abstract class Theme extends Plugin {
} else if ($item['url'] == '') {
$html .= $this->get_layeredMenuNoLinkItem($item);
} else {
$html .= $this->get_layeredMenuLinkItem ($item);
$html .= $this->get_layeredMenuLinkItem($item);
}
}
$html .= $this->get_layeredMenuFooter();
Oops, something went wrong.

0 comments on commit 9df9f60

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