Changeset 659

Timestamp:

May 29, 2014, 11:59:39 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení hodnoty času trvání změn stavu rozhraní.
• Upraveno: Vzdálenou IP klienta nezjišťovat z proxy adres. Tyto adresy se dají falšovat a tedy nejsou spolehlivé.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Database.php (modified) (16 diffs)
• Common/Form/Types/DateTime.php (modified) (4 diffs)
• Common/Form/Types/File.php (modified) (12 diffs)
• Common/Form/Types/Time.php (modified) (3 diffs)
• Common/Form/Types/TimeDiff.php (added)
• Common/Form/Types/Type.php (modified) (5 diffs)
• Common/Global.php (modified) (1 diff)
• Modules/NetworkConfigLinux/Generators/DNS.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (1 diff)
• Modules/News/NewsPage.php (modified) (28 diffs)
• block/index.php (modified) (3 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 658; // Subversion revision
+$Revision = 659; // Subversion revision
 $DatabaseRevision = 657; // SQL structure revision
 $ReleaseTime = strtotime('2014-05-25');

trunk/Common/Database.php

@@ -8 +8 @@
   var $PDOStatement;
   var $num_rows = 0;
-  
+
   function fetch_assoc()
   {
     return($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
   }
-  
+
   function fetch_array()
   {
@@ -36 +36 @@
   var $ShowSQLError;
   var $ShowSQLQuery;
-  
+
   function __construct()
-  { 
+  {
     $this->Type = 'mysql';  // mysql, pgsql
     $this->ShowSQLError = false;
@@ -44 +44 @@
     $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
   }
-  
+
   function Connect($Host, $User, $Password, $Database)
-  {    
+  {
     if($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
       else if($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
@@ -59 +59 @@
     }
   }
-  
+
   function Disconnect()
   {
     unset($this->PDO);
   }
-  
+
   function Connected()
   {
     return(isset($this->PDO));
   }
-  
+
   function select_db($Database)
   {
     $this->query('USE `'.$Database.'`');
   }
-  
+
   function query($Query)
   {
     if(!$this->Connected()) throw new Exception('Not connected to database');
     $this->LastQuery = $Query;
-    if($this->ShowSQLQuery == true) 
+    if($this->ShowSQLQuery == true)
       echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>'."\n");
     $Result = new DatabaseResult();
@@ -91 +91 @@
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];
-      if(($this->Error != '') and ($this->ShowSQLError == true)) 
+      if(($this->Error != '') and ($this->ShowSQLError == true))
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
         throw new Exception('SQL Error: '.$this->Error.', Query: '.$Query);
     }
-    return($Result);  
+    return($Result);
   }
 
   function select($Table, $What = '*', $Condition = 1)
-  {   
-    return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));  
+  {
+    return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));
   }
 
   function delete($Table, $Condition)
   {
-    $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);  
-  }
-  
+    $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
+  }
+
   function insert($Table, $Data)
   {
@@ -115 +115 @@
     {
       $Name .= ',`'.$Key.'`';
-      if(!in_array($Value, $this->Functions)) 
+      if(!in_array($Value, $this->Functions))
       {
         if(is_null($Value)) $Value = 'NULL';
@@ -124 +124 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')'); 
+    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
     $this->insert_id = $this->PDO->lastInsertId();
   }
-  
+
   function update($Table, $Condition, $Data)
   {
@@ -133 +133 @@
     foreach($Data as $Key => $Value)
     {
-      if(!in_array($Value, $this->Functions)) 
+      if(!in_array($Value, $this->Functions))
       {
         if(is_null($Value)) $Value = 'NULL';
@@ -140 +140 @@
       $Values .= ', `'.$Key.'`='.$Value;
     }
-    $Values = substr($Values, 2);  
+    $Values = substr($Values, 2);
     $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
   }
-  
+
   function replace($Table, $Data)
   {
@@ -150 +150 @@
     foreach($Data as $Key => $Value)
     {
-      if(!in_array($Value, $this->Functions)) 
+      if(!in_array($Value, $this->Functions))
       {
         if(is_null($Value)) $Value = 'NULL';
@@ -164 +164 @@
     //echo($this->error().'<br>');
   }
-  
+
   function charset($Charset)
   {
     $this->query('SET NAMES "'.$Charset.'"');
   }
-  
+
   function real_escape_string($Text)
   {
     return(addslashes($Text));
   }
-  
+
   public function __sleep()
   {
@@ -188 +188 @@
 {
   if($Time == NULL) return(NULL);
-    else return(date('Y-m-d H:i:s', $Time));  
+    else return(date('Y-m-d H:i:s', $Time));
 }
 
@@ -194 +194 @@
 {
   if($Time == NULL) return(NULL);
-    else return(date('Y-m-d', $Time));  
+    else return(date('Y-m-d', $Time));
 }
 
@@ -200 +200 @@
 {
   if($Time == NULL) return(NULL);
-    else return(date('H:i:s', $Time));  
+    else return(date('H:i:s', $Time));
 }
 
 function MysqlDateTimeToTime($DateTime)
 {
-  if($DateTime == '') return(NULL);      
+  if($DateTime == '') return(NULL);
   $Parts = explode(' ', $DateTime);
-  $DateParts = explode('-', $Parts[0]); 
+  $DateParts = explode('-', $Parts[0]);
   $TimeParts = explode(':', $Parts[1]);
-  $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]); 
-  return($Result);  
+  $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]);
+  return($Result);
 }
 
@@ -216 +216 @@
 {
   if($Date == '') return(NULL);
-  return(MysqlDateTimeToTime($Date.' 0:0:0'));  
+  return(MysqlDateTimeToTime($Date.' 0:0:0'));
 }
 
@@ -222 +222 @@
 {
   if($Time == '') return(NULL);
-  return(MysqlDateTimeToTime('0000-00-00 '.$Time));  
-}
+  return(MysqlDateTimeToTime('0000-00-00 '.$Time));
+}

