Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
JB Lebrun
JB Lebrun committed Dec 3, 2018
2 parents 0641f69 + 6f5c20e commit 6229d6b0096e339e4edae57583240d84e145a4ab
Showing with 3,134 additions and 2,043 deletions.
  1. +16 −22 Camyks.php.inc
  2. +34 −0 documents/changelogs/Release-20181101.md
  3. +5 −5 engine/etc/static.php.inc
  4. +12 −11 engine/lib/object/HTMLForm.php.inc
  5. +4 −3 engine/lib/object/HTMLPage.php.inc
  6. +52 −35 engine/lib/tool/client.php.inc
  7. +50 −10 engine/lib/tool/clientBots/Bots.php.inc
  8. +12 −2 engine/lib/tool/clientBots/Generics.php.inc
  9. +22 −2 engine/lib/tool/clientBots/Tools.php.inc
  10. +3 −2 engine/lib/tool/clientDevices/Alcatel.php.inc
  11. +9 −7 engine/lib/tool/clientDevices/Asus.php.inc
  12. +6 −4 engine/lib/tool/clientDevices/Blackview.php.inc
  13. +10 −9 engine/lib/tool/clientDevices/Google.php.inc
  14. +10 −9 engine/lib/tool/clientDevices/HTC.php.inc
  15. +9 −4 engine/lib/tool/clientDevices/Huawei.php.inc
  16. +3 −2 engine/lib/tool/clientDevices/LG.php.inc
  17. +3 −2 engine/lib/tool/clientDevices/Lenovo.php.inc
  18. +10 −5 engine/lib/tool/clientDevices/Motorola.php.inc
  19. +12 −2 engine/lib/tool/clientDevices/Samsung.php.inc
  20. +3 −2 engine/lib/tool/clientDevices/Sony.php.inc
  21. +5 −4 engine/lib/tool/clientDevices/Tecno.php.inc
  22. +4 −2 engine/lib/tool/clientDevices/Xiaomi.php.inc
  23. +216 −144 plugin/module/Admin_MonitoringUserAgentChecker/Admin_MonitoringUserAgentChecker.php.inc
  24. +43 −33 plugin/module/Admin_MonitoringUserAgentChecker/html/admin.html.inc
  25. +31 −25 plugin/module/Admin_MonitoringUserAgentChecker/html/admin_edit_user_agent.html.inc
  26. +38 −32 plugin/module/Admin_MonitoringUserAgentChecker/html/admin_view_user_agent.html.inc
  27. +28 −22 plugin/module/Admin_MonitoringUserAgentChecker/html/admin_view_user_agent_bot_details.html.inc
  28. +12 −12 plugin/module/Admin_MonitoringUserAgentChecker/html/admin_view_user_agent_fake_details.html.inc
  29. +19 −12 plugin/module/Admin_MonitoringUserAgentChecker/html/admin_view_user_agent_generic_details.html.inc
  30. +18 −12 plugin/module/Admin_MonitoringUserAgentChecker/html/admin_view_user_agent_hack_details.html.inc
  31. +28 −22 plugin/module/Admin_MonitoringUserAgentChecker/html/admin_view_user_agent_tool_details.html.inc
  32. +96 −0 plugin/module/Admin_MonitoringUserAgentChecker/js/UARecordList.js
  33. +67 −54 plugin/module/Admin_MonitoringUserAgentChecker/lib/Admin_MonitoringUserAgentCheckerRecord.php.inc
  34. +15 −14 ...ule/Admin_MonitoringUserAgentChecker/lib/Admin_MonitoringUserAgentCheckerRecordListParams.php.inc
  35. +21 −15 plugin/module/Admin_MonitoringUserAgentChecker/locale/translation_fr.php.inc
  36. +207 −93 plugin/module/Admin_SecurityTools/Admin_SecurityTools.php.inc
  37. +256 −1 plugin/module/Admin_SecurityTools/html/admin.html.inc
  38. +53 −70 plugin/module/Admin_SecurityTools/html/admin_editipfilter.html.inc
  39. +191 −0 plugin/module/Admin_SecurityTools/js/SecurityTools.js
  40. +146 −15 plugin/module/Admin_SecurityTools/lib/Admin_SecurityIPFilterRule.php.inc
  41. +63 −0 plugin/module/Admin_SecurityTools/lib/Admin_SecurityIPFilterRuleListParams.php.inc
  42. +54 −29 plugin/module/Admin_SecurityTools/locale/translation_fr.php.inc
  43. +454 −463 plugin/module/Admin_Site/Admin_Site.php.inc
  44. +25 −25 plugin/module/Admin_Site/html/admin_edit_plugin_config.html.inc
  45. +22 −22 plugin/module/Admin_Site/html/admin_view_plugin_config.html.inc
  46. +695 −746 plugin/module/Admin_Site/html/admin_view_site_config.html.inc
  47. +18 −14 plugin/module/Admin_Site/locale/translation_en.php.inc
  48. +20 −15 plugin/module/Admin_Site/locale/translation_fr.php.inc
  49. +4 −9 plugin/theme/IndigoFlatStyle/css/admin.css
