Changeset 683

Timestamp:

Aug 5, 2014, 11:02:46 PM (10 years ago)

Author:

chronos

Message:

• Upraveno: Potlačit záznam chyb pokud zdrojová stránka RSS aktualit není dosažitelná.
• Upraveno: Nepřijímat MAC adresu s pomlčkami jako platnou.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Form/Types/MacAddress.php (modified) (1 diff)
• Modules/News/ImportTvBeskyd.php (modified) (2 diffs)
• Modules/News/ImportZdechovCzNews.php (modified) (2 diffs)
• Modules/News/ImportZdechovCzRecords.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 682; // Subversion revision
+$Revision = 683; // Subversion revision
 $DatabaseRevision = 679; // SQL structure revision
 $ReleaseTime = strtotime('2014-08-05');

trunk/Common/Form/Types/MacAddress.php

@@ -29 +29 @@
     return('"'.addslashes($Value).'"');
   }
-  
+
   function Validate($Item)
   {
         if($Item['Null'] and ($Item['Value'] == '')) return(true);
-        return(preg_match('/^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$/', $Item['Value']));
+        return(preg_match('/^([0-9A-F]{2}[:]){5}([0-9A-F]{2})$/', $Item['Value']));
   }
 

trunk/Modules/News/ImportTvBeskyd.php

@@ -16 +16 @@
 //$Encoding = new Encoding();
 //$Content = addslashes($Encoding->ToUTF8(file_get_contents($SourceURL), 'win1250'));
-$Content = file_get_contents($SourceURL);
+$Content = @file_get_contents($SourceURL);
 while(strpos($Content, $StartText) !== false)
 {
@@ -34 +34 @@
   //echo('Description: '.$Description.'<br>');
   //echo('Link: '.$Link.'<br><hr>');
-  
+
   $DbResult = $System->Database->select('News', 'Id', '`Title`="'.$System->Database->real_escape_string($Title).'" AND `Category`='.$Category);
   //echo($System->Database->LastQuery);

trunk/Modules/News/ImportZdechovCzNews.php

@@ -15 +15 @@
 $Category = 12;
 $Author = 'Automat';
-$Content = file_get_contents($SourceURL);
+$Content = @file_get_contents($SourceURL);
 while(strpos($Content, $StartText) !== false)
 {
@@ -29 +29 @@
   $Title = substr($Content, 0, strpos($Content, '<'));
   $Description = '';
-  
+
 
   /*

trunk/Modules/News/ImportZdechovCzRecords.php

@@ -15 +15 @@
 $Category = 11;
 $Author = 'Automat';
-$Content = file_get_contents($SourceURL);
+$Content = @file_get_contents($SourceURL);
 while(strpos($Content, $StartText) !== false)
 {
@@ -29 +29 @@
   $Title = substr($Content, 0, strpos($Content, '<'));
   $Description = '';
-  
+
 
   /*