Changeset 862 for trunk/Application

Timestamp:

Jan 22, 2016, 4:49:21 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Setup need to work without any app module installed.

Location:

trunk/Application

Files:

• Core.php (modified) (8 diffs)
• UpdateTrace.php (modified) (2 diffs)
• Version.php (modified) (1 diff)

trunk/Application/Core.php

@@ -12 +12 @@
   var $LocaleManager;
   var $Bars;
+  var $PageHeaders;
+  var $BaseURL;
 
   function __construct()
@@ -23 +25 @@
     $this->Pages = array();
     $this->Bars = array();
+    $this->PageHeaders = array();
+    $this->BaseURL = '';
   }
 
@@ -56 +60 @@
     );
 
+    if(GetRemoteAddress() != '')
+      $this->BaseURL = substr($_SERVER["CONTEXT_PREFIX"], 0, -1);
     $this->PathItems = ProcessURL();
 
     // Detect interface locale
-    $this->LocaleManager->DefaultLangCode = $this->Config['Web']['Locale'];
+    if(isset($this->Config['Web']['Locale']))
+      $this->LocaleManager->DefaultLangCode = $this->Config['Web']['Locale'];
     $this->LocaleManager->LangCode = $this->LocaleManager->DefaultLangCode;
     if(count($this->PathItems) > 0)
@@ -99 +106 @@
 
     $ScriptStartTime = GetMicrotime();
-    if(GetRemoteAddress() != '') session_start();
+    //if(GetRemoteAddress() != '')
+      session_start();
 
     // SQL injection hack protection
@@ -139 +147 @@
   function Link($Target)
   {
-    $Remaining = substr($Target, count($this->Config['Web']['BaseURL']));
+    $Remaining = substr($Target, count($this->BaseURL));
     $TargetParts = explode('/', $Remaining);
     if(count($TargetParts) > 0)
@@ -145 +153 @@
       if(in_array($TargetParts[0], $this->LinkLocaleExceptions))
       {
-        return($this->Config['Web']['BaseURL'].$Target);
+        return($this->BaseURL.$Target);
       }
     }
@@ -218 +226 @@
 
     if($Locale == $this->LocaleManager->DefaultLangCode)
-      return($this->Config['Web']['BaseURL'].$Target);
-    return($this->Config['Web']['BaseURL'].'/'.$Locale.$Target);
+      return($this->BaseURL.$Target);
+    return($this->BaseURL.'/'.$Locale.$Target);
   }
 
@@ -319 +327 @@
     $this->Bars[$BarName][$ItemName] = $Callback;
   }
+
+  function RegisterPageHeader($Name, $Callback)
+  {
+    $this->PageHeaders[$Name] = $Callback;
+  }
 }

trunk/Application/UpdateTrace.php

@@ -2938 +2938 @@
 }
 
-$Updates = array(
+class Updates
+{
+  function Get()
+  {
+    return(array(
   498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
   506 => array('Revision' => 510, 'Function' => 'UpdateTo510'),
@@ -2970 +2974 @@
   848 => array('Revision' => 849, 'Function' => 'UpdateTo849'),
   849 => array('Revision' => 857, 'Function' => 'UpdateTo857'),
-);
+    ));
+  }
+}

trunk/Application/Version.php

@@ -7 +7 @@
 
 $Version = '1.0-alfa';
-$Revision = 861; // Subversion revision
+$Revision = 862; // Subversion revision
 $DatabaseRevision = 857; // Database structure revision
-$ReleaseTime = '2016-01-21';
+$ReleaseTime = '2016-01-22';