trunk/Common/Form/Types/DateTime.php

@@ -10 +10 @@
   {
     global $MonthNames;
-    
+
     if($Item['Value'] == 0) return('');
     if((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == '')) $Item['Value'] = time();
     $Parts = getdate($Item['Value']);
     $Output = $Parts['mday'].'.'.$Parts['mon'].'.'.$Parts['year'].' '.
-      $Parts['hours'].':'.$Parts['minutes'].':'.$Parts['seconds'];
+      sprintf('%02d', $Parts['hours']).':'.sprintf('%02d', $Parts['minutes']).':'.sprintf('%02d', $Parts['seconds']);
     return($Output);
   }
@@ -25 +25 @@
     if(($Item['Value'] !== null) and ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == ''))) $Item['Value'] = time();
     $Parts = getdate($Item['Value']);
-    
+
     $Output = '';
     $Style = '';
@@ -43 +43 @@
           $Item['Name'].'-day\');toggle(\''.$Item['Name'].'-month\');toggle(\''.$Item['Name'].'-year\');"/>';
     }
-    
+
     // Hour
     $Output .= '<select name="'.$Item['Name'].'-hour" id="'.$Item['Name'].'-hour" '.$Style.'>';
@@ -106 +106 @@
     return(MysqlDateTimeToTime($Item['Value']));
   }
-  
+
   function OnSaveDb($Item)
