Completed
Push — development ( bccf1d...9d6ac7 )
by Nils
08:40
created
includes/language/dutch.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14 14
  */
15 15
 global $LANG;
16
-$LANG = array (
16
+$LANG = array(
17 17
     'human_resources' => 'Human Resources',
18 18
     'user_ga_code' => 'E-mail Google Authenticatie naar gebruiker',
19 19
     'send_ga_code' => 'Stel Google Authenticatie in en stuur e-mail',
Please login to merge, or discard this patch.
includes/language/polish.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14 14
  */
15 15
 global $LANG;
16
-$LANG = array (
16
+$LANG = array(
17 17
     'human_resources' => 'Human Resources',
18 18
     'user_ga_code' => 'Wyślij do użytkownika Google Authenticator za pośrednictwem e-mail ',
19 19
     'send_ga_code' => 'Google Authenticator dla użytkownika',
Please login to merge, or discard this patch.
includes/language/chinese.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14 14
  */
15 15
 global $LANG;
16
-$LANG = array (
16
+$LANG = array(
17 17
     'human_resources' => 'Human Resources',
18 18
     'user_ga_code' => '发送 Google 身份验证器至用户,通过电子邮件',
19 19
     'send_ga_code' => 'Google 身份验证器,为用户',
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +27 added lines, -30 removed lines patch added patch discarded remove patch
@@ -91,34 +91,34 @@  discard block
 block discarded – undo
91 91
 require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
92 92
 
93 93
 // Prepare POST variables
94
-$post_language =        filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
95
-$post_sig_response =    filter_input(INPUT_POST, 'sig_response', FILTER_SANITIZE_STRING);
96
-$post_duo_login =       filter_input(INPUT_POST, 'duo_login', FILTER_SANITIZE_STRING);
97
-$post_duo_data =        filter_input(INPUT_POST, 'duo_data', FILTER_SANITIZE_STRING);
98
-$post_login =           filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING);
99
-$post_pw =              filter_input(INPUT_POST, 'pw', FILTER_SANITIZE_STRING);
94
+$post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
95
+$post_sig_response = filter_input(INPUT_POST, 'sig_response', FILTER_SANITIZE_STRING);
96
+$post_duo_login = filter_input(INPUT_POST, 'duo_login', FILTER_SANITIZE_STRING);
97
+$post_duo_data = filter_input(INPUT_POST, 'duo_data', FILTER_SANITIZE_STRING);
98
+$post_login = filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING);
99
+$post_pw = filter_input(INPUT_POST, 'pw', FILTER_SANITIZE_STRING);
100 100
 
101 101
 // Prepare superGlobal variables
102
-$session_user_language =        $superGlobal->get("user_language", "SESSION");
103
-$session_user_id =              $superGlobal->get("user_id", "SESSION");
104
-$session_user_flag =            $superGlobal->get("user_language_flag", "SESSION");
105
-$session_user_admin =           $superGlobal->get("user_admin", "SESSION");
102
+$session_user_language = $superGlobal->get("user_language", "SESSION");
103
+$session_user_id = $superGlobal->get("user_id", "SESSION");
104
+$session_user_flag = $superGlobal->get("user_language_flag", "SESSION");
105
+$session_user_admin = $superGlobal->get("user_admin", "SESSION");
106 106
 $session_user_human_resources = $superGlobal->get("user_can_manage_all_users", "SESSION");
107
-$session_user_avatar_thumb =    $superGlobal->get("user_avatar_thumb", "SESSION");
108
-$session_name =                 $superGlobal->get("name", "SESSION");
109
-$session_lastname =             $superGlobal->get("lastname", "SESSION");
110
-$session_user_manager =         $superGlobal->get("user_manager", "SESSION");
111
-$session_user_read_only =       $superGlobal->get("user_read_only", "SESSION");
112
-$session_is_admin =             $superGlobal->get("is_admin", "SESSION");
113
-$session_login =                $superGlobal->get("login", "SESSION");
114
-$session_validite_pw =          $superGlobal->get("validite_pw", "SESSION");
115
-$session_nb_folders =           $superGlobal->get("nb_folders", "SESSION");
116
-$session_nb_roles =             $superGlobal->get("nb_roles", "SESSION");
117
-$session_autoriser =            $superGlobal->get("autoriser", "SESSION");
118
-$session_hide_maintenance =     $superGlobal->get("hide_maintenance", "SESSION");
119
-$session_initial_url =          $superGlobal->get("initial_url", "SESSION");
120
-$server_request_uri =           $superGlobal->get("REQUEST_URI", "SERVER");
121
-$session_nb_users_online =      $superGlobal->get("nb_users_online", "SESSION");
107
+$session_user_avatar_thumb = $superGlobal->get("user_avatar_thumb", "SESSION");
108
+$session_name = $superGlobal->get("name", "SESSION");
109
+$session_lastname = $superGlobal->get("lastname", "SESSION");
110
+$session_user_manager = $superGlobal->get("user_manager", "SESSION");
111
+$session_user_read_only = $superGlobal->get("user_read_only", "SESSION");
112
+$session_is_admin = $superGlobal->get("is_admin", "SESSION");
113
+$session_login = $superGlobal->get("login", "SESSION");
114
+$session_validite_pw = $superGlobal->get("validite_pw", "SESSION");
115
+$session_nb_folders = $superGlobal->get("nb_folders", "SESSION");
116
+$session_nb_roles = $superGlobal->get("nb_roles", "SESSION");
117
+$session_autoriser = $superGlobal->get("autoriser", "SESSION");
118
+$session_hide_maintenance = $superGlobal->get("hide_maintenance", "SESSION");
119
+$session_initial_url = $superGlobal->get("initial_url", "SESSION");
120
+$server_request_uri = $superGlobal->get("REQUEST_URI", "SERVER");
121
+$session_nb_users_online = $superGlobal->get("nb_users_online", "SESSION");
122 122
 
123 123
 
124 124
 /* DEFINE WHAT LANGUAGE TO USE */
@@ -239,10 +239,7 @@  discard block
 block discarded – undo
239 239
         <div style="float:right; margin:-10px 5px 0 0; color:#FFF;">'
240 240
             .$LANG['index_welcome'].'&nbsp;<b>'.$session_name.'&nbsp;'.$session_lastname
241 241
             .'&nbsp;['.$session_login.']</b>&nbsp;-&nbsp;'
242
-            , $session_user_admin === '1' ? $LANG['god'] :
243
-                ($session_user_manager === '1' ? $LANG['gestionnaire'] :
244
-                    ($session_user_read_only === '1' ? $LANG['read_only_account'] :
245
-                        ($session_user_human_resources === '1' ? $LANG['human_resources'] :$LANG['user'])
242
+            , $session_user_admin === '1' ? $LANG['god'] : ($session_user_manager === '1' ? $LANG['gestionnaire'] : ($session_user_read_only === '1' ? $LANG['read_only_account'] : ($session_user_human_resources === '1' ? $LANG['human_resources'] : $LANG['user'])
246 243
                     )
247 244
                 ), '&nbsp;'.strtolower($LANG['index_login']).'</div>';
248 245
 
@@ -794,7 +791,7 @@  discard block
 block discarded – undo
794 791
             <a href="https://www.reddit.com/r/TeamPass/" target="_blank" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['admin_help']).'"><i class="fa fa-reddit-alien"></i></a>
795 792
             &nbsp;
796 793
             ', ($session_user_id !== null && empty($session_user_id) === false) ? '
797
-            <a href="#" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['bugs_page']).'" onclick="generateBugReport()"><i class="fa fa-bug"></i></a>' : '' ,'
794
+            <a href="#" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['bugs_page']).'" onclick="generateBugReport()"><i class="fa fa-bug"></i></a>' : '', '
798 795
         </div>
799 796
         <div style="float:left;width:32%;text-align:center;">
800 797
             ', ($session_user_id !== null && empty($session_user_id) === false) ? '<i class="fa fa-users"></i>&nbsp;'.$session_nb_users_online.'&nbsp;'.$LANG['users_online'].'&nbsp;|&nbsp;<i class="fa fa-hourglass-end"></i>&nbsp;'.$LANG['index_expiration_in'].'&nbsp;<div style="display:inline;" id="countdown"></div>' : '', '
Please login to merge, or discard this patch.