nilsteampassnet / TeamPass

includes/language/chinese_kb.php

Spacing +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'];
 }
 

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'];
 }
 

includes/language/polish.php

Braces +3 added lines, -1 removed lines

@@ -879,7 +879,8 @@ 
     'error_url_missing' => 'Nie podano adresu URL!',
     'error_ssh_credentials_missing' => 'Poświadczenia SSH są niepoprawne.',
     'error_url_must_be_ssh' => 'URL musi zawierać protokół SSH!',
-    'auto_update_server_password_info' => 'Kliknięcie start, automatycznie wykona poniższe kroki: < ul > <li > Połączenie przez SSH do serwera wykorzystując dane logowania i pole `URL`, < / li > <li > Zmiana hasła użytkownika na serwerze < /il > <li > Zachowanie nowego hasła w Teampass < /il > <li > Zakończenie połączenia SSH < /li > < / ul > <br / > < b > Upewnij się, że użytkownik posiada prawa do zalogowania się i zmiany hasła na serwerze(jeśli nie, określ hasło użytkownika root) przed uruchomieniem.< / b > ',
+    'auto_update_server_password_info' => 'Kliknięcie start, automatycznie wykona poniższe kroki: < ul > <li > Połączenie przez SSH do {
+    serwera wykorzystując dane logowania i pole `URL`, < / li > <li > Zmiana hasła użytkownika na serwerze < /il > <li > Zachowanie nowego hasła w Teampass < /il > <li > Zakończenie połączenia SSH < /li > < / ul > <br / > < b > Upewnij się, że użytkownik posiada prawa do zalogowania się i zmiany hasła na serwerze(jeśli nie, określ hasło użytkownika root) przed uruchomieniem.< / b > ',
     'update_server_password' => 'Zaktualizuj hasło serwera',
     'error_personal_sk_expected' => 'Musisz najpierw wprowadzić swój prywatny saltkety!',
     'click_to_generate' => 'Kliknij by wygenerować',
@@ -1048,3 +1049,4 @@ 
     '' => ''
 );
 }
+}

includes/language/swedish_kb.php

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -1 removed lines

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

includes/language/italian_kb.php

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -1 removed lines

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

includes/language/spanish_admin_help.php

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -1 removed lines

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

includes/language/dutch_kb.php

Spacing +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'];
 }
 

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/libraries/LDAP/adLDAP/adLDAP.php

Indentation +14 added lines, -14 removed lines

@@ -755,11 +755,11 @@ 
     }
 
     /**
-    * Returns objectClass in an array
-    *
-    * @param string $distinguishedName The full DN of a contact
-    * @return array
-    */
+     * Returns objectClass in an array
+     *
+     * @param string $distinguishedName The full DN of a contact
+     * @return array
+     */
     public function getObjectClass($distinguishedName) {
         if ($distinguishedName === NULL) { return false; }
         if (!$this->getLdapBind()) { return false; }
@@ -778,21 +778,21 @@ 
     }
 
     /**
-    * Find the Base DN of your domain controller
-    * 
-    * @return string
-    */
+     * Find the Base DN of your domain controller
+     * 
+     * @return string
+     */
     public function findBaseDn() {
         $namingContext = $this->getRootDse(array('defaultnamingcontext'));   
         return $namingContext[0]['defaultnamingcontext'][0];
     }
     
     /**
-    * Get the RootDSE properties from a domain controller
-    * 
-    * @param string[] $attributes The attributes you wish to query e.g. defaultnamingcontext
-    * @return array
-    */
+     * Get the RootDSE properties from a domain controller
+     * 
+     * @param string[] $attributes The attributes you wish to query e.g. defaultnamingcontext
+     * @return array
+     */
     public function getRootDse($attributes = array("*", "+")) {
         if (!$this->ldapBind) { return (false); }
         

Spacing +1 added lines, -1 removed lines

@@ -480,7 +480,7 @@
     public function setUseSSL($useSSL) {
             $this->useSSL = $useSSL;
             // Set the default port correctly 
-            if($this->useSSL) { 
+            if ($this->useSSL) { 
             $this->setPort(self::ADLDAP_LDAPS_PORT); 
             }
             else { 

Braces +4 added lines, -8 removed lines

@@ -482,8 +482,7 @@ 
             // Set the default port correctly 
             if($this->useSSL) { 
             $this->setPort(self::ADLDAP_LDAPS_PORT); 
-            }
-            else { 
+            } else { 
             $this->setPort(self::ADLDAP_LDAP_PORT); 
             } 
     }
@@ -641,8 +640,7 @@ 
                 if ($this->useSSL && !$this->useTLS) {
                     // If you have problems troubleshooting, remove the @ character from the ldapldapBind command above to get the actual error message
                     throw new adLDAPException('Bind to Active Directory failed. Either the LDAPs connection failed or the login credentials are incorrect. AD said: '.$this->getLastError());
-                }
-                else {
+                } else {
                     throw new adLDAPException('Bind to Active Directory failed. Check the login credentials and/or server details. AD said: '.$this->getLastError());
                 }
             }
@@ -652,8 +650,7 @@ 
             $this->ldapBind = @ldap_sasl_bind($this->ldapConnection, NULL, NULL, "GSSAPI"); 
             if (!$this->ldapBind) { 
                 throw new adLDAPException('Rebind to Active Directory failed. AD said: '.$this->getLastError()); 
-            } 
-            else {
+            } else {
                 return true;
             }
         }
@@ -694,8 +691,7 @@ 
             $this->ldapBind = @ldap_sasl_bind($this->ldapConnection, NULL, NULL, "GSSAPI");
             if (!$this->ldapBind) {
                 throw new adLDAPException('Rebind to Active Directory failed. AD said: '.$this->getLastError());
-            }
-            else {
+            } else {
                 return true;
             }
         }

