Changeset 6 for trunk

Timestamp:

Aug 5, 2018, 8:38:46 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Relative links to BaseURL.

File:

• trunk/index.php (modified) (15 diffs)

trunk/index.php

@@ -12 +12 @@
 {
   var $NoFullPage = false;
-  
+
   function Link($URL)
   {
-    if(substr($URL, 0, 1) == '/') return($this->Config['BaseURL'].substr($URL, 1));
-      else return($URL);
+    return($this->Config['BaseURL'].$URL);
   }
 
@@ -68 +67 @@
       $Output .= '<th>'.$ResourceGroup['Name'].'</th>';
     }
-    $Output .= '</tr>';      
+    $Output .= '</tr>';
     $DbResult = $this->Database->select('Dance', '*, (SELECT Name FROM DanceGroup WHERE DanceGroup.Id=Dance.Group) AS GroupName', '1 ORDER BY `Name`');
     while($Dance = $DbResult->fetch_assoc())
@@ -114 +113 @@
     $MeetSources->ParseAll();
   }
-  
+
   function ShowMeetList()
   {
@@ -130 +129 @@
       if (array_key_exists('pohlavi', $_GET) ) {
         if ($_GET['pohlavi'] > 0) $_SESSION['pohlavi'] = $_GET['pohlavi'];
-          else unset($_SESSION['pohlavi']); 
+          else unset($_SESSION['pohlavi']);
       }
     } else {
@@ -136 +135 @@
       ' var load_timer = 100;
    var ltimer = null;
-   
+
    function checkOut(kc,obj){
-      if(kc==13) $(obj).blur(); 
+      if(kc==13) $(obj).blur();
    }
    function initLTimer(tm){
@@ -148 +147 @@
       ltimer = null;
    }
-           
+
    var cf = {};
 
@@ -169 +168 @@
       if(lonreload) initLTimer(1000); else initLTimer(100);
    }
-   
+
    function freloader(){
       ltimer = null;
@@ -214 +213 @@
       '</div>';
     }
-    
-    $Where = '';    
+
+    $Where = '';
     if (array_key_exists('vekod', $_SESSION) and ($_SESSION['vekod'] != '')) $Where .= ' AND (Age >= '.$_SESSION['vekod'].')';
     if (array_key_exists('vekdo', $_SESSION) and ($_SESSION['vekdo'] != '')) $Where .= ' AND (Age <= '.$_SESSION['vekdo'].')';
@@ -224 +223 @@
     if (array_key_exists('pohlavi', $_SESSION) and ($_SESSION['pohlavi'] != '')) $Where .= ' AND (Gender = '.$_SESSION['pohlavi'].')';
     if (substr($Where, 0, 4) == ' AND') $Where = substr($Where, 4);
-    if ($Where == '') $Where = '1';    
-    
+    if ($Where == '') $Where = '1';
+
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `MeetItem` WHERE '.$Where);
     $DbRow = $DbResult->fetch_row();
     $PageList = GetPageList($DbRow[0]);
-    
+
     $Gender = array('', 'Muž', 'Žena');
     $Output .= '<div id="list_content">';
@@ -260 +259 @@
         '<td>'.$Gender[$MeetItem['Gender']].'</td>'.
         '<td>'.$MeetItem['Message'].'</td>'.
-        '<td><a href="'.$this->Link($MeetItem['SourceURL']).'">'.$MeetItem['SourceName'].'</a></td>';      
+        '<td><a href="'.$this->Link($MeetItem['SourceURL']).'">'.$MeetItem['SourceName'].'</a></td>';
       $Output .= '</tr>';
     }
@@ -269 +268 @@
     return($Output);
   }
-  
+
   function ShowMeetListRss()
   {
     global $Config;
-    
+
     $this->NoFullPage = true;
     $RSS = new RSS();
     $RSS->Title = 'Taneční seznamka';
     $RSS->Description = '';
-    $RSS->Link = $Config['BaseURL'].'seznamka';
-    
+    $RSS->Link = $this->Link('/seznamka/');
+
     $DbResult = $this->Database->select('MeetItem', '*, (SELECT MeetSource.Name FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceName, '.
       '(SELECT MeetSource.URL FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceURL', '1 ORDER BY `Date` DESC LIMIT 30');
@@ -291 +290 @@
       if ($MeetItem['Phone'] != '') $Description .= '<br/>Telefon: '.$MeetItem['Phone'];
       $Description .= '<br/>Škola: <a href="'.$this->Link($MeetItem['SourceURL']).'">'.$MeetItem['SourceName'].'</a>';
-      $RSS->Items[] = array(          
-        'Title' => $Title, 
-        'Description' => $Description, 
+      $RSS->Items[] = array(
+        'Title' => $Title,
+        'Description' => $Description,
         'Time' => MysqlDateTimeToTime($MeetItem['Date']),
-        'Link' => $Config['BaseURL'].'seznamka',
+        'Link' => $this->Link('/seznamka/'),
       );
       $Output .= '<tr>'.
@@ -322 +321 @@
       '<link rel="stylesheet" href="'.$this->Link('/style.css').'" type="text/css" media="all" />'.
       '<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$this->Config['Encoding'].'" />'.
-      '<script src="jquery.js"></script>';
+      '<script src="'.$this->Link('/jquery.js').'"></script>';
     $Output .= '<link rel="alternate" title="Taneční seznamka" href="'.
-      $this->Config['BaseURL'].'seznamka-rss" type="application/rss+xml" />';
+      $this->Link('/seznamka-rss/').'" type="application/rss+xml" />';
     $Output .= '<title>Tance</title>'.
       '</head><body>';
@@ -344 +343 @@
     $this->PathItems = $this->ProcessURL();
 
-    $Output = '';    
-
-    if(count($this->PathItems) > 0) {
+    $Output = '';
+
+    if(count($this->PathItems) > 0)
+    {
       if($this->PathItems[0] == 'skoly') $Output .= $this->ShowSchoolList();
       else if($this->PathItems[0] == 'tance') $Output .= $this->ShowDanceList();
@@ -354 +354 @@
       else $Output .= $this->ShowDanceList();
     } else $Output .= $this->ShowDanceList();
-    if (!$this->NoFullPage) {
+    if (!$this->NoFullPage)
+    {
       $Output = $this->ShowMenu().$Output;
       echo($this->ShowPage($Output));