phpipam / phpipam

functions/classes/class.User.php

Indentation +5 added lines, -5 removed lines

@@ -659,8 +659,8 @@ 
      * @return void
      */
     public function fetch_available_auth_method_types () {
-		return array("AD", "LDAP", "NetIQ", "Radius", "SAML2");
-	}
+        return array("AD", "LDAP", "NetIQ", "Radius", "SAML2");
+    }
 
 
 
@@ -811,9 +811,9 @@ 
 
 
     /**
-    * @authentication functions
-    * -------------------------------
-    */
+     * @authentication functions
+     * -------------------------------
+     */
 
     /**
      * Main function for authenticating users

Spacing +206 added lines, -206 removed lines

@@ -229,13 +229,13 @@ 
         // not for api
         if ($this->api !== true) {
             //set session name
-            $this->set_session_name();
+            $this->set_session_name ();
             //set debugging
-            $this->set_debugging();
+            $this->set_debugging ();
             //register session
-            session_name($this->sessname);
-            if(@$_SESSION===NULL) {
-                session_start();
+            session_name ($this->sessname);
+            if (@$_SESSION === NULL) {
+                session_start ();
             }
         }
     }
@@ -247,7 +247,7 @@ 
      * @return void
      */
     public function destroy_session () {
-        session_destroy();
+        session_destroy ();
     }
 
     /**
@@ -257,8 +257,8 @@ 
      * @return void
      */
     private function set_session_name () {
-        include( dirname(__FILE__).'/../../config.php' );
-        $this->sessname = strlen(@$phpsessname)>0 ? $phpsessname : "phpipam";
+        include(dirname (__FILE__).'/../../config.php');
+        $this->sessname = strlen (@$phpsessname) > 0 ? $phpsessname : "phpipam";
     }
 
     /**
@@ -272,7 +272,7 @@ 
         if ($this->api !== true) {
             $_SESSION['ipamusername'] = $this->user->username;
             $_SESSION['ipamlanguage'] = $this->fetch_lang_details ();
-            $_SESSION['lastactive']   = time();
+            $_SESSION['lastactive']   = time ();
         }
     }
 
@@ -299,12 +299,12 @@ 
      */
     public function is_authenticated () {
         # if checked for subpages first check if $user is array
-        if(!is_array($this->user)) {
-            if( isset( $_SESSION['ipamusername'] ) && strlen( @$_SESSION['ipamusername'] )>0 ) {
+        if (!is_array ($this->user)) {
+            if (isset($_SESSION['ipamusername']) && strlen (@$_SESSION['ipamusername']) > 0) {
                 # save username
                 $this->username = $_SESSION['ipamusername'];
                 # check for timeout
-                if($this->timeout == true) {
+                if ($this->timeout == true) {
                     $this->authenticated = false;
                 }
                 else {
@@ -312,10 +312,10 @@ 
                     $this->fetch_user_details ($this->username);
 
                     $this->authenticated = true;
-                    $this->reset_inactivity_time();
+                    $this->reset_inactivity_time ();
                     $this->update_activity_time ();
                     # bind language
-                    $this->set_ui_language();
+                    $this->set_ui_language ();
                 }
             }
             else {
@@ -335,10 +335,10 @@ 
      * @return void
      */
     public function is_admin ($die = true) {
-        if($this->isadmin)      { return true; }
+        if ($this->isadmin) { return true; }
         else {
-            if($die)            { $this->Result->show("danger", _('Administrator level privileges required'), true); }
-            else                { return false; }
+            if ($die) { $this->Result->show ("danger", _ ('Administrator level privileges required'), true); }
+            else { return false; }
         }
     }
 
@@ -351,18 +351,18 @@ 
      */
     public function check_user_session ($redirect = true) {
         # not authenticated
-        if($this->authenticated===false) {
+        if ($this->authenticated === false) {
             # set url
-            $url = $this->createURL();
+            $url = $this->createURL ();
 
             # error print for AJAX
-            if(@$_SERVER['HTTP_X_REQUESTED_WITH'] == "XMLHttpRequest") {
+            if (@$_SERVER['HTTP_X_REQUESTED_WITH'] == "XMLHttpRequest") {
                 # for AJAX always check origin
                 $this->check_referrer ();
                 # kill session
                 $this->destroy_session ();
                 # error
-                $this->Result->show("danger", _('Please login first')."!<hr><a class='btn btn-sm btn-default' href='".$url.create_link ("login")."'>"._('Login')."</a>", true, true);
+                $this->Result->show ("danger", _ ('Please login first')."!<hr><a class='btn btn-sm btn-default' href='".$url.create_link ("login")."'>"._ ('Login')."</a>", true, true);
                 die();
             }
             # timeout
@@ -371,7 +371,7 @@ 
                 $this->set_redirect_cookie ();
                 # redirect
                 if ($redirect)
-                header("Location:".$url.create_link ("login","timeout"));
+                header ("Location:".$url.create_link ("login", "timeout"));
                 die();
             }
             else {
@@ -379,7 +379,7 @@ 
                 $this->set_redirect_cookie ();
                 # redirect
                 if ($redirect)
-                header("Location:".$url.create_link ("login"));
+                header ("Location:".$url.create_link ("login"));
                 die();
             }
         }
@@ -397,8 +397,8 @@ 
      */
     private function check_timeout () {
         //session set
-        if(isset($_SESSION['lastactive'])) {
-            if( strlen($this->settings->inactivityTimeout)>0 && (time()-@$_SESSION['lastactive']) > $this->settings->inactivityTimeout) {
+        if (isset($_SESSION['lastactive'])) {
+            if (strlen ($this->settings->inactivityTimeout) > 0 && (time () - @$_SESSION['lastactive']) > $this->settings->inactivityTimeout) {
                 $this->timeout = true;
                 unset($_SESSION['lastactive']);
             }
@@ -412,8 +412,8 @@ 
      * @return void
      */
     private function reset_inactivity_time () {
-        if($this->timeout!==true) {
-            $_SESSION['lastactive'] = time();
+        if ($this->timeout !== true) {
+            $_SESSION['lastactive'] = time ();
         }
     }
 
@@ -425,8 +425,8 @@ 
      */
     private function set_redirect_cookie () {
         # save current redirect vaule
-        if($_SERVER['SCRIPT_URL']!="/login/" && $_SERVER['SCRIPT_URL']!="logout" && $_SERVER['SCRIPT_URL']!="?page=login" && $_SERVER['SCRIPT_URL']!="?page=logout" && $_SERVER['SCRIPT_URL']!="/" && $_SERVER['SCRIPT_URL']!="%2f");
-        setcookie("phpipamredirect", $_SERVER['REQUEST_URI'], time()+10, "/", null, null, true);
+        if ($_SERVER['SCRIPT_URL'] != "/login/" && $_SERVER['SCRIPT_URL'] != "logout" && $_SERVER['SCRIPT_URL'] != "?page=login" && $_SERVER['SCRIPT_URL'] != "?page=logout" && $_SERVER['SCRIPT_URL'] != "/" && $_SERVER['SCRIPT_URL'] != "%2f");
+        setcookie ("phpipamredirect", $_SERVER['REQUEST_URI'], time () + 10, "/", null, null, true);
     }
 
     /**
@@ -436,11 +436,11 @@ 
      * @return void
      */
     private function set_ui_language () {
-        if(strlen($_SESSION['ipamlanguage'])>0)     {
-            putenv("LC_ALL=$_SESSION[ipamlanguage]");
-            setlocale(LC_ALL, $_SESSION['ipamlanguage']);        // set language
-            bindtextdomain("phpipam", "./functions/locale");    // Specify location of translation tables
-            textdomain("phpipam");                                // Choose domain
+        if (strlen ($_SESSION['ipamlanguage']) > 0) {
+            putenv ("LC_ALL=$_SESSION[ipamlanguage]");
+            setlocale (LC_ALL, $_SESSION['ipamlanguage']); // set language
+            bindtextdomain ("phpipam", "./functions/locale"); // Specify location of translation tables
+            textdomain ("phpipam"); // Choose domain
         }
     }
 
@@ -474,8 +474,8 @@ 
      * @return void
      */
     private function csrf_validate_action ($action) {
-        if ($action=="create" || $action=="validate") { return true; }
-        else                                          { $this->Result->show("danger", "Invalid CSRF cookie action", true); }
+        if ($action == "create" || $action == "validate") { return true; }
+        else { $this->Result->show ("danger", "Invalid CSRF cookie action", true); }
     }
 
     /**
@@ -487,9 +487,9 @@ 
      */
     private function csrf_cookie_create ($index) {
         // set cookie suffix
-        $name = is_null($index) ? "csrf_cookie" : "csrf_cookie_".$index;
+        $name = is_null ($index) ? "csrf_cookie" : "csrf_cookie_".$index;
         // save cookie
-        $_SESSION[$name] = md5(uniqid(mt_rand(), true));
+        $_SESSION[$name] = md5 (uniqid (mt_rand (), true));
         // return
         return $_SESSION[$name];
     }
@@ -503,7 +503,7 @@ 
      */
     private function csrf_cookie_validate ($index, $value) {
         // set cookie suffix
-        $name = is_null($index) ? "csrf_cookie" : "csrf_cookie_".$index;
+        $name = is_null ($index) ? "csrf_cookie" : "csrf_cookie_".$index;
         // check and return
         return $_SESSION[$name] == $value ? true : false;
     }
@@ -528,32 +528,32 @@ 
      */
     public function migrate_domain_settings () {
         # if not already migrated migrate settings!
-        if($this->settings->authmigrated==0) {
+        if ($this->settings->authmigrated == 0) {
             # only if AD used
-            if($this->settings->domainAuth!=0) {
+            if ($this->settings->domainAuth != 0) {
                 # fetch AD settings
                 $err = false;
-                try { $ad = $this->Database->getObject("settingsDomain",1); }
+                try { $ad = $this->Database->getObject ("settingsDomain", 1); }
                 catch (Exception $e) { $err = true; }
 
-                if($err === false) {
+                if ($err === false) {
                     # remove editDate
                     unset($ad->editDate);
                     # save to json array
-                    $ad = json_encode($ad);
+                    $ad = json_encode ($ad);
                     # update usersAuthMethod
-                    $type = $this->settings->domainAuth==1 ? "AD" : "LDAP";
+                    $type = $this->settings->domainAuth == 1 ? "AD" : "LDAP";
                     # update
                     try {
-                        $this->Database->insertObject("usersAuthMethod", array("type"=>$type, "params"=>$ad, "description"=>$type." authentication", "protected"=>"No"));
+                        $this->Database->insertObject ("usersAuthMethod", array ("type"=>$type, "params"=>$ad, "description"=>$type." authentication", "protected"=>"No"));
                     }
                     catch (Exception $e) {
                         $err = true;
                     }
                     # set migrated flag
-                    if($err === false) {
+                    if ($err === false) {
                         try {
-                            $this->Database->updateObject("settings", array("id"=>1,"authmigrated"=>1), 'id');
+                            $this->Database->updateObject ("settings", array ("id"=>1, "authmigrated"=>1), 'id');
                         }
                         catch (Exception $e) {
                             // no response on failure
@@ -573,17 +573,17 @@ 
     public function migrate_ldap_settings () {
 
         # fetch LDAP settings
-        $ldaps = $this->Database->getObjectsQuery("select * from usersAuthMethod where type = 'LDAP'");
+        $ldaps = $this->Database->getObjectsQuery ("select * from usersAuthMethod where type = 'LDAP'");
 
         foreach ($ldaps as $ldapobj) {
 
-            $ldap = json_decode($ldapobj->params);
+            $ldap = json_decode ($ldapobj->params);
 
-            if (!property_exists($ldap, 'ldap_security')) {
+            if (!property_exists ($ldap, 'ldap_security')) {
                 $ldap->ldap_security = 'none';
             }
 
-            if (property_exists($ldap, 'use_ssl')) {
+            if (property_exists ($ldap, 'use_ssl')) {
 
                 if ($ldap->use_ssl == '1') {
                     $ldap->ldap_security = 'ssl';
@@ -592,7 +592,7 @@ 
 
             }
 
-            if (property_exists($ldap, 'use_tls')) {
+            if (property_exists ($ldap, 'use_tls')) {
 
                 if ($ldap->use_tls == '1') {
                     $ldap->ldap_security = 'tls';
@@ -600,13 +600,13 @@ 
                 unset($ldap->use_tls);
             }
 
-            if (!property_exists($ldap, 'uid_attr')) {
+            if (!property_exists ($ldap, 'uid_attr')) {
                 $ldap->uid_attr = 'uid';
             }
 
-            $ldapobj->params = json_encode($ldap);
+            $ldapobj->params = json_encode ($ldap);
 
-            $this->Database->updateObject("usersAuthMethod", $ldapobj);
+            $this->Database->updateObject ("usersAuthMethod", $ldapobj);
 
         }
     }
@@ -630,10 +630,10 @@ 
      * @return void
      */
     private function check_referrer () {
-        if ( ($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") && ($_SERVER['HTTP_ORIGIN'] != $_SERVER['HTTP_HOST'] ) ) {
+        if (($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") && ($_SERVER['HTTP_ORIGIN'] != $_SERVER['HTTP_HOST'])) {
             # write log and die
-            $this->Log->write ("referrer_check", _('Page not referred properly'), 0 );
-            $this->Result->show ("danger", _('Page not referred properly'), true);
+            $this->Log->write ("referrer_check", _ ('Page not referred properly'), 0);
+            $this->Result->show ("danger", _ ('Page not referred properly'), true);
         }
     }
 
@@ -644,8 +644,8 @@ 
      * @return void
      */
     public function get_default_lang () {
-        try { $lang = $this->Database->findObject("lang","l_id",$this->settings->defaultLang); }
-        catch (Exception $e) { $this->debugging ? : $this->Result->show("danger", _("Database error: ").$e->getMessage()); }
+        try { $lang = $this->Database->findObject ("lang", "l_id", $this->settings->defaultLang); }
+        catch (Exception $e) { $this->debugging ? : $this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
         return $lang;
     }
@@ -659,7 +659,7 @@ 
      * @return void
      */
     public function fetch_available_auth_method_types () {
-		return array("AD", "LDAP", "NetIQ", "Radius", "SAML2");
+		return array ("AD", "LDAP", "NetIQ", "Radius", "SAML2");
 	}
 
 
@@ -684,26 +684,26 @@ 
      */
     public function fetch_favourite_subnets () {
         # none
-        if(strlen($this->user->favourite_subnets)==0) {
+        if (strlen ($this->user->favourite_subnets) == 0) {
             return false;
         }
         # ok
         else {
             # store to array
-            $subnets = explode(";", $this->user->favourite_subnets);
-            $subnets = array_filter($subnets);
+            $subnets = explode (";", $this->user->favourite_subnets);
+            $subnets = array_filter ($subnets);
 
-            if(sizeof($subnets)>0) {
+            if (sizeof ($subnets) > 0) {
                 // init
-                $fsubnets = array();
+                $fsubnets = array ();
                 # fetch details for each subnet
-                foreach($subnets as $id) {
+                foreach ($subnets as $id) {
                     $query = "select `su`.`id` as `subnetId`,`se`.`id` as `sectionId`, `subnet`, `mask`,`isFull`,`su`.`description`,`se`.`description` as `section`, `vlanId`, `isFolder`
                               from `subnets` as `su`, `sections` as `se` where `su`.`id` = ? and `su`.`sectionId` = `se`.`id` limit 1;";
 
-                    try { $fsubnet = $this->Database->getObjectQuery($query, array($id)); }
+                    try { $fsubnet = $this->Database->getObjectQuery ($query, array ($id)); }
                     catch (Exception $e) {
-                        $this->Result->show("danger", _("Error: ").$e->getMessage());
+                        $this->Result->show ("danger", _ ("Error: ").$e->getMessage ());
                         return false;
                     }
 
@@ -725,11 +725,11 @@ 
      * @param mixed $subnetId
      * @return void
      */
-    public function edit_favourite($action, $subnetId) {
+    public function edit_favourite ($action, $subnetId) {
         # execute
-        if($action=="remove")    { return $this->remove_favourite ($subnetId); }
-        elseif($action=="add")   { return $this->add_favourite ($subnetId); }
-        else                     { return false; }
+        if ($action == "remove") { return $this->remove_favourite ($subnetId); }
+        elseif ($action == "add") { return $this->add_favourite ($subnetId); }
+        else { return false; }
     }
 
     /**
@@ -741,11 +741,11 @@ 
      */
     private function remove_favourite ($subnetId) {
         # set old favourite subnets
-        $old_favourites = explode(";", $this->user->favourite_subnets);
+        $old_favourites = explode (";", $this->user->favourite_subnets);
         # set new
-        $new_favourites = implode(";", array_diff($old_favourites, array($subnetId)));
+        $new_favourites = implode (";", array_diff ($old_favourites, array ($subnetId)));
         # update
-        try { $this->Database->updateObject("users", array("favourite_subnets"=>$new_favourites, "id"=>$this->user->id), "id"); }
+        try { $this->Database->updateObject ("users", array ("favourite_subnets"=>$new_favourites, "id"=>$this->user->id), "id"); }
         catch (Exception $e) {
             return false;
         }
@@ -761,12 +761,12 @@ 
      */
     private function add_favourite ($subnetId) {
         # set old favourite subnets
-        $old_favourites = explode(";", $this->user->favourite_subnets);
-        $old_favourites = is_array($old_favourites) ? $old_favourites : array();
+        $old_favourites = explode (";", $this->user->favourite_subnets);
+        $old_favourites = is_array ($old_favourites) ? $old_favourites : array ();
         # set new
-        $new_favourites = implode(";",array_merge(array($subnetId), $old_favourites));
+        $new_favourites = implode (";", array_merge (array ($subnetId), $old_favourites));
         # update
-        try { $this->Database->updateObject("users", array("favourite_subnets"=>$new_favourites, "id"=>$this->user->id), "id"); }
+        try { $this->Database->updateObject ("users", array ("favourite_subnets"=>$new_favourites, "id"=>$this->user->id), "id"); }
         catch (Exception $e) {
             return false;
         }
@@ -783,10 +783,10 @@ 
     public function is_subnet_favourite ($subnetId) {
         $this->fetch_favourite_subnets ();
         # check if in array
-        $subnets = explode(";", $this->user->favourite_subnets);
-        $subnets = array_filter($subnets);
+        $subnets = explode (";", $this->user->favourite_subnets);
+        $subnets = array_filter ($subnets);
         # result
-        return in_array($subnetId, $subnets) ? true : false;
+        return in_array ($subnetId, $subnets) ? true : false;
     }
 
     /**
@@ -832,15 +832,15 @@ 
         # first we need to check if username exists
         $this->fetch_user_details ($username);
         # set method type if set, otherwise presume local auth
-        $this->authmethodid = strlen(@$this->user->authMethod)>0 ? $this->user->authMethod : 1;
+        $this->authmethodid = strlen (@$this->user->authMethod) > 0 ? $this->user->authMethod : 1;
 
         # get authentication method details
         $this->get_auth_method_type ();
 
         # authenticate based on name of auth method
-        if(!method_exists($this, $this->authmethodtype))    {
-            $this->Log->write ("User login", _('Error: Invalid authentication method'), 2 );
-            $this->Result->show("danger", _("Error: Invalid authentication method"), true);
+        if (!method_exists ($this, $this->authmethodtype)) {
+            $this->Log->write ("User login", _ ('Error: Invalid authentication method'), 2);
+            $this->Result->show ("danger", _ ("Error: Invalid authentication method"), true);
         }
         else {
             # set method name variable
@@ -859,18 +859,18 @@ 
      */
     private function fetch_user_details ($username) {
         # only if not already active
-        if(!is_object($this->user)) {
-            try { $user = $this->Database->findObject("users", "username", $username); }
-            catch (Exception $e)     { $this->Result->show("danger", _("Error: ").$e->getMessage(), true);}
+        if (!is_object ($this->user)) {
+            try { $user = $this->Database->findObject ("users", "username", $username); }
+            catch (Exception $e) { $this->Result->show ("danger", _ ("Error: ").$e->getMessage (), true); }
 
             # if not result return false
             $usert = (array) $user;
 
             # admin?
-            if($user->role == "Administrator")    { $this->isadmin = true; }
+            if ($user->role == "Administrator") { $this->isadmin = true; }
 
-            if(sizeof($usert)==0)    { $this->block_ip (); $this->Log->write ("User login", _('Invalid username'), 2, $username ); $this->Result->show("danger", _("Invalid username or password"), true);}
-            else                     { $this->user = $user; }
+            if (sizeof ($usert) == 0) { $this->block_ip (); $this->Log->write ("User login", _ ('Invalid username'), 2, $username); $this->Result->show ("danger", _ ("Invalid username or password"), true); }
+            else { $this->user = $user; }
         }
     }
 
@@ -881,9 +881,9 @@ 
      * @return void
      */
     public function fetch_langs () {
-        try { $langs = $this->Database->getObjects("lang", "l_id"); }
+        try { $langs = $this->Database->getObjects ("lang", "l_id"); }
         catch (Exception $e) {
-            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            $this->Result->show ("danger", _ ("Error: ").$e->getMessage ());
             return false;
         }
         # return
@@ -898,9 +898,9 @@ 
      */
     private function fetch_lang_details () {
         // fetch from db
-        try { $lang = $this->Database->findObject("lang", "l_id", $this->user->lang); }
+        try { $lang = $this->Database->findObject ("lang", "l_id", $this->user->lang); }
         catch (Exception $e) {
-            $this->Result->show("danger", _("Error: ").$e->getMessage(), true);
+            $this->Result->show ("danger", _ ("Error: ").$e->getMessage (), true);
             return false;
         }
         // return code
@@ -915,16 +915,16 @@ 
      */
     private function get_auth_method_type () {
         # for older versions - only local is available!
-        if($this->settings->version=="1.1") {
+        if ($this->settings->version == "1.1") {
             $this->authmethodtype = "auth_local";
         }
         else {
-            try { $method = $this->Database->getObject("usersAuthMethod", $this->authmethodid); }
+            try { $method = $this->Database->getObject ("usersAuthMethod", $this->authmethodid); }
             catch (Exception $e) {
-                $this->Result->show("danger", _("Error: ").$e->getMessage(), true);
+                $this->Result->show ("danger", _ ("Error: ").$e->getMessage (), true);
             }
             # save method name if existing
-            if($method!==false) {
+            if ($method !== false) {
                 $this->authmethodtype   = "auth_".$method->type;
                 $this->authmethodparams = $method->params;
             }
@@ -942,12 +942,12 @@ 
      */
     private function auth_local ($username, $password) {
         # auth ok
-        if($this->user->password == crypt($password, $this->user->password)) {
+        if ($this->user->password == crypt ($password, $this->user->password)) {
             # save to session
             $this->write_session_parameters ();
 
-            $this->Result->show("success", _("Login successful"));
-            $this->Log->write( "User login", "User ".$this->user->real_name." logged in", 0, $username );
+            $this->Result->show ("success", _ ("Login successful"));
+            $this->Log->write ("User login", "User ".$this->user->real_name." logged in", 0, $username);
 
             # write last logintime
             $this->update_login_time ();
@@ -960,11 +960,11 @@ 
             # add blocked count
             $this->block_ip ();
 
-            $this->Log->write( "User login", "Invalid username or password", 2, $username );
+            $this->Log->write ("User login", "Invalid username or password", 2, $username);
 
             # apache
-            if (!empty($_SERVER['PHP_AUTH_USER'])) { $this->show_http_login(); }
-            else                                 { $this->Result->show("danger", _("Invalid username or password"), true); }
+            if (!empty($_SERVER['PHP_AUTH_USER'])) { $this->show_http_login (); }
+            else { $this->Result->show ("danger", _ ("Invalid username or password"), true); }
         }
     }
 
@@ -981,8 +981,8 @@ 
         # save to session
         $this->write_session_parameters ();
 
-        $this->Result->show("success", _("Login successful"));
-        $this->Log->write( "User login", "User ".$this->user->real_name." logged in", 0, $username );
+        $this->Result->show ("success", _ ("Login successful"));
+        $this->Log->write ("User login", "User ".$this->user->real_name." logged in", 0, $username);
 
         # write last logintime
         $this->update_login_time ();
@@ -998,8 +998,8 @@ 
      * @return void
      */
     private function show_http_login () {
-        header('WWW-Authenticate: Basic realm="phpIPAM authentication"');
-        header('HTTP/1.0 401 Unauthorized');
+        header ('WWW-Authenticate: Basic realm="phpIPAM authentication"');
+        header ('HTTP/1.0 401 Unauthorized');
         echo 'Authentication failed';
         exit;
     }
@@ -1016,13 +1016,13 @@ 
     private function directory_connect ($authparams) {
 
         # adLDAP script
-        require(dirname(__FILE__) . "/../adLDAP/src/adLDAP.php");
+        require(dirname (__FILE__)."/../adLDAP/src/adLDAP.php");
 
-        $dirparams = Array();
+        $dirparams = Array ();
         $dirparams['base_dn'] = @$authparams['base_dn'];
         $dirparams['ad_port'] = @$authparams['ad_port'];
         $dirparams['account_suffix'] = @$authparams['account_suffix'];
-        $dirparams['domain_controllers'] = explode(";", str_replace(" ", "", $authparams['domain_controllers']));
+        $dirparams['domain_controllers'] = explode (";", str_replace (" ", "", $authparams['domain_controllers']));
 
         // set ssl and tls separate for ldap and AD
         if ($this->ldap) {
@@ -1032,8 +1032,8 @@ 
 
             // Support the pre-1.2 auth settings as well as the current version
             // TODO: remove legacy support at some point
-            if ($authparams['ldap_security'] == 'tls' || $authparams['use_tls'] == 1)         { $dirparams['use_tls'] = true; }
-            elseif ($authparams['ldap_security'] == 'ssl' || $authparams['use_ssl'] == 1)     { $dirparams['use_ssl'] = true; }
+            if ($authparams['ldap_security'] == 'tls' || $authparams['use_tls'] == 1) { $dirparams['use_tls'] = true; }
+            elseif ($authparams['ldap_security'] == 'ssl' || $authparams['use_ssl'] == 1) { $dirparams['use_ssl'] = true; }
 
             if (isset($authparams['admin_username']) && isset($authparams['admin_password'])) {
                 $dirparams['admin_username'] = $authparams['adminUsername'];
@@ -1048,11 +1048,11 @@ 
         # open connection
         try {
             # Initialize adLDAP
-            $dirconn = new adLDAP($dirparams);
+            $dirconn = new adLDAP ($dirparams);
 
         } catch (adLDAPException $e) {
-            $this->Log->write("Directory connection error", "Failed to connect: " . $e->getMessage(), 2, null);
-            $this->Result->show("danger", _("Error: ") . $e->getMessage(), true);
+            $this->Log->write ("Directory connection error", "Failed to connect: ".$e->getMessage (), 2, null);
+            $this->Result->show ("danger", _ ("Error: ").$e->getMessage (), true);
         }
 
         return $dirconn;
@@ -1075,32 +1075,32 @@ 
         // set method
         $method = $this->ldap ? "LDAP" : "AD";
         // connect
-        $adldap = $this->directory_connect($authparams);
+        $adldap = $this->directory_connect ($authparams);
 
         # authenticate
         try {
-            if ($adldap->authenticate($username, $password)) {
+            if ($adldap->authenticate ($username, $password)) {
                 # save to session
-                $this->write_session_parameters();
+                $this->write_session_parameters ();
 
-                $this->Log->write($method . " login", "User " . $this->user->real_name . " logged in via " . $method, 0, $username);
-                $this->Result->show("success", _($method . " Login successful"));
+                $this->Log->write ($method." login", "User ".$this->user->real_name." logged in via ".$method, 0, $username);
+                $this->Result->show ("success", _ ($method." Login successful"));
 
                 # write last logintime
-                $this->update_login_time();
+                $this->update_login_time ();
                 # remove possible blocked IP
-                $this->block_remove_entry();
+                $this->block_remove_entry ();
             } # wrong user/pass by default
             else {
                 # add blocked count
-                $this->block_ip();
-                $this->Log->write($method . " login", "User $username failed to authenticate against " . $method, 1, $username);
-                $this->Result->show("danger", _("Invalid username or password for " . $username ), true);
+                $this->block_ip ();
+                $this->Log->write ($method." login", "User $username failed to authenticate against ".$method, 1, $username);
+                $this->Result->show ("danger", _ ("Invalid username or password for ".$username), true);
 
             }
         } catch (adLDAPException $e) {
-            $this->Log->write("Error", "Something went wrong during auth: " . $e->getMessage(), 2, $username);
-            $this->Result->show("danger", _("Error: ") . $e->getMessage(), true);
+            $this->Log->write ("Error", "Something went wrong during auth: ".$e->getMessage (), 2, $username);
+            $this->Result->show ("danger", _ ("Error: ").$e->getMessage (), true);
         }
 
     }
@@ -1116,9 +1116,9 @@ 
      */
     private function auth_AD ($username, $password) {
         // parse settings for LDAP connection and store them to array
-        $authparams = json_decode($this->authmethodparams, true);
+        $authparams = json_decode ($this->authmethodparams, true);
         // authenticate
-        $this->directory_authenticate($authparams, $username, $password);
+        $this->directory_authenticate ($authparams, $username, $password);
     }
 
     /**
@@ -1132,17 +1132,17 @@ 
      */
     private function auth_LDAP ($username, $password) {
         // parse settings for LDAP connection and store them to array
-        $authparams = json_decode($this->authmethodparams, true);
-        $this->ldap = true;                            //set ldap flag
+        $authparams = json_decode ($this->authmethodparams, true);
+        $this->ldap = true; //set ldap flag
 
         // set uid
-        if (!empty($authparams['uid_attr'])) { $udn = $authparams['uid_attr'] . '=' . $username; }
-        else                                 { $udn = 'uid=' . $username; }
+        if (!empty($authparams['uid_attr'])) { $udn = $authparams['uid_attr'].'='.$username; }
+        else { $udn = 'uid='.$username; }
         // set DN
-        if (!empty($authparams['users_base_dn'])) { $udn = $udn . "," . $authparams['users_base_dn']; }
-        else                                      { $udn = $udn . "," . $authparams['base_dn']; }
+        if (!empty($authparams['users_base_dn'])) { $udn = $udn.",".$authparams['users_base_dn']; }
+        else { $udn = $udn.",".$authparams['base_dn']; }
         // authenticate
-        $this->directory_authenticate($authparams, $udn, $password);
+        $this->directory_authenticate ($authparams, $udn, $password);
     }
 
     /**
@@ -1168,36 +1168,36 @@ 
      */
     private function auth_radius ($username, $password) {
         # decode radius parameters
-        $params = json_decode($this->authmethodparams);
+        $params = json_decode ($this->authmethodparams);
 
         # check for socket support !
-        if(!in_array("sockets", get_loaded_extensions())) {
-            $this->Log->write( "Radius login", "php Socket extension missing", 2 );
-            $this->Result->show("danger", _("php Socket extension missing"), true);
+        if (!in_array ("sockets", get_loaded_extensions ())) {
+            $this->Log->write ("Radius login", "php Socket extension missing", 2);
+            $this->Result->show ("danger", _ ("php Socket extension missing"), true);
         }
 
         # initialize radius class
-        require( dirname(__FILE__) . '/class.Radius.php' );
+        require(dirname (__FILE__).'/class.Radius.php');
         $Radius = new Radius ($params->hostname, $params->secret, $params->suffix, $params->timeout, $params->port);
         //debugging
-        $this->debugging!==true ? : $Radius->SetDebugMode(TRUE);
+        $this->debugging !== true ? : $Radius->SetDebugMode (TRUE);
 
         # authenticate
-        $auth = $Radius->AccessRequest($username, $password);
+        $auth = $Radius->AccessRequest ($username, $password);
         # debug?
-        if($this->debugging) {
+        if ($this->debugging) {
             print "<pre style='width:700px;margin:auto;margin-top:10px;'>";
-            print(implode("<br>", $Radius->debug_text));
+            print(implode ("<br>", $Radius->debug_text));
             print "</pre>";
         }
 
         # authenticate user
-        if($auth) {
+        if ($auth) {
             # save to session
             $this->write_session_parameters ();
 
-            $this->Log->write( "Radius login", "User ".$this->user->real_name." logged in via radius", 0, $username );
-            $this->Result->show("success", _("Radius login successful"));
+            $this->Log->write ("Radius login", "User ".$this->user->real_name." logged in via radius", 0, $username);
+            $this->Result->show ("success", _ ("Radius login successful"));
 
             # write last logintime
             $this->update_login_time ();
@@ -1207,8 +1207,8 @@ 
         else {
             # add blocked count
             $this->block_ip ();
-            $this->Log->write( "Radius login", "Failed to authenticate user on radius server", 2, $username );
-            $this->Result->show("danger", _("Invalid username or password"), true);
+            $this->Log->write ("Radius login", "Failed to authenticate user on radius server", 2, $username);
+            $this->Result->show ("danger", _ ("Invalid username or password"), true);
         }
     }
 
@@ -1244,13 +1244,13 @@ 
         # initialize salt
         $salt = "";
         # set possible salt characters in array
-        $salt_chars = array_merge(range('A','Z'), range('a','z'), range(0,9));
+        $salt_chars = array_merge (range ('A', 'Z'), range ('a', 'z'), range (0, 9));
         # loop to create salt
-        for($i=0; $i < 22; $i++) { $salt .= $salt_chars[array_rand($salt_chars)]; }
+        for ($i = 0; $i < 22; $i++) { $salt .= $salt_chars[array_rand ($salt_chars)]; }
         # get prefix
         $prefix = $this->detect_crypt_type ();
         # return crypted variable
-        return crypt($input, $prefix.$salt);
+        return crypt ($input, $prefix.$salt);
     }
 
     /**
@@ -1260,11 +1260,11 @@ 
      * @return void
      */
     private function detect_crypt_type () {
-        if(CRYPT_SHA512 == 1)        { return '$6$rounds=3000$'; }
-        elseif(CRYPT_SHA256 == 1)    { return '$5$rounds=3000$'; }
-        elseif(CRYPT_BLOWFISH == 1)    { return '$2y$'.str_pad(rand(4,31),2,0, STR_PAD_LEFT).'$'; }
-        elseif(CRYPT_MD5 == 1)        { return '$5$rounds=3000$'; }
-        else                        { $this->Result->show("danger", _("No crypt types supported"), true); }
+        if (CRYPT_SHA512 == 1) { return '$6$rounds=3000$'; }
+        elseif (CRYPT_SHA256 == 1) { return '$5$rounds=3000$'; }
+        elseif (CRYPT_BLOWFISH == 1) { return '$2y$'.str_pad (rand (4, 31), 2, 0, STR_PAD_LEFT).'$'; }
+        elseif (CRYPT_MD5 == 1) { return '$5$rounds=3000$'; }
+        else { $this->Result->show ("danger", _ ("No crypt types supported"), true); }
     }
 
     /**
@@ -1274,11 +1274,11 @@ 
      * @return void
      */
     public function return_crypt_type () {
-        if(CRYPT_SHA512 == 1)        { return 'CRYPT_SHA512'; }
-        elseif(CRYPT_SHA256 == 1)    { return 'CRYPT_SHA256'; }
-        elseif(CRYPT_BLOWFISH == 1)    { return 'CRYPT_BLOWFISH'; }
-        elseif(CRYPT_MD5 == 1)        { return 'CRYPT_MD5'; }
-        else                        { return "No crypt types supported"; }
+        if (CRYPT_SHA512 == 1) { return 'CRYPT_SHA512'; }
+        elseif (CRYPT_SHA256 == 1) { return 'CRYPT_SHA256'; }
+        elseif (CRYPT_BLOWFISH == 1) { return 'CRYPT_BLOWFISH'; }
+        elseif (CRYPT_MD5 == 1) { return 'CRYPT_MD5'; }
+        else { return "No crypt types supported"; }
     }
 
     /**
@@ -1289,10 +1289,10 @@ 
      * @return void
      */
     public function update_user_pass ($password) {
-        try { $this->Database->updateObject("users", array("password"=>$this->crypt_user_pass ($password), "passChange"=>"No", "id"=>$this->user->id), "id"); }
-        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); }
+        try { $this->Database->updateObject ("users", array ("password"=>$this->crypt_user_pass ($password), "passChange"=>"No", "id"=>$this->user->id), "id"); }
+        catch (Exception $e) { $this->Result->show ("danger", $e->getMessage (), true); }
 
-        $this->Result->show("success", "Hi, ".$this->user->real_name.", "._("your password was updated").". <a class='btn btn-sm btn-default' href='".create_link("dashboard")."'>Dashboard</a>", false);
+        $this->Result->show ("success", "Hi, ".$this->user->real_name.", "._ ("your password was updated").". <a class='btn btn-sm btn-default' href='".create_link ("dashboard")."'>Dashboard</a>", false);
     }
 
 
@@ -1316,9 +1316,9 @@ 
      * @param mixed $post //posted user details
      * @return void
      */
-    public function self_update($post) {
+    public function self_update ($post) {
         # set items to update
-        $items  = array("real_name"=>$post['real_name'],
+        $items = array ("real_name"=>$post['real_name'],
                         "mailNotify"=>$post['mailNotify'],
                         "mailChangelog"=>$post['mailChangelog'],
                         "email"=>$post['email'],
@@ -1326,10 +1326,10 @@ 
                         "id"=>$this->user->id,
                         //display
                         "compressOverride"=>$post['compressOverride'],
-                        "hideFreeRange"=>$this->verify_checkbox(@$post['hideFreeRange']),
+                        "hideFreeRange"=>$this->verify_checkbox (@$post['hideFreeRange']),
                         "menuType"=>$post['menuType'],
                         );
-        if(strlen($post['password1'])>0) {
+        if (strlen ($post['password1']) > 0) {
         $items['password'] = $this->crypt_user_pass ($post['password1']);
         }
 
@@ -1337,17 +1337,17 @@ 
         $log = $this->array_to_log ($post);
 
         # update
-        try { $this->Database->updateObject("users", $items); }
+        try { $this->Database->updateObject ("users", $items); }
         catch (Exception $e) {
-            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-            $this->Log->write( "User self update", "User self update failed!<br>".$log, 2 );
+            $this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
+            $this->Log->write ("User self update", "User self update failed!<br>".$log, 2);
             return false;
         }
         # update language
         $this->update_session_language ();
 
         # ok, update log table
-        $this->Log->write( "User self update", "User self update suceeded!", 0 );
+        $this->Log->write ("User self update", "User self update suceeded!", 0);
         return true;
     }
 
@@ -1360,9 +1360,9 @@ 
      */
     public function self_update_widgets ($widgets) {
         # update
-        try { $this->Database->updateObject("users", array("widgets"=>$widgets, "id"=>$this->user->id)); }
+        try { $this->Database->updateObject ("users", array ("widgets"=>$widgets, "id"=>$this->user->id)); }
         catch (Exception $e) {
-            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            $this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
             return false;
         }
         # ok, update log table
@@ -1377,11 +1377,11 @@ 
      */
     public function update_login_time () {
         # fix for older versions
-        if($this->settings->version!="1.1") {
+        if ($this->settings->version != "1.1") {
             # update
-            try { $this->Database->updateObject("users", array("lastLogin"=>date("Y-m-d H:i:s"), "id"=>$this->user->id)); }
+            try { $this->Database->updateObject ("users", array ("lastLogin"=>date ("Y-m-d H:i:s"), "id"=>$this->user->id)); }
             catch (Exception $e) {
-                $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+                $this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
                 return false;
             }
         }
@@ -1395,7 +1395,7 @@ 
      */
     public function update_activity_time () {
         # update
-        try { $this->Database->updateObject("users", array("lastActivity"=>date("Y-m-d H:i:s"), "id"=>$this->user->id)); }
+        try { $this->Database->updateObject ("users", array ("lastActivity"=>date ("Y-m-d H:i:s"), "id"=>$this->user->id)); }
         catch (Exception $e) { }
     }
 
@@ -1435,14 +1435,14 @@ 
         $this->purge_blocked_entries ();
         $this->block_get_ip ();
         # set date and query
-        $now = date("Y-m-d H:i:s", time() - 5*60);
+        $now = date ("Y-m-d H:i:s", time () - 5 * 60);
         $query = "select count from `loginAttempts` where `ip` = ? and `datetime` > ?;";
         # fetch
-        try { $cnt = $this->Database->getObjectQuery($query, array($this->ip, $now)); }
-        catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
+        try { $cnt = $this->Database->getObjectQuery ($query, array ($this->ip, $now)); }
+        catch (Exception $e) { !$this->debugging ? : $this->Result->show ("danger", $e->getMessage (), false); }
 
         # verify
-        return @$cnt->count>0 ? $cnt->count : false;
+        return @$cnt->count > 0 ? $cnt->count : false;
     }
 
     /**
@@ -1453,12 +1453,12 @@ 
      */
     private function block_ip () {
         # validate IP
-        if(!filter_var($this->ip, FILTER_VALIDATE_IP))    { return false; }
+        if (!filter_var ($this->ip, FILTER_VALIDATE_IP)) { return false; }
 
         # first check if already in
-        if($this->block_check_ip ())         { $this->block_update_count(); }
+        if ($this->block_check_ip ()) { $this->block_update_count (); }
         # if not in add first entry
-        else                                 { $this->block_add_entry(); }
+        else { $this->block_add_entry (); }
     }
 
     /**
@@ -1470,8 +1470,8 @@ 
      */
     private function block_get_ip () {
         # set IP
-        if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { $this->ip = @$_SERVER['HTTP_X_FORWARDED_FOR']; }
-        else                                        { $this->ip = @$_SERVER['REMOTE_ADDR']; }
+        if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { $this->ip = @$_SERVER['HTTP_X_FORWARDED_FOR']; }
+        else { $this->ip = @$_SERVER['REMOTE_ADDR']; }
     }
 
     /**
@@ -1482,11 +1482,11 @@ 
      */
     private function purge_blocked_entries () {
         # set date 5 min ago and query
-        $ago = date("Y-m-d H:i:s", time() - 5*60);
+        $ago = date ("Y-m-d H:i:s", time () - 5 * 60);
         $query = "delete from `loginAttempts` where `datetime` < ?; ";
 
-        try { $this->Database->runQuery($query, array($ago)); }
-        catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
+        try { $this->Database->runQuery ($query, array ($ago)); }
+        catch (Exception $e) { !$this->debugging ? : $this->Result->show ("danger", $e->getMessage (), false); }
     }
 
     /**
@@ -1495,11 +1495,11 @@ 
      * @access private
      * @return void
      */
-    private function block_update_count() {
+    private function block_update_count () {
         # query
         $query = "update `loginAttempts` set `count`=`count`+1 where `ip` = ?; ";
-        try { $this->Database->runQuery($query, array($this->ip)); }
-        catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
+        try { $this->Database->runQuery ($query, array ($this->ip)); }
+        catch (Exception $e) { !$this->debugging ? : $this->Result->show ("danger", $e->getMessage (), false); }
     }
 
     /**
@@ -1508,9 +1508,9 @@ 
      * @access private
      * @return void
      */
-    private function block_add_entry() {
-        try { $this->Database->insertObject("loginAttempts", array("ip"=>$this->ip, "count"=>1)); }
-        catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
+    private function block_add_entry () {
+        try { $this->Database->insertObject ("loginAttempts", array ("ip"=>$this->ip, "count"=>1)); }
+        catch (Exception $e) { !$this->debugging ? : $this->Result->show ("danger", $e->getMessage (), false); }
     }
 
     /**
@@ -1519,9 +1519,9 @@ 
      * @access private
      * @return void
      */
-    private function block_remove_entry() {
-        try { $this->Database->deleteRow("loginAttempts", "ip", $this->ip); }
-        catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
+    private function block_remove_entry () {
+        try { $this->Database->deleteRow ("loginAttempts", "ip", $this->ip); }
+        catch (Exception $e) { !$this->debugging ? : $this->Result->show ("danger", $e->getMessage (), false); }
     }
 }
 

app/admin/authentication-methods/index.php

Spacing +30 added lines, -30 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all auth methods
-$all_methods = $Admin->fetch_all_objects("usersAuthMethod");
+$all_methods = $Admin->fetch_all_objects ("usersAuthMethod");
 # fetch all parameters for each method
-$all_method_types = $User->fetch_available_auth_method_types();
+$all_method_types = $User->fetch_available_auth_method_types ();
 ?>
 
 
-<h4><?php print _("Authentication methods"); ?></h4>
+<h4><?php print _ ("Authentication methods"); ?></h4>
 <hr>
 
 <!-- Add new -->
 <div class="btn-group" style="margin-bottom: 20px;">
 <?php
-foreach($all_method_types as $type) {
-	print "<button class='btn btn-sm btn-default editAuthMethod' style='margin-bottom:10px;' data-action='add' data-type='$type'><i class='fa fa-plus'></i> "._("Create new $type authentication")."</button>";
+foreach ($all_method_types as $type) {
+	print "<button class='btn btn-sm btn-default editAuthMethod' style='margin-bottom:10px;' data-action='add' data-type='$type'><i class='fa fa-plus'></i> "._ ("Create new $type authentication")."</button>";
 }
 ?>
 </div>
@@ -27,23 +27,23 @@ 
 
 <!-- Headers -->
 <tr>
-    <th><?php print _('Type'); ?></th>
-    <th><?php print _('Description'); ?></th>
-    <th><?php print _('Parameters'); ?></th>
-    <th><?php print _('Users'); ?></th>
-    <th><?php print _('Protected'); ?></th>
+    <th><?php print _ ('Type'); ?></th>
+    <th><?php print _ ('Description'); ?></th>
+    <th><?php print _ ('Parameters'); ?></th>
+    <th><?php print _ ('Users'); ?></th>
+    <th><?php print _ ('Protected'); ?></th>
     <th></th>
 </tr>
 
 <!-- data -->
 <?php
 //loop
-foreach($all_methods as $method) {
+foreach ($all_methods as $method) {
 	//set protected
-	$protected_class = $method->protected=="yes" ? "danger" : "";
+	$protected_class = $method->protected == "yes" ? "danger" : "";
 
 	//number of users
-	$user_num = $Database->numObjectsFilter("users", "authMethod", $method->id);
+	$user_num = $Database->numObjectsFilter ("users", "authMethod", $method->id);
 
 	print "<tr>";
 	print "	<td>$method->type</td>";
@@ -51,11 +51,11 @@ 
 	//parameters
 	print "	<td>";
 	print "	<span class='text-muted'>";
-	if(strlen($method->params)>0) {
-		$params = json_decode($method->params);
-		foreach($params as $key=>$parameter) {
+	if (strlen ($method->params) > 0) {
+		$params = json_decode ($method->params);
+		foreach ($params as $key=>$parameter) {
 			// mask user/pass
-			if($key=="adminPassword")	{ $parameter = "********"; }
+			if ($key == "adminPassword") { $parameter = "********"; }
 			// print
 			print $key." => ".$parameter."<br>";
 		}
@@ -68,7 +68,7 @@ 
 	print "	<td class='$protected_class'>$user_num</td>";
 	print "	<td class='$protected_class'>$method->protected</td>";
 	//actions
-	$disabled = $method->type=="local" ? "disabled" : "";
+	$disabled = $method->type == "local" ? "disabled" : "";
 	print "	<td class='actions'>";
 	print "	<div class='btn-group'>";
 	print "		<button class='btn btn-xs btn-default editAuthMethod' data-id='$method->id' data-action='edit'   data-type='$method->type' rel='tooltip' title='Edit'><i class='fa fa-pencil'></i></button>";
@@ -84,19 +84,19 @@ 
 
 <hr>
 <div class="alert alert-info alert-absolute" style="margin-top:30px;">
-	<?php print _("Here you can set different authentication methods for your users."); ?>
+	<?php print _ ("Here you can set different authentication methods for your users."); ?>
 	<hr>
-	<?php print _("phpIPAM currently supports 7 methods for authentication:"); ?>
+	<?php print _ ("phpIPAM currently supports 7 methods for authentication:"); ?>
 	<ul>
-		<li><?php print _("Local authentication"); ?></li>
-		<li><?php print _("Apache authentication"); ?></li>
-		<li><?php print _("AD (Active Directory) authentication"); ?></li>
-		<li><?php print _("LDAP authentication"); ?></li>
-		<li><?php print _("NetIQ authentication"); ?></li>
-		<li><?php print _("Radius authentication"); ?></li>
-		<li><?php print _("SAMLv2 authentication"); ?></li>
+		<li><?php print _ ("Local authentication"); ?></li>
+		<li><?php print _ ("Apache authentication"); ?></li>
+		<li><?php print _ ("AD (Active Directory) authentication"); ?></li>
+		<li><?php print _ ("LDAP authentication"); ?></li>
+		<li><?php print _ ("NetIQ authentication"); ?></li>
+		<li><?php print _ ("Radius authentication"); ?></li>
+		<li><?php print _ ("SAMLv2 authentication"); ?></li>
 	</ul>
 	<br>
-	<?php print _("For AD/LDAP/NetIQ connection phpipam is using adLDAP, for documentation please check ")."<a href='http://adldap.sourceforge.net/'>adLDAP</a><br><br>"; ?>
-	<?php print _('First create new user under user management with <u>same username as on AD</u> and set authention type to one of available methods.')."<br>"._('Also set proper permissions - group membership for new user'); ?>
+	<?php print _ ("For AD/LDAP/NetIQ connection phpipam is using adLDAP, for documentation please check ")."<a href='http://adldap.sourceforge.net/'>adLDAP</a><br><br>"; ?>
+	<?php print _ ('First create new user under user management with <u>same username as on AD</u> and set authention type to one of available methods.')."<br>"._ ('Also set proper permissions - group membership for new user'); ?>
 </div>

app/admin/authentication-methods/edit-SAML2.php

Indentation +51 added lines, -51 removed lines

@@ -9,21 +9,21 @@ 
 
 # ID must be numeric */
 if($_POST['action']!="add") {
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+    if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
 
-	# feth method settings
-	$method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-	$method_settings->params = json_decode($method_settings->params);
+    # feth method settings
+    $method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
+    $method_settings->params = json_decode($method_settings->params);
 }
 else {
-	$method_settings = new StdClass ();
-	# set default values
+    $method_settings = new StdClass ();
+    # set default values
     $method_settings->params->idpissuer = "";
-	$method_settings->params->idplogin = "";
-	$method_settings->params->idplogout = "";
-	$method_settings->params->idpcertfingerprint = "";
-	$method_settings->params->idpcertalgorithm = "sha1";
-	//$method_settings->params->timeout = 2;
+    $method_settings->params->idplogin = "";
+    $method_settings->params->idplogout = "";
+    $method_settings->params->idpcertfingerprint = "";
+    $method_settings->params->idpcertalgorithm = "sha1";
+    //$method_settings->params->timeout = 2;
 
 }
 
@@ -123,12 +123,12 @@ 
 		<td>
 			<select name="idpcertalgorithm" class="form-control input-w-auto">
 			<?php
-			$values = array("sha1","sha256", "sha384", "sha512");
-			foreach($values as $v) {
-				if($v==@$method_settings->params->idpcertalgorithm)	{ print "<option value='$v' selected=selected>$v</option>"; }
-				else										{ print "<option value='$v'					 >$v</option>"; }
-			}
-			?>
+            $values = array("sha1","sha256", "sha384", "sha512");
+            foreach($values as $v) {
+                if($v==@$method_settings->params->idpcertalgorithm)	{ print "<option value='$v' selected=selected>$v</option>"; }
+                else										{ print "<option value='$v'					 >$v</option>"; }
+            }
+            ?>
 			</select>
 		</td>
 		<td class="base_dn info2">
@@ -140,32 +140,32 @@ 
 	</form>
 
 	<?php
-	# check for support 
-	if(!in_array("xml", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php xml extension missing!", 2 );
-		$Result->show("danger", _("php XML extension missing!"), false);
-	}
-	if(!in_array("date", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php date extension missing!", 2 );
-		$Result->show("danger", _("php Date extension missing!"), false);
-	}
-	if(!in_array("zlib", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php zlib extension missing!", 2 );
-		$Result->show("danger", _("php zlib extension missing!"), false);
-	}
-	if(!in_array("openssl", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php openssl extension missing!", 2 );
-		$Result->show("danger", _("php openssl extension missing!"), false);
-	}
-	if(!in_array("mcrypt", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php mcrypt extension missing!", 2 );
-		$Result->show("danger", _("php mcrypt extension missing!"), false);
-	}
-	if(!in_array("gettext", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php gettext extension missing!", 2 );
-		$Result->show("danger", _("php gettext extension missing!"), false);
-	}
-	?>
+    # check for support 
+    if(!in_array("xml", get_loaded_extensions())) {
+        $Log->write( "SAML2 login", "php xml extension missing!", 2 );
+        $Result->show("danger", _("php XML extension missing!"), false);
+    }
+    if(!in_array("date", get_loaded_extensions())) {
+        $Log->write( "SAML2 login", "php date extension missing!", 2 );
+        $Result->show("danger", _("php Date extension missing!"), false);
+    }
+    if(!in_array("zlib", get_loaded_extensions())) {
+        $Log->write( "SAML2 login", "php zlib extension missing!", 2 );
+        $Result->show("danger", _("php zlib extension missing!"), false);
+    }
+    if(!in_array("openssl", get_loaded_extensions())) {
+        $Log->write( "SAML2 login", "php openssl extension missing!", 2 );
+        $Result->show("danger", _("php openssl extension missing!"), false);
+    }
+    if(!in_array("mcrypt", get_loaded_extensions())) {
+        $Log->write( "SAML2 login", "php mcrypt extension missing!", 2 );
+        $Result->show("danger", _("php mcrypt extension missing!"), false);
+    }
+    if(!in_array("gettext", get_loaded_extensions())) {
+        $Log->write( "SAML2 login", "php gettext extension missing!", 2 );
+        $Result->show("danger", _("php gettext extension missing!"), false);
+    }
+    ?>
 </div>
 
 
@@ -177,14 +177,14 @@ 
 	</div>
 
 	<?php
-	# check for mathing users
-	if($_POST['action']=="delete") {
-		$users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
-		if($users!==false) {
-			$Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
-		}
-	}
-	?>
+    # check for mathing users
+    if($_POST['action']=="delete") {
+        $users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
+        if($users!==false) {
+            $Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
+        }
+    }
+    ?>
 
 	<!-- Result -->
 	<div class="editAuthMethodResult"></div>

Spacing +49 added lines, -49 removed lines

@@ -5,15 +5,15 @@ 
  *****************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # ID must be numeric */
-if($_POST['action']!="add") {
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add") {
+	if (!is_numeric ($_POST['id'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 	# feth method settings
 	$method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-	$method_settings->params = json_decode($method_settings->params);
+	$method_settings->params = json_decode ($method_settings->params);
 }
 else {
 	$method_settings = new StdClass ();
@@ -28,11 +28,11 @@ 
 }
 
 # set delete flag
-$delete = $_POST['action']=="delete" ? "disabled" : "";
+$delete = $_POST['action'] == "delete" ? "disabled" : "";
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _('SAML2 connection settings'); ?></div>
+<div class="pHeader"><?php print _ ('SAML2 connection settings'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -42,12 +42,12 @@ 
 
 	<!-- description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
 			<input type="text" name="description" class="form-control input-sm" value="<?php print @$method_settings->description; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Set name for authentication method'); ?>
+			<?php print _ ('Set name for authentication method'); ?>
 		</td>
 	</tr>
 
@@ -57,15 +57,15 @@ 
 
 <!-- SSL -->
 	<tr>
-		<td><?php print _('Use advanced settings'); ?></td>
+		<td><?php print _ ('Use advanced settings'); ?></td>
 		<td>
 			<select name="advanced" class="form-control input-sm input-w-auto" <?php print $delete; ?>>
-				<option value="0" <?php if(@$method_settings->params->advanced == 0) { print 'selected'; } ?>><?php print _('false'); ?></option>
-				<option value="1" <?php if(@$method_settings->params->advanced == 1) { print 'selected'; } ?>><?php print _('true'); ?></option>
+				<option value="0" <?php if (@$method_settings->params->advanced == 0) { print 'selected'; } ?>><?php print _ ('false'); ?></option>
+				<option value="1" <?php if (@$method_settings->params->advanced == 1) { print 'selected'; } ?>><?php print _ ('true'); ?></option>
 			</select>
 		</td>
 		<td class="info2">
-			<?php print _('Use Onelogin php-saml settings.php configuration'); ?><br>
+			<?php print _ ('Use Onelogin php-saml settings.php configuration'); ?><br>
 		</td>
 	</tr>
 	<tr>
@@ -74,7 +74,7 @@ 
 	
 	<!-- Idp issuer -->
 	<tr>
-		<td><?php print _('IDP issuer'); ?></td>
+		<td><?php print _ ('IDP issuer'); ?></td>
 		<td>
 			<input type="text" name="idpissuer" class="form-control input-sm" value="<?php print @$method_settings->params->idpissuer; ?>" <?php print $delete; ?>>
 			<input type="hidden" name="type" value="SAML2">
@@ -83,56 +83,56 @@ 
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Enter idp issuer'); ?>
+			<?php print _ ('Enter idp issuer'); ?>
 		</td>
 	</tr>
 
 	<!-- Idp login -->
 	<tr>
-		<td><?php print _('IDP login url'); ?></td>
+		<td><?php print _ ('IDP login url'); ?></td>
 		<td>
 			<input type="text" name="idplogin" class="form-control input-sm" value="<?php print @$method_settings->params->idplogin; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Enter IDP login url'); ?>
+			<?php print _ ('Enter IDP login url'); ?>
 		</td>
 	</tr>
 	<!-- Idp logout -->
 	<tr>
-		<td><?php print _('IDP logout url'); ?></td>
+		<td><?php print _ ('IDP logout url'); ?></td>
 		<td>
 			<input type="text" name="idplogout" class="form-control input-sm" value="<?php print @$method_settings->params->idplogout; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Enter IDP logout url'); ?>
+			<?php print _ ('Enter IDP logout url'); ?>
 		</td>
 	</tr>
 	<!-- Idp cert fingerprint -->
 	<tr>
-		<td><?php print _('IDP cert fingerprint'); ?></td>
+		<td><?php print _ ('IDP cert fingerprint'); ?></td>
 		<td>
 			<input type="text" name="idpcertfingerprint" class="form-control input-sm" value="<?php print @$method_settings->params->idpcertfingerprint; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Enter IDP X509 certificate fingerprint'); ?>
+			<?php print _ ('Enter IDP X509 certificate fingerprint'); ?>
 		</td>
 	</tr>
 	<!-- Idp cert algorithm -->
 	<tr>
-		<td><?php print _('IDP cert algorithm'); ?></td>
+		<td><?php print _ ('IDP cert algorithm'); ?></td>
 		<td>
 			<select name="idpcertalgorithm" class="form-control input-w-auto">
 			<?php
-			$values = array("sha1","sha256", "sha384", "sha512");
-			foreach($values as $v) {
-				if($v==@$method_settings->params->idpcertalgorithm)	{ print "<option value='$v' selected=selected>$v</option>"; }
-				else										{ print "<option value='$v'					 >$v</option>"; }
+			$values = array ("sha1", "sha256", "sha384", "sha512");
+			foreach ($values as $v) {
+				if ($v == @$method_settings->params->idpcertalgorithm) { print "<option value='$v' selected=selected>$v</option>"; }
+				else { print "<option value='$v'					 >$v</option>"; }
 			}
 			?>
 			</select>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Enter IDP X509 certificate algorithm'); ?>
+			<?php print _ ('Enter IDP X509 certificate algorithm'); ?>
 		</td>
 	</tr>
 
@@ -141,29 +141,29 @@ 
 
 	<?php
 	# check for support 
-	if(!in_array("xml", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php xml extension missing!", 2 );
-		$Result->show("danger", _("php XML extension missing!"), false);
+	if (!in_array ("xml", get_loaded_extensions ())) {
+		$Log->write ("SAML2 login", "php xml extension missing!", 2);
+		$Result->show ("danger", _ ("php XML extension missing!"), false);
 	}
-	if(!in_array("date", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php date extension missing!", 2 );
-		$Result->show("danger", _("php Date extension missing!"), false);
+	if (!in_array ("date", get_loaded_extensions ())) {
+		$Log->write ("SAML2 login", "php date extension missing!", 2);
+		$Result->show ("danger", _ ("php Date extension missing!"), false);
 	}
-	if(!in_array("zlib", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php zlib extension missing!", 2 );
-		$Result->show("danger", _("php zlib extension missing!"), false);
+	if (!in_array ("zlib", get_loaded_extensions ())) {
+		$Log->write ("SAML2 login", "php zlib extension missing!", 2);
+		$Result->show ("danger", _ ("php zlib extension missing!"), false);
 	}
-	if(!in_array("openssl", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php openssl extension missing!", 2 );
-		$Result->show("danger", _("php openssl extension missing!"), false);
+	if (!in_array ("openssl", get_loaded_extensions ())) {
+		$Log->write ("SAML2 login", "php openssl extension missing!", 2);
+		$Result->show ("danger", _ ("php openssl extension missing!"), false);
 	}
-	if(!in_array("mcrypt", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php mcrypt extension missing!", 2 );
-		$Result->show("danger", _("php mcrypt extension missing!"), false);
+	if (!in_array ("mcrypt", get_loaded_extensions ())) {
+		$Log->write ("SAML2 login", "php mcrypt extension missing!", 2);
+		$Result->show ("danger", _ ("php mcrypt extension missing!"), false);
 	}
-	if(!in_array("gettext", get_loaded_extensions())) {
-		$Log->write( "SAML2 login", "php gettext extension missing!", 2 );
-		$Result->show("danger", _("php gettext extension missing!"), false);
+	if (!in_array ("gettext", get_loaded_extensions ())) {
+		$Log->write ("SAML2 login", "php gettext extension missing!", 2);
+		$Result->show ("danger", _ ("php gettext extension missing!"), false);
 	}
 	?>
 </div>
@@ -172,16 +172,16 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if ($_POST['action'] == "add") { print "fa-plus"; } else if ($_POST['action'] == "delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords (_ ($_POST['action'])); ?></button>
 	</div>
 
 	<?php
 	# check for mathing users
-	if($_POST['action']=="delete") {
+	if ($_POST['action'] == "delete") {
 		$users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
-		if($users!==false) {
-			$Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
+		if ($users !== false) {
+			$Result->show ("warning", sizeof ($users)._ (" users have this method for logging in. They will be reset to local auth!"), false);
 		}
 	}
 	?>

Braces +4 added lines, -1 removed lines

@@ -174,7 +174,10 @@
 <div class="pFooter">
 	<div class="btn-group">
 		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; }
+else if ($_POST['action']=="delete") { print "fa-trash-o"; }
+else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
 	</div>
 
 	<?php

app/login/index.php

Indentation +42 added lines, -42 removed lines

@@ -5,11 +5,11 @@ 
 // http auth
 if( !empty($_SERVER['PHP_AUTH_USER']) ) {
     // try to authenticate
-	$User->authenticate ($_SERVER['PHP_AUTH_USER'], '');
-	// Redirect user where he came from, if unknown go to dashboard.
-	if( isset($_COOKIE['phpipamredirect']) )    { header("Location: ".$_COOKIE['phpipamredirect']); }
-	else                                        { header("Location: ".create_link("dashboard")); }
-	exit();
+    $User->authenticate ($_SERVER['PHP_AUTH_USER'], '');
+    // Redirect user where he came from, if unknown go to dashboard.
+    if( isset($_COOKIE['phpipamredirect']) )    { header("Location: ".$_COOKIE['phpipamredirect']); }
+    else                                        { header("Location: ".create_link("dashboard")); }
+    exit();
 }
 ?>
 
@@ -82,9 +82,9 @@ 
     <!-- logo -->
 	<div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">
     <?php
-	if(file_exists( "css/1.2/images/logo/logo.png")) {
-    	print "<img style='width:220px;margin:10px;margin-top:20px;' src='css/1.2/images/logo/logo.png'>";
-	}
+    if(file_exists( "css/1.2/images/logo/logo.png")) {
+        print "<img style='width:220px;margin:10px;margin-top:20px;' src='css/1.2/images/logo/logo.png'>";
+    }
     ?>
 	</div>
 	<!-- title -->
@@ -103,48 +103,48 @@ 
 <div class="container-fluid" id="mainContainer">
 
 	<?php
-	# set default language
-	if(isset($User->settings->defaultLang) && !is_null($User->settings->defaultLang) ) {
-		# get language
-		$lang = $User->get_default_lang();
-
-		putenv("LC_ALL=".$lang->l_code);
-		setlocale(LC_ALL, $lang->l_code);					// set language
-		bindtextdomain("phpipam", "./functions/locale");	// Specify location of translation tables
-		textdomain("phpipam");								// Choose domain
-	}
-	?>
+    # set default language
+    if(isset($User->settings->defaultLang) && !is_null($User->settings->defaultLang) ) {
+        # get language
+        $lang = $User->get_default_lang();
+
+        putenv("LC_ALL=".$lang->l_code);
+        setlocale(LC_ALL, $lang->l_code);					// set language
+        bindtextdomain("phpipam", "./functions/locale");	// Specify location of translation tables
+        textdomain("phpipam");								// Choose domain
+    }
+    ?>
 
 	<?php
-	# include proper subpage
-	if($_GET['page'] == "login") 				{ include_once('login_form.php'); }
-	else if ($_GET['page'] == "request_ip") 	{ include_once('request_ip_form.php'); }
-	else 										{ $_GET['subnetId'] = "404"; print "<div id='error'>"; include_once('app/error.php'); print "</div>"; }
-	?>
+    # include proper subpage
+    if($_GET['page'] == "login") 				{ include_once('login_form.php'); }
+    else if ($_GET['page'] == "request_ip") 	{ include_once('request_ip_form.php'); }
+    else 										{ $_GET['subnetId'] = "404"; print "<div id='error'>"; include_once('app/error.php'); print "</div>"; }
+    ?>
 
 	<!-- login response -->
 	<div id="loginCheck">
 		<?php
-		# deauthenticate user
-		if ( $User->is_authenticated()===true ) {
-			# print result
-			if($_GET['section']=="timeout")		{ $Result->show("success", _('You session has timed out')); }
-			else								{ $Result->show("success", _('You have logged out')); }
-
-			# write log
-			$Log->write( "User logged out", "User $User->username has logged out", 0, $User->username );
-
-			# destroy session
-			$User->destroy_session();
-		}
+        # deauthenticate user
+        if ( $User->is_authenticated()===true ) {
+            # print result
+            if($_GET['section']=="timeout")		{ $Result->show("success", _('You session has timed out')); }
+            else								{ $Result->show("success", _('You have logged out')); }
+
+            # write log
+            $Log->write( "User logged out", "User $User->username has logged out", 0, $User->username );
+
+            # destroy session
+            $User->destroy_session();
+        }
 		
-		//check if SAML2 login is possible
-		$saml2settings=$Tools->fetch_object("usersAuthMethod", "type", "SAML2");
-		if($saml2settings!=false){
-			$Result->show("success", _('You can login with SAML2 <a href="'.$Tools->createURL().'/saml2">here</a>'));
-		}
+        //check if SAML2 login is possible
+        $saml2settings=$Tools->fetch_object("usersAuthMethod", "type", "SAML2");
+        if($saml2settings!=false){
+            $Result->show("success", _('You can login with SAML2 <a href="'.$Tools->createURL().'/saml2">here</a>'));
+        }
 		
-		?>
+        ?>
 	</div>
 
 </div>

Spacing +26 added lines, -26 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 # verify php build
-include('functions/checks/check_php_build.php');		# check for support for PHP modules and database connection
+include('functions/checks/check_php_build.php'); # check for support for PHP modules and database connection
 
 // http auth
-if( !empty($_SERVER['PHP_AUTH_USER']) ) {
+if (!empty($_SERVER['PHP_AUTH_USER'])) {
     // try to authenticate
 	$User->authenticate ($_SERVER['PHP_AUTH_USER'], '');
 	// Redirect user where he came from, if unknown go to dashboard.
-	if( isset($_COOKIE['phpipamredirect']) )    { header("Location: ".$_COOKIE['phpipamredirect']); }
-	else                                        { header("Location: ".create_link("dashboard")); }
+	if (isset($_COOKIE['phpipamredirect'])) { header ("Location: ".$_COOKIE['phpipamredirect']); }
+	else { header ("Location: ".create_link ("dashboard")); }
 	exit();
 }
 ?>
@@ -65,7 +65,7 @@ 
 <div class="jqueryError">
 	<div class='alert alert-danger' style="width:400px;margin:auto">jQuery error!</div>
 	<div class="jqueryErrorText"></div><br>
-	<a href="<?php print create_link(null); ?>" class="btn btn-sm btn-default" id="hideError" style="margin-top:0px;">Hide</a>
+	<a href="<?php print create_link (null); ?>" class="btn btn-sm btn-default" id="hideError" style="margin-top:0px;">Hide</a>
 </div>
 
 <!-- Popups -->
@@ -75,14 +75,14 @@ 
 <div id="popup" class="popup popup_w700"></div>
 
 <!-- loader -->
-<div class="loading"><?php print _('Loading');?>...<br><i class="fa fa-spinner fa-spin"></i></div>
+<div class="loading"><?php print _ ('Loading'); ?>...<br><i class="fa fa-spinner fa-spin"></i></div>
 
 <!-- header -->
 <div class="row header-install" id="header">
     <!-- logo -->
 	<div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">
     <?php
-	if(file_exists( "css/1.2/images/logo/logo.png")) {
+	if (file_exists ("css/1.2/images/logo/logo.png")) {
     	print "<img style='width:220px;margin:10px;margin-top:20px;' src='css/1.2/images/logo/logo.png'>";
 	}
     ?>
@@ -90,8 +90,8 @@ 
 	<!-- title -->
 	<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 		<div class="hero-unit" style="padding:20px;margin-bottom:10px;margin-top: 10px;">
-			<a href="<?php print create_link(null); ?>"><?php print $User->settings->siteTitle;?></a>
-            <p class="muted"><?php print _("Login"); ?></p>
+			<a href="<?php print create_link (null); ?>"><?php print $User->settings->siteTitle; ?></a>
+            <p class="muted"><?php print _ ("Login"); ?></p>
 		</div>
 	</div>
 	<div class="col-lg-3 col-md-3 hidden-sm hidden-xs">
@@ -104,44 +104,44 @@ 
 
 	<?php
 	# set default language
-	if(isset($User->settings->defaultLang) && !is_null($User->settings->defaultLang) ) {
+	if (isset($User->settings->defaultLang) && !is_null ($User->settings->defaultLang)) {
 		# get language
-		$lang = $User->get_default_lang();
+		$lang = $User->get_default_lang ();
 
-		putenv("LC_ALL=".$lang->l_code);
-		setlocale(LC_ALL, $lang->l_code);					// set language
-		bindtextdomain("phpipam", "./functions/locale");	// Specify location of translation tables
-		textdomain("phpipam");								// Choose domain
+		putenv ("LC_ALL=".$lang->l_code);
+		setlocale (LC_ALL, $lang->l_code); // set language
+		bindtextdomain ("phpipam", "./functions/locale"); // Specify location of translation tables
+		textdomain ("phpipam"); // Choose domain
 	}
 	?>
 
 	<?php
 	# include proper subpage
-	if($_GET['page'] == "login") 				{ include_once('login_form.php'); }
-	else if ($_GET['page'] == "request_ip") 	{ include_once('request_ip_form.php'); }
-	else 										{ $_GET['subnetId'] = "404"; print "<div id='error'>"; include_once('app/error.php'); print "</div>"; }
+	if ($_GET['page'] == "login") { include_once('login_form.php'); }
+	else if ($_GET['page'] == "request_ip") { include_once('request_ip_form.php'); }
+	else { $_GET['subnetId'] = "404"; print "<div id='error'>"; include_once('app/error.php'); print "</div>"; }
 	?>
 
 	<!-- login response -->
 	<div id="loginCheck">
 		<?php
 		# deauthenticate user
-		if ( $User->is_authenticated()===true ) {
+		if ($User->is_authenticated () === true) {
 			# print result
-			if($_GET['section']=="timeout")		{ $Result->show("success", _('You session has timed out')); }
-			else								{ $Result->show("success", _('You have logged out')); }
+			if ($_GET['section'] == "timeout") { $Result->show ("success", _ ('You session has timed out')); }
+			else { $Result->show ("success", _ ('You have logged out')); }
 
 			# write log
-			$Log->write( "User logged out", "User $User->username has logged out", 0, $User->username );
+			$Log->write ("User logged out", "User $User->username has logged out", 0, $User->username);
 
 			# destroy session
-			$User->destroy_session();
+			$User->destroy_session ();
 		}
 		
 		//check if SAML2 login is possible
-		$saml2settings=$Tools->fetch_object("usersAuthMethod", "type", "SAML2");
-		if($saml2settings!=false){
-			$Result->show("success", _('You can login with SAML2 <a href="'.$Tools->createURL().'/saml2">here</a>'));
+		$saml2settings = $Tools->fetch_object ("usersAuthMethod", "type", "SAML2");
+		if ($saml2settings != false) {
+			$Result->show ("success", _ ('You can login with SAML2 <a href="'.$Tools->createURL ().'/saml2">here</a>'));
 		}
 		
 		?>

Braces +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
 		
 		//check if SAML2 login is possible
 		$saml2settings=$Tools->fetch_object("usersAuthMethod", "type", "SAML2");
-		if($saml2settings!=false){
+		if($saml2settings!=false) {
 			$Result->show("success", _('You can login with SAML2 <a href="'.$Tools->createURL().'/saml2">here</a>'));
 		}
 		

app/saml2/index.php

Indentation +30 added lines, -30 removed lines

@@ -14,10 +14,10 @@ 
 $params=json_decode($dbobj->params);
 //if using advanced settings, instantiate without db settings
 if($params->advanced=="1"){
-	$auth = new OneLogin_Saml2_Auth(); 
+    $auth = new OneLogin_Saml2_Auth(); 
 }else{
 
-	$settings = array (
+    $settings = array (
         'sp' => array (
             'entityId' => $Tools->createURL(),
             'assertionConsumerService' => array (
@@ -37,45 +37,45 @@ 
                 'url' => $params->idplogout,
             ),
             'certFingerprint' => $params->idpcertfingerprint,
-	        'certFingerprintAlgorithm' => $params->idpcertalgorithm,
+            'certFingerprintAlgorithm' => $params->idpcertalgorithm,
         ),
     );	
-	$auth = new OneLogin_Saml2_Auth($settings); 
+    $auth = new OneLogin_Saml2_Auth($settings); 
 }
 //if SAMLResponse is not in the request, create an authnrequest and send it to the idp
 if(!isset($_POST["SAMLResponse"])){
-	$ssoBuiltUrl = $auth->login(null, array(), false, false, true);
-	$_SESSION['AuthNRequestID'] = $auth->getLastRequestID();
-	header('Pragma: no-cache');
-	header('Cache-Control: no-cache, must-revalidate');
-	header('Location: ' . $ssoBuiltUrl);
-	exit();
+    $ssoBuiltUrl = $auth->login(null, array(), false, false, true);
+    $_SESSION['AuthNRequestID'] = $auth->getLastRequestID();
+    header('Pragma: no-cache');
+    header('Cache-Control: no-cache, must-revalidate');
+    header('Location: ' . $ssoBuiltUrl);
+    exit();
 }else{
 //process the authentication response
-	if (isset($_SESSION) && isset($_SESSION['AuthNRequestID'])) {
-	    $requestID = $_SESSION['AuthNRequestID'];
-	} else {
-	    $requestID = null;
-	}
+    if (isset($_SESSION) && isset($_SESSION['AuthNRequestID'])) {
+        $requestID = $_SESSION['AuthNRequestID'];
+    } else {
+        $requestID = null;
+    }
 	
-	$auth->processResponse($requestID);
+    $auth->processResponse($requestID);
 
-	$errors = $auth->getErrors();
+    $errors = $auth->getErrors();
 	
-	if (!empty($errors)) {
-	    print_r('<p>'.implode(', ', $errors).'</p>');
-	    exit();
-	}
+    if (!empty($errors)) {
+        print_r('<p>'.implode(', ', $errors).'</p>');
+        exit();
+    }
 	
-	if (!$auth->isAuthenticated()) {
-	    echo "<p>Not authenticated</p>";
-	    exit();
-	}
+    if (!$auth->isAuthenticated()) {
+        echo "<p>Not authenticated</p>";
+        exit();
+    }
 	
-	// try to authenticate in phpipam
-	$User->authenticate ($auth->getNameId(), '');
-	// Redirect user where he came from, if unknown go to dashboard.
-	if( isset($_COOKIE['phpipamredirect']) )    { header("Location: ".$_COOKIE['phpipamredirect']); }
-	else                                        { header("Location: ".create_link("dashboard")); }
+    // try to authenticate in phpipam
+    $User->authenticate ($auth->getNameId(), '');
+    // Redirect user where he came from, if unknown go to dashboard.
+    if( isset($_COOKIE['phpipamredirect']) )    { header("Location: ".$_COOKIE['phpipamredirect']); }
+    else                                        { header("Location: ".create_link("dashboard")); }
 
 }
\ No newline at end of file

Spacing +27 added lines, -27 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 # verify php build
-include('functions/checks/check_php_build.php');		# check for support for PHP modules and database connection
-define("TOOLKIT_PATH", '/var/www/html/phpipam/functions/php-saml/');
-require_once(TOOLKIT_PATH . '_toolkit_loader.php');   // We load the SAML2 lib
+include('functions/checks/check_php_build.php'); # check for support for PHP modules and database connection
+define ("TOOLKIT_PATH", '/var/www/html/phpipam/functions/php-saml/');
+require_once(TOOLKIT_PATH.'_toolkit_loader.php'); // We load the SAML2 lib
 
 //get SAML2 settings from db 
-$dbobj=$Tools->fetch_object("usersAuthMethod", "type", "SAML2");
-if(!$dbobj){
+$dbobj = $Tools->fetch_object ("usersAuthMethod", "type", "SAML2");
+if (!$dbobj) {
 echo "SAML settings not found in database";
 die();
 }
 //decode authentication module params
-$params=json_decode($dbobj->params);
+$params = json_decode ($dbobj->params);
 //if using advanced settings, instantiate without db settings
-if($params->advanced=="1"){
-	$auth = new OneLogin_Saml2_Auth(); 
-}else{
+if ($params->advanced == "1") {
+	$auth = new OneLogin_Saml2_Auth (); 
+} else {
 
 	$settings = array (
         'sp' => array (
-            'entityId' => $Tools->createURL(),
+            'entityId' => $Tools->createURL (),
             'assertionConsumerService' => array (
-                'url' => $Tools->createURL()."/saml2",
+                'url' => $Tools->createURL ()."/saml2",
             ),
             'singleLogoutService' => array (
-                'url' => $Tools->createURL(),
+                'url' => $Tools->createURL (),
             ),
             'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified',
         ),
@@ -40,17 +40,17 @@ 
 	        'certFingerprintAlgorithm' => $params->idpcertalgorithm,
         ),
     );	
-	$auth = new OneLogin_Saml2_Auth($settings); 
+	$auth = new OneLogin_Saml2_Auth ($settings); 
 }
 //if SAMLResponse is not in the request, create an authnrequest and send it to the idp
-if(!isset($_POST["SAMLResponse"])){
-	$ssoBuiltUrl = $auth->login(null, array(), false, false, true);
-	$_SESSION['AuthNRequestID'] = $auth->getLastRequestID();
-	header('Pragma: no-cache');
-	header('Cache-Control: no-cache, must-revalidate');
-	header('Location: ' . $ssoBuiltUrl);
+if (!isset($_POST["SAMLResponse"])) {
+	$ssoBuiltUrl = $auth->login (null, array (), false, false, true);
+	$_SESSION['AuthNRequestID'] = $auth->getLastRequestID ();
+	header ('Pragma: no-cache');
+	header ('Cache-Control: no-cache, must-revalidate');
+	header ('Location: '.$ssoBuiltUrl);
 	exit();
-}else{
+} else {
 //process the authentication response
 	if (isset($_SESSION) && isset($_SESSION['AuthNRequestID'])) {
 	    $requestID = $_SESSION['AuthNRequestID'];
@@ -58,24 +58,24 @@ 
 	    $requestID = null;
 	}
 	
-	$auth->processResponse($requestID);
+	$auth->processResponse ($requestID);
 
-	$errors = $auth->getErrors();
+	$errors = $auth->getErrors ();
 	
 	if (!empty($errors)) {
-	    print_r('<p>'.implode(', ', $errors).'</p>');
+	    print_r ('<p>'.implode (', ', $errors).'</p>');
 	    exit();
 	}
 	
-	if (!$auth->isAuthenticated()) {
+	if (!$auth->isAuthenticated ()) {
 	    echo "<p>Not authenticated</p>";
 	    exit();
 	}
 	
 	// try to authenticate in phpipam
-	$User->authenticate ($auth->getNameId(), '');
+	$User->authenticate ($auth->getNameId (), '');
 	// Redirect user where he came from, if unknown go to dashboard.
-	if( isset($_COOKIE['phpipamredirect']) )    { header("Location: ".$_COOKIE['phpipamredirect']); }
-	else                                        { header("Location: ".create_link("dashboard")); }
+	if (isset($_COOKIE['phpipamredirect'])) { header ("Location: ".$_COOKIE['phpipamredirect']); }
+	else { header ("Location: ".create_link ("dashboard")); }
 
 }
\ No newline at end of file

Braces +9 added lines, -6 removed lines

@@ -6,16 +6,17 @@ 
 
 //get SAML2 settings from db 
 $dbobj=$Tools->fetch_object("usersAuthMethod", "type", "SAML2");
-if(!$dbobj){
+if(!$dbobj) {
 echo "SAML settings not found in database";
 die();
 }
 //decode authentication module params
 $params=json_decode($dbobj->params);
 //if using advanced settings, instantiate without db settings
-if($params->advanced=="1"){
+if($params->advanced=="1") {
 	$auth = new OneLogin_Saml2_Auth(); 
-}else{
+}
+else {
 
 	$settings = array (
         'sp' => array (
@@ -43,18 +44,20 @@ 
 	$auth = new OneLogin_Saml2_Auth($settings); 
 }
 //if SAMLResponse is not in the request, create an authnrequest and send it to the idp
-if(!isset($_POST["SAMLResponse"])){
+if(!isset($_POST["SAMLResponse"])) {
 	$ssoBuiltUrl = $auth->login(null, array(), false, false, true);
 	$_SESSION['AuthNRequestID'] = $auth->getLastRequestID();
 	header('Pragma: no-cache');
 	header('Cache-Control: no-cache, must-revalidate');
 	header('Location: ' . $ssoBuiltUrl);
 	exit();
-}else{
+}
+else {
 //process the authentication response
 	if (isset($_SESSION) && isset($_SESSION['AuthNRequestID'])) {
 	    $requestID = $_SESSION['AuthNRequestID'];
-	} else {
+	}
+	else {
 	    $requestID = null;
 	}