Changeset 514 for trunk

Timestamp:

Feb 16, 2013, 8:31:12 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Částečna snaha o správu odkazů tabulky propagace. Bude potřeba zajistit nejdříve obecný formulářový systém.

Location:

trunk

Files:

• banners.php (modified) (4 diffs)
• import/cmd.php (modified) (2 diffs)
• includes/user.php (modified) (1 diff)
• save.php (modified) (1 diff)

trunk/banners.php

@@ -2 +2 @@
 
 include('includes/global.php');
+
+function ParentWebs($Selected)
+{
+  global $System;
+
+  $Output = '<select name="Parent">';
+  $Output .= '<option value=""';
+  if($Selected == '')
+    $Output .= ' selected="selected"';
+  $Output .= '></option>';
+  $DbResult = $System->Database->select('Referrer', '`Id`, `Web`', 'Parent IS NULL');
+  while($Language = $DbResult->fetch_assoc())
+  {
+    $Output .= '<option value="'.$Language['Id'].'"';
+    if($Selected == $Language['Id'])
+      $Output .= ' selected="selected"';
+    $Output .= '>'.$Language['Web'].'</option>';
+  }
+  $Output .= '</select>';
+  return($Output);
+}
 
 $MonthAge = 3;
@@ -22 +43 @@
 
 
+if(!$User->Licence(LICENCE_ADMIN)) $Where = ' WHERE (`Show`=1) AND (`Parent` IS NULL)';
+  else $Where = '';
 $Query = 'SELECT * FROM (SELECT *, (`Hits` + COALESCE((SELECT SUM(`Hits`) FROM '.
 '`Referrer` AS `T1` WHERE `T1`.`Parent` = `T2`.`Id`), 0)) AS `TotalHits`, '.
 'GREATEST(`DateLast`, COALESCE((SELECT MAX(`DateLast`) FROM '.
 '`Referrer` AS `T1` WHERE `T1`.`Parent` = `T2`.`Id`), 0)) AS `MaxDateLast` FROM '.
-'`Referrer` AS `T2` WHERE (`Show`=1) AND (`Parent` IS NULL)) AS `T3` '.
+'`Referrer` AS `T2`'.$Where.') AS `T3` '.
 'WHERE (`T3`.`MaxDateLast` > (NOW() - INTERVAL '.$MonthAge.' MONTH))';
-  
+ 
 
 $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS T');
@@ -42 +65 @@
   array('Name' => 'TotalHits', 'Title' => 'Příchodů'), 
 );
+if($User->Licence(LICENCE_ADMIN))
+{
+        $TableColumns[] = array('Name' => 'Show', 'Title' => 'Viditelné');
+  $TableColumns[] = array('Name' => 'Parent', 'Title' => 'Rodič');
+  $TableColumns[] = array('Name' => 'Description', 'Title' => 'Komentář');
+  $TableColumns[] = array('Name' => 'Action', 'Title' => 'Akce');
+}
 $Order = GetOrderTableHeader($TableColumns, 'MaxDateLast', 1);
 $Output .= $Order['Output'];
@@ -52 +82 @@
   $Output .= '<tr><td><a href="'.$Line['LastURL'].'">'.$Line['Web'].'</a></td>'.
     '<td>'.HumanDate($Line['MaxDateLast']).'</td>'.
-    '<td>'.$Line['TotalHits'].'</td></tr>';
+    '<td>'.$Line['TotalHits'].'</td>';
+    if($User->Licence(LICENCE_ADMIN))
+    {
+      $Output .=  
+    '<td>'.$Line['Show'].'</td>'.
+    '<td>'.$Line['Parent'].'</td>'.
+    '<td>'.$Line['Description'].'</td>'.
+    '<td><a href="?action=edit&amp;id='.$Line['Id'].'">Upravit</a></td>';
+    }
+    $Output .= '</tr>';
 }
 $Output .= '</table>';

trunk/import/cmd.php

@@ -64 +64 @@
         if(($Group['MangosTable'] != '') and ($Group['TablePrefix'] != '') and ($Group['MangosDatabase'] == 'mangos'))
         {
-      $Output .= '  '.$TranslationTree[$Group['Id']]['Name'].' ');  
-            ImportSQLMangos($Config['Web']['GameVersion'], $Group['Id'];
+      $Output .= '  '.$TranslationTree[$Group['Id']]['Name'].' ';  
+      ImportSQLMangos($Config['Web']['GameVersion'], $Group['Id']);
       $Output .= '
       ';
@@ -76 +76 @@
         if(($Group['DBCFileName'] != '') and ($Group['TablePrefix'] != ''))
         {
-      $Output .= '  '.$TranslationTree[$Group['Id']]['Name'].' ');  
-            ImportDBC($Config['Web']['GameVersion'], $Group['Id'];
+      $Output .= '  '.$TranslationTree[$Group['Id']]['Name'].' ';  
+            ImportDBC($Config['Web']['GameVersion'], $Group['Id']);
       $Output .= '
       ';

trunk/includes/user.php

@@ -40 +40 @@
       WriteLog('Login: '.$Name, LOG_TYPE_USER);
       $this->UpdateState();
-    } else $ŧhis->Role = LICENCE_ANONYMOUS;
+    } else $this->Role = LICENCE_ANONYMOUS;
   }
   

trunk/save.php

@@ -188 +188 @@
       '<input type="hidden" name="user" value="'.$_POST['user'].'" />'.
       '<input type="hidden" name="ID" value="'.$_POST['ID'].'" />'.
-      '<input type="hidden" name="Language" value="'.$_POST['Language'].'" />');
+      '<input type="hidden" name="Language" value="'.$_POST['Language'].'" />';
 
     foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)