Skip to content
Permalink
Browse files

Merge branch 'dev'

  • Loading branch information
JB Lebrun
JB Lebrun committed Sep 2, 2019
2 parents 4064af3 + b8fa67b commit d45b71e18d75ec163162f71a54c0318708d97df8
Showing with 1,655 additions and 279 deletions.
  1. +15 −0 documents/changelogs/Release-20190701.md
  2. +5 −5 engine/etc/static.php.inc
  3. +117 −39 engine/lib/tool/client.php.inc
  4. +65 −5 engine/lib/tool/clientBots/Bots.php.inc
  5. +12 −2 engine/lib/tool/clientBots/Generics.php.inc
  6. +42 −2 engine/lib/tool/clientBots/Tools.php.inc
  7. +32 −2 engine/lib/tool/clientBots/Unknowns.php.inc
  8. +4 −2 engine/lib/tool/clientDevices/Acer.php.inc
  9. +47 −0 engine/lib/tool/clientDevices/Advan.php.inc
  10. +3 −2 engine/lib/tool/clientDevices/Alcatel.php.inc
  11. +48 −0 engine/lib/tool/clientDevices/Altice.php.inc
  12. +46 −0 engine/lib/tool/clientDevices/AmericanNetworkSolutions.php.inc
  13. +6 −2 engine/lib/tool/clientDevices/Asus.php.inc
  14. +22 −2 engine/lib/tool/clientDevices/BlackBerry.php.inc
  15. +3 −2 engine/lib/tool/clientDevices/Blackview.php.inc
  16. +6 −4 engine/lib/tool/clientDevices/Condor.php.inc
  17. +43 −4 engine/lib/tool/clientDevices/Cubot.php.inc
  18. +5 −2 engine/lib/tool/clientDevices/Doogee.php.inc
  19. +10 −3 engine/lib/tool/clientDevices/Energizer.php.inc
  20. +4 −2 engine/lib/tool/clientDevices/Google.php.inc
  21. +7 −2 engine/lib/tool/clientDevices/HTC.php.inc
  22. +3 −2 engine/lib/tool/clientDevices/Haier.php.inc
  23. +39 −10 engine/lib/tool/clientDevices/Huawei.php.inc
  24. +46 −0 engine/lib/tool/clientDevices/KrugerMatz.php.inc
  25. +3 −2 engine/lib/tool/clientDevices/LG.php.inc
  26. +3 −2 engine/lib/tool/clientDevices/Meizu.php.inc
  27. +3 −2 engine/lib/tool/clientDevices/Micromax.php.inc
  28. +3 −2 engine/lib/tool/clientDevices/Motorola.php.inc
  29. +8 −2 engine/lib/tool/clientDevices/Nokia.php.inc
  30. +5 −2 engine/lib/tool/clientDevices/OnePlus.php.inc
  31. +4 −2 engine/lib/tool/clientDevices/Oppo.php.inc
  32. +20 −2 engine/lib/tool/clientDevices/Samsung.php.inc
  33. +6 −2 engine/lib/tool/clientDevices/Sony.php.inc
  34. +3 −2 engine/lib/tool/clientDevices/Tecno.php.inc
  35. +3 −2 engine/lib/tool/clientDevices/Wiko.php.inc
  36. +53 −0 engine/lib/tool/clientDevices/Wileyfox.php.inc
  37. +5 −2 engine/lib/tool/clientDevices/Xiaomi.php.inc
  38. +4 −2 engine/lib/tool/clientDevices/ZTE.php.inc
  39. +362 −0 plugin/input/ClicAndPayPayment/ClicAndPayPayment.php.inc
  40. +100 −0 plugin/input/ClicAndPayPayment/html/configuration/edit.html.inc
  41. +102 −0 plugin/input/ClicAndPayPayment/html/configuration/view.html.inc
  42. +26 −0 plugin/input/ClicAndPayPayment/html/input.html.inc
  43. +85 −0 plugin/input/ClicAndPayPayment/lib/ClicAndPayPaymentConfig.php.inc
  44. +34 −0 plugin/input/ClicAndPayPayment/locale/translation_en.php.inc
  45. +34 −0 plugin/input/ClicAndPayPayment/locale/translation_fr.php.inc
  46. +118 −118 plugin/input/GenericMediaPopup/js/mediapopup.js
  47. +1 −0 plugin/input/SocialNetworksSharingPanel/SocialNetworksSharingPanel.php.inc
  48. +1 −0 plugin/module/Admin_ContentPage/Admin_ContentPage.php.inc
  49. +3 −3 plugin/module/Admin_GenericEmailingManager/lib/Admin_GenericEmailingManagerEmailing.php.inc
  50. +2 −6 ...GenericMediaLibraryManager/lib/Admin_GenericMediaLibraryManagerPictureSelectionListParams.php.inc
  51. +26 −25 plugin/module/Admin_GenericPetitionManager/lib/Admin_GenericPetitionManagerSignature.php.inc
  52. +3 −3 ...ule/Admin_MonitoringUserAgentChecker/lib/Admin_MonitoringUserAgentCheckerRecordListParams.php.inc
  53. +2 −1 plugin/module/Admin_SystemReport/js/admin_systemreport.js
  54. +3 −3 plugin/module/Content_GoogleSearchResultsViewer/js/googlesearchresultsviewer.js
