nilsteampassnet / TeamPass

sources/find.queries.php

Braces +8 added lines, -5 removed lines

@@ -207,7 +207,9 @@ 
  */
 if (!isset($_GET['type'])) {
     $sOutput = '{';
-    if (isset($_GET['sEcho'])) $sOutput .= '"sEcho": '.intval($_GET['sEcho']).', ';
+    if (isset($_GET['sEcho'])) {
+        $sOutput .= '"sEcho": '.intval($_GET['sEcho']).', ';
+    }
     $sOutput .= '"iTotalRecords": '.$iFilteredTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -295,10 +297,11 @@ 
         $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES).'", ';
 
         // col6 - URL
-        if ($record['url'] != "0")
-            $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['url']), ENT_QUOTES).'", ';
-        else
-            $sOutputItem .= '"", ';
+        if ($record['url'] != "0") {
+                    $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['url']), ENT_QUOTES).'", ';
+        } else {
+                    $sOutputItem .= '"", ';
+        }
 
         //col7 - Prepare the Treegrid
         $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES).'"';

sources/tree.php

Braces +5 added lines, -2 removed lines

@@ -164,8 +164,11 @@
                 }
 
                 // prepare json return for current node
-                if ($node->parent_id == 0) $parent = "#";
-                else $parent = "li_".$node->parent_id;
+                if ($node->parent_id == 0) {
+                    $parent = "#";
+                } else {
+                    $parent = "li_".$node->parent_id;
+                }
 
                 // special case for READ-ONLY folder
                 if ($_SESSION['user_read_only'] === true && !in_array($node->id, $_SESSION['personal_folders'])) {

sources/main.functions.php

Braces +36 added lines, -21 removed lines

@@ -1330,12 +1330,24 @@ 
     $pwgen = new Encryption\PwGen\pwgen();
 
     // init
-    if (!empty($size)) $pwgen->setLength($size);
-    if (!empty($secure)) $pwgen->setSecure($secure);
-    if (!empty($numerals)) $pwgen->setNumerals($numerals);
-    if (!empty($capitalize)) $pwgen->setCapitalize($capitalize);
-    if (!empty($ambiguous)) $pwgen->setAmbiguous($ambiguous);
-    if (!empty($symbols)) $pwgen->setSymbols($symbols);
+    if (!empty($size)) {
+        $pwgen->setLength($size);
+    }
+    if (!empty($secure)) {
+        $pwgen->setSecure($secure);
+    }
+    if (!empty($numerals)) {
+        $pwgen->setNumerals($numerals);
+    }
+    if (!empty($capitalize)) {
+        $pwgen->setCapitalize($capitalize);
+    }
+    if (!empty($ambiguous)) {
+        $pwgen->setAmbiguous($ambiguous);
+    }
+    if (!empty($symbols)) {
+        $pwgen->setSymbols($symbols);
+    }
 
     // generate and send back
     return $pwgen->generate();
@@ -1446,20 +1458,21 @@ 
  */
 function get_client_ip_server() {
     $ipaddress = '';
-    if (getenv('HTTP_CLIENT_IP'))
-        $ipaddress = getenv('HTTP_CLIENT_IP');
-    else if (getenv('HTTP_X_FORWARDED_FOR'))
-        $ipaddress = getenv('HTTP_X_FORWARDED_FOR');
-    else if (getenv('HTTP_X_FORWARDED'))
-        $ipaddress = getenv('HTTP_X_FORWARDED');
-    else if (getenv('HTTP_FORWARDED_FOR'))
-        $ipaddress = getenv('HTTP_FORWARDED_FOR');
-    else if (getenv('HTTP_FORWARDED'))
-        $ipaddress = getenv('HTTP_FORWARDED');
-    else if (getenv('REMOTE_ADDR'))
-        $ipaddress = getenv('REMOTE_ADDR');
-    else
-        $ipaddress = 'UNKNOWN';
+    if (getenv('HTTP_CLIENT_IP')) {
+            $ipaddress = getenv('HTTP_CLIENT_IP');
+    } else if (getenv('HTTP_X_FORWARDED_FOR')) {
+            $ipaddress = getenv('HTTP_X_FORWARDED_FOR');
+    } else if (getenv('HTTP_X_FORWARDED')) {
+            $ipaddress = getenv('HTTP_X_FORWARDED');
+    } else if (getenv('HTTP_FORWARDED_FOR')) {
+            $ipaddress = getenv('HTTP_FORWARDED_FOR');
+    } else if (getenv('HTTP_FORWARDED')) {
+            $ipaddress = getenv('HTTP_FORWARDED');
+    } else if (getenv('REMOTE_ADDR')) {
+            $ipaddress = getenv('REMOTE_ADDR');
+    } else {
+            $ipaddress = 'UNKNOWN';
+    }
 
     return $ipaddress;
 }
@@ -1526,7 +1539,9 @@ 
         $x = 0;
         $bFound = false;
         foreach ($data as $line) {
-            if (stristr($line, ");")) break;
+            if (stristr($line, ");")) {
+                break;
+            }
             if (stristr($line, "'".$field."' => '")) {
                 $data[$x] = "    '".$field."' => '".$value."',\n";
                 $bFound = true;

sources/folders.queries.php

Braces +1 added lines, -2 removed lines

@@ -581,8 +581,7 @@
                             $prev_level = $t->nlevel;
                         }
                     }
-                }
-                else {
+                } else {
                     $error = $LANG['error_not_allowed_to'];
                 }
             }

