Changeset 96

Timestamp:

Jul 31, 2008, 12:09:43 PM (16 years ago)

Author:

george

Message:

• Přidáno: Možnost zobrazit aktuality v samostném okně po kliknutí.
• Přidáno: Funkce obnovení zapomenutého hesla uživatele.

Location:

devel/www

Files:

• aktuality/index.php (modified) (1 diff)
• aktuality/news.php (modified) (3 diffs)
• code.php (added)
• finance/manage.php (modified) (1 diff)
• form_classes.php (modified) (1 diff)
• global.php (modified) (1 diff)
• index.php (modified) (1 diff)
• style.css (modified) (1 diff)
• user.php (modified) (3 diffs)

devel/www/aktuality/index.php

@@ -26 +26 @@
     switch($_GET['action'])
     {
+      case 'view':
+        if(!$this->System->Modules['User']->CheckPermission('News', 'Display', 'Item')) $Output .= 'Nemáte oprávnění';
+        else 
+        {
+          if(array_key_exists('id', $_GET)) $Id = $_GET['id'] * 1;
+          $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();
+            $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']).', '.$Row['Name'].$Row['author'].')</strong>';
+            if($this->System->Modules['User']->User['Id'] == $Row['User'])
+            { 
+              $Output .= '&nbsp;<a href="index.php?action=del&amp;category='.$Category.'&amp;id='.$Row['id'].'">Smazat</a>';
+              $Output .= '&nbsp;<a href="index.php?action=edit&amp;category='.$Category.'&amp;id='.$Row['id'].'">Editovat</a>';
+            }
+            $Output .= '</div>'.$Row['content'].'<br />';
+            if($Row['enclosure'] != '')
+            { 
+              $Output .= '<br />Přílohy: ';
+              $Enclosures = explode(';', $Row['enclosure']);
+              foreach($Enclosures as $Enclosure)
+              {
+                if(file_exists($this->UploadedFilesFolder.$Enclosure)) $Output .= ' <a href="'.$this->UploadedFilesFolder.$Enclosure.'">'.$Enclosure.'</a>';
+              }
+            }
+            $Output .= '</div>';
+          } else $Output .= 'Položka nenalezena.';
+        }
+        break;
       case 'add':
           $Output .= '<strong>Vložení nové aktuality:</strong><br />';

devel/www/aktuality/news.php

@@ -38 +38 @@
       while($Row = $DbResult->fetch_array())
       {
-        $Output .= '<tr><td 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">'.$Row['Name'].$Row['author'].' ('.HumanDate($Row['date']).')</td></tr></table>';
+        $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">'.$Row['Name'].$Row['author'].' ('.HumanDate($Row['date']).')</td></tr></table>';
         $Output .= '<div id="new'.$Category.$Index.'" class="NewsTableItem">'.$Row['content'];
 
@@ -60 +60 @@
     return($Output);
   }
-  
+
   function LoadSettingsFromCookies()
   {
@@ -85 +85 @@
   function Show()
   {
-    $Output = '<div class="PanelTitle"><span id="MenuItem">Aktuálně:</span><div id="MenuItem2"><a href="?Action=CustomizeNews">Upravit</a></div></div>';
+    $Output = '<div class="PanelTitle"><span class="MenuItem">Aktuálně:</span><div class="MenuItem2"><a href="?Action=CustomizeNews">Upravit</a></div></div>';
 
     $UploadedFilesFolder = 'aktuality/uploads/';

devel/www/finance/manage.php

@@ -361 +361 @@
     }
   }
+
 }
 

devel/www/form_classes.php

@@ -71 +71 @@
     ),
   ),
