Changeset 679

Timestamp:

May 14, 2019 2:17:07 AM (5 years ago)

Author:

anonymous

Message:

Fix minor bugs. Detect http port and add to site_port, site_url, and page_url params of App.

Location:

trunk

Files:

• docs/examples/_config.inc.php (modified) (1 diff)
• js/Msg.js (modified) (2 diffs)
• js/Utilities.js (modified) (6 diffs)
• lib/App.inc.php (modified) (7 diffs)
• lib/DB.inc.php (modified) (1 diff)
• lib/Utilities.inc.php (modified) (1 diff)

trunk/docs/examples/_config.inc.php

@@ -62 +62 @@
     'images_path' => '/i',
 
+    'php_timezone' => null,
     'date_format' => 'd M Y',
+    'time_format' => 'H:i',
     'sql_date_format' => '%e %b %Y',
     'sql_time_format' => '%k:%i',

trunk/js/Msg.js

@@ -83 +83 @@
     var msghash = Strangecode.Msg.hash(message);
     if (!$(options.container).find('[data-msghash="' + msghash + '"]').length) {
-        $(options.container).append($('<div data-alert class="alert-box sc-js-msg ' + msg_class + '" data-msghash="' + msghash + '"></div>').hide().html(message).append('<a href="#" class="close">×</a>'));
+        $(options.container).append($('<div data-alert class="alert-box sc-js-msg ' + msg_class + '" data-msghash="' + msghash + '"></div>').hide().html(message).append('<a href="#" class="close">×</a>')).show();
         $('.sc-js-msg').slideDown('fast');
         if ($.fn.foundation) {
@@ -107 +107 @@
     }
 
-    if (options.gotohash) {
-        $(document.body).animate({
+    if (options.gotohash && $('html, body').scrollTop() > $(options.container).offset().top) {
+        $('html, body').animate({
             'scrollTop': $(options.container).offset().top
         }, 'fast');

trunk/js/Utilities.js

@@ -39 +39 @@
 */
 if (!String.prototype.format) {
-    String.prototype.format = function() {
+    String.prototype.format = function () {
         var args = arguments;
-        return this.replace(/{(\d+)}/g, function(match, number) {
+        return this.replace(/{(\d+)}/g, function (match, number) {
             return typeof args[number-1] != 'undefined' ? args[number-1] : match;
         });
@@ -61 +61 @@
 * @since    30 Jun 2008 12:32:19
 */
-jQuery.fn.nospam = function() {
-    return this.each(function(){
+jQuery.fn.nospam = function () {
+    return this.each(function (){
         $(this).text($(this).text().replace(' at ', '@').replace(' dot ', '.'));
         if (this.href) {
@@ -131 +131 @@
 * @since    30 Jun 2013
 */
-$.fn.slug = function() {
+$.fn.slug = function () {
     str = this.text().trim().toLowerCase();
     var from = 'áéíóúà ÚìòùÀëïöÌÁÉÍÓÚÀÈÌÒÙÄËÏÖÜâêîÎûÂÊÎÔÛñçÇ@·/_,:;';
@@ -173 +173 @@
 */
 if (!String.prototype.ucfirst) {
-    String.prototype.ucfirst = function() {
+    String.prototype.ucfirst = function () {
         return this.charAt(0).toUpperCase() + this.slice(1);
     };
@@ -193 +193 @@
 * @since    06 Mar 2019
 */
-Strangecode.humanTime = function(seconds, max_unit) {
+Strangecode.humanTime = function (seconds, max_unit) {
     // Units: array of seconds in the unit, singular and plural unit names.
     var units = {
@@ -227 +227 @@
 // https://github.com/benjamingr/RegExp.escape
 if(!RegExp.escape){
-    RegExp.escape = function(s){
+    RegExp.escape = function (s){
         return String(s).replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
     };
 }
+
+// Throttle will ensure that a function is called at most once
+// in a specified time period (for instance, once per 10 seconds). This means
+// throttling will prevent a function from running if it has run “recently”.
+// Throttling also ensures a function is run regularly at a fixed rate.
+// https://blog.bitsrc.io/understanding-throttling-and-debouncing-973131c1ba07
+Strangecode.throttle = function (f, t) {
+    return function (args) {
+        let previousCall = this.lastCall;
+        this.lastCall = Date.now();
+        if (typeof previousCall === 'undefined' || (this.lastCall - previousCall) > t) {
+            // Throttle time has elapsed.
+            f(args);
+        }
+    }
+}
+
+// Debounce will ignore all calls to it until the calls have stopped for a
+// specified time period. Only then will it call the original function. For
+// instance, if we specify the time as two seconds, and the debounced function is
+// called 10 times with an interval of one second between each call, the function
+// will not call the original function until two seconds after the last (tenth)
+// call.
+// https://blog.bitsrc.io/understanding-throttling-and-debouncing-973131c1ba07
+Strangecode.debounce = function (f, t) {
+    return function (args) {
+        let previousCall = this.lastCall;
+        this.lastCall = Date.now();
+        if (previousCall && ((this.lastCall - previousCall) <= t)) {
+            clearTimeout(this.lastCallTimer);
+        }
+        this.lastCallTimer = setTimeout(() => f(args), t);
+    }
+}

trunk/lib/App.inc.php

@@ -78 +78 @@
         'site_name' => null,
         'site_email' => '', // Set to no-reply@HTTP_HOST if not set here.
-        'site_hostname' => '', // The hostname of this application (if not set, use a cleaned HTTP_HOST environment variable).
+        'site_hostname' => '', // The hostname of this application (if not set, derived from HTTP_HOST).
+        'site_port' => '', // The hostname of this application (if not set, derived from HTTP_HOST).
         'site_url' => '', // URL to the root of the site (created during App->start()).
         'page_url' => '', // URL to the current page (created during App->start()).
@@ -146 +147 @@
         'db_pass' => null,
 
-        // And for CLI scripts, which should include a JSON file at this specified location in the include path.
+        // CLI scripts will need this JSON file in the include path.
         'db_auth_file' => 'db_auth.json',
 
@@ -479 +480 @@
          */
 
-        // To get a safe hostname, remove host port and invalid hostname characters.
+        // To get a safe hostname, remove port and invalid hostname characters.
         $safe_http_host = preg_replace('/[^a-z\d.:-]/', '', strtok(getenv('HTTP_HOST'), ':'));
+        // If strtok() matched a ':' in the previous line, the rest of the string contains the port number (or FALSE)
+        $safe_http_port = preg_replace('/[^0-9]/', '', strtok(''));
         if ('' != $safe_http_host && '' == $this->getParam('site_hostname')) {
             $this->setParam(array('site_hostname' => $safe_http_host));
+        }
+        if ('' != $safe_http_port && '' == $this->getParam('site_port')) {
+            $this->setParam(array('site_port' => $safe_http_port));
         }
 
@@ -489 +495 @@
         // Not available on CLI scripts obviously.
         if ('' != $safe_http_host && '' == $this->getParam('site_url')) {
-            $this->setParam(array('site_url' => sprintf('%s://%s', (getenv('HTTPS') ? 'https' : 'http'), $safe_http_host)));
+            $this->setParam(array('site_url' => sprintf('%s://%s%s', (getenv('HTTPS') ? 'https' : 'http'), $safe_http_host, (preg_match('/^(|80|443)$/', $safe_http_port) ? '' : ':' . $safe_http_port))));
         }
 
@@ -495 +501 @@
         // Also not available on CLI scripts obviously.
         if ('' != $safe_http_host) {
-            $this->setParam(array('page_url' => sprintf('%s://%s%s', (getenv('HTTPS') ? 'https' : 'http'), $safe_http_host, getenv('REQUEST_URI'))));
+            $this->setParam(array('page_url' => sprintf('%s%s', $this->getParam('site_url'), getenv('REQUEST_URI'))));
         }
 
@@ -1396 +1402 @@
 
         if (preg_match('!^/!', $url)) {
-            // If relative URL is given, prepend correct local hostname.
-            $scheme = getenv('HTTPS') ? 'https' : 'http';
-            $host = $this->getParam('site_hostname');
-            $url = sprintf('%s://%s%s', $scheme, $host, $url);
+            // If relative URL is given, prepend site_url, which contains: scheme://hostname[:port]
+            $url = sprintf('%s%s', $this->getParam('site_url'), $url);
         }
 
@@ -1705 +1709 @@
 
     /*
-    * Set timezone used internally by PHP.
+    * Set timezone used internally by PHP. See full list at https://www.php.net/manual/en/timezones.php
     *
     * @access   public

trunk/lib/DB.inc.php

@@ -339 +339 @@
         $debugqry = preg_replace("/\n[\t ]+/", "\n", $query);
         if ($this->getParam('db_always_debug') || $debug) {
-            echo "<!-- ----------------- Query $this->_query_count ---------------------\n$debugqry\n-->\n";
+            if ($debug > 1) {
+                dump($debugqry, true, SC_DUMP_PRINT_R, __FILE__, __LINE__);
+            } else {
+                echo "<!-- ----------------- Query $this->_query_count ---------------------\n$debugqry\n-->\n";
+            }
         }
 

trunk/lib/Utilities.inc.php

@@ -1452 +1452 @@
     $ch = curl_init($url);
     curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+    curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
     curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
     curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36");
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // Don't pass through data to the browser.