nilsteampassnet / TeamPass

includes/libraries/Goodby/CSV/Import/Standard/Observer/PdoObserver.php

Spacing +3 added lines, -3 removed lines

@@ -55,15 +55,15 @@
                 return $value;
             }
 
-            throw new \InvalidArgumentException('value is invalid: ' . var_export($value, 1));
+            throw new \InvalidArgumentException('value is invalid: '.var_export($value, 1));
         }, $line);
 
         $prepare = array_map(function() {
             return '?';
         }, $line);
 
-        $sql = 'INSERT INTO ' . $this->table . '(' . join(', ', $this->columns) . ')' .
-                ' VALUES(' . join(',', $prepare) . ')';
+        $sql = 'INSERT INTO '.$this->table.'('.join(', ', $this->columns).')'.
+                ' VALUES('.join(',', $prepare).')';
 
         $stmt = $this->pdo->prepare($sql);
         $stmt->execute($line);

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/datatable/datatable.users_logged.php

Spacing +5 added lines, -5 removed lines

@@ -48,20 +48,20 @@
 //Paging
 $sLimit = "";
 if (isset($_GET['iDisplayStart']) && $_GET['iDisplayLength'] != '-1') {
-    $sLimit = "LIMIT ". filter_var($_GET['iDisplayStart'], FILTER_SANITIZE_NUMBER_INT) .", ". filter_var($_GET['iDisplayLength'], FILTER_SANITIZE_NUMBER_INT)."";
+    $sLimit = "LIMIT ".filter_var($_GET['iDisplayStart'], FILTER_SANITIZE_NUMBER_INT).", ".filter_var($_GET['iDisplayLength'], FILTER_SANITIZE_NUMBER_INT)."";
 }
 
 //Ordering
 
 if (isset($_GET['iSortCol_0']) && in_array($_GET['iSortCol_0'], $aSortTypes)) {
     $sOrder = "ORDER BY  ";
-    for ($i=0; $i<intval($_GET['iSortingCols']); $i++) {
+    for ($i = 0; $i < intval($_GET['iSortingCols']); $i++) {
         if (
-            $_GET[ 'bSortable_'.filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT)] == "true" &&
+            $_GET['bSortable_'.filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT)] == "true" &&
             preg_match("#^(asc|desc)\$#i", $_GET['sSortDir_'.$i])
         ) {
-            $sOrder .= "".$aColumns[ filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT) ]." "
-            .mysqli_escape_string($link, $_GET['sSortDir_'.$i]) .", ";
+            $sOrder .= "".$aColumns[filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT)]." "
+            .mysqli_escape_string($link, $_GET['sSortDir_'.$i]).", ";
         }
     }
 

sources/main.functions.php

Spacing +2 added lines, -2 removed lines

@@ -1347,11 +1347,11 @@
 /**
  * @param string $message
  */
-function send_syslog($message, $component = "teampass", $program = "php", $host , $port)
+function send_syslog($message, $component = "teampass", $program = "php", $host, $port)
 {
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
         //$syslog_message = "<123>" . date('M d H:i:s ') . " " .$host . " " . $component . ": " . $message;
-    $syslog_message = "<123>" . date('M d H:i:s ') . $component . ": " . $message;
+    $syslog_message = "<123>".date('M d H:i:s ').$component.": ".$message;
         socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, $host, $port);
     socket_close($sock);
 }

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/admin.queries.php

Spacing +9 added lines, -9 removed lines

@@ -2048,31 +2048,31 @@
                 ldap_start_tls($ldapconn);
             }
 
