Changeset 862
- Timestamp:
- Jan 22, 2016, 4:49:21 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Application/Core.php
r861 r862 12 12 var $LocaleManager; 13 13 var $Bars; 14 var $PageHeaders; 15 var $BaseURL; 14 16 15 17 function __construct() … … 23 25 $this->Pages = array(); 24 26 $this->Bars = array(); 27 $this->PageHeaders = array(); 28 $this->BaseURL = ''; 25 29 } 26 30 … … 56 60 ); 57 61 62 if(GetRemoteAddress() != '') 63 $this->BaseURL = substr($_SERVER["CONTEXT_PREFIX"], 0, -1); 58 64 $this->PathItems = ProcessURL(); 59 65 60 66 // Detect interface locale 61 $this->LocaleManager->DefaultLangCode = $this->Config['Web']['Locale']; 67 if(isset($this->Config['Web']['Locale'])) 68 $this->LocaleManager->DefaultLangCode = $this->Config['Web']['Locale']; 62 69 $this->LocaleManager->LangCode = $this->LocaleManager->DefaultLangCode; 63 70 if(count($this->PathItems) > 0) … … 99 106 100 107 $ScriptStartTime = GetMicrotime(); 101 if(GetRemoteAddress() != '') session_start(); 108 //if(GetRemoteAddress() != '') 109 session_start(); 102 110 103 111 // SQL injection hack protection … … 139 147 function Link($Target) 140 148 { 141 $Remaining = substr($Target, count($this-> Config['Web']['BaseURL']));149 $Remaining = substr($Target, count($this->BaseURL)); 142 150 $TargetParts = explode('/', $Remaining); 143 151 if(count($TargetParts) > 0) … … 145 153 if(in_array($TargetParts[0], $this->LinkLocaleExceptions)) 146 154 { 147 return($this-> Config['Web']['BaseURL'].$Target);155 return($this->BaseURL.$Target); 148 156 } 149 157 } … … 218 226 219 227 if($Locale == $this->LocaleManager->DefaultLangCode) 220 return($this-> Config['Web']['BaseURL'].$Target);221 return($this-> Config['Web']['BaseURL'].'/'.$Locale.$Target);228 return($this->BaseURL.$Target); 229 return($this->BaseURL.'/'.$Locale.$Target); 222 230 } 223 231 … … 319 327 $this->Bars[$BarName][$ItemName] = $Callback; 320 328 } 329 330 function RegisterPageHeader($Name, $Callback) 331 { 332 $this->PageHeaders[$Name] = $Callback; 333 } 321 334 } -
trunk/Application/UpdateTrace.php
r857 r862 2938 2938 } 2939 2939 2940 $Updates = array( 2940 class Updates 2941 { 2942 function Get() 2943 { 2944 return(array( 2941 2945 498 => array('Revision' => 506, 'Function' => 'UpdateTo506'), 2942 2946 506 => array('Revision' => 510, 'Function' => 'UpdateTo510'), … … 2970 2974 848 => array('Revision' => 849, 'Function' => 'UpdateTo849'), 2971 2975 849 => array('Revision' => 857, 'Function' => 'UpdateTo857'), 2972 ); 2976 )); 2977 } 2978 } -
trunk/Application/Version.php
r861 r862 7 7 8 8 $Version = '1.0-alfa'; 9 $Revision = 86 1; // Subversion revision9 $Revision = 862; // Subversion revision 10 10 $DatabaseRevision = 857; // Database structure revision 11 $ReleaseTime = '2016-01-2 1';11 $ReleaseTime = '2016-01-22'; -
trunk/Modules/Export/Page.php
r859 r862 705 705 $DbRow = $DbResult->fetch_row(); 706 706 $PageList = GetPageList($DbRow[0]); 707 $Output = '<h3>'.T('Statistic of co plection selected groups').'</h3>'.707 $Output = '<h3>'.T('Statistic of completion selected groups').'</h3>'. 708 708 $PageList['Output']; 709 709 -
trunk/Modules/News/News.php
r854 r862 25 25 $this->RegisterRSS(array('Title' => T('News'), 'Channel' => 'news', 26 26 'Callback' => array('PageNews', 'ShowRSS'), 'Permission' => LICENCE_ANONYMOUS)); 27 $this->System->RegisterPageHeader('New', array($this, 'ShowRSSHeader')); 27 28 } 28 29 -
trunk/Packages/Common/Setup.php
r860 r862 325 325 { 326 326 $Output = "<?php\n\n". 327 "\$IsDeveloper =in_array(\$_SERVER['REMOTE_ADDR'], array('127.0.0.1'));\n\n";327 "\$IsDeveloper = array_key_exists('REMOTE_ADDR', \$_SERVER) and in_array(\$_SERVER['REMOTE_ADDR'], array('127.0.0.1'));\n\n"; 328 328 329 329 foreach($this->ConfigDefinition as $Def) -
trunk/includes/Global.php
r861 r862 8 8 include_once(dirname(__FILE__).'/../Application/Version.php'); 9 9 include_once(dirname(__FILE__).'/../Application/DefaultConfig.php'); 10 include_once(dirname(__FILE__).'/../Application/UpdateTrace.php'); 10 11 include_once(dirname(__FILE__).'/PageEdit.php'); 11 12 require_once(dirname(__FILE__).'/../HTML/BBCodeParser2.php'); -
trunk/locale/cs.php
r861 r862 265 265 'Export don\'t have selected version of client' => 'Export nemá vybránu verzi klienta', 266 266 'Format output isn\'t select' => 'Nebyl vybrán formát výstupu', 267 'Statistic of co plection selected groups' => 'Statistika dokončení vybraných skupin',267 'Statistic of completion selected groups' => 'Statistika dokončení vybraných skupin', 268 268 'English' => 'Anglických', 269 269 'Percent' => 'Procenta',
Note:
See TracChangeset
for help on using the changeset viewer.