Completed
Push — development ( 60bfa9...a230e9 )
by Nils
07:59
created
admin.settings.load.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -205,9 +205,9 @@  discard block
 block discarded – undo
205 205
                     if (val[4] !== "") {
206 206
                         newList += '<span id="encryt_data_'+val[1]+'" style="margin-left:4px; cursor:pointer;">';
207 207
                         if (val[4] === "1") {
208
-                            newList += '<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data'];?>" onclick="changeEncrypMode('+val[1]+', 1)"></i>';
208
+                            newList += '<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data']; ?>" onclick="changeEncrypMode('+val[1]+', 1)"></i>';
209 209
                         } else if (val[4] === "0") {
210
-                            newList += '<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data'];?>" onclick="changeEncrypMode('+val[1]+', 0)"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>';
210
+                            newList += '<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data']; ?>" onclick="changeEncrypMode('+val[1]+', 0)"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>';
211 211
                         }
212 212
                         newList += '</span>'
213 213
                     }
@@ -215,9 +215,9 @@  discard block
 block discarded – undo
215 215
                     if (val[6] !== "") {
216 216
                         newList += '<span style="margin-left:4px;">';
217 217
                         if (val[6] === "text") {
218
-                            newList += '<i class="fa fa-paragraph tip" title="<?php echo $LANG['data_is_text'];?>"></i>';
218
+                            newList += '<i class="fa fa-paragraph tip" title="<?php echo $LANG['data_is_text']; ?>"></i>';
219 219
                         } else if (val[6] === "masked") {
220
-                            newList += '<i class="fa fa-eye-slash tip" title="<?php echo $LANG['data_is_masked'];?>"></i>';
220
+                            newList += '<i class="fa fa-eye-slash tip" title="<?php echo $LANG['data_is_masked']; ?>"></i>';
221 221
                         }
222 222
                         newList += '</span>'
223 223
                     }
@@ -1028,8 +1028,8 @@  discard block
 block discarded – undo
1028 1028
         function(data) {
1029 1029
             data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
1030 1030
 
1031
-            var html_admin_by = '<option value="">-- <?php echo addslashes($LANG['select']);?> --</option>',
1032
-                html_roles = '<option value="">-- <?php echo addslashes($LANG['select']);?> --</option>',
1031
+            var html_admin_by = '<option value="">-- <?php echo addslashes($LANG['select']); ?> --</option>',
1032
+                html_roles = '<option value="">-- <?php echo addslashes($LANG['select']); ?> --</option>',
1033 1033
                 selected_admin_by = 0,
1034 1034
                 selected_role = 0;
1035 1035
 
@@ -1040,7 +1040,7 @@  discard block
 block discarded – undo
1040 1040
                 if (data[i].selected_role === 1) {
1041 1041
                     selected_role = data[i].id;
1042 1042
                 }
1043
-                html_admin_by += '<option value="'+data[i].id+'"><?php echo addslashes($LANG['managers_of']." ");?>'+data[i].title+'</option>';
1043
+                html_admin_by += '<option value="'+data[i].id+'"><?php echo addslashes($LANG['managers_of']." "); ?>'+data[i].title+'</option>';
1044 1044
                 html_roles += '<option value="'+data[i].id+'">'+data[i].title+'</option>';
1045 1045
             }
1046 1046
             $("#ldap_new_user_is_administrated_by").append(html_admin_by);
Please login to merge, or discard this patch.
includes/language/english.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
     'newly_created_user_role' => 'Newly created user has role',
18 18
     'human_resources' => 'Human Resources',
19 19
     'user_ga_code' => 'Email Google Authentication to user',
Please login to merge, or discard this patch.
backups/script.backup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,15 +12,15 @@
 block discarded – undo
12 12
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13 13
  */
14 14
 
15
-include dirname(__FILE__) .'/../includes/config/settings.php';
16
-require_once dirname(__FILE__) .'/../includes/config/tp.config.php';
15
+include dirname(__FILE__).'/../includes/config/settings.php';
16
+require_once dirname(__FILE__).'/../includes/config/tp.config.php';
17 17
 header("Content-type: text/html; charset=utf-8");
18 18
 
19 19
 $_SESSION['CPM'] = 1;
20 20
 
21 21
 // connect to DB
22
-require_once $SETTINGS['cpassman_dir'] .'../sources/SplClassLoader.php';
23
-require_once $SETTINGS['cpassman_dir'] .'../includes/libraries/Database/Meekrodb/db.class.php';
22
+require_once $SETTINGS['cpassman_dir'].'../sources/SplClassLoader.php';
23
+require_once $SETTINGS['cpassman_dir'].'../includes/libraries/Database/Meekrodb/db.class.php';
24 24
 
25 25
 // Load libraries
26 26
 require_once $SETTINGS['cpassman_dir'].'../sources/main.functions.php';
Please login to merge, or discard this patch.
sources/main.functions.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -18,15 +18,15 @@  discard block
 block discarded – undo
18 18
 
19 19
 // Load config if $SETTINGS not defined
20 20
 if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir'])) {
21
-  if (file_exists('../includes/config/tp.config.php')) {
22
-      require_once '../includes/config/tp.config.php';
23
-  } elseif (file_exists('./includes/config/tp.config.php')) {
24
-      require_once './includes/config/tp.config.php';
25
-  } elseif (file_exists('../../includes/config/tp.config.php')) {
26
-      require_once '../../includes/config/tp.config.php';
27
-  } else {
28
-      throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
29
-  }
21
+    if (file_exists('../includes/config/tp.config.php')) {
22
+        require_once '../includes/config/tp.config.php';
23
+    } elseif (file_exists('./includes/config/tp.config.php')) {
24
+        require_once './includes/config/tp.config.php';
25
+    } elseif (file_exists('../../includes/config/tp.config.php')) {
26
+        require_once '../../includes/config/tp.config.php';
27
+    } else {
28
+        throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
29
+    }
30 30
 }
31 31
 
32 32
 // load phpCrypt
@@ -1430,7 +1430,7 @@  discard block
 block discarded – undo
1430 1430
     // Can we use PHP7 random_int function?
1431 1431
     if (version_compare(phpversion(), '7.0', '>=')) {
1432 1432
         require_once $SETTINGS['cpassman_dir'].'/includes/libraries/PasswordGenerator/RandomGenerator/Php7RandomGenerator.php';
1433
-         $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator());
1433
+            $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator());
1434 1434
     }
1435 1435
 
1436 1436
     // init
Please login to merge, or discard this patch.