includes/libraries/LDAP/adLDAP/classes/adLDAPUsers.php

Indentation +52 added lines, -52 removed lines

@@ -54,25 +54,25 @@ 
     }
     
     /**
-    * Validate a user's login credentials
-    * 
-    * @param string $username A user's AD username
-    * @param string $password A user's AD password
-    * @param bool optional $prevent_rebind
-    * @return bool
-    */
+     * Validate a user's login credentials
+     * 
+     * @param string $username A user's AD username
+     * @param string $password A user's AD password
+     * @param bool optional $prevent_rebind
+     * @return bool
+     */
     public function authenticate($username, $password, $preventRebind = false) {
         return $this->adldap->authenticate($username, $password, $preventRebind);
     }
     
     /**
-    * Create a user
-    * 
-    * If you specify a password here, this can only be performed over SSL
-    * 
-    * @param array $attributes The attributes to set to the user account
-    * @return string|boolean
-    */
+     * Create a user
+     * 
+     * If you specify a password here, this can only be performed over SSL
+     * 
+     * @param array $attributes The attributes to set to the user account
+     * @return string|boolean
+     */
     public function create($attributes) {
         // Check for compulsory fields
         if (!array_key_exists("username", $attributes)) { return "Missing compulsory field [username]"; }
@@ -122,11 +122,11 @@ 
     }
     
     /**
-    * Account control options
-    *
-    * @param string[] $options The options to convert to int 
-    * @return int
-    */
+     * Account control options
+     *
+     * @param string[] $options The options to convert to int 
+     * @return int
+     */
     protected function accountControl($options) {
         $val = 0;
 
@@ -158,12 +158,12 @@ 
     }
     
     /**
-    * Delete a user account
-    * 
-    * @param string $username The username to delete (please be careful here!)
-    * @param bool $isGUID Is the username a GUID or a samAccountName
-    * @return boolean
-    */
+     * Delete a user account
+     * 
+     * @param string $username The username to delete (please be careful here!)
+     * @param bool $isGUID Is the username a GUID or a samAccountName
+     * @return boolean
+     */
     public function delete($username, $isGUID = false) {      
         $userinfo = $this->info($username, array("*"), $isGUID);
         $dn = $userinfo[0]['distinguishedname'][0];
@@ -370,13 +370,13 @@ 
     }
     
     /**
-    * Modify a user
-    * 
-    * @param string $username The username to query
-    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return string|boolean
-    */
+     * Modify a user
+     * 
+     * @param string $username The username to query
+     * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+     * @param bool $isGUID Is the username passed a GUID or a samAccountName
+     * @return string|boolean
+     */
     public function modify($username, $attributes, $isGUID = false) {
         if ($username === NULL) { return "Missing compulsory field [username]"; }
         if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) { 
@@ -416,12 +416,12 @@ 
     }
     
     /**
-    * Disable a user account
-    * 
-    * @param string $username The username to disable
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return string|boolean
-    */
+     * Disable a user account
+     * 
+     * @param string $username The username to disable
+     * @param bool $isGUID Is the username passed a GUID or a samAccountName
+     * @return string|boolean
+     */
     public function disable($username, $isGUID = false) {
         if ($username === NULL) { return "Missing compulsory field [username]"; }
         $attributes = array("enabled" => 0);
@@ -432,12 +432,12 @@ 
     }
     
     /**
-    * Enable a user account
-    * 
-    * @param string $username The username to enable
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return string|boolean
-    */
+     * Enable a user account
+     * 
+     * @param string $username The username to enable
+     * @param bool $isGUID Is the username passed a GUID or a samAccountName
+     * @return string|boolean
+     */
     public function enable($username, $isGUID = false) {
         if ($username === NULL) { return "Missing compulsory field [username]"; }
         $attributes = array("enabled" => 1);
@@ -605,19 +605,19 @@ 
             }
         }
         if ($sorted) { 
-          asort($usersArray); 
+            asort($usersArray); 
         }
         return ($usersArray);
     }
     
     /**
-    * Move a user account to a different OU
-    *
-    * @param string $username The username to move (please be careful here!)
-    * @param array $container The container or containers to move the user to (please be careful here!).
-    * accepts containers in 1. parent 2. child order
-    * @return string|boolean
-    */
+     * Move a user account to a different OU
+     *
+     * @param string $username The username to move (please be careful here!)
+     * @param array $container The container or containers to move the user to (please be careful here!).
+     * accepts containers in 1. parent 2. child order
+     * @return string|boolean
+     */
     public function move($username, $container) {
         if (!$this->adldap->getLdapBind()) { return false; }
         if ($username === null) { return "Missing compulsory field [username]"; }

Spacing +5 added lines, -5 removed lines

@@ -214,17 +214,17 @@ 
 
         if ($isGUID === true) {
             $username = $this->adldap->utilities()->strGuidToHex($username);
-            $filter = "objectguid=" . $username;
+            $filter = "objectguid=".$username;
         }
         else if (strpos($username, "@")) {
-                $filter = "userPrincipalName=" . $username;
+                $filter = "userPrincipalName=".$username;
         }
         else {
-                $filter = "samaccountname=" . $username;
+                $filter = "samaccountname=".$username;
         }
         $filter = "(&(objectCategory=person)({$filter}))";
         if ($fields === NULL) { 
-            $fields = array("samaccountname","mail","memberof","department","displayname","telephonenumber","primarygroupid","objectsid"); 
+            $fields = array("samaccountname", "mail", "memberof", "department", "displayname", "telephonenumber", "primarygroupid", "objectsid"); 
         }
         if (!in_array("objectsid", $fields)) {
             $fields[] = "objectsid";
@@ -508,7 +508,7 @@ 
      * @param bool $isGUID Is the username passed a GUID or a samAccountName
      * @return string
      */
-    public function dn($username, $isGUID=false) {
+    public function dn($username, $isGUID = false) {
         $user = $this->info($username, array("cn"), $isGUID);
         if ($user[0]["dn"] === NULL) { 
             return false; 

Braces +2 added lines, -4 removed lines

@@ -215,11 +215,9 @@
         if ($isGUID === true) {
             $username = $this->adldap->utilities()->strGuidToHex($username);
             $filter = "objectguid=" . $username;
-        }
-        else if (strpos($username, "@")) {
+        } else if (strpos($username, "@")) {
                 $filter = "userPrincipalName=" . $username;
-        }
-        else {
+        } else {
                 $filter = "samaccountname=" . $username;
         }
         $filter = "(&(objectCategory=person)({$filter}))";

includes/libraries/LDAP/adLDAP/classes/adLDAPGroups.php

Indentation +11 added lines, -11 removed lines

@@ -151,11 +151,11 @@ 
     }
 
     /**
-    * Create a group
-    * 
-    * @param array $attributes Default attributes of the group
-    * @return string|boolean
-    */
+     * Create a group
+     * 
+     * @param array $attributes Default attributes of the group
+     * @return string|boolean
+     */
     public function create($attributes) {
         if (!is_array($attributes)) { return "Attributes must be an array"; }
         if (!array_key_exists("group_name", $attributes)) { return "Missing compulsory field [group_name]"; }
@@ -184,12 +184,12 @@ 
     }
     
     /**
-    * Delete a group account 
-    * 
-    * @param string $group The group to delete (please be careful here!) 
-    * 
-    * @return string|boolean 
-    */
+     * Delete a group account 
+     * 
+     * @param string $group The group to delete (please be careful here!) 
+     * 
+     * @return string|boolean 
+     */
     public function delete($group) {
         if (!$this->adldap->getLdapBind()) { return false; }
         if ($group === null) { return "Missing compulsory field [group]"; }

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
      * @param string $child The child group name
      * @return bool
      */
-    public function addGroup($parent,$child) {
+    public function addGroup($parent, $child) {
 
         // Find the parent group's dn
         $parentGroup = $this->ginfo($parent, array("cn"));
@@ -240,7 +240,7 @@ 
      * @param string $child The child group name
      * @return bool
      */
-    public function removeGroup($parent , $child) {
+    public function removeGroup($parent, $child) {
     
         // Find the parent dn
         $parentGroup = $this->info($parent, array("cn"));
@@ -345,15 +345,15 @@ 
  
         $groupArray = array();
 
-        for ($i=0; $i<$groups["count"]; $i++) { 
-                $filter = "(&(objectCategory=group)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($groups[$i]) . "))";
+        for ($i = 0; $i < $groups["count"]; $i++) { 
+                $filter = "(&(objectCategory=group)(distinguishedName=".$this->adldap->utilities()->ldapSlashes($groups[$i])."))";
                 $fields = array("samaccountname", "distinguishedname", "objectClass");
                 $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
                 $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
 
                 // not a person, look for a group  
                 if ($entries['count'] == 0 && $recursive == true) {  
-                $filter = "(&(objectCategory=group)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($groups[$i]) . "))";  
+                $filter = "(&(objectCategory=group)(distinguishedName=".$this->adldap->utilities()->ldapSlashes($groups[$i])."))";  
                 $fields = array("distinguishedname");  
                 $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);  
                 $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);  
@@ -395,15 +395,15 @@ 
  
         $userArray = array();
 
-        for ($i=0; $i<$users["count"]; $i++) { 
-                $filter = "(&(objectCategory=person)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($users[$i]) . "))";
+        for ($i = 0; $i < $users["count"]; $i++) { 
+                $filter = "(&(objectCategory=person)(distinguishedName=".$this->adldap->utilities()->ldapSlashes($users[$i])."))";
                 $fields = array("samaccountname", "distinguishedname", "objectClass");
                 $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
                 $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
 
                 // not a person, look for a group  
                 if ($entries['count'] == 0 && $recursive == true) {  
-                $filter = "(&(objectCategory=group)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($users[$i]) . "))";  
+                $filter = "(&(objectCategory=group)(distinguishedName=".$this->adldap->utilities()->ldapSlashes($users[$i])."))";  
                 $fields = array("samaccountname");  
                 $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);  
                 $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);  

Braces +3 added lines, -6 removed lines

@@ -215,8 +215,7 @@ 
         $info = $this->info($group);
         if ($info[0]["dn"] === NULL) {
             return false;
-        }
-        else {
+        } else {
             $groupDN = $info[0]["dn"];
         }
         $newRDN = 'CN='.$newName;
@@ -416,15 +415,13 @@ 
                     $userArray = array_unique($userArray);  
                 }
                 continue;  
-                } 
-                else if ($entries['count'] == 0) {   
+                } else if ($entries['count'] == 0) {   
                 continue; 
                 } 
 
                 if ((!isset($entries[0]['samaccountname'][0]) || $entries[0]['samaccountname'][0] === NULL) && $entries[0]['distinguishedname'][0] !== NULL) {
                     $userArray[] = $entries[0]['distinguishedname'][0];
-                }
-                else if ($entries[0]['samaccountname'][0] !== NULL) {
+                } else if ($entries[0]['samaccountname'][0] !== NULL) {
                 $userArray[] = $entries[0]['samaccountname'][0];
                 }
         }