diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index ee6151f996..53c738684a 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -1144,94 +1144,89 @@ class UsersController extends AdminController
* @Auther Aldin Alaily
* @return Redirect
*/
- public function postLDAP()
- {
-
-
- $url = Config::get('ldap.url');
- $username = Config::get('ldap.username');
- $password = Config::get('ldap.password');
- $base_dn = Config::get('ldap.basedn');
- $filter = Config::get('ldap.filter');
-
- Log::info("post LDAP");
- Log::debug("Debug in LDAP");
- $ldapconn = ldap_connect($url)
- or die("Could not connect to LDAP server.");
-
- // Binding to ldap server
- $ldapbind = ldap_bind($ldapconn, $username, $password)
- or die("could not bind.");
+ public function postLDAP()
+ {
+
+ $url = Config::get('ldap.url');
+ $username = Config::get('ldap.username');
+ $password = Config::get('ldap.password');
+ $base_dn = Config::get('ldap.basedn');
+ $filter = Config::get('ldap.filter');
- // Perform the search
- $search_results = ldap_search($ldapconn, $base_dn, $filter);
- $results = ldap_get_entries($ldapconn, $search_results);
+ $ldapconn = ldap_connect($url)
+ or die("Could not connect to LDAP server.");
- $summary = array();
- for( $i=0; $i < $results["count"]; $i++ ) {
- if( $results[$i]["pyactive"][0] == "TRUE" ) {
-
- $item = array();
-
- $item["username"] = $results[$i]["pyusername"][0];
- $item["pycyin"] = $results[$i]["pycyin"][0];
- $item["cn"] = $results[$i]["cn"][0];
- $item["lastname"] = $results[$i]["sn"][0];
- $item["firstname"] = $results[$i]["givenname"][0];
- $item["mail"] = $results[$i]["mail"][0];
-
- $user = DB::table('users')->where('username', $item['username'])->first();
- if ($user) {
- $item["note"] = "exists";
- } else {
-
- $validator = Validator::make($item, $this->ldapValidationRules);
- if ($validator->fails()) {
- $item["note"] = "Validotor failed: " . $validator->messages();
- }
- else {
-
- // Create the user if they don't exist.
- $pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10);
-
- $newuser = array(
- 'first_name' => $item["firstname"],
- 'last_name' => $item["lastname"],
- 'username' => $item["username"],
- 'email' => $item["mail"],
- 'employee_num' => $item["pycyin"],
- 'password' => $pass,
- 'activated' => 1,
- 'location_id' => 1,
- 'permissions' => '{"user":1}',
- 'notes' => 'Imported from LDAP'
- );
-
- DB::table('users')->insert($newuser);
-
- $updateuser = Sentry::findUserByLogin($item["username"]);
+ // Binding to ldap server
+ $ldapbind = ldap_bind($ldapconn, $username, $password)
+ or die("could not bind.");
- // Update the user details
- $updateuser->password = $pass;
+ // Perform the search
+ $search_results = ldap_search($ldapconn, $base_dn, $filter);
+ $results = ldap_get_entries($ldapconn, $search_results);
- // Update the user
- $updateuser->save();
-
- $item["note"] = "created" . " " . $pass . "";
- } // Validator didn't fail
- }
-
-
- array_push($summary, $item);
- }
- if( $i <= 1 ) break;
- }
-
-
-
- return Redirect::route('ldap/user')->with('success', "OK")->with('summary', $summary);
+ $summary = array();
+ for ($i = 0; $i < $results["count"]; $i++) {
+ if ($results[$i]["pyactive"][0] == "TRUE") {
+
+ $item = array();
+
+ $item["username"] = $results[$i]["pyusername"][0];
+ $item["pycyin"] = $results[$i]["pycyin"][0];
+ $item["cn"] = $results[$i]["cn"][0];
+ $item["lastname"] = $results[$i]["sn"][0];
+ $item["firstname"] = $results[$i]["givenname"][0];
+ $item["mail"] = $results[$i]["mail"][0];
+
+ $user = DB::table('users')->where('username', $item['username'])->first();
+ if ($user) {
+ $item["note"] = "exists";
+ } else {
+
+ $validator = Validator::make($item, $this->ldapValidationRules);
+ if ($validator->fails()) {
+ $item["note"] = "Validotor failed: " . $validator->messages();
+ } else {
+
+ // Create the user if they don't exist.
+ $pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10);
+
+ $newuser = array(
+ 'first_name' => $item["firstname"],
+ 'last_name' => $item["lastname"],
+ 'username' => $item["username"],
+ 'email' => $item["mail"],
+ 'employee_num' => $item["pycyin"],
+ 'password' => $pass,
+ 'activated' => 1,
+ 'location_id' => 1,
+ 'permissions' => '{"user":1}',
+ 'notes' => 'Imported from LDAP'
+ );
+
+ DB::table('users')->insert($newuser);
+
+ $updateuser = Sentry::findUserByLogin($item["username"]);
+
+ // Update the user details
+ $updateuser->password = $pass;
+
+ // Update the user
+ $updateuser->save();
+
+ $item["note"] = "created" . " " . $pass . "";
+ } // Validator didn't fail
+ }
+
+
+ array_push($summary, $item);
+ }
+ if ($i <= 1)
+ break;
+ }
+
+
+
+ return Redirect::route('ldap/user')->with('success', "OK")->with('summary', $summary);
+ }
- }
-
-
}