Changeset 862 for trunk

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

Files:

• Application/Core.php (modified) (8 diffs)
• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Export/Page.php (modified) (1 diff)
• Modules/News/News.php (modified) (1 diff)
• Packages/Common/Setup.php (modified) (1 diff)
• includes/Global.php (modified) (1 diff)
• locale/cs.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';

trunk/Modules/Export/Page.php

@@ -705 +705 @@
       $DbRow = $DbResult->fetch_row();
       $PageList = GetPageList($DbRow[0]);
-      $Output = '<h3>'.T('Statistic of coplection selected groups').'</h3>'.
+      $Output = '<h3>'.T('Statistic of completion selected groups').'</h3>'.
         $PageList['Output'];
 

trunk/Modules/News/News.php

@@ -25 +25 @@
     $this->RegisterRSS(array('Title' => T('News'), 'Channel' => 'news',
       'Callback' => array('PageNews', 'ShowRSS'), 'Permission' => LICENCE_ANONYMOUS));
+    $this->System->RegisterPageHeader('New', array($this, 'ShowRSSHeader'));
   }
 

trunk/Packages/Common/Setup.php

@@ -325 +325 @@
   {
     $Output = "<?php\n\n".
-        "\$IsDeveloper = in_array(\$_SERVER['REMOTE_ADDR'], array('127.0.0.1'));\n\n";
+      "\$IsDeveloper = array_key_exists('REMOTE_ADDR', \$_SERVER) and  in_array(\$_SERVER['REMOTE_ADDR'], array('127.0.0.1'));\n\n";
 
     foreach($this->ConfigDefinition as $Def)

trunk/includes/Global.php

@@ -8 +8 @@
 include_once(dirname(__FILE__).'/../Application/Version.php');
 include_once(dirname(__FILE__).'/../Application/DefaultConfig.php');
+include_once(dirname(__FILE__).'/../Application/UpdateTrace.php');
 include_once(dirname(__FILE__).'/PageEdit.php');
 require_once(dirname(__FILE__).'/../HTML/BBCodeParser2.php');

trunk/locale/cs.php

@@ -265 +265 @@
       'Export don\'t have selected version of client' => 'Export nemá vybránu verzi klienta',
       'Format output isn\'t select' => 'Nebyl vybrán formát výstupu',
-      'Statistic of coplection selected groups' => 'Statistika dokončení vybraných skupin',
+      'Statistic of completion selected groups' => 'Statistika dokončení vybraných skupin',
       'English' => 'Anglických',
       'Percent' => 'Procenta',