Changeset 289

Timestamp:

Dec 23, 2009, 9:03:16 AM (14 years ago)

Author:

george

Message:

• Opraveno: Zobrazení obrázku statistiky dokončení překladové skupiny pro neexistujícího uživatele.
• Opraveno: Používat absolutní cestu pro obrázky šipek řezení tabulek.

Location:

trunk

Files:

• img_statistic.php (modified) (1 diff)
• includes/error.php (modified) (1 diff)
• includes/global.php (modified) (1 diff)
• includes/global_function.php (modified) (2 diffs)

trunk/img_statistic.php

@@ -10 +10 @@
 if(array_key_exists('team', $_GET)) 
 {
-  $team = ' AND `User` IN (SELECT `ID` FROM `user` WHERE `team` = '.$_GET['team'].')';
+  $team = ' AND `User` IN (SELECT `ID` FROM `user` WHERE `team` = '.($_GET['team'] * 1).')';
 } else $team = '';
+
 if(array_key_exists('language', $_GET)) 
 {
   $language = ' AND `Language` = '.$_GET['language'].'';
 } else $language = '';
+
 if(array_key_exists('user', $_GET)) 
 {
-  $DbResult = $Database->SQLCommand('SELECT `user`,`ExportSetting` FROM `user` WHERE ID='.$_GET['user']);
-  $User = mysql_fetch_assoc($DbResult);
-  $ExportSetting = unserialize($User['ExportSetting']);
-  $SelectedUsers = ''; 
-  foreach($ExportSetting['users-selection'] as $Item)
-    $SelectedUsers .= ','.$Item;
-  $SelectedUsers = substr($SelectedUsers, 1);
-  $user_sql = ' AND `User` IN ('.$SelectedUsers.')';
+  $DbResult = $Database->SQLCommand('SELECT `user`,`ExportSetting` FROM `user` WHERE ID='.($_GET['user'] * 1));
+  if(mysql_num_rows($DbResult) > 0)
+  {
+    $User = mysql_fetch_assoc($DbResult);
+    $ExportSetting = unserialize($User['ExportSetting']);
+    $SelectedUsers = ''; 
+    foreach($ExportSetting['users-selection'] as $Item)
+      $SelectedUsers .= ','.$Item;
+    $SelectedUsers = substr($SelectedUsers, 1);
+    $user_sql = ' AND `User` IN ('.$SelectedUsers.')';
+  } else $user_sql = '';
 } else $user_sql = '';
+
 
 $ID = mysql_fetch_row($Database->SQLCommand('SELECT MAX(`VersionEnd`) FROM '.$Group['TablePrefix']));

trunk/includes/error.php

@@ -36 +36 @@
     foreach($Backtrace as $Item)
     {
-      print_r($Item);
-      $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
+      //print_r($Item);
+      if(array_key_exists('line', $Item))
+        $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
+      else $Error .= ' '.$Item['file']."\t".$Item['function'];
       $Arguments = '';
       if(array_key_exists('args', $Item) and is_array($Item['args']))

trunk/includes/global.php

@@ -246 +246 @@
 
   //záznam o aktivitě
-  if(Licence(0)) $Database->SQLCommand('UPDATE user SET LastIP = "'.$_SERVER['REMOTE_ADDR'].'", LastLogin = NOW() WHERE ID = '.$_SESSION['UserID']);
+  if(Licence(0) and array_key_exists('REMOTE_ADDR', $_SERVER)) 
+    $Database->SQLCommand('UPDATE user SET LastIP = "'.$_SERVER['REMOTE_ADDR'].'", LastLogin = NOW() WHERE ID = '.$_SESSION['UserID']);
 
   echo('<table class="page"><tr><td class="menu">');

trunk/includes/global_function.php

@@ -94 +94 @@
 function GetOrderTableHeader($Columns, $DefaultColumn)
 {
-  global $OrderDirSQL, $OrderArrowImage;
+  global $OrderDirSQL, $OrderArrowImage, $Config;
   
   if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
@@ -121 +121 @@
     $QueryItems['OrderCol'] = $Column['Name'];
     $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img  style="vertical-align: middle; border: 0px;" src="images/'.$OrderArrowImage[$_SESSION['OrderDir']].'" alt="order arrow">';
+    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img  style="vertical-align: middle; border: 0px;" src="'.$Config['Web']['BaseURL'].'/images/'.$OrderArrowImage[$_SESSION['OrderDir']].'" alt="order arrow">';
       else $ArrowImage = '';
     if($Column['Name'] == '') $Result .= '<th>'.$Column['Title'].'</th>';