-  {    
+  {
     if($Item['Value'] == null) return(null);
       else return(date('Y-m-d H:i:s', $Item['Value']));

trunk/Common/Form/Types/File.php

@@ -9 +9 @@
   var $DirectoryId;
   var $TempName;
-  
+
   function DetectMimeType()
   {
@@ -18 +18 @@
     return($Result);
   }
-  
+
   function GetSize($Item)
   {
@@ -24 +24 @@
     if(file_exists($FileName)) $Result = filesize($FileName);
       else $Result = 0;
-    return($Result); 
+    return($Result);
   }
-  
+
   function GetFullName()
   {
     $ParentId = $this->Directory;
-    while($ParenId != null)
+    while($ParentId != null)
     {
       $DbResult = $this->Database->select('FileDirectory', '*', 'Id='.$ParentId);
@@ -36 +36 @@
       $Path .= $DbRow['Name'].'/';
       $ParentId = $DbRow['Parent'];
-    }     
+    }
     $Result = $this->UploadFileFolder.'/'.$Path.$File->Name;
     return($Result);
   }
-  
+
   function GetExt()
   {
     return(substr($this->Name, 0, strpos($this->Name, '.') - 1));
   }
-  
+
   function Delete()
   {
     if(file_exists($this->GetFullName())) unlink($this->GetFullName());
   }
-  
+
   function GetContent()
   {
@@ -64 +64 @@
   var $FileDownloadURL;
   var $DirectoryId;
-  
+
   function __construct($FormManager)
   {
@@ -71 +71 @@
     $this->DirectoryId = null;
   }
-  
+
   function OnView($Item)
   {
@@ -99 +99 @@
       {
         $File->Name = $UploadFile['name'];
-        $File->Size = $UploadFile['size']; 
+        $File->Size = $UploadFile['size'];
         $File->TempName = $UploadFile['tmp_name'];
       }
@@ -105 +105 @@
     return($File);
   }
-  
+
   function OnLoadDb($Item)
   {
@@ -120 +120 @@
     return($File);
   }
-  
+
   function OnSaveDb($Item)
   {
     if(!is_object($Item['Value'])) $Item['Value'] = new DbFile();
     $File = &$Item['Value'];
-    $Properties = array('Name' => $File->Name, 
+    $Properties = array('Name' => $File->Name,
       'Size' => $File->GetSize(), 'Directory' => $File->Directory);
     $DbResult = $this->Database->select('File', '*', 'Id='.$File->Id);
@@ -131 +131 @@
     {
       $DbRow = $DbResult->fetch_assoc();
-      if($File->TempName != '') 
+      if($File->TempName != '')
       {
         $FileName = $File->GetFullName();
@@ -137 +137 @@
       }
       $this->Database->update('File', 'Id='.$File->Id, $Properties);
-    } else 
+    } else
     {
       $this->Database->insert('File', $Properties);
@@ -145 +145 @@
       SystemMessage('Nahrání souboru', 'Cílová složka není dostupná!');
   }
-  
+
 }

trunk/Common/Form/Types/Time.php

@@ -13 +13 @@
     $TimeParts = getdate($Item['Value']);
 
-    $Output = $TimeParts['hours'].':'.$TimeParts['minutes'].':'.$TimeParts['seconds'];
+    $Output = sprintf('%02d', $TimeParts['hours']).':'.sprintf('%02d', $TimeParts['minutes']).':'.sprintf('%02d', $TimeParts['seconds']);
     return($Output);
   }
@@ -24 +24 @@
     $Output = '';
     $Style = '';
-    if(array_key_exists('Null', $Item) and $Item['Null']) 
+    if(array_key_exists('Null', $Item) and $Item['Null'])
     {
-      if($Item['Value'] != null) 
+      if($Item['Value'] != null)
       {
         $Checked = ' checked="1"';
         $Style = 'style="display:inline;"';
-      } else 
+      } else
       {
         $Checked = '';
-        $Style = 'style="display:none;"';        
+        $Style = 'style="display:none;"';
       }
       $Output .= '<input type="checkbox" name="'.$Item['Name'].'-null"'.$Checked.' onclick="toggle(\''.
-        $Item['Name'].'-hour\');toggle(\''.$Item['Name'].'-minute\');toggle(\''.$Item['Name'].'-second\');"/>';      
+        $Item['Name'].'-hour\');toggle(\''.$Item['Name'].'-minute\');toggle(\''.$Item['Name'].'-second\');"/>';
     }
