Changeset 716

Timestamp:

Jan 5, 2014, 5:10:40 PM (11 years ago)

Author:

maron

Message:

• Added: Featured export by Database

Location:

trunk

Files:

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

trunk/Modules/Download/Download.php

@@ -78 +78 @@
         
         function ShowDownload() {
-          
+          global $System;
     $Output = '<h3>Stažení češtiny</h3><br />';
     
@@ -90 +90 @@
                 $Output .= '<table class="BaseTable">';
                 $Output .= '<tr><th>Stáhnout</th><th>Název</th><th>Datum vytvoření</th><th>Popis</th></tr>';
-      foreach ($this->System->Config['Web']['RecommendedExport'] as $ExportId) {
-                $DbRows = $this->System->Database->query('SELECT *, (SELECT Version FROM `ClientVersion` WHERE `ClientVersion`.`Id`=`Export`.`ClientVersion`) AS `ClientVersion` FROM `Export` WHERE `Id`='.$ExportId);
-                    $DbExport = $DbRows->fetch_assoc();
+                $DbRows = $this->System->Database->query('SELECT *, (SELECT Version FROM `ClientVersion` WHERE `ClientVersion`.`Id`=`Export`.`ClientVersion`) AS `ClientVersion` FROM `Export` WHERE `Featured`=1');
+      while ($DbExport = $DbRows->fetch_assoc()) {
+      
+        $ExportId = $DbExport['Id'];
                     
-        $Export = new Export($this->System);
-        $Export->Id = $ExportId;
-        $Export->Init();
-        $Export->LoadFilters();
-
+                    $filename = $System->Config['Web']['TempFolder'].'Export/'.$ExportId.'/'.'Instalace_CzechWoW_'.$DbExport['ClientVersion'].'.exe';
+                            
                           if ($DbExport['OutputType'] == 10)
-          $Output .= '<tr><td><a href="'.$this->System->Link('/'.$Export->TempDirRelative.'Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe').'">CzechWoW_'.$Export->ClientVersion['Version'].'.exe</a><br /> <a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">Export '.$ExportId.'</a></td>';
+          $Output .= '<tr><td><a href="'.$System->Link('/'.$filename).'">CzechWoW_'.$DbExport['ClientVersion'].'.exe</a><br /> <a href="'.$System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">Export '.$ExportId.'</a></td>';
         else
-          $Output .= '<tr><td><a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$ExportId.'&amp;Tab=7').'">Exportovat</a><br /> <a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">Export '.$ExportId.'</a></td>';
+          $Output .= '<tr><td><a href="'.$System->Link('/export/?Action=View&amp;ExportId='.$ExportId.'&amp;Tab=7').'">Exportovat</a><br /> <a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">Export '.$ExportId.'</a></td>';
                                 
         $Output .= '<td>'.$DbExport['Title'].'</td>'; //.'<td>'.$DbExport['ClientVersion'].'</td>';
                                 
-                          if (($DbExport['OutputType'] == 10) and (file_exists($Export->TempDir.'Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe')))
-          $Output .= '<td>'.date('d.m.y H:i',filemtime($Export->TempDir.'Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe')).'</td>';
+                          if (($DbExport['OutputType'] == 10) and (file_exists($filename)))
+          $Output .= '<td>'.date('d.m.y H:i',filemtime($filename)).'</td>';
         else
           $Output .= '<td></td>';

trunk/Modules/Export/Page.php

@@ -279 +279 @@
                                 if(array_key_exists('WithDiacritic', $_POST)) $WithDiacritic = 1;
                                 else $WithDiacritic = 0;
-                                $this->System->Database->query('UPDATE `Export` SET `Title`="'.$_POST['Title'].'", `Description`="'.$_POST['Description'].'", `WithDiacritic`='.$WithDiacritic.' WHERE Id='.$Export['Id']);
+                                if (array_key_exists('Featured', $_POST)) $Export['Featured'] = 1;
+                                $this->System->Database->query('UPDATE `Export` SET `Title`="'.$_POST['Title'].'", `Featured`='.$Export['Featured'].', `Description`="'.$_POST['Description'].'", `WithDiacritic`='.$WithDiacritic.' WHERE Id='.$Export['Id']);
                                 $Export['Title'] = $_POST['Title'];
                                 $Export['Description'] = $_POST['Description'];
@@ -294 +295 @@
                                 $Output .= '<input type="hidden" name="Operation" value="Save"/>'.
                                                 '<tr><td colspan="2">';
-        $Output .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu klonovat položku?\');">Klonovat</a>';
         if($Editable) $Output .= ' <input type="submit" value="Uložit" '.$DisabledInput[$Editable].'/>';
+        $Output .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu klonovat položku?\');">Klonovat</a> ';
+        if($this->System->User->Licence(LICENCE_ADMIN))
+          $Output .= CheckBox('Featured', $Export['Featured'], '', 'CheckBox', !$Editable). ' Doporučený ';
         $Output .= '</td></tr>';
                         }

trunk/admin/UpdateTrace.php

@@ -2711 +2711 @@
 }
 
+function UpdateTo716($Manager)
+{
+        $Manager->Execute('ALTER TABLE  `Export` ADD  `Featured` TINYINT NOT NULL');   
+}
+
+
 $Updates = array(
         498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
@@ -2731 +2737 @@
         678 => array('Revision' => 695 , 'Function' => 'UpdateTo695'),
         695 => array('Revision' => 712 , 'Function' => 'UpdateTo712'),
+        712 => array('Revision' => 716 , 'Function' => 'UpdateTo716'),
 );

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 715; // Subversion revision
-$DatabaseRevision = 712; // Database structure revision 
+$Revision = 716; // Subversion revision
+$DatabaseRevision = 716; // Database structure revision 
 $ReleaseTime = '2014-01-05';