Changeset 202 for trunk/index.php

Timestamp:

Apr 30, 2009, 11:30:37 PM (15 years ago)

Author:

george

Message:

• Upraveno: Při chybně vyplněném formuláři zobraz chybové hlášení i obsah formuláře, aby nebylo nutné vše vyplňovat znovu.
• Přidáno: Možnost povolit v konfiguraci webu formátování výstupního HTML kódu.
• Opraveno: Validace HTML kódu generování formulářů.

File:

• trunk/index.php (modified) (8 diffs)

trunk/index.php

@@ -68 +68 @@
     'fun' => array('Zábava',
             array('Youtube', 'http://www.youtube.com/', ''),
+            array('Stream.cz', 'http://www.stream.cz/', ''),
       array('Last.fm', 'http://www.last.fm/', ''),    
     ),
@@ -100 +101 @@
   function InfoBar()
   {
-    $this->Database->select_db('is');
+    global $Config;
+    
+    $Database->select_db($Config['Database']['Database']);
 
     $Output2 = '';
@@ -197 +200 @@
   function GetServerUptime()
   {
-    $Data = explode(' ',exec('uptime'));
+    $Data = explode(' ', exec('uptime'));
     $Data = array_slice($Data, 3, -8);
     $Uptime = '';
@@ -227 +230 @@
       if($_GET['Action'] == 'LoginForm')
       {
-        $Output .= '<form action="?Action=Login" method="post"><center><fieldset style="width: 500px;"><legend>Přihlašovací údaje</legend>'.
-        '<table class="hidden">'.
-        '<tr align="left"><td colspan="2">Jméno:</td></tr>'.
-        '<tr align="left"><td colspan="2"><input type="text" name="Username" size="40" maxlength="16" /></td></tr>'.
-              '<tr align="left"><td colspan="2">Heslo:</td></tr>'.
-              '<tr align="left"><td colspan="2"><input type="password" name="Password" size="40" maxlength="16" /></td></tr>'.
-              '<tr><td colspan="2">&nbsp;</td></tr>'.
-              '<tr align="left">'.
-                  //<td><input type="checkbox" name="remember" value="1" checked="checked" /> Trvalé přihlášení</td>
-                    '<td align="center" colspan="2"><input type="submit" value="Přihlásit" /></td>'.
-              '</tr>'.
-        '<tr align="left">'.
-                    '<td><a href="?Action=UserRegister">Registrovat se</a></td>'.
-                    '<td><a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></td>'.
-              '</tr>'.
-        '</table>'.
-        '</fieldset></center>'.
-        '</form>';
-//        $Output .= $this->SystemMessage('Test', $Output);
+        $Form = new Form('UserLogin');
+        $Form->OnSubmit = '?Action=Login';
+        $Output .= $Form->ShowEditForm();
+        $Output .= '<div class="Centred"><a href="?Action=UserRegister">Registrovat se</a> '.
+                    '<a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
       } else
       if($_GET['Action'] == 'Login')
       {
-        $Output .= $this->SystemMessage('Přihlášení', $this->System->Modules['User']->Login($_POST['Username'], $_POST['Password']));
+        $Form = new Form('UserLogin');
+        $Form->OnSubmit = '?Action=Login';
+        $Result = $this->System->Modules['User']->Login($_POST['Username'], $_POST['Password']);
+        $Output .= $this->SystemMessage('Přihlášení', $Result);
+        if($Result <> USER_LOGGED_IN)
+        {
+          $Form->LoadValuesFromForm();
+          $Form->Values['Password'] = '';
+          $Output .= $Form->ShowEditForm();
+          $Output .= '<div class="Centred"><a href="?Action=UserRegister">Registrovat se</a> '.
+                    '<a href="?Action=PasswordRecovery">Obnova zapomenutého hesla</a></div>';
+        }
       } else 
       if($_GET['Action'] == 'Logout')
@@ -275 +275 @@
       if($_GET['Action'] == 'UserRegister')
       {
-        $UserRegister = new Form('UserRegister');
-        $UserRegister->OnSubmit = '?Action=UserRegisterSave';
-        $Output .= $UserRegister->ShowEditForm();
+        $Form = new Form('UserRegister');
+        $Form->LoadValuesFromForm();
+        $Form->OnSubmit = '?Action=UserRegisterSave';
+        $Output .= $Form->ShowEditForm();
       } else
       if($_GET['Action'] == 'UserRegisterConfirm')
       {
-          $Output .= $this->SystemMessage('Potvrzení registrace', $this->System->Modules['User']->RegisterConfirm($_GET['User'], $_GET['H']));
+        $Output .= $this->SystemMessage('Registrace nového účtu', $this->System->Modules['User']->RegisterConfirm($_GET['User'], $_GET['H']));
       } else
       if($_GET['Action'] == 'PasswordRecovery')
@@ -293 +294 @@
         $Form = new Form('PasswordRecovery');
         $Form->LoadValuesFromForm();
-
-        $Output .= $this->SystemMessage('Obnova hesla', $this->System->Modules['User']->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']));
+        $Result = $this->System->Modules['User']->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
+        $Output .= $this->SystemMessage('Obnova hesla', $Result);
+        if($Result <> USER_PASSWORD_RECOVERY_SUCCESS)
+        {
+          $Output .= $Form->ShowEditForm();
+        }        
       } else
       if($_GET['Action'] == 'PasswordRecoveryConfirm')
@@ -302 +307 @@
       if($_GET['Action'] == 'UserRegisterSave')
       {
-        $UserRegister = new Form('UserRegister', array());
-        $UserRegister->LoadValuesFromForm();
-        $Output .= $this->SystemMessage('Nastavení', $this->System->Modules['User']->Register($UserRegister->Values['Login'], $UserRegister->Values['Password'], $UserRegister->Values['Password2'], $UserRegister->Values['Email'], $UserRegister->Values['Name'], $UserRegister->Values['PhoneNumber'], $UserRegister->Values['ICQ']));
+        $Form = new Form('UserRegister', array());
+        $Form->LoadValuesFromForm();
+        $Result = $this->System->Modules['User']->Register($Form->Values['Login'], $Form->Values['Password'], $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name'], $Form->Values['PhoneNumber'], $Form->Values['ICQ']);
+        $Output .= $this->SystemMessage('Nastavení', $Result);
+        if($Result <> USER_REGISTRATED) 
+        {
+          $Form->OnSubmit = '?Action=UserRegisterSave';
+          $Output .= $Form->ShowEditForm();
+        }
       } else
       if($_GET['Action'] == 'MemberOptions')
@@ -344 +355 @@
     }
 
-    $Database->select_db('is');
+    $Database->select_db($Config['Database']['Database']);
 
     //$Output .= $this->InfoBar();