Changeset 693 for trunk/Modules/User

Timestamp:

Sep 14, 2014, 8:26:20 PM (10 years ago)

Author:

chronos

Message:

• Modified: PhoneNumber converted from User table columnt to generic Contacts table.
• Fixed: Removed ICQ and PhoneNumber fields from user registration.

Location:

trunk/Modules/User

Files:

• User.php (modified) (6 diffs)
• UserList.php (modified) (3 diffs)
• UserPage.php (modified) (10 diffs)

trunk/Modules/User/User.php

@@ -127 +127 @@
   }
 
-  function Register($Login, $Password, $Password2, $Email, $Name, $PhoneNumber, $ICQ)
+  function Register($Login, $Password, $Password2, $Email, $Name)
   {
     if(($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = DATA_MISSING;
@@ -151 +151 @@
               'Password' => $PasswordHash->Hash($Password, $Salt), 'Salt' => $Salt,
               'Email' => $Email, 'RegistrationTime' => 'NOW()',
-              'Locked' => 1, 'PhoneNumber' => $PhoneNumber, 'ICQ' => $ICQ));
+              'Locked' => 1));
             $UserId = $this->Database->insert_id;
             $this->Database->insert('PermissionUserAssignment', array('User' => $UserId,
@@ -460 +460 @@
   `RegistrationTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `Locked` tinyint(1) NOT NULL DEFAULT '0',
-  `ICQ` int(11) NOT NULL DEFAULT '0',
-  `PhoneNumber` varchar(32) NOT NULL DEFAULT '',
   `InitPassword` varchar(255) NOT NULL,
   PRIMARY KEY (`Id`),
@@ -571 +569 @@
         'Name' => array('Type' => 'String', 'Caption' => 'Zobrazované jméno', 'Default' => ''),
         'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
-        'PhoneNumber' => array('Type' => 'String', 'Caption' => 'Telefón', 'Default' => ''),
       ),
     ));
@@ -584 +581 @@
         'Name' => array('Type' => 'String', 'Caption' => 'Zobrazované jméno', 'Default' => ''),
         'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
-        'PhoneNumber' => array('Type' => 'String', 'Caption' => 'Telefón', 'Default' => ''),
-        'ICQ' => array('Type' => 'String', 'Caption' => 'ICQ', 'Default' => ''),
       ),
     ));
@@ -619 +614 @@
         'RegistrationTime' => array('Type' => 'DateTime', 'Caption' => 'Čas registrace', 'Default' => ''),
         'Locked' => array('Type' => 'Boolean', 'Caption' => 'Uzamčen', 'Default' => ''),
-        'PhoneNumber' => array('Type' => 'String', 'Caption' => 'Telefon', 'Default' => ''),
         'UserRel' => array('Type' => 'TUserCustomerRelListUser', 'Caption' => 'Přístup k zákazníkům', 'Default' => ''),
         'Permission' => array('Type' => 'TPermissionUserAssignmentListUser', 'Caption' => 'Oprávnění', 'Default' => ''),

trunk/Modules/User/UserList.php

@@ -19 +19 @@
       array('Name' => 'Name', 'Title' => 'Jméno'),
       array('Name' => 'Email', 'Title' => 'E-mail'),
-      array('Name' => 'PhoneNumber', 'Title' => 'Telefón'),
       array('Name' => '', 'Title' => 'Počítače'),
     );
@@ -30 +29 @@
     while($User = $DbResult->fetch_assoc())
     {
-      if($User['PhoneNumber'] > 0) $User['PhoneNumber'] = $User['PhoneNumber'];
-        else $User['PhoneNumber'] = ' ';
-
       $Devices = array();
       $DbResult2 = $this->Database->query('SELECT `Id` FROM `Member` WHERE `Member`.`ResponsibleUser` = '.$User['Id']);
@@ -48 +44 @@
       $Output .= '<tr><td>'.$User['Name'].'</td>'.
       '<td>'.$User['Email'].'</td>'.
-      '<td>'.$User['PhoneNumber'].'</td>'.
       '<td>'.$User['Devices'].'</td></tr>';
     }

trunk/Modules/User/UserPage.php

@@ -9 +9 @@
   function Panel($Title, $Content, $Menu = array())
   {
-    if(count($Menu) > 0) 
+    if(count($Menu) > 0)
       foreach($Menu as $Item)
         $Title .= '<div class="Action">'.$Item.'</div>';
@@ -19 +19 @@
     $Output = '';
     if($this->System->User->User['Id'] != null)
-    { 
+    {
         $Actions = '';
         foreach($this->System->ModuleManager->Modules['User']->UserPanel as $Action)
@@ -32 +32 @@
       $Output .= $this->Panel('Nabídka uživatele', $Actions);
       $Output .= '</td><td>';
+      if($this->System->User->User['Id'] != null)
+        {
+          $Form = new Form($this->System->FormManager);
+          $Form->SetClass('UserOptions');
+          $Form->LoadValuesFromDatabase($this->System->User->User['Id']);
+          $Form->OnSubmit = '?Action=UserOptionsSave';
+          $Output .= $Form->ShowViewForm();
+        } else $Output .= $this->SystemMessage('Nastavení uživatele', 'Nejste přihlášen');
+
       //$Output .= $this->Panel('Přehled', $this->UserPanel());
       $Output .= '</td></tr></table></div>';
@@ -61 +70 @@
           $Form->OnSubmit = '?Action=Login';
           if(array_key_exists('StayLogged', $_POST) and ($_POST['StayLogged'] == 'on')) $StayLogged = true;
-            else $StayLogged = false;          
+            else $StayLogged = false;
           $Result = $this->System->User->Login($_POST['Username'], $_POST['Password'], $StayLogged);
           $Output .= $this->SystemMessage('Přihlášení', $Result);
@@ -77 +86 @@
           }
         } else $Output .= $this->SystemMessage('Přihlášení', 'Nezadány přihlašovací údaje');
-      } else 
+      } else
       if($Action == 'Logout')
       {
@@ -86 +95 @@
       } else
       if($Action == 'UserOptions')
-      { 
+      {
         if($this->System->User->User['Id'] != null)
         {
@@ -118 +127 @@
       if($Action == 'UserRegisterConfirm')
       {
-        $Output .= $this->SystemMessage('Potvrzení registrace', 
+        $Output .= $this->SystemMessage('Potvrzení registrace',
           $this->System->User->RegisterConfirm($_GET['User'], $_GET['H']));
       } else
@@ -138 +147 @@
         {
           $Output .= $Form->ShowEditForm();
-        }        
+        }
       } else
       if($Action == 'PasswordRecoveryConfirm')
@@ -149 +158 @@
         $Form->SetClass('UserRegister');
         $Form->LoadValuesFromForm();
-        $Result = $this->System->User->Register($Form->Values['Login'], $Form->Values['Password'], 
-          $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name'], $Form->Values['PhoneNumber'], $Form->Values['ICQ']);
+        $Result = $this->System->User->Register($Form->Values['Login'], $Form->Values['Password'],
+          $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name']);
         $Output .= $this->SystemMessage('Registrace nového účtu', $Result);
-        if($Result <> USER_REGISTRATED) 
+        if($Result <> USER_REGISTRATED)
         {
           $Form->OnSubmit = '?Action=UserRegisterSave';
           $Output .= $Form->ShowEditForm();
         }
-      } else     
+      } else
       if($Action == 'UserMenu')
       {
@@ -163 +172 @@
       } else $Output = $this->ShowMain();
     } else $Output = $this->ShowMain();
-    return($Output);            
+    return($Output);
         }
-        
+
         function ShowMain()
         {