Changeset 685 for trunk/lib/App.inc.php

Timestamp:

May 23, 2019 6:40:04 PM (5 years ago)

Author:

anonymous

Message:

Various minor changes:

• Allow $app->ohref() with no value to return a link to the current page (REQUEST_URI but without the QUERY_STRING).
• Add some classes to HTML output to support Zurb Foundation 6.
• Stop prepending ​scheme://host:port to URLs because we can't guess hte port at a proxy.
• Include Auth_Simple.inc.php (copied from control.strangecode.com). $auth->login() now requires a callback funtion to verify credentials.

File:

• trunk/lib/App.inc.php (modified) (7 diffs)

trunk/lib/App.inc.php

@@ -764 +764 @@
                 switch ($m['type']) {
                 case MSG_ERR:
-                    echo '<div data-alert class="sc-msg-error alert-box alert">' . $m['message'] . '<a href="#" class="close">&times;</a></div>';
+                    echo '<div data-alert data-closable class="sc-msg-error alert-box callout alert">' . $m['message'] . '<a class="close close-button" aria-label="Dismiss alert" data-close><span aria-hidden="true">&times;</span></a></div>';
                     break;
 
                 case MSG_WARNING:
-                    echo '<div data-alert class="sc-msg-warning alert-box warning">' . $m['message'] . '<a href="#" class="close">&times;</a></div>';
+                    echo '<div data-alert data-closable class="sc-msg-warning alert-box callout warning">' . $m['message'] . '<a class="close close-button" aria-label="Dismiss alert" data-close><span aria-hidden="true">&times;</span></a></div>';
                     break;
 
                 case MSG_SUCCESS:
-                    echo '<div data-alert class="sc-msg-success alert-box success">' . $m['message'] . '<a href="#" class="close">&times;</a></div>';
+                    echo '<div data-alert data-closable class="sc-msg-success alert-box callout success">' . $m['message'] . '<a class="close close-button" aria-label="Dismiss alert" data-close><span aria-hidden="true">&times;</span></a></div>';
                     break;
 
                 case MSG_NOTICE:
                 default:
-                    echo '<div data-alert class="sc-msg-notice alert-box info">' . $m['message'] . '<a href="#" class="close">&times;</a></div>';
+                    echo '<div data-alert data-closable class="sc-msg-notice alert-box callout primary info">' . $m['message'] . '<a class="close close-button" aria-label="Dismiss alert" data-close><span aria-hidden="true">&times;</span></a></div>';
                     break;
                 }
@@ -1079 +1079 @@
      * @return string url with attached queries and, if not using cookies, the session id
      */
-    public function url($url, $carry_args=null, $always_include_sid=false, $include_csrf_token=false)
+    public function url($url='', $carry_args=null, $always_include_sid=false, $include_csrf_token=false)
     {
         if (!$this->running) {
@@ -1118 +1118 @@
         }
 
+        // If the URL is empty, use REQUEST_URI without the QUERY_STRING.
+        if ('' == $url) {
+            $url = str_replace([getenv('QUERY_STRING'), '?'], '', getenv('REQUEST_URI'));
+        }
+
         // Get the first delimiter that is needed in the url.
         $delim = mb_strpos($url, '?') !== false ? ini_get('arg_separator.output') : '?';
@@ -1141 +1146 @@
         $url = $parts[0];
         $anchor = isset($parts[1]) ? $parts[1] : '';
-
         // $anchor =
 
@@ -1177 +1181 @@
         }
 
+        if ('' == $url) {
+            $this->logMsg(sprintf('Generated empty URL. Args: %s', getDump(func_get_args())), LOG_NOTICE, __FILE__, __LINE__);
+        }
+
         return $url;
     }
@@ -1189 +1197 @@
      * @since   09 Dec 2005 17:58:45
      */
-    public function oHREF($url, $carry_args=null, $always_include_sid=false, $include_csrf_token=false)
+    public function oHREF($url='', $carry_args=null, $always_include_sid=false, $include_csrf_token=false)
     {
         // Process the URL.
@@ -1406 +1414 @@
         }
 
-        if (preg_match('!^/!', $url)) {
-            // If relative URL is given, prepend site_url, which contains: scheme://hostname[:port]
-            $url = sprintf('%s%s', $this->getParam('site_url'), $url);
-        }
+        // FIXME: actually, it seems better to continue using a relative URL since we can't guess the port at the reverse proxy (e.g., port 3000 for browser-sync).
+        // if (preg_match('!^/!', $url)) {
+        //     // If relative URL is given, prepend site_url, which contains: scheme://hostname[:port]
+        //     $url = sprintf('%s%s', $this->getParam('site_url'), $url);k
+        // }
 
         $url = $this->url($url, $carry_args, $always_include_sid);