Skip to content
Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
JB Lebrun
JB Lebrun committed Feb 1, 2019
2 parents 948f81e + 653b239 commit aa9362cc02505132416ae059cb88ceffd4fd2415
Showing with 4,820 additions and 2,409 deletions.
  1. +2 −1 .gitignore
  2. +11 −29 Camyks.php.inc
  3. +19 −0 documents/changelogs/Release-20190101.md
  4. +5 −5 engine/etc/static.php.inc
  5. +30 −3 engine/lib/object/HTMLPage.php.inc
  6. +1 −6 engine/lib/object/MySQLiDBConnection.php.inc
  7. +14 −3 engine/lib/object/Theme.php.inc
  8. +274 −142 engine/lib/tool/client.php.inc
  9. +20 −312 engine/lib/tool/clientBots/Bots.php.inc
  10. +13 −3 engine/lib/tool/clientBots/Generics.php.inc
  11. +23 −13 engine/lib/tool/clientBots/Tools.php.inc
  12. +394 −0 engine/lib/tool/clientBots/Unknowns.php.inc
  13. +4 −3 engine/lib/tool/clientDevices/Alcatel.php.inc
  14. +6 −5 engine/lib/tool/clientDevices/Amazon.php.inc
  15. +4 −3 engine/lib/tool/clientDevices/Asus.php.inc
  16. +49 −0 engine/lib/tool/clientDevices/Carrefour.php.inc
  17. +7 −6 engine/lib/tool/clientDevices/Crosscall.php.inc
  18. +8 −3 engine/lib/tool/clientDevices/Google.php.inc
  19. +7 −3 engine/lib/tool/clientDevices/HTC.php.inc
  20. +5 −4 engine/lib/tool/clientDevices/HiSense.php.inc
  21. +11 −3 engine/lib/tool/clientDevices/Huawei.php.inc
  22. +50 −0 engine/lib/tool/clientDevices/Itel.php.inc
  23. +45 −0 engine/lib/tool/clientDevices/KenXinDa.php.inc
  24. +8 −3 engine/lib/tool/clientDevices/LG.php.inc
  25. +70 −0 engine/lib/tool/clientDevices/Leagoo.php.inc
  26. +4 −3 engine/lib/tool/clientDevices/Motorola.php.inc
  27. +9 −4 engine/lib/tool/clientDevices/Nokia.php.inc
  28. +5 −3 engine/lib/tool/clientDevices/OnePlus.php.inc
  29. +4 −3 engine/lib/tool/clientDevices/Oppo.php.inc
  30. +4 −3 engine/lib/tool/clientDevices/Orange.php.inc
  31. +46 −0 engine/lib/tool/clientDevices/Oukitel.php.inc
  32. +19 −6 engine/lib/tool/clientDevices/Samsung.php.inc
  33. +11 −4 engine/lib/tool/clientDevices/Sony.php.inc
  34. +6 −5 engine/lib/tool/clientDevices/Tecno.php.inc
  35. +5 −4 engine/lib/tool/clientDevices/Wiko.php.inc
  36. +4 −3 engine/lib/tool/clientDevices/Xiaomi.php.inc
  37. +4 −4 engine/skeleton_site/.htaccess
  38. +66 −9 plugin/input/PayBoxPayment/PayBoxPayment.php.inc
  39. +361 −0 plugin/input/PayZenPayment/PayZenPayment.php.inc
  40. +100 −0 plugin/input/PayZenPayment/html/configuration/edit.html.inc
  41. +102 −0 plugin/input/PayZenPayment/html/configuration/view.html.inc
  42. +26 −0 plugin/input/PayZenPayment/html/input.html.inc
  43. +85 −0 plugin/input/PayZenPayment/lib/PayZenPaymentConfig.php.inc
  44. +33 −0 plugin/input/PayZenPayment/locale/translation_en.php.inc
  45. +34 −0 plugin/input/PayZenPayment/locale/translation_fr.php.inc
  46. +25 −22 plugin/input/SyntaxColoringEngine/mode/javascript.php.inc
  47. +10 −5 plugin/module/Admin_ContentPage/lib/ContentPage.php.inc
  48. +4 −4 plugin/module/Admin_GenericEmailingManager/Admin_GenericEmailingManager.php.inc
  49. +1 −1 plugin/module/Admin_GenericEmailingManager/locale/translation_fr.php.inc
  50. +89 −11 plugin/module/Admin_MonitoringUserAgentChecker/Admin_MonitoringUserAgentChecker.php.inc
  51. +22 −5 plugin/module/Admin_MonitoringUserAgentChecker/js/UARecordList.js
  52. +50 −3 plugin/module/Admin_MonitoringUserAgentChecker/lib/Admin_MonitoringUserAgentCheckerRecord.php.inc
  53. +5 −4 ...ule/Admin_MonitoringUserAgentChecker/lib/Admin_MonitoringUserAgentCheckerRecordListParams.php.inc
  54. +8 −3 plugin/module/Admin_MonitoringUserAgentChecker/locale/translation_fr.php.inc
  55. +183 −182 plugin/module/Admin_MyAccount/Admin_MyAccount.php.inc
  56. +18 −14 plugin/module/Admin_MyAccount/help/fr/help.php.inc
  57. +24 −24 plugin/module/Admin_MyAccount/help/fr/main.html.inc
  58. +109 −0 plugin/module/Admin_MyAccount/html/admin_edit.html.inc
  59. +0 −67 plugin/module/Admin_MyAccount/html/admin_r.html.inc
  60. +67 −0 plugin/module/Admin_MyAccount/html/admin_read.html.inc
  61. +0 −109 plugin/module/Admin_MyAccount/html/admin_rw.html.inc
  62. +14 −14 plugin/module/Admin_MyAccount/locale/translation_en.php.inc
  63. +14 −14 plugin/module/Admin_MyAccount/locale/translation_fr.php.inc
  64. +406 −379 plugin/module/Admin_MyShortcuts/Admin_MyShortcuts.php.inc
  65. +21 −77 plugin/module/Admin_MyShortcuts/html/admin.html.inc
  66. +46 −79 plugin/module/Admin_MyShortcuts/html/admin_edit.html.inc
  67. +28 −28 plugin/module/Admin_MyShortcuts/html/adminengine.html.inc
  68. +69 −41 plugin/module/Admin_MyShortcuts/lib/Admin_UserShortcut.php.inc
  69. +43 −0 plugin/module/Admin_MyShortcuts/lib/Admin_UserShortcutListParams.php.inc
  70. +23 −18 plugin/module/Admin_MyShortcuts/locale/translation_en.php.inc
  71. +23 −18 plugin/module/Admin_MyShortcuts/locale/translation_fr.php.inc
  72. +341 −47 plugin/module/Admin_SecurityTools/Admin_SecurityTools.php.inc
  73. +5 −5 plugin/module/Admin_SecurityTools/help/fr/desc.html.inc
  74. +17 −9 plugin/module/Admin_SecurityTools/help/fr/help.php.inc
  75. +33 −0 plugin/module/Admin_SecurityTools/help/fr/uafilter.html.inc
  76. +33 −0 plugin/module/Admin_SecurityTools/help/fr/urlfilter.html.inc
  77. +18 −7 plugin/module/Admin_SecurityTools/html/admin.html.inc
  78. +52 −0 plugin/module/Admin_SecurityTools/html/admin_edit_uaFilterConfig.html.inc
  79. +66 −0 plugin/module/Admin_SecurityTools/html/admin_edit_urlFilterRule.html.inc
  80. +2 −3 plugin/module/Admin_SecurityTools/lib/Admin_SecurityIPFilterRule.php.inc
  81. +8 −6 plugin/module/Admin_SecurityTools/lib/Admin_SecurityToolsConfig.php.inc
  82. +71 −0 plugin/module/Admin_SecurityTools/lib/Admin_SecurityUAFilterConfig.php.inc
  83. +164 −0 plugin/module/Admin_SecurityTools/lib/Admin_SecurityURLFilterRule.php.inc
  84. +59 −0 plugin/module/Admin_SecurityTools/lib/Admin_SecurityURLFilterRuleListParams.php.inc
  85. +43 −11 plugin/module/Admin_SecurityTools/locale/translation_fr.php.inc
  86. +318 −311 plugin/module/Content_GenericPageRedirector/Content_GenericPageRedirector.php.inc
  87. +102 −106 plugin/module/Content_GenericPageRedirector/html/admin.html.inc
  88. +22 −24 plugin/module/Content_GenericPageRedirector/html/site_framed1.html.inc
  89. +22 −24 plugin/module/Content_GenericPageRedirector/html/site_framed2.html.inc
  90. +24 −24 plugin/module/Content_GenericPageRedirector/html/site_noframe.html.inc
  91. +17 −20 plugin/module/Content_GenericPageRedirector/js/pageredirector.js
  92. +66 −61 plugin/module/Content_GenericPageRedirector/lib/Content_GenericPageRedirectorItem.php.inc
  93. +13 −14 plugin/module/Content_GenericPageRedirector/locale/translation_en.php.inc
  94. +14 −14 plugin/module/Content_GenericPageRedirector/locale/translation_fr.php.inc
