Changeset 189 for trunk/aktuality

Timestamp:

Apr 12, 2009, 5:40:08 PM (16 years ago)

Author:

george

Message:

• Upraveno: Údaje uživatele jméno a příjmení bylo sloušeno do údaje Zobrazované jméno. Upraveny patřičné sloupce a odkazy ze skriptů.
• Opraveno: Registrace nových uživatelů.

Location:

trunk/aktuality

Files:

• index.php (modified) (3 diffs)
• news.php (modified) (2 diffs)

trunk/aktuality/index.php

@@ -31 +31 @@
         {
           if(array_key_exists('id', $_GET)) $Id = $_GET['id'] * 1;
-          $DbResult = $this->Database->query('SELECT `news`.*, `User`.`Nick` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE  `news`.`id`='.$Id);
+          $DbResult = $this->Database->query('SELECT `news`.*, `User`.`Name` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE  `news`.`id`='.$Id);
           if($DbResult->num_rows > 0)
           {
             $Row = $DbResult->fetch_array();
-            if($Row['Nick'] == '') $Author = $Row['author'];
-              else $Author = $Row['Nick'];
+            if($Row['Name'] == '') $Author = $Row['author'];
+              else $Author = $Row['Name'];
             $Output .= '<div style="border: thin dotted #97ADFF;        background: #F6F7FF; margin-top: 5px; padding: 0px 5px 5px 5px;"><div style="padding-bottom: 1px; border-bottom-width: 1; border-bottom-style: solid; border-bottom-color: silver;"><strong>'.$Row['title'].' ('.HumanDate($Row['date']).', '.$Author.')</strong>';
             if($this->System->Modules['User']->User['Id'] == $Row['User'])
@@ -105 +105 @@
 
           $_POST['content'] = str_replace("\n",'<br />',$_POST['content']);
-          $this->Database->insert('news',array('category' => $Category, 'title' => $_POST['title'], 'content' => $_POST['content'], 'date' => 'NOW()', 'ip' => $RemoteAddr, 'enclosure' => $Enclosures, 'author' => $this->System->Modules['User']->User['Nick'], 'User' => $this->System->Modules['User']->User['Id']));
+          $this->Database->insert('news',array('category' => $Category, 'title' => $_POST['title'], 'content' => $_POST['content'], 'date' => 'NOW()', 'ip' => $RemoteAddr, 'enclosure' => $Enclosures, 'author' => $this->System->Modules['User']->User['Name'], 'User' => $this->System->Modules['User']->User['Id']));
           $Output .= 'Aktualita přidána!<br />Pokud budete chtít vaši aktualitu smazat, klikněte na odkaz Smazat v seznamu všech aktualit v kategorii.<br /><br />';
           $Output .= '<a href="index.php?category='.$_POST['category'].'">Zpět na seznam aktualit</a>';
@@ -173 +173 @@
 
           //echo(GetRemoteAddress().','.$_SERVER['HTTP_X_FORWARDED_FOR'].'<br />');
-          $DbResult = $this->Database->query('SELECT `news`.*, `User`.`Nick` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE `category`='.$Category.' ORDER BY `news`.`id` DESC LIMIT '.($Page * $PerPage).','.$PerPage);
+          $DbResult = $this->Database->query('SELECT `news`.*, `User`.`Name` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE `category`='.$Category.' ORDER BY `news`.`id` DESC LIMIT '.($Page * $PerPage).','.$PerPage);
           while($Row = $DbResult->fetch_array())
           {
-            if($Row['Nick'] == '') $Author = $Row['author'];
-              else $Author = $Row['Nick'];
+            if($Row['Name'] == '') $Author = $Row['author'];
+              else $Author = $Row['Name'];
             $Output .= '<div style="border: thin dotted #97ADFF; background: #F6F7FF; margin-top: 5px; padding: 0px 5px 5px 5px;"><div style="padding-bottom: 1px; border-bottom-width: 1; border-bottom-style: solid; border-bottom-color: silver;"><strong><a href="?action=view&id='.$Row['id'].'">'.$Row['title'].'</a> ('.HumanDate($Row['date']).', '.$Author.')</strong>';
             if($this->System->Modules['User']->User['Id'] == $Row['User'])

trunk/aktuality/news.php

@@ -27 +27 @@
       $Output .= '<a href="aktuality/index.php?action=add&amp;category='.$Category.'">Přidat aktualitu</a>&nbsp;';
     $Output .= '</td></tr><tr><td colspan="2">';
-    $DbResult = $Database->query('SELECT `news`.*, `User`.`Nick` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE (`news`.`category`='.$Category.') AND (DATE_SUB(NOW(), INTERVAL '.$DaysAgo.' DAY) < `news`.`date`) ORDER BY `news`.`date` DESC LIMIT 0,'.$ItemCount);
+    $DbResult = $Database->query('SELECT `news`.*, `User`.`Name` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE (`news`.`category`='.$Category.') AND (DATE_SUB(NOW(), INTERVAL '.$DaysAgo.' DAY) < `news`.`date`) ORDER BY `news`.`date` DESC LIMIT 0,'.$ItemCount);
     //echo($Database->error.'<br />');
     //echo($Database->LastQuery.'<br />');
@@ -38 +38 @@
       while($Row = $DbResult->fetch_array())
       {
-        if($Row['Nick'] == '') $Author = $Row['author'];
-          else $Author = $Row['Nick'];
+        if($Row['Name'] == '') $Author = $Row['author'];
+          else $Author = $Row['Name'];
         $Output .= '<tr><td onclick="window.location=\'aktuality/index.php?action=view&amp;id='.$Row['id'].'\'" onmouseover="zobraz('."'new".$Category.$Index."'".')" style="cursor: pointer; margin: 0px;"><table cellspacing="0" cellpadding="0" style="padding: 0px; margin: 0px; font-size: small; color: red;" width="100%"><tr><td style="font-size: '.$FontSize.'pt"><strong>'.$Row['title'].'</strong></td><td align="right" style="font-size: '.$FontSize.'pt">'.$Author.' ('.HumanDate($Row['date']).')</td></tr></table>';
         $Output .= '<div id="new'.$Category.$Index.'" class="NewsTableItem">'.$Row['content'];