nilsteampassnet / TeamPass

install/upgrade_ajax.php

Braces +7 added lines, -4 removed lines

@@ -100,9 +100,12 @@ 
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 //define pbkdf2 iteration count
 @define('ITCOUNT', '2072');
@@ -852,7 +855,7 @@ 
                         }
                         if(($r+1) == $row_count || ($r % 400) == 399){
                             $contents .= ");\n\n";
-                        }else{
+                        } else{
                             $contents .= "),\n";
                         }
                         $r++;

install/js/crypt/aes.class.php

Braces +35 added lines, -11 removed lines

@@ -19,7 +19,9 @@ 
     $Nr = count($w)/$Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
     $state = array();  // initialise 4xNb byte-array 'state' with input [é3.4]
-    for ($i=0; $i<4*$Nb; $i++) $state[$i%4][floor($i/4)] = $input[$i];
+    for ($i=0; $i<4*$Nb; $i++) {
+        $state[$i%4][floor($i/4)] = $input[$i];
+    }
 
     $state = self::addRoundKey($state, $w, 0, $Nb);
 
@@ -35,14 +37,18 @@ 
     $state = self::addRoundKey($state, $w, $Nr, $Nb);
 
     $output = array(4*$Nb);  // convert state to 1-d array before returning [é3.4]
-    for ($i=0; $i<4*$Nb; $i++) $output[$i] = $state[$i%4][floor($i/4)];
+    for ($i=0; $i<4*$Nb; $i++) {
+        $output[$i] = $state[$i%4][floor($i/4)];
+    }
 
     return $output;
   }
 
   private static function addRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [é5.1.4]
     for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+      for ($c=0; $c<$Nb; $c++) {
+          $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+      }
     }
 
     return $state;
@@ -50,7 +56,9 @@ 
 
   private static function subBytes($s, $Nb) {    // apply SBox to state S [é5.1.1]
     for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
+      for ($c=0; $c<$Nb; $c++) {
+          $s[$r][$c] = self::$sBox[$s[$r][$c]];
+      }
     }
 
     return $s;
@@ -59,8 +67,14 @@ 
   private static function shiftRows($s, $Nb) {    // shift row r of state S left by r bytes [é5.1.2]
     $t = array(4);
     for ($r=1; $r<4; $r++) {
-      for ($c=0; $c<4; $c++) $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
-      for ($c=0; $c<4; $c++) $s[$r][$c] = $t[$c];           // and copy back
+      for ($c=0; $c<4; $c++) {
+          $t[$c] = $s[$r][($c+$r)%$Nb];
+      }
+      // shift into temp copy
+      for ($c=0; $c<4; $c++) {
+          $s[$r][$c] = $t[$c];
+      }
+      // and copy back
     }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
     return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
   }