sources/identify.php

Braces +10 added lines, -7 removed lines

@@ -191,8 +191,11 @@ 
 //--------
 
     // increment counter of login attempts
-    if (empty($_SESSION["pwd_attempts"])) $_SESSION["pwd_attempts"] = 1;
-    else $_SESSION["pwd_attempts"]++;
+    if (empty($_SESSION["pwd_attempts"])) {
+        $_SESSION["pwd_attempts"] = 1;
+    } else {
+        $_SESSION["pwd_attempts"]++;
+    }
 
     // manage brute force
     if ($_SESSION["pwd_attempts"] <= 3) {
@@ -336,8 +339,7 @@ 
             foreach (explode(",", $_SESSION['settings']['ldap_domain_controler']) as $domainControler) {
                 if ($_SESSION['settings']['ldap_ssl'] == 1) {
                     $ldapURIs .= "ldaps://".$domainControler.":".$_SESSION['settings']['ldap_port']." ";
-                }
-                else {
+                } else {
                     $ldapURIs .= "ldap://".$domainControler.":".$_SESSION['settings']['ldap_port']." ";
                 }
             }
@@ -420,8 +422,7 @@ 
             // Posix style LDAP handles user searches a bit differently
             if ($_SESSION['settings']['ldap_type'] == 'posix') {
                 $ldap_suffix = ','.$_SESSION['settings']['ldap_suffix'].','.$_SESSION['settings']['ldap_domain_dn'];
-            }
-            elseif ($_SESSION['settings']['ldap_type'] == 'windows' and $ldap_suffix == '') { //Multiple Domain Names
+            } elseif ($_SESSION['settings']['ldap_type'] == 'windows' and $ldap_suffix == '') { //Multiple Domain Names
                 $ldap_suffix = $_SESSION['settings']['ldap_suffix'];
             }
             $adldap = new adLDAP\adLDAP(
@@ -840,7 +841,9 @@ 
             $_SESSION['user_avatar_thumb'] = $data['avatar_thumb'];
             $_SESSION['user_upgrade_needed'] = $data['upgrade_needed'];
             // get personal settings
-            if (!isset($data['treeloadstrategy']) || empty($data['treeloadstrategy'])) $data['treeloadstrategy'] = "full";
+            if (!isset($data['treeloadstrategy']) || empty($data['treeloadstrategy'])) {
+                $data['treeloadstrategy'] = "full";
+            }
             $_SESSION['user_settings']['treeloadstrategy'] = $data['treeloadstrategy'];
             $_SESSION['user_settings']['agses-usercardid'] = $data['agses-usercardid'];
             $_SESSION['user_settings']['user_language'] = $data['user_language'];

items.load.php

Braces +12 added lines, -2 removed lines

@@ -1745,7 +1745,12 @@ 
     }
 
     if (
-        $("#hid_cat").val() == "<?php if (isset($_SESSION['personal_folders'][0])) echo $_SESSION['personal_folders'][0]; else echo ""; ?>") {
+        $("#hid_cat").val() == "<?php if (isset($_SESSION['personal_folders'][0])) {
+    echo $_SESSION['personal_folders'][0];
+} else {
+    echo "";
+}
+?>") {
         displayMessage("<i class='fa fa-warning'></i>&nbsp;<?php echo $LANG['error_not_allowed_to']; ?>");
         return false;
     }
@@ -3848,7 +3853,12 @@ 
         $(".tip").tooltipster({multiple: true});
         $(".mini_login, .mini_pw").css("cursor", "pointer");
 
-        var restricted_to_roles = <?php if (isset($_SESSION['settings']['restricted_to_roles']) && $_SESSION['settings']['restricted_to_roles'] == 1) echo 1; else echo 0; ?>;
+        var restricted_to_roles = <?php if (isset($_SESSION['settings']['restricted_to_roles']) && $_SESSION['settings']['restricted_to_roles'] == 1) {
+    echo 1;
+} else {
+    echo 0;
+}
+?>;
 
         // refine users list to the related roles
         $.post(

install/js/crypt/aes.class.php

Braces +21 added lines, -7 removed lines

@@ -37,7 +37,9 @@ 
     $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;
   }
@@ -48,7 +50,9 @@ 
    */
   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;
@@ -128,28 +132,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 +12 added lines, -4 removed lines

@@ -66,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 --
 
@@ -138,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 +12 added lines, -8 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);
         }
@@ -997,10 +999,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) {