From 1472e6d40c5ddea520dc398b78f04c5600ae7d20 Mon Sep 17 00:00:00 2001 From: Kenji ITO Date: Sat, 18 Nov 2017 15:32:53 +0900 Subject: [PATCH] Added Resource class --- public_html/admin/clearctl.php | 1 + public_html/javascript/profile_editor.js | 82 +- public_html/layout/denim/functions.php | 12 +- public_html/siteconfig.php.dist | 1 + public_html/usersettings.php | 32 +- public_html/vendor/jquery-ui/LICENSE.txt | 43 + .../images/ui-bg_glass_75_d0e5f5_1x400.png | Bin 0 -> 336 bytes .../images/ui-bg_glass_85_dfeffc_1x400.png | Bin 0 -> 341 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes .../ui-bg_gloss-wave_55_5c9ccc_500x100.png | Bin 0 -> 5824 bytes .../ui-bg_inset-hard_100_f5f8f9_1x100.png | Bin 0 -> 333 bytes .../ui-bg_inset-hard_100_fcfdfd_1x100.png | Bin 0 -> 292 bytes .../images/ui-icons_217bc0_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_469bdd_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_6da8d5_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_d8e7f3_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_f9bd01_256x240.png | Bin 0 -> 4549 bytes public_html/vendor/jquery-ui/jquery-ui.css | 1312 ++ public_html/vendor/jquery-ui/jquery-ui.js | 18706 ++++++++++++++++ .../vendor/jquery-ui/jquery-ui.min.css | 7 + public_html/vendor/jquery-ui/jquery-ui.min.js | 13 + .../vendor/jquery-ui/jquery-ui.structure.css | 886 + .../jquery-ui/jquery-ui.structure.min.css | 5 + .../vendor/jquery-ui/jquery-ui.theme.css | 443 + .../vendor/jquery-ui/jquery-ui.theme.min.css | 5 + public_html/vendor/jquery/jquery.min.js | 4 + system/classes/Autoload.php | 8 + system/classes/JSMin/JSMin.php | 454 + system/classes/JSMin/LICENSE.txt | 26 + .../JSMin/UnterminatedCommentException.php | 6 + .../JSMin/UnterminatedRegExpException.php | 6 + .../JSMin/UnterminatedStringException.php | 6 + .../MatthiasMullie/minify/CONTRIBUTING.md | 59 - .../classes/MatthiasMullie/minify/Dockerfile | 12 - system/classes/MatthiasMullie/minify/LICENSE | 18 - .../MatthiasMullie/minify/bin/minifycss | 45 - .../MatthiasMullie/minify/bin/minifyjs | 45 - .../MatthiasMullie/minify/composer.json | 38 - .../minify/data/js/keywords_after.txt | 7 - .../minify/data/js/keywords_before.txt | 26 - .../minify/data/js/keywords_reserved.txt | 63 - .../minify/data/js/operators.txt | 46 - .../minify/data/js/operators_after.txt | 43 - .../minify/data/js/operators_before.txt | 43 - .../MatthiasMullie/minify/docker-compose.yml | 11 - .../classes/MatthiasMullie/minify/src/CSS.php | 704 - .../MatthiasMullie/minify/src/Exception.php | 20 - .../minify/src/Exceptions/BasicException.php | 23 - .../src/Exceptions/FileImportException.php | 21 - .../minify/src/Exceptions/IOException.php | 21 - .../classes/MatthiasMullie/minify/src/JS.php | 638 - .../MatthiasMullie/minify/src/Minify.php | 444 - .../MatthiasMullie/path-converter/LICENSE | 18 - .../path-converter/composer.json | 28 - .../path-converter/src/Converter.php | 195 - .../path-converter/src/ConverterInterface.php | 24 - .../path-converter/src/NoConverter.php | 23 - system/classes/Resource.php | 495 +- 60 files changed, 22347 insertions(+), 2821 deletions(-) create mode 100644 public_html/vendor/jquery-ui/LICENSE.txt create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_glass_75_d0e5f5_1x400.png create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_glass_85_dfeffc_1x400.png create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_inset-hard_100_f5f8f9_1x100.png create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_inset-hard_100_fcfdfd_1x100.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_217bc0_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_2e83ff_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_469bdd_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_6da8d5_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_cd0a0a_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_d8e7f3_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_f9bd01_256x240.png create mode 100644 public_html/vendor/jquery-ui/jquery-ui.css create mode 100644 public_html/vendor/jquery-ui/jquery-ui.js create mode 100644 public_html/vendor/jquery-ui/jquery-ui.min.css create mode 100644 public_html/vendor/jquery-ui/jquery-ui.min.js create mode 100644 public_html/vendor/jquery-ui/jquery-ui.structure.css create mode 100644 public_html/vendor/jquery-ui/jquery-ui.structure.min.css create mode 100644 public_html/vendor/jquery-ui/jquery-ui.theme.css create mode 100644 public_html/vendor/jquery-ui/jquery-ui.theme.min.css create mode 100644 public_html/vendor/jquery/jquery.min.js create mode 100644 system/classes/JSMin/JSMin.php create mode 100644 system/classes/JSMin/LICENSE.txt create mode 100644 system/classes/JSMin/UnterminatedCommentException.php create mode 100644 system/classes/JSMin/UnterminatedRegExpException.php create mode 100644 system/classes/JSMin/UnterminatedStringException.php delete mode 100644 system/classes/MatthiasMullie/minify/CONTRIBUTING.md delete mode 100644 system/classes/MatthiasMullie/minify/Dockerfile delete mode 100644 system/classes/MatthiasMullie/minify/LICENSE delete mode 100644 system/classes/MatthiasMullie/minify/bin/minifycss delete mode 100644 system/classes/MatthiasMullie/minify/bin/minifyjs delete mode 100644 system/classes/MatthiasMullie/minify/composer.json delete mode 100644 system/classes/MatthiasMullie/minify/data/js/keywords_after.txt delete mode 100644 system/classes/MatthiasMullie/minify/data/js/keywords_before.txt delete mode 100644 system/classes/MatthiasMullie/minify/data/js/keywords_reserved.txt delete mode 100644 system/classes/MatthiasMullie/minify/data/js/operators.txt delete mode 100644 system/classes/MatthiasMullie/minify/data/js/operators_after.txt delete mode 100644 system/classes/MatthiasMullie/minify/data/js/operators_before.txt delete mode 100644 system/classes/MatthiasMullie/minify/docker-compose.yml delete mode 100644 system/classes/MatthiasMullie/minify/src/CSS.php delete mode 100644 system/classes/MatthiasMullie/minify/src/Exception.php delete mode 100644 system/classes/MatthiasMullie/minify/src/Exceptions/BasicException.php delete mode 100644 system/classes/MatthiasMullie/minify/src/Exceptions/FileImportException.php delete mode 100644 system/classes/MatthiasMullie/minify/src/Exceptions/IOException.php delete mode 100644 system/classes/MatthiasMullie/minify/src/JS.php delete mode 100644 system/classes/MatthiasMullie/minify/src/Minify.php delete mode 100644 system/classes/MatthiasMullie/path-converter/LICENSE delete mode 100644 system/classes/MatthiasMullie/path-converter/composer.json delete mode 100644 system/classes/MatthiasMullie/path-converter/src/Converter.php delete mode 100644 system/classes/MatthiasMullie/path-converter/src/ConverterInterface.php delete mode 100644 system/classes/MatthiasMullie/path-converter/src/NoConverter.php diff --git a/public_html/admin/clearctl.php b/public_html/admin/clearctl.php index 9b31aedd4..298b1aca0 100644 --- a/public_html/admin/clearctl.php +++ b/public_html/admin/clearctl.php @@ -45,3 +45,4 @@ */ CTL_clearCache(); COM_redirect($_CONF['site_admin_url'] . '/index.php?msg=500'); +Geeklog\Cache::clear(); diff --git a/public_html/javascript/profile_editor.js b/public_html/javascript/profile_editor.js index e013639b9..d93218548 100644 --- a/public_html/javascript/profile_editor.js +++ b/public_html/javascript/profile_editor.js @@ -1,13 +1,11 @@ /* Reminder: always indent with 4 spaces (no tabs). */ // +---------------------------------------------------------------------------+ -// | Geeklog 1.6 | +// | Geeklog 2.2 | // +---------------------------------------------------------------------------+ // | Copyright (C) 2003-2009 by the following authors: | // | Version 1.0 Date: Jun 24, 2006 | // | Authors: Blaine Lang - blaine@portalparts.com | -// | | // | Javascript functions for Account Profile Editor | -// | | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -26,51 +24,85 @@ // | | // +---------------------------------------------------------------------------+ -// @param string selected Name of div that has been selected -// @param int selindex index id of the selected tab as in 1 - 7 used to set the selected tab -function showhideProfileEditorDiv(selected, selindex) { - +// @param string selected Name of div that has been selected +// @param int selectedIndex index id of the selected tab as in 1 - 7 used to set the selected tab +function showhideProfileEditorDiv(selected, selectedIndex) { + 'use strict'; // Reset the current selected navbar tab - var cnavbar = document.getElementById('current'); - if (cnavbar) cnavbar.id = ''; + var cNavbar = document.getElementById('current'); + + if (cNavbar) { + cNavbar.id = ''; + } - // Cycle thru the navlist child elements - buiding an array of just the link items + // Cycle thru the navlist child elements - building an array of just the link items var navbar = document.getElementById('navlist'); - var menuitems = new Array(7); + var menuItems = new Array(7); var item = 0; - for (var i=0 ;i < navbar.childNodes.length ; i++ ) { - if (navbar.childNodes[i].nodeName.toLowerCase() == 'li') { - menuitems[item] = navbar.childNodes[i]; + for (var i = 0; i < navbar.childNodes.length; i++) { + if (navbar.childNodes[i].nodeName.toLowerCase() === 'li') { + menuItems[item] = navbar.childNodes[i]; item++; } } + // Now that I have just the link items I can set the selected tab using the passed selected Item number // Set the