Changeset 22

Timestamp:

Mar 1, 2010, 9:12:44 PM (14 years ago)

Author:

george

Message:

• Přidáno: Skript pro import ze databáze centrály.
• Přidáno: Zprovozněno přihalšování a odhlašování uživatelů, prohlížení a změna profilu.

Location:

trunk

Files:

• Base/User.php (modified) (2 diffs)
• Base/UserOnline.php (modified) (4 diffs)
• CustomOutput.php (modified) (4 diffs)
• Locale/csCZ.php (modified) (1 diff)
• Module/Main/Controller.php (modified) (1 diff)
• Module/Main/Home.php (deleted)
• Module/Network/history.php (deleted)
• Module/Network/vyzva.php (deleted)
• Module/User/Controller.php (modified) (1 diff)
• SQL/Updates/22.sql (added)
• Style/Basic/Style.css (modified) (1 diff)
• import.php (added)
• index.php (modified) (5 diffs)

trunk/Base/User.php

@@ -33 +33 @@
   {
     $DbResult = $this->System->Database->select('User', 'Id', 'Name="'.$Name.
-      '" AND Password=SHA1(CONCAT("'.$Password.'", Salt))');
+      '" AND Password=SHA1(CONCAT(SHA1("'.$Password.'"), Salt))');
     if($DbResult->num_rows > 0)
     {
@@ -46 +46 @@
     $Salt = GetPasswordSalt();
     $this->System->Database->insert('User', array('Name' => '"'.$Name.'"',
-      'Salt' => '"'.$Salt.'"', 'Password' => 'SHA1(CONCAT("'.$Password.'", "'.$Salt.'"))',
+      'Salt' => '"'.$Salt.'"', 'Password' => 'SHA1(CONCAT(SHA1("'.$Password.'"), "'.$Salt.'"))',
       'Email' => '"'.$Email.'"', 'RegistrationTime' => 'NOW()'));
   }

trunk/Base/UserOnline.php

@@ -7 +7 @@
   var $Id;
   var $User;
+  var $AnonymousUserId;
 
   function __construct($System)
@@ -12 +13 @@
     parent::__construct($System);
     $this->Id = 0;
-    $this->User = 1;
+    $this->AnonymousUserId = 98;
+    $this->User = $this->AnonymousUserId;
   }
 