@@ -105,28 +119,38 @@ 
 
     for ($i=$Nk; $i<($Nb*($Nr+1)); $i++) {
       $w[$i] = array();
-      for ($t=0; $t<4; $t++) $temp[$t] = $w[$i-1][$t];
+      for ($t=0; $t<4; $t++) {
+          $temp[$t] = $w[$i-1][$t];
+      }
       if ($i % $Nk == 0) {
         $temp = self::subWord(self::rotWord($temp));
-        for ($t=0; $t<4; $t++) $temp[$t] ^= self::$rCon[$i/$Nk][$t];
+        for ($t=0; $t<4; $t++) {
+            $temp[$t] ^= self::$rCon[$i/$Nk][$t];
+        }
       } elseif ($Nk > 6 && $i%$Nk == 4) {
         $temp = self::subWord($temp);
       }
-      for ($t=0; $t<4; $t++) $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+      for ($t=0; $t<4; $t++) {
+          $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+      }
     }
 
     return $w;
   }
 
   private static function subWord($w) {    // apply SBox to 4-byte word w
-    for ($i=0; $i<4; $i++) $w[$i] = self::$sBox[$w[$i]];
+    for ($i=0; $i<4; $i++) {
+        $w[$i] = self::$sBox[$w[$i]];
+    }
 
     return $w;
   }
 
   private static function rotWord($w) {    // rotate 4-byte word w left by one byte
     $tmp = $w[0];
-    for ($i=0; $i<3; $i++) $w[$i] = $w[$i+1];
+    for ($i=0; $i<3; $i++) {
+        $w[$i] = $w[$i+1];
+    }
     $w[3] = $tmp;
 
     return $w;

install/js/crypt/aesctr.class.php

Braces +41 added lines, -13 removed lines

@@ -21,14 +21,19 @@ 
   public static function encrypt($plaintext, $password, $nBits)
   {
     $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-    if (!($nBits==128 || $nBits==192 || $nBits==256)) return '';  // standard allows 128/192/256 bit keys
+    if (!($nBits==128 || $nBits==192 || $nBits==256)) {
+        return '';
+    }
+    // standard allows 128/192/256 bit keys
     // note PHP (5) gives us plaintext and password in UTF8 encoding!
 
     // use AES itself to encrypt password to get cipher key (using plain password as source for
     // key expansion) - gives us well encrypted key
     $nBytes = $nBits/8;  // no bytes in key
     $pwBytes = array();
-    for ($i=0; $i<$nBytes; $i++) $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    for ($i=0; $i<$nBytes; $i++) {
+        $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    }
     $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
     $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
 
@@ -39,11 +44,17 @@ 
     $nonceSec = floor($nonce/1000);
     $nonceMs = $nonce%1000;
     // encode nonce with seconds in 1st 4 bytes, and (repeated) ms part filling 2nd 4 bytes
-    for ($i=0; $i<4; $i++) $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
-    for ($i=0; $i<4; $i++) $counterBlock[$i+4] = $nonceMs & 0xff;
+    for ($i=0; $i<4; $i++) {
+        $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
+    }
+    for ($i=0; $i<4; $i++) {
+        $counterBlock[$i+4] = $nonceMs & 0xff;
+    }
     // and convert it to a string to go on the front of the ciphertext
     $ctrTxt = '';
-    for ($i=0; $i<8; $i++) $ctrTxt .= chr($counterBlock[$i]);
+    for ($i=0; $i<8; $i++) {
+        $ctrTxt .= chr($counterBlock[$i]);
+    }
 
     // generate key schedule - an expansion of the key into distinct Key Rounds for each round
     $keySchedule = Aes::keyExpansion($key);
@@ -55,8 +66,12 @@ 
     for ($b=0; $b<$blockCount; $b++) {
       // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
       // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+      }
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+      }
 
       $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
 
@@ -89,20 +104,27 @@ 
   public static function decrypt($ciphertext, $password, $nBits)
   {
     $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-    if (!($nBits==128 || $nBits==192 || $nBits==256)) return '';  // standard allows 128/192/256 bit keys
+    if (!($nBits==128 || $nBits==192 || $nBits==256)) {
+        return '';
+    }
+    // standard allows 128/192/256 bit keys
     $ciphertext = base64_decode($ciphertext);
 
     // use AES to encrypt password (mirroring encrypt routine)
     $nBytes = $nBits/8;  // no bytes in key
     $pwBytes = array();
-    for ($i=0; $i<$nBytes; $i++) $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    for ($i=0; $i<$nBytes; $i++) {
+        $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    }
     $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
     $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
 
     // recover nonce from 1st element of ciphertext
     $counterBlock = array();
     $ctrTxt = substr($ciphertext, 0, 8);
-    for ($i=0; $i<8; $i++) $counterBlock[$i] = ord(substr($ctrTxt,$i,1));
+    for ($i=0; $i<8; $i++) {
+        $counterBlock[$i] = ord(substr($ctrTxt,$i,1));
+    }
 
     // generate key schedule
     $keySchedule = Aes::keyExpansion($key);
@@ -110,7 +132,9 @@ 
     // separate ciphertext into blocks (skipping past initial 8 bytes)
     $nBlocks = ceil((strlen($ciphertext)-8) / $blockSize);
     $ct = array();
-    for ($b=0; $b<$nBlocks; $b++) $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
+    for ($b=0; $b<$nBlocks; $b++) {
+        $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
+    }
     $ciphertext = $ct;  // ciphertext is now array of block-length strings
 
     // plaintext will get generated block-by-block into array of block-length strings
@@ -118,8 +142,12 @@ 
 
     for ($b=0; $b<$nBlocks; $b++) {
       // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+      }
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+      }
 
       $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block
 

install/install.queries.php

Braces +15 added lines, -10 removed lines

@@ -23,14 +23,16 @@ 
     $dp = opendir($dir);
     $res = true;
     while($file = readdir($dp)) {
-        if (($file == ".") || ($file == ".."))
-            continue;
+        if (($file == ".") || ($file == "..")) {
+                    continue;
+        }
 
         $fullPath = $dir."/".$file;
 
         if(is_dir($fullPath)) {
-            if ($res = @chmod($fullPath, $dirPermissions))
-                $res = @chmod_r($fullPath, $dirPermissions, $filePermissions);
+            if ($res = @chmod($fullPath, $dirPermissions)) {
+                            $res = @chmod_r($fullPath, $dirPermissions, $filePermissions);
+            }
         } else {
             $res = chmod($fullPath, $filePermissions);
         }
@@ -40,8 +42,9 @@ 
         }
     }
     closedir($dp);
-    if (is_dir($dir) && $res)
-        $res = @chmod($dir, $dirPermissions);
+    if (is_dir($dir) && $res) {
+            $res = @chmod($dir, $dirPermissions);
+    }
 
     return $res;
 }
@@ -995,10 +998,12 @@ 
                     if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
                         // Change directory permissions
                         $result = chmod_r($_SESSION['abspath'], 0770, 0740);
-                        if ($result )
-                            $result = chmod_r($_SESSION['abspath'].'/files', 0770, 0770);
-                        if  ($result)
-                            $result = chmod_r($_SESSION['abspath'].'/upload', 0770, 0770);
+                        if ($result ) {
+                                                    $result = chmod_r($_SESSION['abspath'].'/files', 0770, 0770);
+                        }
+                        if  ($result) {
+                                                    $result = chmod_r($_SESSION['abspath'].'/upload', 0770, 0770);
+                        }
                     }
 
                     if ($result === false) {

install/upgrade_run_db_original.php

Braces +6 added lines, -3 removed lines

@@ -89,9 +89,12 @@
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 //define pbkdf2 iteration count
 @define('ITCOUNT', '2072');

install/upgrade_run_final.php

Braces +6 added lines, -2 removed lines

@@ -101,8 +101,12 @@
         }
 
         // temp data
