Completed
Push — development ( 362b6c...477849 )
by Nils
08:04
created
includes/language/german_admin_help.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 //GERMAN
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4
-	$TeamPass_url = '';
4
+    $TeamPass_url = '';
5 5
 }else{
6
-	$TeamPass_url = $_SESSION['settings']['cpassman_url'];
6
+    $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
9 9
 
Please login to merge, or discard this patch.
Spacing   +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.
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.
includes/language/german.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
     'feature_support_canal' => 'For Support and Help, please use ',
18 18
     'user_ga_code' => 'Den Google Authenticator per E-Mail an Benutzer senden',
19 19
     'send_ga_code' => 'Google Authenticator fĂĽr Benutzer',
Please login to merge, or discard this patch.
includes/language/arabic_admin_help.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 //ARABIC
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4
-	$TeamPass_url = '';
4
+    $TeamPass_url = '';
5 5
 }else{
6
-	$TeamPass_url = $_SESSION['settings']['cpassman_url'];
6
+    $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
9 9
 
Please login to merge, or discard this patch.
Spacing   +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.
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/swedish.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
     'feature_support_canal' => 'For Support and Help, please use ',
18 18
     'user_ga_code' => 'Email Google Authentication to user',
19 19
     'send_ga_code' => 'Set and email Google Authentication code',
Please login to merge, or discard this patch.
includes/language/czech.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
     'feature_support_canal' => 'For Support and Help, please use ',
18 18
     'user_ga_code' => 'Zaslat uĹľivateli Google Authenticator emailem',
19 19
     'send_ga_code' => 'Google Authenticator pro uĹľivatele',
Please login to merge, or discard this patch.
includes/language/chinese_kb.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 //CHINESE
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4
-	$TeamPass_url = '';
4
+    $TeamPass_url = '';
5 5
 }else{
6
-	$TeamPass_url = $_SESSION['settings']['cpassman_url'];
6
+    $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
9 9
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //CHINESE
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.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //CHINESE
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 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 //PORTUGUESE
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4
-	$TeamPass_url = '';
4
+    $TeamPass_url = '';
5 5
 }else{
6
-	$TeamPass_url = $_SESSION['settings']['cpassman_url'];
6
+    $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
9 9
 
Please login to merge, or discard this patch.
Spacing   +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.
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/libraries/misc/random_compat/random_int.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
123 123
          */
124 124
         while ($range > 0) {
125 125
             if ($bits % 8 === 0) {
126
-               ++$bytes;
126
+                ++$bytes;
127 127
             }
128 128
             ++$bits;
129 129
             $range >>= 1;
Please login to merge, or discard this patch.
includes/libraries/PasswordLib/Key/Derivation/PBKDF/PBKDF2.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         for ($i = 1; $i <= $len; $i++) {
50 50
             $tmp = hash_hmac(
51 51
                 $this->hash,
52
-                $salt . pack('N', $i),
52
+                $salt.pack('N', $i),
53 53
                 $password,
54 54
                 true
55 55
             );
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
      * @return string The signature for this instance
73 73
      */
74 74
     public function getSignature() {
75
-        return 'pbkdf2-' . $this->hash;
75
+        return 'pbkdf2-'.$this->hash;
76 76
     }
77 77
 
78 78
 }
Please login to merge, or discard this patch.