-            $debug_ldap .= "LDAP connection : " . ($ldapconn ? "Connected" : "Failed") . "<br/>";
+            $debug_ldap .= "LDAP connection : ".($ldapconn ? "Connected" : "Failed")."<br/>";
 
             ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3);
             if ($ldapconn) {
                 $ldapbind = @ldap_bind($ldapconn, $dataReceived[0]['ldap_bind_dn'], $dataReceived[0]['ldap_bind_passwd']);
 
-                $debug_ldap .= "LDAP bind : " . ($ldapbind ? "Bound" : "Failed") . "<br/>";
+                $debug_ldap .= "LDAP bind : ".($ldapbind ? "Bound" : "Failed")."<br/>";
 
                 if ($ldapbind) {
-                    $filter="(&(" . $dataReceived[0]['ldap_user_attribute']. "=$username)(objectClass=" . $dataReceived[0]['ldap_object_class'] ."))";
-                    $result=ldap_search($ldapconn, $dataReceived[0]['ldap_search_base'], $filter, array('dn','mail','givenname','sn'));
+                    $filter = "(&(".$dataReceived[0]['ldap_user_attribute']."=$username)(objectClass=".$dataReceived[0]['ldap_object_class']."))";
+                    $result = ldap_search($ldapconn, $dataReceived[0]['ldap_search_base'], $filter, array('dn', 'mail', 'givenname', 'sn'));
                     if (isset($dataReceived[0]['ldap_usergroup'])) {
                         $filter_group = "memberUid=".$username;
-                        $result_group = ldap_search($ldapconn, $dataReceived[0]['ldap_usergroup'],$filter_group, array('dn'));
+                        $result_group = ldap_search($ldapconn, $dataReceived[0]['ldap_usergroup'], $filter_group, array('dn'));
 
-                        $debug_ldap .= 'Search filter (group): ' . $filter_group . "<br/>" .
-                                    'Results : ' . print_r(ldap_get_entries($ldapconn, $result_group), true) . "<br/>";
+                        $debug_ldap .= 'Search filter (group): '.$filter_group."<br/>".
+                                    'Results : '.print_r(ldap_get_entries($ldapconn, $result_group), true)."<br/>";
 
                         if (!ldap_count_entries($ldapconn, $result_group)) {
                                 $ldapConnection = "Error - No entries found";
                         }
                     }
 
-                    $debug_ldap .= 'Search filter : ' . $filter . "<br/>" .
-                            'Results : ' . print_r(ldap_get_entries($ldapconn, $result), true) . "<br/>";
+                    $debug_ldap .= 'Search filter : '.$filter."<br/>".
+                            'Results : '.print_r(ldap_get_entries($ldapconn, $result), true)."<br/>";
 
                     if (ldap_count_entries($ldapconn, $result)) {
                         // try auth

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

Spacing +7 added lines, -7 removed lines

@@ -350,25 +350,25 @@
                 ldap_start_tls($ldapconn);
             }
             if ($debugLdap == 1) {
-                fputs($dbgLdap, "LDAP connection : " . ($ldapconn ? "Connected" : "Failed") . "\n");
+                fputs($dbgLdap, "LDAP connection : ".($ldapconn ? "Connected" : "Failed")."\n");
             }
             ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3);
             if ($ldapconn) {
                 $ldapbind = ldap_bind($ldapconn, $_SESSION['settings']['ldap_bind_dn'], $_SESSION['settings']['ldap_bind_passwd']);
                 if ($debugLdap == 1) {
-                    fputs($dbgLdap, "LDAP bind : " . ($ldapbind ? "Bound" : "Failed") . "\n");
+                    fputs($dbgLdap, "LDAP bind : ".($ldapbind ? "Bound" : "Failed")."\n");
                 }
                 if ($ldapbind) {
-                    $filter="(&(" . $_SESSION['settings']['ldap_user_attribute']. "=$username)(objectClass=" . $_SESSION['settings']['ldap_object_class'] ."))";
-                    $result=ldap_search($ldapconn, $_SESSION['settings']['ldap_search_base'], $filter, array('dn','mail','givenname','sn'));
+                    $filter = "(&(".$_SESSION['settings']['ldap_user_attribute']."=$username)(objectClass=".$_SESSION['settings']['ldap_object_class']."))";
+                    $result = ldap_search($ldapconn, $_SESSION['settings']['ldap_search_base'], $filter, array('dn', 'mail', 'givenname', 'sn'));
                     if (isset($_SESSION['settings']['ldap_usergroup'])) {
                         $filter_group = "memberUid=".$username;
-                        $result_group = ldap_search($ldapconn, $_SESSION['settings']['ldap_usergroup'],$filter_group, array('dn'));
+                        $result_group = ldap_search($ldapconn, $_SESSION['settings']['ldap_usergroup'], $filter_group, array('dn'));
                         if ($debugLdap == 1) {
                                 fputs(
                                         $dbgLdap,
-                                        'Search filter (group): ' . $filter_group . "\n" .
-                                        'Results : ' . print_r(ldap_get_entries($ldapconn, $result_group), true) . "\n"
+                                        'Search filter (group): '.$filter_group."\n".
+                                        'Results : '.print_r(ldap_get_entries($ldapconn, $result_group), true)."\n"
                                 );
                         }
                         if (!ldap_count_entries($ldapconn, $result_group)) {

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(