Changeset 202 for trunk

Timestamp:

Apr 30, 2009, 11:30:37 PM (16 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ářů.

Location:

trunk

Files:

• Readme.txt (modified) (1 diff)
• aktuality/index.php (modified) (1 diff)
• config.sample.php (modified) (1 diff)
• form_classes.php (modified) (3 diffs)
• forms.php (modified) (7 diffs)
• index.php (modified) (8 diffs)
• page.php (modified) (1 diff)
• style.css (modified) (1 diff)

trunk/Readme.txt

@@ -26 +26 @@
   finance/doklady - vlastníka nastavit na apache
   aktuality/uploads - vlastníka nastavit na apache
+
   
 5) Generování PDF dokumentů

trunk/aktuality/index.php

@@ -179 +179 @@
             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>';
+            $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&amp;id='.$Row['Id'].'">'.$Row['Title'].'</a> ('.HumanDate($Row['Date']).', '.$Author.')</strong>';
             if($this->System->Modules['User']->User['Id'] == $Row['User'])
             {

trunk/config.sample.php

@@ -14 +14 @@
   'Web' => array
   (
+    'FormatHTML' => false,
     'Charset' => 'utf-8',
     'Host' => 'localhost',

trunk/form_classes.php

@@ -51 +51 @@
     'Title' => 'Základní nastavení',
     'Table' => 'User',
+    'SubmitText' => 'Uložit',
     'Items' => array(
       'Login' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => ''),
@@ -62 +63 @@
   'UserRegister' => array(
     'Title' => 'Registrace uživatele',
+    'SubmitText' => 'Registrovat',
     'Table' => 'User',
     'Items' => array(
@@ -90 +92 @@
   'PasswordRecovery' => array(
     'Title' => 'Obnova hesla',
+    'SubmitText' => 'Obnovit',
     'Table' => '',
     'Items' => array(
       'Name' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => ''),
       'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
+    ),
+  ),
+  'UserLogin' => array(
+    'Title' => 'Přihlášení uživatele',
+    'SubmitText' => 'Přihlásit',
+    'Table' => '',
+    'Items' => array(
+      'Username' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => ''),
+      'Password' => array('Type' => 'Password', 'Caption' => 'Heslo', 'Default' => ''),
     ),
   ),

trunk/forms.php

@@ -9 +9 @@
   var $Values = array();
   var $OnSubmit = '';
-
+  
   function Form($ClassName)
   {  
@@ -19 +19 @@
   function ShowEditForm()
   {
-    $Output = '<form action="'.$this->OnSubmit.'" method="post"><center>'.$this->ShowEditBlock().'<input type="submit" value="Uložit"></center></form>';
+    if(!array_key_exists('SubmitText', $this->Definition)) $this->Definition['SubmitText'] = 'Uložit';
+    $Output = '<form class="Form" action="'.$this->OnSubmit.'" method="post">'.$this->ShowEditBlock().'<div><input type="submit" value="'.$this->Definition['SubmitText'].'" /></div></form>';
     return($Output);
   }
@@ -39 +40 @@
         case 'Boolean':
           if($this->Values[$Index] == 0) $Checked = ''; else $Checked = ' CHECKED';
-          $Edit = '<input type="checkbox" name="'.$Context.$Index.'"'.$Checked.'>';
+          $Edit = '<input type="checkbox" name="'.$Context.$Index.'"'.$Checked.' />';
           break;
         case 'String':
-          $Edit = '<input type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'">';
-          break;
-        case 'Password':
-          $Edit = '<input type="password" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'">';
+          $Edit = '<input type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
+          break;
+        case 'Password':
+          $Edit = '<input type="password" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
           break;
         case 'Integer':
-          $Edit = '<input type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'">';
+          $Edit = '<input type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
           break;
         case 'Float':
-          $Edit = '<input type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'">';
+          $Edit = '<input type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
           break;
         case 'Time':
           if($this->Values[$Index] == 'Now') $this->Values[$Index] = date('j.n.Y');
-          $Edit = '<input type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'">';
+          $Edit = '<input type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
           break;
         case 'Array':
@@ -69 +70 @@
             "scr.parentNode.insertBefore(newcontent, scr); }".
             '</script>';
-            $Edit .= '<form><input type="button" onclick="AddItem();" value="Přidat položku"></form>';
+            $Edit .= '<form><input type="button" onclick="AddItem();" value="Přidat položku" /></form>';
           break;
         default:
@@ -101 +102 @@
       array_push($Table['Rows'], array($Item['Caption'].':', $Edit));
     }
-    $Output = '<fieldset style="width: 500px;"><legend>'.$this->Definition['Title'].'</legend>'.Table($Table).
+    $Output = '<fieldset><legend>'.$this->Definition['Title'].'</legend>'.Table($Table).
     '</fieldset>';
     return($Output); 
@@ -166 +167 @@
     foreach($this->Definition['Items'] as $Index => $Item)
     {
+      if(array_key_exists($Context.$Index, $_POST))
       switch($Item['Type'])
       {
@@ -227 +229 @@
 {
   $Result = '<table class="BasicTable">';
-  $Result .= '<tr>';
   if(array_key_exists('Header', $Table))
   {
+    $Result .= '<tr>';
     foreach($Table['Header'] as $Item)
       $Result .= '<th>'.$Item.'</th>';

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();

trunk/page.php

@@ -172 +172 @@
   function GetOutput()
   { 
+    global $Config;
+    
     $Output = $this->Show();
     $Output = $this->ShowHeader($this->FullTitle, $this->ShortTitle).$Output;
     $Output .= $this->ShowFooter();
-    //echo($this->FormatOutput($Output));
-    echo($Output);
+    if($Config['Web']['FormatHTML'] == true) echo($this->FormatOutput($Output));
+    else echo($Output);
   }
 

trunk/style.css

@@ -179 +179 @@
 }
 
+.Centred
+{
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.Form
+{
+  width: 500px;
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;
+}
+
 .BasicTable
 {
   width: 100%;
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;
 }