@@ -1,4 +1,5 @@
.DS_Store
._*
*~
*.local.php.inc
*.local.php.inc
engine/lib/external/*
@@ -1,13 +1,13 @@
<?php
/**
* @brief CaMykS CMS master class
* @brief CaMykS CMS master class.
* @details Engine / Main Object
* @file Camyks.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.7
* @version 1.0.9
* @date Creation: Jun 2005
* @date Modification: Oct 2018
* @copyright 2005 - 2018 CaMykS Team
* @date Modification: Jan 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.
*/
@@ -44,7 +44,6 @@ define('CAMYKS_NAME', 'CaMykS');
/**
* CaMykS master class.
* @author CaMykS Team <camyks.contact@gmail.com>
*/
final class Camyks {
@@ -1326,19 +1325,6 @@ final class Camyks {
return;
} else {
$ua = client_getUAInfos();
$refused = array('hack');
/* check for disabling fakes also */
if ($this->get_confValue('site_disableFake') == 1)
$refused[] = 'fake';
/* disabled unwanted connections */
if (in_array($ua['platform_type'], $refused)) {
header('HTTP/1.1 403 Forbidden');
$this->log('Security', 'Connection refused', 'Bad user agent ('.$ua['platform_type'].')');
die();
}
/* define define/format */
$device = isset($ua['platform_format'])?$ua['platform_format']:'desktop';
$deviceStatus = 'auto';
@@ -2131,14 +2117,12 @@ final class Camyks {
/* set google analytics informations */
$this->HTMLPage->set_googleInformations($this->get_confValue('google_analytics', ''), $this->get_confValue('google_analytics_domain', ''));
/* add favicon */
if (($f = $this->get_confValue('favicon', false)) !== false) {
$this->HTMLPage->set_favicon($f);
} else {
$this->HTMLPage->set_favicon();
}
/* initialise page */
$this->contentPage->init_site();
/* add favicon */
$this->HTMLPage->set_favicon();
/* update statistics */
$this->update_siteStatistics();
@@ -2205,11 +2189,9 @@ final class Camyks {
$this->current_language
);
$this->HTMLPage->set_robotInformations(false, false);
if ($this->get_confValue('favicon', '') != '') {
$this->HTMLPage->set_favicon($this->get_confValue('favicon', ''));
} else {
$this->HTMLPage->set_favicon();
}
/* add favicon */
$this->HTMLPage->set_favicon();
/* display html header */
$this->HTMLPage->add_HTMLHeader();
@@ -0,0 +1,19 @@
# CaMykS Changelog
## Release 20190101

* [2018-12-03 10:48:05 +0100 | JB Lebrun] Adds December 2018 release history in changelogs. [#View details](https://github.com/Dj1b/CaMykS/commit/cad558a070b858e1d1e3e97186f3755f8f85d7b1)
* [2018-12-04 15:01:26 +0100 | JB Lebrun] Enhances string_text2Words method for non-html source in string library. [#View details](https://github.com/Dj1b/CaMykS/commit/3db845c0776c2026160d971e059397dfa84bbfb1)
* [2018-12-06 09:22:15 +0100 | JB Lebrun] Fixes page name check for modern2 URL mode in Admin_ContentPage module. [#View details](https://github.com/Dj1b/CaMykS/commit/03d7a7eb7ad526beb6f316eb562cfbd15d62a8c1)
* [2018-12-06 15:56:06 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/79ac6018ad8350597981ea13940b3149bfb0a219)
* [2018-12-06 15:58:13 +0100 | JB Lebrun] Adds feature to allow body to have a CSS class attached. [#View details](https://github.com/Dj1b/CaMykS/commit/82ce765ac17eaef7558696398bab6ef0c3884857)
* [2018-12-07 16:19:13 +0100 | JB Lebrun] Fixes a bug when closing MySQL connection in MySQLDBConnection library. [#View details](https://github.com/Dj1b/CaMykS/commit/7d8fa36d969270f2d8b9ba16c6086c60df7e8a7a)
* [2018-12-10 15:53:17 +0100 | JB Lebrun] Adds a « Mark as unverified » button to record view in Admin_MonitoringUserAgentChecker module. [#View details](https://github.com/Dj1b/CaMykS/commit/e5c357743680fc457ca6035d5d1ee1e882a0c670)
* [2018-12-14 11:13:07 +0100 | JB Lebrun] Adds small enhancements, normalises files format, indents more nicely the code and makes the Admin_GenericEmailingManager module, ready to be parsed by Doxygen. [#View details](https://github.com/Dj1b/CaMykS/commit/6abc0a7b666c88e7aee03b6dad095ca400291c47)
* [2018-12-14 11:26:29 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/bdb0e7ff41500377aa8f5e4b2fb72e186e756e3b)
* [2018-12-14 17:31:39 +0100 | JB Lebrun] Adds support for .htaccess rules installation and Admin_Site configuration in Admin_GenericEmailingManager module. [#View details](https://github.com/Dj1b/CaMykS/commit/8bedbc73a265d15ae1ffee56bcf94ebee112a7f4)
* [2018-12-19 15:13:45 +0100 | JB Lebrun] Allows external contacts to add CC recipients to email in Admin_GenericEmailingManager module. [#View details](https://github.com/Dj1b/CaMykS/commit/b17625aeb4a3a50170d2d4cf2488228915e61c60)
* [2018-12-24 10:46:49 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/d89e88697a8f6d0e989a7db7b5b9d7a5d4dad6fe)
* [2018-12-24 10:47:43 +0100 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/bcf09d1d11a737ead8b77e3154cb13efef76fcab)
* [2018-12-24 10:50:56 +0100 | JB Lebrun] Fixes last bot signature added in d89e88697a8f6d0e989a7db7b5b9d7a5d4dad6fe in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/93b985d0803891cf6c0aced0c924505616a6b604)
* [2019-01-03 11:31:40 +0100 | JB Lebrun] Does some files cleaning. [#View details](https://github.com/Dj1b/CaMykS/commit/aff9a9cfeaa758f8bbadde14bab4e2dcd3e384cf)
* [2019-01-03 11:39:18 +0100 | JB Lebrun] Prepares releases. [#View details](https://github.com/Dj1b/CaMykS/commit/44735355ae7137b79e9672014c9ff2f3884b8cc4)
@@ -5,9 +5,9 @@
* @details Engine / Configuration file
* @file engine/etc/static.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.6
* @version 1.0.7
* @date Creation: Sep 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.
@@ -23,7 +23,7 @@ $this->website = 'https://www.camyks.net';
* @var string $this->version
* @brief CaMykS full version
*/
$this->version = '1.0-20190101';
$this->version = '1.0-20190201';
/**
* @var string $this->mversion
@@ -35,13 +35,13 @@ $this->mversion = '1.0';
* @var string $this->nversion
* @brief CaMykS minor version
*/
$this->nversion = '20190101';
$this->nversion = '20190201';
/**
* @var integer $this->last_modification_date
* @brief CaMykS last modification date
*/
$this->last_modification_date = mktime(0, 0, 0, 1, 1, 2019);
$this->last_modification_date = mktime(0, 0, 0, 1, 2, 2019);
/**
* @var string $this->engine_folder
@@ -4,10 +4,10 @@
* @details Engine / Object Library
* @file engine/lib/object/HTMLPage.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.4
* @version 1.0.5
* @date Creation: Jun 2005
* @date Modification: Dec 2018
* @copyright 2005 - 2018 CaMykS Team
* @date Modification: Jan 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.
* @todo Try to set up output page parts as private, as they should be only called by add_HTMLHeader().
@@ -282,11 +282,38 @@ final class HTMLPage {
*/
public function set_favicon($favicon=null) {
global $camyks;
/* Define base url */
$root = $camyks->get_rootBaseURL('absolute_long');
/* Check for given favicon */
if (isset($favicon) and file_exists($favicon))
$this->add_link('icon', $root.$favicon);
/* Check favicon from config */
else if (($icon = $camyks->get_confValue('favicon', false)) !== false)
$this->add_link('icon', $root.$icon);
/* Search for favicon in root folder */
else if (count($f = glob('favicon.*'))>0)
$this->add_link('icon', $root.basename($f[0]));
else {
/* Check for existing icon */
foreach($this->links as $link)
if ($link['rel'] == 'icon')
return;
/* Try to load icon from site mode theme */
$theme = $camyks->get_theme($camyks->get_confValue('site_default_theme'));
if ($theme !== false and ($icon = $theme->get_mainIcon()) !== false) {
$this->add_link('icon', $root.$icon);
return;
}
/* Last solution, display empty PNG */
$this->add_link('icon', 'data:image/png;base64,iVBORw0KGgo=');
}
}
/**
@@ -93,12 +93,7 @@ final class MySQLiDBConnection extends CDBConnection {
return $this->connection->select_db($name);
}
/**
* Dump database.
* @param mixed $file
* @return mixed
*/
/**
/**
* Dump database.
* @param mixed $file
* @return mixed
@@ -4,10 +4,10 @@
* @details Engine / Object Library
* @file engine/lib/object/Theme.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0
* @version 1.0.1
* @date Creation: Jun 2005
* @date Modification: Apr 2018
* @copyright 2005 - 2018 CaMykS Team
* @date Modification: Jan 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.
*/
@@ -749,5 +749,16 @@ abstract class Theme extends Plugin {
public function get_layeredMenuFooter() {
return $this->get_part('layeredMenuFooter');
}
/**
* Return main icon url from touch icons.
* @return string
*/
public function get_mainIcon() {
foreach ($this->touchIcons as $icon)
if ($icon['name'] === 'icon')
return $this->get_fileURL('img/touchIcons/'.$icon['url']);
return false;
}
}
?>
Oops, something went wrong.

0 comments on commit aa9362c

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