-        if (!isset($record['login'])) $record['login'] = "";
-        if (!isset($resNT['renewal_period'])) $resNT['renewal_period'] = "0";
+        if (!isset($record['login'])) {
+            $record['login'] = "";
+        }
+        if (!isset($resNT['renewal_period'])) {
+            $resNT['renewal_period'] = "0";
+        }
 
         // store data
         $res = mysqli_query($dbTmp,

install/upgrade_run_2.1.27.php

Braces +18 added lines, -7 removed lines

@@ -83,16 +83,27 @@
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 function cleanFields($txt) {
     $tmp = str_replace(",", ";", trim($txt));
-    if (empty($tmp)) return $tmp;
-    if ($tmp === ";") return "";
-    if (strpos($tmp, ';') === 0) $tmp = substr($tmp, 1);
-    if (substr($tmp, -1) !== ";") $tmp = $tmp.";";
+    if (empty($tmp)) {
+        return $tmp;
+    }
+    if ($tmp === ";") {
+        return "";
+    }
+    if (strpos($tmp, ';') === 0) {
+        $tmp = substr($tmp, 1);
+    }
+    if (substr($tmp, -1) !== ";") {
+        $tmp = $tmp.";";
+    }
     return $tmp;
 }
 

includes/language/dutch_kb.php

Braces +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 //DUTCH
 if (!isset($_SESSION['settings']['cpassman_url'])) {
 	$TeamPass_url = '';
-}else{
+} else{
 	$TeamPass_url = $_SESSION['settings']['cpassman_url'];
 }
 

includes/language/chinese_admin_help.php

Braces +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 //CHINESE
 if (!isset($_SESSION['settings']['cpassman_url'])) {
 	$TeamPass_url = '';
-}else{
+} else{
 	$TeamPass_url = $_SESSION['settings']['cpassman_url'];
 }