@@ -0,0 +1,15 @@
# CaMykS Changelog
## Release 20190701

* [2019-06-05 15:17:26 +0200 | JB Lebrun] Adds June 2019 release history in changelogs. [#View details](https://github.com/Dj1b/CaMykS/commit/c8d8e1e0cd368ba82dde8c654f4e7e5eb8fd6b5b)
* [2019-06-05 15:18:34 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/5b3e1c791c4bdfe3d6f0b11d8a7c6e9f2364a0bf)
* [2019-06-07 16:53:45 +0200 | JB Lebrun] Updates label styles in IndigoFlatStyle theme. [#View details](https://github.com/Dj1b/CaMykS/commit/6f08d9208e54338640ab56c092ed06151275150d)
* [2019-06-12 11:15:24 +0200 | JB Lebrun] Disables Google+ social network and does some code enhancements in SocialNetworksSharingPanel input. [#View details](https://github.com/Dj1b/CaMykS/commit/9a4d85e3cdea567f7dadba9407705b293b96ec61)
* [2019-06-13 11:35:22 +0200 | JB Lebrun] Adds management of admin events in CaMykS and Plugin libraries. [#View details](https://github.com/Dj1b/CaMykS/commit/7f5510f562035d5b30e1dfb328e63a831c59f41f)
* [2019-06-14 11:43:10 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/44011939305f082e0612d85d4b558892874f958f)
* [2019-06-21 16:23:55 +0200 | JB Lebrun] Enhances hasEmptyFirstOption parameter management in display_dateInput in HTMLForm library. [#View details](https://github.com/Dj1b/CaMykS/commit/41fa017514b239ab695ee0c170194ac4a6663cff)
* [2019-06-21 16:26:04 +0200 | JB Lebrun] Updates user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/56bc94b7e6a8bfdbf6456177db72844d517618f4)
* [2019-06-26 16:39:50 +0200 | JB Lebrun] Adds manufacturer country in client library and Admin_MonitoringUserAgentChecker module. [#View details](https://github.com/Dj1b/CaMykS/commit/43c28cd15003bc7b25c719e99c04cb7bb51a1ee6)
* [2019-07-01 11:44:37 +0200 | JB Lebrun] Update user agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/ba8271916603e7a33423795948bcc8233bf260cd)
* [2019-07-01 11:44:58 +0200 | JB Lebrun] Does some files cleaning. [#View details](https://github.com/Dj1b/CaMykS/commit/cedb9dc6154dc2cdea8f68525c023f0ca7841433)
* [2019-07-01 11:51:11 +0200 | JB Lebrun] Prepares release. [#View details](https://github.com/Dj1b/CaMykS/commit/7f14dc5902943967abd2b266a97b6564696d3169)
@@ -5,9 +5,9 @@
* @details Engine / Configuration file
* @file engine/etc/static.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.12
* @version 1.0.13
* @date Creation: Sep 2005
* @date Modification: Jul 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.
@@ -23,7 +23,7 @@ $this->website = 'https://www.camyks.net';
* @var string $this->version
* @brief CaMykS full version
*/
$this->version = '1.0-20190701';
$this->version = '1.0-20190901';
/**
* @var string $this->mversion
@@ -35,13 +35,13 @@ $this->mversion = '1.0';
* @var string $this->nversion
* @brief CaMykS minor version
*/
$this->nversion = '20190701';
$this->nversion = '201907901';
/**
* @var integer $this->last_modification_date
* @brief CaMykS last modification date
*/
$this->last_modification_date = mktime(0, 0, 0, 1, 7, 2019);
$this->last_modification_date = mktime(0, 0, 0, 1, 9, 2019);
/**
* @var string $this->engine_folder

Large diffs are not rendered by default.

@@ -4,9 +4,9 @@
* @details Engine / Bot Library
* @file engine/lib/tool/clientBots/Bots.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.41
* @version 1.0.43
* @date Creation: May 2018
* @date Modification: Jun 2019
* @date Modification: Aug 2019
* @copyright 2018 - 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.
@@ -329,6 +329,16 @@ function _client_getKnownBots() {
'engine_url' => 'http://www.facebook.com/',
);
/* Twitter bot : Twitterbot */
$knownBots['twitterbot'] = array(
'platform_type' => 'bot',
'platform_format' => 'desktop',
'bot_title' => 'Twitterbot',
'bot_url' => '',
'engine_title' => 'Twitter',
'engine_url' => 'https://twitter.com/',
);
/* Cuill search engine : Twiceler */
$knownBots['cuill.com'] = array(
'platform_type' => 'bot',
@@ -1163,9 +1173,9 @@ function _client_getKnownBots() {
'platform_type' => 'bot',
'platform_format' => 'desktop',
'bot_title' => 'PaperLiBot',
'bot_url' => '',
'engine_title' => 'Amazon',
'engine_url' => 'http://aws.amazon.com/',
'bot_url' => 'https://support.paper.li/entries/20023257-what-is-paper-li',
'engine_title' => 'Paper.li',
'engine_url' => 'https://paper.li',
);
/* Suggy Bot */
@@ -4344,6 +4354,56 @@ function _client_getKnownBots() {
'engine_url' => 'https://econtext.ai/',
);
/* TinEye-bot */
$knownBots['tineye-bot'] = array(
'platform_type' => 'bot',
'platform_format' => 'desktop',
'bot_title' => 'TinEye-bot',
'bot_url' => 'https://www.tineye.com/crawler.html',
'engine_title' => 'TinEye',
'engine_url' => 'https://www.tineye.com/',
);
/* veu */
$knownBots['veu.cat'] = array(
'platform_type' => 'bot',
'platform_format' => 'desktop',
'bot_title' => '',
'bot_url' => '',
'engine_title' => 'veu.cat',
'engine_url' => 'http://www.veu.cat/',
);
/* Nuzzel */
$knownBots['nuzzel'] = array(
'platform_type' => 'bot',
'platform_format' => 'desktop',
'bot_title' => '',
'bot_url' => '',
'engine_title' => 'Nuzzel',
'engine_url' => 'http://nuzzel.com/',
);
/* datagnionbot */
$knownBots['datagnionbot'] = array(
'platform_type' => 'bot',
'platform_format' => 'desktop',
'bot_title' => 'datagnionbot',
'bot_url' => 'https://www.datagnion.com/bot.html',
'engine_title' => 'Datagnion',
'engine_url' => 'https://www.datagnion.com/',
);
/* TrendsmapResolver */
$knownBots['trendsmapresolver'] = array(
'platform_type' => 'bot',
'platform_format' => 'desktop',
'bot_title' => 'TrendsmapResolver',
'bot_url' => '',
'engine_title' => 'Trendsmap',
'engine_url' => 'https://www.trendsmap.com/',
);
/* return bot list */
return $knownBots;
}
@@ -4,9 +4,9 @@
* @details Engine / Tool Library
* @file engine/lib/tool/clientBots/Generics.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.13
* @version 1.0.14
* @date Creation: May 2018
* @date Modification: Jun 2019
* @date Modification: Jul 2019
* @copyright 2018 - 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.
@@ -733,6 +733,16 @@ function _client_getKnownGenericsL2() {
'engine_url' => '',
);
/* Cortex */
$knownGenerics['cortex'] = array(
'platform_type' => 'tool',
'platform_format' => 'desktop',
'tool_title' => 'Cortex',
'tool_url' => 'https://github.com/TheHive-Project/Cortex',
'engine_title' => '',
'engine_url' => '',
);
/* obot */
$knownGenerics[' obot'] = array(
'platform_type' => 'bot',
@@ -4,9 +4,9 @@
* @details Engine / Tool Library
* @file engine/lib/tool/clientBots/Tools.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.20
* @version 1.0.22
* @date Creation: May 2018
* @date Modification: Jun 2019
* @date Modification: Aug 2019
* @copyright 2018 - 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.
@@ -1241,6 +1241,46 @@ function _client_getKnownTools() {
'engine_url' => 'https://slack.com/',
);
/* Cocolyzebot */
$knownTools['cocolyzebot'] = array(
'platform_type' => 'tool',
'platform_format' => 'desktop',
'tool_title' => 'Cocolyzebot',
'tool_url' => 'https://cocolyze.com/bot',
'engine_title' => 'Cocolyze',
'engine_url' => 'https://cocolyze.com/',
);
/* Camo Asset Proxy */
$knownTools['camo asset proxy'] = array(
'platform_type' => 'tool',
'platform_format' => 'desktop',
'tool_title' => '',
'tool_url' => '',
'engine_title' => 'Camo Asset Proxy',
'engine_url' => 'https://github.com/atmos/camo',
);
/* Apercite */
$knownTools['aprc.it'] = array(
'platform_type' => 'tool',
'platform_format' => 'desktop',
'tool_title' => 'Aprc',
'tool_url' => '',
'engine_title' => 'Apercite',
'engine_url' => 'https://apercite.fr',
);
/* EventMachine */
$knownTools['eventmachine'] = array(
'platform_type' => 'tool',
'platform_format' => 'desktop',
'tool_title' => 'EventMachine HttpClient',
'tool_url' => 'https://github.com/eventmachine/eventmachine',
'engine_title' => '',
'engine_url' => '',
);
/* return list */
return $knownTools;
}
@@ -4,9 +4,9 @@
* @details Engine / Bot Library
* @file engine/lib/tool/clientBots/Unknowns.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.9
* @version 1.0.11
* @date Creation: Jan 2019
* @date Modification: Jun 2019
* @date Modification: Aug 2019
* @copyright 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.
@@ -469,6 +469,36 @@ function _client_getKnownUnknowns() {
'engine_url' => '',
);
/* Ceatles */
$unknownBots['ceatles'] = array(
'platform_type' => 'bot',
'platform_format' => 'desktop',
'bot_title' => 'Ceatles (Unknown bot)',
'bot_url' => '',
'engine_title' => '',
'engine_url' => '',
);
/* backlinkCheck */
$unknownBots['backlinkcheckv'] = array(
'platform_type' => 'bot',
'platform_format' => 'desktop',
'bot_title' => 'backlinkCheck (Unknown tool)',
'bot_url' => '',
'engine_title' => '',
'engine_url' => '',
);
/* marky */
$unknownBots['marky'] = array(
'platform_type' => 'bot',
'platform_format' => 'desktop',
'bot_title' => 'Marky (Unknown bot)',
'bot_url' => '',
'engine_title' => '',
'engine_url' => '',
);
/* return bot list */
return $unknownBots;
}
@@ -4,9 +4,9 @@
* @details Engine / Tool Library
* @file engine/lib/tool/clientDevices/Acer.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.6
* @version 1.0.8
* @date Creation: Apr 2018
* @date Modification: Jun 2019
* @date Modification: Aug 2019
* @copyright 2018 - 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,6 +23,8 @@ function get_AcerClientDevice($deviceCode='') {
/* Acer tablets */
'A500' => array('platform_model' => 'Iconia Tab A500', 'platform_type' => 'tablet', 'platform_format' => 'tablet', 'platform_year' => 2012),
'B3-A20' => array('platform_model' => 'Iconia Tab One 10', 'platform_type' => 'tablet', 'platform_format' => 'tablet', 'platform_year' => 2015),
'B1-770' => array('platform_model' => 'Iconia Tab One 7', 'platform_type' => 'tablet', 'platform_format' => 'tablet', 'platform_year' => 2015),
'B1-850' => array('platform_model' => 'Iconia Tab One 8', 'platform_type' => 'tablet', 'platform_format' => 'tablet', 'platform_year' => 2016),
'B3-A30' => array('platform_model' => 'Iconia Tab One 10', 'platform_type' => 'tablet', 'platform_format' => 'tablet', 'platform_year' => 2016),
'B3-A40' => array('platform_model' => 'Iconia Tab One 10', 'platform_type' => 'tablet', 'platform_format' => 'tablet', 'platform_year' => 2017),
'B3-A50' => array('platform_model' => 'Iconia Tab One 10', 'platform_type' => 'tablet', 'platform_format' => 'tablet', 'platform_year' => 2018),
@@ -0,0 +1,47 @@
<?php
/**
* @brief Advan client devices specific methods
* @details Engine / Tool Library
* @file engine/lib/tool/clientDevices/Advan.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.0
* @date Creation: Aug 2019
* @date Modification: Aug 2019
* @copyright 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.
*/
/**
* Return Advan client device information from a known list.
* @param mixed $deviceCode
* @return array
*/
function get_AdvanClientDevice($deviceCode='') {
$deviceList = array(
'5041' => array('platform_model' => 'S50K', 'platform_year' => 2017),
'5061' => array('platform_model' => 'i5C', 'platform_year' => 2017),
'5062' => array('platform_model' => 'S5E', 'platform_year' => 2017),
);
/* Check for returning list */
if ($deviceCode === false)
return $deviceList;
/* Initialise result. */
$result = array(
'platform_company' => 'Advan',
'platform_model' => $deviceCode,
'platform_type' => 'handheld',
'platform_format' => 'handheld',
);
/* Check if device is a known device. */
if (!array_key_exists($deviceCode, $deviceList))
return $result;
/* Return result. */
return array_merge($result, $deviceList[$deviceCode]);
}
?>
@@ -4,9 +4,9 @@
* @details Engine / Tool Library
* @file engine/lib/tool/clientDevices/Alcatel.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.7
* @version 1.0.8
* @date Creation: Apr 2018
* @date Modification: Jun 2019
* @date Modification: Aug 2019
* @copyright 2018 - 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.
@@ -52,6 +52,7 @@ function get_AlcatelClientDevice($deviceCode='') {
'5015X' => array('platform_model' => 'OneTouch Pop 3', 'platform_year' => 2015),
'5020X' => array('platform_model' => 'OneTouch M\'Pop', 'platform_year' => 2013),
'5023F' => array('platform_model' => 'PIxi 4 Plus Power', 'platform_year' => 2016),
'5024D' => array('platform_model' => '1S', 'platform_year' => 2019),
'5026D' => array('platform_model' => '3C', 'platform_year' => 2018),
'5035D' => array('platform_model' => 'OneTouch X\'Pop', 'platform_year' => 2013),
'5036D' => array('platform_model' => 'OneTouch Pop C5', 'platform_year' => 2013),

0 comments on commit d45b71e

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