-    
+
     // Hour
     $Output .= '<select name="'.$Item['Name'].'-hour" id="'.$Item['Name'].'-hour" '.$Style.'>';
@@ -68 +68 @@
   function OnLoad($Item)
   {
-    if(!array_key_exists($Item['Name'].'-null', $_POST) and array_key_exists('Null', $Item) and ($Item['Null'] == true)) return(null); 
+    if(!array_key_exists($Item['Name'].'-null', $_POST) and array_key_exists('Null', $Item) and ($Item['Null'] == true)) return(null);
       return(mktime($_POST[$Item['Name'].'-hour'], $_POST[$Item['Name'].'-minute'], $_POST[$Item['Name'].'-second']));
   }

trunk/Common/Form/Types/Type.php

@@ -24 +24 @@
 include(dirname(__FILE__).'/MacAddress.php');
 include(dirname(__FILE__).'/Image.php');
+include(dirname(__FILE__).'/TimeDiff.php');
 
 class Type
@@ -58 +59 @@
       'IPv6Address' => array('Name' => 'IPv6Address', 'Class' => 'IPv6Address', 'ParentType' => '', 'Parameters' => array()),
       'Image' => array('Name' => 'Image', 'Class' => 'Image', 'ParentType' => '', 'Parameters' => array()),
+      'TimeDiff' => array('Name' => 'TimeDiff', 'Class' => 'TimeDiff', 'ParentType' => 'Integer', 'Parameters' => array()),
     );
   }
@@ -72 +74 @@
     } else return($TypeName);
   }
-  
+
   function IsHidden($TypeName)
   {
@@ -90 +92 @@
       $Type = $this->TypeDefinitionList[$ParentType];
     } else $Type = array();
-  
+
     $Type['Name'] = $Name;
     $Type['Class'] = $Name;
@@ -104 +106 @@
     // TODO: remove dependent types
   }
