Changeset 811 for trunk

Timestamp:

May 28, 2014, 11:00:26 PM (10 years ago)

Author:

chronos

Message:

• Added: Better handling of repeater false referrer links. Now use manual BlackList table for checking which IP source is blocked.

Location:

trunk

Files:

• Modules/Export/ProcessTask.php (modified) (17 diffs)
• Modules/Referrer/Referrer.php (modified) (3 diffs)
• admin/UpdateTrace.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)
• includes/system.php (modified) (2 diffs)

trunk/Modules/Export/ProcessTask.php

@@ -6 +6 @@
 include_once(dirname(__FILE__).'/../../includes/zip.lib.php');
 
-include_once('Export.php');    
-include_once('ExportOutput.php');    
+include_once('Export.php');
+include_once('ExportOutput.php');
 
 //LoadCommandLineParameters();
@@ -25 +25 @@
         {
           $Dir = opendir($deldir.'/') ;
-          while(($File = readdir($Dir)) !== false) 
+          while(($File = readdir($Dir)) !== false)
           {
             if(($File != '..') and ($File != '.') and (!is_dir("$File"))) unlink($deldir.'/'.$File);
@@ -38 +38 @@
   if (file_exists($dst)) DeleteOldFiles($dst);
   if (is_dir($src)) {
-    if (!file_exists($dst)) mkdir($dst, 0777, true); 
+    if (!file_exists($dst)) mkdir($dst, 0777, true);
     $files = scandir($src);
     foreach ($files as $file)
-    if ($file != "." && $file != ".." and (!is_dir("$src/$file"))) rcopy("$src/$file", "$dst/$file"); 
+    if ($file != "." && $file != ".." and (!is_dir("$src/$file"))) rcopy("$src/$file", "$dst/$file");
   }
   else if (file_exists($src)) copy($src, $dst);
@@ -51 +51 @@
   $patch = 'Z:'.$patch;
   return $patch;
-}      
+}
 
 function MPQPack($packdir) {
@@ -58 +58 @@
   {
     $Dir = opendir($packdir.DIRECTORY_SEPARATOR) ;
-    while(($File = readdir($Dir)) !== false) 
-    {
-      if(($File != '..') and ($File != '.')) {           
+    while(($File = readdir($Dir)) !== false)
+    {
+      if(($File != '..') and ($File != '.')) {
         $File = str_replace('/',DIRECTORY_SEPARATOR,$File);
         $InDir = '';
@@ -78 +78 @@
             $InDir = 'Interface\\\\GlueXML\\\\';
         }
-       
+
         if (DIRECTORY_SEPARATOR == '/') // linux
           echo exec('wine cmd /C mpq.exe "'.GetWinZPatch($packdir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR).'patch-5.MPQ" '.$InDir.basename($File).' "'.GetWinZPatch($packdir.DIRECTORY_SEPARATOR).$File.'" ');
-  
+
         if (DIRECTORY_SEPARATOR == '\\') // windows
           echo exec('mpq.exe "'.$packdir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'patch-5.MPQ" '.$InDir.basename($File).' "'.$packdir.DIRECTORY_SEPARATOR.$File.'" ');
-  
+
         echo "\n";
       }
@@ -97 +97 @@
   $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask`'.
     ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `Export`.`OutputType` = 9 AND `ExportTask`.`TimeFinish` IS NULL');
-  while($DbRow = $DbResult->fetch_assoc()) 
+  while($DbRow = $DbResult->fetch_assoc())
   {
     echo(StrFTime("%d/%m/%Y %H:%M:%S", time()).': Generování DBC souborů pro export '.$DbRow['ExportId'].'.. '."\n");
-    if($DbRow['ExportId'] != '') 
-    {     
-      try 
+    if($DbRow['ExportId'] != '')
+    {
+      try
       {
         $Export = new Export($System);
@@ -111 +111 @@
 
         echo('Mazání starých souborů...'."\n");
-        
+
         // Delete old files
         DeleteOldFiles($Export->TempDir.'dbc');
@@ -117 +117 @@
 
         SetProgress($Export,20);
-        if(function_exists('gzcompress')) 
+        if(function_exists('gzcompress'))
         {
           $Export->ExportToDBC();
@@ -126 +126 @@
         } else echo('Funkce pro tvorbu Zip souboru není podporována!'."\n");
         $System->Database->query('UPDATE `ExportTask` SET `TimeFinish`=NOW() WHERE `Export`='.$Export->Id);
-      } catch (Exception $e) 
+      } catch (Exception $e)
       {
         echo 'Caught exception: ',  $e->getMessage(), "\n";
@@ -141 +141 @@
   $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask`'.
     ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `Export`.`OutputType` = 10 AND `ExportTask`.`TimeFinish` IS NULL');
-  while($DbRow = $DbResult->fetch_assoc()) 
+  while($DbRow = $DbResult->fetch_assoc())
   {
     echo(StrFTime("%d/%m/%Y %H:%M:%S", time()).': Generování EXE souboru pro export '.$DbRow['ExportId'].'.. '."\n");
-    if($DbRow['ExportId'] != '') 
-    {     
-      try 
+    if($DbRow['ExportId'] != '')
+    {
+      try
       {
      // echo shell_exec('"'.dirname(__FILE__).'./client_cz_export.sh" '.$DbRow['ExportId'].'');
@@ -157 +157 @@
 
         $nsifile = 'install.nsi';
-        
+
         // Delete old files
         SetProgress($Export,1);
@@ -164 +164 @@
         DeleteOldFiles($Export->TempDir.'lua');
         DeleteOldFiles($Export->TempDir.'CzWoW');
-        
+
         //copy need files
         SetProgress($Export,5);
@@ -173 +173 @@
         rcopy('files/'.$Export->ClientVersion['Version'].'/CzWoW/', $Export->TempDir.'CzWoW/');
         rcopy('files/WoW.ico', $Export->TempDir.'WoW.ico');
-        rcopy('files/Fonts/', $Export->TempDir.'Fonts/');       
-              
+        rcopy('files/Fonts/', $Export->TempDir.'Fonts/');
+
         SetProgress($Export,10);
         echo('Export lua...'."\n");
@@ -184 +184 @@
         echo('Export dbc...'."\n");
         $Export->ExportToDBC();
-      
+
         echo('Create readme...'."\n");
         SetProgress($Export,60);
@@ -191 +191 @@
         $File->WriteLine($Export->GetReadme());
         unset($File);
-        
+
         echo('Packing files...'."\n");
         SetProgress($Export,70);
@@ -203 +203 @@
         if (DIRECTORY_SEPARATOR == '/') // linux
           echo exec('makensis '.$workdir.$nsifile);
-  
+
         if (DIRECTORY_SEPARATOR == '\\') // windows
-          echo exec('"'.$workdir.$nsifile.'" '); //"c:\Program Files (x86)\NSIS\makensisw.exe" /Xscriptcmd 
+          echo exec('"'.$workdir.$nsifile.'" '); //"c:\Program Files (x86)\NSIS\makensisw.exe" /Xscriptcmd
 
         SetProgress($Export,100);
         echo ("\n"."Hotovo"."\n");
         $System->Database->query('UPDATE `ExportTask` SET `TimeFinish`=NOW() WHERE `Export`='.$DbRow['Export']);
-      } catch (Exception $e) 
+      } catch (Exception $e)
       {
         echo 'Caught exception: ',  $e->getMessage(), "\n";

trunk/Modules/Referrer/Referrer.php

@@ -41 +41 @@
       {
         $IP = GetRemoteAddress();
-        
-        // Check if client IP is not blocked as spam source
-        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Referrer` WHERE `LastIP` = "'.$IP.'" AND (`Visible` = 0)');
+
+        // Check if client IP is not blaclisted as spam source. If yes then add new referrer as invisible
+        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `BlackList` WHERE `IP` = "'.$IP.'"');
         $DbRow = $DbResult->fetch_row();
-        if($DbRow[0] == 0) $Visible = '1';
-          else $Visible = '0';
+        if($DbRow[0] == 0)
+        {
+          $Visible = '1';
+          $Description = '';
+        } else
+        {
+          $Visible = '0';
+          $Description = 'Spam';
+        }
 
         // Check if host name is already stored and need just to update hit counter
@@ -55 +62 @@
           $this->System->Database->query('UPDATE `Referrer` SET `Hits` = `Hits` + 1, `DateLast` = NOW(), `LastURL` = "'.
            addslashes($Referrer).'", `LastIP` = "'.$IP.'" WHERE `Id` = '.$DbRow['Id']);
-        } else $this->System->Database->query('INSERT INTO `Referrer` (`Web`, `DateFirst`, `DateLast`, `LastURL`, `Hits`, `LastIP`, `Visible`) '.
-                  'VALUES ("'.$HostName.'", NOW(), NOW( ), "'.addslashes($Referrer).'", 1, "'.$IP.'", '.$Visible.')');
+        } else
+        {
+          $this->System->Database->query('INSERT INTO `Referrer` (`Web`, `DateFirst`, `DateLast`, `LastURL`, `Hits`, `LastIP`, `Visible`, `Description`) '.
+                  'VALUES ("'.$HostName.'", NOW(), NOW( ), "'.addslashes($Referrer).'", 1, "'.$IP.'", '.$Visible.', "'.$Description.'")');
+        }
       }
     }
@@ -177 +187 @@
           $Item = $DbResult->fetch_assoc();
           $this->Database->update('Referrer', 'Id='.$_GET['id'], array('Visible' => 0, 'Description' => 'Spam'));
+          $DbResult2 = $this->Database->select('BlackList', '*', 'IP="'.$Item['LastIP'].'"');
+          if($DbResult2->num_rows == 0)
+          {
+            $this->Database->insert('BlackList', array('Time' => 'NOW()', 'IP' => $Item['LastIP']));
+          }
           $Output = ShowMessage(T('Set as spam'), MESSAGE_CRITICAL);
           $Output .= $this->ShowList();

trunk/admin/UpdateTrace.php

@@ -2806 +2806 @@
 }
 
+function UpdateTo811($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `BlackList` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Time` datetime NOT NULL,
+  `IP` varchar(255) NOT NULL,
+  PRIMARY KEY (`Id`)
+  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+}
+
 $Updates = array(
         498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
@@ -2833 +2843 @@
   748 => array('Revision' => 787, 'Function' => 'UpdateTo787'),
   787 => array('Revision' => 803, 'Function' => 'UpdateTo803'),
+  803 => array('Revision' => 811, 'Function' => 'UpdateTo811'),
 );

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 810; // Subversion revision
-$DatabaseRevision = 803; // Database structure revision
-$ReleaseTime = '2014-05-25';
+$Revision = 811; // Subversion revision
+$DatabaseRevision = 811; // Database structure revision
+$ReleaseTime = '2014-05-28';

trunk/includes/system.php

@@ -250 +250 @@
   and method_exists($this->OnPageNotFound[0], $this->OnPageNotFound[1]))
           $Output = $this->BaseView->ShowPage(call_user_func_array($this->OnPageNotFound, array()));
-                else 
+                else
                 {
                         $Output = $this->PageNotFound();
@@ -452 +452 @@
         {
                 $Output = $this->ShowHeader().$Content.$this->ShowFooter();
-                if($this->System->Config['Web']['FormatOutput']) 
+                if($this->System->Config['Web']['FormatOutput'])
               $Output = $this->FormatOutput($Output);
                 return($Output);