Changeset 526

Timestamp:

Jun 17, 2015 11:47:23 PM (9 years ago)

Author:

anonymous

Message:

Enabled App to load version from json file. Lock URL fixed to permit additional query arguments. Return array instead of object for Prefs cookie json.

Location:

trunk/lib

Files:

• App.inc.php (modified) (2 diffs)
• Lock.inc.php (modified) (1 diff)
• Prefs.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -75 +75 @@
         'site_url' => '', // URL automatically determined by _SERVER['HTTP_HOST'] if not set here.
         '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).
         'site_version_file' => 'docs/version.txt', // File containing version number of this app, relative to the include path.
 
@@ -470 +471 @@
         // Set the application version if defined.
         if (false !== $site_version_file = stream_resolve_include_path($this->getParam('site_version_file'))) {
-            $site_version = trim(file_get_contents($site_version_file));
+            if (mb_strpos($site_version_file, '.json') !== false) {
+                $version_json = json_decode(trim(file_get_contents($site_version_file)), true);
+                $site_version = $version_json['version'];
+            } else {
+                $site_version = trim(file_get_contents($site_version_file));
+            }
             $this->setParam(array('site_version' => $site_version));
-            if (!defined('_CLI')) {
-                if (!headers_sent($h_file, $h_line)) {
-                    header('X-Site-Version: ' . $site_version);
-                } else {
-                    $this->logMsg(sprintf('Unable to set X-Site-Version; headers already sent (output started in %s : %s)', $h_file, $h_line), LOG_DEBUG, __FILE__, __LINE__);
-                }
+        }
+        if (!defined('_CLI') && $this->getParam('site_version')) {
+            if (!headers_sent($h_file, $h_line)) {
+                header('X-Site-Version: ' . $site_version);
+            } else {
+                $this->logMsg(sprintf('Unable to set X-Site-Version; headers already sent (output started in %s : %s)', $h_file, $h_line), LOG_DEBUG, __FILE__, __LINE__);
             }
         }

trunk/lib/Lock.inc.php

@@ -377 +377 @@
         $app =& App::getInstance();
 
-        $app->dieURL(sprintf('%s?lock_id=%s&boomerang=%s', $this->getParam('error_url'), $this->data['lock_id'], urlencode(absoluteMe())));
+        $app->dieURL($this->getParam('error_url'), array('lock_id' => $this->data['lock_id'], 'boomerang' => urlencode(absoluteMe())));
     }
 

trunk/lib/Prefs.inc.php

@@ -333 +333 @@
             $name = $this->_getCookieName($key);
             if ($this->exists($key)) {
-                $val = json_decode($_COOKIE[$name]);
+                $val = json_decode($_COOKIE[$name], true);
                 $app->logMsg(sprintf('Found %s in cookie: %s', $key, getDump($val)), LOG_DEBUG, __FILE__, __LINE__);
                 return $val;