-  
+
   function GetTypeDefinition($TypeName)
   {

trunk/Common/Global.php

@@ -346 +346 @@
 function GetRemoteAddress()
 {
-  if(array_key_exists('HTTP_X_FORWARDED_FOR',$_SERVER)) $IP = $_SERVER['HTTP_X_FORWARDED_FOR'] ;
-  else if(array_key_exists('REMOTE_ADDR', $_SERVER)) $IP = $_SERVER['REMOTE_ADDR'];
+  if(array_key_exists('REMOTE_ADDR', $_SERVER)) $IP = $_SERVER['REMOTE_ADDR'];
   else $IP = '0.0.0.0';
   return($IP);

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -9 +9 @@
 $BaseDomain = 'zdechov.net';
 $Now = getdate();
-$I = floor(($Now['hours'] * 60 * 60 + $Now['minutes'] * 60 + $Now['seconds']) / (24 * 60 * 60) * 100); 
+$I = floor(($Now['hours'] * 60 * 60 + $Now['minutes'] * 60 + $Now['seconds']) / (24 * 60 * 60) * 100);
 $Serial = date('Ymd', time()).$I;
 $MinimumTime = 7200;
@@ -192 +192 @@
 
 // Domain alias
-$DbResult = $System->Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`'); 
+$DbResult = $System->Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`');
 // JOIN `NetworkDevice` ON NetworkDomainAlias.Target LIKE NetworkDevice.Name AND NetworkInterface.ExternalIP != ""');
 while($Alias = $DbResult->fetch_assoc())

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -34 +34 @@
         'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => '', 'ReadOnly' => true),
         'State' => array('Type' => 'Boolean', 'Caption' => 'Stav', 'Default' => '', 'ReadOnly' => true),
-        'Duration' => array('Type' => 'Time', 'Caption' => 'Trvání', 'Default' => '', 'ReadOnly' => true,
-          'SQL' => 'TIMEDIFF(`Time`,'.
+        'Duration' => array('Type' => 'TimeDiff', 'Caption' => 'Trvání', 'Default' => '', 'ReadOnly' => true,
+          'SQL' => 'TIMESTAMPDIFF(SECOND, `Time`, '.
             '(SELECT `Time` FROM `NetworkInterfaceUpDown` AS `TA` WHERE (`TA`.`Time` > `TX`.`Time`) '.
                         'AND (`TA`.`Interface`=`TX`.`Interface`) ORDER BY `TA`.`Time` LIMIT 1))'),

trunk/Modules/News/NewsPage.php

@@ -14 +14 @@
     $this->UploadedFilesFolder = $this->System->ModuleManager->Modules['News']->UploadedFilesFolder;
     if(count($this->System->PathItems) > 1)
-    { 
+    {
       if($this->System->PathItems[1] == 'subscription') return($this->ShowSubscription());
         else if($this->System->PathItems[1] == 'rss') return($this->ShowRSS());
@@ -20 +20 @@
     } else return($this->ShowMain());
   }
-  
+
   function ShowView()
   {
@@ -52 +52 @@
           foreach($Enclosures as $Enclosure)
           {
-            if(file_exists($this->UploadedFilesFolder.$Enclosure)) 
+            if(file_exists($this->UploadedFilesFolder.$Enclosure))
               $Output .= ' <a href="'.$this->System->Link('/'.$this->UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
           }
@@ -61 +61 @@
     return($Output);
   }
-  
+
   function ShowAdd()
   {
@@ -78 +78 @@
         if($this->System->User->CheckPermission('News', 'Insert', 'Group', $DbRow['Id']))
         {
-          if($DbRow['Id'] == $Category['Id']) $Selected = ' selected="1"'; 
+          if($DbRow['Id'] == $Category['Id']) $Selected = ' selected="1"';
             else $Selected = '';
           $Output .= '<option value="'.$DbRow['Id'].'"'.$Selected.'>'.$DbRow['Caption'].'</option>';
@@ -96 +96 @@
     return($Output);
   }
-  
+
   function ShowAdd2()
   {
@@ -122 +122 @@
         }
         $Enclosures = substr($Enclosures, 1);
-    
+
         $_POST['content'] = str_replace("\n",'<br />',$_POST['content']);
         $this->Database->insert('News', array('Category' => $Category['Id'], 'Title' => $_POST['title'],
           'Content' => $_POST['content'], 'Date' => 'NOW()', 'IP' => $RemoteAddr,
-          'Enclosure' => $Enclosures, 'Author' => $this->System->User->User['Name'], 
+          'Enclosure' => $Enclosures, 'Author' => $this->System->User->User['Name'],
           'User' => $this->System->User->User['Id'], 'Link' => $_POST['link']));
         $Output .= 'Aktualita přidána!<br />Pokud budete chtít vaši aktualitu smazat, klikněte na odkaz Smazat v seznamu všech aktualit v kategorii.<br /><br />';
@@ -134 +134 @@
     return($Output);
   }
-  
+
   function ShowEdit()
   {
@@ -159 +159 @@
     return($Output);
   }
-  
+
   function ShowUpdate()
   {
     $Output = '';
-    $RemoteAddr = GetRemoteAddress();  
+    $RemoteAddr = GetRemoteAddress();
     $Category = $this->GetCategory();
     if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
@@ -175 +175 @@
         {
           $_POST['content'] = str_replace("\n", '<br />', $_POST['content']);
-          $this->Database->update('News', 'Id='.$_POST['id'], array('Title' => $_POST['title'], 
+          $this->Database->update('News', 'Id='.$_POST['id'], array('Title' => $_POST['title'],
             'Content' => $_POST['content'], 'Link' => $_POST['link']));
           $Output .= 'Aktualita uložena!<br />';
@@ -184 +184 @@
     return($Output);
   }
-  
+
   function ShowDelete()
   {
@@ -197 +197 @@
         // TODO: Make upload using general File class
         if($Row['Enclosure'] != '')
-        { 
+        {
           $Output .= '<br />Přílohy: ';
           $Enclosures = explode(';', $Row['Enclosure']);
@@ -211 +211 @@
     return($Output);
   }
-  
+
   function ShowList()
   {
@@ -226 +226 @@
       $Output .= '<strong>Seznam aktualit kategorie '.$Category['Caption'].':</strong><div style="font-size: small;">';
       $Output .= PagesList('?category='.$Category['Id'].'&amp;page=', $Page, $PageMax, $PerPage);
-    
+
       $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` '.
         'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `Category`='.$Category['Id'].' ORDER BY `News`.`Id` DESC LIMIT '.($Page * $PerPage).','.$PerPage);
@@ -249 +249 @@
           foreach($Enclosures as $Enclosure)
           {
-            if(file_exists($this->UploadedFilesFolder.$Enclosure)) 
+            if(file_exists($this->UploadedFilesFolder.$Enclosure))
               $Output .= ' <a href="'.$this->System->Link('/'.$this->UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
           }
@@ -260 +260 @@
     return($Output);
   }
-  
+
   function GetCategory()
   {
@@ -267 +267 @@
     if(array_key_exists('category', $_POST)) $Category['Id'] = $_POST['category'] * 1;
     //if(is_null($Category)) throw new Exception('Kategorie neurčena');
-    else 
+    else
     {
       $DbResult = $this->Database->select('NewsCategory', '*', '`Id`='.$Category['Id'].' ORDER BY `Sequence`');
@@ -275 +275 @@
     return($Category);
   }
-  
+
   function ShowMain()
   {
-    $Output = '';    
+    $Output = '';
     if(array_key_exists('action',$_GET)) $Action = $_GET['action'];
       else $Action = '';
@@ -290 +290 @@
     return($Output);
   }
-  
+
   function ShowSubscription()
-  {     
+  {
     if(array_key_exists('build', $_GET))
     {
@@ -302 +302 @@
       $Select = $this->System->Config['Web']['RootFolder'].'/aktuality/rss/?select='.substr($Select, 1);
       $Output = 'Výsledný RSS kanál: <a href="'.$Select.'">'.$Select.'</a>';
-    } else 
+    } else
     {
       $Output = 'Vytvořte si vlastní RSS kanál, díky kterému budete moci automaticky sledovat novinky pomocí vaší RSS čtečky. Informace o technologii RSS a programech pro čtení kanálů najdete např. <a href="http://www.lupa.cz/clanky/prehled-rss-ctecek/">zde</a><br />'.
@@ -314 +314 @@
       $Output.= '<input type="submit" value="Sestavit"/>'.
         '</form>';
-    }  
-    return($Output);
-  }
-  
+    }
+    return($Output);
+  }
+
   function ShowRSS()
   {
@@ -332 +332 @@
     $CategoryName = '';
 
-    // Prepare WHERE condition 
-    if(array_key_exists('select', $_GET)) 
+    // Prepare WHERE condition
+    if(array_key_exists('select', $_GET))
     {
       $Where = '';
@@ -339 +339 @@
       foreach($Parts as $Part)
       {
-        $Where .= 'OR (`Category`='.($Part * 1).')'; 
+        $Where .= 'OR (`Category`='.($Part * 1).')';
       }
       $Where = substr($Where, 2);
@@ -354 +354 @@
     // Update news from discussion forum
     /*
-    $ForumCategory = 4;   
+    $ForumCategory = 4;
     $Database->select_db('forum');
     $DbResult = $Database->query('SELECT posts.post_time, posts_text.post_subject, posts_text.post_text, users.username, topics.topic_title FROM posts JOIN posts_text ON posts.post_id = posts_text.post_id JOIN users ON users.user_id = posts.poster_id JOIN topics ON topics.topic_id= posts.topic_id ORDER BY post_time DESC LIMIT '.$NewsCount);
@@ -361 +361 @@
     while($Row = $DbResult->fetch_array())
     {
-      $Row['post_text'] = StrTr($Row['post_text'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE"); 
-      $Row['post_text'] = str_replace("\n","<br>", $Row['post_text']); 
-      $Row['post_subject'] = StrTr($Row['post_subject'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE"); 
-      $Row['topic_title'] = StrTr($Row['topic_title'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE"); 
-      $Index = $Index + 1;    
-      
+      $Row['post_text'] = StrTr($Row['post_text'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE");
+      $Row['post_text'] = str_replace("\n","<br>", $Row['post_text']);
+      $Row['post_subject'] = StrTr($Row['post_subject'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE");
+      $Row['topic_title'] = StrTr($Row['topic_title'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE");
+      $Index = $Index + 1;
+
       $Title = $Row['topic_title'].'-'.$Row['post_subject'];
       $Content = $Row['post_text'];
@@ -374 +374 @@
       //echo('category='.$ForumCategory.' AND title="'.addslashes($Title).'" AND content="'.addslashes($Content).'" AND author="'.addslashes($Author).'" AND date="'.$Date.'"');
       $DbResult2 = $Database->select('news', '*', 'category='.$ForumCategory.' AND title="'.addslashes($Title).'" AND content="'.addslashes($Content).'" AND author="'.addslashes($Author).'" AND date="'.$Date.'"');
-      if($DbResult2->num_rows == 0) //echo('.'); else echo('x'); 
+      if($DbResult2->num_rows == 0) //echo('.'); else echo('x');
         $Database->insert('news', array('category' => $ForumCategory, 'title' => $Title, 'content' => $Content, 'author' => $Author, 'date' => $Date));
-        //echo($Date);  
+        //echo($Date);
       $Database->select_db('forum');
     }
@@ -388 +388 @@
       $EnclosuresText = '';
       if($Row['Enclosure'] != '')
-      { 
+      {
         $EnclosuresText .= '<br />Přílohy: ';
         $Enclosures = explode(';', $Row['Enclosure']);
         foreach($Enclosures as $Enclosure)
         {
-          if(file_exists($this->UploadedFilesFolder.$Enclosure)) 
-            $EnclosuresText .= ' <a href="'.$this->System->Link('/aktuality/'.$UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
+          if(file_exists($this->UploadedFilesFolder.$Enclosure))
+            $EnclosuresText .= ' <a href="'.$this->System->Link('/aktuality/'.$this->UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
         }
       }
@@ -409 +409 @@
     $RSS = new RSS();
     $RSS->Title = $this->System->Config['Web']['Title'].' - Aktuality';
-    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/'; 
-    $RSS->Description = 'Aktuality '.$this->System->Config['Web']['Description']; 
-    $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail']; 
+    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/';
+    $RSS->Description = 'Aktuality '.$this->System->Config['Web']['Description'];
+    $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];
     $RSS->Items = $Items;
-    return($RSS->Generate());      
-  }  
+    return($RSS->Generate());
+  }
 }

trunk/block/index.php

@@ -1 +1 @@
 <?php
 
-include_once('../Common/System.php');
+include_once('../Application/System.php');
 
 class BlockPage extends Page
@@ -29 +29 @@
       $DbResult = $this->Database->select('Member', '*', 'Id='.$Device['Member']);
       $Member = $DbResult->fetch_array();
-      
+
       if($Member['Blocked'] == 1)
       {
@@ -35 +35 @@
       } else $Output .= $this->Reasons[0];
     } else $Output .= $this->Reasons[4];
- 
+
     $Output .= '<br/><br/>V případě problémů kontaktujte technickou podporu na telefonu 737785792<br/><br/>';
     $Output .= '</body></html>';