Changeset 527

Timestamp:

Jun 18, 2015 7:03:20 PM (9 years ago)

Author:

anonymous

Message:

Added page_url calculation to App->start()

Location:

trunk

Files:

• js/Utilities.js (modified) (1 diff)
• lib/App.inc.php (modified) (2 diffs)

trunk/js/Utilities.js

@@ -33 +33 @@
 * @access   public
 * @param    string multiple Strings to pass to the formatted string.
-* @author   http://stackoverflow.com/questions/610406/javascript-printf-string-format/4673436#4673436
+* @author   http://stackoverflow.com/a/4673436/277303
 * @version  1.0
 * @since    30 May 2014 18:02:39

trunk/lib/App.inc.php

@@ -73 +73 @@
         'site_name' => null,
         'site_email' => '', // Set to no-reply@HTTP_HOST if not set here.
-        'site_url' => '', // URL automatically determined by _SERVER['HTTP_HOST'] if not set here.
+        'site_url' => '', // URL to the root of the site (created during App->start()).
+        'page_url' => '', // URL to the current page (created during App->start()).
         'images_path' => '', // Location for codebase-generated interface widgets (ex: "/admin/i").
         'site_version' => '', // Version of this application (set automatically during start() if site_version_file is used).
@@ -424 +425 @@
          */
 
-        // Script URI will be something like http://host.name.tld (no ending slash)
+        // Site URL will become something like http://host.name.tld (no ending slash)
         // and is used whenever a URL need be used to the current site.
-        // Not available on cli scripts obviously.
+        // Not available on CLI scripts obviously.
         if (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST'] && '' == $this->getParam('site_url')) {
             $this->setParam(array('site_url' => sprintf('%s://%s', ('on' == getenv('HTTPS') ? 'https' : 'http'), getenv('HTTP_HOST'))));
+        }
+
+        // Page URL will become a permalink to the current page.
+        // Also not available on CLI scripts obviously.
+        if (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST']) {
+            $this->setParam(array('page_url' => sprintf('%s://%s%s', ('on' == getenv('HTTPS') ? 'https' : 'http'), getenv('HTTP_HOST'), getenv('REQUEST_URI'))));
         }