@@ -2079,23 +2079,22 @@ final class Camyks {
if ($this->benchMode!==false) $this->benchMode->start('CaMykS page loading');
switch ($this->mode) {
case CAMYKS_MODE_SITE:
$this->get_sitePageContent();
break;
case CAMYKS_MODE_ADMIN:
$this->get_adminPageContent();
break;
case CAMYKS_MODE_REQUEST:
$this->get_requestPageContent();
break;
case CAMYKS_MODE_MANAGER:
$this->get_managerPageContent();
break;
case CAMYKS_MODE_INSTALL:
$this->get_installPageContent();
break;
case CAMYKS_MODE_SITE:
$this->get_sitePageContent();
break;
case CAMYKS_MODE_ADMIN:
$this->get_adminPageContent();
break;
case CAMYKS_MODE_REQUEST:
$this->get_requestPageContent();
break;
case CAMYKS_MODE_MANAGER:
$this->get_managerPageContent();
break;
case CAMYKS_MODE_INSTALL:
$this->get_installPageContent();
break;
}
}
/**
@@ -2122,12 +2121,7 @@ final class Camyks {
$this->run_eventHandlers('onPageLoad');
/* get internal locales */
$this->HTMLPage->set_pageInformations(
$this->contentPage->title,
$this->contentPage->description,
$this->contentPage->keywords,
$this->current_language
);
$this->HTMLPage->set_pageInformations($this->contentPage->title, $this->contentPage->description, $this->contentPage->keywords, $this->current_language);
$this->HTMLPage->set_robotInformations();
/* set mobile configuration values */
@@ -0,0 +1,34 @@
# CaMykS Changelog
## Release 20181101
* [2018-10-01 11:02:30 +0200 | JB Lebrun] Adds October 2018 release history in changelogs [#View details](https://github.com/Dj1b/CaMykS/commit/8571e1f99bea64c17aee3328edc4c96763a7c14c)
* [2018-10-01 12:17:51 +0200 | JB Lebrun] Fixes some bugs introduced with update 9959fe62ce4337c5194a61a3e77f533afa8e039f. [#View details](https://github.com/Dj1b/CaMykS/commit/40c50f1f1af6c967065b6b02ffd51b32632406c4)
* [2018-10-04 11:40:51 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/2d971271c18513a870ae54e476d4d896a8e409f9)
* [2018-10-04 11:41:52 +0200 | JB Lebrun] Updates file input builder in HTMLForm library. [#View details](https://github.com/Dj1b/CaMykS/commit/63fb8820f66875bf43e9c54c1d215e5d2964c5cc)
* [2018-10-05 11:03:19 +0200 | JB Lebrun] Fixes transparency support for GD crop method in CImage library. [#View details](https://github.com/Dj1b/CaMykS/commit/636d1c14b3f02b3faabcfafc86ac180f874d9a7b)
* [2018-10-09 09:32:36 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/6f9f0aa6e6320702414103fc89148cb6d463390a)
* [2018-10-09 17:46:36 +0200 | JB Lebrun] Fixes a bug introduced with ca71e6450482acefdf9395d5d00e75698af31c45. [#View details](https://github.com/Dj1b/CaMykS/commit/e0133e2cc1df992f81d5ed4b05266df0d399006b)
* [2018-10-12 10:35:16 +0200 | JB Lebrun] Adds ISO-8859-1 support for string_html2Text and string_text2Html methods in string library. [#View details](https://github.com/Dj1b/CaMykS/commit/0eb35c57d113d6791ad4e4844763ea2e3c15d501)
* [2018-10-12 10:36:26 +0200 | JB Lebrun] Adds url trim in url_getAsSmart method in url library. [#View details](https://github.com/Dj1b/CaMykS/commit/ce42ceef3f853fb291d82276a935c03cf5603fef)
* [2018-10-12 10:38:48 +0200 | JB Lebrun] Update user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/eb6cee57cd2cc6a5378154d98baa0078ee68da28)
* [2018-10-12 12:30:56 +0200 | JB Lebrun] Continues fixing a bug introduced with ca71e6450482acefdf9395d5d00e75698af31c45. [#View details](https://github.com/Dj1b/CaMykS/commit/a13d99eaf4bac851d62c95a3a56b821dbb0b2f87)
* [2018-10-16 11:12:23 +0200 | JB Lebrun] Adds a new method to convert hexadecimal colors to rgb array in color library. [#View details](https://github.com/Dj1b/CaMykS/commit/daebecf459ad5e751886ed093edf256fcb32f6e4)
* [2018-10-16 11:19:19 +0200 | JB Lebrun] Adds a new method to write multiline content with a line limit, also updates set_textColor method to use new color function, and optimises decode_text method in CPDF library. [#View details](https://github.com/Dj1b/CaMykS/commit/316da908a5584edc7fec2661a8136b3f4cb25d64)
* [2018-10-19 15:02:27 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/222e83a608a3f07b7727f78a6cc8badf79d6dfc4)
* [2018-10-23 10:00:56 +0200 | JB Lebrun] Optimises file reading in FSFile and file library. [#View details](https://github.com/Dj1b/CaMykS/commit/e8635734c501ec494cef11b8d9c7ad7ae9705fa6)
* [2018-10-23 10:02:11 +0200 | JB Lebrun] Optimises cache creation using FSFile reading method in HTMLPage library. [#View details](https://github.com/Dj1b/CaMykS/commit/585ea87da529d6ef09d971b48f3c3f555c618efc)
* [2018-10-23 10:03:34 +0200 | JB Lebrun] Optimises configuration merging, removing empty values, in CaMykS library. [#View details](https://github.com/Dj1b/CaMykS/commit/e4468d43b9d264853f1a9ea7c351144c91ae1fcf)
* [2018-10-23 10:05:05 +0200 | JB Lebrun] Allows Tool_Installer module to install website using database parameters defined in CMS configuration. [#View details](https://github.com/Dj1b/CaMykS/commit/ffda3840d2b0d59a9441314e725d0c8d03a34c05)
* [2018-10-25 15:39:49 +0200 | JB Lebrun] Enhances list module library items management in MLDatabaseItem library. [#View details](https://github.com/Dj1b/CaMykS/commit/ec422cc146bbadd274dbb2f824476a3b9eda3a3e)
* [2018-10-26 09:23:29 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/0c20e20a703d91962e68962e9401930224f7f816)
* [2018-10-26 09:27:38 +0200 | JB Lebrun] Adds support for hreflang meta tag for multilingual websites, in Admin_ContentPage module and language library. [#View details](https://github.com/Dj1b/CaMykS/commit/feeadaaf8361a34fd47958ad4146498bac44afb9)
* [2018-10-29 11:32:17 +0100 | JB Lebrun] Adds a new parameter in data_encoding_properties, in data library. [#View details](https://github.com/Dj1b/CaMykS/commit/30744d0cae6340d28c259b8f49c7e6bdf8f5eef2)
* [2018-10-30 11:02:27 +0100 | JB Lebrun] Fixes a bug introduced with 0eb35c57d113d6791ad4e4844763ea2e3c15d501 in string library. [#View details](https://github.com/Dj1b/CaMykS/commit/6a612c42ad08c787be251a272e0c7aa980368671)
* [2018-10-30 11:12:42 +0100 | JB Lebrun] Adds a new URL rewriting mode, in beta. Language can now be used as a folder in URLs. [#View details](https://github.com/Dj1b/CaMykS/commit/31f26c26f6dd466ec7c04ec588e639279bccad20)
* [2018-10-30 15:14:58 +0100 | JB Lebrun] Completes new URLs rewriting method, initiated in update 31f26c26f6dd466ec7c04ec588e639279bccad20. [#View details](https://github.com/Dj1b/CaMykS/commit/d1ac4b4dbdca1a13170dac6b073929c9053f5e14)
* [2018-10-30 16:59:54 +0100 | JB Lebrun] Updates current language loading in CaMykS library. [#View details](https://github.com/Dj1b/CaMykS/commit/4591d536d62abfe5deeb15c9f6787c5960814056)
* [2018-10-30 17:13:16 +0100 | JB Lebrun] Updates AJAX request data gathering in SiteMonitoringToolbar input client-side scripts. [#View details](https://github.com/Dj1b/CaMykS/commit/25db7c1529fb7ca7d85219fed71a51cb406301f5)
* [2018-11-05 11:10:29 +0100 | JB Lebrun] Adds missing new parameter details for updated method in data library. [#View details](https://github.com/Dj1b/CaMykS/commit/7b68ddcf33852fa2f6471bf07e3bde256e7290f4)
* [2018-11-05 11:13:57 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/b5fc230a2bcb86e72234f0eca11fe5fd80f15f39)
* [2018-11-05 11:14:53 +0100 | JB Lebrun] Does some files cleaning. [#View details](https://github.com/Dj1b/CaMykS/commit/4bf6b00ac284e8999d12f2044419fc355dbd0341)
* [2018-11-05 11:18:19 +0100 | JB Lebrun] Prepares release. [#View details](https://github.com/Dj1b/CaMykS/commit/af74b761965e79f8a9f45a2c8e849d81eb4212da)
@@ -5,9 +5,9 @@
* @details Engine / Configuration file
* @file engine/etc/static.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.5
* @version 1.0.6
* @date Creation: Sep 2005
* @date Modification: Nov 2018
* @date Modification: Dec 2018
* @copyright 2005 - 2018 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-20181101';
$this->version = '1.0-20181201';
/**
* @var string $this->mversion
@@ -35,13 +35,13 @@ $this->mversion = '1.0';
* @var string $this->nversion
* @brief CaMykS minor version
*/
$this->nversion = '20181101';
$this->nversion = '20181201';
/**
* @var integer $this->last_modification_date
* @brief CaMykS last modification date
*/
$this->last_modification_date = mktime(0, 0, 0, 11, 1, 2018);
$this->last_modification_date = mktime(0, 0, 0, 12, 1, 2018);
/**
* @var string $this->engine_folder
@@ -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.2
* @version 1.1.4
* @date Creation: Jun 2005
* @date Modification: Oct 2018
* @date Modification: Nov 2018
* @copyright 2005 - 2018 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.
@@ -133,12 +133,13 @@ class HTMLForm {
'data' => array(),
'tabIndex' => -1,
'placeholder' => '',
'maxlength' => -1,
'minlength' => -1,
'maxlength' => 0,
'minlength' => 0,
'pattern' => '',
'readonly' => '',
'list' => '',
'autocomplete' => '',
'allowMultiple' => false,
'size' => 0,
);
@@ -582,7 +583,7 @@ class HTMLForm {
global $camyks;
/* build param list */
$params = array('class'=>'', 'buttons'=>null, 'accept'=>'', 'allowMultiple'=>false);
$params = array('class'=>'', 'buttons'=>null, 'accept'=>'');
/* check limit */
$this->check_inputsLimit(2);
@@ -601,10 +602,6 @@ class HTMLForm {
/* check object params */
$n = $params['name'].($params['language']?'_'.$params['language']:'');
$params['name'] = $n;
if ($params['allowMultiple'] == true)
$params['name'] .= '[]';
if ($params['default'] === '' and isset($this->object)) {
$params['default'] = isset($this->object->vars[$n])?$this->object->vars[$n]:'';
}
@@ -1042,6 +1039,8 @@ class HTMLForm {
$params['maxlength'] = 32;
}
/* build input */
$html = '<input type="text"';
$html .= ' value="'.htmlentities($params['default'], ENT_COMPAT, 'UTF-8').'"';
@@ -1494,11 +1493,13 @@ class HTMLForm {
else
$html .= ' name="'.$params['name'].'_'.$params['language'].'"';
}
if ($params['allowMultiple'] == true)
$params['name'] .= '[]';
if ($params['id'] != '')
$html .= ' id="'.$params['id'].'"';
if ($params['maxlength'] > -1)
if ($params['maxlength'] > 0)
$html .= ' maxlength="'.$params['maxlength'].'"';
if ($params['minlength'] > -1)
if ($params['minlength'] > 0)
$html .= ' minlength="'.$params['minlength'].'"';
if ($params['class'] != '')
$html .= ' class="'.$params['class'].'"';
@@ -4,9 +4,9 @@
* @details Engine / Object Library
* @file engine/lib/object/HTMLPage.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.2
* @version 1.0.3
* @date Creation: Jun 2005
* @date Modification: Oct 2018
* @date Modification: Nov 2018
* @copyright 2005 - 2018 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.
@@ -204,7 +204,8 @@ final class HTMLPage {
}
/* add generator meta as CaMykS */
$this->add_meta('generator', $camyks->name.' '.$camyks->version);
if (!$camyks->get_confValue('cms_hideSignature'))
$this->add_meta('generator', $camyks->name.' '.$camyks->version);
}
/*********** INPUT METHODS **************/
Oops, something went wrong.

0 comments on commit 6229d6b

Please sign in to comment.