Changeset 843 for trunk/Modules/User

Timestamp:

Jan 14, 2016, 10:25:47 PM (9 years ago)

Author:

chronos

Message:

• Added: Support for translatable URLs. Now each language can have URL in its language.

This requires to all links inside web to use System->Link function which is responsible for translation.
All links need to be written in english so they can be translated to other language.

Location:

trunk/Modules/User

Files:

• Profile.php (modified) (2 diffs)
• Registration.php (modified) (1 diff)
• User.php (modified) (5 diffs)
• UserList.php (modified) (1 diff)

trunk/Modules/User/Profile.php

@@ -159 +159 @@
         T('Level:').' <strong>'.$XP['Level'].'</strong> '.T('experience:').' '.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'<br/>';
       if($UserLine['TeamName'] != '')
-        $Output .= T('Member of team:').' <a href="team/?action=team&amp;id='.$UserLine['Team'].'"><strong>'.$UserLine['TeamName'].'</strong></a><br />';
+        $Output .= T('Member of team:').' <a href="'.$this->System->Link('/team/?action=team&amp;id='.$UserLine['Team']).'"><strong>'.$UserLine['TeamName'].'</strong></a><br />';
 
       // User tags
@@ -222 +222 @@
           'Prohlížeč: <strong>'.$UserLine['UserAgent'].'</strong><br />'.
           'Email: <strong>'.$UserLine['Email'].'</strong><br />';
-      $Output .= '<br/><form action="user.php" method="post"><div>'.
+      $Output .= '<br/><form action="'.$this->System->Link('/user/').'" method="post"><div>'.
         'Napsat E-mail:'.
         '<input type="text" name="email" value="'.$UserLine['Email'].'" /><br/>'.

trunk/Modules/User/Registration.php

@@ -19 +19 @@
     <fieldset><legend>'.T('New user registration').'</legend>
     <table>
-    <tr><td colspan="2">'.T('Please read carefully <a href="info.php">translation guidelines</a> and follow them. Translate with diacritics!').'<br/><br/></td></tr>
+    <tr><td colspan="2">'.T('Please read carefully <a href="'.$this->System->Link('/info/').'">translation guidelines</a> and follow them. Translate with diacritics!').'<br/><br/></td></tr>
     <tr>
     <th class="Left">'.T('Are you human?').'</th>';

trunk/Modules/User/User.php

@@ -22 +22 @@
   {
     $this->System->User = new User($this->System);
-    $this->System->RegisterPage('userlist.php', 'PageUserList');
-    $this->System->RegisterPage('Options.php', 'PageUserOptions');
-    $this->System->RegisterPage('registrace.php', 'PageUserRegistration');
-    $this->System->RegisterPage('user.php', 'PageUserProfile');
+    $this->System->RegisterPage('users', 'PageUserList');
+    $this->System->RegisterPage('options', 'PageUserOptions');
+    $this->System->RegisterPage('registration', 'PageUserRegistration');
+    $this->System->RegisterPage('user', 'PageUserProfile');
     $this->System->RegisterPage('login', 'PageUserLogin');
     $this->System->RegisterMenuItem(array(
       'Title' => T('Translators'),
       'Hint' => 'Seznam registrovaných uživatelů',
-      'Link' => $this->System->Link('/userlist.php'),
+      'Link' => $this->System->Link('/users/'),
       'Permission' => LICENCE_ANONYMOUS,
       'Icon' => '',
@@ -36 +36 @@
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('user',
-      T('Translators'), array('Name'), '`User`', $this->System->Link('/userlist.php?search='));
+      T('Translators'), array('Name'), '`User`', $this->System->Link('/users/?search='));
   }
 
@@ -43 +43 @@
     $Output = T('Online translators').':<br />';
     $DbResult = $this->System->Database->query('SELECT * FROM ('.
-'SELECT `User`.`Name`, `User`.`ID` FROM `UserOnline` '.
-        'JOIN `User` ON `User`.`ID` = `UserOnline`.`User` '.
-        'WHERE (`ActivityTime` >= NOW() - 300) '.
-        'ORDER BY `ActivityTime` DESC ) AS `T` GROUP BY `Name`');
+      'SELECT `User`.`Name`, `User`.`ID` FROM `UserOnline` '.
+      'JOIN `User` ON `User`.`ID` = `UserOnline`.`User` '.
+      'WHERE (`ActivityTime` >= NOW() - 300) '.
+      'ORDER BY `ActivityTime` DESC ) AS `T` GROUP BY `Name`');
     while($DbUser = $DbResult->fetch_assoc())
     {
-      $Name = '<a href="'.$this->System->Link('/user.php?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
+      $Name = '<a href="'.$this->System->Link('/user/?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
       $Output .= $Name.'<br />';
     }
@@ -124 +124 @@
       // Prepare cookies for permanent login
       $StayLoggedSalt = $this->GetPasswordSalt();
-      $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array(
+      $this->Database->update('UserOnline', '`SessionId`="'.$SID.'"', array(
         'User' => $User['ID'], 'StayLogged' => $StayLogged, 'StayLoggedHash' => $StayLoggedSalt));
       if($StayLogged)
       {
-        setcookie('LoginUserId', $User['ID'], time()+365*24*60*60);
-        setcookie('LoginHash', sha1($User['ID'].$StayLoggedSalt), time()+365*24*60*60);
+        setcookie('LoginUserId', $User['ID'], time() + 365 * 24 * 60 * 60);
+        setcookie('LoginHash', sha1($User['ID'].$StayLoggedSalt), time() + 365 * 24 * 60 * 60);
       } else {
         setcookie('LoginUserId', '', time() - 3600);
@@ -150 +150 @@
     if($this->Role != LICENCE_ANONYMOUS)
     {
-      $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => null));
+      $this->Database->update('UserOnline', '`SessionId`="'.$SID.'"', array('User' => null));
       $this->Database->query('UPDATE `UserTrace` SET '.
         '`LastLogout` = NOW() WHERE `User` = '.$this->Id);

trunk/Modules/User/UserList.php

@@ -61 +61 @@
     {
       $XP = GetLevelMinMax($Line['XP']);
-      $Output .= '<tr><td><a href="user.php?user='.$Line['ID'].'">'.$Line['Name'].'</a></td>'.
-        '<td style="text-align: center;"><a href="TranslationList.php?user='.$Line['ID'].'&amp;group=0&amp;state=2" title="Zobrazit Všechny jeho přeložené texty">'.$Line['TranslatedCount'].'</a></td>'.
+      $Output .= '<tr><td><a href="'.$this->System->Link('/user/?user='.$Line['ID']).'">'.$Line['Name'].'</a></td>'.
+        '<td style="text-align: center;"><a href="'.$this->System->Link('/TranslationList.php?user='.$Line['ID'].'&amp;group=0&amp;state=2').'" title="Zobrazit Všechny jeho přeložené texty">'.$Line['TranslatedCount'].'</a></td>'.
         '<td>'.$XP['Level'].'</td>'.
         '<td>'.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'</td>'.