Changeset 293

Timestamp:

Dec 27, 2009, 9:35:07 PM (15 years ago)

Author:

george

Message:

• Přidáno: Zobrazení potvrzovacího dialogu při mazání exportů.
• Přidáno: Kontrola výběru verze k formátu výstupu exportu.

Location:

trunk

Files:

• export/export.php (modified) (2 diffs)
• export/index.php (modified) (4 diffs)
• style/global.js (modified) (1 diff)

trunk/export/export.php

@@ -31 +31 @@
     while($Language = $DbResult->fetch_assoc())
       $this->WhereLang .= ' OR (Language = '.$Language['Language'].')'; 
-    if($this->WhereLang == '') $WhereLang = 1; 
+    if($this->WhereLang == '') $this->WhereLang = 1; 
       else $this->WhereLang = '('.substr($this->WhereLang, 4).')';
 
@@ -65 +65 @@
       $this->User = $DbResult->fetch_assoc();
     } else $this->User = array('user' => 'Neznámý');
+
 
     $DbResult = $this->Database->query('SELECT * FROM `wow_client_version` WHERE `Id`='.$this->Export['ClientVersion']);

trunk/export/index.php

@@ -35 +35 @@
     array('Name' => 'UserName', 'Title' => 'Překladatel'), 
     array('Name' => 'Title', 'Title' => 'Popis'), 
-    array('Name' => 'UsedCount', 'Title' => 'Počet stažení'), 
+    array('Name' => 'UsedCount', 'Title' => 'Prohlédnutí výstupu'), 
     array('Name' => 'UserCount', 'Title' => 'Překladatelů'), 
     array('Name' => 'GroupCount', 'Title' => 'Překladových skupin'), 
@@ -48 +48 @@
   {
     $Action = '<a href="?Action=View&amp;ExportId='.$Export['Id'].'">Zobrazit</a>';
-    if($Export['User'] == $_SESSION['UserID']) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'"><div onclick="return confirmAction(\'Opravdu smazat položku?\');">Smazat</div></a>';
+    if($Export['User'] == $_SESSION['UserID']) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu smazat položku?\');">Smazat</a>';
     echo('<tr><td>'.$Export['TimeCreate'].'</td><td>'.$Export['UserName'].'</td><td>'.$Export['Title'].'</td><td>'.$Export['UsedCount'].'</td><td>'.$Export['UserCount'].'</td><td>'.$Export['GroupCount'].'</td><td>'.$Action.'</td></tr>');
   }
@@ -94 +94 @@
     if(array_key_exists('ExportId', $_GET))
     {
-      $Database->SQLCommand('DELETE FROM Export WHERE Id='.$_GET['ExportId']);
-      echo('Export smazán.<br/><br/>');
-      $_GET['Filter'] = 'my';
-      ExportList();
+      $DbResult = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId'].' AND User='.$_SESSION['UserID']);
+      if(mysql_num_rows($DbResult) > 0)
+      {
+        $Database->SQLCommand('DELETE FROM Export WHERE Id='.$_GET['ExportId']);
+        echo('Export smazán.<br/><br/>');
+        $_GET['Filter'] = 'my';
+        ExportList();
+      } else echo('Export '.$_GET['ExportId'].' nelze smazat.<br/>');
     } else echo('Nebylo zadáno Id');
   } else echo('Nemáte oprávnění');
@@ -515 +519 @@
   $DbResult = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
   $Export = mysql_fetch_assoc($DbResult);
-  ExportOutput($Export['Id'], $Export['OutputType']);
+  $DbResult = $Database->SQLCommand('SELECT * FROM ExportOutputType WHERE Id='.$Export['OutputType']);
+  if(mysql_num_rows($DbResult) > 0)
+  {
+    $DbResult = $Database->SQLCommand('SELECT * FROM ExportVersion WHERE ExportType='.$Export[ 'OutputType'].' AND ClientVersion='.$Export['ClientVersion']);
+    if(mysql_num_rows($DbResult) > 0)
+    {  
+      $Database->SQLCommand('UPDATE Export SET UsedCount = UsedCount + 1 WHERE Id='.$Export['Id']);
+      ExportOutput($Export['Id'], $Export['OutputType']);
+    } else echo('Nebyla vybrána požadovaná verze klienta');
+  } else echo('Nebyl vybrán formát výstupu.');
 }
 

trunk/style/global.js

@@ -35 +35 @@
 } 
 
-onload = function()
+function confirmAction(theMessage)
 {
-  if (document.getElementsByClassName == undefined) 
+  // TODO: Confirmation is not required in the configuration file
+  // or browser is Opera (crappy js implementation)
+  if (typeof(window.opera) != 'undefined') 
   {
-        document.getElementsByClassName = function(className)
-        {
-                var hasClassName = new RegExp("(?:^|\\s)" + className + "(?:$|\\s)");
-                var allElements = document.getElementsByTagName("*");
-                var results = [];
-
-                var element;
-                for (var i = 0; (element = allElements[i]) != null; i++) 
-                {
-                        var elementClass = element.className;
-                        if (elementClass && elementClass.indexOf(className) != -1 && hasClassName.test(elementClass))
-                                results.push(element);
-                }
-
-                return results;
-        }
-        
+    return true;
   }
 
-  arr = document.getElementsByClassName('textedit');
-  for(i = 0; i < arr.length; i++) 
-  {
-    ResizeTextArea(arr[i]);
-  }
+  var is_confirmed = confirm(theMessage);
+
+  return is_confirmed;
 }
-
-function CheckAll()
-{
-  ch = document.getElementById('CheckAll');
-  arr = document.getElementsByClassName('CheckBox');
-  for(i = 0; i < arr.length; i++) 
-  {
-    arr[i].checked = ch.checked;
-  }
-}
-
-function UpdateVersion(versions,versionselected)
-{
-  //elSel.clear;
-  var elSel = document.getElementById('Version');
-  for (i = elSel.length - 1; i>=0; i--) {
-      elSel.remove(i);
-  }
-
-  var elSel = document.getElementById('Version');
-  for(i = 0; i < versions.length; i++) 
-  {
-    var elOptNew = document.createElement('option');
-    elOptNew.text = versions[i];
-    elOptNew.value = versions[i];
-    if (versions[i] == versionselected)
-      elOptNew.selected = true;
-    try {
-      elSel.add(elOptNew, null); // standards compliant; doesn't work in IE
-    }
-    catch(ex) {
-      elSel.add(elOptNew); // IE only
-    }
-  }
-}