Changeset 542 for trunk

Timestamp:

Jun 2, 2013, 9:14:50 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Import aktualit z jiných webů se odkazoval na dřívější globální proměnnou $Database.

Location:

trunk/Modules

Files:

• News/ImportKinoVatra.php (modified) (1 diff)
• News/ImportObecHovezi.php (modified) (3 diffs)
• News/ImportTvBeskyd.php (modified) (1 diff)
• News/ImportZdechovCzNews.php (modified) (1 diff)
• News/ImportZdechovCzRecords.php (modified) (1 diff)
• Search/Search.php (modified) (2 diffs)

trunk/Modules/News/ImportKinoVatra.php

@@ -27 +27 @@
   $Date = TimeToMysqlDateTime(strtotime($Date));
   
-  $Query = 'SELECT Id FROM News WHERE (`Title`="'.$Database->real_escape_string($Title).'") AND (`Category`='.$Category.') AND (`Content` = "'.$Database->real_escape_string($Description).'") AND (`Link` = "'.$Database->real_escape_string($Link).'")';
-  $DbResult = $Database->query($Query);
+  $Query = 'SELECT Id FROM News WHERE (`Title`="'.$System->Database->real_escape_string($Title).'") AND (`Category`='.$Category.') AND (`Content` = "'.$System->Database->real_escape_string($Description).'") AND (`Link` = "'.$System->Database->real_escape_string($Link).'")';
+  $DbResult = $System->Database->query($Query);
   if($DbResult->num_rows == 0)
   {
-    $Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
-    echo($Database->insert_id.',');
+    $System->Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
+    echo($System->Database->insert_id.',');
   }
 }

trunk/Modules/News/ImportObecHovezi.php

@@ -28 +28 @@
   
   
-  $DbResult = $Database->select('News', 'Id', '(`Title`="'.$Database->real_escape_string($Title).'") AND (`Category`='.$Category.') AND (`Content` = "'.$Database->real_escape_string($Description).'") AND (`Link` = "'.$Database->real_escape_string($Link).'")');
-  //echo($Database->LastQuery);
+  $DbResult = $System->Database->select('News', 'Id', '(`Title`="'.$System->Database->real_escape_string($Title).'") AND (`Category`='.$Category.') AND (`Content` = "'.$System->Database->real_escape_string($Description).'") AND (`Link` = "'.$System->Database->real_escape_string($Link).'")');
+  //echo($System->Database->LastQuery);
   if($DbResult->num_rows == 0)
   {
-    $Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
-    echo($Database->insert_id.',');
+    $System->Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
+    echo($System->Database->insert_id.',');
   }
 }
@@ -59 +59 @@
   //echo('Link: '.$Link.'<br><hr>');
   
-  $Link = $Database->real_escape_string($Link);
-  $Title = $Database->real_escape_string($Title);
+  $Link = $System->Database->real_escape_string($Link);
+  $Title = $System->Database->real_escape_string($Title);
   $Description = strip_cdata($Description);
   $Description = strip_tags($Description);
@@ -66 +66 @@
   $Description = str_replace("\n", '<br>', $Description);
   $Description = str_replace("\r", '', $Description);
-  $Description = $Database->real_escape_string($Description);
+  $Description = $System->Database->real_escape_string($Description);
   
-  $DbResult = $Database->select('News', 'Id', '(`Title`="'.$Title.'") AND (`Category`='.$Category.') AND (`Content` = "'.$Description.'") AND (`Link` = "'.$Link.'")');
-  //echo($Database->LastQuery);
+  $DbResult = $System->Database->select('News', 'Id', '(`Title`="'.$Title.'") AND (`Category`='.$Category.') AND (`Content` = "'.$Description.'") AND (`Link` = "'.$Link.'")');
+  //echo($System->Database->LastQuery);
   if($DbResult->num_rows == 0)
   {
-    $Database->insert('News', array('Title' => $Title, 'Date' => 'NOW()', 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
-    echo($Database->insert_id.',');
+    $System->Database->insert('News', array('Title' => $Title, 'Date' => 'NOW()', 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
+    echo($System->Database->insert_id.',');
   }
 } 

trunk/Modules/News/ImportTvBeskyd.php

@@ -31 +31 @@
   //echo('Link: '.$Link.'<br><hr>');
   
-  $DbResult = $Database->select('News', 'Id', '`Title`="'.$Database->real_escape_string($Title).'" AND `Category`='.$Category);
-  //echo($Database->LastQuery);
+  $DbResult = $System->Database->select('News', 'Id', '`Title`="'.$System->Database->real_escape_string($Title).'" AND `Category`='.$Category);
+  //echo($System->Database->LastQuery);
   if($DbResult->num_rows == 0)
   {
-    $Database->insert('News', array('Title' => $Title, 'Date' => 'NOW()', 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
-    echo($Database->insert_id.',');
+    $System->Database->insert('News', array('Title' => $Title, 'Date' => 'NOW()', 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
+    echo($System->Database->insert_id.',');
   }
 }

trunk/Modules/News/ImportZdechovCzNews.php

@@ -35 +35 @@
   */
 
-  $DbResult = $Database->select('News', 'Id', '`Title`="'.$Database->real_escape_string($Title).'" AND `Date`="'.$Date.'" AND `Category`='.$Category);
-  //echo($Database->LastQuery);
+  $DbResult = $System->Database->select('News', 'Id', '`Title`="'.$System->Database->real_escape_string($Title).'" AND `Date`="'.$Date.'" AND `Category`='.$Category);
+  //echo($System->Database->LastQuery);
   if($DbResult->num_rows == 0)
   {
-    $Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
-    echo($Database->insert_id.',');
+    $System->Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
+    echo($System->Database->insert_id.',');
   }
 }

trunk/Modules/News/ImportZdechovCzRecords.php

@@ -35 +35 @@
   */
 
-  $DbResult = $Database->select('News', 'Id', '`Title`="'.$Database->real_escape_string($Title).'" AND `Date`="'.$Date.'" AND `Category`='.$Category);
-  //echo($Database->LastQuery);
+  $DbResult = $System->Database->select('News', 'Id', '`Title`="'.$System->Database->real_escape_string($Title).'" AND `Date`="'.$Date.'" AND `Category`='.$Category);
+  //echo($System->Database->LastQuery);
   if($DbResult->num_rows == 0)
   {
-    $Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
-    echo($Database->insert_id.',');
+    $System->Database->insert('News', array('Title' => $Title, 'Date' => $Date, 'Author' => $Author, 'Category' => $Category, 'Content' => $Description, 'Link' => $Link));
+    echo($System->Database->insert_id.',');
   }
 }

trunk/Modules/Search/Search.php

@@ -23 +23 @@
     foreach($this->System->ModuleManager->Modules['Search']->Items as $Item)
     {
-      $Output .= '<strong>'.$Item['Name'].'</strong><br/>';
       $Columns = '';
       $Condition = '';
@@ -35 +34 @@
       $DbResult = $this->Database->Select($Item['Table'], $Columns, $Condition.' LIMIT '.
         $this->System->ModuleManager->Modules['Search']->MaxItemCount);
-      echo($this->Database->LastQuery);
+      if($DbResult->num_rows > 0) $Output .= '<strong>'.$Item['Name'].'</strong><br/>';
       while($Row = $DbResult->fetch_assoc())
       {