Completed
Push — development ( 6a24df...5afdf5 )
by Nils
07:52
created
api/functions.php 1 patch
Braces   +23 added lines, -13 removed lines patch added patch discarded remove patch
@@ -352,8 +352,7 @@  discard block
 block discarded – undo
352 352
 
353 353
                     $x++;
354 354
                 }
355
-            }
356
-            else if ($GLOBALS['request'][1] == "userpw") {
355
+            } else if ($GLOBALS['request'][1] == "userpw") {
357 356
                 /*
358 357
                 * READ USER ITEMS
359 358
                 */
@@ -437,8 +436,7 @@  discard block
 block discarded – undo
437 436
 
438 437
                     $x++;
439 438
                 }
440
-            }
441
-            else if ($GLOBALS['request'][1] == "userfolders") {
439
+            } else if ($GLOBALS['request'][1] == "userfolders") {
442 440
                 /*
443 441
                 * READ USER FOLDERS
444 442
                 * Sends back a list of folders
@@ -481,8 +479,7 @@  discard block
 block discarded – undo
481 479
                         }
482 480
                     }
483 481
                 }
484
-            }
485
-            elseif ($GLOBALS['request'][1] == "items") {
482
+            } elseif ($GLOBALS['request'][1] == "items") {
486 483
                 /*
487 484
                 * READ ITEMS asked
488 485
                 */
@@ -829,8 +826,11 @@  discard block
 block discarded – undo
829 826
                                 "SELECT `id` FROM ".prefix_table("roles_title")." WHERE title = %s",
830 827
                                 $role
831 828
                             );
832
-                            if (empty($rolesList)) $rolesList = $tmp['id'];
833
-                            else $rolesList .= ";".$tmp['id'];
829
+                            if (empty($rolesList)) {
830
+                                $rolesList = $tmp['id'];
831
+                            } else {
832
+                                $rolesList .= ";".$tmp['id'];
833
+                            }
834 834
                         }
835 835
 
836 836
                         // Add user in DB
@@ -1925,11 +1925,21 @@  discard block
 block discarded – undo
1925 1925
 
1926 1926
                 // init
1927 1927
                 $pwgen->setLength($params[0]);
1928
-                if ($params[1] === "1") $pwgen->setSecure(true);
1929
-                if ($params[2] === "1") $pwgen->setNumerals(true);
1930
-                if ($params[3] === "1") $pwgen->setCapitalize(true);
1931
-                if ($params[4] === "1") $pwgen->setAmbiguous(true);
1932
-                if ($params[5] === "1" && $params[6] === "1") $pwgen->setSymbols(true);
1928
+                if ($params[1] === "1") {
1929
+                    $pwgen->setSecure(true);
1930
+                }
1931
+                if ($params[2] === "1") {
1932
+                    $pwgen->setNumerals(true);
1933
+                }
1934
+                if ($params[3] === "1") {
1935
+                    $pwgen->setCapitalize(true);
1936
+                }
1937
+                if ($params[4] === "1") {
1938
+                    $pwgen->setAmbiguous(true);
1939
+                }
1940
+                if ($params[5] === "1" && $params[6] === "1") {
1941
+                    $pwgen->setSymbols(true);
1942
+                }
1933 1943
 
1934 1944
                 // generate and send back (generate in base64 if symbols are asked)
1935 1945
                 if ($params[6] === "1") {
Please login to merge, or discard this patch.
includes/language/ukrainian_kb.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //TURKISH
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/arabic_admin_help.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //ARABIC
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/portuguese_kb.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //PORTUGUESE
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/russian_admin_help.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //RUSSIAN
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/catalan_kb.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //CATALAN
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/portuguese_admin_help.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //PORTUGUESE
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/portuguese_br_admin_help.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //PORTUGUESE
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/german_kb.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //GERMAN
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.