Changeset 690

Timestamp:

Jan 2, 2014, 4:11:45 PM (11 years ago)

Author:

maron

Message:

• Fixed: count view export only if user open side

Location:

trunk

Files:

• Modules/Export/ExportOutput.php (modified) (2 diffs)
• Modules/Export/Page.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/ExportOutput.php

@@ -227 +227 @@
     }
         $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-                                 'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&ExportId='.$Export->Id).'\'", 3000)'.
+                                 'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&Auto&ExportId='.$Export->Id).'\'", 5000)'.
                                                  '</script>';
     $Output .= ' <strong>Dokončeno procent: '.ProgressBar(300, $Line).'</strong>';
@@ -277 +277 @@
     }
         $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-                                 'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&ExportId='.$Export->Id).'\'", 3000)'.
+                                 'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&Auto&ExportId='.$Export->Id).'\'", 5000)'.
                                                  '</script>';
     $Output .= ' <strong>Dokončeno procent: '.ProgressBar(300, $Line).'</strong>';

trunk/Modules/Export/Page.php

@@ -606 +606 @@
                                 if($DbResult->num_rows > 0)
                                 {
-                                  //TODO: don't count on dbc or exe
-                                        $this->System->Database->query('UPDATE `Export` SET `UsedCount` = `UsedCount` + 1 WHERE `Id`='.$Export['Id']);
+                                  if (array_key_exists('Auto', $_GET) == false)  
+                                          $this->System->Database->query('UPDATE `Export` SET `UsedCount` = `UsedCount` + 1 WHERE `Id`='.$Export['Id']);
                                         $Output = ExportOutput($Export['Id'], $Export['OutputType']);
                                 } else $Output = ShowMessage('Nebyla vybrána požadovaná verze klienta.', MESSAGE_CRITICAL);

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 689; // Subversion revision
+$Revision = 690; // Subversion revision
 $DatabaseRevision = 678; // Database structure revision 
 $ReleaseTime = '2014-01-02';