@@ -29 +31 @@
     {
       // Create new record
-      $this->System->Database->insert('UserOnline', array('User' => 1,
+      $this->System->Database->insert('UserOnline', array('User' => $this->AnonymousUserId,
         'ActivityTime' => 'NOW()', 'SessionId' => '"'.session_id().'"',
         'IpAddress' => '"'.$this->System->GetRemoteAddress().'"',
@@ -52 +54 @@
     {
       $this->System->Database->update('UserOnline', 'SessionId="'.session_id().'"',
-        array('User' => 1));
-      $this->User = 1;
+        array('User' => $this->AnonymousUserId));
+      $this->User = $this->AnonymousUserId;
     }
   }

trunk/CustomOutput.php

@@ -34 +34 @@
   {
     $Output = '<div class="Navigation">';
-    if($this->System->UserOnline->User == 1)
-    {
       // Visitor
       $Output .= '<ul class="MenuItem">';
@@ -46 +44 @@
       $Output .= '<li>'.$this->System->HTML->MakeLink($this->System->Localization->Translate('Links'), $this->System->Navigation->MakeLink('Main', 'Links')).'</li>';
       $Output .= '<li>'.$this->System->HTML->MakeLink($this->System->Localization->Translate('Contact'), $this->System->Navigation->MakeLink('Main', 'Contact')).'</li>';
+    if($this->System->UserOnline->User == $this->System->UserOnline->AnonymousUserId)
+    {
       $Output .= '</ul>';
       $Output .= '<ul class="MenuItem2">';
@@ -52 +52 @@
     } else
     {
-      $Output .= '<ul class="MenuItem">';
-      $Output .= '<li><a href="'.$this->System->Navigation->MakeLink('Lift', 'List').'">'.$this->System->Localization->Translate('Lifts').'</a></li>';
-      $Output .= '<li><a href="'.$this->System->Navigation->MakeLink('LiftGroup', 'List').'">'.$this->System->Localization->Translate('LiftGroups').'</a></li>';
-      $Output .= '<li><a href="'.$this->System->Navigation->MakeLink('LiftServiceCheck', 'List').'">'.$this->System->Localization->Translate('LiftServiceChecks').'</a></li>';
       $Output .= '</ul>';
       $Output .= '<ul class="MenuItem2">';
@@ -131 +127 @@
     $this->Document->HeadTag->SubElements[] = $Keywords;
     
-    $this->Document->BodyTag->SubElements = array('<div class="Title">'.$Title.'</div>',
+    $this->Document->BodyTag->SubElements = array('<div class="TitlePanel">'.$Title.'</div>',
 $this->TopMenu(), $this->PageMenu(), $Content, $this->Footer());
-    echo($this->Document->GetOutput());
+    return($this->Document->GetOutput());
   }
 

trunk/Locale/csCZ.php

@@ -11 +11 @@
   'Links' => 'Odkazy',
   'Contact' => 'Kontakt',
+  'UserName' => 'Jméno',
+  'Password' => 'Heslo',
+  'UserNotFound' => 'Uživatel nenalezen',
+  'UserLoggedOut' => 'Uživatel odhlášen',
+  'UserLogout' => 'Odhlášení',
+  'UserView' => 'Profil',
+  'Email' => 'E-mail',
+  'Member' => 'Člen',
+  'UserDetails' => 'Podrobnosti',
+  'FullName' => 'Celé jméno',
+  'Edit' => 'Upravit',
+  'UserEdit' => 'Üprava účtu',
+  'Save' => 'Uložit',
 );
 

trunk/Module/Main/Controller.php

@@ -113 +113 @@
   function Hosting()
   {
-    $this->System->Output->Title = $this->System->Localization->Translate('Internet');
+    $this->System->Output->Title = $this->System->Localization->Translate('Hosting');
 
     $Output = 'V nabídce je provoz virtualizovaných Linuxových serverů dle dohodnutých parameterů.<br/><br/>';

trunk/Module/User/Controller.php

@@ -204 +204 @@
         $this->System->User->Id = $this->System->UserOnline->User;
         $this->System->User->LoadData();
-        $_GET['M'] = 'Lift';
-        $_GET['A'] = 'List';
-        $LiftController = new LiftController($this->System);
-        $Output .= $LiftController->Show();
+        
+        $_GET['M'] = $this->System->DefaultModule;
+        unset($_GET['A']);
+        $_GET['Panel'] = 1;
+        $Output = $this->System->GetModuleOutput();
       } catch (UserNotFoundException $E)
       {

trunk/Style/Basic/Style.css

@@ -439 +439 @@
 }
 
-.Title
+.TitlePanel
 {
   background-color: #5050FF; 

trunk/index.php

@@ -14 +14 @@
 include_once(dirname(__FILE__).'/CustomOutput.php');
 
+include_once(dirname(__FILE__).'/Module/User/Controller.php');
 include_once(dirname(__FILE__).'/Module/Main/Controller.php');
 include_once(dirname(__FILE__).'/Module/Network/Controller.php');
@@ -27 +28 @@
   var $BaseURL;
   var $Type;
+  var $DefaultModule;
 
   function __construct()
@@ -40 +42 @@
     $this->BaseURL = new URL();
     
+    $this->DefaultModule = 'Main';
     $this->BaseURL->Scheme = 'http';
     $this->BaseURL->Host = $_SERVER['SERVER_NAME'];
@@ -59 +62 @@
   }
 
+  function GetModuleOutput()
+  {
+    if(!array_key_exists('M', $_GET)) $_GET['M'] = $this->DefaultModule;
+    $ModuleName = $_GET['M'];
+    $ModuleName .= 'Controller';
+    if(class_exists($ModuleName)) 
+    {
+      $Module = new $ModuleName($this);
+      if(array_key_exists('Panel', $_GET)) $Output = $Module->Show();
+        else $Output = $this->Output->Show($Module->Show());
+    } else 
+      throw new Exception('Module not found');
+    return($Output);
+  }
+
   function Run()
   {
@@ -65 +83 @@
     $this->User->Id = $this->UserOnline->User;
     $this->User->LoadData();
-    if(!array_key_exists('M', $_GET)) $_GET['M'] = 'Main';
-    $ModuleName = $_GET['M'];
-    $ModuleName .= 'Controller';
-    if(class_exists($ModuleName)) 
-    {
-      $Module = new $ModuleName($this);
-      if(array_key_exists('Panel', $_GET)) echo($Module->Show());
-        else $this->Output->Show($Module->Show());
-    } else 
-      throw new Exception('Module not found');
+    echo($this->GetModuleOutput());
   }
 }