Changeset 554 for trunk

Timestamp:

Jul 29, 2013, 9:25:33 PM (11 years ago)

Author:

chronos

Message:

• Fixed: Error in user profile page if user id is not given.
• Fixed: Error in translation list view if translation group item filter is empty.
• Fixed: SQL constraint error in case of export deletion which have records in related tables.
• Fixed: Error when table ordering parameter contain invalid value.

Location:

trunk

Files:

• Modules/Translation/Save.php (modified) (1 diff)
• Modules/User/Profile.php (modified) (2 diffs)
• export/index.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (2 diffs)

trunk/Modules/Translation/Save.php

@@ -45 +45 @@
           if(($GroupItem['Visible'] == 1) and ($EnglishText[$GroupItem['Column']] != ''))
             $Filter .= ' OR (`'.$GroupItem['Column'].'` = "'.addslashes($EnglishText[$GroupItem['Column']]).'")';
-        $Filter = ' AND ('.substr($Filter, 3).')';
+        if(substr($Filter, 0, 3) == ' OR') $Filter = ' AND ('.substr($Filter, 3).')';
         
         $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$Config['OriginalLanguage'].')'.$Filter);

trunk/Modules/User/Profile.php

@@ -41 +41 @@
                                 'LEFT JOIN `Team` ON `Team`.`Id` = `User`.`Team` '.
                                 'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
-                                'WHERE `User`.`Id` = '.$_GET['user'];
+                                'WHERE `User`.`Id` = '.($_GET['user'] * 1);
                 $DbResult = $this->Database->query($Query);
+                if($DbResult->num_rows > 0)
+                {
                 $UserLine = $DbResult->fetch_array();
                  
@@ -76 +78 @@
                                         '</div></form></fieldset>';
                 }
+                } else $Output .= ShowMessage('Uživatel nenalezen', MESSAGE_CRITICAL);
                 return($Output);
         }

trunk/export/index.php

@@ -116 +116 @@
   if($User->Licence(LICENCE_USER))
   {   
-    $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId'].' AND `User`='.$User->Id);
-    $System->Database->query('DELETE FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-    DeleteDirectory('../tmp/Export/'.$_GET['ExportId'].'/');
-    $Output = ShowMessage('Export smazán.');
-    $_GET['Filter'] = 'my';
-    WriteLog('Smazán export '.$_GET['ExportId'], LOG_TYPE_EXPORT);
-    $Output .= ExportList();
+    $DbResult = $System->Database->query('SELECT * FROM `Export` WHERE (`Id`='.($_GET['ExportId'] * 1).') AND (`User`='.$User->Id.')');
+    if($DbResult->num_rows > 0)
+    {
+      $System->Database->query('DELETE FROM `ExportGroup` WHERE `Export`='.$_GET['ExportId']);
+      $System->Database->query('DELETE FROM `ExportLanguage` WHERE `Export`='.$_GET['ExportId']);
+      $System->Database->query('DELETE FROM `ExportTask` WHERE `Export`='.$_GET['ExportId']);
+      $System->Database->query('DELETE FROM `ExportUser` WHERE `Export`='.$_GET['ExportId']);
+      $System->Database->query('DELETE FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+      DeleteDirectory('../tmp/Export/'.$_GET['ExportId'].'/');
+      $Output = ShowMessage('Export smazán.');
+      $_GET['Filter'] = 'my';
+      WriteLog('Smazán export '.$_GET['ExportId'], LOG_TYPE_EXPORT);
+      $Output .= ExportList();
+    } else $Output = ShowMessage('Export nenalezen.', MESSAGE_CRITICAL);
   } else $Output = ShowMessage('Nemáte oprávnění.', MESSAGE_CRITICAL);
   return($Output);

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 553; // Subversion revision
+$Revision = 554; // Subversion revision
 $DatabaseRevision = 543; // Database structure revision 
-$ReleaseTime = '2013-07-18';
+$ReleaseTime = '2013-07-29';

trunk/includes/global.php

@@ -232 +232 @@
   
   if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
-  if(array_key_exists('OrderDir', $_GET)) $_SESSION['OrderDir'] = $_GET['OrderDir'];
+  if(array_key_exists('OrderDir', $_GET) and (array_key_exists($_GET['OrderDir'], $OrderArrowImage))) 
+        $_SESSION['OrderDir'] = $_GET['OrderDir'];
   if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
-  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;
+  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;  
   
   // Check OrderCol
@@ -260 +261 @@
     $QueryItems['OrderCol'] = $Column['Name'];
     $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img  style="vertical-align: middle; border: 0px;" src="'.$System->Link('/images/'.$OrderArrowImage[$_SESSION['OrderDir']]).'" alt="order arrow">';
+    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img  style="vertical-align: middle; border: 0px;" src="'.
+      $System->Link('/images/'.$OrderArrowImage[$_SESSION['OrderDir']]).'" alt="order arrow">';
       else $ArrowImage = '';
     if($Column['Name'] == '') $Result .= '<th>'.$Column['Title'].'</th>';