Changeset 510 for trunk

Timestamp:

Feb 15, 2013, 11:02:13 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Novinky na webu nyní mají titulek. U starých novinek se nastaví jako titulek jméno uživatele, jako to bylo dříve.

Location:

trunk

Files:

• action.php (modified) (1 diff)
• admin/UpdateTrace.php (modified) (1 diff)
• admin/index.php (modified) (2 diffs)
• admin/install.php (modified) (1 diff)
• includes/Page.php (modified) (1 diff)
• includes/global.php (modified) (1 diff)
• index.php (modified) (1 diff)
• rss.php (modified) (1 diff)

trunk/action.php

@@ -271 +271 @@
   if($User->Licence(LICENCE_ADMIN)) $Output .= ' <a href="admin/?action=addnew">Vložit</a>';
   $Output .= '<div class="shoutbox">';
-  $DbResult = $System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
+  $DbResult = $System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, '.
+        '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
   while($Line = $DbResult->fetch_assoc())
-    $Output .= '<div><strong>'.HumanDate($Line['Time']).'</strong> '.$Line['Text'].' ('.$Line['User'].')</div>';
+    $Output .= '<div><strong>'.$Line['Title'].' ('.HumanDate($Line['Time']).')</strong> '.$Line['Text'].' ('.$Line['User'].')</div>';
   $Output .= '</div>'.$PageList['Output'];
   return($Output); 

trunk/admin/UpdateTrace.php

@@ -2395 +2395 @@
 }
 
+function UpdateTo510($Manager)
+{      
+  global $System;
+  
+  $Manager->Execute('ALTER TABLE `News` ADD `Title` VARCHAR( 255 ) NOT NULL AFTER `Time`');
+  $Manager->Execute('UPDATE `News` SET `Title` = (SELECT `Name` FROM `User` AS `T` WHERE `T`.`ID` = `User`)');
+}
+
 $Updates = array(
         498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
+        506 => array('Revision' => 510, 'Function' => 'UpdateTo510'),
 );
 

trunk/admin/index.php

@@ -31 +31 @@
   
   $Output = '<form action="?action=addnew" method="POST">'.
-  'Uživatel: '.$User->Name.'('.$User->Id.')<br/> '.
+  'Uživatel: '.$User->Name.'('.$User->Id.')<br/> '.  
+  'Nadpis: <input type="text" name="title" size="40"/><br/>'.
+  'Obsah: <textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="Text" name="text"></textarea><br/>'.
   '<input type="submit" value="Uložit"/><br/>'.
-  '<textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="Text" name="text"></textarea>'.
   '</form>';
   return($Output);
@@ -42 +43 @@
   global $System, $Config, $User;
   
-  if(array_key_exists('text', $_POST)) 
+  if(array_key_exists('text', $_POST) and array_key_exists('title', $_POST)) 
   {
-    $querty = 'INSERT INTO `News` ( `Time` ,`User` ,`Text`) VALUES ( NOW( ) , '.$User->Id.', "'.$_POST['text'].'")';
+    $querty = 'INSERT INTO `News` (`Title`, `Time` ,`User` ,`Text`) VALUES ( "'.$_POST['title'].'", NOW( ) , '.
+      $User->Id.', "'.$_POST['text'].'")';
     $System->Database->query($querty);
     $Output = ShowMessage('Aktualita uložena.');

trunk/admin/install.php

@@ -3 +3 @@
 $StopAfterUpdateManager = true;
 include_once('../includes/global.php');
-include_once('../sql/UpdateTrace.php');
+include_once('UpdateTrace.php');
 $UpdateManager->Trace = $Updates;
 $UpdateManager->InstallMethod = 'FullInstall';

trunk/includes/Page.php

@@ -1 +1 @@
 <?php
-
-$RSSChannels = array(
-  array('Title' => 'Změny systému', 'Channel' => 'news'),
-  array('Title' => 'Poslední překlady', 'Channel' => 'translation'),
-  array('Title' => 'Shoutbox', 'Channel' => 'shoutbox'),
-);
 
 function ShowShoutbox()

trunk/includes/global.php

@@ -25 +25 @@
   date_default_timezone_set($Config['Web']['Timezone']);
   
-  $Revision = 506; // Subversion revision
+  $Revision = 510; // Subversion revision
   $ReleaseTime = '2013-02-15';  
   

trunk/index.php

@@ -8 +8 @@
 
   $Output = '<strong>Změny systému:</strong><div class="NewsBox">';
-  $DbResult = $System->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text` FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
+  $DbResult = $System->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text`,`News`.`Title`'.
+    ' FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
   while($DbRow = $DbResult->fetch_assoc())
-    $Output .= '<div><strong>'.$DbRow['Name'].' ('.HumanDate($DbRow['Time']).')</strong> <br />'.$DbRow['Text'].'</div>';  
+    $Output .= '<div><strong>'.$DbRow['Title'].' ('.HumanDate($DbRow['Time']).')</strong> <br />'.$DbRow['Text'].'</div>';  
   $Output .= '<a href="action.php?action=news">Všechny zprávy</a>';
   $Output .= '</div>';

trunk/rss.php

@@ -6 +6 @@
   if($_GET['channel'] == 'news')
   {
-    $DbResult = $System->Database->query('SELECT UNIX_TIMESTAMP(`News`.`Time`) AS `UnixTime`, `News`.`Time`, `User`.`Name`, `News`.`Text` FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
+    $DbResult = $System->Database->query('SELECT UNIX_TIMESTAMP(`News`.`Time`) AS `UnixTime`, '.
+      '`News`.`Title`, `News`.`Time`, `User`.`Name`, `News`.`Text` '.
+      'FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
     while($DbRow = $DbResult->fetch_assoc()) 
     {
       $Items[] = array
     (
-        'Title' => $DbRow['Name'].'('.date('d.m.Y', MysqlDateTimeToTime($DbRow['Time'])).')',
+        'Title' => $DbRow['Title'],
         'Link' =>  'http://'.$Config['Web']['Host'].$System->Link('/'),
-        'Description' => $DbRow['Text'],
+        'Description' => $DbRow['Text'].' ('.$DbRow['Name'].')',
         'Time' => $DbRow['UnixTime'],
       );