bantenprov / bantenprov-sso

src/BantenprovSsoServiceProvider.php

Indentation +23 added lines, -23 removed lines

@@ -6,28 +6,28 @@
 
 class BantenprovSsoServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        include __DIR__.'/BantenprovSso.php';
-        $this->publishes([
-        __DIR__ . '/views'          => base_path('public/js'),
-        __DIR__ . '/controllers'    => base_path('app/Http/Controllers'),
-        ]);
-        $this->commands('Bantenprov\BantenprovSso\Commands\RouteCommands');
-    }
+	/**
+	 * Bootstrap the application services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		include __DIR__.'/BantenprovSso.php';
+		$this->publishes([
+		__DIR__ . '/views'          => base_path('public/js'),
+		__DIR__ . '/controllers'    => base_path('app/Http/Controllers'),
+		]);
+		$this->commands('Bantenprov\BantenprovSso\Commands\RouteCommands');
+	}
 
-    /**
-     * Register the application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
+	/**
+	 * Register the application services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
     {
         include __DIR__.'/BantenprovSso.php';
         $this->publishes([
-        __DIR__ . '/views'          => base_path('public/js'),
-        __DIR__ . '/controllers'    => base_path('app/Http/Controllers'),
+        __DIR__.'/views'          => base_path('public/js'),
+        __DIR__.'/controllers'    => base_path('app/Http/Controllers'),
         ]);
         $this->commands('Bantenprov\BantenprovSso\Commands\RouteCommands');
     }

src/controllers/DevelController.php

Indentation +139 added lines, -139 removed lines

@@ -11,146 +11,146 @@
 
 class DevelController extends Controller
 {
-    public function login()
-    {
-    	if(!Auth::check())
-    	{
-    		return view('pages.credential.login');
-    	}
-    	return Redirect::to('dashboard');
-    }
-
-    public function post_login(Request $request)
-    {
-    	$validator = Validator::make($request->all(), 
-    		[
-    			'email'			=> 'required|email',
-    			'password'		=> 'required'
-    		]);
-
-    	if($validator->fails())
-    	{
-    		Session::flash('message', 'Data tidak boleh kosong');
-    		return redirect()->back()
-                ->withErrors($validator)
-                ->withInput();
-    	}
-    	$credential = [
-    	'email'			=> $request->input('email'), 
-    	'password'		=> $request->input('password'),
-    	'ipaddress'		=> $request->input('ip1').'-'.$request->input('ip2')
-    	];
-
-    	//set session 
-    	Session(['ipaddress' => $request->input('ip1').'-'.$request->input('ip2')]);
-
-    	if(!BantenprovSso::Attempt($credential))
-    	{
-    		//dd(BantenprovSso::message());
-    		Session::flash('message', 'terjadi kesalah, login tidak berhasil');
-    		return redirect()->back()
-                ->withErrors(BantenprovSso::message())
-                ->withInput();
-    	}
-    	//dd(BantenprovSso::data());
-    	$data = BantenprovSso::data();
-    	//check data user pada table user 
-    	$user = User::where('email', $data->email)
-    			->first();
-    	if(count($user) == 0)
-    	{
-    		//return 'gak ada';
-    		//insert data user
-    		$create_user = new User;
-    		$create_user->email 		= $data->email;
-    		$create_user->name 			= $data->name;
-    		$create_user->password 		= $data->password;
-    		$create_user->save();
-
-    		return Self::init_login($create_user);
-    	}
-    	else
-    	{
-    		return Self::init_login($user);
-    	}
-
-    }
-
-    public function init_login($data)
-    {
-    	//login with id
-    	//dd($data->id);
-    	if(Auth::loginUsingId($data->id))
-    	{
-    		return redirect::to('dashboard');
-
-    	}
-    	else
-    	{
-    		//false
-    		return Redirect::to('login');
-    	}
-
-
-    }
-
-    public function check_logout(Request $request)
-    {
-    	if(BantenprovSso::check_logout(['ipaddress' => $request->input('ipaddress')]))
-    	{
-    		return 1;
-    	}
-    	else
-    	{
-    		return 0;
-    	}
-    }
-
-    public function check_login(Request $request)
-    {
-    	$check = BantenprovSso::check_login(['ipaddress' => $request->input('ipaddress')]);
-    	if(!$check)
-    	{
-    		return 0;
-    	}
-    	else
-    	{
-    		// cari atau simpan data baru
-    		$teng = BantenprovSso::check_login_data();
-    		$user_data = User::where('email', $teng->email)->first();
-    		if(count($user_data) == 0)
-    		{
-    			//simpan data baru
-    			$simpan = new User;
-    			$simpan->email 			= $teng->email;
-	    		$simpan->name 			= $teng->name;
-	    		$simpan->password 		= 'bantenprov';
-	    		$simpan->save();
-
-	    		Auth::loginUsingId($simpan->id);
-	    		return 1;
-    		}
-    		else
-    		{
-    			Auth::loginUsingId($user_data->id);
-	    		return 1;
-    		}
-    	}
-    }
-
-    public function cas_logout()
-    {
-    	Auth::logout();
-    	Session()->forget('ipaddress');
-    	return 1;
-    }
+	public function login()
+	{
+		if(!Auth::check())
+		{
+			return view('pages.credential.login');
+		}
+		return Redirect::to('dashboard');
+	}
+
+	public function post_login(Request $request)
+	{
+		$validator = Validator::make($request->all(), 
+			[
+				'email'			=> 'required|email',
+				'password'		=> 'required'
+			]);
+
+		if($validator->fails())
+		{
+			Session::flash('message', 'Data tidak boleh kosong');
+			return redirect()->back()
+				->withErrors($validator)
+				->withInput();
+		}
+		$credential = [
+		'email'			=> $request->input('email'), 
+		'password'		=> $request->input('password'),
+		'ipaddress'		=> $request->input('ip1').'-'.$request->input('ip2')
+		];
+
+		//set session 
+		Session(['ipaddress' => $request->input('ip1').'-'.$request->input('ip2')]);
+
+		if(!BantenprovSso::Attempt($credential))
+		{
+			//dd(BantenprovSso::message());
+			Session::flash('message', 'terjadi kesalah, login tidak berhasil');
+			return redirect()->back()
+				->withErrors(BantenprovSso::message())
+				->withInput();
+		}
+		//dd(BantenprovSso::data());
+		$data = BantenprovSso::data();
+		//check data user pada table user 
+		$user = User::where('email', $data->email)
+				->first();
+		if(count($user) == 0)
+		{
+			//return 'gak ada';
+			//insert data user
+			$create_user = new User;
+			$create_user->email 		= $data->email;
+			$create_user->name 			= $data->name;
+			$create_user->password 		= $data->password;
+			$create_user->save();
+
+			return Self::init_login($create_user);
+		}
+		else
+		{
+			return Self::init_login($user);
+		}
+
+	}
+
+	public function init_login($data)
+	{
+		//login with id
+		//dd($data->id);
+		if(Auth::loginUsingId($data->id))
+		{
+			return redirect::to('dashboard');
+
+		}
+		else
+		{
+			//false
+			return Redirect::to('login');
+		}
+
+
+	}
+
+	public function check_logout(Request $request)
+	{
+		if(BantenprovSso::check_logout(['ipaddress' => $request->input('ipaddress')]))
+		{
+			return 1;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	public function check_login(Request $request)
+	{
+		$check = BantenprovSso::check_login(['ipaddress' => $request->input('ipaddress')]);
+		if(!$check)
+		{
+			return 0;
+		}
+		else
+		{
+			// cari atau simpan data baru
+			$teng = BantenprovSso::check_login_data();
+			$user_data = User::where('email', $teng->email)->first();
+			if(count($user_data) == 0)
+			{
+				//simpan data baru
+				$simpan = new User;
+				$simpan->email 			= $teng->email;
+				$simpan->name 			= $teng->name;
+				$simpan->password 		= 'bantenprov';
+				$simpan->save();
+
+				Auth::loginUsingId($simpan->id);
+				return 1;
+			}
+			else
+			{
+				Auth::loginUsingId($user_data->id);
+				return 1;
+			}
+		}
+	}
+
+	public function cas_logout()
+	{
+		Auth::logout();
+		Session()->forget('ipaddress');
+		return 1;
+	}
 
    	public function logout()
-    {
-    	Auth::logout();
-    	BantenprovSso::Logout(['ipaddress' => Session::get('ipaddress')]);
-    	Session()->forget('ipaddress');
-    	return Redirect::to('/login');
-    }
+	{
+		Auth::logout();
+		BantenprovSso::Logout(['ipaddress' => Session::get('ipaddress')]);
+		Session()->forget('ipaddress');
+		return Redirect::to('/login');
+	}
 
 }

Spacing +12 added lines, -12 removed lines

@@ -13,7 +13,7 @@ 
 {
     public function login()
     {
-    	if(!Auth::check())
+    	if (!Auth::check())
     	{
     		return view('pages.credential.login');
     	}
@@ -28,7 +28,7 @@ 
     			'password'		=> 'required'
     		]);
 
-    	if($validator->fails())
+    	if ($validator->fails())
     	{
     		Session::flash('message', 'Data tidak boleh kosong');
     		return redirect()->back()
@@ -44,7 +44,7 @@ 
     	//set session 
     	Session(['ipaddress' => $request->input('ip1').'-'.$request->input('ip2')]);
 
-    	if(!BantenprovSso::Attempt($credential))
+    	if (!BantenprovSso::Attempt($credential))
     	{
     		//dd(BantenprovSso::message());
     		Session::flash('message', 'terjadi kesalah, login tidak berhasil');
@@ -57,14 +57,14 @@ 
     	//check data user pada table user 
     	$user = User::where('email', $data->email)
     			->first();
-    	if(count($user) == 0)
+    	if (count($user) == 0)
     	{
     		//return 'gak ada';
     		//insert data user
     		$create_user = new User;
     		$create_user->email 		= $data->email;
     		$create_user->name 			= $data->name;
-    		$create_user->password 		= $data->password;
+    		$create_user->password = $data->password;
     		$create_user->save();
 
     		return Self::init_login($create_user);
@@ -80,7 +80,7 @@ 
     {
     	//login with id
     	//dd($data->id);
-    	if(Auth::loginUsingId($data->id))
+    	if (Auth::loginUsingId($data->id))
     	{
     		return redirect::to('dashboard');
 
@@ -96,7 +96,7 @@ 
 
     public function check_logout(Request $request)
     {
-    	if(BantenprovSso::check_logout(['ipaddress' => $request->input('ipaddress')]))
+    	if (BantenprovSso::check_logout(['ipaddress' => $request->input('ipaddress')]))
     	{
     		return 1;
     	}
@@ -109,7 +109,7 @@ 
     public function check_login(Request $request)
     {
     	$check = BantenprovSso::check_login(['ipaddress' => $request->input('ipaddress')]);
-    	if(!$check)
+    	if (!$check)
     	{
     		return 0;
     	}
@@ -118,13 +118,13 @@ 
     		// cari atau simpan data baru
     		$teng = BantenprovSso::check_login_data();
     		$user_data = User::where('email', $teng->email)->first();
-    		if(count($user_data) == 0)
+    		if (count($user_data) == 0)
     		{
     			//simpan data baru
     			$simpan = new User;
-    			$simpan->email 			= $teng->email;
-	    		$simpan->name 			= $teng->name;
-	    		$simpan->password 		= 'bantenprov';
+    			$simpan->email = $teng->email;
+	    		$simpan->name = $teng->name;
+	    		$simpan->password = 'bantenprov';
 	    		$simpan->save();
 
 	    		Auth::loginUsingId($simpan->id);

Braces +5 added lines, -10 removed lines

@@ -68,8 +68,7 @@ 
     		$create_user->save();
 
     		return Self::init_login($create_user);
-    	}
-    	else
+    	} else
     	{
     		return Self::init_login($user);
     	}
@@ -84,8 +83,7 @@ 
     	{
     		return redirect::to('dashboard');
 
-    	}
-    	else
+    	} else
     	{
     		//false
     		return Redirect::to('login');
@@ -99,8 +97,7 @@ 
     	if(BantenprovSso::check_logout(['ipaddress' => $request->input('ipaddress')]))
     	{
     		return 1;
-    	}
-    	else
+    	} else
     	{
     		return 0;
     	}
@@ -112,8 +109,7 @@ 
     	if(!$check)
     	{
     		return 0;
-    	}
-    	else
+    	} else
     	{
     		// cari atau simpan data baru
     		$teng = BantenprovSso::check_login_data();
@@ -129,8 +125,7 @@ 
 
 	    		Auth::loginUsingId($simpan->id);
 	    		return 1;
-    		}
-    		else
+    		} else
     		{
     			Auth::loginUsingId($user_data->id);
 	    		return 1;

src/commands/routecommands.php

Indentation +37 added lines, -37 removed lines

@@ -17,51 +17,51 @@
 
 class RouteCommands extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'bantenprov-sso:add-route';
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'bantenprov-sso:add-route';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Add sso rotes  to web route';
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Add sso rotes  to web route';
 
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
 
-    protected $drip;
+	protected $drip;
 
-    public function __construct()
-    {
-        parent::__construct();
+	public function __construct()
+	{
+		parent::__construct();
         
-    }
+	}
 
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
 
-    protected function content()
-    {
+	protected function content()
+	{
 
-        $replace_middleware = File::get(__DIR__.'/../stubs/route.stub');
-        return $replace_middleware;
-    }
+		$replace_middleware = File::get(__DIR__.'/../stubs/route.stub');
+		return $replace_middleware;
+	}
     
 
-    public function handle()
-    {               
-        $this->info('Route add success'); 
-        File::append(base_path('routes/web.php'),"\n".$this->content());        
-    }
+	public function handle()
+	{               
+		$this->info('Route add success'); 
+		File::append(base_path('routes/web.php'),"\n".$this->content());        
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -62,6 +62,6 @@
     public function handle()
     {               
         $this->info('Route add success'); 
-        File::append(base_path('routes/web.php'),"\n".$this->content());        
+        File::append(base_path('routes/web.php'), "\n".$this->content());        
     }
 }

src/BantenprovSso.php

Indentation +19 added lines, -19 removed lines

@@ -42,7 +42,7 @@ 
 		curl_setopt($curl,CURLOPT_POSTFIELDS,http_build_query($post));
 		curl_setopt($curl,CURLOPT_TIMEOUT,20);
 		curl_setopt($curl,CURLOPT_HTTPHEADER, array(
-		    'Accept: application/json')
+			'Accept: application/json')
 		);
 		$exec=curl_exec($curl);
 		if(!$exec)
@@ -71,7 +71,7 @@ 
 		curl_setopt($curl,CURLOPT_POSTFIELDS,http_build_query($post));
 		curl_setopt($curl,CURLOPT_TIMEOUT,20);
 		curl_setopt($curl,CURLOPT_HTTPHEADER, array(
-		    'Accept: application/json')
+			'Accept: application/json')
 		);
 		$exec=curl_exec($curl);
 		if(!$exec)
@@ -94,7 +94,7 @@ 
 		curl_setopt($curl,CURLOPT_POSTFIELDS,http_build_query($post));
 		curl_setopt($curl,CURLOPT_TIMEOUT,20);
 		curl_setopt($curl,CURLOPT_HTTPHEADER, array(
-		    'Accept: application/json')
+			'Accept: application/json')
 		);
 		$exec=curl_exec($curl);
 
@@ -136,7 +136,7 @@ 
 		curl_setopt($curl,CURLOPT_POSTFIELDS,http_build_query($post));
 		curl_setopt($curl,CURLOPT_TIMEOUT,20);
 		curl_setopt($curl,CURLOPT_HTTPHEADER, array(
-		    'Accept: application/json')
+			'Accept: application/json')
 		);
 		$exec=curl_exec($curl);
 		//dd($exec);
@@ -153,21 +153,21 @@ 
 	static function InitAddress()
 	{
 		$ipaddress = '';
-	    if (getenv('HTTP_CLIENT_IP'))
-	        $ipaddress = getenv('HTTP_CLIENT_IP');
-	    else if(getenv('HTTP_X_FORWARDED_FOR'))
-	        $ipaddress = getenv('HTTP_X_FORWARDED_FOR');
-	    else if(getenv('HTTP_X_FORWARDED'))
-	        $ipaddress = getenv('HTTP_X_FORWARDED');
-	    else if(getenv('HTTP_FORWARDED_FOR'))
-	        $ipaddress = getenv('HTTP_FORWARDED_FOR');
-	    else if(getenv('HTTP_FORWARDED'))
-	       $ipaddress = getenv('HTTP_FORWARDED');
-	    else if(getenv('REMOTE_ADDR'))
-	        $ipaddress = getenv('REMOTE_ADDR');
-	    else
-	        $ipaddress = 'UNKNOWN';
-	    return $ipaddress;
+		if (getenv('HTTP_CLIENT_IP'))
+			$ipaddress = getenv('HTTP_CLIENT_IP');
+		else if(getenv('HTTP_X_FORWARDED_FOR'))
+			$ipaddress = getenv('HTTP_X_FORWARDED_FOR');
+		else if(getenv('HTTP_X_FORWARDED'))
+			$ipaddress = getenv('HTTP_X_FORWARDED');
+		else if(getenv('HTTP_FORWARDED_FOR'))
+			$ipaddress = getenv('HTTP_FORWARDED_FOR');
+		else if(getenv('HTTP_FORWARDED'))
+		   $ipaddress = getenv('HTTP_FORWARDED');
+		else if(getenv('REMOTE_ADDR'))
+			$ipaddress = getenv('REMOTE_ADDR');
+		else
+			$ipaddress = 'UNKNOWN';
+		return $ipaddress;
 	}
 
 	static function init()

Spacing +43 added lines, -43 removed lines

@@ -24,7 +24,7 @@ 
 
 	public function __construct()
 	{
-		Self::$fails   			= false;
+		Self::$fails = false;
 		Self::$profile_fails   	= false;
 		Self::$token_access     = false;
 		$this->profile = '';
@@ -35,17 +35,17 @@ 
 	{
 		$post['appid']		= env('APPID');
 		$post['token']		= env('TOKEN');
-		$curl=curl_init();
-		curl_setopt($curl,CURLOPT_RETURNTRANSFER,1);
-		curl_setopt($curl,CURLOPT_URL,env('SSO_LOGIN'));
-		curl_setopt($curl,CURLOPT_POST,1);
-		curl_setopt($curl,CURLOPT_POSTFIELDS,http_build_query($post));
-		curl_setopt($curl,CURLOPT_TIMEOUT,20);
-		curl_setopt($curl,CURLOPT_HTTPHEADER, array(
+		$curl = curl_init();
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($curl, CURLOPT_URL, env('SSO_LOGIN'));
+		curl_setopt($curl, CURLOPT_POST, 1);
+		curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($post));
+		curl_setopt($curl, CURLOPT_TIMEOUT, 20);
+		curl_setopt($curl, CURLOPT_HTTPHEADER, array(
 		    'Accept: application/json')
 		);
-		$exec=curl_exec($curl);
-		if(!$exec)
+		$exec = curl_exec($curl);
+		if (!$exec)
 		{
 			return BantenprovSso::$fails = true;
 		}
@@ -64,17 +64,17 @@ 
 	{
 		$post['appid']		= env('APPID');
 		$post['token']		= env('TOKEN');
-		$curl=curl_init();
-		curl_setopt($curl,CURLOPT_RETURNTRANSFER,1);
-		curl_setopt($curl,CURLOPT_URL,env('CHECK_LOGOUT'));
-		curl_setopt($curl,CURLOPT_POST,1);
-		curl_setopt($curl,CURLOPT_POSTFIELDS,http_build_query($post));
-		curl_setopt($curl,CURLOPT_TIMEOUT,20);
-		curl_setopt($curl,CURLOPT_HTTPHEADER, array(
+		$curl = curl_init();
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($curl, CURLOPT_URL, env('CHECK_LOGOUT'));
+		curl_setopt($curl, CURLOPT_POST, 1);
+		curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($post));
+		curl_setopt($curl, CURLOPT_TIMEOUT, 20);
+		curl_setopt($curl, CURLOPT_HTTPHEADER, array(
 		    'Accept: application/json')
 		);
-		$exec=curl_exec($curl);
-		if(!$exec)
+		$exec = curl_exec($curl);
+		if (!$exec)
 		{
 			return false;
 		}
@@ -87,20 +87,20 @@ 
 	{
 		$post['appid']		= env('APPID');
 		$post['token']		= env('TOKEN');
-		$curl=curl_init();
-		curl_setopt($curl,CURLOPT_RETURNTRANSFER,1);
-		curl_setopt($curl,CURLOPT_URL,env('CHECK_LOGIN'));
-		curl_setopt($curl,CURLOPT_POST,1);
-		curl_setopt($curl,CURLOPT_POSTFIELDS,http_build_query($post));
-		curl_setopt($curl,CURLOPT_TIMEOUT,20);
-		curl_setopt($curl,CURLOPT_HTTPHEADER, array(
+		$curl = curl_init();
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($curl, CURLOPT_URL, env('CHECK_LOGIN'));
+		curl_setopt($curl, CURLOPT_POST, 1);
+		curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($post));
+		curl_setopt($curl, CURLOPT_TIMEOUT, 20);
+		curl_setopt($curl, CURLOPT_HTTPHEADER, array(
 		    'Accept: application/json')
 		);
-		$exec=curl_exec($curl);
+		$exec = curl_exec($curl);
 
 		//dd($exec);
 
-		if(!$exec)
+		if (!$exec)
 		{
 			return false;
 		}
@@ -117,7 +117,7 @@ 
 
 	static function data()
 	{
-		if( BantenprovSso::$result->status == false)
+		if (BantenprovSso::$result->status == false)
 		{
 			return BantenprovSso::$result->message;
 		}
@@ -129,18 +129,18 @@ 
 	{
 		$post['appid']		= env('APPID');
 		$post['token']		= env('TOKEN');
-		$curl=curl_init();
-		curl_setopt($curl,CURLOPT_RETURNTRANSFER,1);
-		curl_setopt($curl,CURLOPT_URL,env('SSO_LOGOUT'));
-		curl_setopt($curl,CURLOPT_POST,1);
-		curl_setopt($curl,CURLOPT_POSTFIELDS,http_build_query($post));
-		curl_setopt($curl,CURLOPT_TIMEOUT,20);
-		curl_setopt($curl,CURLOPT_HTTPHEADER, array(
+		$curl = curl_init();
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($curl, CURLOPT_URL, env('SSO_LOGOUT'));
+		curl_setopt($curl, CURLOPT_POST, 1);
+		curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($post));
+		curl_setopt($curl, CURLOPT_TIMEOUT, 20);
+		curl_setopt($curl, CURLOPT_HTTPHEADER, array(
 		    'Accept: application/json')
 		);
-		$exec=curl_exec($curl);
+		$exec = curl_exec($curl);
 		//dd($exec);
-		if(!$exec)
+		if (!$exec)
 		{
 			return false;
 		}
@@ -155,15 +155,15 @@ 
 		$ipaddress = '';
 	    if (getenv('HTTP_CLIENT_IP'))
 	        $ipaddress = getenv('HTTP_CLIENT_IP');
-	    else if(getenv('HTTP_X_FORWARDED_FOR'))
+	    else if (getenv('HTTP_X_FORWARDED_FOR'))
 	        $ipaddress = getenv('HTTP_X_FORWARDED_FOR');
-	    else if(getenv('HTTP_X_FORWARDED'))
+	    else if (getenv('HTTP_X_FORWARDED'))
 	        $ipaddress = getenv('HTTP_X_FORWARDED');
-	    else if(getenv('HTTP_FORWARDED_FOR'))
+	    else if (getenv('HTTP_FORWARDED_FOR'))
 	        $ipaddress = getenv('HTTP_FORWARDED_FOR');
-	    else if(getenv('HTTP_FORWARDED'))
+	    else if (getenv('HTTP_FORWARDED'))
 	       $ipaddress = getenv('HTTP_FORWARDED');
-	    else if(getenv('REMOTE_ADDR'))
+	    else if (getenv('REMOTE_ADDR'))
 	        $ipaddress = getenv('REMOTE_ADDR');
 	    else
 	        $ipaddress = 'UNKNOWN';

Braces +15 added lines, -14 removed lines

@@ -153,20 +153,21 @@
 	static function InitAddress()
 	{
 		$ipaddress = '';
-	    if (getenv('HTTP_CLIENT_IP'))
-	        $ipaddress = getenv('HTTP_CLIENT_IP');
-	    else if(getenv('HTTP_X_FORWARDED_FOR'))
-	        $ipaddress = getenv('HTTP_X_FORWARDED_FOR');
-	    else if(getenv('HTTP_X_FORWARDED'))
-	        $ipaddress = getenv('HTTP_X_FORWARDED');
-	    else if(getenv('HTTP_FORWARDED_FOR'))
-	        $ipaddress = getenv('HTTP_FORWARDED_FOR');
-	    else if(getenv('HTTP_FORWARDED'))
-	       $ipaddress = getenv('HTTP_FORWARDED');
-	    else if(getenv('REMOTE_ADDR'))
-	        $ipaddress = getenv('REMOTE_ADDR');
-	    else
-	        $ipaddress = 'UNKNOWN';
+	    if (getenv('HTTP_CLIENT_IP')) {
+	    	        $ipaddress = getenv('HTTP_CLIENT_IP');
+	    } else if(getenv('HTTP_X_FORWARDED_FOR')) {
+	    	        $ipaddress = getenv('HTTP_X_FORWARDED_FOR');
+	    } else if(getenv('HTTP_X_FORWARDED')) {
+	    	        $ipaddress = getenv('HTTP_X_FORWARDED');
+	    } else if(getenv('HTTP_FORWARDED_FOR')) {
+	    	        $ipaddress = getenv('HTTP_FORWARDED_FOR');
+	    } else if(getenv('HTTP_FORWARDED')) {
+	    	       $ipaddress = getenv('HTTP_FORWARDED');
+	    } else if(getenv('REMOTE_ADDR')) {
+	    	        $ipaddress = getenv('REMOTE_ADDR');
+	    } else {
+	    	        $ipaddress = 'UNKNOWN';
+	    }
 	    return $ipaddress;
 	}