+  'PasswordRecovery' => array(
+    'Title' => 'Obnova hesla',
+    'Table' => '',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => ''),
+      'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
+    ),
+  ),
   'NewNetworkDevice' => array(
     'Title' => 'Vložit nové zařízení',

devel/www/global.php

@@ -9 +9 @@
 include('database.php');
 include('error.php');
+include_once('code.php');
 $Database = new Database($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
 $Database->Prefix = $Config['Database']['Prefix'];

devel/www/index.php

@@ -262 +262 @@
       }
       if($_GET['Action'] == 'UserRegister')
-      { 
+      {
         $UserRegister = new Form('UserRegister');
         $UserRegister->OnSubmit = '?Action=UserRegisterSave';
         $Output .= $UserRegister->ShowEditForm();
       } else
+      if($_GET['Action'] == 'PasswordRecovery')
+      {
+        $Form = new Form('PasswordRecovery');
+        $Form->OnSubmit = '?Action=PasswordRecovery2';
+        $Output .= $Form->ShowEditForm();
+      } else
+      if($_GET['Action'] == 'PasswordRecovery2')
+      {
+        $Form = new Form('PasswordRecovery');
+        $Form->LoadValuesFromForm();
+
+        $Output .= $this->SystemMessage('Obnova hesla', $this->System->Modules['User']->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']));
+      } else
+      if($_GET['Action'] == 'PasswordRecoveryConfirm')
+      {
+        $Output .= $this->SystemMessage('Obnova hesla', $this->System->Modules['User']->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
+      } else
       if($_GET['Action'] == 'UserRegisterSave')
-      { 
+      {
         $UserRegister = new Form('UserRegister', array());
         $UserRegister->LoadValuesFromForm();

devel/www/style.css

@@ -91 +91 @@
   margin: 0px 0px 0px 0px;
   padding: 0px 0px 0px 0px;
-  border: 0px 0px 0px 0px;
+  border-width: 0px 0px 0px 0px;
   vertical-align: middle;
 }

devel/www/user.php

@@ -12 +12 @@
 define('USER_LOGGED_OUT', 'Byl jste odhlášen.');
 define('BAD_PASSWORD', 'Špatné heslo.');
+define('USER_NOT_FOUND', 'Uživatele nenalezen.');
 define('USER_TIMEOUT', 300);  // in seconds
+define('USER_PASSWORD_RECOVERY_SUCCESS', 'Přihlašovací údaje byly odeslány na zadanou emailovou adresu.');
+define('USER_PASSWORD_RECOVERY_FAIL', 'Podle zadaných údajů nebyl nalezen žádný uživatel.');
+define('USER_PASSWORD_RECOVERY_CONFIRMED', 'Nové heslo bylo aktivováno.');
 
 define('USER_EVENT_REGISTER', 1);
@@ -26 +30 @@
   var $DefaultRole = 2;
   var $AnonymousUserId = 1;
-  
+
   function Check()
   {
@@ -181 +185 @@
     } else return(false);
   }
+
+  function PasswordRecoveryRequest($Name, $Email)
+  {
+    global $Config;
+
+    $DbResult = $this->Database->select('User', 'Name, Id, Email, Password', '`Name`="'.$Name.'" AND `Email`="'.$Email.'"');
+    if($DbResult->num_rows > 0)
+    {
+      $Row = $DbResult->fetch_array();
+      $NewPassword = substr(sha1(strtoupper($Row['Name'])), 0, 7);
+
+      $Subject = 'Obnova hesla';
+      $Message = 'Požádali jste o zaslání nového hesla na serveru <a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'">http://'.$Config['Web']['Host'].$Config['Web']['RootFolder']."</a>.<br>\nPokud jste tak neučinili, měli by jste tento email ignorovat.<br><br>\n\nVaše nové heslo k účtu ".$Row['Name']." je: ".$NewPassword."\n<br>Pro aktivaci tohoto hesla klikněte na ".'<a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/?Action=PasswordRecoveryConfirm&amp;User='.$Row['Id'].'&amp;H='.$Row['Password'].'&amp;P='.$NewPassword.'">tento odkaz</a>.'."\n<br> Po přihlášení si prosím změňte heslo na nové.\n\n<br><br>Na tento email neodpovídejte.";
+      $AdditionalHeaders = "To: ".$Row['Name']." <".$Row['Email'].">\n"."From: ".from_utf8($Config['Web']['Title'], 'iso2')." <noreplay@zdechov.net>\n"."MIME-Version: 1.0\n"."Content-type: text/html; charset=utf-8";
+      mail($Row['Email'], $Subject, $Message, $AdditionalHeaders);
+      $Output = USER_PASSWORD_RECOVERY_SUCCESS;
+    } else $Output = USER_PASSWORD_RECOVERY_FAIL;
+    return($Output);
+  }
+
+  function PasswordRecoveryConfirm($Id, $Hash, $NewPassword)
+  {
+    $DbResult = $this->Database->select('User', 'Id, Name, Password', 'Id = '.$Id);
+    if($DbResult->num_rows > 0)
+    {
+      $Row = $DbResult->fetch_array();
+      $NewPassword2 = substr(sha1(strtoupper($Row['Name'])), 0, 7);
+      if(($NewPassword == $NewPassword2) and ($Hash == $Row['Password']))
+      {
+        $this->Database->update('User', 'Id='.$Row['Id'], array('Password' => sha1($NewPassword)));
+        $Output = USER_PASSWORD_RECOVERY_CONFIRMED;
+      } else $Output = PASSWORDS_UNMATCHED;
+    } else $Output = USER_NOT_FOUND;
+    return($Output);
+  }
 }