Changeset 744

Timestamp:

Sep 6, 2015, 10:39:58 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Config file name.
• Fixed: Proper displaying of empty top bar.
• Modified: Made .htaccess file working by default without need a change.

Location:

trunk

Files:

• .htaccess (modified) (1 diff)
• Application/System.php (modified) (1 diff)
• Common/Page.php (modified) (1 diff)
• Common/Setup/Setup.php (modified) (4 diffs)

trunk/.htaccess

@@ -5 +5 @@
 
 RewriteEngine On
-RewriteBase /
-
-# Pretty urls on localhost with alias
-RewriteCond %{HTTP_HOST} localhost
 RewriteCond  %{REQUEST_FILENAME}  !-f
 RewriteCond  %{REQUEST_FILENAME}  !-d
-RewriteRule   ^(.*)$ centrala/index.php?$1
-
-# Pretty urls 
-RewriteCond %{HTTP_HOST} centrala.zdechov.net
-RewriteCond  %{REQUEST_FILENAME}  !-f
-RewriteCond  %{REQUEST_FILENAME}  !-d
-RewriteRule   ^(.*)$ index.php?$1
-
+RewriteRule   ^(.*)$ %{CONTEXT_PREFIX}/index.php?$1
 
 #ErrorDocument 403 "index.php?page=403"

trunk/Application/System.php

@@ -149 +149 @@
     if(isset($_SERVER['REMOTE_ADDR'])) session_start();
 
-    $ConfigFileName = dirname(__FILE__).'/../config.php';
+    $ConfigFileName = dirname(dirname(__FILE__)).'/config.php';
     if(file_exists($ConfigFileName))
       $this->ConfigManager->LoadFromFile($ConfigFileName);

trunk/Common/Page.php

@@ -89 +89 @@
       //$Output .= '<div class="MainTitle">'.$Title.'</div>';
       $Output .= '<div class="MainTitle"><span class="MenuItem"><strong>Navigace :: </strong> '.$Navigation.'</span><div class="MenuItem2">';
+      $Bar = '';
       foreach($this->System->Bars['Top'] as $BarItem)
-        $Output .= call_user_func($BarItem);
+        $Bar .= call_user_func($BarItem);
+      if(trim($Bar) != '') $Output .= $Bar;
+        else $Output .= '&nbsp;';
       $Output .= '</div></div>';
     }

trunk/Common/Setup/Setup.php

@@ -22 +22 @@
     $this->ShortTitle = 'Instalátor';
     //$this->ParentClass = 'PagePortal';
-    $this->ConfigDir = dirname(__FILE__).'/../..';
+    $this->ConfigDir = dirname(dirname(dirname(__FILE__))).'/Config';
   }
 
@@ -105 +105 @@
             $Output .= $this->System->Setup->Upgrade();
           } catch (Exception $E) {
-            $Output .= $this->SystemMessage('Chyba aktualizace', 'Došlo k chybě v SQL dotazu při aktualizaci: <br/>'.$E->getMessage());
+            $Output .= $this->SystemMessage('Chyba aktualizace',
+              'Došlo k chybě v SQL dotazu při aktualizaci: <br/>'.$E->getMessage());
           }
           $Output .= $this->ControlPanel();
@@ -256 +257 @@
   {
     $Output = '';
-    if(!file_exists($this->ConfigDir.'/config.php') and !is_writable($this->ConfigDir))
-      $Output .= 'Varování: Konfigurační soubor nebude možné zapsat, protože složka není povolená pro zápis!';
-    if(file_exists($this->ConfigDir.'/config.php') and !is_writable($this->ConfigDir.'/config.php'))
-      $Output .= 'Varování: Konfigurační soubor nebude možné zapsat, protože soubor config.php není povolen pro zápis!';
+    if(!file_exists($this->ConfigDir.'/Config.php') and !is_writable($this->ConfigDir))
+      $Output .= 'Varování: Konfigurační soubor nebude možné zapsat, protože složka "'.$this->ConfigDir.'" není povolená pro zápis!';
+    if(file_exists($this->ConfigDir.'/Config.php') and !is_writable($this->ConfigDir.'/Config.php'))
+      $Output .= 'Varování: Konfigurační soubor nebude možné zapsat, protože soubor "'.$this->ConfigDir.'/Config.php" není povolen pro zápis!';
     $Output .= '<h3>Nastavení systému</h3>'.
         '<form action="?action=configure_save" method="post">'.
@@ -320 +321 @@
     }
     $ConfigText = $this->CreateConfig($Config);
-    file_put_contents($this->ConfigDir.'/config.php', $ConfigText);
+    file_put_contents($this->ConfigDir.'/Config.php', $ConfigText);
     $Output .= 'Konfigurace nastavena<br/>';
     return($Output);