Changeset 14

Timestamp:

Jun 11, 2009, 10:43:35 PM (15 years ago)

Author:

george

Message:

• Opraveno: Obnova uživatelského hesla přes email.
• Upraveno: Překládat emulátor s ladícími informacemi pro GDB.

Location:

trunk/www

Files:

• emulator.php (modified) (2 diffs)
• form_classes.php (modified) (1 diff)
• page.php (modified) (1 diff)
• server.php (modified) (3 diffs)
• user.php (modified) (2 diffs)

trunk/www/emulator.php

@@ -20 +20 @@
     global $System;
     
-    $this->Database->insert('Task', array('User' => $System->Modules['User']->User['Id'], 'Title' => $Title, 'Time' => 'NOW()', 'CommandList' => implode("\n", $Task)));
+    $this->Database->insert('Task', array('User' => $System->Modules['User']->User['Id'], 'Title' => $Title, 'Time' => 'NOW()', 'CommandList' => implode("\n", $Task)."\n"));
   }
   
@@ -60 +60 @@
       'mkdir objdir',
       'cd objdir',
-      '../configure --prefix='.$Config['BaseDir'].'emulator/'.$this->Id.'/ --enable-cli --enable-ra --with-debug-info',
+      'export CFLAGS="-march=athlon64 -m64 -O2 -g -ggdb',
+      'export CXXFLAGS="-march=athlon64 -m64 -O2 -g -ggdb',
+      '../configure --prefix='.$Config['BaseDir'].'emulator/'.$this->Id.'/ --enable-cli --enable-ra',
       'make',
       'make install',

trunk/www/form_classes.php

@@ -27 +27 @@
       //'PhoneNumber' => array('Type' => 'String', 'Caption' => 'Telefón', 'Default' => ''),
       //'ICQ' => array('Type' => 'String', 'Caption' => 'ICQ', 'Default' => ''),
+    ),
+  ),
+  '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' => ''),
     ),
   ),

trunk/www/page.php

@@ -35 +35 @@
       if($this->System->Modules['User']->User['Role'] == USER_ROLE_ADMINISTRATOR) 
       {
-        $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=EmulatorList">Emulátory</a>'; 
+        $Output .= ' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=EmulatorList">Emulátory</a>'; 
       }
     }

trunk/www/server.php

@@ -34 +34 @@
     global $System;
     
-    $this->Database->insert('Task', array('User' => $System->Modules['User']->User['Id'], 'Title' => $Title, 'Time' => 'NOW()', 'CommandList' => implode("\n", $Task)));
+    $this->Database->insert('Task', array('User' => $System->Modules['User']->User['Id'], 'Title' => $Title, 'Time' => 'NOW()', 'CommandList' => implode("\n", $Task)."\n"));
   }
   
@@ -87 +87 @@
   {
     $this->AddTask('Start emulátoru', array(
-      'screen -A -m -d -S server'.$this->Id.'-realmd emulator/'.$this->Server['Database']['Emulator']['Id'].'/bin/mangos-realmd -c server/'.$this->Id.'/etc/realmd.conf"',
+      'screen -A -m -d -S server'.$this->Id.'-realmd emulator/'.$this->Server['Database']['Emulator']['Id'].'/bin/mangos-realmd -c server/'.$this->Id.'/etc/realmd.conf',
       'screen -A -m -d -S server'.$this->Id.'-worldd server/'.$this->Id.'/bin/start.sh',
     ));
@@ -178 +178 @@
       '#!/bin/sh',
       'while [ 1=1 ] ; do',
-      'gdb emulator/'.$this->Id.'/bin/mangos-realmd -x mangos.gdb --batch >>server/'.$this->Id.'/log/mangos-worldd.log 2>>server/'.$this->Id.'/log/mangos-worldd.err',
+      'gdb emulator/'.$this->Id.'/bin/mangos-worldd -x mangos.gdb --batch >>server/'.$this->Id.'/log/mangos-worldd.log 2>>server/'.$this->Id.'/log/mangos-worldd.err',
       'cd www',
       'php mangos_debug_process.php '.$this->Id.' >>server/'.$this->Id.'/log/mangos_debug.log 2>>server/'.$this->Id.'/log/mangos_debug.err',

trunk/www/user.php

@@ -103 +103 @@
           {
             $this->Database->insert('User', array('Name' => $Name, 'Login' => $Login, 'Password' => sha1($Password), 'Email' => $Email, 'RegistrationTime' => 'NOW()', 'Locked' => 1, 'Role' => 2));
+            $UserId = $Database->insert_id;
             
             $Subject = FromUTF8('Registrace nového účtu', 'iso2');
@@ -236 +237 @@
     global $Config;
 
-    $DbResult = $this->Database->select('User', 'Name, Id, Email, Password', '`Login`="'.$Login.'" AND `Email`="'.$Email.'"');
-    if($DbResult->num_rows > 0)
-    {
-      $Row = $DbResult->fetch_array();
+    $DbResult = $this->Database->select('User', 'Login, Name, Id, Email, Password', '`Login`="'.$Login.'" AND `Email`="'.$Email.'"');
+    if($DbResult->num_rows > 0)
+    {
+      $Row = $DbResult->fetch_assoc();
       $NewPassword = substr(sha1(strtoupper($Row['Login'])), 0, 7);