diff --git a/app/Commands/Command.php b/app/Commands/Command.php
index 018bc2192..c9b0a33a6 100644
--- a/app/Commands/Command.php
+++ b/app/Commands/Command.php
@@ -1,7 +1,8 @@
-<?php namespace App\Commands;
+<?php
 
-abstract class Command {
-
-	//
+namespace App\Commands;
 
+abstract class Command
+{
+    //
 }
diff --git a/app/Console/Commands/Inspire.php b/app/Console/Commands/Inspire.php
index b5b0c0d68..6e39cf65f 100644
--- a/app/Console/Commands/Inspire.php
+++ b/app/Console/Commands/Inspire.php
@@ -1,32 +1,33 @@
-<?php namespace App\Console\Commands;
+<?php
+
+namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;
 
-class Inspire extends Command {
+class Inspire extends Command
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'inspire';
 
-	/**
-	 * The console command name.
-	 *
-	 * @var string
-	 */
-	protected $name = 'inspire';
-
-	/**
-	 * The console command description.
-	 *
-	 * @var string
-	 */
-	protected $description = 'Display an inspiring quote';
-
-	/**
-	 * Execute the console command.
-	 *
-	 * @return mixed
-	 */
-	public function handle()
-	{
-		$this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
-	}
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Display an inspiring quote';
 
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
+    }
 }
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index cb183d946..bce2f0715 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -1,37 +1,38 @@
-<?php namespace App\Console;
+<?php
+
+namespace App\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
-class Kernel extends ConsoleKernel {
+class Kernel extends ConsoleKernel
+{
+    /**
+     * The Artisan commands provided by your application.
+     *
+     * @var array
+     */
+    protected $commands = [
+        'App\Console\Commands\Inspire',
+    ];
 
-	/**
-	 * The Artisan commands provided by your application.
-	 *
-	 * @var array
-	 */
-	protected $commands = [
-		'App\Console\Commands\Inspire',
-	];
+    /**
+     * Define the application's command schedule.
+     *
+     * @param \Illuminate\Console\Scheduling\Schedule $schedule
+     *
+     * @return void
+     */
+    protected function schedule(Schedule $schedule)
+    {
+        $schedule->command('inspire')
+                 ->hourly();
 
-	/**
-	 * Define the application's command schedule.
-	 *
-	 * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-	 * @return void
-	 */
-	protected function schedule(Schedule $schedule)
-	{
-		$schedule->command('inspire')
-				 ->hourly();
-		
-		$schedule->call(function () {
-            
-			$user = new User;
-			$user->save();
-    
-    		})->everyFiveMinutes();
+        $schedule->call(function () {
 
-	}
+            $user = new User();
+            $user->save();
 
+            })->everyFiveMinutes();
+    }
 }
diff --git a/app/Events/ClientTicketForm.php b/app/Events/ClientTicketForm.php
index ab534034e..4288c16c4 100644
--- a/app/Events/ClientTicketForm.php
+++ b/app/Events/ClientTicketForm.php
@@ -1,27 +1,25 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class ClientTicketForm extends Event {
+class ClientTicketForm extends Event
+{
+    use SerializesModels;
 
-	use SerializesModels;
-        
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-	
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-                        $this->para1 = $para1;
-                        $this->para2 = $para2;
-                        $this->para3 = $para3;
-                        $this->para4 = $para4;
-                        $this->para5 = $para5;
-                                
-	}
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/ClientTicketFormPost.php b/app/Events/ClientTicketFormPost.php
index ae045d75a..f242c5f5d 100644
--- a/app/Events/ClientTicketFormPost.php
+++ b/app/Events/ClientTicketFormPost.php
@@ -1,28 +1,25 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class ClientTicketFormPost extends Event {
-
-        use SerializesModels;
-        
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-	
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-                        $this->para1 = $para1;
-                        $this->para2 = $para2;
-                        $this->para3 = $para3;
-                        $this->para4 = $para4;
-                        $this->para5 = $para5;
-                                
-	}
+class ClientTicketFormPost extends Event
+{
+    use SerializesModels;
 
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/Event.php b/app/Events/Event.php
index d59f7690f..ba2f88838 100644
--- a/app/Events/Event.php
+++ b/app/Events/Event.php
@@ -1,7 +1,8 @@
-<?php namespace App\Events;
+<?php
 
-abstract class Event {
-
-	//
+namespace App\Events;
 
+abstract class Event
+{
+    //
 }
diff --git a/app/Events/FaveoAfterReply.php b/app/Events/FaveoAfterReply.php
index 0b51b947a..6ccfa4a1b 100644
--- a/app/Events/FaveoAfterReply.php
+++ b/app/Events/FaveoAfterReply.php
@@ -1,31 +1,29 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class FaveoAfterReply extends Event {
-
-	use SerializesModels;
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-        
-	/**
-	 * Create a new event instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-		$this->para1 = $para1;
-                $this->para2 = $para2;
-                $this->para3 = $para3;
-                $this->para4 = $para4;
-                $this->para5 = $para5;
-	}
-
+class FaveoAfterReply extends Event
+{
+    use SerializesModels;
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/FormRegisterEvent.php b/app/Events/FormRegisterEvent.php
index fe0bc0f51..c5398916f 100644
--- a/app/Events/FormRegisterEvent.php
+++ b/app/Events/FormRegisterEvent.php
@@ -1,31 +1,30 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class FormRegisterEvent extends Event {
+class FormRegisterEvent extends Event
+{
+    use SerializesModels;
 
-	use SerializesModels;
-        
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-        
-	/**
-	 * Create a new event instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-		$this->para1 = $para1;
-                $this->para2 = $para2;
-                $this->para3 = $para3;
-                $this->para4 = $para4;
-                $this->para5 = $para5;
-	}
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/LoginEvent.php b/app/Events/LoginEvent.php
index 899084513..486a8f8c8 100644
--- a/app/Events/LoginEvent.php
+++ b/app/Events/LoginEvent.php
@@ -1,31 +1,29 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class LoginEvent extends Event {
-
-	use SerializesModels;
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-
-	/**
-	 * Create a new event instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-		$this->para1 = $para1;
-                $this->para2 = $para2;
-                $this->para3 = $para3;
-                $this->para4 = $para4;
-                $this->para5 = $para5;
-	}
-
+class LoginEvent extends Event
+{
+    use SerializesModels;
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/PostRegisterEvent.php b/app/Events/PostRegisterEvent.php
index 1d116ace7..e75f90c7d 100644
--- a/app/Events/PostRegisterEvent.php
+++ b/app/Events/PostRegisterEvent.php
@@ -1,30 +1,29 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class PostRegisterEvent extends Event {
-
-	use SerializesModels;
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-
-	/**
-	 * Create a new event instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-		$this->para1 = $para1;
-                $this->para2 = $para2;
-                $this->para3 = $para3;
-                $this->para4 = $para4;
-                $this->para5 = $para5;
-	}
+class PostRegisterEvent extends Event
+{
+    use SerializesModels;
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/ReadMailEvent.php b/app/Events/ReadMailEvent.php
index f3c6b7cbd..9ecaf66ae 100644
--- a/app/Events/ReadMailEvent.php
+++ b/app/Events/ReadMailEvent.php
@@ -1,31 +1,29 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class ReadMailEvent extends Event {
-
-	use SerializesModels;
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-
-	/**
-	 * Create a new event instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-		$this->para1 = $para1;
-                $this->para2 = $para2;
-                $this->para3 = $para3;
-                $this->para4 = $para4;
-                $this->para5 = $para5;
-	}
-
+class ReadMailEvent extends Event
+{
+    use SerializesModels;
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/TicketBoxHeader.php b/app/Events/TicketBoxHeader.php
index 05c78ae48..4a2d4a4b1 100644
--- a/app/Events/TicketBoxHeader.php
+++ b/app/Events/TicketBoxHeader.php
@@ -1,30 +1,29 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class TicketBoxHeader extends Event {
-
-	use SerializesModels;
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-
-	/**
-	 * Create a new event instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-		$this->para1 = $para1;
-                $this->para2 = $para2;
-                $this->para3 = $para3;
-                $this->para4 = $para4;
-                $this->para5 = $para5;
-	}
+class TicketBoxHeader extends Event
+{
+    use SerializesModels;
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/TicketDetailTable.php b/app/Events/TicketDetailTable.php
index b5f05a84a..e630efd07 100644
--- a/app/Events/TicketDetailTable.php
+++ b/app/Events/TicketDetailTable.php
@@ -1,30 +1,29 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class TicketDetailTable extends Event {
-
-	use SerializesModels;
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-        
-	/**
-	 * Create a new event instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-		$this->para1 = $para1;
-                $this->para2 = $para2;
-                $this->para3 = $para3;
-                $this->para4 = $para4;
-                $this->para5 = $para5;
-	}
+class TicketDetailTable extends Event
+{
+    use SerializesModels;
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/TimeLineFormEvent.php b/app/Events/TimeLineFormEvent.php
index 3417a1773..b795dd585 100644
--- a/app/Events/TimeLineFormEvent.php
+++ b/app/Events/TimeLineFormEvent.php
@@ -1,30 +1,29 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class TimeLineFormEvent extends Event {
-
-	use SerializesModels;
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-        
-	/**
-	 * Create a new event instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-		$this->para1 = $para1;
-                $this->para2 = $para2;
-                $this->para3 = $para3;
-                $this->para4 = $para4;
-                $this->para5 = $para5;
-	}
+class TimeLineFormEvent extends Event
+{
+    use SerializesModels;
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/Timeline.php b/app/Events/Timeline.php
index 52cb947ba..e8ba8c913 100644
--- a/app/Events/Timeline.php
+++ b/app/Events/Timeline.php
@@ -1,31 +1,30 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class Timeline extends Event {
+class Timeline extends Event
+{
+    use SerializesModels;
 
-	use SerializesModels;
-        
-        public $para1;
-        public $para2;
-        public $para3;
-        public $para4;
-        public $para5;
-        
-	/**
-	 * Create a new event instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($para1='',$para2='',$para3='',$para4='',$para5='')
-	{
-		$this->para1 = $para1;
-                $this->para2 = $para2;
-                $this->para3 = $para3;
-                $this->para4 = $para4;
-                $this->para5 = $para5;
-	}
+    public $para1;
+    public $para2;
+    public $para3;
+    public $para4;
+    public $para5;
 
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($para1 = '', $para2 = '', $para3 = '', $para4 = '', $para5 = '')
+    {
+        $this->para1 = $para1;
+        $this->para2 = $para2;
+        $this->para3 = $para3;
+        $this->para4 = $para4;
+        $this->para5 = $para5;
+    }
 }
diff --git a/app/Events/TopNavEvent.php b/app/Events/TopNavEvent.php
index 74c56f7e5..019681f79 100644
--- a/app/Events/TopNavEvent.php
+++ b/app/Events/TopNavEvent.php
@@ -1,21 +1,20 @@
-<?php namespace App\Events;
+<?php
 
-use App\Events\Event;
+namespace App\Events;
 
 use Illuminate\Queue\SerializesModels;
 
-class TopNavEvent extends Event {
-
-	use SerializesModels;
-
-	/**
-	 * Create a new event instance.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		//
-	}
+class TopNavEvent extends Event
+{
+    use SerializesModels;
 
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
 }
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 568c4364e..4e904dbe5 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -8,19 +8,20 @@ use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 // use App\Http\Controllers\Common\SettingsController;
 //use App\Model\helpdesk\Email\Smtp;
 
-class Handler extends ExceptionHandler {
-
+class Handler extends ExceptionHandler
+{
     /**
      * A list of the exception types that should not be reported.
      *
      * @var array
      */
     protected $dontReport = [
-        'Symfony\Component\HttpKernel\Exception\HttpException'
+        'Symfony\Component\HttpKernel\Exception\HttpException',
     ];
 
     /**
      * Create a new controller instance.
+     *
      * @return type response
      */
     // public function __construct() {
@@ -32,26 +33,29 @@ class Handler extends ExceptionHandler {
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
-     * @param  \Exception  $e
+     * @param \Exception $e
+     *
      * @return void
      */
-    public function report(Exception $e) {
+    public function report(Exception $e)
+    {
         return parent::report($e);
     }
 
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $e
+     * @param \Illuminate\Http\Request $request
+     * @param \Exception               $e
+     *
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $e) {
-
+    public function render($request, Exception $e)
+    {
         if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) {
             return response()->json(['message' => $e->getMessage(), 'code' => $e->getStatusCode()]);
             //dd($e);
-        } else if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) {
+        } elseif ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) {
             return response()->json(['message' => $e->getMessage(), 'code' => $e->getStatusCode()]);
         }
 
@@ -81,13 +85,13 @@ class Handler extends ExceptionHandler {
         return parent::render($request, $e);
     }
 
-    protected function renderExceptionWithWhoops(Exception $e) {
-        $whoops = new \Whoops\Run;
+    protected function renderExceptionWithWhoops(Exception $e)
+    {
+        $whoops = new \Whoops\Run();
         $whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler());
 
         return new \Illuminate\Http\Response(
                 $whoops->handleException($e), $e->getStatusCode(), $e->getHeaders()
         );
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/AgentController.php b/app/Http/Controllers/Admin/helpdesk/AgentController.php
index d2158967a..b8ca005af 100644
--- a/app/Http/Controllers/Admin/helpdesk/AgentController.php
+++ b/app/Http/Controllers/Admin/helpdesk/AgentController.php
@@ -3,47 +3,47 @@
 namespace App\Http\Controllers\Admin\helpdesk;
 
 // controller
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Common\SettingsController;
 use App\Http\Controllers\Common\PhpMailController;
+use App\Http\Controllers\Common\SettingsController;
+use App\Http\Controllers\Controller;
 // request
 use App\Http\Requests\helpdesk\AgentRequest;
 use App\Http\Requests\helpdesk\AgentUpdate;
 // model
-use App\User;
 use App\Model\helpdesk\Agent\Assign_team_agent;
 use App\Model\helpdesk\Agent\Department;
 use App\Model\helpdesk\Agent\Groups;
 use App\Model\helpdesk\Agent\Teams;
-use App\Model\helpdesk\Utility\Timezones;
+use App\Model\helpdesk\Email\Emails;
 use App\Model\helpdesk\Settings\Company;
 use App\Model\helpdesk\Settings\Email;
-use App\Model\helpdesk\Email\Emails;
+use App\Model\helpdesk\Utility\Timezones;
+use App\User;
 // classes
 use DB;
-use Mail;
-use Hash;
 use Exception;
+use Hash;
+use Mail;
 
 /**
  * AgentController
- * This controller is used to CRUD category 
+ * This controller is used to CRUD category.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class AgentController extends Controller {
-
+class AgentController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
+     *
      * @return void
      */
-    public function __construct(PhpMailController $PhpMailController) {
+    public function __construct(PhpMailController $PhpMailController)
+    {
         $this->PhpMailController = $PhpMailController;
         SettingsController::smtp();
         // checking authentication
@@ -53,11 +53,14 @@ class AgentController extends Controller {
     }
 
     /**
-     * Get all agent list page
+     * Get all agent list page.
+     *
      * @param type User $user
+     *
      * @return type Response
      */
-    public function index() {
+    public function index()
+    {
         try {
             return view('themes.default1.admin.helpdesk.agent.agents.index');
         } catch (Exception $e) {
@@ -66,21 +69,25 @@ class AgentController extends Controller {
     }
 
     /**
-     * creating a new agent
+     * creating a new agent.
+     *
      * @param type Assign_team_agent $team_assign_agent
-     * @param type Timezones $timezone
-     * @param type Groups $group
-     * @param type Department $department
-     * @param type Teams $team
+     * @param type Timezones         $timezone
+     * @param type Groups            $group
+     * @param type Department        $department
+     * @param type Teams             $team
+     *
      * @return type view
      */
-    public function create(Assign_team_agent $team_assign_agent, Timezones $timezone, Groups $group, Department $department, Teams $team) {
+    public function create(Assign_team_agent $team_assign_agent, Timezones $timezone, Groups $group, Department $department, Teams $team)
+    {
         try {
             $team = $team->get();
             $timezones = $timezone->get();
             $groups = $group->get();
             $departments = $department->get();
             $teams = $team->lists('id', 'name');
+
             return view('themes.default1.admin.helpdesk.agent.agents.create', compact('assign', 'teams', 'agents', 'timezones', 'groups', 'departments', 'team'));
         } catch (Exception $e) {
             return redirect()->back()->with('fails', $e->errorInfo[2]);
@@ -88,13 +95,16 @@ class AgentController extends Controller {
     }
 
     /**
-     * store a new agent
-     * @param type User $user
-     * @param type AgentRequest $request
+     * store a new agent.
+     *
+     * @param type User              $user
+     * @param type AgentRequest      $request
      * @param type Assign_team_agent $team_assign_agent
+     *
      * @return type Response
      */
-    public function store(User $user, AgentRequest $request, Assign_team_agent $team_assign_agent) {
+    public function store(User $user, AgentRequest $request, Assign_team_agent $team_assign_agent)
+    {
 
         // dd($this->system_mail());
 
@@ -120,6 +130,7 @@ class AgentController extends Controller {
             } catch (Exception $e) {
                 return redirect('agents')->with('fails', 'Some error occured while sending mail to the agent. Please check email settings and try again');
             }
+
             return redirect('agents')->with('success', 'Agent Created sucessfully');
         } else {
             return redirect('agents')->with('fails', 'Agent can not Create');
@@ -127,17 +138,20 @@ class AgentController extends Controller {
     }
 
     /**
-     * Editing a selected agent
-     * @param type int $id
-     * @param type User $user
+     * Editing a selected agent.
+     *
+     * @param type int               $id
+     * @param type User              $user
      * @param type Assign_team_agent $team_assign_agent
-     * @param type Timezones $timezone
-     * @param type Groups $group
-     * @param type Department $department
-     * @param type Teams $team
+     * @param type Timezones         $timezone
+     * @param type Groups            $group
+     * @param type Department        $department
+     * @param type Teams             $team
+     *
      * @return type Response
      */
-    public function edit($id, User $user, Assign_team_agent $team_assign_agent, Timezones $timezone, Groups $group, Department $department, Teams $team) {
+    public function edit($id, User $user, Assign_team_agent $team_assign_agent, Timezones $timezone, Groups $group, Department $department, Teams $team)
+    {
         try {
             $user = $user->whereId($id)->first();
             $team = $team->get();
@@ -148,6 +162,7 @@ class AgentController extends Controller {
             $table = $team_assign_agent->where('agent_id', $id)->first();
             $teams = $team->lists('id', 'name');
             $assign = $team_assign_agent->where('agent_id', $id)->lists('team_id');
+
             return view('themes.default1.admin.helpdesk.agent.agents.edit', compact('teams', 'assign', 'table', 'teams1', 'selectedTeams', 'user', 'timezones', 'groups', 'departments', 'team', 'exp', 'counted'));
         } catch (Exception $e) {
             return redirect('agents')->with('fail', 'No such file');
@@ -156,13 +171,16 @@ class AgentController extends Controller {
 
     /**
      * Update the specified agent in storage.
-     * @param type int $id
-     * @param type User $user
-     * @param type AgentUpdate $request
+     *
+     * @param type int               $id
+     * @param type User              $user
+     * @param type AgentUpdate       $request
      * @param type Assign_team_agent $team_assign_agent
+     *
      * @return type Response
      */
-    public function update($id, User $user, AgentUpdate $request, Assign_team_agent $team_assign_agent) {
+    public function update($id, User $user, AgentUpdate $request, Assign_team_agent $team_assign_agent)
+    {
 
         // storing all the details
         $user = $user->whereId($id)->first();
@@ -181,20 +199,24 @@ class AgentController extends Controller {
         //Todo For success and failure conditions
         try {
             $user->fill($request->except('daylight_save', 'limit_access', 'directory_listing', 'vocation_mode', 'assign_team'))->save();
+
             return redirect('agents')->with('success', 'Agent Updated sucessfully');
         } catch (Exception $e) {
-            return redirect('agents')->with('fails', 'Agent did not update' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('agents')->with('fails', 'Agent did not update'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Remove the specified agent from storage.
-     * @param type int $id
-     * @param type User $user
+     *
+     * @param type int               $id
+     * @param type User              $user
      * @param type Assign_team_agent $team_assign_agent
+     *
      * @return type Response
      */
-    public function destroy($id, User $user, Assign_team_agent $team_assign_agent) {
+    public function destroy($id, User $user, Assign_team_agent $team_assign_agent)
+    {
         /* Becouse of foreign key we delete team_assign_agent first */
         error_reporting(E_ALL & ~E_NOTICE);
         $team_assign_agent = $team_assign_agent->where('agent_id', $id);
@@ -205,43 +227,52 @@ class AgentController extends Controller {
             $user->id;
             $user->delete();
             throw new \Exception($error);
+
             return redirect('agents')->with('success', 'Agent Deleted sucessfully');
         } catch (\Exception $e) {
             dd($e->errorInfo);
+
             return redirect('agents')->with('fails', $error);
         }
     }
 
     /**
-     * Generate a random string for password
+     * Generate a random string for password.
+     *
      * @param type $length
+     *
      * @return type string
      */
-    public function generateRandomString($length = 10) {
+    public function generateRandomString($length = 10)
+    {
         $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
         $charactersLength = strlen($characters);
         $randomString = '';
         for ($i = 0; $i < $length; $i++) {
             $randomString .= $characters[rand(0, $charactersLength - 1)];
         }
+
         return $randomString;
     }
 
     /**
-     * Fetching comapny name to send mail
+     * Fetching comapny name to send mail.
+     *
      * @return type
      */
-    public function company() {
+    public function company()
+    {
         $company = Company::Where('id', '=', '1')->first();
         if ($company->company_name == null) {
-            $company = "Support Center";
+            $company = 'Support Center';
         } else {
             $company = $company->company_name;
         }
+
         return $company;
     }
 
-    /**
+    /*
      * System default email
      */
     //  public function system_mail() {
diff --git a/app/Http/Controllers/Admin/helpdesk/BanlistController.php b/app/Http/Controllers/Admin/helpdesk/BanlistController.php
index ae7c32730..29b05d4a7 100644
--- a/app/Http/Controllers/Admin/helpdesk/BanlistController.php
+++ b/app/Http/Controllers/Admin/helpdesk/BanlistController.php
@@ -8,29 +8,30 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\helpdesk\BanlistRequest;
 use App\Http\Requests\helpdesk\BanRequest;
 // model
-use App\User;
 use App\Model\helpdesk\Email\Banlist;
+use App\User;
 //classes
 use Exception;
 
 /**
  * BanlistController
- * In this controller in the CRUD function for all the banned emails
- * @package     Controllers
- * @subpackage  Controller
+ * In this controller in the CRUD function for all the banned emails.
+ *
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class BanlistController extends Controller {
-
+class BanlistController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         // checking authentication
         $this->middleware('auth');
         // checking admin roles
@@ -39,12 +40,16 @@ class BanlistController extends Controller {
 
     /**
      * Display a listing of the resource.
+     *
      * @param type Banlist $ban
+     *
      * @return type Response
      */
-    public function index() {
+    public function index()
+    {
         try {
             $bans = User::where('ban', '=', 1)->get();
+
             return view('themes.default1.admin.helpdesk.emails.banlist.index', compact('bans'));
         } catch (Exception $e) {
             return view('404');
@@ -53,9 +58,11 @@ class BanlistController extends Controller {
 
     /**
      * Show the form for creating a new resource.
+     *
      * @return type Response
      */
-    public function create() {
+    public function create()
+    {
         try {
             return view('themes.default1.admin.helpdesk.emails.banlist.create');
         } catch (Exception $e) {
@@ -65,12 +72,15 @@ class BanlistController extends Controller {
 
     /**
      * Store a newly created resource in storage.
-     * @param type banlist $ban
+     *
+     * @param type banlist    $ban
      * @param type BanRequest $request
-     * @param type User $user
+     * @param type User       $user
+     *
      * @return type Response
      */
-    public function store(BanRequest $request, User $user) {
+    public function store(BanRequest $request, User $user)
+    {
         // dd($request);
         try {
             //adding field to user whether it is banned or not
@@ -83,11 +93,12 @@ class BanlistController extends Controller {
                 // $user->create($request->input())->save();
                 return redirect('banlist')->with('success', 'Email Banned sucessfully');
             } else {
-                $user = new User;
+                $user = new User();
                 $user->email = $adban;
                 $user->ban = $request->input('ban');
                 $user->internal_note = $request->input('internal_note');
                 $user->save();
+
                 return redirect('banlist')->with('success', 'Email Banned sucessfully');
             }
         } catch (Exception $e) {
@@ -98,22 +109,28 @@ class BanlistController extends Controller {
     /**
      * Display the specified resource.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return Response
      */
-    public function show($id) {
+    public function show($id)
+    {
         //
     }
 
     /**
      * Show the form for editing the specified resource.
-     * @param type int $id
+     *
+     * @param type int     $id
      * @param type Banlist $ban
+     *
      * @return type Response
      */
-    public function edit($id, User $ban) {
+    public function edit($id, User $ban)
+    {
         try {
             $bans = $ban->whereId($id)->first();
+
             return view('themes.default1.admin.helpdesk.emails.banlist.edit', compact('bans'));
         } catch (Exception $e) {
             return view('404');
@@ -122,12 +139,15 @@ class BanlistController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type int $id
-     * @param type Banlist $ban
+     *
+     * @param type int            $id
+     * @param type Banlist        $ban
      * @param type BanlistRequest $request
+     *
      * @return type Response
      */
-    public function update($id, User $ban, BanlistRequest $request) {
+    public function update($id, User $ban, BanlistRequest $request)
+    {
         try {
             $bans = $ban->whereId($id)->first();
             $bans->internal_note = $request->input('internal_note');
@@ -143,7 +163,7 @@ class BanlistController extends Controller {
         }
     }
 
-    /**
+    /*
      * Remove the specified resource from storage.
      * @param type int $id
      * @param type Banlist $ban
diff --git a/app/Http/Controllers/Admin/helpdesk/DepartmentController.php b/app/Http/Controllers/Admin/helpdesk/DepartmentController.php
index b6122cb21..749eb942f 100644
--- a/app/Http/Controllers/Admin/helpdesk/DepartmentController.php
+++ b/app/Http/Controllers/Admin/helpdesk/DepartmentController.php
@@ -9,46 +9,50 @@ use App\Http\Requests\helpdesk\DepartmentRequest;
 use App\Http\Requests\helpdesk\DepartmentUpdate;
 // model
 use App\Model\helpdesk\Agent\Department;
-use App\Model\helpdesk\Agent\Groups;
 use App\Model\helpdesk\Agent\Group_assign_department;
+use App\Model\helpdesk\Agent\Groups;
 use App\Model\helpdesk\Agent\Teams;
 use App\Model\helpdesk\Email\Emails;
 use App\Model\helpdesk\Email\Template;
+use App\Model\helpdesk\Manage\Help_topic;
 use App\Model\helpdesk\Manage\Sla_plan;
 use App\Model\helpdesk\Settings\System;
 use App\Model\helpdesk\Ticket\Tickets;
-use App\Model\helpdesk\Manage\Help_topic;
 use App\User;
 // classes
 use DB;
 use Exception;
 
 /**
- * DepartmentController
+ * DepartmentController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class DepartmentController extends Controller {
-
+class DepartmentController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->middleware('auth');
         $this->middleware('roles');
     }
 
     /**
-     * Get index page
+     * Get index page.
+     *
      * @param type Department $department
+     *
      * @return type Response
      */
-    public function index(Department $department) {
+    public function index(Department $department)
+    {
         try {
             $departments = $department->get();
+
             return view('themes.default1.admin.helpdesk.agent.departments.index', compact('departments'));
         } catch (Exception $e) {
             return view('404');
@@ -57,16 +61,19 @@ class DepartmentController extends Controller {
 
     /**
      * Show the form for creating a new resource.
-     * @param type User $user
+     *
+     * @param type User                    $user
      * @param type Group_assign_department $group_assign_department
-     * @param type Department $department
-     * @param type Sla_plan $sla
-     * @param type Template $template
-     * @param type Emails $email
-     * @param type Groups $group
+     * @param type Department              $department
+     * @param type Sla_plan                $sla
+     * @param type Template                $template
+     * @param type Emails                  $email
+     * @param type Groups                  $group
+     *
      * @return type Response
      */
-    public function create(User $user, Group_assign_department $group_assign_department, Department $department, Sla_plan $sla, Template $template, Emails $email, Groups $group) {
+    public function create(User $user, Group_assign_department $group_assign_department, Department $department, Sla_plan $sla, Template $template, Emails $email, Groups $group)
+    {
         try {
             $slas = $sla->get();
             $user = $user->where('role', 'agent')->get();
@@ -74,6 +81,7 @@ class DepartmentController extends Controller {
             $templates = $template->get();
             $department = $department->get();
             $groups = $group->lists('id', 'name');
+
             return view('themes.default1.admin.helpdesk.agent.departments.create', compact('department', 'templates', 'slas', 'user', 'emails', 'groups'));
         } catch (Exception $e) {
             return view('404');
@@ -82,11 +90,14 @@ class DepartmentController extends Controller {
 
     /**
      * Store a newly created resource in storage.
-     * @param type Department $department
+     *
+     * @param type Department        $department
      * @param type DepartmentRequest $request
+     *
      * @return type Response
      */
-    public function store(Department $department, DepartmentRequest $request) {
+    public function store(Department $department, DepartmentRequest $request)
+    {
         try {
             $department->fill($request->except('group_id', 'manager'))->save();
             $requests = $request->input('group_id');
@@ -113,18 +124,21 @@ class DepartmentController extends Controller {
 
     /**
      * Show the form for editing the specified resource.
-     * @param type int $id
-     * @param type User $user
+     *
+     * @param type int                     $id
+     * @param type User                    $user
      * @param type Group_assign_department $group_assign_department
-     * @param type Template $template
-     * @param type Teams $team
-     * @param type Department $department
-     * @param type Sla_plan $sla
-     * @param type Emails $email
-     * @param type Groups $group
+     * @param type Template                $template
+     * @param type Teams                   $team
+     * @param type Department              $department
+     * @param type Sla_plan                $sla
+     * @param type Emails                  $email
+     * @param type Groups                  $group
+     *
      * @return type Response
      */
-    public function edit($id, User $user, Group_assign_department $group_assign_department, Template $template, Teams $team, Department $department, Sla_plan $sla, Emails $email, Groups $group) {
+    public function edit($id, User $user, Group_assign_department $group_assign_department, Template $template, Teams $team, Department $department, Sla_plan $sla, Emails $email, Groups $group)
+    {
         try {
             $slas = $sla->get();
             $user = $user->where('role', 'agent')->get();
@@ -133,6 +147,7 @@ class DepartmentController extends Controller {
             $departments = $department->whereId($id)->first();
             $groups = $group->lists('id', 'name');
             $assign = $group_assign_department->where('department_id', $id)->lists('group_id');
+
             return view('themes.default1.admin.helpdesk.agent.departments.edit', compact('assign', 'team', 'templates', 'departments', 'slas', 'user', 'emails', 'groups'));
         } catch (Exception $e) {
             return view('404');
@@ -141,13 +156,16 @@ class DepartmentController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type int $id
+     *
+     * @param type int                     $id
      * @param type Group_assign_department $group_assign_department
-     * @param type Department $department
-     * @param type DepartmentUpdate $request
+     * @param type Department              $department
+     * @param type DepartmentUpdate        $request
+     *
      * @return type Response
      */
-    public function update($id, Group_assign_department $group_assign_department, Department $department, DepartmentUpdate $request) {
+    public function update($id, Group_assign_department $group_assign_department, Department $department, DepartmentUpdate $request)
+    {
         // dd($id);
         try {
             $table = $group_assign_department->where('department_id', $id);
@@ -177,12 +195,15 @@ class DepartmentController extends Controller {
 
     /**
      * Remove the specified resource from storage.
-     * @param type int $id
-     * @param type Department $department
+     *
+     * @param type int                     $id
+     * @param type Department              $department
      * @param type Group_assign_department $group_assign_department
+     *
      * @return type Response
      */
-    public function destroy($id, Department $department, Group_assign_department $group_assign_department, System $system, Tickets $tickets) {
+    public function destroy($id, Department $department, Group_assign_department $group_assign_department, System $system, Tickets $tickets)
+    {
         // try {
         $system = $system->where('id', '=', '1')->first();
         if ($system->department == $id) {
@@ -191,54 +212,53 @@ class DepartmentController extends Controller {
             $tickets = DB::table('tickets')->where('dept_id', '=', $id)->update(['dept_id' => $system->department]);
             if ($tickets > 0) {
                 if ($tickets > 1) {
-                    $text_tickets = "Tickets";
+                    $text_tickets = 'Tickets';
                 } else {
-                    $text_tickets = "Ticket";
+                    $text_tickets = 'Ticket';
                 }
-                $ticket = '<li>' . $tickets . ' ' . $text_tickets . ' have been moved to default department</li>';
+                $ticket = '<li>'.$tickets.' '.$text_tickets.' have been moved to default department</li>';
             } else {
-                $ticket = "";
+                $ticket = '';
             }
             $users = DB::table('users')->where('primary_dpt', '=', $id)->update(['primary_dpt' => $system->department]);
             if ($users > 0) {
                 if ($users > 1) {
-                    $text_user = "Users";
+                    $text_user = 'Users';
                 } else {
-                    $text_user = "User";
+                    $text_user = 'User';
                 }
-                $user = '<li>' . $users . ' ' . $text_user . ' have been moved to default department</li>';
+                $user = '<li>'.$users.' '.$text_user.' have been moved to default department</li>';
             } else {
-                $user = "";
+                $user = '';
             }
             $emails = DB::table('emails')->where('department', '=', $id)->update(['department' => $system->department]);
             if ($emails > 0) {
                 if ($emails > 1) {
-                    $text_emails = "Emails";
+                    $text_emails = 'Emails';
                 } else {
-                    $text_emails = "Email";
+                    $text_emails = 'Email';
                 }
-                $email = '<li>' . $emails . ' System ' . $text_emails . ' have been moved to default department</li>';
+                $email = '<li>'.$emails.' System '.$text_emails.' have been moved to default department</li>';
             } else {
-                $email = "";
+                $email = '';
             }
             $helptopic = DB::table('help_topic')->where('department', '=', $id)->update(['department' => null], ['status' => '1']);
             if ($helptopic > 0) {
                 $helptopic = '<li>The associated helptopic has been deactivated</li>';
             } else {
-                $helptopic = "";
+                $helptopic = '';
             }
-            $message = $ticket . $user . $email . $helptopic;
+            $message = $ticket.$user.$email.$helptopic;
             /* Becouse of foreign key we delete group_assign_department first */
             $group_assign_department = $group_assign_department->where('department_id', $id);
             $group_assign_department->delete();
             $departments = $department->whereId($id)->first();
             /* Check the function is Success or Fail */
             if ($departments->delete() == true) {
-                return redirect('departments')->with('success', 'Department Deleted sucessfully' . $message);
+                return redirect('departments')->with('success', 'Department Deleted sucessfully'.$message);
             } else {
                 return redirect('departments')->with('fails', 'Department can not Delete');
             }
         }
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/EmailsController.php b/app/Http/Controllers/Admin/helpdesk/EmailsController.php
index c8259403c..a4a10f8ab 100644
--- a/app/Http/Controllers/Admin/helpdesk/EmailsController.php
+++ b/app/Http/Controllers/Admin/helpdesk/EmailsController.php
@@ -11,39 +11,43 @@ use App\Http\Requests\helpdesk\EmailsRequest;
 use App\Model\helpdesk\Agent\Department;
 use App\Model\helpdesk\Email\Emails;
 use App\Model\helpdesk\Manage\Help_topic;
-use App\Model\helpdesk\Utility\MailboxProtocol;
-use App\Model\helpdesk\Ticket\Ticket_Priority;
 use App\Model\helpdesk\Settings\Email;
+use App\Model\helpdesk\Ticket\Ticket_Priority;
+use App\Model\helpdesk\Utility\MailboxProtocol;
 // classes
 use Crypt;
 use Exception;
 
 /**
- * EmailsController
+ * EmailsController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class EmailsController extends Controller {
-
+class EmailsController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->middleware('auth');
         $this->middleware('roles');
     }
 
     /**
      * Display a listing of the resource.
+     *
      * @param type Emails $emails
+     *
      * @return type Response
      */
-    public function index(Emails $emails) {
+    public function index(Emails $emails)
+    {
         try {
             $emails = $emails->get();
+
             return view('themes.default1.admin.helpdesk.emails.emails.index', compact('emails'));
         } catch (Exception $e) {
             return view('404');
@@ -52,18 +56,22 @@ class EmailsController extends Controller {
 
     /**
      * Show the form for creating a new resource.
-     * @param type Department $department
-     * @param type Help_topic $help
-     * @param type Priority $priority
+     *
+     * @param type Department      $department
+     * @param type Help_topic      $help
+     * @param type Priority        $priority
      * @param type MailboxProtocol $mailbox_protocol
+     *
      * @return type Response
      */
-    public function create(Department $department, Help_topic $help, Ticket_Priority $priority, MailboxProtocol $mailbox_protocol) {
+    public function create(Department $department, Help_topic $help, Ticket_Priority $priority, MailboxProtocol $mailbox_protocol)
+    {
         try {
             $departments = $department->get();
             $helps = $help->get();
             $priority = $priority->get();
             $mailbox_protocols = $mailbox_protocol->get();
+
             return view('themes.default1.admin.helpdesk.emails.emails.create', compact('mailbox_protocols', 'priority', 'departments', 'helps'));
         } catch (Exception $e) {
             return view('404');
@@ -72,11 +80,14 @@ class EmailsController extends Controller {
 
     /**
      * Store a newly created resource in storage.
-     * @param type Emails $email
+     *
+     * @param type Emails        $email
      * @param type EmailsRequest $request
+     *
      * @return type Response
      */
-    public function store(Emails $email, EmailsRequest $request) {
+    public function store(Emails $email, EmailsRequest $request)
+    {
         try {
             $password = $request->input('password');
             $encrypted = Crypt::encrypt($password);
@@ -115,30 +126,36 @@ class EmailsController extends Controller {
     /**
      * Display the specified resource.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return Response
      */
-    public function show($id) {
+    public function show($id)
+    {
         //
     }
 
     /**
      * Show the form for editing the specified resource.
-     * @param type int $id
-     * @param type Department $department
-     * @param type Help_topic $help
-     * @param type Emails $email
-     * @param type Priority $priority
+     *
+     * @param type int             $id
+     * @param type Department      $department
+     * @param type Help_topic      $help
+     * @param type Emails          $email
+     * @param type Priority        $priority
      * @param type MailboxProtocol $mailbox_protocol
+     *
      * @return type Response
      */
-    public function edit($id, Department $department, Help_topic $help, Emails $email, Ticket_Priority $priority, MailboxProtocol $mailbox_protocol) {
+    public function edit($id, Department $department, Help_topic $help, Emails $email, Ticket_Priority $priority, MailboxProtocol $mailbox_protocol)
+    {
         try {
             $emails = $email->whereId($id)->first();
             $departments = $department->get();
             $helps = $help->get();
             $priority = $priority->get();
             $mailbox_protocols = $mailbox_protocol->get();
+
             return view('themes.default1.admin.helpdesk.emails.emails.edit', compact('mailbox_protocols', 'priority', 'departments', 'helps', 'emails'));
         } catch (Exception $e) {
             return view('404');
@@ -147,12 +164,15 @@ class EmailsController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type $id
-     * @param type Emails $email
+     *
+     * @param type                   $id
+     * @param type Emails            $email
      * @param type EmailsEditRequest $request
+     *
      * @return type Response
      */
-    public function update($id, Emails $email, EmailsEditRequest $request) {
+    public function update($id, Emails $email, EmailsEditRequest $request)
+    {
         $password = $request->input('password');
         $encrypted = Crypt::encrypt($password);
         //echo $encrypted;
@@ -179,6 +199,7 @@ class EmailsController extends Controller {
             }
             $emails->password = $encrypted;
             $emails->save();
+
             return redirect('emails')->with('success', 'Email Updated sucessfully');
         } catch (Exception $e) {
             return redirect('emails')->with('fails', 'Email not updated');
@@ -187,11 +208,14 @@ class EmailsController extends Controller {
 
     /**
      * Remove the specified resource from storage.
-     * @param type int $id
+     *
+     * @param type int    $id
      * @param type Emails $email
+     *
      * @return type Response
      */
-    public function destroy($id, Emails $email) {
+    public function destroy($id, Emails $email)
+    {
         $default_system_email = Email::where('id', '=', '1')->first();
         if ($default_system_email->id) {
             if ($id == $default_system_email->id) {
@@ -209,5 +233,4 @@ class EmailsController extends Controller {
             return redirect('emails')->with('fails', 'Email can not  Delete ');
         }
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/FormController.php b/app/Http/Controllers/Admin/helpdesk/FormController.php
index 4aa013c55..786c87546 100644
--- a/app/Http/Controllers/Admin/helpdesk/FormController.php
+++ b/app/Http/Controllers/Admin/helpdesk/FormController.php
@@ -13,58 +13,66 @@ use Illuminate\Http\Request;
 // Class
 use Input;
 use Redirect;
-use Exception;
 
 /**
  * FormController
- * This controller is used to CRUD Custom Forms
+ * This controller is used to CRUD Custom Forms.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class FormController extends Controller {
-
+class FormController extends Controller
+{
     private $fields;
     private $forms;
 
-    public function __construct(Fields $fields, Forms $forms) {
+    public function __construct(Fields $fields, Forms $forms)
+    {
         $this->fields = $fields;
         $this->forms = $forms;
         // $this->middleware('auth');
     }
 
     /**
-     * home
+     * home.
+     *
      * @return type
      */
-    public function home() {
+    public function home()
+    {
         return view('forms.home');
     }
 
     /**
-     * list of forms
-     * @param type Forms $forms 
+     * list of forms.
+     *
+     * @param type Forms $forms
+     *
      * @return Response
      */
-    public function index(Forms $forms) {
+    public function index(Forms $forms)
+    {
         return view('themes.default1.admin.helpdesk.manage.form.index', compact('forms'));
     }
 
     /**
      * Show the form for creating a new resource.
+     *
      * @return Response
      */
-    public function create() {
+    public function create()
+    {
         return view('themes.default1.admin.helpdesk.manage.form.form');
     }
 
     /**
      * Display the specified resource.
-     * @param  int  $id
+     *
+     * @param int $id
+     *
      * @return Response
      */
-    public function show($id) {
+    public function show($id)
+    {
         return view('themes.default1.admin.helpdesk.manage.form.preview', compact('id'));
     }
 
@@ -73,13 +81,14 @@ class FormController extends Controller {
      *
      * @return Response
      */
-    public function store(Forms $forms) {
+    public function store(Forms $forms)
+    {
         if (!Input::get('formname')) {
             return Redirect::back()->with('fails', 'Please fill Form name');
         }
         $required = Input::get('required');
         $count = count($required);
-        $require = array();
+        $require = [];
         for ($i = 2; $i < $count + 2; $i++) {
             for ($j = 0; $j < 1; $j++) {
                 array_push($require, $required[$i][$j]);
@@ -88,24 +97,26 @@ class FormController extends Controller {
         $forms->formname = Input::get('formname');
         $forms->save();
         $count = count(Input::get('name'));
-        $fields = array();
+        $fields = [];
         for ($i = 0; $i <= $count; $i++) {
             if (!empty(Input::get('name')[$i])) {
-                array_push($fields, array(
+                array_push($fields, [
                     'forms_id' => $forms->id,
-                    'label' => Input::get('label')[$i],
-                    'name' => Input::get('name')[$i],
-                    'type' => Input::get('type')[$i],
-                    'value' => Input::get('value')[$i],
+                    'label'    => Input::get('label')[$i],
+                    'name'     => Input::get('name')[$i],
+                    'type'     => Input::get('type')[$i],
+                    'value'    => Input::get('value')[$i],
                     'required' => $require[$i],
-                ));
+                ]);
             }
         }
         Fields::insert($fields);
+
         return Redirect::back()->with('success', 'Successfully created Form');
     }
 
-    public function delete($id, Forms $forms, Fields $field, Help_topic $help_topic) {
+    public function delete($id, Forms $forms, Fields $field, Help_topic $help_topic)
+    {
         $fields = $field->where('forms_id', $id)->get();
         $help_topics = $help_topic->where('custom_form', '=', $id)->get();
         foreach ($help_topics as $help_topic) {
@@ -117,7 +128,7 @@ class FormController extends Controller {
         }
         $forms = $forms->where('id', $id)->first();
         $forms->delete();
+
         return redirect()->back()->with('success', 'Deleted Successfully');
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/GroupController.php b/app/Http/Controllers/Admin/helpdesk/GroupController.php
index 139b55b54..9e8392cc7 100644
--- a/app/Http/Controllers/Admin/helpdesk/GroupController.php
+++ b/app/Http/Controllers/Admin/helpdesk/GroupController.php
@@ -6,45 +6,49 @@ namespace App\Http\Controllers\Admin\helpdesk;
 use App\Http\Controllers\Controller;
 // requests
 use App\Http\Requests\helpdesk\GroupRequest;
-use Illuminate\Http\Request;
-// models
 use App\Model\helpdesk\Agent\Department;
-use App\Model\helpdesk\Agent\Groups;
+// models
 use App\Model\helpdesk\Agent\Group_assign_department;
+use App\Model\helpdesk\Agent\Groups;
 use App\User;
-// classes
-use Illuminate\Support\Facades\Input;
 use Exception;
+// classes
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Input;
 
 /**
- * GroupController
+ * GroupController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class GroupController extends Controller {
-
+class GroupController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type void
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->middleware('auth');
         $this->middleware('roles');
     }
 
     /**
      * Display a listing of the resource.
-     * @param type Groups $group
-     * @param type Department $department
+     *
+     * @param type Groups                  $group
+     * @param type Department              $department
      * @param type Group_assign_department $group_assign_department
+     *
      * @return type Response
      */
-    public function index(Groups $group, Department $department, Group_assign_department $group_assign_department) {
+    public function index(Groups $group, Department $department, Group_assign_department $group_assign_department)
+    {
         try {
             $groups = $group->get();
             $departments = $department->lists('id');
+
             return view('themes.default1.admin.helpdesk.agent.groups.index', compact('departments', 'group_assign_department', 'groups'));
         } catch (Exception $e) {
             return view('404');
@@ -53,9 +57,11 @@ class GroupController extends Controller {
 
     /**
      * Show the form for creating a new resource.
+     *
      * @return type Response
      */
-    public function create() {
+    public function create()
+    {
         try {
             return view('themes.default1.admin.helpdesk.agent.groups.create');
         } catch (Exception $e) {
@@ -65,44 +71,55 @@ class GroupController extends Controller {
 
     /**
      * Store a newly created resource in storage.
-     * @param type Groups $group
+     *
+     * @param type Groups       $group
      * @param type GroupRequest $request
+     *
      * @return type Response
      */
-    public function store(Groups $group, GroupRequest $request) {
+    public function store(Groups $group, GroupRequest $request)
+    {
         try {
             /* Check Whether function success or not */
             $group->fill($request->input())->save();
+
             return redirect('groups')->with('success', 'Group Created Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('groups')->with('fails', 'Groups can not Create' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('groups')->with('fails', 'Groups can not Create'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Show the form for editing the specified resource.
-     * @param type int $id
+     *
+     * @param type int    $id
      * @param type Groups $group
+     *
      * @return type Response
      */
-    public function edit($id, Groups $group) {
+    public function edit($id, Groups $group)
+    {
         try {
             $groups = $group->whereId($id)->first();
+
             return view('themes.default1.admin.helpdesk.agent.groups.edit', compact('groups'));
         } catch (Exception $e) {
-            return redirect('groups')->with('fails', 'Groups can not Create' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('groups')->with('fails', 'Groups can not Create'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Update the specified resource in storage.
-     * @param type int $id
-     * @param type Groups $group
+     *
+     * @param type int     $id
+     * @param type Groups  $group
      * @param type Request $request
+     *
      * @return type Response
      */
-    public function update($id, Groups $group, Request $request) {
+    public function update($id, Groups $group, Request $request)
+    {
         $var = $group->whereId($id)->first();
         //Updating Status
         $status = $request->Input('group_status');
@@ -153,22 +170,26 @@ class GroupController extends Controller {
             return redirect('groups')->with('success', 'Group Updated Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('groups')->with('fails', 'Groups can not Create' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('groups')->with('fails', 'Groups can not Create'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Remove the specified resource from storage.
-     * @param type int $id
-     * @param type Groups $group
+     *
+     * @param type int                     $id
+     * @param type Groups                  $group
      * @param type Group_assign_department $group_assign_department
+     *
      * @return type Response
      */
-    public function destroy($id, Groups $group, Group_assign_department $group_assign_department) {
+    public function destroy($id, Groups $group, Group_assign_department $group_assign_department)
+    {
         $users = User::where('assign_group', '=', $id)->first();
         if ($users) {
             $user = '<li>There are agents assigned to this group. Please unassign them from this group to delete</li>';
-            return redirect('groups')->with('fails', 'Group cannot Delete ' . $user);
+
+            return redirect('groups')->with('fails', 'Group cannot Delete '.$user);
         }
         $group_assign_department->where('group_id', $id)->delete();
         $groups = $group->whereId($id)->first();
@@ -179,8 +200,7 @@ class GroupController extends Controller {
             return redirect('groups')->with('success', 'Group Deleted Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('groups')->with('fails', 'Groups cannot Create' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('groups')->with('fails', 'Groups cannot Create'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/HelptopicController.php b/app/Http/Controllers/Admin/helpdesk/HelptopicController.php
index c223b8965..31f3d825d 100644
--- a/app/Http/Controllers/Admin/helpdesk/HelptopicController.php
+++ b/app/Http/Controllers/Admin/helpdesk/HelptopicController.php
@@ -13,39 +13,43 @@ use App\Model\helpdesk\Agent\Department;
 use App\Model\helpdesk\Form\Forms;
 use App\Model\helpdesk\Manage\Help_topic;
 use App\Model\helpdesk\Manage\Sla_plan;
-use App\Model\helpdesk\Ticket\Ticket_Priority;
 use App\Model\helpdesk\Settings\Ticket;
+use App\Model\helpdesk\Ticket\Ticket_Priority;
 use App\User;
 // classes
 use DB;
 use Exception;
 
 /**
- * HelptopicController
+ * HelptopicController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class HelptopicController extends Controller {
-
+class HelptopicController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type vodi
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->middleware('auth');
         $this->middleware('roles');
     }
 
     /**
      * Display a listing of the resource.
+     *
      * @param type Help_topic $topic
+     *
      * @return type Response
      */
-    public function index(Help_topic $topic) {
+    public function index(Help_topic $topic)
+    {
         try {
             $topics = $topic->get();
+
             return view('themes.default1.admin.helpdesk.manage.helptopic.index', compact('topics'));
         } catch (Exception $e) {
             return view('404');
@@ -54,12 +58,14 @@ class HelptopicController extends Controller {
 
     /**
      * Show the form for creating a new resource.
-     * @param type Priority $priority
+     *
+     * @param type Priority   $priority
      * @param type Department $department
      * @param type Help_topic $topic
-     * @param type Form_name $form
-     * @param type Agents $agent
-     * @param type Sla_plan $sla
+     * @param type Form_name  $form
+     * @param type Agents     $agent
+     * @param type Sla_plan   $sla
+     *
      * @return type Response
      */
     /*
@@ -72,7 +78,8 @@ class HelptopicController extends Controller {
       | 5.Forms Model
       ================================================
      */
-    public function create(Ticket_Priority $priority, Department $department, Help_topic $topic, Forms $form, User $agent, Sla_plan $sla) {
+    public function create(Ticket_Priority $priority, Department $department, Help_topic $topic, Forms $form, User $agent, Sla_plan $sla)
+    {
         try {
             $departments = $department->get();
             $topics = $topic->get();
@@ -80,6 +87,7 @@ class HelptopicController extends Controller {
             $agents = $agent->where('role', '=', 'agent')->get();
             $slas = $sla->get();
             $priority = $priority->get();
+
             return view('themes.default1.admin.helpdesk.manage.helptopic.create', compact('priority', 'departments', 'topics', 'forms', 'agents', 'slas'));
         } catch (Exception $e) {
             return view('404');
@@ -88,11 +96,14 @@ class HelptopicController extends Controller {
 
     /**
      * Store a newly created resource in storage.
-     * @param type Help_topic $topic
+     *
+     * @param type Help_topic       $topic
      * @param type HelptopicRequest $request
+     *
      * @return type Response
      */
-    public function store(Help_topic $topic, HelptopicRequest $request) {
+    public function store(Help_topic $topic, HelptopicRequest $request)
+    {
         try {
             if ($request->custom_form) {
                 $custom_form = $request->custom_form;
@@ -111,22 +122,25 @@ class HelptopicController extends Controller {
             return redirect('helptopic')->with('success', 'Helptopic Created Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('helptopic')->with('fails', 'Helptopic can not Create' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('helptopic')->with('fails', 'Helptopic can not Create'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Show the form for editing the specified resource.
-     * @param type $id
-     * @param type Priority $priority
+     *
+     * @param type            $id
+     * @param type Priority   $priority
      * @param type Department $department
      * @param type Help_topic $topic
-     * @param type Form_name $form
-     * @param type Agents $agent
-     * @param type Sla_plan $sla
+     * @param type Form_name  $form
+     * @param type Agents     $agent
+     * @param type Sla_plan   $sla
+     *
      * @return type Response
      */
-    public function edit($id, Ticket_Priority $priority, Department $department, Help_topic $topic, Forms $form, Sla_plan $sla) {
+    public function edit($id, Ticket_Priority $priority, Department $department, Help_topic $topic, Forms $form, Sla_plan $sla)
+    {
         try {
             $agents = User::where('role', '=', 'agent')->get();
             $departments = $department->get();
@@ -134,20 +148,24 @@ class HelptopicController extends Controller {
             $forms = $form->get();
             $slas = $sla->get();
             $priority = $priority->get();
+
             return view('themes.default1.admin.helpdesk.manage.helptopic.edit', compact('priority', 'departments', 'topics', 'forms', 'agents', 'slas'));
         } catch (Exception $e) {
-            return redirect('helptopic')->with('fails', '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('helptopic')->with('fails', '<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Update the specified resource in storage.
-     * @param type $id
-     * @param type Help_topic $topic
+     *
+     * @param type                 $id
+     * @param type Help_topic      $topic
      * @param type HelptopicUpdate $request
+     *
      * @return type Response
      */
-    public function update($id, Help_topic $topic, HelptopicUpdate $request) {
+    public function update($id, Help_topic $topic, HelptopicUpdate $request)
+    {
         // dd($request);
         try {
             $topics = $topic->whereId($id)->first();
@@ -170,61 +188,62 @@ class HelptopicController extends Controller {
             return redirect('helptopic')->with('success', 'Helptopic Updated Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('helptopic')->with('fails', 'Helptopic can not Update' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('helptopic')->with('fails', 'Helptopic can not Update'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Remove the specified resource from storage.
-     * @param type int $id
+     *
+     * @param type int        $id
      * @param type Help_topic $topic
+     *
      * @return type Response
      */
-    public function destroy($id, Help_topic $topic, Ticket $ticket_setting) {
+    public function destroy($id, Help_topic $topic, Ticket $ticket_setting)
+    {
         $ticket_settings = $ticket_setting->where('id', '=', '1')->first();
         if ($ticket_settings->help_topic == $id) {
             return redirect('departments')->with('fails', 'You cannot delete default department');
         } else {
-
             $tickets = DB::table('tickets')->where('help_topic_id', '=', $id)->update(['help_topic_id' => $ticket_settings->help_topic]);
 
             if ($tickets > 0) {
                 if ($tickets > 1) {
-                    $text_tickets = "Tickets";
+                    $text_tickets = 'Tickets';
                 } else {
-                    $text_tickets = "Ticket";
+                    $text_tickets = 'Ticket';
                 }
-                $ticket = '<li>' . $tickets . ' ' . $text_tickets . ' have been moved to default Help Topic</li>';
+                $ticket = '<li>'.$tickets.' '.$text_tickets.' have been moved to default Help Topic</li>';
             } else {
-                $ticket = "";
+                $ticket = '';
             }
 
             $emails = DB::table('emails')->where('help_topic', '=', $id)->update(['help_topic' => $ticket_settings->help_topic]);
 
             if ($emails > 0) {
                 if ($emails > 1) {
-                    $text_emails = "Emails";
+                    $text_emails = 'Emails';
                 } else {
-                    $text_emails = "Email";
+                    $text_emails = 'Email';
                 }
-                $email = '<li>' . $emails . ' System ' . $text_emails . ' have been moved to default Help Topic</li>';
+                $email = '<li>'.$emails.' System '.$text_emails.' have been moved to default Help Topic</li>';
             } else {
-                $email = "";
+                $email = '';
             }
 
-            $message = $ticket . $email;
+            $message = $ticket.$email;
 
             $topics = $topic->whereId($id)->first();
             /* Check whether function success or not */
             try {
                 $topics->delete();
                 /* redirect to Index page with Success Message */
-                return redirect('helptopic')->with('success', 'Helptopic Deleted Successfully' . $message);
+                return redirect('helptopic')->with('success', 'Helptopic Deleted Successfully'.$message);
             } catch (Exception $e) {
                 /* redirect to Index page with Fails Message */
-                return redirect('helptopic')->with('fails', 'Helptopic can not Delete' . '<li>' . $e->errorInfo[2] . '</li>');
+                return redirect('helptopic')->with('fails', 'Helptopic can not Delete'.'<li>'.$e->errorInfo[2].'</li>');
             }
         }
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/HomeController.php b/app/Http/Controllers/Admin/helpdesk/HomeController.php
index 7a2744c8d..c9e942bb4 100644
--- a/app/Http/Controllers/Admin/helpdesk/HomeController.php
+++ b/app/Http/Controllers/Admin/helpdesk/HomeController.php
@@ -10,17 +10,17 @@ namespace App\Http\Controllers\Admin\helpdesk;
  * are authenticated. Of course, you are free to change or remove the
  * controller as you wish. It is just here to get your app started!
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class HomeController extends Controller {
-
+class HomeController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->middleware('auth');
     }
 
@@ -29,8 +29,8 @@ class HomeController extends Controller {
      *
      * @return Response
      */
-    public function index() {
+    public function index()
+    {
         return view('themes/default1/admin/dashboard');
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/LanguageController.php b/app/Http/Controllers/Admin/helpdesk/LanguageController.php
index c66c06027..5bf526f4d 100644
--- a/app/Http/Controllers/Admin/helpdesk/LanguageController.php
+++ b/app/Http/Controllers/Admin/helpdesk/LanguageController.php
@@ -3,55 +3,55 @@
 namespace App\Http\Controllers\Admin\helpdesk;
 
 // controllers
-use App\Http\Controllers\Controller;
+use App;
 // requests
-use App\Http\Requests;
-use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 //supports
+use App\Http\Requests;
+use Cache;
+use Config;
+//classes
+use File;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Session;
-use Illuminate\Support\Collection;
-//classes
 use Input;
-use Config;
-use Validator;
-use Zipper;
-use App;
 use Lang;
-use Cache;
-use File;
-use Exception;
+use Validator;
 
 /**
- * SlaController
+ * SlaController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class LanguageController extends Controller {
-
+class LanguageController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type void
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->middleware('auth');
         $this->middleware('roles');
     }
 
     /**
-     * Switch language at runtime
+     * Switch language at runtime.
+     *
      * @param type "" $lang
+     *
      * @return type response
      */
-    public function switchLanguage($lang) {
+    public function switchLanguage($lang)
+    {
         //if(Cache::has('language'))
         //{
         //  return Cache::get('language');
         //} else return 'false';
         // Cache::put('language',$)
-        $path = base_path('resources/lang');  // Path to check available language packages 
+        $path = base_path('resources/lang');  // Path to check available language packages
         if (array_key_exists($lang, Config::get('languages')) && in_array($lang, scandir($path))) {
             // dd(array_key_exists($lang, Config::get('languages')));
             // app()->setLocale($lang);
@@ -60,55 +60,63 @@ class LanguageController extends Controller {
             // dd(Cache::get('language'));
             // dd()
         } else {
-            return Redirect::back()->with('fails', Lang::get("lang.language-error"));
+            return Redirect::back()->with('fails', Lang::get('lang.language-error'));
         }
+
         return Redirect::back();
     }
 
     /**
-     * Shows language page
+     * Shows language page.
+     *
      * @return type response
      */
-    public function index() {
+    public function index()
+    {
         return view('themes.default1.admin.helpdesk.language.index');
     }
 
     /**
-     * Shows Language upload form
+     * Shows Language upload form.
+     *
      * @return type response
      */
-    public function getForm() {
+    public function getForm()
+    {
         return view('themes.default1.admin.helpdesk.language.create');
     }
 
     /**
-     * Provide language datatable to language page
-     * @return type 
+     * Provide language datatable to language page.
+     *
+     * @return type
      */
-    public function getLanguages() {
-        $path = base_path('resources/lang'); 
+    public function getLanguages()
+    {
+        $path = base_path('resources/lang');
         $values = scandir($path);  //Extracts names of directories present in lang directory
-        $values = array_slice($values, 2); // skips array element $value[0] = '.' & $value[1] = '..' 
+        $values = array_slice($values, 2); // skips array element $value[0] = '.' & $value[1] = '..'
         return \Datatable::collection(new Collection($values))
-                        ->addColumn('language', function($model) {
-                            return Config::get('languages.' . $model);
+                        ->addColumn('language', function ($model) {
+                            return Config::get('languages.'.$model);
                         })
-                        ->addColumn('id', function($model) {
+                        ->addColumn('id', function ($model) {
                             return $model;
                         })
-                        ->addColumn('status', function($model) {
+                        ->addColumn('status', function ($model) {
                             if (Lang::getLocale() === $model) {
-                                return "<span style='color:green'>" . Lang::trans("lang.active") . "</span>";
-                            } else
-                                return "<span style='color:red'>" . Lang::trans("lang.inactive") . "</span>";
-                        })
-                        ->addColumn('Action', function($model) {
-                            if (Lang::getLocale() === $model) {
-                                return "<a href='change-language/" . $model . "'><input type='button' class='btn btn-info btn-xs btn-flat' disabled value='" . Lang::trans("lang.disable") . "'/></a>  
-                <a href='change-language/" . $model . "' class='btn btn-danger btn-xs btn-flat' disabled><i class='fa fa-trash' style='color:black;'> </i> " . Lang::trans("lang.delete") . "</a>";
+                                return "<span style='color:green'>".Lang::trans('lang.active').'</span>';
                             } else {
-                                return "<a href='change-language/" . $model . "'><input type='button' class='btn btn-info btn-xs btn-flat' value='" . Lang::trans("lang.enable") . "'/></a>  
-                <a href='delete-language/" . $model . "' class='btn btn-danger btn-xs btn-flat'><i class='fa fa-trash' style='color:black;'> </i> " . Lang::trans("lang.delete") . "</a>";
+                                return "<span style='color:red'>".Lang::trans('lang.inactive').'</span>';
+                            }
+                        })
+                        ->addColumn('Action', function ($model) {
+                            if (Lang::getLocale() === $model) {
+                                return "<a href='change-language/".$model."'><input type='button' class='btn btn-info btn-xs btn-flat' disabled value='".Lang::trans('lang.disable')."'/></a>  
+                <a href='change-language/".$model."' class='btn btn-danger btn-xs btn-flat' disabled><i class='fa fa-trash' style='color:black;'> </i> ".Lang::trans('lang.delete').'</a>';
+                            } else {
+                                return "<a href='change-language/".$model."'><input type='button' class='btn btn-info btn-xs btn-flat' value='".Lang::trans('lang.enable')."'/></a>  
+                <a href='delete-language/".$model."' class='btn btn-danger btn-xs btn-flat'><i class='fa fa-trash' style='color:black;'> </i> ".Lang::trans('lang.delete').'</a>';
                             }
                         })
                         ->searchColumns('language', 'id')
@@ -116,23 +124,25 @@ class LanguageController extends Controller {
     }
 
     /**
-     * handle language file uploading
-     * @return response  
+     * handle language file uploading.
+     *
+     * @return response
      */
-    public function postForm() {
+    public function postForm()
+    {
         // getting all of the post data
-        $file = array(
-            'File' => Input::file('File'),
+        $file = [
+            'File'          => Input::file('File'),
             'language-name' => Input::input('language-name'),
-            'iso-code' => Input::input('iso-code')
-        );
+            'iso-code'      => Input::input('iso-code'),
+        ];
 
         // setting up rules
-        $rules = array(
-            'File' => 'required|mimes:zip|max:30000',
+        $rules = [
+            'File'          => 'required|mimes:zip|max:30000',
             'language-name' => 'required',
-            'iso-code' => 'required|max:2'
-        ); // and for max size 
+            'iso-code'      => 'required|max:2',
+        ]; // and for max size
         // doing the validation, passing post data, rules and the messages
         $validator = Validator::make($file, $rules);
         if ($validator->fails()) {
@@ -141,18 +151,19 @@ class LanguageController extends Controller {
             return Redirect::back()->withInput()->withErrors($validator);
         } else {
 
-
             //Checking if package already exists or not in lang folder
-            $path = base_path('resources/lang'); 
+            $path = base_path('resources/lang');
             if (in_array(strtolower(Input::get('iso-code')), scandir($path))) {
 
                 //sending back with error message
                 Session::flash('fails', Lang::get('lang.package_exist'));
-                Session::flash('link', "change-language/" . strtolower(Input::get('iso-code')));
+                Session::flash('link', 'change-language/'.strtolower(Input::get('iso-code')));
+
                 return Redirect::back()->withInput();
-            } elseif (!array_key_exists(strtolower(Input::get('iso-code')), Config::get('languages'))) {//Checking Valid ISO code form Languages.php 
+            } elseif (!array_key_exists(strtolower(Input::get('iso-code')), Config::get('languages'))) {//Checking Valid ISO code form Languages.php
                 //sending back with error message
                 Session::flash('fails', Lang::get('lang.iso-code-error'));
+
                 return Redirect::back()->withInput();
             } else {
 
@@ -160,11 +171,11 @@ class LanguageController extends Controller {
                 if (Input::file('File')->isValid()) {
                     $name = Input::file('File')->getClientOriginalName(); //uploaded file's original name
                     $destinationPath = '../public/uploads/'; // defining uploading path
-                    $extractpath = '../resources/lang/' . strtolower(Input::get('iso-code')); //defining extracting path
+                    $extractpath = '../resources/lang/'.strtolower(Input::get('iso-code')); //defining extracting path
                     mkdir($extractpath); //creating directroy for extracting uploadd file
                     //mkdir($destinationPath);
                     Input::file('File')->move($destinationPath, $name); // uploading file to given path
-                    \Zipper::make($destinationPath . '/' . $name)->extractTo($extractpath); //extracting file to give path
+                    \Zipper::make($destinationPath.'/'.$name)->extractTo($extractpath); //extracting file to give path
                     //check if Zip extract foldercontains any subfolder
                     $directories = File::directories($extractpath);
                     //$directories = glob($extractpath. '/*' , GLOB_ONLYDIR);
@@ -174,18 +185,21 @@ class LanguageController extends Controller {
                         if ($success) {
                             //sending back with error message
                             Session::flash('fails', Lang::get('lang.zipp-error'));
-                            Session::flash('link2', "http://www.ladybirdweb.com/support/show/how-to-translate-faveo-into-multiple-languages");
+                            Session::flash('link2', 'http://www.ladybirdweb.com/support/show/how-to-translate-faveo-into-multiple-languages');
+
                             return Redirect::back()->withInput();
                         }
                     } else {
                         // sending back with success message
-                        Session::flash('success', Lang::get("lang.upload-success"));
-                        Session::flash('link', "change-language/" . strtolower(Input::get('iso-code')));
+                        Session::flash('success', Lang::get('lang.upload-success'));
+                        Session::flash('link', 'change-language/'.strtolower(Input::get('iso-code')));
+
                         return Redirect::route('LanguageController');
                     }
                 } else {
                     // sending back with error message.
-                    Session::flash('fails', Lang::get("lang.file-error"));
+                    Session::flash('fails', Lang::get('lang.file-error'));
+
                     return Redirect::route('form');
                 }
             }
@@ -193,36 +207,43 @@ class LanguageController extends Controller {
     }
 
     /**
-     * allow user to download language template file
+     * allow user to download language template file.
+     *
      * @return type
      */
-    Public function download() {
+    public function download()
+    {
         return response()->download('../public/downloads/en.zip');
     }
 
     /**
-     * This function is used to delete languages
-     * @param type $lang 
+     * This function is used to delete languages.
+     *
+     * @param type $lang
+     *
      * @return type response
      */
-    public function deleteLanguage($lang) {
+    public function deleteLanguage($lang)
+    {
         if ($lang !== App::getLocale()) {
-            $deletePath = base_path('resources/lang') . $lang;     //define file path to delete
+            $deletePath = base_path('resources/lang').$lang;     //define file path to delete
             $success = File::deleteDirectory($deletePath); //remove extracted folder and it's subfolder from lang
             if ($success) {
                 //sending back with success message
                 Session::flash('success', Lang::get('lang.delete-success'));
+
                 return Redirect::back();
             } else {
                 //sending back with error message
                 Session::flash('fails', Lang::get('lang.lang-doesnot-exist'));
+
                 return Redirect::back();
             }
         } else {
             //sending back with error message
             Session::flash('fails', Lang::get('lang.active-lang-error'));
+
             return redirect('languages');
         }
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/ProfileController.php b/app/Http/Controllers/Admin/helpdesk/ProfileController.php
index cb34fb0eb..9be3cbdf6 100644
--- a/app/Http/Controllers/Admin/helpdesk/ProfileController.php
+++ b/app/Http/Controllers/Admin/helpdesk/ProfileController.php
@@ -11,33 +11,35 @@ use App\Http\Requests\ProfileRequest;
 use App\User;
 // classes
 use Auth;
+use Exception;
 use Hash;
 use Input;
-use Exception;
 
 /**
- * ProfileController
+ * ProfileController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class ProfileController extends Controller {
-
+class ProfileController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type void
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->middleware('auth');
         $this->middleware('roles');
     }
 
     /**
-     * Get profile page
+     * Get profile page.
+     *
      * @return type Response
      */
-    public function getProfile() {
+    public function getProfile()
+    {
         try {
             $user = Auth::user();
             if ($user) {
@@ -51,10 +53,12 @@ class ProfileController extends Controller {
     }
 
     /**
-     * Get profile Edit page
+     * Get profile Edit page.
+     *
      * @return type Response
      */
-    public function getProfileedit() {
+    public function getProfileedit()
+    {
         try {
             $user = Auth::user();
             if ($user) {
@@ -68,12 +72,15 @@ class ProfileController extends Controller {
     }
 
     /**
-     * Post profile page
-     * @param type int $id
+     * Post profile page.
+     *
+     * @param type int            $id
      * @param type ProfileRequest $request
+     *
      * @return type Response
      */
-    public function postProfile($id, ProfileRequest $request) {
+    public function postProfile($id, ProfileRequest $request)
+    {
         $user = Auth::user();
         $user->gender = $request->input('gender');
         $user->save();
@@ -92,12 +99,13 @@ class ProfileController extends Controller {
             //$extension = Input::file('profile_pic')->getClientOriginalExtension();
             $name = Input::file('profile_pic')->getClientOriginalName();
             $destinationPath = 'lb-faveo/profilepic';
-            $fileName = rand(0000, 9999) . '.' . $name;
+            $fileName = rand(0000, 9999).'.'.$name;
             //echo $fileName;
             Input::file('profile_pic')->move($destinationPath, $fileName);
             $user->profile_pic = $fileName;
         } else {
             $user->fill($request->except('profile_pic', 'gender'))->save();
+
             return redirect('guest')->with('success', 'Profile Updated sucessfully');
         }
         if ($user->fill($request->except('profile_pic'))->save()) {
@@ -106,22 +114,25 @@ class ProfileController extends Controller {
     }
 
     /**
-     * Post  Profile password page
-     * @param type int $id
-     * @param type User $user
+     * Post  Profile password page.
+     *
+     * @param type int             $id
+     * @param type User            $user
      * @param type ProfilePassword $request
+     *
      * @return type Response
      */
-    public function postProfilePassword($id, User $user, ProfilePassword $request) {
+    public function postProfilePassword($id, User $user, ProfilePassword $request)
+    {
         $user = Auth::user();
         //echo $user->password;
         if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
             $user->password = Hash::make($request->input('new_password'));
             $user->save();
+
             return redirect('guest')->with('success', 'Password Updated sucessfully');
         } else {
             return redirect('guest')->with('fails', 'Password was not Updated');
         }
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php
index 1c9b1c49f..674d27f78 100644
--- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php
+++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php
@@ -21,51 +21,55 @@ use App\Model\helpdesk\Settings\Email;
 use App\Model\helpdesk\Settings\Responder;
 use App\Model\helpdesk\Settings\System;
 use App\Model\helpdesk\Settings\Ticket;
+use App\Model\helpdesk\Ticket\Ticket_Priority;
 use App\Model\helpdesk\Utility\Date_format;
 use App\Model\helpdesk\Utility\Date_time_format;
-use App\Model\helpdesk\Ticket\Ticket_Priority;
-use App\Model\helpdesk\Utility\Timezones;
 use App\Model\helpdesk\Utility\Time_format;
+use App\Model\helpdesk\Utility\Timezones;
 // classes
+use Exception;
 use Illuminate\Http\Request;
 use Input;
-use Exception;
 
 /**
- * SettingsController
+ * SettingsController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class SettingsController extends Controller {
-
+class SettingsController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         // $this->smtp();
         $this->middleware('auth');
         $this->middleware('roles');
     }
 
     /**
-     * Main Settings Page
+     * Main Settings Page.
+     *
      * @return type view
      */
-    public function settings() {
+    public function settings()
+    {
         return view('themes.default1.admin.helpdesk.setting');
     }
 
     /**
      * @param int $id
-     * @return Response
      * @param $compant instance of company table
      *
      * get the form for company setting page
+     *
+     * @return Response
      */
-    public function getcompany(Company $company) {
+    public function getcompany(Company $company)
+    {
         try {
             /* fetch the values of company from company table */
             $companys = $company->whereId('1')->first();
@@ -78,18 +82,21 @@ class SettingsController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type int $id
-     * @param type Company $company
-     * @param type CompanyRequest $request 
+     *
+     * @param type int            $id
+     * @param type Company        $company
+     * @param type CompanyRequest $request
+     *
      * @return Response
      */
-    public function postcompany($id, Company $company, CompanyRequest $request) {
+    public function postcompany($id, Company $company, CompanyRequest $request)
+    {
         /* fetch the values of company request  */
         $companys = $company->whereId('1')->first();
         if (Input::file('logo')) {
             $name = Input::file('logo')->getClientOriginalName();
             $destinationPath = 'lb-faveo/media/company/';
-            $fileName = rand(0000, 9999) . '.' . $name;
+            $fileName = rand(0000, 9999).'.'.$name;
             Input::file('logo')->move($destinationPath, $fileName);
             $companys->logo = $fileName;
         }
@@ -103,21 +110,24 @@ class SettingsController extends Controller {
             return redirect('getcompany')->with('success', 'Company Updated Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('getcompany')->with('fails', 'Company can not Updated' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('getcompany')->with('fails', 'Company can not Updated'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
-     * get the form for System setting page
-     * @param type System $system
-     * @param type Department $department
-     * @param type Timezones $timezone
-     * @param type Date_format $date
+     * get the form for System setting page.
+     *
+     * @param type System           $system
+     * @param type Department       $department
+     * @param type Timezones        $timezone
+     * @param type Date_format      $date
      * @param type Date_time_format $date_time
-     * @param type Time_format $time
+     * @param type Time_format      $time
+     *
      * @return type Response
      */
-    public function getsystem(System $system, Department $department, Timezones $timezone, Date_format $date, Date_time_format $date_time, Time_format $time) {
+    public function getsystem(System $system, Department $department, Timezones $timezone, Date_format $date, Date_time_format $date_time, Time_format $time)
+    {
         try {
             /* fetch the values of system from system table */
             $systems = $system->whereId('1')->first();
@@ -134,12 +144,15 @@ class SettingsController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type int  $id
-     * @param type System $system
+     *
+     * @param type int           $id
+     * @param type System        $system
      * @param type SystemRequest $request
+     *
      * @return type Response
      */
-    public function postsystem($id, System $system, SystemRequest $request) {
+    public function postsystem($id, System $system, SystemRequest $request)
+    {
         try {
             // dd($request);
             /* fetch the values of system request  */
@@ -151,19 +164,22 @@ class SettingsController extends Controller {
             return redirect('getsystem')->with('success', 'System Updated Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('getsystem')->with('fails', 'System can not Updated' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('getsystem')->with('fails', 'System can not Updated'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
-     * get the form for Ticket setting page
-     * @param type Ticket $ticket
-     * @param type Sla_plan $sla
+     * get the form for Ticket setting page.
+     *
+     * @param type Ticket     $ticket
+     * @param type Sla_plan   $sla
      * @param type Help_topic $topic
-     * @param type Priority $priority
+     * @param type Priority   $priority
+     *
      * @return type Response
      */
-    public function getticket(Ticket $ticket, Sla_plan $sla, Help_topic $topic, Ticket_Priority $priority) {
+    public function getticket(Ticket $ticket, Sla_plan $sla, Help_topic $topic, Ticket_Priority $priority)
+    {
         try {
             /* fetch the values of ticket from ticket table */
             $tickets = $ticket->whereId('1')->first();
@@ -180,12 +196,15 @@ class SettingsController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type int  $id
-     * @param type Ticket $ticket
+     *
+     * @param type int     $id
+     * @param type Ticket  $ticket
      * @param type Request $request
+     *
      * @return type Response
      */
-    public function postticket($id, Ticket $ticket, Request $request) {
+    public function postticket($id, Ticket $ticket, Request $request)
+    {
         try {
             /* fetch the values of ticket request  */
             $tickets = $ticket->whereId('1')->first();
@@ -206,18 +225,21 @@ class SettingsController extends Controller {
             return redirect('getticket')->with('success', 'Ticket Updated Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('getticket')->with('fails', 'Ticket can not Updated' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('getticket')->with('fails', 'Ticket can not Updated'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
-     * get the form for Email setting page
-     * @param type Email $email
+     * get the form for Email setting page.
+     *
+     * @param type Email    $email
      * @param type Template $template
-     * @param type Emails $email1
+     * @param type Emails   $email1
+     *
      * @return type Response
      */
-    public function getemail(Email $email, Template $template, Emails $email1) {
+    public function getemail(Email $email, Template $template, Emails $email1)
+    {
         try {
             /* fetch the values of email from Email table */
             $emails = $email->whereId('1')->first();
@@ -234,12 +256,15 @@ class SettingsController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type int $id
-     * @param type Email $email
+     *
+     * @param type int          $id
+     * @param type Email        $email
      * @param type EmailRequest $request
+     *
      * @return type Response
      */
-    public function postemail($id, Email $email, EmailRequest $request) {
+    public function postemail($id, Email $email, EmailRequest $request)
+    {
         try {
             /* fetch the values of email request  */
             $emails = $email->whereId('1')->first();
@@ -258,20 +283,22 @@ class SettingsController extends Controller {
             return redirect('getemail')->with('success', 'Email Updated Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('getemail')->with('fails', 'Email can not Updated' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('getemail')->with('fails', 'Email can not Updated'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
-     * get the form for Access setting page
+     * get the form for Access setting page.
+     *
      * @param type Access $access
+     *
      * @return type Response
      */
     // public function getaccess(Access $access) {
     // 	try {
     // 		/* fetch the values of access from access table */
     // 		$accesses = $access->whereId('1')->first();
-//	// 		 Direct to Access Settings Page 
+//	// 		 Direct to Access Settings Page
     // 		return view('themes.default1.admin.helpdesk.settings.access', compact('accesses'));
     // 	} catch (Exception $e) {
     // 		return view('404');
@@ -280,8 +307,10 @@ class SettingsController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type Access $access
+     *
+     * @param type Access  $access
      * @param type Request $request
+     *
      * @return type Response
      */
     // public function postaccess(Access $access, Request $request) {
@@ -310,11 +339,14 @@ class SettingsController extends Controller {
     // }
 
     /**
-     * get the form for Responder setting page
+     * get the form for Responder setting page.
+     *
      * @param type Responder $responder
+     *
      * @return type Response
      */
-    public function getresponder(Responder $responder) {
+    public function getresponder(Responder $responder)
+    {
         try {
             /* fetch the values of responder from responder table */
             $responders = $responder->whereId('1')->first();
@@ -327,11 +359,14 @@ class SettingsController extends Controller {
 
     /**
      * Update the specified resource in storage.
+     *
      * @param type Responder $responder
-     * @param type Request $request
+     * @param type Request   $request
+     *
      * @return type
      */
-    public function postresponder(Responder $responder, Request $request) {
+    public function postresponder(Responder $responder, Request $request)
+    {
         try {
             /* fetch the values of responder request  */
             $responders = $responder->whereId('1')->first();
@@ -348,16 +383,19 @@ class SettingsController extends Controller {
             return redirect('getresponder')->with('success', 'Responder Updated Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('getresponder')->with('fails', 'Responder can not Updated' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('getresponder')->with('fails', 'Responder can not Updated'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
-     * get the form for Alert setting page
+     * get the form for Alert setting page.
+     *
      * @param type Alert $alert
+     *
      * @return type Response
      */
-    public function getalert(Alert $alert) {
+    public function getalert(Alert $alert)
+    {
         try {
             /* fetch the values of alert from alert table */
             $alerts = $alert->whereId('1')->first();
@@ -370,12 +408,15 @@ class SettingsController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type $id
-     * @param type Alert $alert
+     *
+     * @param type         $id
+     * @param type Alert   $alert
      * @param type Request $request
+     *
      * @return type Response
      */
-    public function postalert($id, Alert $alert, Request $request) {
+    public function postalert($id, Alert $alert, Request $request)
+    {
         try {
             /* fetch the values of alert request  */
             $alerts = $alert->whereId('1')->first();
@@ -430,38 +471,46 @@ class SettingsController extends Controller {
             return redirect('getalert')->with('success', 'Alert Updated Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('getalert')->with('fails', 'Alert can not Updated' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('getalert')->with('fails', 'Alert can not Updated'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
-     * 	To display the list of ratings in the system
+     * 	To display the list of ratings in the system.
+     *
      *  @return type View
      */
-    public function RatingSettings() {
+    public function RatingSettings()
+    {
         $ratings = DB::table('settings_ratings')->get();
+
         return view('themes.default1.admin.helpdesk.settings.ratings', compact('ratings'));
     }
 
     /**
-     * 	To store rating data
+     * 	To store rating data.
+     *
      *  @return type Redirect
      */
-    public function PostRatingSettings($slug) {
+    public function PostRatingSettings($slug)
+    {
         $name = Input::get('rating_name');
         $publish = Input::get('publish');
         $modify = Input::get('modify');
-        DB::table('settings_ratings')->whereSlug($slug)->update(array('rating_name' => $name, 'publish' => $publish, 'modify' => $modify));
+        DB::table('settings_ratings')->whereSlug($slug)->update(['rating_name' => $name, 'publish' => $publish, 'modify' => $modify]);
+
         return redirect()->back()->with('success', 'Successfully updated');
     }
 
     /**
-     *  To delete a type of rating
+     *  To delete a type of rating.
+     *
      * 	@return type Redirect
      */
-    public function RatingDelete($slug) {
+    public function RatingDelete($slug)
+    {
         DB::table('settings_ratings')->whereSlug($slug)->delete();
+
         return redirect()->back()->with('success', 'Successfully Deleted');
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/SlaController.php b/app/Http/Controllers/Admin/helpdesk/SlaController.php
index 2dd8c69c5..7dee75a9c 100644
--- a/app/Http/Controllers/Admin/helpdesk/SlaController.php
+++ b/app/Http/Controllers/Admin/helpdesk/SlaController.php
@@ -15,29 +15,32 @@ use DB;
 use Exception;
 
 /**
- * SlaController
+ * SlaController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class SlaController extends Controller {
-
+class SlaController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type void
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->middleware('auth');
         $this->middleware('roles');
     }
 
     /**
      * Display a listing of the resource.
+     *
      * @param type Sla_plan $sla
+     *
      * @return type Response
      */
-    public function index(Sla_plan $sla) {
+    public function index(Sla_plan $sla)
+    {
         try {
             /* Declare a Variable $slas to store all Values From Sla_plan Table */
             $slas = $sla->get();
@@ -50,9 +53,11 @@ class SlaController extends Controller {
 
     /**
      * Show the form for creating a new resource.
+     *
      * @return type Response
      */
-    public function create() {
+    public function create()
+    {
         try {
             /* Direct to Create Page */
             return view('themes.default1.admin.helpdesk.manage.sla.create');
@@ -63,11 +68,14 @@ class SlaController extends Controller {
 
     /**
      * Store a newly created resource in storage.
-     * @param type Sla_plan $sla
+     *
+     * @param type Sla_plan   $sla
      * @param type SlaRequest $request
+     *
      * @return type Response
      */
-    public function store(Sla_plan $sla, SlaRequest $request) {
+    public function store(Sla_plan $sla, SlaRequest $request)
+    {
         try {
             /* Fill the request values to Sla_plan Table  */
             /* Check whether function success or not */
@@ -76,21 +84,25 @@ class SlaController extends Controller {
             return redirect('sla')->with('success', 'SLA Plan Created Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('sla')->with('fails', 'SLA Plan can not Create' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('sla')->with('fails', 'SLA Plan can not Create'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Show the form for editing the specified resource.
-     * @param type int $id
+     *
+     * @param type int      $id
      * @param type Sla_plan $sla
+     *
      * @return type Response
      */
-    public function edit($id, Sla_plan $sla) {
+    public function edit($id, Sla_plan $sla)
+    {
         try {
             /* Direct to edit page along values of perticular field using Id */
             $slas = $sla->whereId($id)->first();
             $slas->get();
+
             return view('themes.default1.admin.helpdesk.manage.sla.edit', compact('slas'));
         } catch (Exception $e) {
             return redirect()->back()->with('fails', $e->errorInfo[2]);
@@ -99,12 +111,15 @@ class SlaController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type int $id
-     * @param type Sla_plan $sla
+     *
+     * @param type int       $id
+     * @param type Sla_plan  $sla
      * @param type SlaUpdate $request
+     *
      * @return type Response
      */
-    public function update($id, Sla_plan $sla, SlaUpdate $request) {
+    public function update($id, Sla_plan $sla, SlaUpdate $request)
+    {
         try {
             /* Fill values to selected field using Id except Check box */
             $slas = $sla->whereId($id)->first();
@@ -119,17 +134,20 @@ class SlaController extends Controller {
             return redirect('sla')->with('success', 'SLA Plan Updated Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('sla')->with('fails', 'SLA Plan can not Update' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('sla')->with('fails', 'SLA Plan can not Update'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Remove the specified resource from storage.
-     * @param type int $id
+     *
+     * @param type int      $id
      * @param type Sla_plan $sla
+     *
      * @return type Response
      */
-    public function destroy($id, Sla_plan $sla) {
+    public function destroy($id, Sla_plan $sla)
+    {
         $default_sla = Ticket::where('id', '=', '1')->first();
         if ($default_sla->sla == $id) {
             return redirect('departments')->with('fails', 'You cannot delete default department');
@@ -137,49 +155,48 @@ class SlaController extends Controller {
             $tickets = DB::table('tickets')->where('sla', '=', $id)->update(['sla' => $default_sla->sla]);
             if ($tickets > 0) {
                 if ($tickets > 1) {
-                    $text_tickets = "Tickets";
+                    $text_tickets = 'Tickets';
                 } else {
-                    $text_tickets = "Ticket";
+                    $text_tickets = 'Ticket';
                 }
-                $ticket = '<li>' . $tickets . ' ' . $text_tickets . ' have been moved to default SLA</li>';
+                $ticket = '<li>'.$tickets.' '.$text_tickets.' have been moved to default SLA</li>';
             } else {
-                $ticket = "";
+                $ticket = '';
             }
             $dept = DB::table('department')->where('sla', '=', $id)->update(['sla' => $default_sla->sla]);
             if ($dept > 0) {
                 if ($dept > 1) {
-                    $text_dept = "Emails";
+                    $text_dept = 'Emails';
                 } else {
-                    $text_dept = "Email";
+                    $text_dept = 'Email';
                 }
                 $dept = '<li>Associated department have been moved to default SLA</li>';
             } else {
-                $dept = "";
+                $dept = '';
             }
             $topic = DB::table('help_topic')->where('sla_plan', '=', $id)->update(['sla_plan' => $default_sla->sla]);
             if ($topic > 0) {
                 if ($topic > 1) {
-                    $text_topic = "Emails";
+                    $text_topic = 'Emails';
                 } else {
-                    $text_topic = "Email";
+                    $text_topic = 'Email';
                 }
                 $topic = '<li>Associated Help Topic have been moved to default SLA</li>';
             } else {
-                $topic = "";
+                $topic = '';
             }
-            $message = $ticket . $dept . $topic;
+            $message = $ticket.$dept.$topic;
             /* Delete a perticular field from the database by delete() using Id */
             $slas = $sla->whereId($id)->first();
             /* Check whether function success or not */
             try {
                 $slas->delete();
                 /* redirect to Index page with Success Message */
-                return redirect('sla')->with('success', 'SLA Plan Deleted Successfully' . $message);
+                return redirect('sla')->with('success', 'SLA Plan Deleted Successfully'.$message);
             } catch (Exception $e) {
                 /* redirect to Index page with Fails Message */
-                return redirect('sla')->with('fails', 'SLA Plan can not Delete' . '<li>' . $e->errorInfo[2] . '</li>');
+                return redirect('sla')->with('fails', 'SLA Plan can not Delete'.'<li>'.$e->errorInfo[2].'</li>');
             }
         }
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/TeamController.php b/app/Http/Controllers/Admin/helpdesk/TeamController.php
index 396c996d7..0af3a5d77 100644
--- a/app/Http/Controllers/Admin/helpdesk/TeamController.php
+++ b/app/Http/Controllers/Admin/helpdesk/TeamController.php
@@ -16,35 +16,39 @@ use DB;
 use Exception;
 
 /**
- * TeamController
+ * TeamController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class TeamController extends Controller {
-
+class TeamController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type void
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->middleware('auth');
         $this->middleware('roles');
     }
 
     /**
-     * get Index page
-     * @param type Teams $team
+     * get Index page.
+     *
+     * @param type Teams             $team
      * @param type Assign_team_agent $assign_team_agent
+     *
      * @return type Response
      */
-    public function index(Teams $team, Assign_team_agent $assign_team_agent) {
+    public function index(Teams $team, Assign_team_agent $assign_team_agent)
+    {
         try {
             $teams = $team->get();
             /*  find out the Number of Members in the Team */
             $id = $teams->lists('id');
             $assign_team_agent = $assign_team_agent->get();
+
             return view('themes.default1.admin.helpdesk.agent.teams.index', compact('assign_team_agent', 'teams'));
         } catch (Exception $e) {
             return redirect()->back()->with('fails', $e->errorInfo[2]);
@@ -53,12 +57,16 @@ class TeamController extends Controller {
 
     /**
      * Show the form for creating a new resource.
+     *
      * @param type User $user
+     *
      * @return type Response
      */
-    public function create(User $user) {
+    public function create(User $user)
+    {
         try {
             $user = $user->get();
+
             return view('themes.default1.admin.helpdesk.agent.teams.create', compact('user'));
         } catch (Exception $e) {
             return redirect()->back()->with('fails', $e->errorInfo[2]);
@@ -67,12 +75,14 @@ class TeamController extends Controller {
 
     /**
      * Store a newly created resource in storage.
-     * @param type Teams $team
+     *
+     * @param type Teams       $team
      * @param type TeamRequest $request
+     *
      * @return type Response
      */
-    public function store(Teams $team, TeamRequest $request) {
-
+    public function store(Teams $team, TeamRequest $request)
+    {
         if ($request->team_lead) {
             $team_lead = $request->team_lead;
         } else {
@@ -86,24 +96,28 @@ class TeamController extends Controller {
             return redirect('teams')->with('success', 'Teams  Created Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('teams')->with('fails', 'Teams can not Create' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('teams')->with('fails', 'Teams can not Create'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Show the form for editing the specified resource.
-     * @param type $id
-     * @param type User $user
+     *
+     * @param type                   $id
+     * @param type User              $user
      * @param type Assign_team_agent $assign_team_agent
-     * @param type Teams $team
+     * @param type Teams             $team
+     *
      * @return type Response
      */
-    public function edit($id, User $user, Assign_team_agent $assign_team_agent, Teams $team) {
+    public function edit($id, User $user, Assign_team_agent $assign_team_agent, Teams $team)
+    {
         try {
             $user = $user->whereId($id)->first();
             $teams = $team->whereId($id)->first();
             $agent_team = $assign_team_agent->where('team_id', $id)->get();
             $agent_id = $agent_team->lists('agent_id', 'agent_id');
+
             return view('themes.default1.admin.helpdesk.agent.teams.edit', compact('agent_id', 'user', 'teams', 'allagents'));
         } catch (Exception $e) {
             return redirect()->back()->with('fails', $e->errorInfo[2]);
@@ -112,13 +126,15 @@ class TeamController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type int $id
-     * @param type Teams $team
+     *
+     * @param type int        $id
+     * @param type Teams      $team
      * @param type TeamUpdate $request
+     *
      * @return type Response
      */
-    public function update($id, Teams $team, TeamUpdate $request) {
-
+    public function update($id, Teams $team, TeamUpdate $request)
+    {
         $teams = $team->whereId($id)->first();
         //updating check box
         if ($request->team_lead) {
@@ -140,18 +156,21 @@ class TeamController extends Controller {
             return redirect('teams')->with('success', 'Teams  Updated Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('teams')->with('fails', 'Teams  can not Update' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('teams')->with('fails', 'Teams  can not Update'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Remove the specified resource from storage.
-     * @param type int $id
-     * @param type Teams $team
+     *
+     * @param type int               $id
+     * @param type Teams             $team
      * @param type Assign_team_agent $assign_team_agent
+     *
      * @return type Response
      */
-    public function destroy($id, Teams $team, Assign_team_agent $assign_team_agent) {
+    public function destroy($id, Teams $team, Assign_team_agent $assign_team_agent)
+    {
         try {
             $assign_team_agent->where('team_id', $id)->delete();
             $teams = $team->whereId($id)->first();
@@ -162,8 +181,7 @@ class TeamController extends Controller {
             return redirect('teams')->with('success', 'Teams  Deleted Successfully');
         } catch (Exception $e) {
             /* redirect to Index page with Fails Message */
-            return redirect('teams')->with('fails', 'Teams can not Delete' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('teams')->with('fails', 'Teams can not Delete'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php
index 9e55e240d..02c639377 100644
--- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php
+++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php
@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Admin\helpdesk;
 
 // controllers
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Common\SettingsController;
 use App\Http\Controllers\Common\PhpMailController;
+use App\Http\Controllers\Common\SettingsController;
+use App\Http\Controllers\Controller;
 // requests
 use App\Http\Requests\helpdesk\TemplateRequest;
 use App\Http\Requests\helpdesk\TemplateUdate;
@@ -14,25 +14,25 @@ use App\Model\helpdesk\Email\Emails;
 use App\Model\helpdesk\Email\Template;
 use App\Model\helpdesk\Utility\Languages;
 // classes
-use Illuminate\Http\Request;
-use Mail;
 use Exception;
+use Illuminate\Http\Request;
 use Input;
+use Mail;
 
 /**
- * TemplateController
+ * TemplateController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class TemplateController extends Controller {
-
+class TemplateController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type void
      */
-    public function __construct(PhpMailController $PhpMailController) {
+    public function __construct(PhpMailController $PhpMailController)
+    {
         $this->PhpMailController = $PhpMailController;
         SettingsController::smtp();
         $this->middleware('auth');
@@ -41,12 +41,16 @@ class TemplateController extends Controller {
 
     /**
      * Display a listing of the resource.
+     *
      * @param type Template $template
+     *
      * @return type Response
      */
-    public function index(Template $template) {
+    public function index(Template $template)
+    {
         try {
             $templates = $template->get();
+
             return view('themes.default1.admin.helpdesk.emails.template.index', compact('templates'));
         } catch (Exception $e) {
             return view('404');
@@ -55,14 +59,18 @@ class TemplateController extends Controller {
 
     /**
      * Show the form for creating a new resource.
+     *
      * @param type Languages $language
-     * @param type Template $template
+     * @param type Template  $template
+     *
      * @return type Response
      */
-    public function create(Languages $language, Template $template) {
+    public function create(Languages $language, Template $template)
+    {
         try {
             $templates = $template->get();
             $languages = $language->get();
+
             return view('themes.default1.admin.helpdesk.emails.template.create', compact('languages', 'templates'));
         } catch (Exception $e) {
             return view('404');
@@ -71,11 +79,14 @@ class TemplateController extends Controller {
 
     /**
      * Store a newly created resource in storage.
-     * @param type Template $template
+     *
+     * @param type Template        $template
      * @param type TemplateRequest $request
+     *
      * @return type Response
      */
-    public function store(Template $template, TemplateRequest $request) {
+    public function store(Template $template, TemplateRequest $request)
+    {
         try {
             /* Check whether function success or not */
             if ($template->fill($request->input())->save() == true) {
@@ -93,49 +104,60 @@ class TemplateController extends Controller {
 
     /**
      * Display the specified resource.
-     * @param  int  $id
+     *
+     * @param int $id
+     *
      * @return Response
      */
-    public function show($id) {
+    public function show($id)
+    {
         //
     }
 
     /**
      * Show the form for editing the specified resource.
-     * @param type $id
-     * @param type Template $template
+     *
+     * @param type           $id
+     * @param type Template  $template
      * @param type Languages $language
+     *
      * @return type Response
      */
-    public function listdirectories() {
+    public function listdirectories()
+    {
         $path = '../resources/views/emails/';
         $directories = scandir($path);
         $directory = str_replace('/', '-', $path);
+
         return view('themes.default1.admin.helpdesk.emails.template.listdirectories', compact('directories', 'directory'));
     }
 
-    public function listtemplates($template, $path) {
+    public function listtemplates($template, $path)
+    {
         $paths = str_replace('-', '/', $path);
-        $directory2 = $paths . $template;
+        $directory2 = $paths.$template;
 
         $templates = scandir($directory2);
-        $directory = str_replace('/', '-', $directory2 . '/');
+        $directory = str_replace('/', '-', $directory2.'/');
+
         return view('themes.default1.admin.helpdesk.emails.template.listtemplates', compact('templates', 'directory'));
     }
 
-    public function readtemplate($template, $path) {
+    public function readtemplate($template, $path)
+    {
         $directory = str_replace('-', '/', $path);
-        $handle = fopen($directory . $template, "r");
-        $contents = fread($handle, filesize($directory . $template));
+        $handle = fopen($directory.$template, 'r');
+        $contents = fread($handle, filesize($directory.$template));
         fclose($handle);
 
         return view('themes.default1.admin.helpdesk.emails.template.readtemplates', compact('contents', 'template', 'path'));
     }
 
-    public function createtemplate() {
+    public function createtemplate()
+    {
         $directory = '../resources/views/emails/';
         $fname = Input::get('folder_name');
-        $filename = $directory . $fname;
+        $filename = $directory.$fname;
 
 // images folder creation using php
 //   $mydir = dirname( __FILE__ )."/html/images";
@@ -147,32 +169,37 @@ class TemplateController extends Controller {
         if (!file_exists($filename)) {
             mkdir($filename, 0777);
         }
-        $files = array_filter(scandir($directory . 'default'));
+        $files = array_filter(scandir($directory.'default'));
 
         foreach ($files as $file) {
-            if ($file === '.' or $file === '..')
+            if ($file === '.' or $file === '..') {
                 continue;
+            }
             if (!is_dir($file)) {
                 //   $file_to_go = str_replace("code/resources/views/emails/",'code/resources/views/emails/'.$fname,$file);
-                $destination = $directory . $fname . '/';
+                $destination = $directory.$fname.'/';
 
-                copy($directory . 'default/' . $file, $destination . $file);
+                copy($directory.'default/'.$file, $destination.$file);
             }
         }
+
         return \Redirect::back()->with('success', 'Successfully copied');
     }
 
-    public function writetemplate($template, $path) {
+    public function writetemplate($template, $path)
+    {
         $directory = str_replace('-', '/', $path);
         $b = Input::get('templatedata');
 
-        file_put_contents($directory . $template, print_r($b, true));
+        file_put_contents($directory.$template, print_r($b, true));
+
         return \Redirect::back()->with('success', 'Successfully updated');
     }
 
-    public function deletetemplate($template, $path) {
+    public function deletetemplate($template, $path)
+    {
         $directory = str_replace('-', '/', $path);
-        $dir = $directory . $template;
+        $dir = $directory.$template;
         $status = \DB::table('settings_email')->first();
         if ($template == 'default' or $template == $status->template) {
             return \Redirect::back()->with('fails', 'You cannot delete a default or active directory!');
@@ -180,26 +207,31 @@ class TemplateController extends Controller {
         if (is_dir($dir)) {
             $objects = scandir($dir);
             foreach ($objects as $object) {
-                if ($object != "." && $object != "..") {
-                    unlink($dir . "/" . $object);
+                if ($object != '.' && $object != '..') {
+                    unlink($dir.'/'.$object);
                 }
             }
             rmdir($dir);
         } else {
             rmdir($dir);
         }
+
         return \Redirect::back()->with('success', 'Successfully Deleted');
     }
 
-    public function activateset($setname) {
-        \DB::table('settings_email')->update(array('template' => $setname));
+    public function activateset($setname)
+    {
+        \DB::table('settings_email')->update(['template' => $setname]);
+
         return \Redirect::back()->with('success', 'You have Successfully Activated this Set');
     }
 
-    public function edit($id, Template $template, Languages $language) {
+    public function edit($id, Template $template, Languages $language)
+    {
         try {
             $templates = $template->whereId($id)->first();
             $languages = $language->get();
+
             return view('themes.default1.admin.helpdesk.emails.template.edit', compact('templates', 'languages'));
         } catch (Exception $e) {
             return view('404');
@@ -208,12 +240,15 @@ class TemplateController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type int $id
-     * @param type Template $template
+     *
+     * @param type int           $id
+     * @param type Template      $template
      * @param type TemplateUdate $request
+     *
      * @return type Response
      */
-    public function update($id, Template $template, TemplateUdate $request) {
+    public function update($id, Template $template, TemplateUdate $request)
+    {
         try {
             //TODO validation
             $templates = $template->whereId($id)->first();
@@ -233,11 +268,14 @@ class TemplateController extends Controller {
 
     /**
      * Remove the specified resource from storage.
-     * @param type int $id
+     *
+     * @param type int      $id
      * @param type Template $template
+     *
      * @return type Response
      */
-    public function destroy($id, Template $template) {
+    public function destroy($id, Template $template)
+    {
         try {
             $templates = $template->whereId($id)->first();
             /* Check whether function success or not */
@@ -256,12 +294,16 @@ class TemplateController extends Controller {
 
     /**
      * Form for Email connection checking.
+     *
      * @param type Emails $email
+     *
      * @return type Response
      */
-    public function formDiagno(Emails $email) {
+    public function formDiagno(Emails $email)
+    {
         try {
             $emails = $email->get();
+
             return view('themes.default1.admin.helpdesk.emails.template.formDiagno', compact('emails'));
         } catch (Exception $e) {
             return view('404');
@@ -269,11 +311,14 @@ class TemplateController extends Controller {
     }
 
     /**
-     * function to send  emails
+     * function to send  emails.
+     *
      * @param type Request $request
+     *
      * @return type
      */
-    public function postDiagno(Request $request) {
+    public function postDiagno(Request $request)
+    {
         $email = $request->input('to');
         if ($email == null) {
             return redirect('getdiagno')->with('fails', 'Please provide E-mail address !');
@@ -283,5 +328,4 @@ class TemplateController extends Controller {
 
         return redirect('getdiagno')->with('success', 'Please check your mail. An E-mail has been sent to your E-mail address');
     }
-
 }
diff --git a/app/Http/Controllers/Admin/helpdesk/ThreadController.php b/app/Http/Controllers/Admin/helpdesk/ThreadController.php
index f9653d36e..9306834be 100644
--- a/app/Http/Controllers/Admin/helpdesk/ThreadController.php
+++ b/app/Http/Controllers/Admin/helpdesk/ThreadController.php
@@ -11,21 +11,22 @@ use App\Model\helpdesk\Ticket_thread;
 use Exception;
 
 /**
- * ThreadController
+ * ThreadController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class ThreadController extends Controller {
-
+class ThreadController extends Controller
+{
     /**
-     * get the values from ticket_thread Table and direct to view page
+     * get the values from ticket_thread Table and direct to view page.
+     *
      * @param type Ticket_thread $thread
-     * @param type Priority $priority
-     * @return type  Response
+     * @param type Priority      $priority
+     *
+     * @return type Response
      */
-    public function getTickets(Ticket_thread $thread, Priority $priority) {
+    public function getTickets(Ticket_thread $thread, Priority $priority)
+    {
         try {
             /* get the values of Ticket_thread from Ticket_thread Table  */
             $threads = $thread->get();
@@ -37,5 +38,4 @@ class ThreadController extends Controller {
             return view('404');
         }
     }
-
 }
diff --git a/app/Http/Controllers/Agent/helpdesk/CannedController.php b/app/Http/Controllers/Agent/helpdesk/CannedController.php
index 1b61bdeb6..771a426a5 100644
--- a/app/Http/Controllers/Agent/helpdesk/CannedController.php
+++ b/app/Http/Controllers/Agent/helpdesk/CannedController.php
@@ -14,25 +14,25 @@ use App\User;
 use Exception;
 
 /**
- * CannedController
+ * CannedController.
  * 
  * This controller is for all the functionalities of Canned response for Agents in the Agent Panel
  *
- * @package   	Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class CannedController extends Controller {
-
+class CannedController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         // checking authentication
         $this->middleware('auth');
         // checking if role is agent
@@ -41,27 +41,34 @@ class CannedController extends Controller {
 
     /**
      * Display a listing of the Canned Responses.
+     *
      * @return type View
      */
-    public function index() {
+    public function index()
+    {
         return view('themes.default1.agent.helpdesk.canned.index');
     }
 
     /**
-     * Show the form for creating a new Canned Response
+     * Show the form for creating a new Canned Response.
+     *
      * @return type View
      */
-    public function create() {
+    public function create()
+    {
         return view('themes.default1.agent.helpdesk.canned.create');
     }
 
     /**
      * Store a newly created Canned Response.
-     * @param type CannedRequest $request 
-     * @param type Canned $canned 
+     *
+     * @param type CannedRequest $request
+     * @param type Canned        $canned
+     *
      * @return type Redirect
      */
-    public function store(CannedRequest $request, Canned $canned) {
+    public function store(CannedRequest $request, Canned $canned)
+    {
         // fetching all the requested inputs
         $canned->user_id = \Auth::user()->id;
         $canned->title = $request->input('title');
@@ -69,6 +76,7 @@ class CannedController extends Controller {
         try {
             // saving inputs
             $canned->save();
+
             return redirect()->route('canned.list')->with('success', 'Added Successfully');
         } catch (Exception $e) {
             return redirect()->route('canned.list')->with('fails', $e->errorInfo[2]);
@@ -77,24 +85,31 @@ class CannedController extends Controller {
 
     /**
      * Show the form for editing the Canned Response.
-     * @param type $id 
-     * @param type Canned $canned 
+     *
+     * @param type        $id
+     * @param type Canned $canned
+     *
      * @return type View
      */
-    public function edit($id, Canned $canned) {
+    public function edit($id, Canned $canned)
+    {
         // fetching requested canned response
         $canned = $canned->where('user_id', '=', \Auth::user()->id)->where('id', '=', $id)->first();
+
         return view('themes.default1.agent.helpdesk.canned.edit', compact('canned'));
     }
 
     /**
      * Update the Canned Response in database.
-     * @param type $id 
-     * @param type CannedUpdateRequest $request 
-     * @param type Canned $canned 
+     *
+     * @param type                     $id
+     * @param type CannedUpdateRequest $request
+     * @param type Canned              $canned
+     *
      * @return type Redirect
      */
-    public function update($id, CannedUpdateRequest $request, Canned $canned) {
+    public function update($id, CannedUpdateRequest $request, Canned $canned)
+    {
         /* select the field where id = $id(request Id) */
         $canned = $canned->where('id', '=', $id)->where('user_id', '=', \Auth::user()->id)->first();
         // fetching all the requested inputs
@@ -104,6 +119,7 @@ class CannedController extends Controller {
         try {
             // saving inputs
             $canned->save();
+
             return redirect()->route('canned.list')->with('success', 'Updated Successfully');
         } catch (Exception $e) {
             return redirect()->route('canned.list')->with('fails', $e->errorInfo[2]);
@@ -112,11 +128,14 @@ class CannedController extends Controller {
 
     /**
      * Delete the Canned Response from storage.
-     * @param type $id 
-     * @param type Canned $canned 
+     *
+     * @param type        $id
+     * @param type Canned $canned
+     *
      * @return type Redirect
      */
-    public function destroy($id, Canned $canned) {
+    public function destroy($id, Canned $canned)
+    {
         /* select the field where id = $id(request Id) */
         $canned = $canned->whereId($id)->first();
         /* delete the selected field */
@@ -133,20 +152,22 @@ class CannedController extends Controller {
 
     /**
      * Fetch Canned Response in the ticket detail page.
-     * @param type $id 
+     *
+     * @param type $id
+     *
      * @return type json
      */
-    public function get_canned($id) {
+    public function get_canned($id)
+    {
         // checking for the canned response with requested value
-        if ($id != "zzz") {
+        if ($id != 'zzz') {
             // fetching canned response
             $canned = Canned::where('id', '=', $id)->where('user_id', '=', \Auth::user()->id)->first();
             $msg = $canned->message;
         } else {
-            $msg = "";
+            $msg = '';
         }
         // returning the canned response in JSON format
         return \Response::json($msg);
     }
-
 }
diff --git a/app/Http/Controllers/Agent/helpdesk/DashboardController.php b/app/Http/Controllers/Agent/helpdesk/DashboardController.php
index cf7a4dda2..4a09419d2 100644
--- a/app/Http/Controllers/Agent/helpdesk/DashboardController.php
+++ b/app/Http/Controllers/Agent/helpdesk/DashboardController.php
@@ -5,35 +5,32 @@ namespace App\Http\Controllers\Agent\helpdesk;
 // controllers
 use App\Http\Controllers\Controller;
 // models
-use App\Model\helpdesk\Settings\Company;
-use App\Model\helpdesk\Ticket\Ticket_Collaborator;
-use App\Model\helpdesk\Email\Emails;
 use App\User;
 // classes
-use DB;
-use View;
 use Auth;
+use DB;
 use Exception;
+use View;
 
 /**
  * DashboardController
- * This controlleris used to fetch dashboard in the agent panel
+ * This controlleris used to fetch dashboard in the agent panel.
  * 
- * @package   	Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class DashboardController extends Controller {
-
+class DashboardController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         // checking for authentication
         $this->middleware('auth');
         // checking if the role is agent
@@ -41,12 +38,14 @@ class DashboardController extends Controller {
     }
 
     /**
-     * Get the dashboard page
+     * Get the dashboard page.
+     *
      * @return type view
      */
-    public function index() {
+    public function index()
+    {
         // if(Auth::user()->role == "user"){
-        // return \Redirect::route('home');		
+        // return \Redirect::route('home');
         // }
         try {
             return View::make('themes.default1.agent.helpdesk.dashboard.dashboard');
@@ -56,10 +55,12 @@ class DashboardController extends Controller {
     }
 
     /**
-     * Fetching dashboard graph data to implement graph
+     * Fetching dashboard graph data to implement graph.
+     *
      * @return type Json
      */
-    public function ChartData($date111 = "", $date122 = "") {
+    public function ChartData($date111 = '', $date122 = '')
+    {
         $date11 = strtotime($date122);
         $date12 = strtotime($date111);
         if ($date11 && $date12) {
@@ -67,29 +68,29 @@ class DashboardController extends Controller {
             $date1 = $date11;
         } else {
             // generating current date
-            $date2 = strtotime(Date('Y-m-d'));
-            $date3 = Date('Y-m-d');
+            $date2 = strtotime(date('Y-m-d'));
+            $date3 = date('Y-m-d');
             $format = 'Y-m-d';
             // generating a date range of 1 month
-            $date1 = strtotime(Date($format, strtotime('-1 month' . $date3)));
+            $date1 = strtotime(date($format, strtotime('-1 month'.$date3)));
         }
-        $return = "";
-        $last = "";
+        $return = '';
+        $last = '';
         for ($i = $date1; $i <= $date2; $i = $i + 86400) {
             $thisDate = date('Y-m-d', $i);
 
-            $created = \DB::table('tickets')->select('created_at')->where('created_at', 'LIKE', '%' . $thisDate . '%')->count();
-            $closed = \DB::table('tickets')->select('closed_at')->where('closed_at', 'LIKE', '%' . $thisDate . '%')->count();
-            $reopened = \DB::table('tickets')->select('reopened_at')->where('reopened_at', 'LIKE', '%' . $thisDate . '%')->count();
+            $created = \DB::table('tickets')->select('created_at')->where('created_at', 'LIKE', '%'.$thisDate.'%')->count();
+            $closed = \DB::table('tickets')->select('closed_at')->where('closed_at', 'LIKE', '%'.$thisDate.'%')->count();
+            $reopened = \DB::table('tickets')->select('reopened_at')->where('reopened_at', 'LIKE', '%'.$thisDate.'%')->count();
 
             $value = ['date' => $thisDate, 'open' => $created, 'closed' => $closed, 'reopened' => $reopened];
             $array = array_map('htmlentities', $value);
             $json = html_entity_decode(json_encode($array));
-            $return .= $json . ',';
+            $return .= $json.',';
         }
         $last = rtrim($return, ',');
 
-        return '[' . $last . ']';
+        return '['.$last.']';
 
         // $ticketlist = DB::table('tickets')
         //     ->select(DB::raw('MONTH(updated_at) as month'),DB::raw('SUM(CASE WHEN status = 3 THEN 1 ELSE 0 END) as closed'),DB::raw('SUM(CASE WHEN status = 2 THEN 1 ELSE 0 END) as reopened'),DB::raw('SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) as open'),DB::raw('SUM(CASE WHEN status = 5 THEN 1 ELSE 0 END) as deleted'),
@@ -99,5 +100,4 @@ class DashboardController extends Controller {
         //     ->get();
         // return $ticketlist;
     }
-
 }
diff --git a/app/Http/Controllers/Agent/helpdesk/MailController.php b/app/Http/Controllers/Agent/helpdesk/MailController.php
index 1cb90eedd..d0901da4c 100644
--- a/app/Http/Controllers/Agent/helpdesk/MailController.php
+++ b/app/Http/Controllers/Agent/helpdesk/MailController.php
@@ -3,57 +3,50 @@
 namespace App\Http\Controllers\Agent\helpdesk;
 
 // controllers
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Agent\helpdesk\TicketController;
+use App;
 // models
-use App\User;
+use App\Http\Controllers\Controller;
 use App\Model\helpdesk\Email\Emails;
+use App\Model\helpdesk\Manage\Help_topic;
 use App\Model\helpdesk\Settings\Email;
-use App\Model\helpdesk\Ticket\Ticket_attachments;
-use App\Model\helpdesk\Ticket\Ticket_Thread;
 use App\Model\helpdesk\Settings\System;
 use App\Model\helpdesk\Settings\Ticket;
-use App\Model\helpdesk\Manage\Help_topic;
-use App\Model\helpdesk\Utility\MailboxProtocol;
+use App\Model\helpdesk\Ticket\Ticket_attachments;
 use App\Model\helpdesk\Ticket\Ticket_source;
-use App\Model\helpdesk\Ticket\Ticket_Priority;
+use App\Model\helpdesk\Ticket\Ticket_Thread;
 use App\Model\helpdesk\Ticket\Tickets;
 // classes
-use PhpImap\Mailbox as ImapMailbox;
-use PhpImap\IncomingMail;
-use PhpImap\IncomingMailAttachment;
-use \ForceUTF8\Encoding;
-use App;
-use DB;
+use App\Model\helpdesk\Utility\MailboxProtocol;
 use Crypt;
-use Schedule;
 use File;
-use Artisan;
-use Exception;
+use ForceUTF8\Encoding;
+use PhpImap\Mailbox as ImapMailbox;
 
 /**
- * MailController
+ * MailController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class MailController extends Controller {
-
+class MailController extends Controller
+{
     /**
      * constructor
      * Create a new controller instance.
+     *
      * @param type TicketController $TicketController
      */
-    public function __construct(TicketController $TicketController) {
+    public function __construct(TicketController $TicketController)
+    {
         $this->TicketController = $TicketController;
     }
 
     /**
-     * Reademails
+     * Reademails.
+     *
      * @return type
      */
-    public function readmails(Emails $emails, Email $settings_email, System $system, Ticket $ticket) {
+    public function readmails(Emails $emails, Email $settings_email, System $system, Ticket $ticket)
+    {
         // $path_url = $system->first()->url;
         if ($settings_email->first()->email_fetching == 1) {
             if ($settings_email->first()->all_emails == 1) {
@@ -86,11 +79,11 @@ class MailController extends Controller {
                     $protocol = $e_mail->mailbox_protocol;
                     $get_mailboxprotocol = MailboxProtocol::where('id', '=', $protocol)->first();
                     $protocol = $get_mailboxprotocol->value;
-                    $imap_config = '{' . $host . ':' . $port . $protocol . '}INBOX';
+                    $imap_config = '{'.$host.':'.$port.$protocol.'}INBOX';
                     $password = Crypt::decrypt($e_mail->password);
                     $mailbox = new ImapMailbox($imap_config, $e_mail->email_address, $password, __DIR__);
-                    $mails = array();
-                    $mailsIds = $mailbox->searchMailBox('SINCE ' . date('d-M-Y', strtotime("-1 day")));
+                    $mails = [];
+                    $mailsIds = $mailbox->searchMailBox('SINCE '.date('d-M-Y', strtotime('-1 day')));
                     if (!$mailsIds) {
                         die('Mailbox is empty');
                     }
@@ -112,15 +105,15 @@ class MailController extends Controller {
                             }
                             $date = $mail->date;
                             $datetime = $overview[0]->date;
-                            $date_time = explode(" ", $datetime);
-                            $date = $date_time[1] . "-" . $date_time[2] . "-" . $date_time[3] . " " . $date_time[4];
+                            $date_time = explode(' ', $datetime);
+                            $date = $date_time[1].'-'.$date_time[2].'-'.$date_time[3].' '.$date_time[4];
                             $date = date('Y-m-d H:i:s', strtotime($date));
                             // dd($date);
 
                             if (isset($mail->subject)) {
                                 $subject = $mail->subject;
                             } else {
-                                $subject = "No Subject";
+                                $subject = 'No Subject';
                             }
 
                             // dd($subject);
@@ -128,7 +121,7 @@ class MailController extends Controller {
                             $fromaddress = $mail->fromAddress;
                             $ticket_source = Ticket_source::where('name', '=', 'email')->first();
                             $source = $ticket_source->id;
-                            $phone = "";
+                            $phone = '';
 
                             $assign = $get_helptopic->auto_assign;
                             $form_data = null;
@@ -141,7 +134,7 @@ class MailController extends Controller {
                                 $thread_id = $thread_id;
 
                                 foreach ($mail->getAttachments() as $attachment) {
-                                    $support = "support";
+                                    $support = 'support';
                                     // echo $_SERVER['DOCUMENT_ROOT'];
                                     $dir_img_paths = __DIR__;
                                     $dir_img_path = explode('/code', $dir_img_paths);
@@ -150,7 +143,7 @@ class MailController extends Controller {
                                     // var_dump($attachment->filePath);
                                     // dd($filepath);
                                     // $path = $dir_img_path[0]."/code/public/".$filepath[1];
-                                    $path = public_path() . $filepath[1];
+                                    $path = public_path().$filepath[1];
                                     // dd($path);
                                     $filesize = filesize($path);
                                     $file_data = file_get_contents($path);
@@ -159,28 +152,28 @@ class MailController extends Controller {
                                     $string = str_replace('-', '', $attachment->name);
                                     $filename = explode('src', $attachment->filePath);
                                     $filename = str_replace('\\', '', $filename);
-                                    $body = str_replace("cid:" . $imageid, $filepath[1], $body);
+                                    $body = str_replace('cid:'.$imageid, $filepath[1], $body);
                                     $pos = strpos($body, $filepath[1]);
 
                                     if ($pos == false) {
                                         if ($settings_email->first()->attachment == 1) {
-                                            $upload = new Ticket_attachments;
+                                            $upload = new Ticket_attachments();
                                             $upload->file = $file_data;
                                             $upload->thread_id = $thread_id;
                                             $upload->name = $filepath[1];
                                             $upload->type = $ext;
                                             $upload->size = $filesize;
-                                            $upload->poster = "ATTACHMENT";
+                                            $upload->poster = 'ATTACHMENT';
                                             $upload->save();
                                         }
                                     } else {
-                                        $upload = new Ticket_attachments;
+                                        $upload = new Ticket_attachments();
                                         $upload->file = $file_data;
                                         $upload->thread_id = $thread_id;
                                         $upload->name = $filepath[1];
                                         $upload->type = $ext;
                                         $upload->size = $filesize;
-                                        $upload->poster = "INLINE";
+                                        $upload->poster = 'INLINE';
                                         $upload->save();
                                     }
                                     unlink($path);
@@ -198,35 +191,45 @@ class MailController extends Controller {
     }
 
     /**
-     * separate reply
-     * @param type $body 
+     * separate reply.
+     *
+     * @param type $body
+     *
      * @return type string
      */
-    public function separate_reply($body) {
+    public function separate_reply($body)
+    {
         $body2 = explode('---Reply above this line---', $body);
         $body3 = $body2[0];
+
         return $body3;
     }
 
     /**
-     * Decode Imap text
+     * Decode Imap text.
+     *
      * @param type $str
+     *
      * @return type string
      */
-    public function decode_imap_text($str) {
+    public function decode_imap_text($str)
+    {
         $result = '';
         $decode_header = imap_mime_header_decode($str);
-        foreach ($decode_header AS $obj) {
+        foreach ($decode_header as $obj) {
             $result .= htmlspecialchars(rtrim($obj->text, "\t"));
         }
+
         return $result;
     }
 
     /**
-     * fetch_attachments
+     * fetch_attachments.
+     *
      * @return type
      */
-    public function fetch_attachments() {
+    public function fetch_attachments()
+    {
         $uploads = Upload::all();
         foreach ($uploads as $attachment) {
             $image = @imagecreatefromstring($attachment->file);
@@ -234,24 +237,26 @@ class MailController extends Controller {
             imagejpeg($image, null, 80);
             $data = ob_get_contents();
             ob_end_clean();
-            $var = '<a href="" target="_blank"><img src="data:image/jpg;base64,' . base64_encode($data) . '"/></a>';
-            echo '<br/><span class="mailbox-attachment-icon has-img">' . $var . '</span>';
+            $var = '<a href="" target="_blank"><img src="data:image/jpg;base64,'.base64_encode($data).'"/></a>';
+            echo '<br/><span class="mailbox-attachment-icon has-img">'.$var.'</span>';
         }
     }
 
     /**
-     * function to load data
-     * @param type $id 
+     * function to load data.
+     *
+     * @param type $id
+     *
      * @return type file
      */
-    public function get_data($id) {
+    public function get_data($id)
+    {
         $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('id', '=', $id)->get();
         foreach ($attachments as $attachment) {
-            header('Content-type: application/' . $attachment->type . '');
-            header('Content-Disposition: inline; filename=' . $attachment->name . '');
+            header('Content-type: application/'.$attachment->type.'');
+            header('Content-Disposition: inline; filename='.$attachment->name.'');
             header('Content-Transfer-Encoding: binary');
             echo $attachment->file;
         }
     }
-
 }
diff --git a/app/Http/Controllers/Agent/helpdesk/NotificationController.php b/app/Http/Controllers/Agent/helpdesk/NotificationController.php
index 278c1ac94..37aea1162 100644
--- a/app/Http/Controllers/Agent/helpdesk/NotificationController.php
+++ b/app/Http/Controllers/Agent/helpdesk/NotificationController.php
@@ -5,38 +5,35 @@ namespace App\Http\Controllers\Agent\helpdesk;
 // 	controllers
 use App\Http\Controllers\Controller;
 //	Model
-use App\User;
-use App\Model\helpdesk\Settings\Company;
-use App\Model\helpdesk\Agent\Teams;
 use App\Model\helpdesk\Agent\Department;
-use App\Model\helpdesk\Utility\Log_notification;
+use App\Model\helpdesk\Agent\Teams;
+use App\Model\helpdesk\Settings\Company;
 use App\Model\helpdesk\settings\Email;
+use App\Model\helpdesk\Utility\Log_notification;
+use App\User;
 // classes
-use Exception;
 
 /**
  * NotificationController
- * This controller is used to send daily notifications
+ * This controller is used to send daily notifications.
  *
- * @package   	Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class NotificationController extends Controller {
-
+class NotificationController extends Controller
+{
     /**
-     * 	This function is for sending daily report/notification about the system
+     * 	This function is for sending daily report/notification about the system.
      * */
-    public function send_notification() {
+    public function send_notification()
+    {
         //fetching email settings
         $email = Email::where('id', '=', '1')->first();
         // checking if the daily notification is enabled or not
         if ($email->notification_cron == 1) {
             // checking if current date is equal to the last entered daily notification log
             $notification = Log_notification::where('log', '=', 'NOT-1')->orderBy('id', 'DESC')->first();
-            $date = explode(" ", $notification->created_at);
-            if (Date('Y-m-d') == $date[0]) {
-                
+            $date = explode(' ', $notification->created_at);
+            if (date('Y-m-d') == $date[0]) {
             } else {
                 // creating a daily notification log
                 Log_notification::create(['log' => 'NOT-1']);
@@ -54,28 +51,33 @@ class NotificationController extends Controller {
     }
 
     /**
-     * 	Admin Notification/Report
+     * 	Admin Notification/Report.
+     *
      * 	@param company
+     *
      * 	@return mail
      * */
-    public function send_notification_to_admin($company) {
+    public function send_notification_to_admin($company)
+    {
         // get all admin users
         $users = User::where('role', '=', 'admin')->get();
         foreach ($users as $user) {
             // Send notification details to admin
             $email = $user->email;
-            $user_name = $user->first_name . " " . $user->last_name;
-            \Mail::send('emails.notifications.admin', ['company' => $company, 'name' => $user_name], function ($message)use ($email, $user_name, $company) {
-                $message->to($email, $user_name)->subject($company . ' Daily Report ');
+            $user_name = $user->first_name.' '.$user->last_name;
+            \Mail::send('emails.notifications.admin', ['company' => $company, 'name' => $user_name], function ($message) use ($email, $user_name, $company) {
+                $message->to($email, $user_name)->subject($company.' Daily Report ');
             });
         }
     }
 
     /**
-     * 	Department Manager Notification/Report
+     * 	Department Manager Notification/Report.
+     *
      * 	@return mail
      * */
-    public function send_notification_to_manager($company) {
+    public function send_notification_to_manager($company)
+    {
         // get all department managers
         $depts = Department::all();
         foreach ($depts as $dept) {
@@ -85,9 +87,9 @@ class NotificationController extends Controller {
                 foreach ($users as $user) {
                     // Send notification details to manager of a department
                     $email = $user->email;
-                    $user_name = $user->first_name . " " . $user->last_name;
-                    \Mail::send('emails.notifications.manager', ['company' => $company, 'name' => $user_name, 'dept_id' => $dept->id, 'dept_name' => $dept->name], function ($message)use ($email, $user_name, $company, $dept_name) {
-                        $message->to($email, $user_name)->subject($company . ' Daily Report for department manager of ' . $dept_name . ' department.');
+                    $user_name = $user->first_name.' '.$user->last_name;
+                    \Mail::send('emails.notifications.manager', ['company' => $company, 'name' => $user_name, 'dept_id' => $dept->id, 'dept_name' => $dept->name], function ($message) use ($email, $user_name, $company, $dept_name) {
+                        $message->to($email, $user_name)->subject($company.' Daily Report for department manager of '.$dept_name.' department.');
                     });
                 }
             }
@@ -95,10 +97,12 @@ class NotificationController extends Controller {
     }
 
     /**
-     *  Team Lead Notification/Report
+     *  Team Lead Notification/Report.
+     *
      * 	@return mail
      * */
-    public function send_notification_to_team_lead($company) {
+    public function send_notification_to_team_lead($company)
+    {
         // get all Team leads
         $teams = Teams::all();
         foreach ($teams as $team) {
@@ -108,9 +112,9 @@ class NotificationController extends Controller {
                 foreach ($users as $user) {
                     // Send notification details to team lead
                     $email = $user->email;
-                    $user_name = $user->first_name . " " . $user->last_name;
-                    \Mail::send('emails.notifications.lead', ['company' => $company, 'name' => $user_name, 'team_id' => $team->id], function ($message)use ($email, $user_name, $company, $team_name) {
-                        $message->to($email, $user_name)->subject($company . ' Daily Report for Team Lead of team ' . $team_name);
+                    $user_name = $user->first_name.' '.$user->last_name;
+                    \Mail::send('emails.notifications.lead', ['company' => $company, 'name' => $user_name, 'team_id' => $team->id], function ($message) use ($email, $user_name, $company, $team_name) {
+                        $message->to($email, $user_name)->subject($company.' Daily Report for Team Lead of team '.$team_name);
                     });
                 }
             }
@@ -118,35 +122,40 @@ class NotificationController extends Controller {
     }
 
     /**
-     * 	Agent Notification/Report
+     * 	Agent Notification/Report.
+     *
      * 	@return mail
      * */
-    public function send_notification_to_agent($company) {
+    public function send_notification_to_agent($company)
+    {
         // get all agents users
         $users = User::where('role', '=', 'agent')->get();
         foreach ($users as $user) {
             // Send notification details to all the agents
             $email = $user->email;
-            $user_name = $user->first_name . " " . $user->last_name;
-            \Mail::send('emails.notifications.agent', ['company' => $company, 'name' => $user_name, 'user_id' => 1], function ($message)use ($email, $user_name, $company) {
-                $message->to($email, $user_name)->subject($company . ' Daily Report for Agents');
+            $user_name = $user->first_name.' '.$user->last_name;
+            \Mail::send('emails.notifications.agent', ['company' => $company, 'name' => $user_name, 'user_id' => 1], function ($message) use ($email, $user_name, $company) {
+                $message->to($email, $user_name)->subject($company.' Daily Report for Agents');
             });
         }
     }
 
     /**
-     * Fetching company name
+     * Fetching company name.
+     *
      * @return type variable
      */
-    public function company() {
+    public function company()
+    {
         // fetching comapny model
         $company = Company::Where('id', '=', '1')->first();
         // fetching company name
         if ($company->company_name == null) {
-            $company = "Support Center";
+            $company = 'Support Center';
         } else {
             $company = $company->company_name;
         }
+
         return $company;
     }
 
diff --git a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php
index a2d4d71e9..bfb5a1c98 100644
--- a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php
+++ b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php
@@ -6,13 +6,11 @@ namespace App\Http\Controllers\Agent\helpdesk;
 use App\Http\Controllers\Controller;
 // requests
 use App\Http\Requests\helpdesk\OrganizationRequest;
-
 /* include organization model */
 use App\Http\Requests\helpdesk\OrganizationUpdate;
 // models
 /* Define OrganizationRequest to validate the create form */
 use App\Model\helpdesk\Agent_panel\Organization;
-
 /* Define OrganizationUpdate to validate the create form */
 use App\Model\helpdesk\Agent_panel\User_org;
 // classes
@@ -22,21 +20,21 @@ use Exception;
  * OrganizationController
  * This controller is used to CRUD organization detail.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class OrganizationController extends Controller {
-
+class OrganizationController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         // checking for authentication
         $this->middleware('auth');
         // checking if the role is agent
@@ -45,10 +43,13 @@ class OrganizationController extends Controller {
 
     /**
      * Display a listing of the resource.
+     *
      * @param type Organization $org
+     *
      * @return type Response
      */
-    public function index() {
+    public function index()
+    {
         try {
             /* get all values of table organization */
             return view('themes.default1.agent.helpdesk.organization.index');
@@ -58,10 +59,12 @@ class OrganizationController extends Controller {
     }
 
     /**
-     * This function is used to display the list of Organizations
+     * This function is used to display the list of Organizations.
+     *
      * @return datatable
      */
-    public function org_list() {
+    public function org_list()
+    {
         // chumper datable package call to display Advance datatable
         return \Datatable::collection(Organization::all())
                         /* searchable name */
@@ -73,28 +76,31 @@ class OrganizationController extends Controller {
                             // return $model->name;
                             if (strlen($model->name) > 20) {
                                 $orgname = substr($model->name, 0, 25);
-                                $orgname = substr($orgname, 0, strrpos($orgname, ' ')) . ' ...';
+                                $orgname = substr($orgname, 0, strrpos($orgname, ' ')).' ...';
                             } else {
                                 $orgname = $model->name;
                             }
+
                             return $orgname;
                         })
                         /* column website */
                         ->addColumn('website', function ($model) {
                             $website = $model->website;
+
                             return $website;
                         })
                         /* column phone number */
                         ->addColumn('phone', function ($model) {
                             $phone = $model->phone;
+
                             return $phone;
                         })
                         /* column action buttons */
                         ->addColumn('Actions', function ($model) {
-                            // displaying action buttons 
+                            // displaying action buttons
                             // modal popup to delete data
-                            return '<span  data-toggle="modal" data-target="#deletearticle' . $model->id . '"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . ' </button></span>&nbsp;<a href="' . route('organizations.edit', $model->id) . '" class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href="' . route('organizations.show', $model->id) . '" class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
-				<div class="modal fade" id="deletearticle' . $model->id . '">
+                            return '<span  data-toggle="modal" data-target="#deletearticle'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').' </button></span>&nbsp;<a href="'.route('organizations.edit', $model->id).'" class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href="'.route('organizations.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
+				<div class="modal fade" id="deletearticle'.$model->id.'">
 			        <div class="modal-dialog">
 			            <div class="modal-content">
                 			<div class="modal-header">
@@ -102,11 +108,11 @@ class OrganizationController extends Controller {
                     			<h4 class="modal-title">Are You Sure ?</h4>
                 			</div>
                 			<div class="modal-body">
-                				' . $model->user_name . '
+                				'.$model->user_name.'
                 			</div>
                 			<div class="modal-footer">
                     			<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
-                    			<a href="' . route('org.delete', $model->id) . '"><button class="btn btn-danger">delete</button></a>
+                    			<a href="'.route('org.delete', $model->id).'"><button class="btn btn-danger">delete</button></a>
                 			</div>
             			</div><!-- /.modal-content -->
         			</div><!-- /.modal-dialog -->
@@ -117,9 +123,11 @@ class OrganizationController extends Controller {
 
     /**
      * Show the form for creating a new organization.
+     *
      * @return type Response
      */
-    public function create() {
+    public function create()
+    {
         try {
             return view('themes.default1.agent.helpdesk.organization.create');
         } catch (Exception $e) {
@@ -129,11 +137,14 @@ class OrganizationController extends Controller {
 
     /**
      * Store a newly created organization in storage.
-     * @param type Organization $org
+     *
+     * @param type Organization        $org
      * @param type OrganizationRequest $request
+     *
      * @return type Redirect
      */
-    public function store(Organization $org, OrganizationRequest $request) {
+    public function store(Organization $org, OrganizationRequest $request)
+    {
         try {
             /* Insert the all input request to organization table */
             /* Check whether function success or not */
@@ -152,11 +163,14 @@ class OrganizationController extends Controller {
 
     /**
      * Display the specified organization.
-     * @param type $id
+     *
+     * @param type              $id
      * @param type Organization $org
+     *
      * @return type view
      */
-    public function show($id, Organization $org) {
+    public function show($id, Organization $org)
+    {
         try {
             /* select the field by id  */
             $orgs = $org->whereId($id)->first();
@@ -169,11 +183,14 @@ class OrganizationController extends Controller {
 
     /**
      * Show the form for editing the specified organization.
-     * @param type $id
+     *
+     * @param type              $id
      * @param type Organization $org
+     *
      * @return type view
      */
-    public function edit($id, Organization $org) {
+    public function edit($id, Organization $org)
+    {
         try {
             /* select the field by id  */
             $orgs = $org->whereId($id)->first();
@@ -186,12 +203,15 @@ class OrganizationController extends Controller {
 
     /**
      * Update the specified organization in storage.
-     * @param type $id
-     * @param type Organization $org
+     *
+     * @param type                    $id
+     * @param type Organization       $org
      * @param type OrganizationUpdate $request
+     *
      * @return type Redirect
      */
-    public function update($id, Organization $org, OrganizationUpdate $request) {
+    public function update($id, Organization $org, OrganizationUpdate $request)
+    {
 
         /* select the field by id  */
         $orgs = $org->whereId($id)->first();
@@ -213,10 +233,13 @@ class OrganizationController extends Controller {
 
     /**
      * Delete a specified organization from storage.
+     *
      * @param type int $id
+     *
      * @return type Redirect
      */
-    public function destroy($id, Organization $org, User_org $user_org) {
+    public function destroy($id, Organization $org, User_org $user_org)
+    {
 
         /* select the field by id  */
         $orgs = $org->whereId($id)->first();
@@ -237,11 +260,14 @@ class OrganizationController extends Controller {
     }
 
     /**
-     * Soring an organization head
-     * @param type $id 
+     * Soring an organization head.
+     *
+     * @param type $id
+     *
      * @return type boolean
      */
-    public function Head_Org($id) {
+    public function Head_Org($id)
+    {
         // get the user to make organization head
         $head_user = \Input::get('user');
         // get an instance of the selected organization
@@ -249,7 +275,7 @@ class OrganizationController extends Controller {
         $org_head->head = $head_user;
         // save the user to organization head
         $org_head->save();
+
         return 1;
     }
-
 }
diff --git a/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php b/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php
index 0be79e1a8..61b2848c7 100644
--- a/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php
+++ b/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php
@@ -3,56 +3,39 @@
 namespace App\Http\Controllers\Agent\helpdesk;
 
 // controllers
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Agent\helpdesk\TicketController;
-use App\Http\Controllers\Common\SettingsController;
+use App\Http\Controllers\Common\SettingsController;use App\Http\Controllers\Controller;
 // requests
-use App\Http\Requests\helpdesk\CreateTicketRequest;
-use App\Http\Requests\helpdesk\TicketRequest;
-use App\Http\Requests\helpdesk\TicketEditRequest;
 // models
-use App\Model\helpdesk\Email\Banlist;
-use App\Model\helpdesk\Ticket\Tickets;
-use App\Model\helpdesk\Ticket\Ticket_attachments;
-use App\Model\helpdesk\Ticket\Ticket_Collaborator;
-use App\Model\helpdesk\Ticket\Ticket_Thread;
-use App\Model\helpdesk\Settings\Company;
-use App\Model\helpdesk\Settings\System;
-use App\Model\helpdesk\Settings\Alert;
-use App\Model\helpdesk\Ticket\Ticket_Status;
-use App\Model\helpdesk\Email\Emails;
 use App\Model\helpdesk\Agent\Department;
 use App\User;
 // classes
 use Auth;
-use Hash;
-use Input;
-use Mail;
-use PDF;
 
 /**
- * TicketController2
+ * TicketController2.
  *
- * @package 	Controllers
- * @subpackage 	Controller
  * @author     	Ladybird <info@ladybirdweb.com>
  */
-class Ticket2Controller extends Controller {
-
+class Ticket2Controller extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type response
      */
-    public function __construct() {
+    public function __construct()
+    {
         SettingsController::smtp();
         $this->middleware('auth');
     }
 
     /**
-     * Show the Inbox ticket list page
+     * Show the Inbox ticket list page.
+     *
      * @return type response
      */
-    public function deptopen($id) {
+    public function deptopen($id)
+    {
         $dept = Department::where('name', '=', $id)->first();
         if (Auth::user()->role == 'agent') {
             if (Auth::user()->dept_id == $dept->id) {
@@ -66,10 +49,12 @@ class Ticket2Controller extends Controller {
     }
 
     /**
-     * Show the Inbox ticket list page
+     * Show the Inbox ticket list page.
+     *
      * @return type response
      */
-    public function deptclose($id) {
+    public function deptclose($id)
+    {
         $dept = Department::where('name', '=', $id)->first();
         if (Auth::user()->role == 'agent') {
             if (Auth::user()->dept_id == $dept->id) {
@@ -83,10 +68,12 @@ class Ticket2Controller extends Controller {
     }
 
     /**
-     * Show the Inbox ticket list page
+     * Show the Inbox ticket list page.
+     *
      * @return type response
      */
-    public function deptinprogress($id) {
+    public function deptinprogress($id)
+    {
         $dept = Department::where('name', '=', $id)->first();
         if (Auth::user()->role == 'agent') {
             if (Auth::user()->dept_id == $dept->id) {
@@ -98,5 +85,4 @@ class Ticket2Controller extends Controller {
             return view('themes.default1.agent.helpdesk.dept-ticket.inprogress', compact('id'));
         }
     }
-
 }
diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php
index 840f4370e..f71c1ea6d 100644
--- a/app/Http/Controllers/Agent/helpdesk/TicketController.php
+++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php
@@ -3,92 +3,92 @@
 namespace App\Http\Controllers\Agent\helpdesk;
 
 // controllers
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Agent\helpdesk\TicketController;
-use App\Http\Controllers\Common\SettingsController;
 use App\Http\Controllers\Common\PhpMailController;
+use App\Http\Controllers\Common\SettingsController;
+use App\Http\Controllers\Controller;
 // requests
 use App\Http\Requests\helpdesk\CreateTicketRequest;
 use App\Http\Requests\helpdesk\TicketRequest;
-use App\Http\Requests\helpdesk\TicketEditRequest;
 // models
-use App\Model\helpdesk\Email\Banlist;
-use App\Model\helpdesk\Ticket\Tickets;
+use App\Model\helpdesk\Agent\Department;
+use App\Model\helpdesk\Agent\Teams;
+use App\Model\helpdesk\Email\Emails;
+use App\Model\helpdesk\Form\Fields;
+use App\Model\helpdesk\Manage\Help_topic;
+use App\Model\Helpdesk\Manage\Sla_plan;
+use App\Model\helpdesk\Settings\Alert;
+use App\Model\helpdesk\Settings\Company;
+use App\Model\helpdesk\Settings\Email;
+use App\Model\helpdesk\Settings\System;
 use App\Model\helpdesk\Ticket\Ticket_attachments;
 use App\Model\helpdesk\Ticket\Ticket_Collaborator;
-use App\Model\helpdesk\Ticket\Ticket_Thread;
-use App\Model\helpdesk\Ticket\Ticket_Priority;
-use App\Model\helpdesk\Settings\Company;
-use App\Model\helpdesk\Settings\System;
-use App\Model\helpdesk\Settings\Alert;
-use App\Model\helpdesk\Ticket\Ticket_Status;
-use App\Model\helpdesk\Ticket\Ticket_source;
-use App\Model\helpdesk\Email\Emails;
-use App\Model\helpdesk\Agent\Department;
-use App\Model\helpdesk\Manage\Help_topic;
 use App\Model\helpdesk\Ticket\Ticket_Form_Data;
-use App\Model\helpdesk\Form\Fields;
-use App\Model\helpdesk\Utility\Timezones;
+use App\Model\helpdesk\Ticket\Ticket_Priority;
+use App\Model\helpdesk\Ticket\Ticket_source;
+use App\Model\helpdesk\Ticket\Ticket_Status;
+use App\Model\helpdesk\Ticket\Ticket_Thread;
+use App\Model\helpdesk\Ticket\Tickets;
 use App\Model\helpdesk\Utility\Date_time_format;
-use App\Model\helpdesk\Agent\Teams;
-use Illuminate\support\Collection;
-use App\Model\Helpdesk\Manage\Sla_plan;
+use App\Model\helpdesk\Utility\Timezones;
 use App\User;
-use App\Model\helpdesk\Settings\Email;
+use Auth;
 use DB;
 // classes
-use Auth;
+use Exception;
 use Hash;
+use Illuminate\support\Collection;
 use Input;
 use Mail;
 use PDF;
-use Exception;
 
 /**
- * TicketController
+ * TicketController.
  *
- * @package 	Controllers
- * @subpackage 	Controller
  * @author     	Ladybird <info@ladybirdweb.com>
  */
-class TicketController extends Controller {
-
+class TicketController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type response
      */
-    public function __construct(PhpMailController $PhpMailController) {
+    public function __construct(PhpMailController $PhpMailController)
+    {
         $this->PhpMailController = $PhpMailController;
         SettingsController::smtp();
         $this->middleware('auth');
     }
 
     /**
-     * Show the Inbox ticket list page
+     * Show the Inbox ticket list page.
+     *
      * @return type response
      */
-    public function inbox_ticket_list() {
+    public function inbox_ticket_list()
+    {
         return view('themes.default1.agent.helpdesk.ticket.inbox');
     }
 
-    public function get_inbox() {
-        if (Auth::user()->role == "admin") {
+    public function get_inbox()
+    {
+        if (Auth::user()->role == 'admin') {
             $tickets = Tickets::where('status', '=', 1)->get();
-            ;
         } else {
             $dept = DB::table('department')->where('id', '=', Auth::user()->primary_dpt)->first();
             $tickets = Tickets::where('status', 1)->where('dept_id', '=', $dept->id)->get();
         }
+
         return \Datatable::collection(new Collection($tickets))
-                        ->addColumn('id', function($ticket) {
-                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='" . $ticket->id . "'></input>";
+                        ->addColumn('id', function ($ticket) {
+                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='".$ticket->id."'></input>";
                         })
-                        ->addColumn('subject', function($ticket) {
-                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', "=", $ticket->id)->first();
+                        ->addColumn('subject', function ($ticket) {
+                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first();
                             $string = $subject->title;
                             if (strlen($string) > 20) {
                                 $stringCut = substr($string, 0, 30);
-                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...';
+                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...';
                             }
                             //collabrations
                             $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get();
@@ -108,51 +108,56 @@ class TicketController extends Controller {
                             if ($attachCount > 0) {
                                 $attachString = '&nbsp;<i class="fa fa-paperclip"></i>';
                             } else {
-                                $attachString = "";
+                                $attachString = '';
                             }
                             //return $threads->id;
 
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $subject->title . "'>" . $string . "&nbsp;<span style='color:green'>(" . $count . ")<i class='fa fa-comment'></i></span></a>" . $collabString . $attachString;
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$subject->title."'>".$string."&nbsp;<span style='color:green'>(".$count.")<i class='fa fa-comment'></i></span></a>".$collabString.$attachString;
                         })
-                        ->addColumn('ticket_number', function($ticket) {
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $ticket->ticket_number . "'>#" . $ticket->ticket_number . "</a>";
+                        ->addColumn('ticket_number', function ($ticket) {
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$ticket->ticket_number."'>#".$ticket->ticket_number.'</a>';
                         })
-                        ->addColumn('priority', function($ticket) {
-                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', "=", $ticket->priority_id)->first();
-                            return '<span class="btn btn-' . $priority->priority_color . ' btn-xs">' . $priority->priority_desc . '</span>';
+                        ->addColumn('priority', function ($ticket) {
+                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
+
+                            return '<span class="btn btn-'.$priority->priority_color.' btn-xs">'.$priority->priority_desc.'</span>';
                             //return "loda";
                         })
-                        ->addColumn('from', function($ticket) {
-                            $from = DB::table('users')->select('user_name')->where('id', "=", $ticket->user_id)->first();
-                            return "<span style='color:#508983'>" . $from->user_name . "</span>";
+                        ->addColumn('from', function ($ticket) {
+                            $from = DB::table('users')->select('user_name')->where('id', '=', $ticket->user_id)->first();
+
+                            return "<span style='color:#508983'>".$from->user_name.'</span>';
                         })
                         ->addColumn('Last Replier', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
                             $TicketDatarow = Ticket_Thread::where('id', '=', $TicketData)->first();
                             $LastResponse = User::where('id', '=', $TicketDatarow->user_id)->first();
-                            if ($LastResponse->role == "user") {
-                                $rep = "#F39C12";
+                            if ($LastResponse->role == 'user') {
+                                $rep = '#F39C12';
                                 $username = $LastResponse->user_name;
                             } else {
-                                $rep = "#000";
-                                $username = $LastResponse->first_name . " " . $LastResponse->last_name;
+                                $rep = '#000';
+                                $username = $LastResponse->first_name.' '.$LastResponse->last_name;
                                 if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
                                     $username = $LastResponse->user_name;
                                 }
                             }
-                            return "<span style='color:" . $rep . "'>" . $username . "</span>";
+
+                            return "<span style='color:".$rep."'>".$username.'</span>';
                         })
-                        ->addColumn('assigned_to', function($ticket) {
+                        ->addColumn('assigned_to', function ($ticket) {
                             if ($ticket->assigned_to == null) {
                                 return "<span style='color:red'>Unassigned</span>";
                             } else {
-                                $assign = DB::table("users")->where('id', "=", $ticket->assigned_to)->first();
-                                return "<span style='color:green'>" . $assign->first_name . " " . $assign->last_name . "</span>";
+                                $assign = DB::table('users')->where('id', '=', $ticket->assigned_to)->first();
+
+                                return "<span style='color:green'>".$assign->first_name.' '.$assign->last_name.'</span>';
                             }
                         })
-                        ->addColumn('Last', function($ticket) {
+                        ->addColumn('Last', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
                             $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first();
+
                             return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at));
                         })
                         ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority')
@@ -161,15 +166,18 @@ class TicketController extends Controller {
     }
 
     /**
-     * Show the Open ticket list page
+     * Show the Open ticket list page.
+     *
      * @return type response
      */
-    public function open_ticket_list() {
+    public function open_ticket_list()
+    {
         return view('themes.default1.agent.helpdesk.ticket.open');
     }
 
-    public function get_open() {
-        if (Auth::user()->role == "admin") {
+    public function get_open()
+    {
+        if (Auth::user()->role == 'admin') {
             // $tickets = Tickets::where('status','=',1)->get();;
 
             $tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', 0)->get();
@@ -180,16 +188,17 @@ class TicketController extends Controller {
             $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first();
             $tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', 0)->where('dept_id', '=', $dept->id)->get();
         }
+
         return \Datatable::collection(new Collection($tickets))
-                        ->addColumn('id', function($ticket) {
-                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='" . $ticket->id . "'></input>";
+                        ->addColumn('id', function ($ticket) {
+                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='".$ticket->id."'></input>";
                         })
-                        ->addColumn('subject', function($ticket) {
-                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', "=", $ticket->id)->first();
+                        ->addColumn('subject', function ($ticket) {
+                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first();
                             $string = $subject->title;
                             if (strlen($string) > 20) {
                                 $stringCut = substr($string, 0, 30);
-                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...';
+                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...';
                             }
                             //collabrations
                             $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get();
@@ -206,51 +215,56 @@ class TicketController extends Controller {
                             if ($attachCount > 0) {
                                 $attachString = '&nbsp;<i class="fa fa-paperclip"></i>';
                             } else {
-                                $attachString = "";
+                                $attachString = '';
                             }
                             //return $threads->id;
 
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $subject->title . "'>" . $string . "&nbsp;<span style='color:green'>(" . $count . ")<i class='fa fa-comment'></i></span></a>" . $collabString . $attachString;
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$subject->title."'>".$string."&nbsp;<span style='color:green'>(".$count.")<i class='fa fa-comment'></i></span></a>".$collabString.$attachString;
                         })
-                        ->addColumn('ticket_number', function($ticket) {
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $ticket->ticket_number . "'>#" . $ticket->ticket_number . "</a>";
+                        ->addColumn('ticket_number', function ($ticket) {
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$ticket->ticket_number."'>#".$ticket->ticket_number.'</a>';
                         })
-                        ->addColumn('priority', function($ticket) {
-                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', "=", $ticket->priority_id)->first();
-                            return '<span class="btn btn-' . $priority->priority_color . ' btn-xs">' . $priority->priority_desc . '</span>';
+                        ->addColumn('priority', function ($ticket) {
+                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
+
+                            return '<span class="btn btn-'.$priority->priority_color.' btn-xs">'.$priority->priority_desc.'</span>';
                             //return "loda";
                         })
-                        ->addColumn('from', function($ticket) {
-                            $from = DB::table('users')->select('user_name')->where('id', "=", $ticket->user_id)->first();
-                            return "<span style='color:#508983'>" . $from->user_name . "</span>";
+                        ->addColumn('from', function ($ticket) {
+                            $from = DB::table('users')->select('user_name')->where('id', '=', $ticket->user_id)->first();
+
+                            return "<span style='color:#508983'>".$from->user_name.'</span>';
                         })
                         ->addColumn('Last Replier', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
                             $TicketDatarow = Ticket_Thread::where('id', '=', $TicketData)->first();
                             $LastResponse = User::where('id', '=', $TicketDatarow->user_id)->first();
-                            if ($LastResponse->role == "user") {
-                                $rep = "#F39C12";
+                            if ($LastResponse->role == 'user') {
+                                $rep = '#F39C12';
                                 $username = $LastResponse->user_name;
                             } else {
-                                $rep = "#000";
-                                $username = $LastResponse->first_name . " " . $LastResponse->last_name;
+                                $rep = '#000';
+                                $username = $LastResponse->first_name.' '.$LastResponse->last_name;
                                 if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
                                     $username = $LastResponse->user_name;
                                 }
                             }
-                            return "<span style='color:" . $rep . "'>" . $username . "</span>";
+
+                            return "<span style='color:".$rep."'>".$username.'</span>';
                         })
-                        ->addColumn('assigned_to', function($ticket) {
+                        ->addColumn('assigned_to', function ($ticket) {
                             if ($ticket->assigned_to == null) {
                                 return "<span style='color:red'>Unassigned</span>";
                             } else {
-                                $assign = DB::table("users")->where('id', "=", $ticket->assigned_to)->first();
-                                return "<span style='color:green'>" . $assign->first_name . " " . $assign->last_name . "</span>";
+                                $assign = DB::table('users')->where('id', '=', $ticket->assigned_to)->first();
+
+                                return "<span style='color:green'>".$assign->first_name.' '.$assign->last_name.'</span>';
                             }
                         })
-                        ->addColumn('Last', function($ticket) {
+                        ->addColumn('Last', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
                             $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first();
+
                             return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at));
                         })
                         ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority')
@@ -259,15 +273,18 @@ class TicketController extends Controller {
     }
 
     /**
-     * Show the answered ticket list page
+     * Show the answered ticket list page.
+     *
      * @return type response
      */
-    public function answered_ticket_list() {
+    public function answered_ticket_list()
+    {
         return view('themes.default1.agent.helpdesk.ticket.answered');
     }
 
-    public function get_answered() {
-        if (Auth::user()->role == "admin") {
+    public function get_answered()
+    {
+        if (Auth::user()->role == 'admin') {
             // $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get();
 
             $tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->get();
@@ -278,16 +295,17 @@ class TicketController extends Controller {
             $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first();
             $tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->where('dept_id', '=', $dept->id)->get();
         }
+
         return \Datatable::collection(new Collection($tickets))
-                        ->addColumn('id', function($ticket) {
-                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='" . $ticket->id . "'></input>";
+                        ->addColumn('id', function ($ticket) {
+                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='".$ticket->id."'></input>";
                         })
-                        ->addColumn('subject', function($ticket) {
-                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', "=", $ticket->id)->first();
+                        ->addColumn('subject', function ($ticket) {
+                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first();
                             $string = $subject->title;
                             if (strlen($string) > 20) {
                                 $stringCut = substr($string, 0, 30);
-                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...';
+                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...';
                             }
                             //collabrations
                             $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get();
@@ -304,51 +322,56 @@ class TicketController extends Controller {
                             if ($attachCount > 0) {
                                 $attachString = '&nbsp;<i class="fa fa-paperclip"></i>';
                             } else {
-                                $attachString = "";
+                                $attachString = '';
                             }
                             //return $threads->id;
 
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $subject->title . "'>" . $string . "&nbsp;<span style='color:green'>(" . $count . ")<i class='fa fa-comment'></i></span></a>" . $collabString . $attachString;
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$subject->title."'>".$string."&nbsp;<span style='color:green'>(".$count.")<i class='fa fa-comment'></i></span></a>".$collabString.$attachString;
                         })
-                        ->addColumn('ticket_number', function($ticket) {
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $ticket->ticket_number . "'>#" . $ticket->ticket_number . "</a>";
+                        ->addColumn('ticket_number', function ($ticket) {
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$ticket->ticket_number."'>#".$ticket->ticket_number.'</a>';
                         })
-                        ->addColumn('priority', function($ticket) {
-                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', "=", $ticket->priority_id)->first();
-                            return '<span class="btn btn-' . $priority->priority_color . ' btn-xs">' . $priority->priority_desc . '</span>';
+                        ->addColumn('priority', function ($ticket) {
+                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
+
+                            return '<span class="btn btn-'.$priority->priority_color.' btn-xs">'.$priority->priority_desc.'</span>';
                             //return "loda";
                         })
-                        ->addColumn('from', function($ticket) {
-                            $from = DB::table('users')->select('user_name')->where('id', "=", $ticket->user_id)->first();
-                            return "<span style='color:#508983'>" . $from->user_name . "</span>";
+                        ->addColumn('from', function ($ticket) {
+                            $from = DB::table('users')->select('user_name')->where('id', '=', $ticket->user_id)->first();
+
+                            return "<span style='color:#508983'>".$from->user_name.'</span>';
                         })
                         ->addColumn('Last Replier', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->where('is_internal', '!=', 1)->max('id');
                             $TicketDatarow = Ticket_Thread::where('id', '=', $TicketData)->first();
                             $LastResponse = User::where('id', '=', $TicketDatarow->user_id)->first();
-                            if ($LastResponse->role == "user") {
-                                $rep = "#F39C12";
+                            if ($LastResponse->role == 'user') {
+                                $rep = '#F39C12';
                                 $username = $LastResponse->user_name;
                             } else {
-                                $rep = "#000";
-                                $username = $LastResponse->first_name . " " . $LastResponse->last_name;
+                                $rep = '#000';
+                                $username = $LastResponse->first_name.' '.$LastResponse->last_name;
                                 if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
                                     $username = $LastResponse->user_name;
                                 }
                             }
-                            return "<span style='color:" . $rep . "'>" . $username . "</span>";
+
+                            return "<span style='color:".$rep."'>".$username.'</span>';
                         })
-                        ->addColumn('assigned_to', function($ticket) {
+                        ->addColumn('assigned_to', function ($ticket) {
                             if ($ticket->assigned_to == null) {
                                 return "<span style='color:red'>Usernassigned</span>";
                             } else {
-                                $assign = DB::table("users")->where('id', "=", $ticket->assigned_to)->first();
-                                return "<span style='color:green'>" . $assign->first_name . " " . $assign->last_name . "</span>";
+                                $assign = DB::table('users')->where('id', '=', $ticket->assigned_to)->first();
+
+                                return "<span style='color:green'>".$assign->first_name.' '.$assign->last_name.'</span>';
                             }
                         })
-                        ->addColumn('Last', function($ticket) {
+                        ->addColumn('Last', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
                             $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first();
+
                             return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at));
                         })
                         ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority')
@@ -357,30 +380,34 @@ class TicketController extends Controller {
     }
 
     /**
-     * Show the Myticket list page
+     * Show the Myticket list page.
+     *
      * @return type response
      */
-    public function myticket_ticket_list() {
+    public function myticket_ticket_list()
+    {
         return view('themes.default1.agent.helpdesk.ticket.myticket');
     }
 
-    public function get_myticket() {
-        if (Auth::user()->role == "admin") {
+    public function get_myticket()
+    {
+        if (Auth::user()->role == 'admin') {
             $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get();
         } else {
             $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first();
             $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get();
         }
+
         return \Datatable::collection(new Collection($tickets))
-                        ->addColumn('id', function($ticket) {
-                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='" . $ticket->id . "'></input>";
+                        ->addColumn('id', function ($ticket) {
+                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='".$ticket->id."'></input>";
                         })
-                        ->addColumn('subject', function($ticket) {
-                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', "=", $ticket->id)->first();
+                        ->addColumn('subject', function ($ticket) {
+                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first();
                             $string = $subject->title;
                             if (strlen($string) > 20) {
                                 $stringCut = substr($string, 0, 30);
-                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...';
+                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...';
                             }
                             //collabrations
                             $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get();
@@ -397,51 +424,56 @@ class TicketController extends Controller {
                             if ($attachCount > 0) {
                                 $attachString = '&nbsp;<i class="fa fa-paperclip"></i>';
                             } else {
-                                $attachString = "";
+                                $attachString = '';
                             }
                             //return $threads->id;
 
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $subject->title . "'>" . $string . "&nbsp;<span style='color:green'>(" . $count . ")<i class='fa fa-comment'></i></span></a>" . $collabString . $attachString;
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$subject->title."'>".$string."&nbsp;<span style='color:green'>(".$count.")<i class='fa fa-comment'></i></span></a>".$collabString.$attachString;
                         })
-                        ->addColumn('ticket_number', function($ticket) {
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $ticket->ticket_number . "'>#" . $ticket->ticket_number . "</a>";
+                        ->addColumn('ticket_number', function ($ticket) {
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$ticket->ticket_number."'>#".$ticket->ticket_number.'</a>';
                         })
-                        ->addColumn('priority', function($ticket) {
-                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', "=", $ticket->priority_id)->first();
-                            return '<span class="btn btn-' . $priority->priority_color . ' btn-xs">' . $priority->priority_desc . '</span>';
+                        ->addColumn('priority', function ($ticket) {
+                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
+
+                            return '<span class="btn btn-'.$priority->priority_color.' btn-xs">'.$priority->priority_desc.'</span>';
                             //return "loda";
                         })
-                        ->addColumn('from', function($ticket) {
-                            $from = DB::table('users')->select('user_name')->where('id', "=", $ticket->user_id)->first();
-                            return "<span style='color:#508983'>" . $from->user_name . "</span>";
+                        ->addColumn('from', function ($ticket) {
+                            $from = DB::table('users')->select('user_name')->where('id', '=', $ticket->user_id)->first();
+
+                            return "<span style='color:#508983'>".$from->user_name.'</span>';
                         })
                         ->addColumn('Last Replier', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->where('is_internal', '!=', 1)->max('id');
                             $TicketDatarow = Ticket_Thread::where('id', '=', $TicketData)->first();
                             $LastResponse = User::where('id', '=', $TicketDatarow->user_id)->first();
-                            if ($LastResponse->role == "user") {
-                                $rep = "#F39C12";
+                            if ($LastResponse->role == 'user') {
+                                $rep = '#F39C12';
                                 $username = $LastResponse->user_name;
                             } else {
-                                $rep = "#000";
-                                $username = $LastResponse->first_name . " " . $LastResponse->last_name;
+                                $rep = '#000';
+                                $username = $LastResponse->first_name.' '.$LastResponse->last_name;
                                 if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
                                     $username = $LastResponse->user_name;
                                 }
                             }
-                            return "<span style='color:" . $rep . "'>" . $username . "</span>";
+
+                            return "<span style='color:".$rep."'>".$username.'</span>';
                         })
-                        ->addColumn('assigned_to', function($ticket) {
+                        ->addColumn('assigned_to', function ($ticket) {
                             if ($ticket->assigned_to == null) {
                                 return "<span style='color:red'>Usernassigned</span>";
                             } else {
-                                $assign = DB::table("users")->where('id', "=", $ticket->assigned_to)->first();
-                                return "<span style='color:green'>" . $assign->first_name . " " . $assign->last_name . "</span>";
+                                $assign = DB::table('users')->where('id', '=', $ticket->assigned_to)->first();
+
+                                return "<span style='color:green'>".$assign->first_name.' '.$assign->last_name.'</span>';
                             }
                         })
-                        ->addColumn('Last', function($ticket) {
+                        ->addColumn('Last', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
                             $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first();
+
                             return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at));
                         })
                         ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority')
@@ -450,38 +482,44 @@ class TicketController extends Controller {
     }
 
     /**
-     * Show the Overdue ticket list page
+     * Show the Overdue ticket list page.
+     *
      * @return type response
      */
-    public function overdue_ticket_list() {
+    public function overdue_ticket_list()
+    {
         return view('themes.default1.agent.helpdesk.ticket.overdue');
     }
 
     /**
-     * Show the Closed ticket list page
+     * Show the Closed ticket list page.
+     *
      * @return type response
      */
-    public function closed_ticket_list() {
+    public function closed_ticket_list()
+    {
         return view('themes.default1.agent.helpdesk.ticket.closed');
     }
 
-    public function get_closed() {
-        if (Auth::user()->role == "admin") {
+    public function get_closed()
+    {
+        if (Auth::user()->role == 'admin') {
             $tickets = Tickets::where('status', '>', 1)->where('status', '<', 4)->get();
         } else {
             $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first();
             $tickets = Tickets::where('status', '>', 1)->where('dept_id', '=', $dept->id)->where('status', '<', 4)->get();
         }
+
         return \Datatable::collection(new Collection($tickets))
-                        ->addColumn('id', function($ticket) {
-                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='" . $ticket->id . "'></input>";
+                        ->addColumn('id', function ($ticket) {
+                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='".$ticket->id."'></input>";
                         })
-                        ->addColumn('subject', function($ticket) {
-                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', "=", $ticket->id)->first();
+                        ->addColumn('subject', function ($ticket) {
+                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first();
                             $string = $subject->title;
                             if (strlen($string) > 20) {
                                 $stringCut = substr($string, 0, 30);
-                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...';
+                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...';
                             }
                             //collabrations
                             $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get();
@@ -498,50 +536,55 @@ class TicketController extends Controller {
                             if ($attachCount > 0) {
                                 $attachString = '&nbsp;<i class="fa fa-paperclip"></i>';
                             } else {
-                                $attachString = "";
+                                $attachString = '';
                             }
                             //return $threads->id;
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $subject->title . "'>" . $string . "&nbsp;<span style='color:green'>(" . $count . ")<i class='fa fa-comment'></i></span></a>" . $collabString . $attachString;
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$subject->title."'>".$string."&nbsp;<span style='color:green'>(".$count.")<i class='fa fa-comment'></i></span></a>".$collabString.$attachString;
                         })
-                        ->addColumn('ticket_number', function($ticket) {
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $ticket->ticket_number . "'>#" . $ticket->ticket_number . "</a>";
+                        ->addColumn('ticket_number', function ($ticket) {
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$ticket->ticket_number."'>#".$ticket->ticket_number.'</a>';
                         })
-                        ->addColumn('priority', function($ticket) {
-                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', "=", $ticket->priority_id)->first();
-                            return '<span class="btn btn-' . $priority->priority_color . ' btn-xs">' . $priority->priority_desc . '</span>';
+                        ->addColumn('priority', function ($ticket) {
+                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
+
+                            return '<span class="btn btn-'.$priority->priority_color.' btn-xs">'.$priority->priority_desc.'</span>';
                             //return "loda";
                         })
-                        ->addColumn('from', function($ticket) {
-                            $from = DB::table('users')->select('user_name')->where('id', "=", $ticket->user_id)->first();
-                            return "<span style='color:#508983'>" . $from->user_name . "</span>";
+                        ->addColumn('from', function ($ticket) {
+                            $from = DB::table('users')->select('user_name')->where('id', '=', $ticket->user_id)->first();
+
+                            return "<span style='color:#508983'>".$from->user_name.'</span>';
                         })
                         ->addColumn('Last Replier', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->where('is_internal', '!=', 1)->max('id');
                             $TicketDatarow = Ticket_Thread::where('id', '=', $TicketData)->first();
                             $LastResponse = User::where('id', '=', $TicketDatarow->user_id)->first();
-                            if ($LastResponse->role == "user") {
-                                $rep = "#F39C12";
+                            if ($LastResponse->role == 'user') {
+                                $rep = '#F39C12';
                                 $username = $LastResponse->user_name;
                             } else {
-                                $rep = "#000";
-                                $username = $LastResponse->first_name . " " . $LastResponse->last_name;
+                                $rep = '#000';
+                                $username = $LastResponse->first_name.' '.$LastResponse->last_name;
                                 if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
                                     $username = $LastResponse->user_name;
                                 }
                             }
-                            return "<span style='color:" . $rep . "'>" . $username . "</span>";
+
+                            return "<span style='color:".$rep."'>".$username.'</span>';
                         })
-                        ->addColumn('assigned_to', function($ticket) {
+                        ->addColumn('assigned_to', function ($ticket) {
                             if ($ticket->assigned_to == null) {
                                 return "<span style='color:red'>Usernassigned</span>";
                             } else {
-                                $assign = DB::table("users")->where('id', "=", $ticket->assigned_to)->first();
-                                return "<span style='color:green'>" . $assign->first_name . " " . $assign->last_name . "</span>";
+                                $assign = DB::table('users')->where('id', '=', $ticket->assigned_to)->first();
+
+                                return "<span style='color:green'>".$assign->first_name.' '.$assign->last_name.'</span>';
                             }
                         })
-                        ->addColumn('Last', function($ticket) {
+                        ->addColumn('Last', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
                             $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first();
+
                             return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at));
                         })
                         ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority')
@@ -550,30 +593,34 @@ class TicketController extends Controller {
     }
 
     /**
-     * Show the ticket list page
+     * Show the ticket list page.
+     *
      * @return type response
      */
-    public function assigned_ticket_list() {
+    public function assigned_ticket_list()
+    {
         return view('themes.default1.agent.helpdesk.ticket.assigned');
     }
 
-    public function get_assigned() {
-        if (Auth::user()->role == "admin") {
+    public function get_assigned()
+    {
+        if (Auth::user()->role == 'admin') {
             $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->get();
         } else {
             $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first();
             $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->where('dept_id', '=', $dept->id)->get();
         }
+
         return \Datatable::collection(new Collection($tickets))
-                        ->addColumn('id', function($ticket) {
-                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='" . $ticket->id . "'></input>";
+                        ->addColumn('id', function ($ticket) {
+                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='".$ticket->id."'></input>";
                         })
-                        ->addColumn('subject', function($ticket) {
-                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', "=", $ticket->id)->first();
+                        ->addColumn('subject', function ($ticket) {
+                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first();
                             $string = $subject->title;
                             if (strlen($string) > 20) {
                                 $stringCut = substr($string, 0, 30);
-                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...';
+                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...';
                             }
                             //collabrations
                             $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get();
@@ -590,51 +637,56 @@ class TicketController extends Controller {
                             if ($attachCount > 0) {
                                 $attachString = '&nbsp;<i class="fa fa-paperclip"></i>';
                             } else {
-                                $attachString = "";
+                                $attachString = '';
                             }
                             //return $threads->id;
 
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $subject->title . "'>" . $string . "&nbsp;<span style='color:green'>(" . $count . ")<i class='fa fa-comment'></i></span></a>" . $collabString . $attachString;
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$subject->title."'>".$string."&nbsp;<span style='color:green'>(".$count.")<i class='fa fa-comment'></i></span></a>".$collabString.$attachString;
                         })
-                        ->addColumn('ticket_number', function($ticket) {
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $ticket->ticket_number . "'>#" . $ticket->ticket_number . "</a>";
+                        ->addColumn('ticket_number', function ($ticket) {
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$ticket->ticket_number."'>#".$ticket->ticket_number.'</a>';
                         })
-                        ->addColumn('priority', function($ticket) {
-                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', "=", $ticket->priority_id)->first();
-                            return '<span class="btn btn-' . $priority->priority_color . ' btn-xs">' . $priority->priority_desc . '</span>';
+                        ->addColumn('priority', function ($ticket) {
+                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
+
+                            return '<span class="btn btn-'.$priority->priority_color.' btn-xs">'.$priority->priority_desc.'</span>';
                             //return "loda";
                         })
-                        ->addColumn('from', function($ticket) {
-                            $from = DB::table('users')->select('user_name')->where('id', "=", $ticket->user_id)->first();
-                            return "<span style='color:#508983'>" . $from->user_name . "</span>";
+                        ->addColumn('from', function ($ticket) {
+                            $from = DB::table('users')->select('user_name')->where('id', '=', $ticket->user_id)->first();
+
+                            return "<span style='color:#508983'>".$from->user_name.'</span>';
                         })
                         ->addColumn('Last Replier', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->where('is_internal', '!=', 1)->max('id');
                             $TicketDatarow = Ticket_Thread::where('id', '=', $TicketData)->first();
                             $LastResponse = User::where('id', '=', $TicketDatarow->user_id)->first();
-                            if ($LastResponse->role == "user") {
-                                $rep = "#F39C12";
+                            if ($LastResponse->role == 'user') {
+                                $rep = '#F39C12';
                                 $username = $LastResponse->user_name;
                             } else {
-                                $rep = "#000";
-                                $username = $LastResponse->first_name . " " . $LastResponse->last_name;
+                                $rep = '#000';
+                                $username = $LastResponse->first_name.' '.$LastResponse->last_name;
                                 if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
                                     $username = $LastResponse->user_name;
                                 }
                             }
-                            return "<span style='color:" . $rep . "'>" . $username . "</span>";
+
+                            return "<span style='color:".$rep."'>".$username.'</span>';
                         })
-                        ->addColumn('assigned_to', function($ticket) {
+                        ->addColumn('assigned_to', function ($ticket) {
                             if ($ticket->assigned_to == null) {
                                 return "<span style='color:red'>Usernassigned</span>";
                             } else {
-                                $assign = DB::table("users")->where('id', "=", $ticket->assigned_to)->first();
-                                return "<span style='color:green'>" . $assign->first_name . " " . $assign->last_name . "</span>";
+                                $assign = DB::table('users')->where('id', '=', $ticket->assigned_to)->first();
+
+                                return "<span style='color:green'>".$assign->first_name.' '.$assign->last_name.'</span>';
                             }
                         })
-                        ->addColumn('Last', function($ticket) {
+                        ->addColumn('Last', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
                             $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first();
+
                             return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at));
                         })
                         ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority')
@@ -643,19 +695,24 @@ class TicketController extends Controller {
     }
 
     /**
-     * Show the New ticket page
+     * Show the New ticket page.
+     *
      * @return type response
      */
-    public function newticket() {
+    public function newticket()
+    {
         return view('themes.default1.agent.helpdesk.ticket.new');
     }
 
     /**
-     * Save the data of new ticket and show the New ticket page with result
+     * Save the data of new ticket and show the New ticket page with result.
+     *
      * @param type CreateTicketRequest $request
+     *
      * @return type response
      */
-    public function post_newticket(CreateTicketRequest $request) {
+    public function post_newticket(CreateTicketRequest $request)
+    {
         try {
             $email = $request->input('email');
             $fullname = $request->input('fullname');
@@ -683,16 +740,20 @@ class TicketController extends Controller {
             }
         } catch (Exception $e) {
             dd($e);
-            return Redirect()->back()->with('fails', '<li>' . $e->errorInfo . '</li>');
+
+            return Redirect()->back()->with('fails', '<li>'.$e->errorInfo.'</li>');
         }
     }
 
     /**
-     * Shows the ticket thread details
+     * Shows the ticket thread details.
+     *
      * @param type $id
+     *
      * @return type response
      */
-    public function thread($id) {
+    public function thread($id)
+    {
         /* $lock = Tickets::where('id','=',$id)->first();
           if($lock->lock_by == Auth::user()->id || $lock->lock_at < date('Y-m-d H:i:s', strtotime('-3 minutes', strtotime($lock->lock_at)))) {
           if(Auth::user()->role == 'agent'){
@@ -709,7 +770,6 @@ class TicketController extends Controller {
           return Redirect()->back()->with('fails', 'This ticket has been locked by other agent');
           } */
         if (Auth::user()->role == 'agent') {
-
             $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first();
 
             $tickets = Tickets::where('id', '=', $id)->where('dept_id', '=', $dept->id)->first();
@@ -722,12 +782,15 @@ class TicketController extends Controller {
     }
 
     /**
-     * Replying a ticket
+     * Replying a ticket.
+     *
      * @param type Ticket_Thread $thread
      * @param type TicketRequest $request
+     *
      * @return type bool
      */
-    public function reply(Ticket_Thread $thread, TicketRequest $request, Ticket_attachments $ta) {
+    public function reply(Ticket_Thread $thread, TicketRequest $request, Ticket_attachments $ta)
+    {
         $attachments = $request->file('attachment');
         $check_attachment = null;
         // Event fire
@@ -756,11 +819,11 @@ class TicketController extends Controller {
         if ($tickets->assigned_to == 0) {
             $tickets->assigned_to = Auth::user()->id;
             $tickets->save();
-            $thread2 = New Ticket_Thread;
+            $thread2 = new Ticket_Thread();
             $thread2->ticket_id = $thread->ticket_id;
             $thread2->user_id = Auth::user()->id;
             $thread2->is_internal = 1;
-            $thread2->body = "This Ticket have been assigned to " . Auth::user()->first_name . " " . Auth::user()->last_name;
+            $thread2->body = 'This Ticket have been assigned to '.Auth::user()->first_name.' '.Auth::user()->last_name;
             $thread2->save();
         }
         if ($tickets->status > 1) {
@@ -814,7 +877,7 @@ class TicketController extends Controller {
         \Event::fire(new \App\Events\FaveoAfterReply($reply_content, $user->phone_number, $request, $tickets));
 
         // sending attachments via php mail function
-        $message = "";
+        $message = '';
         if ($check_attachment == 1) {
             $attachment_files = $attachments;
             // dd($attachment_files);
@@ -828,7 +891,7 @@ class TicketController extends Controller {
 
         try {
             $this->PhpMailController->sendmail(
-                    $from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email, 'cc' => $collaborators], $message = ['subject' => $ticket_subject . '[#' . $ticket_number . ']', 'body' => $request->input('reply_content'), 'scenario' => 'ticket-reply-agent', 'attachments' => $attachment_files], $template_variables = ['ticket_number' => $ticket_number, 'user' => $username, 'agent_sign' => $agentsign]
+                    $from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email, 'cc' => $collaborators], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'body' => $request->input('reply_content'), 'scenario' => 'ticket-reply-agent', 'attachments' => $attachment_files], $template_variables = ['ticket_number' => $ticket_number, 'user' => $username, 'agent_sign' => $agentsign]
             );
         } catch (\Exception $e) {
             return 0;
@@ -838,13 +901,15 @@ class TicketController extends Controller {
     }
 
     /**
-     * Ticket edit and save ticket data
-     * @param type $ticket_id
+     * Ticket edit and save ticket data.
+     *
+     * @param type               $ticket_id
      * @param type Ticket_Thread $thread
+     *
      * @return type bool
      */
-    public function ticketEditPost($ticket_id, Ticket_Thread $thread, Tickets $ticket) {
-
+    public function ticketEditPost($ticket_id, Ticket_Thread $thread, Tickets $ticket)
+    {
         if (Input::get('subject') == null) {
             return 1;
         } elseif (Input::get('sla_paln') == null) {
@@ -857,37 +922,45 @@ class TicketController extends Controller {
             return 5;
         } else {
             $ticket = $ticket->where('id', '=', $ticket_id)->first();
-            $ticket->sla = Input::get("sla_paln");
-            $ticket->help_topic_id = Input::get("help_topic");
-            $ticket->source = Input::get("ticket_source");
-            $ticket->priority_id = Input::get("ticket_priority");
+            $ticket->sla = Input::get('sla_paln');
+            $ticket->help_topic_id = Input::get('help_topic');
+            $ticket->source = Input::get('ticket_source');
+            $ticket->priority_id = Input::get('ticket_priority');
             $ticket->save();
 
             $threads = $thread->where('ticket_id', '=', $ticket_id)->first();
-            $threads->title = Input::get("subject");
+            $threads->title = Input::get('subject');
             $threads->save();
+
             return 0;
         }
     }
 
     /**
-     * Print Ticket Details
+     * Print Ticket Details.
+     *
      * @param type $id
+     *
      * @return type respponse
      */
-    public function ticket_print($id) {
+    public function ticket_print($id)
+    {
         $tickets = Tickets::where('id', '=', $id)->first();
         $thread = Ticket_Thread::where('ticket_id', '=', $id)->first();
         $html = view('themes.default1.agent.helpdesk.ticket.pdf', compact('id', 'tickets', 'thread'))->render();
+
         return PDF::load($html)->show();
     }
 
     /**
-     * Generates Ticket Number
+     * Generates Ticket Number.
+     *
      * @param type $ticket_number
+     *
      * @return type integer
      */
-    public function ticketNumber($ticket_number) {
+    public function ticketNumber($ticket_number)
+    {
         $number = $ticket_number;
         $number = explode('-', $number);
         $number1 = $number[0];
@@ -907,17 +980,21 @@ class TicketController extends Controller {
         $number3++;
         $number2 = sprintf('%04s', $number2);
         $number3 = sprintf('%07s', $number3);
-        $array = array($number1, $number2, $number3);
+        $array = [$number1, $number2, $number3];
         $number = implode('-', $array);
+
         return $number;
     }
 
     /**
-     * check email for dublicate entry
+     * check email for dublicate entry.
+     *
      * @param type $email
+     *
      * @return type bool
      */
-    public function checkEmail($email) {
+    public function checkEmail($email)
+    {
         $check = User::where('email', '=', $email)->first();
         if ($check == true) {
             return $check;
@@ -927,7 +1004,8 @@ class TicketController extends Controller {
     }
 
     /**
-     * Create User while creating ticket
+     * Create User while creating ticket.
+     *
      * @param type $emailadd
      * @param type $username
      * @param type $subject
@@ -937,9 +1015,11 @@ class TicketController extends Controller {
      * @param type $sla
      * @param type $priority
      * @param type $system
+     *
      * @return type bool
      */
-    public function create_user($emailadd, $username, $subject, $body, $phone, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $from_data) {
+    public function create_user($emailadd, $username, $subject, $body, $phone, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $from_data)
+    {
         // define global variables
         // dd($source);
         // dd($emailadd);
@@ -954,7 +1034,7 @@ class TicketController extends Controller {
             // Generate password
             $password = $this->generateRandomString();
             // create user
-            $user = new User;
+            $user = new User();
             if ($username == null) {
                 $username = $emailadd;
             }
@@ -962,20 +1042,20 @@ class TicketController extends Controller {
             $user->email = $emailadd;
             $user->password = Hash::make($password);
             $user->phone_number = $phone;
-            $user->role = "user";
-            $user->active = "1";
+            $user->role = 'user';
+            $user->active = '1';
             // mail user his/her password
             \Event::fire(new \App\Events\ClientTicketFormPost($from_data, $emailadd, $source));
             if ($user->save()) {
                 $user_id = $user->id;
-                // Event fire 
+                // Event fire
                 \Event::fire(new \App\Events\ReadMailEvent($user_id, $password));
                 // if (Mail::send('emails.pass', ['password' => $password, 'name' => $username, 'from'=>$company,'emailadd' => $emailadd], function ($message) use ($emailadd, $username,$company) {
                 // 	$message->to($emailadd, $username)->subject('Welcome to '.$company.' helpdesk');
                 // })) {
                 // try {
 
-                    $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => 'Welcome to ' . $company . ' helpdesk', 'scenario' => 'registration-notification'], $template_variables = ['user' => $username, 'email_address' => $emailadd, 'user_password' => $password]);
+                    $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => 'Welcome to '.$company.' helpdesk', 'scenario' => 'registration-notification'], $template_variables = ['user' => $username, 'email_address' => $emailadd, 'user_password' => $password]);
                 // } catch (\Exception $e) {
                     // return 0;
                 // }
@@ -1001,11 +1081,11 @@ class TicketController extends Controller {
         // dd($threaddata);
         $is_reply = $ticket_number[1];
         $system = $this->system();
-        $updated_subject = $threaddata->title . '[#' . $ticket_number2 . ']';
+        $updated_subject = $threaddata->title.'[#'.$ticket_number2.']';
         if ($ticket_number2) {
             // send ticket create details to user
             if ($is_reply == 0) {
-                $mail = "create-ticket-agent";
+                $mail = 'create-ticket-agent';
                 if (Auth::user()) {
                     $sign = Auth::user()->agent_sign;
                 } else {
@@ -1015,26 +1095,24 @@ class TicketController extends Controller {
                 if ($source == 3) {
                     // Mail::send('emails.Ticket_Create', ['sign'=>$sign, 'content' => $body, 'name' => $username, 'ticket_number' => $ticket_number2, 'system' => $system], function ($message) use ($emailadd, $username, $ticket_number2, $updated_subject) {
                     // 	$message->to($emailadd, $username)->subject($updated_subject);
-                    // });	
+                    // });
                     // dd($body);
                     try {
                         $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket-by-agent', 'body' => $body], $template_variables = ['agent_sign' => Auth::user()->agent_sign, 'ticket_number' => $ticket_number2]);
                     } catch (\Exception $e) {
-                        
                     }
                 } else {
                     $body2 = null;
                     // Mail::send('emails.Ticket_Create', ['sign'=>$sign, 'content' => $body2, 'name' => $username, 'ticket_number' => $ticket_number2, 'system' => $system], function ($message) use ($emailadd, $username, $ticket_number2, $updated_subject) {
                     // 	$message->to($emailadd, $username)->subject($updated_subject);
-                    // });	
+                    // });
                     try {
-                        $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'], $template_variables = ['user' => $username, 'ticket_number' => $ticket_number2, 'department_sign' => ""]);
+                        $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'], $template_variables = ['user' => $username, 'ticket_number' => $ticket_number2, 'department_sign' => '']);
                     } catch (\Exception $e) {
-                        
                     }
                 }
             } else {
-                $mail = "ticket-reply-agent";
+                $mail = 'ticket-reply-agent';
             }
             if (Alert::first()->ticket_status == 1 || Alert::first()->ticket_admin_email == 1) {
                 // send email to admin
@@ -1049,7 +1127,6 @@ class TicketController extends Controller {
                     try {
                         $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $admin_user, 'email' => $admin_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $admin_user, 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]);
                     } catch (\Exception $e) {
-                        
                     }
                 }
             }
@@ -1071,7 +1148,6 @@ class TicketController extends Controller {
                             try {
                                 $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $agent_user, 'email' => $agent_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $agent_user, 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]);
                             } catch (\Exception $e) {
-                                
                             }
                         }
                     }
@@ -1088,61 +1164,73 @@ class TicketController extends Controller {
                 try {
                     $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $agent_user, 'email' => $agent_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $assigned_to->user_name, 'ticket_number' => $ticket_number2, 'email_address' => $assigned_to->email, 'name' => $ticket_creator]);
                 } catch (\Exception $e) {
-                    
                 }
             }
+
             return ['0' => $ticket_number2, '1' => true];
         }
     }
 
     /**
-     * Default helptopic
+     * Default helptopic.
+     *
      * @return type string
      */
-    public function default_helptopic() {
-        $helptopic = "1";
+    public function default_helptopic()
+    {
+        $helptopic = '1';
+
         return $helptopic;
     }
 
     /**
-     * Default SLA plan
+     * Default SLA plan.
+     *
      * @return type string
      */
-    public function default_sla() {
-        $sla = "1";
+    public function default_sla()
+    {
+        $sla = '1';
+
         return $sla;
     }
 
     /**
-     * Default Priority
+     * Default Priority.
+     *
      * @return type string
      */
-    public function default_priority() {
-        $priority = "1";
+    public function default_priority()
+    {
+        $priority = '1';
+
         return $prioirty;
     }
 
     /**
-     * Check the response of the ticket
+     * Check the response of the ticket.
+     *
      * @param type $user_id
      * @param type $subject
      * @param type $body
      * @param type $helptopic
      * @param type $sla
      * @param type $priority
+     *
      * @return type string
      */
-    public function check_ticket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data) {
+    public function check_ticket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data)
+    {
         // $read_ticket_number = substr($subject, 0, 6);
         $read_ticket_number = explode('[#', $subject);
         if (isset($read_ticket_number[1])) {
             // dd($read_ticket_number);
             // if ($read_ticket_number == 'Re: [#' or $read_ticket_number == 'RE: [#') {
             // dd($read_ticket_number);
-            $separate = explode("]", $read_ticket_number[1]);
+            $separate = explode(']', $read_ticket_number[1]);
             $new_subject = substr($separate[0], 0, 20);
             $find_number = Tickets::where('ticket_number', '=', $new_subject)->first();
-            $thread_body = explode("---Reply above this line---", $body);
+            $thread_body = explode('---Reply above this line---', $body);
             $body = $thread_body[0];
             if (count($find_number) > 0) {
                 $id = $find_number->id;
@@ -1162,53 +1250,57 @@ class TicketController extends Controller {
                     if ($user_name->role == 'user') {
                         $username = $user_name->user_name;
                     } elseif ($user_name->role == 'agent' or $user_name->role == 'admin') {
-                        $username = $user_name->first_name . " " . $user_name->last_name;
+                        $username = $user_name->first_name.' '.$user_name->last_name;
                     }
 
-                    $ticket_threads = new Ticket_Thread;
+                    $ticket_threads = new Ticket_Thread();
                     $ticket_threads->ticket_id = $id;
                     $ticket_threads->user_id = $user_id;
                     $ticket_threads->is_internal = 1;
-                    $ticket_threads->body = $ticket_status->message . " " . $username;
+                    $ticket_threads->body = $ticket_status->message.' '.$username;
                     $ticket_threads->save();
                 }
                 if (isset($id)) {
                     if ($this->ticketThread($subject, $body, $id, $user_id)) {
-                        return array($ticket_number, 1);
+                        return [$ticket_number, 1];
                     }
                 }
             } else {
                 $ticket_number = $this->createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data);
-                return array($ticket_number, 0);
+
+                return [$ticket_number, 0];
             }
         } else {
             $ticket_number = $this->createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data);
-            return array($ticket_number, 0);
+
+            return [$ticket_number, 0];
         }
     }
 
     /**
-     * Create Ticket
+     * Create Ticket.
+     *
      * @param type $user_id
      * @param type $subject
      * @param type $body
      * @param type $helptopic
      * @param type $sla
      * @param type $priority
+     *
      * @return type string
      */
-    public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data) {
+    public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data)
+    {
         $max_number = Tickets::whereRaw('id = (select max(`id`) from tickets)')->first();
         if ($max_number == null) {
-            $ticket_number = "AAAA-9999-9999999";
+            $ticket_number = 'AAAA-9999-9999999';
         } else {
             foreach ($max_number as $number) {
                 $ticket_number = $max_number->ticket_number;
             }
         }
 
-
-        $ticket = new Tickets;
+        $ticket = new Tickets();
         $ticket->ticket_number = $this->ticketNumber($ticket_number);
         $ticket->user_id = $user_id;
         $ticket->dept_id = $dept;
@@ -1240,7 +1332,7 @@ class TicketController extends Controller {
             foreach ($form_data as $key => $form_details) {
                 foreach ($forms as $from) {
                     if ($from->name == $key) {
-                        $form_value = new Ticket_Form_Data;
+                        $form_value = new Ticket_Form_Data();
                         $form_value->ticket_id = $id;
                         $form_value->title = $from->label;
                         $form_value->content = $form_details;
@@ -1258,15 +1350,18 @@ class TicketController extends Controller {
     }
 
     /**
-     * Generate Ticket Thread
+     * Generate Ticket Thread.
+     *
      * @param type $subject
      * @param type $body
      * @param type $id
      * @param type $user_id
+     *
      * @return type
      */
-    public function ticketThread($subject, $body, $id, $user_id) {
-        $thread = new Ticket_Thread;
+    public function ticketThread($subject, $body, $id, $user_id)
+    {
+        $thread = new Ticket_Thread();
         $thread->user_id = $user_id;
         $thread->ticket_id = $id;
         $thread->poster = 'client';
@@ -1278,27 +1373,34 @@ class TicketController extends Controller {
     }
 
     /**
-     * Generate a random string for password
+     * Generate a random string for password.
+     *
      * @param type $length
+     *
      * @return type string
      */
-    public function generateRandomString($length = 10) {
+    public function generateRandomString($length = 10)
+    {
         $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
         $charactersLength = strlen($characters);
         $randomString = '';
         for ($i = 0; $i < $length; $i++) {
             $randomString .= $characters[rand(0, $charactersLength - 1)];
         }
+
         return $randomString;
     }
 
     /**
-     * function to Ticket Close
-     * @param type $id
+     * function to Ticket Close.
+     *
+     * @param type         $id
      * @param type Tickets $ticket
+     *
      * @return type string
      */
-    public function close($id, Tickets $ticket) {
+    public function close($id, Tickets $ticket)
+    {
         $ticket_status = $ticket->where('id', '=', $id)->first();
         $ticket_status->status = 3;
         $ticket_status->closed = 1;
@@ -1307,11 +1409,11 @@ class TicketController extends Controller {
         $ticket_thread = Ticket_Thread::where('ticket_id', '=', $ticket_status->id)->first();
         $ticket_subject = $ticket_thread->title;
         $ticket_status_message = Ticket_Status::where('id', '=', $ticket_status->status)->first();
-        $thread = New Ticket_Thread;
+        $thread = new Ticket_Thread();
         $thread->ticket_id = $ticket_status->id;
         $thread->user_id = Auth::user()->id;
         $thread->is_internal = 1;
-        $thread->body = $ticket_status_message->message . " " . Auth::user()->first_name . " " . Auth::user()->last_name;
+        $thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name;
         $thread->save();
 
         $user_id = $ticket_status->user_id;
@@ -1333,64 +1435,75 @@ class TicketController extends Controller {
             $from_email = $sending_emails->id;
         }
         try {
-            $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket_status->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $ticket_subject . '[#' . $ticket_number . ']', 'scenario' => 'close-ticket'], $template_variables = ['ticket_number' => $ticket_number]);
+            $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket_status->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'close-ticket'], $template_variables = ['ticket_number' => $ticket_number]);
         } catch (\Exception $e) {
             return 0;
         }
 
-        return "your ticket" . $ticket_status->ticket_number . " has been closed";
+        return 'your ticket'.$ticket_status->ticket_number.' has been closed';
     }
 
     /**
-     * function to Ticket resolved
-     * @param type $id
+     * function to Ticket resolved.
+     *
+     * @param type         $id
      * @param type Tickets $ticket
+     *
      * @return type string
      */
-    public function resolve($id, Tickets $ticket) {
+    public function resolve($id, Tickets $ticket)
+    {
         $ticket_status = $ticket->where('id', '=', $id)->first();
         $ticket_status->status = 2;
         $ticket_status->closed = 1;
         $ticket_status->closed_at = date('Y-m-d H:i:s');
         $ticket_status->save();
         $ticket_status_message = Ticket_Status::where('id', '=', $ticket_status->status)->first();
-        $thread = New Ticket_Thread;
+        $thread = new Ticket_Thread();
         $thread->ticket_id = $ticket_status->id;
         $thread->user_id = Auth::user()->id;
         $thread->is_internal = 1;
-        $thread->body = $ticket_status_message->message . " " . Auth::user()->first_name . " " . Auth::user()->last_name;
+        $thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name;
         $thread->save();
-        return "your ticket" . $ticket_status->ticket_number . " has been resolved";
+
+        return 'your ticket'.$ticket_status->ticket_number.' has been resolved';
     }
 
     /**
-     * function to Open Ticket
-     * @param type $id
+     * function to Open Ticket.
+     *
+     * @param type         $id
      * @param type Tickets $ticket
+     *
      * @return type
      */
-    public function open($id, Tickets $ticket) {
+    public function open($id, Tickets $ticket)
+    {
         $ticket_status = $ticket->where('id', '=', $id)->first();
         $ticket_status->status = 1;
         $ticket_status->reopened_at = date('Y-m-d H:i:s');
         $ticket_status->save();
         $ticket_status_message = Ticket_Status::where('id', '=', $ticket_status->status)->first();
-        $thread = New Ticket_Thread;
+        $thread = new Ticket_Thread();
         $thread->ticket_id = $ticket_status->id;
         $thread->user_id = Auth::user()->id;
         $thread->is_internal = 1;
-        $thread->body = $ticket_status_message->message . " " . Auth::user()->first_name . " " . Auth::user()->last_name;
+        $thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name;
         $thread->save();
-        return "your ticket" . $ticket_status->ticket_number . " has been opened";
+
+        return 'your ticket'.$ticket_status->ticket_number.' has been opened';
     }
 
     /**
-     * Function to delete ticket
-     * @param type $id
+     * Function to delete ticket.
+     *
+     * @param type         $id
      * @param type Tickets $ticket
+     *
      * @return type string
      */
-    public function delete($id, Tickets $ticket) {
+    public function delete($id, Tickets $ticket)
+    {
         $ticket_delete = $ticket->where('id', '=', $id)->first();
         if ($ticket_delete->status == 5) {
             $ticket_delete->delete();
@@ -1402,44 +1515,53 @@ class TicketController extends Controller {
             foreach ($ticket_attachments as $ticket_attachment) {
                 $ticket_attachment->delete();
             }
-            return "your ticket has been delete";
+
+            return 'your ticket has been delete';
         } else {
             $ticket_delete->is_deleted = 1;
             $ticket_delete->status = 5;
             $ticket_delete->save();
             $ticket_status_message = Ticket_Status::where('id', '=', $ticket_delete->status)->first();
-            $thread = New Ticket_Thread;
+            $thread = new Ticket_Thread();
             $thread->ticket_id = $ticket_delete->id;
             $thread->user_id = Auth::user()->id;
             $thread->is_internal = 1;
-            $thread->body = $ticket_status_message->message . " " . Auth::user()->first_name . " " . Auth::user()->last_name;
+            $thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name;
             $thread->save();
-            return "your ticket" . $ticket_delete->ticket_number . " has been delete";
+
+            return 'your ticket'.$ticket_delete->ticket_number.' has been delete';
         }
     }
 
     /**
-     * Function to ban an email
-     * @param type $id
+     * Function to ban an email.
+     *
+     * @param type         $id
      * @param type Tickets $ticket
+     *
      * @return type string
      */
-    public function ban($id, Tickets $ticket) {
+    public function ban($id, Tickets $ticket)
+    {
         $ticket_ban = $ticket->where('id', '=', $id)->first();
         $ban_email = $ticket_ban->user_id;
         $user = User::where('id', '=', $ban_email)->first();
         $user->ban = 1;
         $user->save();
         $Email = $user->email;
-        return "the user has been banned";
+
+        return 'the user has been banned';
     }
 
     /**
-     * function to assign ticket
+     * function to assign ticket.
+     *
      * @param type $id
+     *
      * @return type bool
      */
-    public function assign($id) {
+    public function assign($id)
+    {
         $UserEmail = Input::get('assign_to');
         $assign_to = explode('_', $UserEmail);
         $ticket = Tickets::where('id', '=', $id)->first();
@@ -1455,11 +1577,11 @@ class TicketController extends Controller {
             $ticket_thread = Ticket_Thread::where('ticket_id', '=', $id)->first();
             $ticket_subject = $ticket_thread->title;
 
-            $thread = New Ticket_Thread;
+            $thread = new Ticket_Thread();
             $thread->ticket_id = $ticket->id;
             $thread->user_id = Auth::user()->id;
             $thread->is_internal = 1;
-            $thread->body = "This Ticket has been assigned to " . $assignee;
+            $thread->body = 'This Ticket has been assigned to '.$assignee;
             $thread->save();
 
             // $master = Auth::user()->first_name . " " . Auth::user()->last_name;
@@ -1472,7 +1594,7 @@ class TicketController extends Controller {
         } elseif ($assign_to[0] == 'user') {
             $ticket->assigned_to = $assign_to[1];
             $user_detail = User::where('id', '=', $assign_to[1])->first();
-            $assignee = $user_detail->first_name . ' ' . $user_detail->last_name;
+            $assignee = $user_detail->first_name.' '.$user_detail->last_name;
 
             $company = $this->company();
             $system = $this->system();
@@ -1483,17 +1605,17 @@ class TicketController extends Controller {
             $ticket_thread = Ticket_Thread::where('ticket_id', '=', $id)->first();
             $ticket_subject = $ticket_thread->title;
 
-            $thread = New Ticket_Thread;
+            $thread = new Ticket_Thread();
             $thread->ticket_id = $ticket->id;
             $thread->user_id = Auth::user()->id;
             $thread->is_internal = 1;
-            $thread->body = "This Ticket has been assigned to " . $assignee;
+            $thread->body = 'This Ticket has been assigned to '.$assignee;
             $thread->save();
 
             $agent = $user_detail->first_name;
             $agent_email = $user_detail->email;
 
-            $master = Auth::user()->first_name . " " . Auth::user()->last_name;
+            $master = Auth::user()->first_name.' '.Auth::user()->last_name;
             // if(Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) {
             // ticket assigned send mail
             // Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from'=>$company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) {
@@ -1506,7 +1628,7 @@ class TicketController extends Controller {
             //     $from_email = $sending_emails->id;
             // }
             try {
-                $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject . '[#' . $ticket_number . ']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master]);
+                $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master]);
             } catch (\Exception $e) {
                 return 0;
             }
@@ -1518,14 +1640,17 @@ class TicketController extends Controller {
     }
 
     /**
-     * Function to post internal note
+     * Function to post internal note.
+     *
      * @param type $id
+     *
      * @return type bool
      */
-    public function InternalNote($id) {
+    public function InternalNote($id)
+    {
         $InternalContent = Input::get('InternalContent');
         $thread = Ticket_Thread::where('ticket_id', '=', $id)->first();
-        $NewThread = new Ticket_Thread;
+        $NewThread = new Ticket_Thread();
         $NewThread->ticket_id = $thread->ticket_id;
         $NewThread->user_id = Auth::user()->id;
         // $NewThread->thread_type = 'M';
@@ -1534,22 +1659,26 @@ class TicketController extends Controller {
         $NewThread->title = $thread->title;
         $NewThread->body = $InternalContent;
         $NewThread->save();
+
         return 1;
     }
 
     /**
-     * Function to surrender a ticket
+     * Function to surrender a ticket.
+     *
      * @param type $id
+     *
      * @return type bool
      */
-    public function surrender($id) {
+    public function surrender($id)
+    {
         $ticket = Tickets::where('id', '=', $id)->first();
 
         // if($ticket->assigned_to == Auth::user()->id)
         // {
-        $InternalContent = Auth::user()->first_name . " " . Auth::user()->last_name . " has Surrendered the assigned Ticket";
+        $InternalContent = Auth::user()->first_name.' '.Auth::user()->last_name.' has Surrendered the assigned Ticket';
         $thread = Ticket_Thread::where('ticket_id', '=', $id)->first();
-        $NewThread = new Ticket_Thread;
+        $NewThread = new Ticket_Thread();
         $NewThread->ticket_id = $thread->ticket_id;
         $NewThread->user_id = Auth::user()->id;
         $NewThread->is_internal = 1;
@@ -1566,25 +1695,32 @@ class TicketController extends Controller {
     }
 
     /**
-     * Search
-     * @param type $keyword 
+     * Search.
+     *
+     * @param type $keyword
+     *
      * @return type array
      */
-    public function search($keyword) {
+    public function search($keyword)
+    {
         if (isset($keyword)) {
-            $data = array('ticket_number' => Tickets::search($keyword));
+            $data = ['ticket_number' => Tickets::search($keyword)];
+
             return $data;
         } else {
-            return "no results";
+            return 'no results';
         }
     }
 
     /**
-     * Search
-     * @param type $keyword 
+     * Search.
+     *
+     * @param type $keyword
+     *
      * @return type array
      */
-    public function stores($ticket_number) {
+    public function stores($ticket_number)
+    {
         $this->layout->header = $ticket_number;
         $content = View::make('themes.default1.admin.tickets.ticketsearch', with(new Tickets()))
                 ->with('header', $this->layout->header)
@@ -1597,11 +1733,14 @@ class TicketController extends Controller {
     }
 
     /**
-     * store_collaborators
-     * @param type $headers 
+     * store_collaborators.
+     *
+     * @param type $headers
+     *
      * @return type
      */
-    public function storeCollaborators($headers, $id) {
+    public function storeCollaborators($headers, $id)
+    {
         $company = $this->company();
         if (isset($headers)) {
             foreach ($headers as $email => $name) {
@@ -1611,11 +1750,11 @@ class TicketController extends Controller {
                 $name = $name;
                 $email = $email;
                 if ($this->checkEmail($email) == false) {
-                    $create_user = new User;
+                    $create_user = new User();
                     $create_user->user_name = $name;
                     $create_user->email = $email;
                     $create_user->active = 1;
-                    $create_user->role = "user";
+                    $create_user->role = 'user';
                     $password = $this->generateRandomString();
                     $create_user->password = Hash::make($password);
                     $create_user->save();
@@ -1633,53 +1772,60 @@ class TicketController extends Controller {
                     try {
                         $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]);
                     } catch (\Exception $e) {
-                        
                     }
                 } else {
                     $user = $this->checkEmail($email);
                     $user_id = $user->id;
                 }
-                $collaborator_store = new Ticket_Collaborator;
+                $collaborator_store = new Ticket_Collaborator();
                 $collaborator_store->isactive = 1;
                 $collaborator_store->ticket_id = $id;
                 $collaborator_store->user_id = $user_id;
-                $collaborator_store->role = "ccc";
+                $collaborator_store->role = 'ccc';
                 $collaborator_store->save();
             }
         }
+
         return true;
     }
 
     /**
-     * company
+     * company.
+     *
      * @return type
      */
-    public function company() {
+    public function company()
+    {
         $company = Company::Where('id', '=', '1')->first();
         if ($company->company_name == null) {
-            $company = "Support Center";
+            $company = 'Support Center';
         } else {
             $company = $company->company_name;
         }
+
         return $company;
     }
 
     /**
-     * system
+     * system.
+     *
      * @return type
      */
-    public function system() {
+    public function system()
+    {
         $system = System::Where('id', '=', '1')->first();
         if ($system->name == null) {
-            $system = "Support Center";
+            $system = 'Support Center';
         } else {
             $system = $system->name;
         }
+
         return $system;
     }
 
     /**
-     * function to search
+     * function to search.
+     *
      * @return type
      */
     // public function search() {
@@ -1708,15 +1854,18 @@ class TicketController extends Controller {
     // }
 
     /**
-     * shows trashed tickets
+     * shows trashed tickets.
+     *
      * @return type response
      */
-    public function trash() {
+    public function trash()
+    {
         return view('themes.default1.agent.helpdesk.ticket.trash');
     }
 
-    public function get_trash() {
-        if (Auth::user()->role == "admin") {
+    public function get_trash()
+    {
+        if (Auth::user()->role == 'admin') {
             // $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get();
 
             $tickets = Tickets::where('status', '=', 5)->get();
@@ -1731,16 +1880,17 @@ class TicketController extends Controller {
             // $dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
             // $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get();
         }
+
         return \Datatable::collection(new Collection($tickets))
-                        ->addColumn('id', function($ticket) {
-                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='" . $ticket->id . "'></input>";
+                        ->addColumn('id', function ($ticket) {
+                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='".$ticket->id."'></input>";
                         })
-                        ->addColumn('subject', function($ticket) {
-                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', "=", $ticket->id)->first();
+                        ->addColumn('subject', function ($ticket) {
+                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first();
                             $string = $subject->title;
                             if (strlen($string) > 20) {
                                 $stringCut = substr($string, 0, 30);
-                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...';
+                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...';
                             }
                             //collabrations
                             $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get();
@@ -1757,51 +1907,56 @@ class TicketController extends Controller {
                             if ($attachCount > 0) {
                                 $attachString = '&nbsp;<i class="fa fa-paperclip"></i>';
                             } else {
-                                $attachString = "";
+                                $attachString = '';
                             }
                             //return $threads->id;
 
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $subject->title . "'>" . $string . "&nbsp;<span style='color:green'>(" . $count . ")<i class='fa fa-comment'></i></span></a>" . $collabString . $attachString;
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$subject->title."'>".$string."&nbsp;<span style='color:green'>(".$count.")<i class='fa fa-comment'></i></span></a>".$collabString.$attachString;
                         })
-                        ->addColumn('ticket_number', function($ticket) {
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $ticket->ticket_number . "'>#" . $ticket->ticket_number . "</a>";
+                        ->addColumn('ticket_number', function ($ticket) {
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$ticket->ticket_number."'>#".$ticket->ticket_number.'</a>';
                         })
-                        ->addColumn('priority', function($ticket) {
-                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', "=", $ticket->priority_id)->first();
-                            return '<span class="btn btn-' . $priority->priority_color . ' btn-xs">' . $priority->priority_desc . '</span>';
+                        ->addColumn('priority', function ($ticket) {
+                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
+
+                            return '<span class="btn btn-'.$priority->priority_color.' btn-xs">'.$priority->priority_desc.'</span>';
                             //return "loda";
                         })
-                        ->addColumn('from', function($ticket) {
-                            $from = DB::table('users')->select('user_name')->where('id', "=", $ticket->user_id)->first();
-                            return "<span style='color:#508983'>" . $from->user_name . "</span>";
+                        ->addColumn('from', function ($ticket) {
+                            $from = DB::table('users')->select('user_name')->where('id', '=', $ticket->user_id)->first();
+
+                            return "<span style='color:#508983'>".$from->user_name.'</span>';
                         })
                         ->addColumn('Last Replier', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->where('is_internal', '!=', 1)->max('id');
                             $TicketDatarow = Ticket_Thread::where('id', '=', $TicketData)->first();
                             $LastResponse = User::where('id', '=', $TicketDatarow->user_id)->first();
-                            if ($LastResponse->role == "user") {
-                                $rep = "#F39C12";
+                            if ($LastResponse->role == 'user') {
+                                $rep = '#F39C12';
                                 $username = $LastResponse->user_name;
                             } else {
-                                $rep = "#000";
-                                $username = $LastResponse->first_name . " " . $LastResponse->last_name;
+                                $rep = '#000';
+                                $username = $LastResponse->first_name.' '.$LastResponse->last_name;
                                 if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
                                     $username = $LastResponse->user_name;
                                 }
                             }
-                            return "<span style='color:" . $rep . "'>" . $username . "</span>";
+
+                            return "<span style='color:".$rep."'>".$username.'</span>';
                         })
-                        ->addColumn('assigned_to', function($ticket) {
+                        ->addColumn('assigned_to', function ($ticket) {
                             if ($ticket->assigned_to == null) {
                                 return "<span style='color:red'>Unassigned</span>";
                             } else {
-                                $assign = DB::table("users")->where('id', "=", $ticket->assigned_to)->first();
-                                return "<span style='color:green'>" . $assign->first_name . " " . $assign->last_name . "</span>";
+                                $assign = DB::table('users')->where('id', '=', $ticket->assigned_to)->first();
+
+                                return "<span style='color:green'>".$assign->first_name.' '.$assign->last_name.'</span>';
                             }
                         })
-                        ->addColumn('Last', function($ticket) {
+                        ->addColumn('Last', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
                             $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first();
+
                             return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at));
                         })
                         ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority')
@@ -1810,36 +1965,39 @@ class TicketController extends Controller {
     }
 
     /**
-     * shows unassigned tickets
+     * shows unassigned tickets.
+     *
      * @return type
      */
-    public function unassigned() {
+    public function unassigned()
+    {
         return view('themes.default1.agent.helpdesk.ticket.unassigned');
     }
 
-    public function get_unassigned() {
-        if (Auth::user()->role == "admin") {
+    public function get_unassigned()
+    {
+        if (Auth::user()->role == 'admin') {
             // $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get();
 
             $tickets = Tickets::where('assigned_to', '=', null)->where('status', '1')->get();
         } else {
-
             $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first();
             $tickets = Tickets::where('assigned_to', '=', null)->where('dept_id', '=', $dept->id)->get();
 
             // $dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
             // $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get();
         }
+
         return \Datatable::collection(new Collection($tickets))
-                        ->addColumn('id', function($ticket) {
-                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='" . $ticket->id . "'></input>";
+                        ->addColumn('id', function ($ticket) {
+                            return "<input type='checkbox' name='select_all[]' class='icheckbox_flat-blue' value='".$ticket->id."'></input>";
                         })
-                        ->addColumn('subject', function($ticket) {
-                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', "=", $ticket->id)->first();
+                        ->addColumn('subject', function ($ticket) {
+                            $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first();
                             $string = $subject->title;
                             if (strlen($string) > 20) {
                                 $stringCut = substr($string, 0, 30);
-                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...';
+                                $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...';
                             }
                             //collabrations
                             $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get();
@@ -1856,51 +2014,56 @@ class TicketController extends Controller {
                             if ($attachCount > 0) {
                                 $attachString = '&nbsp;<i class="fa fa-paperclip"></i>';
                             } else {
-                                $attachString = "";
+                                $attachString = '';
                             }
                             //return $threads->id;
 
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $subject->title . "'>" . $string . "&nbsp;<span style='color:green'>(" . $count . ")<i class='fa fa-comment'></i></span></a>" . $collabString . $attachString;
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$subject->title."'>".$string."&nbsp;<span style='color:green'>(".$count.")<i class='fa fa-comment'></i></span></a>".$collabString.$attachString;
                         })
-                        ->addColumn('ticket_number', function($ticket) {
-                            return "<a href='" . route('ticket.thread', [$ticket->id]) . "' title='" . $ticket->ticket_number . "'>#" . $ticket->ticket_number . "</a>";
+                        ->addColumn('ticket_number', function ($ticket) {
+                            return "<a href='".route('ticket.thread', [$ticket->id])."' title='".$ticket->ticket_number."'>#".$ticket->ticket_number.'</a>';
                         })
-                        ->addColumn('priority', function($ticket) {
-                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', "=", $ticket->priority_id)->first();
-                            return '<span class="btn btn-' . $priority->priority_color . ' btn-xs">' . $priority->priority_desc . '</span>';
+                        ->addColumn('priority', function ($ticket) {
+                            $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
+
+                            return '<span class="btn btn-'.$priority->priority_color.' btn-xs">'.$priority->priority_desc.'</span>';
                             //return "loda";
                         })
-                        ->addColumn('from', function($ticket) {
-                            $from = DB::table('users')->select('user_name')->where('id', "=", $ticket->user_id)->first();
-                            return "<span style='color:#508983'>" . $from->user_name . "</span>";
+                        ->addColumn('from', function ($ticket) {
+                            $from = DB::table('users')->select('user_name')->where('id', '=', $ticket->user_id)->first();
+
+                            return "<span style='color:#508983'>".$from->user_name.'</span>';
                         })
                         ->addColumn('Last Replier', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->where('is_internal', '!=', 1)->max('id');
                             $TicketDatarow = Ticket_Thread::where('id', '=', $TicketData)->first();
                             $LastResponse = User::where('id', '=', $TicketDatarow->user_id)->first();
-                            if ($LastResponse->role == "user") {
-                                $rep = "#F39C12";
+                            if ($LastResponse->role == 'user') {
+                                $rep = '#F39C12';
                                 $username = $LastResponse->user_name;
                             } else {
-                                $rep = "#000";
-                                $username = $LastResponse->first_name . " " . $LastResponse->last_name;
+                                $rep = '#000';
+                                $username = $LastResponse->first_name.' '.$LastResponse->last_name;
                                 if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
                                     $username = $LastResponse->user_name;
                                 }
                             }
-                            return "<span style='color:" . $rep . "'>" . $username . "</span>";
+
+                            return "<span style='color:".$rep."'>".$username.'</span>';
                         })
-                        ->addColumn('assigned_to', function($ticket) {
+                        ->addColumn('assigned_to', function ($ticket) {
                             if ($ticket->assigned_to == null) {
                                 return "<span style='color:red'>Unassigned</span>";
                             } else {
-                                $assign = DB::table("users")->where('id', "=", $ticket->assigned_to)->first();
-                                return "<span style='color:green'>" . $assign->first_name . " " . $assign->last_name . "</span>";
+                                $assign = DB::table('users')->where('id', '=', $ticket->assigned_to)->first();
+
+                                return "<span style='color:green'>".$assign->first_name.' '.$assign->last_name.'</span>';
                             }
                         })
-                        ->addColumn('Last', function($ticket) {
+                        ->addColumn('Last', function ($ticket) {
                             $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
                             $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first();
+
                             return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at));
                         })
                         ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority')
@@ -1909,77 +2072,96 @@ class TicketController extends Controller {
     }
 
     /**
-     * shows tickets assigned to Auth::user()
+     * shows tickets assigned to Auth::user().
+     *
      * @return type
      */
-    public function myticket() {
+    public function myticket()
+    {
         return view('themes.default1.agent.helpdesk.ticket.myticket');
     }
 
     /**
-     * cleanMe
-     * @param type $input 
+     * cleanMe.
+     *
+     * @param type $input
+     *
      * @return type
      */
-    public function cleanMe($input) {
+    public function cleanMe($input)
+    {
         $input = mysqli_real_escape_string($input);
         $input = htmlspecialchars($input, ENT_IGNORE, 'utf-8');
         $input = strip_tags($input);
         $input = stripslashes($input);
+
         return $input;
     }
 
     /**
-     * autosearch
-     * @param type Image $image 
+     * autosearch.
+     *
+     * @param type Image $image
+     *
      * @return type json
      */
-    public function autosearch($id) {
+    public function autosearch($id)
+    {
         $term = \Input::get('term');
-        $user = \App\User::where('email', 'LIKE', '%' . $term . '%')->lists('email');
+        $user = \App\User::where('email', 'LIKE', '%'.$term.'%')->lists('email');
         echo json_encode($user);
     }
 
     /**
-     * autosearch2
-     * @param type Image $image 
+     * autosearch2.
+     *
+     * @param type Image $image
+     *
      * @return type json
      */
-    public function autosearch2(User $user) {
+    public function autosearch2(User $user)
+    {
         $user = $user->lists('email');
         echo json_encode($user);
     }
 
     /**
-     * autosearch
-     * @param type Image $image 
+     * autosearch.
+     *
+     * @param type Image $image
+     *
      * @return type json
      */
-    public function usersearch() {
+    public function usersearch()
+    {
         $email = Input::get('search');
         $ticket_id = Input::get('ticket_id');
         $data = User::where('email', '=', $email)->first();
 
         $ticket_collaborator = Ticket_Collaborator::where('ticket_id', '=', $ticket_id)->where('user_id', '=', $data->id)->first();
         if (!isset($ticket_collaborator)) {
-            $ticket_collaborator = new Ticket_Collaborator;
+            $ticket_collaborator = new Ticket_Collaborator();
             $ticket_collaborator->isactive = 1;
             $ticket_collaborator->ticket_id = $ticket_id;
             $ticket_collaborator->user_id = $data->id;
             $ticket_collaborator->role = 'ccc';
             $ticket_collaborator->save();
-            return '<div id="alert11" class="alert alert-dismissable" style="color:#60B23C;background-color:#F2F2F2;"><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-check"></i>Success!</h4><h4><i class="icon fa fa-user"></i>' . $data->user_name . '</h4><div id="message-success1">' . $data->email . '</div></div>';
+
+            return '<div id="alert11" class="alert alert-dismissable" style="color:#60B23C;background-color:#F2F2F2;"><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-check"></i>Success!</h4><h4><i class="icon fa fa-user"></i>'.$data->user_name.'</h4><div id="message-success1">'.$data->email.'</div></div>';
         } else {
-            return '<div id="alert11" class="alert alert-warning alert-dismissable"><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-warning"></i>' . $data->user_name . '</h4><div id="message-success1">' . $data->email . '<br/>This user already Collaborated</div></div>';
+            return '<div id="alert11" class="alert alert-warning alert-dismissable"><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-warning"></i>'.$data->user_name.'</h4><div id="message-success1">'.$data->email.'<br/>This user already Collaborated</div></div>';
         }
     }
 
     /**
-     * useradd
-     * @param type Image $image 
+     * useradd.
+     *
+     * @param type Image $image
+     *
      * @return type json
      */
-    public function useradd() {
+    public function useradd()
+    {
         $name = Input::get('name');
         $email = Input::get('email');
         $ticket_id = Input::get('ticket_id');
@@ -1988,7 +2170,7 @@ class TicketController extends Controller {
             return '<div id="alert11" class="alert alert-warning alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-alert"></i>Alert!</h4><div id="message-success1">This user already Exists</div></div>';
         } else {
             $company = $this->company();
-            $user = new User;
+            $user = new User();
             $user->user_name = $name;
             $user->email = $email;
             $password = $this->generateRandomString();
@@ -2010,33 +2192,38 @@ class TicketController extends Controller {
 
                 $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]);
             }
-            $ticket_collaborator = new Ticket_Collaborator;
+            $ticket_collaborator = new Ticket_Collaborator();
             $ticket_collaborator->isactive = 1;
             $ticket_collaborator->ticket_id = $ticket_id;
             $ticket_collaborator->user_id = $user->id;
             $ticket_collaborator->role = 'ccc';
             $ticket_collaborator->save();
-            return '<div id="alert11" class="alert alert-dismissable" style="color:#60B23C;background-color:#F2F2F2;"><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-user"></i>' . $user->user_name . '</h4><div id="message-success1">' . $user->email . '</div></div>';
+
+            return '<div id="alert11" class="alert alert-dismissable" style="color:#60B23C;background-color:#F2F2F2;"><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-user"></i>'.$user->user_name.'</h4><div id="message-success1">'.$user->email.'</div></div>';
         }
         // return  '<div id="alert11" class="alert alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-user"></i>'.$data->user_name.'</h4><div id="message-success1">'.$data->email.'</div></div>';
     }
 
     /**
-     * user remove
+     * user remove.
+     *
      * @return type
      */
-    public function userremove() {
+    public function userremove()
+    {
         $id = Input::get('data1');
         $ticket_collaborator = Ticket_Collaborator::where('id', '=', $id)->delete();
+
         return 1;
     }
 
     /**
-     * select_all
+     * select_all.
+     *
      * @return type
      */
-    public function select_all() {
-
+    public function select_all()
+    {
         if (Input::has('select_all')) {
             $selectall = Input::get('select_all');
             // dd($selectall);
@@ -2045,15 +2232,15 @@ class TicketController extends Controller {
             foreach ($selectall as $delete) {
                 var_dump($delete);
                 $ticket = Tickets::whereId($delete)->first();
-                if ($value == "Delete") {
+                if ($value == 'Delete') {
                     $ticket->status = 5;
                     $ticket->save();
-                } elseif ($value == "Close") {
+                } elseif ($value == 'Close') {
                     $ticket->status = 2;
                     $ticket->closed = 1;
                     $ticket->closed_at = date('Y-m-d H:i:s');
                     $ticket->save();
-                } elseif ($value == "Open") {
+                } elseif ($value == 'Open') {
                     $ticket->status = 1;
                     $ticket->reopened = 1;
                     $ticket->reopened_at = date('Y-m-d H:i:s');
@@ -2063,23 +2250,27 @@ class TicketController extends Controller {
                     $ticket->save();
                 }
             }
-            if ($value == "Delete") {
+            if ($value == 'Delete') {
                 return redirect()->back()->with('success', 'Moved to trash');
-            } elseif ($value == "Close") {
+            } elseif ($value == 'Close') {
                 return redirect()->back()->with('success', 'Tickets has been Closed');
-            } elseif ($value == "Open") {
+            } elseif ($value == 'Open') {
                 return redirect()->back()->with('success', 'Ticket has been Opened');
             }
         }
+
         return redirect()->back()->with('fails', 'None Selected!');
     }
 
     /**
-     * user time zone
-     * @param type $utc 
+     * user time zone.
+     *
+     * @param type $utc
+     *
      * @return type date
      */
-    public static function usertimezone($utc) {
+    public static function usertimezone($utc)
+    {
         $set = System::whereId('1')->first();
         $timezone = Timezones::whereId($set->time_zone)->first();
         $tz = $timezone->name;
@@ -2088,15 +2279,19 @@ class TicketController extends Controller {
         $offset = date('Z', strtotime($utc));
         $format = Date_time_format::whereId($format)->first()->format;
         $date = date($format, strtotime($utc) + $offset);
+
         return $date;
     }
 
     /**
-     * lock
-     * @param type $id 
+     * lock.
+     *
+     * @param type $id
+     *
      * @return type null
      */
-    public function lock($id) {
+    public function lock($id)
+    {
         $ticket = Tickets::where('id', '=', $id)->first();
         $ticket->lock_by = Auth::user()->id;
         $ticket->lock_at = date('Y-m-d H:i:s');
@@ -2104,10 +2299,12 @@ class TicketController extends Controller {
     }
 
     /**
-     * Show the deptopen ticket list page
+     * Show the deptopen ticket list page.
+     *
      * @return type response
      */
-    public function deptopen($id) {
+    public function deptopen($id)
+    {
         $dept = Department::where('name', '=', $id)->first();
         if (Auth::user()->role == 'agent') {
             if (Auth::user()->primary_dpt == $dept->id) {
@@ -2121,10 +2318,12 @@ class TicketController extends Controller {
     }
 
     /**
-     * Show the deptclose ticket list page
+     * Show the deptclose ticket list page.
+     *
      * @return type response
      */
-    public function deptclose($id) {
+    public function deptclose($id)
+    {
         $dept = Department::where('name', '=', $id)->first();
         if (Auth::user()->role == 'agent') {
             if (Auth::user()->primary_dpt == $dept->id) {
@@ -2138,10 +2337,12 @@ class TicketController extends Controller {
     }
 
     /**
-     * Show the deptinprogress ticket list page
+     * Show the deptinprogress ticket list page.
+     *
      * @return type response
      */
-    public function deptinprogress($id) {
+    public function deptinprogress($id)
+    {
         $dept = Department::where('name', '=', $id)->first();
         if (Auth::user()->role == 'agent') {
             if (Auth::user()->primary_dpt == $dept->id) {
@@ -2155,40 +2356,51 @@ class TicketController extends Controller {
     }
 
     /**
-     * Store ratings of the user
+     * Store ratings of the user.
+     *
      * @return type Redirect
      */
-    public function rating($id, $rating) {
-        Tickets::where('id', $id)->update(array('rating' => $rating));
+    public function rating($id, $rating)
+    {
+        Tickets::where('id', $id)->update(['rating' => $rating]);
+
         return redirect()->back()->with('Success', 'Thank you for your rating!');
     }
 
     /**
-     * Store Client rating about reply of agent quality
+     * Store Client rating about reply of agent quality.
+     *
      * @return type Redirect
      */
-    public function ratingReply($id, $rating) {
-        Tickets::where('id', $id)->update(array('ratingreply' => $rating));
+    public function ratingReply($id, $rating)
+    {
+        Tickets::where('id', $id)->update(['ratingreply' => $rating]);
+
         return redirect()->back()->with('Success', 'Thank you for your rating!');
     }
 
     /**
-     * System default email
+     * System default email.
      */
-    public function system_mail() {
+    public function system_mail()
+    {
         $email = Email::where('id', '=', '1')->first();
+
         return $email->sys_email;
     }
 
     /**
      * checkLock($id)
-     * function to check and lock ticket
+     * function to check and lock ticket.
+     *
      * @param int $id
+     *
      * @return int
      */
-    public function checkLock($id) {
-        $ticket = DB::table('tickets')->select('id', 'lock_at', 'lock_by')->where('id', "=", $id)->first();
-        $cad = DB::table('settings_ticket')->select('collision_avoid')->where('id', "=", 1)->first();
+    public function checkLock($id)
+    {
+        $ticket = DB::table('tickets')->select('id', 'lock_at', 'lock_by')->where('id', '=', $id)->first();
+        $cad = DB::table('settings_ticket')->select('collision_avoid')->where('id', '=', 1)->first();
         $cad = $cad->collision_avoid; //collision avoid duration defined in system
 
         $to_time = strtotime($ticket->lock_at); //last locking time
@@ -2203,12 +2415,14 @@ class TicketController extends Controller {
             $ticket = Tickets::where('id', '=', $id)->first();
             $ticket->lock_at = date('Y-m-d H:i:s');
             $ticket->save();
+
             return 4;  //ticket is locked by same user who is requesting access
         } else {
             if (Auth::user()->id == $ticket->lock_by) {
                 $ticket = Tickets::where('id', '=', $id)->first();
                 $ticket->lock_at = date('Y-m-d H:i:s');
                 $ticket->save();
+
                 return 1; //ticket is available and lock ticket for the same user who locked ticket previously
             } else {
                 $ticket = Tickets::where('id', '=', $id)->first();
@@ -2220,45 +2434,46 @@ class TicketController extends Controller {
         }
     }
 
-
     /**
-     * function to Change owner
+     * function to Change owner.
+     *
      * @param type $id
+     *
      * @return type bool
      */
-    public function changeOwner($id) {
+    public function changeOwner($id)
+    {
         $action = Input::get('action');
-        $email = Input::get('email');   
+        $email = Input::get('email');
         $ticket_id = Input::get('ticket_id');
         $send_mail = Input::get('send-mail');
-        
-        if($action === 'change-add-owner'){
+
+        if ($action === 'change-add-owner') {
             $name = Input::get('name');
-            $returnValue = $this->changeOwnerAdd($email,$name,$ticket_id);
-            if($returnValue === 0) {
-                return 4;//'<div id="alert11" class="alert alert-warning alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-alert"></i>Alert!</h4><div id="message-success1">This user already Exists</div></div>';
+            $returnValue = $this->changeOwnerAdd($email, $name, $ticket_id);
+            if ($returnValue === 0) {
+                return 4; //'<div id="alert11" class="alert alert-warning alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-alert"></i>Alert!</h4><div id="message-success1">This user already Exists</div></div>';
             } elseif ($returnValue === 2) {
-                return 5;//'<div id="alert11" class="alert alert-warning alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-alert"></i>Alert!</h4><div id="message-success1">Enter valid email address.</div></div>';
-            } else{
+                return 5; //'<div id="alert11" class="alert alert-warning alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-alert"></i>Alert!</h4><div id="message-success1">Enter valid email address.</div></div>';
+            } else {
                 //do nothing
             }
         }
-        $user = User::where('email','=',$email)->first();
+        $user = User::where('email', '=', $email)->first();
         $count = count($user);
-        if($count === 1) {
-
+        if ($count === 1) {
             $user_id = $user->id;
             $ticket = Tickets::where('id', '=', $id)->first();
             $ticket_number = $ticket->ticket_number;
             $ticket->user_id = $user_id;
             $ticket->save();
-            $ticket_thread = Ticket_Thread::where('ticket_id','=',$id)->first();
+            $ticket_thread = Ticket_Thread::where('ticket_id', '=', $id)->first();
             $ticket_subject = $ticket_thread->title;
-            $thread = New Ticket_Thread;
+            $thread = new Ticket_Thread();
             $thread->ticket_id = $ticket->id;
             $thread->user_id = Auth::user()->id;
             $thread->is_internal = 1;
-            $thread->body = "This ticket now belongs to " . $user->user_name;
+            $thread->body = 'This ticket now belongs to '.$user->user_name;
             $thread->save();
 
             //mail functionality
@@ -2268,11 +2483,11 @@ class TicketController extends Controller {
             $agent = $user->first_name;
             $agent_email = $user->email;
 
-            $master = Auth::user()->first_name . " " . Auth::user()->last_name;
-            if(Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) {
+            $master = Auth::user()->first_name.' '.Auth::user()->last_name;
+            if (Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) {
                 // ticket assigned send mail
-                Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from'=>$company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) {
-                        $message->to($agent_email, $agent)->subject($ticket_subject.'[#' . $ticket_number . ']');
+                Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from' => $company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) {
+                        $message->to($agent_email, $agent)->subject($ticket_subject.'[#'.$ticket_number.']');
                     });
             }
 
@@ -2283,30 +2498,31 @@ class TicketController extends Controller {
     }
 
     /** 
-     * useradd
-     * @param type Image $image 
+     * useradd.
+     *
+     * @param type Image $image
+     *
      * @return type json
      */
-    public function changeOwnerAdd($email,$name,$ticket_id)
+    public function changeOwnerAdd($email, $name, $ticket_id)
     {
         $name = $name;
         $email = $email;
-        $ticket_id = $ticket_id;    
+        $ticket_id = $ticket_id;
         $validator = \Validator::make(
             ['email' => $email,
-             'name' => $name,],
+             'name'  => $name, ],
             ['email' => 'required|email',
             ]);
-        $user = User::where('email','=',$email)->first();
+        $user = User::where('email', '=', $email)->first();
         $count = count($user);
-        if($count === 1) {
-            return  0;//'<div id="alert11" class="alert alert-warning alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-alert"></i>Alert!</h4><div id="message-success1">This user already Exists</div></div>';
-        } elseif($validator->fails()){
-            return 2;//'<div id="alert11" class="alert alert-warning alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-alert"></i>Alert!</h4><div id="message-success1">Enter valid email address. Exists</div></div>';
-
-        } else  {
+        if ($count === 1) {
+            return  0; //'<div id="alert11" class="alert alert-warning alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-alert"></i>Alert!</h4><div id="message-success1">This user already Exists</div></div>';
+        } elseif ($validator->fails()) {
+            return 2; //'<div id="alert11" class="alert alert-warning alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-alert"></i>Alert!</h4><div id="message-success1">Enter valid email address. Exists</div></div>';
+        } else {
             $company = $this->company();
-            $user = new User;
+            $user = new User();
             $user->user_name = $name;
             $user->email = $email;
             $password = $this->generateRandomString();
@@ -2314,16 +2530,15 @@ class TicketController extends Controller {
             $user->role = 'user';
             if ($user->save()) {
                 $user_id = $user->id;
-                  try {
-                        $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]);
-                    } catch (\Exception $e) {
-                        dd($e);
-                    }
+                try {
+                    $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]);
+                } catch (\Exception $e) {
+                    dd($e);
+                }
             }
-            return 1;// '<div id="alert11" class="alert alert-dismissable" style="color:#60B23C;background-color:#F2F2F2;"><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-user"></i>'.$user->user_name.'</h4><div id="message-success1">'.$user->email.'</div></div>';
+
+            return 1; // '<div id="alert11" class="alert alert-dismissable" style="color:#60B23C;background-color:#F2F2F2;"><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-user"></i>'.$user->user_name.'</h4><div id="message-success1">'.$user->email.'</div></div>';
         }
         // return  '<div id="alert11" class="alert alert-dismissable" ><button id="dismiss11" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4><i class="icon fa fa-user"></i>'.$data->user_name.'</h4><div id="message-success1">'.$data->email.'</div></div>';
     }
-
-
 }
diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php
index f9c9116d1..b8376c49e 100644
--- a/app/Http/Controllers/Agent/helpdesk/UserController.php
+++ b/app/Http/Controllers/Agent/helpdesk/UserController.php
@@ -19,30 +19,30 @@ use App\Model\helpdesk\Agent_panel\User_org;
 use App\User;
 // classes
 use Auth;
+use Exception;
 use Hash;
 use Input;
 use Redirect;
-use Exception;
 
 /**
  * UserController
- * This controller is used to CRUD an User details, and proile management of an agent
+ * This controller is used to CRUD an User details, and proile management of an agent.
  *
- * @package   Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class UserController extends Controller {
-
+class UserController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         // checking authentication
         $this->middleware('auth');
         // checking if role is agent
@@ -51,10 +51,13 @@ class UserController extends Controller {
 
     /**
      * Display all list of the users.
+     *
      * @param type User $user
+     *
      * @return type view
      */
-    public function index() {
+    public function index()
+    {
         try {
             /* get all values in Sys_user */
             return view('themes.default1.agent.helpdesk.user.index');
@@ -64,10 +67,12 @@ class UserController extends Controller {
     }
 
     /**
-     * This function is used to display the list of users using chumper datatables
+     * This function is used to display the list of users using chumper datatables.
+     *
      * @return datatable
      */
-    public function user_list() {
+    public function user_list()
+    {
         // displaying list of users with chumper datatables
         return \Datatable::collection(User::where('role', '!=', 'admin')->where('role', '!=', 'agent')->get())
                         /* searchable column username */
@@ -78,28 +83,31 @@ class UserController extends Controller {
                         ->addColumn('user_name', function ($model) {
                             if (strlen($model->user_name) > 20) {
                                 $username = substr($model->user_name, 0, 30);
-                                $username = substr($username, 0, strrpos($username, ' ')) . ' ...';
+                                $username = substr($username, 0, strrpos($username, ' ')).' ...';
                             } else {
                                 $username = $model->user_name;
                             }
+
                             return $username;
                         })
                         /* column email */
                         ->addColumn('email', function ($model) {
                             $email = $model->email;
+
                             return $email;
                         })
                         /* column phone */
                         ->addColumn('phone', function ($model) {
-                            $phone = "";
+                            $phone = '';
                             if ($model->phone_number) {
-                                $phone = $model->ext . ' ' . $model->phone_number;
+                                $phone = $model->ext.' '.$model->phone_number;
                             }
-                            $mobile = "";
+                            $mobile = '';
                             if ($model->mobile) {
                                 $mobile = $model->mobile;
                             }
-                            $phone = $phone . "&nbsp;&nbsp;&nbsp;" . $mobile;
+                            $phone = $phone.'&nbsp;&nbsp;&nbsp;'.$mobile;
+
                             return $phone;
                         })
                         /* column account status */
@@ -110,6 +118,7 @@ class UserController extends Controller {
                             } else {
                                 $stat = '<button class="btn btn-danger btn-xs">Inactive</button>';
                             }
+
                             return $stat;
                         })
                         /* column ban status */
@@ -120,25 +129,29 @@ class UserController extends Controller {
                             } else {
                                 $stat = '<button class="btn btn-success btn-xs">Active</button>';
                             }
+
                             return $stat;
                         })
                         /* column last login date */
                         ->addColumn('lastlogin', function ($model) {
                             $t = $model->updated_at;
+
                             return TicketController::usertimezone($t);
                         })
                         /* column actions */
                         ->addColumn('Actions', function ($model) {
-                            return '<a href="' . route('user.edit', $model->id) . '" class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp; <a href="' . route('user.show', $model->id) . '" class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>';
+                            return '<a href="'.route('user.edit', $model->id).'" class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp; <a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>';
                         })
                         ->make();
     }
 
     /**
      * Show the form for creating a new users.
+     *
      * @return type view
      */
-    public function create() {
+    public function create()
+    {
         try {
             return view('themes.default1.agent.helpdesk.user.create');
         } catch (Exception $e) {
@@ -148,11 +161,14 @@ class UserController extends Controller {
 
     /**
      * Store a newly created users in storage.
-     * @param type User $user
+     *
+     * @param type User            $user
      * @param type Sys_userRequest $request
+     *
      * @return type redirect
      */
-    public function store(User $user, Sys_userRequest $request) {
+    public function store(User $user, Sys_userRequest $request)
+    {
         /* insert the input request to sys_user table */
         /* Check whether function success or not */
         $user->email = $request->input('email');
@@ -175,14 +191,18 @@ class UserController extends Controller {
 
     /**
      * Display the specified users.
+     *
      * @param type int  $id
      * @param type User $user
+     *
      * @return type view
      */
-    public function show($id, User $user) {
+    public function show($id, User $user)
+    {
         try {
             /* select the field where id = $id(request Id) */
             $users = $user->whereId($id)->first();
+
             return view('themes.default1.agent.helpdesk.user.show', compact('users'));
         } catch (Exception $e) {
             return view('404');
@@ -191,14 +211,18 @@ class UserController extends Controller {
 
     /**
      * Show the form for editing the specified resource.
-     * @param type int $id
+     *
+     * @param type int  $id
      * @param type User $user
+     *
      * @return type Response
      */
-    public function edit($id, User $user) {
+    public function edit($id, User $user)
+    {
         try {
             /* select the field where id = $id(request Id) */
             $users = $user->whereId($id)->first();
+
             return view('themes.default1.agent.helpdesk.user.edit', compact('users'));
         } catch (Exception $e) {
             return redirect()->back()->with('fails', $e->errorInfo[2]);
@@ -207,12 +231,15 @@ class UserController extends Controller {
 
     /**
      * Update the specified user in storage.
-     * @param type int $id
-     * @param type User $user
+     *
+     * @param type int            $id
+     * @param type User           $user
      * @param type Sys_userUpdate $request
+     *
      * @return type Response
      */
-    public function update($id, User $user, Sys_userUpdate $request) {
+    public function update($id, User $user, Sys_userUpdate $request)
+    {
 
         /* select the field where id = $id(request Id) */
         $users = $user->whereId($id)->first();
@@ -229,10 +256,12 @@ class UserController extends Controller {
     }
 
     /**
-     * get agent profile page
+     * get agent profile page.
+     *
      * @return type view
      */
-    public function getProfile() {
+    public function getProfile()
+    {
         $user = Auth::user();
         try {
             return view('themes.default1.agent.helpdesk.user.profile', compact('user'));
@@ -242,10 +271,12 @@ class UserController extends Controller {
     }
 
     /**
-     * get profile edit page
+     * get profile edit page.
+     *
      * @return type view
      */
-    public function getProfileedit() {
+    public function getProfileedit()
+    {
         $user = Auth::user();
         try {
             return view('themes.default1.agent.helpdesk.user.profile-edit', compact('user'));
@@ -255,12 +286,15 @@ class UserController extends Controller {
     }
 
     /**
-     * post profile edit
-     * @param type int $id
+     * post profile edit.
+     *
+     * @param type int            $id
      * @param type ProfileRequest $request
+     *
      * @return type Redirect
      */
-    public function postProfileedit(ProfileRequest $request) {
+    public function postProfileedit(ProfileRequest $request)
+    {
         // geet authenticated user details
         $user = Auth::user();
         $user->gender = $request->input('gender');
@@ -284,7 +318,7 @@ class UserController extends Controller {
             // fetching upload destination path
             $destinationPath = 'lb-faveo/media/profilepic';
             // adding a random value to profile picture filename
-            $fileName = rand(0000, 9999) . '.' . $name;
+            $fileName = rand(0000, 9999).'.'.$name;
             // moving the picture to a destination folder
             Input::file('profile_pic')->move($destinationPath, $fileName);
             // saving filename to database
@@ -292,6 +326,7 @@ class UserController extends Controller {
         } else {
             try {
                 $user->fill($request->except('profile_pic', 'gender'))->save();
+
                 return Redirect::route('profile')->with('success', 'Profile Updated sucessfully');
             } catch (Exception $e) {
                 return Redirect::route('profile')->with('success', $e->errorInfo[2]);
@@ -303,19 +338,23 @@ class UserController extends Controller {
     }
 
     /**
-     * Post profile password
-     * @param type int $id
+     * Post profile password.
+     *
+     * @param type int             $id
      * @param type ProfilePassword $request
+     *
      * @return type Redirect
      */
-    public function postProfilePassword($id, ProfilePassword $request) {
-        // get authenticated user 
+    public function postProfilePassword($id, ProfilePassword $request)
+    {
+        // get authenticated user
         $user = Auth::user();
         // checking if the old password matches the new password
         if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
             $user->password = Hash::make($request->input('new_password'));
             try {
                 $user->save();
+
                 return redirect('profile-edit')->with('success1', 'Password Updated sucessfully');
             } catch (Exception $e) {
                 return redirect('profile-edit')->with('fails', $e->errorInfo[2]);
@@ -326,25 +365,32 @@ class UserController extends Controller {
     }
 
     /**
-     * Assigning an user to an organization
-     * @param type $id 
+     * Assigning an user to an organization.
+     *
+     * @param type $id
+     *
      * @return type boolean
      */
-    public function UserAssignOrg($id) {
+    public function UserAssignOrg($id)
+    {
         $org = Input::get('org');
-        $user_org = new User_org;
+        $user_org = new User_org();
         $user_org->org_id = $org;
         $user_org->user_id = $id;
         $user_org->save();
+
         return 1;
     }
 
     /**
-     * creating an organization in user profile page via modal popup
-     * @param type $id 
+     * creating an organization in user profile page via modal popup.
+     *
+     * @param type $id
+     *
      * @return type
      */
-    public function User_Create_Org($id) {
+    public function User_Create_Org($id)
+    {
         // checking if the entered value for website is available in database
         if (Input::get('website') != null) {
             // checking website
@@ -356,14 +402,14 @@ class UserController extends Controller {
         $check2 = Organization::where('name', '=', Input::get('name'))->first();
         // if any of the fields is not available then return false
         if (\Input::get('name') == null) {
-            return "Name is required";
+            return 'Name is required';
         } elseif ($check2 != null) {
-            return "Name should be Unique";
+            return 'Name should be Unique';
         } elseif ($check != null) {
-            return "Website should be Unique";
+            return 'Website should be Unique';
         } else {
             // storing organization details and assigning the current user to that organization
-            $org = new Organization;
+            $org = new Organization();
             $org->name = Input::get('name');
             $org->phone = Input::get('phone');
             $org->website = Input::get('website');
@@ -371,7 +417,7 @@ class UserController extends Controller {
             $org->internal_notes = Input::get('internal');
             $org->save();
 
-            $user_org = new User_org;
+            $user_org = new User_org();
             $user_org->org_id = $org->id;
             $user_org->user_id = $id;
             $user_org->save();
@@ -379,5 +425,4 @@ class UserController extends Controller {
             return 0;
         }
     }
-
 }
diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php
index 2d090a481..337bbe430 100644
--- a/app/Http/Controllers/Agent/kb/ArticleController.php
+++ b/app/Http/Controllers/Agent/kb/ArticleController.php
@@ -3,47 +3,46 @@
 namespace App\Http\Controllers\Agent\kb;
 
 // Controllers
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Agent\kb\SettingsController;
-use App\Http\Controllers\Client\kb\UserController;
 use App\Http\Controllers\Agent\helpdesk\TicketController;
+
+use App\Http\Controllers\Controller;
 // Requests
 use App\Http\Requests\kb\ArticleRequest;
 use App\Http\Requests\kb\ArticleUpdate;
 // Models
 use App\Model\kb\Article;
 use App\Model\kb\Category;
+use App\Model\kb\Comment;
 use App\Model\kb\Relationship;
 use App\Model\kb\Settings;
-use App\Model\kb\Comment;
 // Classes
 use Auth;
 use Chumper\Datatable\Table;
 use Datatable;
 use DB;
+use Exception;
 use Illuminate\Http\Request;
 use Redirect;
-use Exception;
 
 /**
  * ArticleController
- * This controller is used to CRUD Articles
+ * This controller is used to CRUD Articles.
  *
- * @package 	Controllers
- * @subpackage 	Controller
  * @author     	Ladybird <info@ladybirdweb.com>
  */
-class ArticleController extends Controller {
-
+class ArticleController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         // checking authentication
         $this->middleware('auth');
         // checking roles
@@ -51,16 +50,19 @@ class ArticleController extends Controller {
         SettingsController::language();
     }
 
-    public function test() {
+    public function test()
+    {
         //$table = $this->setDatatable();
         return view('themes.default1.agent.kb.article.test');
     }
 
     /**
-     * Fetching all the list of articles in a chumper datatable format
+     * Fetching all the list of articles in a chumper datatable format.
+     *
      * @return type void
      */
-    public function getData() {
+    public function getData()
+    {
         // returns chumper datatable
         return Datatable::collection(Article::All())
                         /* searcable column name */
@@ -74,13 +76,14 @@ class ArticleController extends Controller {
                         /* add column Created */
                         ->addColumn('Created', function ($model) {
                             $t = $model->created_at;
+
                             return TicketController::usertimezone($t);
                         })
                         /* add column action */
                         ->addColumn('Actions', function ($model) {
                             /* here are all the action buttons and modal popup to delete articles with confirmations */
-                            return '<span  data-toggle="modal" data-target="#deletearticle' . $model->id . '"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . ' </button></span>&nbsp;<a href=article/' . $model->id . '/edit class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href=show/' . $model->slug . ' class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
-				<div class="modal fade" id="deletearticle' . $model->id . '">
+                            return '<span  data-toggle="modal" data-target="#deletearticle'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').' </button></span>&nbsp;<a href=article/'.$model->id.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=show/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
+				<div class="modal fade" id="deletearticle'.$model->id.'">
         			<div class="modal-dialog">
             			<div class="modal-content">
                 			<div class="modal-header">
@@ -88,11 +91,11 @@ class ArticleController extends Controller {
                     			<h4 class="modal-title">Are You Sure ?</h4>
                 			</div>
                 			<div class="modal-body">
-                				' . $model->name . '
+                				'.$model->name.'
                 			</div>
                 			<div class="modal-footer">
                     			<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
-                    			<a href="article/delete/' . $model->slug . '"><button class="btn btn-danger">delete</button></a>
+                    			<a href="article/delete/'.$model->slug.'"><button class="btn btn-danger">delete</button></a>
                 			</div>
             			</div><!-- /.modal-content -->
         			</div><!-- /.modal-dialog -->
@@ -102,10 +105,12 @@ class ArticleController extends Controller {
     }
 
     /**
-     * List of Articles
+     * List of Articles.
+     *
      * @return type view
      */
-    public function index() {
+    public function index()
+    {
         /* show article list */
         try {
             return view('themes.default1.agent.kb.article.index');
@@ -115,11 +120,14 @@ class ArticleController extends Controller {
     }
 
     /**
-     * Creating a Article
+     * Creating a Article.
+     *
      * @param type Category $category
+     *
      * @return type view
      */
-    public function create(Category $category) {
+    public function create(Category $category)
+    {
         /* get the attributes of the category */
         $category = $category->lists('id', 'name');
         /* get the create page  */
@@ -131,17 +139,20 @@ class ArticleController extends Controller {
     }
 
     /**
-     * Insert the values to the article
-     * @param type Article $article
+     * Insert the values to the article.
+     *
+     * @param type Article        $article
      * @param type ArticleRequest $request
+     *
      * @return type redirect
      */
-    public function store(Article $article, ArticleRequest $request) {
+    public function store(Article $article, ArticleRequest $request)
+    {
         // requesting the values to store article data
-        $publishTime = $request->input('year') . '-' . $request->input('month') . '-' . $request->input('day') . ' ' . $request->input('hour') . ':' . $request->input('minute') . ':00';
+        $publishTime = $request->input('year').'-'.$request->input('month').'-'.$request->input('day').' '.$request->input('hour').':'.$request->input('minute').':00';
 
         $sl = $request->input('slug');
-        $slug = str_slug($sl, "-");
+        $slug = str_slug($sl, '-');
         $article->slug = $slug;
         $article->publish_time = $publishTime;
         $article->fill($request->except('created_at', 'slug'))->save();
@@ -155,21 +166,25 @@ class ArticleController extends Controller {
         /* insert the values to the article table  */
         try {
             $article->fill($request->except('slug'))->save();
+
             return redirect('article')->with('success', 'Article Inserted Successfully');
         } catch (Exception $e) {
-            return redirect('article')->with('fails', 'Article Not Inserted' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('article')->with('fails', 'Article Not Inserted'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
-     * Edit an Article by id
-     * @param type Integer $id
-     * @param type Article $article
+     * Edit an Article by id.
+     *
+     * @param type Integer      $id
+     * @param type Article      $article
      * @param type Relationship $relation
-     * @param type Category $category
+     * @param type Category     $category
+     *
      * @return view
      */
-    public function edit($slug, Article $article, Relationship $relation, Category $category) {
+    public function edit($slug, Article $article, Relationship $relation, Category $category)
+    {
         $aid = $article->where('id', $slug)->first();
         $id = $aid->id;
         /* define the selected fields */
@@ -188,20 +203,23 @@ class ArticleController extends Controller {
     }
 
     /**
-     * Update an Artile by id
-     * @param type Integer $id
-     * @param type Article $article
-     * @param type Relationship $relation
+     * Update an Artile by id.
+     *
+     * @param type Integer        $id
+     * @param type Article        $article
+     * @param type Relationship   $relation
      * @param type ArticleRequest $request
+     *
      * @return Response
      */
-    public function update($slug, Article $article, Relationship $relation, ArticleUpdate $request) {
+    public function update($slug, Article $article, Relationship $relation, ArticleUpdate $request)
+    {
         $aid = $article->where('id', $slug)->first();
-        $publishTime = $request->input('year') . '-' . $request->input('month') . '-' . $request->input('day') . ' ' . $request->input('hour') . ':' . $request->input('minute') . ':00';
+        $publishTime = $request->input('year').'-'.$request->input('month').'-'.$request->input('day').' '.$request->input('hour').':'.$request->input('minute').':00';
 
         $id = $aid->id;
         $sl = $request->input('slug');
-        $slug = str_slug($sl, "-");
+        $slug = str_slug($sl, '-');
         // dd($slug);
 
         $article->slug = $slug;
@@ -221,26 +239,31 @@ class ArticleController extends Controller {
             $article->slug = $slug;
             $article->publish_time = $publishTime;
             $article->save();
+
             return redirect('article')->with('success', 'Article Updated Successfully');
         } catch (Exception $e) {
-            return redirect('article')->with('fails', 'Article Not Updated' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('article')->with('fails', 'Article Not Updated'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
-     * Delete an Agent by id
-     * @param type $id
+     * Delete an Agent by id.
+     *
+     * @param type         $id
      * @param type Article $article
+     *
      * @return Response
      */
-    public function destroy($slug, Article $article, Relationship $relation, Comment $comment) {
+    public function destroy($slug, Article $article, Relationship $relation, Comment $comment)
+    {
         /* delete the selected article from the table */
         $article = $article->where('slug', $slug)->first(); //get the selected article via id
         $id = $article->id;
         $comments = $comment->where('article_id', $id)->get();
         if ($comments) {
-            foreach ($comments as $comment)
+            foreach ($comments as $comment) {
                 $comment->delete();
+            }
         }
         // deleting relationship
         $relation = $relation->where('article_id', $id)->first();
@@ -260,11 +283,14 @@ class ArticleController extends Controller {
 
     /**
      * user time zone
-     * fetching timezone
+     * fetching timezone.
+     *
      * @param type $utc
+     *
      * @return type
      */
-    static function usertimezone($utc) {
+    public static function usertimezone($utc)
+    {
         $user = Auth::user();
         $tz = $user->timezone;
         $set = Settings::whereId('1')->first();
@@ -275,5 +301,4 @@ class ArticleController extends Controller {
         $date = date($format, strtotime($utc) + $offset);
         echo $date;
     }
-
 }
diff --git a/app/Http/Controllers/Agent/kb/CategoryController.php b/app/Http/Controllers/Agent/kb/CategoryController.php
index 6ed6ee6b8..d5202a44a 100644
--- a/app/Http/Controllers/Agent/kb/CategoryController.php
+++ b/app/Http/Controllers/Agent/kb/CategoryController.php
@@ -3,11 +3,8 @@
 namespace App\Http\Controllers\Agent\kb;
 
 // Controllers
-use App\Http\Controllers\client\kb\UserController;
-use App\Http\Controllers\admin\kb\ArticleController;
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Agent\kb\SettingsController;
 use App\Http\Controllers\Agent\helpdesk\TicketController;
+use App\Http\Controllers\Controller;
 // Requests
 use App\Http\Requests\kb\CategoryRequest;
 use App\Http\Requests\kb\CategoryUpdate;
@@ -16,28 +13,28 @@ use App\Model\kb\Category;
 use App\Model\kb\Relationship;
 // Classes
 use Datatable;
-use Redirect;
 use Exception;
+use Redirect;
 
 /**
  * CategoryController
- * This controller is used to CRUD category 
+ * This controller is used to CRUD category.
  *
- * @package 	Controllers
- * @subpackage 	Controller
  * @author     	Ladybird <info@ladybirdweb.com>
  */
-class CategoryController extends Controller {
-
+class CategoryController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         // checking authentication
         $this->middleware('auth');
         // checking roles
@@ -46,11 +43,14 @@ class CategoryController extends Controller {
     }
 
     /**
-     * Indexing all Category
+     * Indexing all Category.
+     *
      * @param type Category $category
+     *
      * @return Response
      */
-    public function index() {
+    public function index()
+    {
         /*  get the view of index of the catogorys with all attributes
           of category model */
         try {
@@ -61,10 +61,12 @@ class CategoryController extends Controller {
     }
 
     /**
-     * fetching category list in chumper datatables
+     * fetching category list in chumper datatables.
+     *
      * @return type chumper datatable
      */
-    public function getData() {
+    public function getData()
+    {
         /* fetching chumper datatables */
         return Datatable::collection(Category::All())
                         /* search column name */
@@ -78,13 +80,14 @@ class CategoryController extends Controller {
                         /* add column Created */
                         ->addColumn('Created', function ($model) {
                             $t = $model->created_at;
+
                             return TicketController::usertimezone($t);
                         })
                         /* add column Actions */
                         /* there are action buttons and modal popup to delete a data column */
                         ->addColumn('Actions', function ($model) {
-                            return '<span  data-toggle="modal" data-target="#deletecategory' . $model->slug . '"><a href="#" ><button class="btn btn-danger btn-xs"></a>' . \Lang::get("lang.delete") . '</button></span>&nbsp;<a href=category/' . $model->id . '/edit class="btn btn-warning btn-xs">' . \Lang::get("lang.edit") . '</a>&nbsp;<a href=article-list class="btn btn-primary btn-xs">' . \Lang::get("lang.view") . '</a>
-				<div class="modal fade" id="deletecategory' . $model->slug . '">
+                            return '<span  data-toggle="modal" data-target="#deletecategory'.$model->slug.'"><a href="#" ><button class="btn btn-danger btn-xs"></a>'.\Lang::get('lang.delete').'</button></span>&nbsp;<a href=category/'.$model->id.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=article-list class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
+				<div class="modal fade" id="deletecategory'.$model->slug.'">
         			<div class="modal-dialog">
             			<div class="modal-content">
                 			<div class="modal-header">
@@ -92,11 +95,11 @@ class CategoryController extends Controller {
                     			<h4 class="modal-title">Are You Sure ?</h4>
                 			</div>
                 			<div class="modal-body">
-                				' . $model->name . '
+                				'.$model->name.'
                 			</div>
                 			<div class="modal-footer">
                     			<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
-                    			<a href="category/delete/' . $model->id . '"><button class="btn btn-danger">delete</button></a>
+                    			<a href="category/delete/'.$model->id.'"><button class="btn btn-danger">delete</button></a>
                 			</div>
             			</div>
         			</div>
@@ -106,11 +109,14 @@ class CategoryController extends Controller {
     }
 
     /**
-     * Create a Category
+     * Create a Category.
+     *
      * @param type Category $category
+     *
      * @return type view
      */
-    public function create(Category $category) {
+    public function create(Category $category)
+    {
         /* Get the all attributes in the category model */
         $category = $category->get();
         /* get the view page to create new category with all attributes
@@ -123,32 +129,39 @@ class CategoryController extends Controller {
     }
 
     /**
-     * To store the selected category
-     * @param type Category $category 
-     * @param type CategoryRequest $request 
+     * To store the selected category.
+     *
+     * @param type Category        $category
+     * @param type CategoryRequest $request
+     *
      * @return type Redirect
      */
-    public function store(Category $category, CategoryRequest $request) {
+    public function store(Category $category, CategoryRequest $request)
+    {
         /* Get the whole request from the form and insert into table via model */
         $sl = $request->input('slug');
-        $slug = str_slug($sl, "-");
+        $slug = str_slug($sl, '-');
         $category->slug = $slug;
         // send success message to index page
         try {
             $category->fill($request->except('slug'))->save();
+
             return Redirect::back()->with('success', 'Category Inserted Successfully');
         } catch (Exception $e) {
-            return Redirect::back()->with('fails', 'Category Not Inserted' . '<li>' . $e->errorInfo[2] . '</li>');
+            return Redirect::back()->with('fails', 'Category Not Inserted'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Show the form for editing the specified category.
-     * @param type $slug 
-     * @param type Category $category 
+     *
+     * @param type          $slug
+     * @param type Category $category
+     *
      * @return type view
      */
-    public function edit($slug, Category $category) {
+    public function edit($slug, Category $category)
+    {
         // fetch the category
         $cid = $category->where('id', $slug)->first();
         $id = $cid->id;
@@ -160,17 +173,20 @@ class CategoryController extends Controller {
 
     /**
      * Update the specified Category in storage.
-     * @param type $slug 
-     * @param type Category $category 
-     * @param type CategoryUpdate $request 
+     *
+     * @param type                $slug
+     * @param type Category       $category
+     * @param type CategoryUpdate $request
+     *
      * @return type redirect
      */
-    public function update($slug, Category $category, CategoryUpdate $request) {
+    public function update($slug, Category $category, CategoryUpdate $request)
+    {
 
         /* Edit the selected category via id */
         $category = $category->where('id', $slug)->first();
         $sl = $request->input('slug');
-        $slug = str_slug($sl, "-");
+        $slug = str_slug($sl, '-');
         // dd($slug);
         $category->slug = $slug;
         /* update the values at the table via model according with the request */
@@ -179,22 +195,25 @@ class CategoryController extends Controller {
             $category->fill($request->all())->save();
             $category->slug = $slug;
             $category->save();
+
             return redirect('category')->with('success', 'Category Updated Successfully');
         } catch (Exception $e) {
             //redirect to index with fails message
-            return redirect('category')->with('fails', 'Category Not Updated' . '<li>' . $e->errorInfo[2] . '</li>');
+            return redirect('category')->with('fails', 'Category Not Updated'.'<li>'.$e->errorInfo[2].'</li>');
         }
     }
 
     /**
      * Remove the specified category from storage.
-     * @param type $id 
-     * @param type Category $category 
-     * @param type Relationship $relation 
+     *
+     * @param type              $id
+     * @param type Category     $category
+     * @param type Relationship $relation
+     *
      * @return type Redirect
      */
-    public function destroy($id, Category $category, Relationship $relation) {
-
+    public function destroy($id, Category $category, Relationship $relation)
+    {
         $relation = $relation->where('category_id', $id)->first();
         if ($relation != null) {
             return Redirect::back()->with('fails', 'Category Not Deleted');
@@ -204,11 +223,11 @@ class CategoryController extends Controller {
             // redirect to index with success message
             try {
                 $category->delete();
+
                 return Redirect::back()->with('success', 'Category Deleted Successfully');
             } catch (Exception $e) {
-                return Redirect::back()->with('fails', 'Category Not Deleted' . '<li>' . $e->errorInfo[2] . '</li>');
+                return Redirect::back()->with('fails', 'Category Not Deleted'.'<li>'.$e->errorInfo[2].'</li>');
             }
         }
     }
-
 }
diff --git a/app/Http/Controllers/Agent/kb/PageController.php b/app/Http/Controllers/Agent/kb/PageController.php
index 1860938c4..45ca6b11e 100644
--- a/app/Http/Controllers/Agent/kb/PageController.php
+++ b/app/Http/Controllers/Agent/kb/PageController.php
@@ -2,41 +2,37 @@
 
 namespace App\Http\Controllers\Agent\kb;
 
-// controllers
-use App\Http\Controllers\client\kb\UserController;
-use App\Http\Controllers\Agent\kb\ArticleController;
+// controllersuse App\Http\Controllers\Agent\helpdesk\TicketController;
 use App\Http\Controllers\Controller;
-use App\Http\Controllers\Agent\kb\SettingsController;
-use App\Http\Controllers\Agent\helpdesk\TicketController;
 // request
 use App\Http\Requests\kb\PageRequest;
 use App\Http\Requests\kb\PageUpdate;
-use Illuminate\Http\Request;
-// Model
 use App\Model\kb\Page;
-// classes
+// Model
 use Datatable;
+// classes
 use Exception;
+use Illuminate\Http\Request;
 
 /**
  * PageController
- * This controller is used to CRUD Pages
+ * This controller is used to CRUD Pages.
  *
- * @package 	Controllers
- * @subpackage 	Controller
  * @author     	Ladybird <info@ladybirdweb.com>
  */
-class PageController extends Controller {
-
+class PageController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
+     *
      * @return void
      */
-    public function __construct(Page $page) {
+    public function __construct(Page $page)
+    {
         // checking authentication
         $this->middleware('auth');
         // checking roles
@@ -46,10 +42,12 @@ class PageController extends Controller {
     }
 
     /**
-     * Display the list of pages
+     * Display the list of pages.
+     *
      * @return type
      */
-    public function index() {
+    public function index()
+    {
         $pages = $this->page->paginate(3);
         $pages->setPath('page');
         try {
@@ -60,10 +58,12 @@ class PageController extends Controller {
     }
 
     /**
-     * fetching pages list in chumper datatables
+     * fetching pages list in chumper datatables.
+     *
      * @return type
      */
-    public function getData() {
+    public function getData()
+    {
         /* fetching chumper datatables */
         return Datatable::collection(Page::All())
                         /* search column name */
@@ -77,13 +77,14 @@ class PageController extends Controller {
                         /* add column Created */
                         ->addColumn('Created', function ($model) {
                             $t = $model->created_at;
+
                             return TicketController::usertimezone($t);
                         })
                         /* add column Actions */
                         /* there are action buttons and modal popup to delete a data column */
                         ->addColumn('Actions', function ($model) {
-                            return '<span  data-toggle="modal" data-target="#deletepage' . $model->id . '"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . '</button></span>&nbsp;<a href=page/' . $model->slug . '/edit class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href=pages/' . $model->slug . ' class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
-				<div class="modal fade" id="deletepage' . $model->id . '">
+                            return '<span  data-toggle="modal" data-target="#deletepage'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').'</button></span>&nbsp;<a href=page/'.$model->slug.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=pages/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
+				<div class="modal fade" id="deletepage'.$model->id.'">
         			<div class="modal-dialog">
             			<div class="modal-content">
                 			<div class="modal-header">
@@ -91,11 +92,11 @@ class PageController extends Controller {
                     			<h4 class="modal-title">Are You Sure ?</h4>
                 			</div>
                 			<div class="modal-body">
-                				' . $model->name . '
+                				'.$model->name.'
                 			</div>
                 			<div class="modal-footer">
 	                    		<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
-    			                <a href="page/delete/' . $model->id . '"><button class="btn btn-danger">delete</button></a>
+    			                <a href="page/delete/'.$model->id.'"><button class="btn btn-danger">delete</button></a>
 			                </div>
 		            	</div>
 			        </div>
@@ -106,23 +107,29 @@ class PageController extends Controller {
 
     /**
      * Show the form for creating a new resource.
+     *
      * @return type view
      */
-    public function create() {
+    public function create()
+    {
         return view('themes.default1.agent.kb.pages.create');
     }
 
     /**
-     * To insert a value to the table Page
+     * To insert a value to the table Page.
+     *
      * @param type Request $request
+     *
      * @return type
      */
-    public function store(PageRequest $request) {
+    public function store(PageRequest $request)
+    {
         $sl = $request->input('slug');
-        $slug = str_slug($sl, "-");
+        $slug = str_slug($sl, '-');
         $this->page->slug = $slug;
         try {
             $this->page->fill($request->except('slug'))->save();
+
             return redirect('page')->with('success', 'Page created successfully');
         } catch (Exception $e) {
             return redirect('page')->with('fails', $e->errorInfo[2]);
@@ -130,13 +137,17 @@ class PageController extends Controller {
     }
 
     /**
-     * To edit a page
-     * @param type $slug 
+     * To edit a page.
+     *
+     * @param type $slug
+     *
      * @return type view
      */
-    public function edit($slug) {
+    public function edit($slug)
+    {
         try {
             $page = $this->page->where('slug', $slug)->first();
+
             return view('themes.default1.agent.kb.pages.edit', compact('page'));
         } catch (Exception $e) {
             return redirect('page')->with('fails', $e->errorInfo[2]);
@@ -144,21 +155,25 @@ class PageController extends Controller {
     }
 
     /**
-     * To update a page
-     * @param type $slug 
-     * @param type PageUpdate $request 
+     * To update a page.
+     *
+     * @param type            $slug
+     * @param type PageUpdate $request
+     *
      * @return type redirect
      */
-    public function update($slug, PageUpdate $request) {
+    public function update($slug, PageUpdate $request)
+    {
         // get pages with respect to slug
         $pages = $this->page->where('slug', $slug)->first();
         $sl = $request->input('slug');
-        $slug = str_slug($sl, "-");
+        $slug = str_slug($sl, '-');
         $this->page->slug = $slug;
         try {
             $pages->fill($request->all())->save();
             $pages->slug = $slug;
             $pages->save();
+
             return redirect('page')->with('success', 'Your Page Updated Successfully');
         } catch (Exception $e) {
             return redirect('page')->with('fails', $e->errorInfo[2]);
@@ -166,19 +181,22 @@ class PageController extends Controller {
     }
 
     /**
-     * To Delete a Page
-     * @param type $id 
+     * To Delete a Page.
+     *
+     * @param type $id
+     *
      * @return type redirect
      */
-    public function destroy($id) {
+    public function destroy($id)
+    {
         try {
             // get the page to be deleted
             $page = $this->page->whereId($id)->first();
             $page->delete();
+
             return redirect('page')->with('success', 'Page Deleted Successfully');
         } catch (Exception $e) {
             return redirect('page')->with('fails', $e->errorInfo[2]);
         }
     }
-
 }
diff --git a/app/Http/Controllers/Agent/kb/SettingsController.php b/app/Http/Controllers/Agent/kb/SettingsController.php
index ebe813ce3..95d689ee9 100644
--- a/app/Http/Controllers/Agent/kb/SettingsController.php
+++ b/app/Http/Controllers/Agent/kb/SettingsController.php
@@ -2,54 +2,45 @@
 
 namespace App\Http\Controllers\Agent\kb;
 
-// Controllers
-use App\Http\Controllers\Agent\kb\ArticleController;
-use App\Http\Controllers\Agent\helpdesk\TicketController;
+// Controllersuse App\Http\Controllers\Agent\helpdesk\TicketController;
 use App\Http\Controllers\Controller;
 // Request
-use App\Http\Requests\kb\FooterRequest;
 use App\Http\Requests\kb\ProfilePassword;
 use App\Http\Requests\kb\ProfileRequest;
 use App\Http\Requests\kb\SettingsRequests;
-use App\Http\Requests\kb\SocialRequest;
-use Illuminate\Http\Request;
-// Model
-use App\Model\kb\Comment;
-use App\Model\kb\Faq;
-use App\Model\kb\Settings;
-use App\Model\kb\Side1;
-use App\Model\kb\Side2;
-use App\Model\kb\Social;
-use App\Model\helpdesk\Utility\Timezones;
 use App\Model\helpdesk\Utility\Date_format;
-// Classes
+// Model
+use App\Model\helpdesk\Utility\Timezones;
+use App\Model\kb\Comment;
+use App\Model\kb\Settings;
 use Auth;
+// Classes
 use Config;
-use Datatable;
+use Exception;
 use Hash;
+use Illuminate\Http\Request;
 use Image;
 use Input;
-use Exception;
 
 /**
  * SettingsController
- * This controller is used to perform settings in the setting page of knowledgebase
+ * This controller is used to perform settings in the setting page of knowledgebase.
  *
- * @package 	Controllers
- * @subpackage 	Controller
  * @author     	Ladybird <info@ladybirdweb.com>
  */
-class SettingsController extends Controller {
-
+class SettingsController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
+     *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         // checking authentication
         $this->middleware('auth');
         // checking roles
@@ -58,11 +49,12 @@ class SettingsController extends Controller {
     }
 
     /**
-     * to get the settings page
+     * to get the settings page.
+     *
      * @return response
-     * @package default
      */
-    public function settings(Settings $settings, Timezones $time, Date_format $date) {
+    public function settings(Settings $settings, Timezones $time, Date_format $date)
+    {
         /* get the setting where the id == 1 */
         $settings = $settings->whereId('1')->first();
         $time = $time->get();
@@ -73,40 +65,42 @@ class SettingsController extends Controller {
     /**
      * Update the specified resource in storage.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return Response
      */
-    public function postSettings($id, Settings $settings, SettingsRequests $request) {
+    public function postSettings($id, Settings $settings, SettingsRequests $request)
+    {
         try {
             /* fetch the values of company request  */
             $settings = $settings->whereId('1')->first();
             if (Input::file('logo')) {
                 $name = Input::file('logo')->getClientOriginalName();
                 $destinationPath = 'lb-faveo/dist/image';
-                $fileName = rand(0000, 9999) . '.' . $name;
+                $fileName = rand(0000, 9999).'.'.$name;
                 //echo $fileName;
                 Input::file('logo')->move($destinationPath, $fileName);
                 $settings->logo = $fileName;
                 //$thDestinationPath = 'dist/th';
-                Image::make($destinationPath . '/' . $fileName, array(
-                    'width' => 300,
-                    'height' => 300,
+                Image::make($destinationPath.'/'.$fileName, [
+                    'width'     => 300,
+                    'height'    => 300,
                     'grayscale' => false,
-                ))->save('lb-faveo/dist/image/' . $fileName);
+                ])->save('lb-faveo/dist/image/'.$fileName);
             }
             if (Input::file('background')) {
                 $name = Input::file('background')->getClientOriginalName();
                 $destinationPath = 'lb-faveo/dist/image';
-                $fileName = rand(0000, 9999) . '.' . $name;
+                $fileName = rand(0000, 9999).'.'.$name;
                 echo $fileName;
                 Input::file('background')->move($destinationPath, $fileName);
                 $settings->background = $fileName;
                 //$thDestinationPath = 'dist/th';
-                Image::make($destinationPath . '/' . $fileName, array(
-                    'width' => 300,
-                    'height' => 300,
+                Image::make($destinationPath.'/'.$fileName, [
+                    'width'     => 300,
+                    'height'    => 300,
                     'grayscale' => false,
-                ))->save('lb-faveo/dist/image/' . $fileName);
+                ])->save('lb-faveo/dist/image/'.$fileName);
             }
             /* Check whether function success or not */
             if ($settings->fill($request->except('logo', 'background'))->save() == true) {
@@ -123,19 +117,24 @@ class SettingsController extends Controller {
     }
 
     /**
-     * To Moderate the commenting
+     * To Moderate the commenting.
+     *
      * @param type Comment $comment
+     *
      * @return Response
      */
-    public function comment(Comment $comment) {
+    public function comment(Comment $comment)
+    {
         return view('themes.default1.agent.kb.settings.comment');
     }
 
     /**
-     * getdata
-     * @return type 
+     * getdata.
+     *
+     * @return type
      */
-    public function getData() {
+    public function getData()
+    {
         return \Datatable::collection(Comment::All())
                         ->searchColumns('name', 'email', 'comment', 'created')
                         ->orderColumns('name')
@@ -154,67 +153,79 @@ class SettingsController extends Controller {
                         ->addColumn('status', function ($model) {
                             $status = $model->status;
                             if ($status == 1) {
-                                return '<p style="color:blue"">' . \Lang::get('lang.published');
+                                return '<p style="color:blue"">'.\Lang::get('lang.published');
                             } else {
-                                return '<p style="color:red"">' . \Lang::get('lang.not_published');
+                                return '<p style="color:red"">'.\Lang::get('lang.not_published');
                             }
                         })
                         ->addColumn('Created', function ($model) {
                             return TicketController::usertimezone(date($model->created_at));
                         })
                         ->addColumn('Actions', function ($model) {
-                            return '<a href=comment/delete/' . $model->id . ' class="btn btn-danger btn-xs">' . \Lang::get('lang.delete') . '</a>&nbsp;<a href=published/' . $model->id . ' class="btn btn-warning btn-xs">' . \Lang::get('lang.publish') . '</a>';
+                            return '<a href=comment/delete/'.$model->id.' class="btn btn-danger btn-xs">'.\Lang::get('lang.delete').'</a>&nbsp;<a href=published/'.$model->id.' class="btn btn-warning btn-xs">'.\Lang::get('lang.publish').'</a>';
                         })
                         ->make();
     }
 
     /**
-     * Admin can publish the comment
-     * @param type $id
+     * Admin can publish the comment.
+     *
+     * @param type         $id
      * @param type Comment $comment
+     *
      * @return bool
      */
-    public function publish($id, Comment $comment) {
+    public function publish($id, Comment $comment)
+    {
         $comment = $comment->whereId($id)->first();
         $comment->status = 1;
         if ($comment->save()) {
-            return redirect('comment')->with('success', $comment->name . '-' . 'Comment Published');
+            return redirect('comment')->with('success', $comment->name.'-'.'Comment Published');
         } else {
             return redirect('comment')->with('fails', 'Can not Process');
         }
     }
 
     /**
-     * delete the comment
-     * @param type $id
+     * delete the comment.
+     *
+     * @param type         $id
      * @param type Comment $comment
+     *
      * @return type
      */
-    public function delete($id, Comment $comment) {
+    public function delete($id, Comment $comment)
+    {
         $comment = $comment->whereId($id)->first();
         if ($comment->delete()) {
-            return redirect('comment')->with('success', $comment->name . "'s!" . 'Comment Deleted');
+            return redirect('comment')->with('success', $comment->name."'s!".'Comment Deleted');
         } else {
             return redirect('comment')->with('fails', 'Can not Process');
         }
     }
 
     /**
-     * get profile page
+     * get profile page.
+     *
      * @return type view
      */
-    public function getProfile() {
+    public function getProfile()
+    {
         $time = Timezone::all();
         $user = Auth::user();
+
         return view('themes.default1.agent.kb.settings.profile', compact('user', 'time'));
     }
 
     /**
-     * Post profile page
-     * @param type ProfileRequest $request 
+     * Post profile page.
+     *
+     * @param type ProfileRequest $request
+     *
      * @return type redirect
      */
-    public function postProfile(ProfileRequest $request) {
+    public function postProfile(ProfileRequest $request)
+    {
         $user = Auth::user();
         $user->gender = $request->input('gender');
         $user->save();
@@ -233,12 +244,13 @@ class SettingsController extends Controller {
             //$extension = Input::file('profile_pic')->getClientOriginalExtension();
             $name = Input::file('profile_pic')->getClientOriginalName();
             $destinationPath = 'lb-faveo/dist/img';
-            $fileName = rand(0000, 9999) . '.' . $name;
+            $fileName = rand(0000, 9999).'.'.$name;
             //echo $fileName;
             Input::file('profile_pic')->move($destinationPath, $fileName);
             $user->profile_pic = $fileName;
         } else {
             $user->fill($request->except('profile_pic', 'gender'))->save();
+
             return redirect()->back()->with('success1', 'Profile Updated sucessfully');
         }
         if ($user->fill($request->except('profile_pic'))->save()) {
@@ -249,18 +261,22 @@ class SettingsController extends Controller {
     }
 
     /**
-     * post profile password
-     * @param type $id 
-     * @param type ProfilePassword $request 
+     * post profile password.
+     *
+     * @param type                 $id
+     * @param type ProfilePassword $request
+     *
      * @return type redirect
      */
-    public function postProfilePassword($id, ProfilePassword $request) {
+    public function postProfilePassword($id, ProfilePassword $request)
+    {
         $user = Auth::user();
         //echo $user->password;
 
         if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
             $user->password = Hash::make($request->input('new_password'));
             $user->save();
+
             return redirect('profile')->with('success2', 'Password Updated sucessfully');
         } else {
             return redirect('profile')->with('fails2', 'Old password Wrong');
@@ -268,14 +284,15 @@ class SettingsController extends Controller {
     }
 
     /**
-     * het locale for language
+     * het locale for language.
+     *
      * @return type config set
      */
-    static function language() {
+    public static function language()
+    {
         // $set = Settings::whereId(1)->first();
         // $lang = $set->language;
         Config::set('app.locale', 'en');
         Config::get('app');
     }
-
 }
diff --git a/app/Http/Controllers/Api/v1/ApiController.php b/app/Http/Controllers/Api/v1/ApiController.php
index babc88270..89c67c97a 100644
--- a/app/Http/Controllers/Api/v1/ApiController.php
+++ b/app/Http/Controllers/Api/v1/ApiController.php
@@ -2,40 +2,37 @@
 
 namespace App\Http\Controllers\Api\v1;
 
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Api\v1\TicketController;
-//use Illuminate\Support\Facades\Request as Value;
-use App\Model\helpdesk\Ticket\Tickets;
-use App\Model\helpdesk\Ticket\Ticket_Thread;
-use App\Model\helpdesk\Ticket\Ticket_attachments;
 use App\Http\Requests\helpdesk\TicketRequest;
-use App\User;
+//use Illuminate\Support\Facades\Request as Value;
+use App\Model\helpdesk\Agent\Department;
 use App\Model\helpdesk\Agent\Teams;
-use App\Model\helpdesk\Settings\System;
 use App\Model\helpdesk\Manage\Help_topic;
 use App\Model\helpdesk\Manage\Sla_plan;
-use App\Model\helpdesk\Utility\Priority;
-use App\Model\helpdesk\Agent\Department;
+use App\Model\helpdesk\Settings\System;
+use App\Model\helpdesk\Ticket\Ticket_attachments;
 use App\Model\helpdesk\Ticket\Ticket_source;
+use App\Model\helpdesk\Ticket\Ticket_Thread;
+use App\Model\helpdesk\Ticket\Tickets;
+use App\Model\helpdesk\Utility\Priority;
+use App\User;
 use Exception;
+use Illuminate\Http\Request;
 
 /**
  * -----------------------------------------------------------------------------
  * Api Controller
- * -----------------------------------------------------------------------------
+ * -----------------------------------------------------------------------------.
  * 
  * 
  * @author Vijay Sebastian <vijay.sebastian@ladybirdweb.com>
  * @copyright (c) 2016, Ladybird Web Solution
  * @name Faveo HELPDESK
+ *
  * @version v1
- * 
- * 
  */
-class ApiController extends Controller {
-
+class ApiController extends Controller
+{
     public $user;
     public $request;
     public $ticket;
@@ -53,11 +50,10 @@ class ApiController extends Controller {
     public $source;
 
     /**
-     * 
      * @param Request $request
      */
-    public function __construct(Request $request) {
-
+    public function __construct(Request $request)
+    {
         $this->request = $request;
 
         $this->middleware('jwt.auth');
@@ -107,30 +103,34 @@ class ApiController extends Controller {
     }
 
     /**
-     * Create Tickets
+     * Create Tickets.
+     *
      * @method POST
+     *
      * @param user_id,subject,body,helptopic,sla,priority,dept
+     *
      * @return json
      */
-    public function createTicket() {
+    public function createTicket()
+    {
         try {
             $v = \Validator::make($this->request->all(), [
-                        'user_id' => 'required|exists:users,id',
-                        'subject' => 'required',
-                        'body' => 'required',
+                        'user_id'   => 'required|exists:users,id',
+                        'subject'   => 'required',
+                        'body'      => 'required',
                         'helptopic' => 'required|exists:help_topic,id',
-                        'sla' => 'required|exists:sla_plan,id',
-                        'priority' => 'required|exists:ticket_priority,priority_id',
-                        'dept' => 'required|exists:department,id',
+                        'sla'       => 'required|exists:sla_plan,id',
+                        'priority'  => 'required|exists:ticket_priority,priority_id',
+                        'dept'      => 'required|exists:department,id',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
 
             $user_id = $this->request->input('user_id');
 
-
             $subject = $this->request->input('subject');
             $body = $this->request->input('body');
             $helptopic = $this->request->input('helptopic');
@@ -143,12 +143,12 @@ class ApiController extends Controller {
             $form_data = $this->request->input('form_data');
             $source = $this->request->input('source');
             $attach = $this->request->input('attachments');
-            /**
+            /*
              * return s ticket number
              */
             $response = $this->ticket->createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach);
 
-            /**
+            /*
              * return ticket details
              */
             //dd($response);
@@ -159,121 +159,144 @@ class ApiController extends Controller {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Reply for the ticket
+     * Reply for the ticket.
+     *
      * @param TicketRequest $request
+     *
      * @return json
      */
-    public function ticketReply() {
+    public function ticketReply()
+    {
         try {
             $v = \Validator::make($this->request->all(), [
-                        'ticket_ID' => 'required|exists:tickets,id',
+                        'ticket_ID'     => 'required|exists:tickets,id',
                         'reply_content' => 'required',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
             $attach = $this->request->input('attachments');
             $result = $this->ticket->reply($this->thread, $this->request, $this->attach, $attach);
+
             return response()->json(compact('result'));
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Edit a ticket
+     * Edit a ticket.
+     *
      * @return json
      */
-    public function editTicket() {
+    public function editTicket()
+    {
         try {
             $v = \Validator::make($this->request->all(), [
-                        'ticket_id' => 'required|exists:tickets,id',
-                        'subject' => 'required',
-                        'sla_plan' => 'required|exists:sla_plan,id',
-                        'help_topic' => 'required|exists:help_topic,id',
-                        'ticket_source' => 'required|exists:ticket_source,id',
+                        'ticket_id'       => 'required|exists:tickets,id',
+                        'subject'         => 'required',
+                        'sla_plan'        => 'required|exists:sla_plan,id',
+                        'help_topic'      => 'required|exists:help_topic,id',
+                        'ticket_source'   => 'required|exists:ticket_source,id',
                         'ticket_priority' => 'required|exists:ticket_priority,priority_id',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
             $ticket_id = $this->request->input('ticket_id');
             $result = $this->ticket->ticketEditPost($ticket_id, $this->thread, $this->model);
+
             return response()->json(compact('result'));
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Delete The Ticket
+     * Delete The Ticket.
+     *
      * @return json
      */
-    public function deleteTicket() {
+    public function deleteTicket()
+    {
         try {
             $v = \Validator::make($this->request->all(), [
                         'ticket_id' => 'required|exists:tickets,id',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
             $id = $this->request->input('ticket_id');
 
             $result = $this->ticket->delete($id, $this->model);
+
             return response()->json(compact('result'));
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get all opened tickets
+     * Get all opened tickets.
+     *
      * @return json
      */
-    public function openedTickets() {
+    public function openedTickets()
+    {
         try {
-//            $result = $this->model->where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', null)->orderBy('id', 'DESC')->get();
+            //            $result = $this->model->where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', null)->orderBy('id', 'DESC')->get();
 //            return response()->json(compact('result'));
-            
-            $result = $this->user->join('tickets', function($join) {
+
+            $result = $this->user->join('tickets', function ($join) {
                         $join->on('users.id', '=', 'tickets.user_id')
-                        ->where('isanswered','=',0)->where('status','=' ,1)->whereNull('assigned_to');
+                        ->where('isanswered', '=', 0)->where('status', '=', 1)->whereNull('assigned_to');
                     })
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
                     ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
                     ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id')
                     ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status')
-                    ->join('ticket_thread', function($join) {
+                    ->join('ticket_thread', function ($join) {
                         $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
                         ->whereNotNull('title');
                     })
@@ -282,38 +305,42 @@ class ApiController extends Controller {
                     ->distinct()
                     ->paginate(10)
                     ->toJson();
+
             return $result;
-            
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get Unsigned Tickets
+     * Get Unsigned Tickets.
+     *
      * @return json
      */
-    public function unassignedTickets() {
+    public function unassignedTickets()
+    {
         try {
             //dd('sdhjbc');
 //            $result = $this->model->where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->get();
 //            return response()->json(compact('result'));
-            $unassigned = $this->user->join('tickets', function($join) {
+            $unassigned = $this->user->join('tickets', function ($join) {
                         $join->on('users.id', '=', 'tickets.user_id')
-                        ->whereNull('assigned_to')->where('status', '=',1);
+                        ->whereNull('assigned_to')->where('status', '=', 1);
                     })
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
                     ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
                     ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id')
                     ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status')
-                    ->join('ticket_thread', function($join) {
+                    ->join('ticket_thread', function ($join) {
                         $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
                         ->whereNotNull('title');
                     })
@@ -322,37 +349,42 @@ class ApiController extends Controller {
                     ->distinct()
                     ->paginate(10)
                     ->toJson();
+
             return $unassigned;
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get closed Tickets
+     * Get closed Tickets.
+     *
      * @return json
      */
-    public function closeTickets() {
+    public function closeTickets()
+    {
         try {
-//            $result = $this->model->where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->get();
+            //            $result = $this->model->where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->get();
 //            return response()->json(compact('result'));
-            
-            $result = $this->user->join('tickets', function($join) {
+
+            $result = $this->user->join('tickets', function ($join) {
                         $join->on('users.id', '=', 'tickets.user_id')
-                        ->where('isanswered','=',0)->where('status', '>', 1)->where('status', '<', 4);
+                        ->where('isanswered', '=', 0)->where('status', '>', 1)->where('status', '<', 4);
                     })
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
                     ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
                     ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id')
                     ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status')
-                    ->join('ticket_thread', function($join) {
+                    ->join('ticket_thread', function ($join) {
                         $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
                         ->whereNotNull('title');
                     })
@@ -361,74 +393,91 @@ class ApiController extends Controller {
                     ->distinct()
                     ->paginate(10)
                     ->toJson();
+
             return $result;
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get All agents
+     * Get All agents.
+     *
      * @return json
      */
-    public function getAgents() {
+    public function getAgents()
+    {
         try {
             $result = $this->faveoUser->where('role', 'agent')->orWhere('role', 'admin')->where('active', 1)->get();
+
             return response()->json(compact('result'));
         } catch (Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get All Teams 
+     * Get All Teams.
+     *
      * @return json
      */
-    public function getTeams() {
+    public function getTeams()
+    {
         try {
             $result = $this->team->get();
+
             return response()->json(compact('result'));
         } catch (Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * To assign a ticket
+     * To assign a ticket.
+     *
      * @return json
      */
-    public function assignTicket() {
+    public function assignTicket()
+    {
         try {
             $v = \Validator::make($this->request->all(), [
                         'ticket_id' => 'required',
-                        'user' => 'required',
+                        'user'      => 'required',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
             $id = $this->request->input('ticket_id');
             $response = $this->ticket->assign($id);
             if ($response == 1) {
                 $result = 'success';
+
                 return response()->json(compact('result'));
             } else {
                 return response()->json(compact('response'));
@@ -437,165 +486,200 @@ class ApiController extends Controller {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get all customers
+     * Get all customers.
+     *
      * @return json
      */
-    public function getCustomers() {
+    public function getCustomers()
+    {
         try {
             $v = \Validator::make($this->request->all(), [
                         'search' => 'required',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
             $search = $this->request->input('search');
-            $result = $this->faveoUser->where('first_name', 'like', '%' . $search . '%')->orWhere('last_name', 'like', '%' . $search . '%')->orWhere('user_name', 'like', '%' . $search . '%')->orWhere('email', 'like', '%' . $search . '%')->get();
+            $result = $this->faveoUser->where('first_name', 'like', '%'.$search.'%')->orWhere('last_name', 'like', '%'.$search.'%')->orWhere('user_name', 'like', '%'.$search.'%')->orWhere('email', 'like', '%'.$search.'%')->get();
+
             return response()->json(compact('result'));
         } catch (Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get a customer by id
+     * Get a customer by id.
+     *
      * @return json
      */
-    public function getCustomer() {
+    public function getCustomer()
+    {
         try {
             $v = \Validator::make($this->request->all(), [
                         'user_id' => 'required',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
             $id = $this->request->input('user_id');
             $result = $this->faveoUser->where('id', $id)->first();
+
             return response()->json(compact('result'));
         } catch (Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Search tickets
+     * Search tickets.
+     *
      * @return json
      */
-    public function searchTicket() {
+    public function searchTicket()
+    {
         try {
             $v = \Validator::make($this->request->all(), [
                         'search' => 'required',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
             $search = $this->request->input('search');
-            $result = $this->thread->select('ticket_id')->where('title', 'like', '%' . $search . '%')->orWhere('body', 'like', '%' . $search . '%')->get();
+            $result = $this->thread->select('ticket_id')->where('title', 'like', '%'.$search.'%')->orWhere('body', 'like', '%'.$search.'%')->get();
+
             return response()->json(compact('result'));
         } catch (Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get threads of a ticket 
+     * Get threads of a ticket.
+     *
      * @return json
      */
-    public function ticketThreads() {
+    public function ticketThreads()
+    {
         try {
             $v = \Validator::make($this->request->all(), [
                         'id' => 'required',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
             $id = $this->request->input('id');
             $result = $this->thread->where('ticket_id', $id)->get();
+
             return response()->json(compact('result'));
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Check the url is valid or not
+     * Check the url is valid or not.
+     *
      * @return json
      */
-    public function checkUrl() {
+    public function checkUrl()
+    {
         //dd($this->request);
         try {
             $v = \Validator::make($this->request->all(), [
-                        'url' => 'required|url'
+                        'url' => 'required|url',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
 
             $url = $this->request->input('url');
-            $url = $url . "/api/v1/helpdesk/check-url?api_key=" . $this->request->input('api_key') . "&token=" . \Config::get('app.token');
+            $url = $url.'/api/v1/helpdesk/check-url?api_key='.$this->request->input('api_key').'&token='.\Config::get('app.token');
             $result = $this->CallGetApi($url);
             //dd($result);
             return response()->json(compact('result'));
         } catch (\Exception $ex) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Success for currect url
+     * Success for currect url.
+     *
      * @return string
      */
-    public function urlResult() {
-        return "success";
+    public function urlResult()
+    {
+        return 'success';
     }
 
     /**
-     * Call curl function for Get Method
+     * Call curl function for Get Method.
+     *
      * @param type $url
+     *
      * @return type int|string|json
      */
-    public function callGetApi($url) {
-
+    public function callGetApi($url)
+    {
         $curl = curl_init($url);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_URL, $url);
@@ -604,7 +688,7 @@ class ApiController extends Controller {
         $response = curl_exec($curl);
 
         if (curl_errno($curl)) {
-            echo 'error:' . curl_error($curl);
+            echo 'error:'.curl_error($curl);
         }
 
         return $response;
@@ -612,13 +696,15 @@ class ApiController extends Controller {
     }
 
     /**
-     * Call curl function for POST Method
+     * Call curl function for POST Method.
+     *
      * @param type $url
      * @param type $data
+     *
      * @return type int|string|json
      */
-    public function callPostApi($url, $data) {
-
+    public function callPostApi($url, $data)
+    {
         $curl = curl_init($url);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_URL, $url);
@@ -628,7 +714,7 @@ class ApiController extends Controller {
         $response = curl_exec($curl);
 
         if (curl_errno($curl)) {
-            echo 'error:' . curl_error($curl);
+            echo 'error:'.curl_error($curl);
         }
 
         return $response;
@@ -636,11 +722,12 @@ class ApiController extends Controller {
     }
 
     /**
-     * To generate api string
+     * To generate api string.
      * 
      * @return type | json
      */
-    public function generateApiKey() {
+    public function generateApiKey()
+    {
         try {
             $set = $this->setting->where('id', '1')->first();
             //dd($set);
@@ -649,123 +736,154 @@ class ApiController extends Controller {
                 $set->api_key = $key;
                 $set->save();
                 $result = $set->api_key;
+
                 return response()->json(compact('result'));
             } else {
                 $result = 'please enable api';
+
                 return response()->json(compact('result'));
             }
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get help topics
+     * Get help topics.
+     *
      * @return json
      */
-    public function getHelpTopic() {
+    public function getHelpTopic()
+    {
         try {
             $result = $this->helptopic->get();
+
             return response()->json(compact('result'));
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get Sla plans
+     * Get Sla plans.
+     *
      * @return json
      */
-    public function getSlaPlan() {
+    public function getSlaPlan()
+    {
         try {
             $result = $this->slaPlan->get();
+
             return response()->json(compact('result'));
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get priorities
+     * Get priorities.
+     *
      * @return json
      */
-    public function getPriority() {
+    public function getPriority()
+    {
         try {
             $result = $this->priority->get();
+
             return response()->json(compact('result'));
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Get departments
+     * Get departments.
+     *
      * @return json
      */
-    public function getDepartment() {
+    public function getDepartment()
+    {
         try {
             $result = $this->department->get();
+
             return response()->json(compact('result'));
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Getting the tickets
+     * Getting the tickets.
+     *
      * @return type json
      */
-    public function getTickets() {
+    public function getTickets()
+    {
         try {
             $tickets = $this->model->paginate(10);
             $tickets->toJson();
+
             return $tickets;
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Fetching the Inbox details
+     * Fetching the Inbox details.
+     *
      * @return type json
      */
-    public function inbox() {
+    public function inbox()
+    {
         try {
             $inbox = $this->user->join('tickets', 'users.id', '=', 'tickets.user_id')
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
@@ -773,7 +891,7 @@ class ApiController extends Controller {
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
                     ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id')
                     ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status')
-                    ->join('ticket_thread', function($join) {
+                    ->join('ticket_thread', function ($join) {
                         $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
                         ->whereNotNull('title');
                     })
@@ -782,31 +900,37 @@ class ApiController extends Controller {
                     ->distinct()
                     ->paginate(10)
                     ->toJson();
+
             return $inbox;
         } catch (\Exception $ex) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
-        }catch (\TokenExpiredException $e) {
+        } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * Create internal note
+     * Create internal note.
+     *
      * @return type json
      */
-    public function internalNote() {
+    public function internalNote()
+    {
         try {
             $v = \Validator::make($this->request->all(), [
-                        'userid' => 'required|exists:users,id',
+                        'userid'   => 'required|exists:users,id',
                         'ticketid' => 'required|exists:tickets,id',
-                        'body' => 'required',
+                        'body'     => 'required',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
             $userid = $this->request->input('userid');
@@ -814,96 +938,104 @@ class ApiController extends Controller {
 
             $body = $this->request->input('body');
             $thread = $this->thread->create(['ticket_id' => $ticketid, 'user_id' => $userid, 'is_internal' => 1, 'body' => $body]);
+
             return response()->json(compact('thread'));
         } catch (\Exception $ex) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
-        }catch (\TokenExpiredException $e) {
-            $error = $e->getMessage();
-            return response()->json(compact('error'));
-        }
-    }
-    
-    public function getTrash(){
-        try{
-            $trash = $this->user->join('tickets', function($join) {
-                        $join->on('users.id', '=', 'tickets.user_id')
-                        ->where('status', '=',5);
-                    })
-                    ->join('department', 'department.id', '=', 'tickets.dept_id')
-                    ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
-                    ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
-                    ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id')
-                    ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status')
-                    ->join('ticket_thread', function($join) {
-                        $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
-                        ->whereNotNull('title');
-                    })
-                    ->select('first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
-                    ->groupby('tickets.id')
-                    ->distinct()
-                    ->paginate(10)
-                    ->toJson();
-            return $trash;
-            
-            
-        } catch (\Exception $e) {
-            $error = $e->getMessage();
-            $line = $e->getLine();
-            $file = $e->getFile();
-            return response()->json(compact('error', 'file', 'line'));
-        }catch (\TokenExpiredException $e) {
-            $error = $e->getMessage();
-            return response()->json(compact('error'));
-        }
-    }
-    public function getMyTickets(){
-        
-        try{
-            $v = \Validator::make($this->request->all(), [
-                        'user_id' => 'required|exists:users,id'
-            ]);
-            if ($v->fails()) {
-                $error = $v->errors();
-                return response()->json(compact('error'));
-            }
-            $id = $this->request->input('user_id');
-            if($this->user->where('id',$id)->first()->role=='user'){
-                $error = "This user is not an Aget or Admin";
-                return response()->json(compact('error'));
-            }
-            $result = $this->user->join('tickets', function($join) use($id){
-                        $join->on('users.id', '=', 'tickets.user_id')
-                        ->where('user_id', '=',$id);
-                    })
-                    ->join('department', 'department.id', '=', 'tickets.dept_id')
-                    ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
-                    ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
-                    ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id')
-                    ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status')
-                    ->join('ticket_thread', function($join) {
-                        $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
-                        ->whereNotNull('title');
-                    })
-                    ->select('first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
-                    ->groupby('tickets.id')
-                    ->distinct()
-                    ->paginate(10)
-                    ->toJson();
-            return $result;
-            
-            
-        } catch (\Exception $e) {
-            $error = $e->getMessage();
-            $line = $e->getLine();
-            $file = $e->getFile();
-            return response()->json(compact('error', 'file', 'line'));
-        }catch (\TokenExpiredException $e) {
+        } catch (\TokenExpiredException $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
+    public function getTrash()
+    {
+        try {
+            $trash = $this->user->join('tickets', function ($join) {
+                        $join->on('users.id', '=', 'tickets.user_id')
+                        ->where('status', '=', 5);
+                    })
+                    ->join('department', 'department.id', '=', 'tickets.dept_id')
+                    ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
+                    ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
+                    ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id')
+                    ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status')
+                    ->join('ticket_thread', function ($join) {
+                        $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
+                        ->whereNotNull('title');
+                    })
+                    ->select('first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
+                    ->groupby('tickets.id')
+                    ->distinct()
+                    ->paginate(10)
+                    ->toJson();
+
+            return $trash;
+        } catch (\Exception $e) {
+            $error = $e->getMessage();
+            $line = $e->getLine();
+            $file = $e->getFile();
+
+            return response()->json(compact('error', 'file', 'line'));
+        } catch (\TokenExpiredException $e) {
+            $error = $e->getMessage();
+
+            return response()->json(compact('error'));
+        }
+    }
+
+    public function getMyTickets()
+    {
+        try {
+            $v = \Validator::make($this->request->all(), [
+                        'user_id' => 'required|exists:users,id',
+            ]);
+            if ($v->fails()) {
+                $error = $v->errors();
+
+                return response()->json(compact('error'));
+            }
+            $id = $this->request->input('user_id');
+            if ($this->user->where('id', $id)->first()->role == 'user') {
+                $error = 'This user is not an Aget or Admin';
+
+                return response()->json(compact('error'));
+            }
+            $result = $this->user->join('tickets', function ($join) use ($id) {
+                        $join->on('users.id', '=', 'tickets.user_id')
+                        ->where('user_id', '=', $id);
+                    })
+                    ->join('department', 'department.id', '=', 'tickets.dept_id')
+                    ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
+                    ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
+                    ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id')
+                    ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status')
+                    ->join('ticket_thread', function ($join) {
+                        $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
+                        ->whereNotNull('title');
+                    })
+                    ->select('first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
+                    ->groupby('tickets.id')
+                    ->distinct()
+                    ->paginate(10)
+                    ->toJson();
+
+            return $result;
+        } catch (\Exception $e) {
+            $error = $e->getMessage();
+            $line = $e->getLine();
+            $file = $e->getFile();
+
+            return response()->json(compact('error', 'file', 'line'));
+        } catch (\TokenExpiredException $e) {
+            $error = $e->getMessage();
+
+            return response()->json(compact('error'));
+        }
+    }
 }
diff --git a/app/Http/Controllers/Api/v1/InstallerApiController.php b/app/Http/Controllers/Api/v1/InstallerApiController.php
index 172f653e2..1c8cd03e3 100644
--- a/app/Http/Controllers/Api/v1/InstallerApiController.php
+++ b/app/Http/Controllers/Api/v1/InstallerApiController.php
@@ -5,52 +5,42 @@ namespace App\Http\Controllers\Api\v1;
 // controllers
 use App\Http\Controllers\Controller;
 // requests
-use Illuminate\Http\Request;
-use App\Http\Requests\helpdesk\InstallerRequest;
-// models
-use App\User;
 use App\Model\helpdesk\Settings\System;
-use App\Model\helpdesk\Form\Form_details;
+// models
 use App\Model\helpdesk\Utility\Date_time_format;
 use App\Model\helpdesk\Utility\Timezones;
-// classes
-use App;
+use App\User;
 use Artisan;
+// classes
 use Config;
 use File;
 use Hash;
-use Input;
-use Redirect;
-use Session;
-use View;
-use Exception;
+use Illuminate\Http\Request;
 
 /**
  * |=======================================================================
  * |Class: InstallController
- * |=======================================================================
+ * |=======================================================================.
  *
  *  Class to perform the first install operation without this the database
  *  settings could not be started
  *
- *  @package    Faveo HELPDESK
- *  @subpackage Controller
  *  @author     Ladybird <info@ladybirdweb.com>
- *
  */
-class InstallerApiController extends Controller {
-
+class InstallerApiController extends Controller
+{
     /**
      * config_database
      * This function is to configure the database and install the application via API call.
+     *
      * @return type Json
      */
-    public function config_database(Request $request) {
+    public function config_database(Request $request)
+    {
         error_reporting(E_ALL & ~E_NOTICE);
 
         // Check for pre install
         if (\Config::get('database.install') == '%0%') {
-
             $default = $request->database;
             $host = $request->host;
             $database = $request->databasename;
@@ -74,7 +64,7 @@ class InstallerApiController extends Controller {
                 }
 
                 // Write environment file
-                $fp = fopen(base_path() . "/.env", 'w');
+                $fp = fopen(base_path().'/.env', 'w');
                 fwrite($fp, $config);
                 fclose($fp);
 
@@ -90,9 +80,11 @@ class InstallerApiController extends Controller {
     /**
      * config_database
      * This function is to configure the database and install the application via API call.
+     *
      * @return type Json
      */
-    public function config_system(Request $request) {
+    public function config_system(Request $request)
+    {
         // Check for pre install
         if (\Config::get('database.install') == '%0%') {
             $firstname = $request->firstname;
@@ -104,8 +96,8 @@ class InstallerApiController extends Controller {
             $datetime = $request->datetime;
 
             // Migrate database
-            Artisan::call('migrate', array('--force' => true));
-            Artisan::call('db:seed', array('--force' => true));
+            Artisan::call('migrate', ['--force' => true]);
+            Artisan::call('db:seed', ['--force' => true]);
 
             // checking requested timezone for the admin and system
             $timezones = Timezones::where('name', '=', $timezone)->first();
@@ -118,7 +110,7 @@ class InstallerApiController extends Controller {
                 return ['response' => 'fail', 'reason' => 'invalid date-time format', 'status' => '0'];
             }
             // Creating minum settings for system
-            $system = new System;
+            $system = new System();
             $system->status = 1;
             $system->department = 1;
             $system->date_time_format = $date_time_format->id;
@@ -126,17 +118,17 @@ class InstallerApiController extends Controller {
             $system->save();
 
             // Creating user
-            $user = User::create(array(
-                        'first_name' => $firstname,
-                        'last_name' => $lastname,
-                        'email' => $email,
-                        'user_name' => $username,
-                        'password' => Hash::make($password),
-                        'active' => 1,
-                        'role' => 'admin',
+            $user = User::create([
+                        'first_name'   => $firstname,
+                        'last_name'    => $lastname,
+                        'email'        => $email,
+                        'user_name'    => $username,
+                        'password'     => Hash::make($password),
+                        'active'       => 1,
+                        'role'         => 'admin',
                         'assign_group' => 1,
-                        'primary_dpt' => 1,
-            ));
+                        'primary_dpt'  => 1,
+            ]);
 
             // Setting database installed status
             $value = '1';
@@ -165,5 +157,4 @@ class InstallerApiController extends Controller {
             return ['response' => 'fail', 'reason' => 'this system is already installed', 'status' => '0'];
         }
     }
-
 }
diff --git a/app/Http/Controllers/Api/v1/TestController.php b/app/Http/Controllers/Api/v1/TestController.php
index 4bd2041ea..22ebe6eef 100644
--- a/app/Http/Controllers/Api/v1/TestController.php
+++ b/app/Http/Controllers/Api/v1/TestController.php
@@ -2,26 +2,26 @@
 
 namespace App\Http\Controllers\Api\v1;
 
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use Exception;
-
-class TestController extends Controller {
 
+class TestController extends Controller
+{
     public $server;
 
-    public function __construct() {
+    public function __construct()
+    {
         $server = new Request();
         $url = $_SERVER['REQUEST_URI'];
         $server = parse_url($url);
-        $server["path"] = dirname($server["path"]);
-        $server = parse_url($server["path"]);
-        $server["path"] = dirname($server["path"]);
-        $this->server = "http://" . $_SERVER['HTTP_HOST'] . $server['path'] . "/";
+        $server['path'] = dirname($server['path']);
+        $server = parse_url($server['path']);
+        $server['path'] = dirname($server['path']);
+        $this->server = 'http://'.$_SERVER['HTTP_HOST'].$server['path'].'/';
     }
 
-    static function callGetApi($url) {
+    public static function callGetApi($url)
+    {
         //dd($url);
         $curl = curl_init($url);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
@@ -31,14 +31,15 @@ class TestController extends Controller {
         $response = curl_exec($curl);
 
         if (curl_errno($curl)) {
-            echo 'error:' . curl_error($curl);
+            echo 'error:'.curl_error($curl);
         }
 
         return $response;
         curl_close($curl);
     }
 
-    static function callPostApi($url, $data) {
+    public static function callPostApi($url, $data)
+    {
         //dd($url);
         $curl = curl_init($url);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
@@ -49,22 +50,23 @@ class TestController extends Controller {
         $response = curl_exec($curl);
 
         if (curl_errno($curl)) {
-            echo 'error:' . curl_error($curl);
+            echo 'error:'.curl_error($curl);
         }
 
         return $response;
         curl_close($curl);
     }
 
-    public function ticketReply() {
+    public function ticketReply()
+    {
 
         //$file = file_get_contents(base_path() . '/../lb-faveo/Img/Ladybird.png');
 
         $data = [
 
-            'ticket_ID' => '1',
+            'ticket_ID'     => '1',
             'reply_content' => 'reply for the ticket id',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
+            'api_key'       => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
 //            'attachments' => [
 //                [
 //                    'name' => 'ladybird',
@@ -82,28 +84,30 @@ class TestController extends Controller {
         ];
         $data = http_build_query($data, '', '&');
 
-        $url = $this->server . "helpdesk/reply?token=" . \Config::get('app.token');
+        $url = $this->server.'helpdesk/reply?token='.\Config::get('app.token');
 
         $_this = new self();
         $respose = $_this->callPostApi($url, $data);
+
         return $respose;
     }
 
-    public function createTicket() {
+    public function createTicket()
+    {
 
         //$file = file_get_contents(base_path() . '/../lb-faveo/Img/Ladybird.png');
 
         $data = [
-            'user_id' => 1,
-            'subject' => 'Api create via faveo api',
-            'body' => 'Test me when call api',
+            'user_id'   => 1,
+            'subject'   => 'Api create via faveo api',
+            'body'      => 'Test me when call api',
             'helptopic' => '1',
-            'sla' => '1',
-            'priority' => '1',
-            'headers' => [0 => 'vijaycodename47@gmail.com'],
-            'dept' => '1',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
-                /** if attachment */
+            'sla'       => '1',
+            'priority'  => '1',
+            'headers'   => [0 => 'vijaycodename47@gmail.com'],
+            'dept'      => '1',
+            'api_key'   => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
+                /* if attachment */
 //            'attachments' => [
 //                [
 //                    'name' => 'ladybird',
@@ -121,280 +125,331 @@ class TestController extends Controller {
         ];
         $data = http_build_query($data, '', '&');
 
-        $url = $this->server . "helpdesk/create?token=" . \Config::get('app.token');
+        $url = $this->server.'helpdesk/create?token='.\Config::get('app.token');
 
         $_this = new self();
         $respose = $_this->callPostApi($url, $data);
+
         return $respose;
     }
 
-    public function generateToken() {
+    public function generateToken()
+    {
         $data = [
             //'email'=>'vijaycodename47@gmail.com',
             'username' => 'vijay',
             'password' => 'manjapra',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN'
+            'api_key'  => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
         ];
 
         $data = http_build_query($data, '', '&');
 
-        $url = $this->server . "authenticate";
+        $url = $this->server.'authenticate';
         //dd($url);
         $_this = new self();
         $respose = $_this->callPostApi($url, $data);
+
         return $respose;
     }
 
-    public function createUser() {
+    public function createUser()
+    {
         $data = [
-            'email' => 'vijaycodename@gmail.com',
+            'email'    => 'vijaycodename@gmail.com',
             'password' => 'manjapra',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN'
+            'api_key'  => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
         ];
 
         $data = http_build_query($data, '', '&');
-        $url = $this->server . "register";
+        $url = $this->server.'register';
         $_this = new self();
         $respose = $_this->callPostApi($url, $data);
+
         return $respose;
     }
 
-    public function getAuthUser() {
-
-        $url = $this->server . "authenticate/user?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function getAuthUser()
+    {
+        $url = $this->server.'authenticate/user?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function editTicket() {
+    public function editTicket()
+    {
         $data = [
-            'ticket_id' => '13',
-            'subject' => 'Api editing ticket via faveo api',
-            'sla_plan' => '2',
-            'help_topic' => '2',
-            'ticket_source' => '2',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
+            'ticket_id'       => '13',
+            'subject'         => 'Api editing ticket via faveo api',
+            'sla_plan'        => '2',
+            'help_topic'      => '2',
+            'ticket_source'   => '2',
+            'api_key'         => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
             'ticket_priority' => '2',
         ];
 
         $data = http_build_query($data, '', '&');
-        $url = $this->server . "helpdesk/edit?token=" . \Config::get('app.token');
+        $url = $this->server.'helpdesk/edit?token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callPostApi($url, $data);
+
         return $respose;
     }
 
-    public function deleteTicket() {
+    public function deleteTicket()
+    {
         $data = [
             'ticket_id' => [11],
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN'
+            'api_key'   => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
         ];
 
         $data = http_build_query($data, '', '&');
-        $url = $this->server . "helpdesk/delete?token=" . \Config::get('app.token');
+        $url = $this->server.'helpdesk/delete?token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callPostApi($url, $data);
+
         return $respose;
     }
 
-    public function openedTickets() {
-        $url = $this->server . "helpdesk/open?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function openedTickets()
+    {
+        $url = $this->server.'helpdesk/open?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function unassignedTickets() {
+    public function unassignedTickets()
+    {
         //dd('dsdf');
-        $url = $this->server . "helpdesk/unassigned?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+        $url = $this->server.'helpdesk/unassigned?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
         //dd($respose);
         return $respose;
     }
 
-    public function closeTickets() {
-        $url = $this->server . "helpdesk/closed?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function closeTickets()
+    {
+        $url = $this->server.'helpdesk/closed?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function getAgents() {
-        $url = $this->server . "helpdesk/agents?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function getAgents()
+    {
+        $url = $this->server.'helpdesk/agents?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function getTeams() {
-        $url = $this->server . "helpdesk/teams?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function getTeams()
+    {
+        $url = $this->server.'helpdesk/teams?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function assignTicket() {
+    public function assignTicket()
+    {
         $data = [
             'ticket_id' => 1,
-            'user' => 'vijay.sebastian@ladybirdweb.com',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN'
+            'user'      => 'vijay.sebastian@ladybirdweb.com',
+            'api_key'   => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
         ];
         $data = http_build_query($data, '', '&');
-        $url = $this->server . "helpdesk/assign?token=" . \Config::get('app.token');
+        $url = $this->server.'helpdesk/assign?token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callPostApi($url, $data);
+
         return $respose;
     }
 
-    public function getCustomers() {
+    public function getCustomers()
+    {
         $search = [
-            'search' => 'vij',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN'
+            'search'  => 'vij',
+            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
         ];
         $data = http_build_query($search, '', '&');
-        $url = $this->server . "helpdesk/customers?token=" . \Config::get('app.token');
-        $url = $url . '&' . $data;
+        $url = $this->server.'helpdesk/customers?token='.\Config::get('app.token');
+        $url = $url.'&'.$data;
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function getCustomer() {
+    public function getCustomer()
+    {
         $search = [
             'user_id' => '1',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN'
+            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
         ];
         $data = http_build_query($search, '', '&');
-        $url = $this->server . "helpdesk/customer?token=" . \Config::get('app.token');
-        $url = $url . '&' . $data;
+        $url = $this->server.'helpdesk/customer?token='.\Config::get('app.token');
+        $url = $url.'&'.$data;
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function getSearch() {
+    public function getSearch()
+    {
         $search = [
-            'search' => 'api',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN'
+            'search'  => 'api',
+            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
         ];
         $data = http_build_query($search, '', '&');
-        $url = $this->server . "helpdesk/ticket-search?token=" . \Config::get('app.token');
-        $url = $url . '&' . $data;
+        $url = $this->server.'helpdesk/ticket-search?token='.\Config::get('app.token');
+        $url = $url.'&'.$data;
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function ticketThreads() {
+    public function ticketThreads()
+    {
         $search = [
-            'id' => '1',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN'
+            'id'      => '1',
+            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
         ];
         $data = http_build_query($search, '', '&');
-        $url = $this->server . "helpdesk/ticket-thread?token=" . \Config::get('app.token');
-        $url = $url . '&' . $data;
+        $url = $this->server.'helpdesk/ticket-thread?token='.\Config::get('app.token');
+        $url = $url.'&'.$data;
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function url() {
+    public function url()
+    {
         $search = [
-            'url' => 'http://localhost/faveo-helpdesk-github/public/',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN'
+            'url'     => 'http://localhost/faveo-helpdesk-github/public/',
+            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
         ];
         $data = http_build_query($search, '', '&');
-        $url = $this->server . "helpdesk/url?token=" . \Config::get('app.token');
-        $url = $url . '&' . $data;
+        $url = $this->server.'helpdesk/url?token='.\Config::get('app.token');
+        $url = $url.'&'.$data;
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function generateApiKey() {
-        $url = $this->server . "helpdesk/api_key?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function generateApiKey()
+    {
+        $url = $this->server.'helpdesk/api_key?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function getHelpTopic() {
-        $url = $this->server . "helpdesk/help-topic?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function getHelpTopic()
+    {
+        $url = $this->server.'helpdesk/help-topic?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function getSlaPlan() {
-        $url = $this->server . "helpdesk/sla-plan?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function getSlaPlan()
+    {
+        $url = $this->server.'helpdesk/sla-plan?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function getPriority() {
-        $url = $this->server . "helpdesk/priority?api_key=clYbe1g7BYVEJznBdvCEBR0xDCLDqKgg&token=" . \Config::get('app.token');
+    public function getPriority()
+    {
+        $url = $this->server.'helpdesk/priority?api_key=clYbe1g7BYVEJznBdvCEBR0xDCLDqKgg&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function getDepartment() {
-        $url = $this->server . "helpdesk/department?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function getDepartment()
+    {
+        $url = $this->server.'helpdesk/department?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function getTickets() {
-        $url = $this->server . "helpdesk/tickets?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function getTickets()
+    {
+        $url = $this->server.'helpdesk/tickets?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function inbox() {
-        $url = $this->server . "helpdesk/inbox?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+    public function inbox()
+    {
+        $url = $this->server.'helpdesk/inbox?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
 
-    public function internalNote() {
+    public function internalNote()
+    {
         $data = [
             'ticketid' => '1',
-            'userid' => 1,
-            'body' => 'Testing the api internal note',
-            'api_key' => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN'
+            'userid'   => 1,
+            'body'     => 'Testing the api internal note',
+            'api_key'  => '9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN',
         ];
         $data = http_build_query($data, '', '&');
-        $url = $this->server . "helpdesk/internal-note?token=" . \Config::get('app.token');
+        $url = $this->server.'helpdesk/internal-note?token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callPostApi($url, $data);
+
         return $respose;
     }
-    
-    public function trash() {
-        $url = $this->server . "helpdesk/trash?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+
+    public function trash()
+    {
+        $url = $this->server.'helpdesk/trash?api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
         $_this = new self();
         $respose = $_this->callGetApi($url);
+
         return $respose;
     }
-    
-    public function myTickets(){
-        try{
-            $url = $this->server . "helpdesk/my-tickets?user_id=1&api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token');
+
+    public function myTickets()
+    {
+        try {
+            $url = $this->server.'helpdesk/my-tickets?user_id=1&api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
             $_this = new self();
             $respose = $_this->callGetApi($url);
+
             return $respose;
         } catch (\Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
             $file = $e->getFile();
+
             return response()->json(compact('error', 'file', 'line'));
         }
     }
-
 }
diff --git a/app/Http/Controllers/Api/v1/TicketController.php b/app/Http/Controllers/Api/v1/TicketController.php
index df81682a5..12856fa89 100644
--- a/app/Http/Controllers/Api/v1/TicketController.php
+++ b/app/Http/Controllers/Api/v1/TicketController.php
@@ -2,70 +2,72 @@
 
 namespace App\Http\Controllers\Api\v1;
 
-use App\Http\Requests;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use App\Model\helpdesk\Ticket\Tickets;
-use App\Model\helpdesk\Settings\Company;
-use App\User;
-use App\Model\helpdesk\Ticket\Ticket_Collaborator;
-use App\Model\helpdesk\Ticket\Ticket_Thread;
 use App\Http\Controllers\Common\PhpMailController;
-use Auth;
-use Mail;
-use Input;
-use App\Model\helpdesk\Ticket\Ticket_Status;
-use App\Model\helpdesk\Ticket\Ticket_attachments;
-use App\Model\helpdesk\Settings\System;
+use App\Http\Controllers\Controller;
 use App\Model\helpdesk\Settings\Alert;
+use App\Model\helpdesk\Settings\Company;
+use App\Model\helpdesk\Settings\System;
+use App\Model\helpdesk\Ticket\Ticket_attachments;
+use App\Model\helpdesk\Ticket\Ticket_Collaborator;
+use App\Model\helpdesk\Ticket\Ticket_Status;
+use App\Model\helpdesk\Ticket\Ticket_Thread;
+use App\Model\helpdesk\Ticket\Tickets;
+use App\User;
+use Auth;
 use Hash;
+use Input;
+use Mail;
 
 /**
  * -----------------------------------------------------------------------------
  * Ticket Controller
- * -----------------------------------------------------------------------------
+ * -----------------------------------------------------------------------------.
  * 
  * 
  * @author Vijay Sebastian <vijay.sebastian@ladybirdweb.com>
  * @copyright (c) 2016, Ladybird Web Solution
  * @name Faveo HELPDESK
+ *
  * @version v1
- * 
- * 
  */
-class TicketController extends Controller {
-
+class TicketController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type response
      */
-    public function __construct() {
-        $PhpMailController  = new PhpMailController();
+    public function __construct()
+    {
+        $PhpMailController = new PhpMailController();
         $this->PhpMailController = $PhpMailController;
     }
 
     /**
-     * Create Ticket
+     * Create Ticket.
+     *
      * @param type $user_id
      * @param type $subject
      * @param type $body
      * @param type $helptopic
      * @param type $sla
      * @param type $priority
+     *
      * @return type string
      */
-    public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach = '') {
+    public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach = '')
+    {
         try {
             $max_number = Tickets::whereRaw('id = (select max(`id`) from tickets)')->first();
             //dd($max_number);
             if ($max_number == null) {
-                $ticket_number = "AAAA-9999-9999999";
+                $ticket_number = 'AAAA-9999-9999999';
             } else {
                 foreach ($max_number as $number) {
                     $ticket_number = $max_number->ticket_number;
                 }
             }
-            $ticket = new Tickets;
+            $ticket = new Tickets();
             $ticket->ticket_number = $this->ticketNumber($ticket_number);
             //dd($this->ticketNumber($ticket_number));
             $ticket->user_id = $user_id;
@@ -86,7 +88,7 @@ class TicketController extends Controller {
                 foreach ($form_data as $key => $form_details) {
                     foreach ($forms as $from) {
                         if ($from->name == $key) {
-                            $form_value = new Ticket_Form_Data;
+                            $form_value = new Ticket_Form_Data();
                             $form_value->ticket_id = $id;
                             $form_value->title = $from->label;
                             $form_value->content = $form_details;
@@ -96,27 +98,30 @@ class TicketController extends Controller {
                 }
             }
 
-
-
             $this->storeCollaborators($headers, $id);
 
             $thread = $this->ticketThread($subject, $body, $id, $user_id);
             if (!empty($attach)) {
                 $this->attach($thread, $attach);
             }
+
             return $thread;
         } catch (\Exception $e) {
             dd($e);
+
             return $e->getMessage();
         }
     }
 
     /**
-     * store_collaborators
-     * @param type $headers 
+     * store_collaborators.
+     *
+     * @param type $headers
+     *
      * @return type
      */
-    public function storeCollaborators($headers, $id) {
+    public function storeCollaborators($headers, $id)
+    {
         try {
             $company = $this->company();
             if (isset($headers)) {
@@ -124,11 +129,11 @@ class TicketController extends Controller {
                     $name = $name;
                     $email = $email;
                     if ($this->checkEmail($email) == false) {
-                        $create_user = new User;
+                        $create_user = new User();
                         $create_user->user_name = $name;
                         $create_user->email = $email;
                         $create_user->active = 1;
-                        $create_user->role = "user";
+                        $create_user->role = 'user';
                         $password = $this->generateRandomString();
                         $create_user->password = Hash::make($password);
                         $create_user->save();
@@ -138,19 +143,19 @@ class TicketController extends Controller {
                         // });
 
                         $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]);
-
                     } else {
                         $user = $this->checkEmail($email);
                         $user_id = $user->id;
                     }
-                    $collaborator_store = new Ticket_Collaborator;
+                    $collaborator_store = new Ticket_Collaborator();
                     $collaborator_store->isactive = 1;
                     $collaborator_store->ticket_id = $id;
                     $collaborator_store->user_id = $user_id;
-                    $collaborator_store->role = "ccc";
+                    $collaborator_store->role = 'ccc';
                     $collaborator_store->save();
                 }
             }
+
             return true;
         } catch (\Exception $e) {
             return $e->getMessage();
@@ -158,22 +163,26 @@ class TicketController extends Controller {
     }
 
     /**
-     * Generate Ticket Thread
+     * Generate Ticket Thread.
+     *
      * @param type $subject
      * @param type $body
      * @param type $id
      * @param type $user_id
+     *
      * @return type
      */
-    public function ticketThread($subject, $body, $id, $user_id) {
+    public function ticketThread($subject, $body, $id, $user_id)
+    {
         try {
-            $thread = new Ticket_Thread;
+            $thread = new Ticket_Thread();
             $thread->user_id = $user_id;
             $thread->ticket_id = $id;
             $thread->poster = 'client';
             $thread->title = $subject;
             $thread->body = $body;
             $thread->save();
+
             return $thread->id;
         } catch (\Exception $e) {
             return $e->getMessage();
@@ -181,11 +190,14 @@ class TicketController extends Controller {
     }
 
     /**
-     * Generates Ticket Number
+     * Generates Ticket Number.
+     *
      * @param type $ticket_number
+     *
      * @return type integer
      */
-    public function ticketNumber($ticket_number) {
+    public function ticketNumber($ticket_number)
+    {
         try {
             //dd($ticket_number);
             $number = $ticket_number;
@@ -207,21 +219,26 @@ class TicketController extends Controller {
             $number3++;
             $number2 = sprintf('%04s', $number2);
             $number3 = sprintf('%07s', $number3);
-            $array = array($number1, $number2, $number3);
+            $array = [$number1, $number2, $number3];
             $number = implode('-', $array);
+
             return $number;
         } catch (\Exception $e) {
             dd($e);
+
             return $e->getMessage();
         }
     }
 
     /**
-     * Generate a random string for password
+     * Generate a random string for password.
+     *
      * @param type $length
+     *
      * @return type string
      */
-    public function generateRandomString($length = 10) {
+    public function generateRandomString($length = 10)
+    {
         try {
             $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
             $charactersLength = strlen($characters);
@@ -229,6 +246,7 @@ class TicketController extends Controller {
             for ($i = 0; $i < $length; $i++) {
                 $randomString .= $characters[rand(0, $charactersLength - 1)];
             }
+
             return $randomString;
         } catch (\Exception $e) {
             return $e->getMessage();
@@ -236,14 +254,16 @@ class TicketController extends Controller {
     }
 
     /**
-     * Replying a ticket
+     * Replying a ticket.
+     *
      * @param type Ticket_Thread $thread
      * @param type TicketRequest $request
+     *
      * @return type bool
      */
-    public function reply($thread, $request, $ta, $attach = '') {
+    public function reply($thread, $request, $ta, $attach = '')
+    {
         try {
-
             $check_attachment = null;
             $eventthread = $thread->where('ticket_id', $request->input('ticket_ID'))->first();
             $eventuserid = $eventthread->user_id;
@@ -266,11 +286,11 @@ class TicketController extends Controller {
             if ($tickets->assigned_to == 0) {
                 $tickets->assigned_to = Auth::user()->id;
                 $tickets->save();
-                $thread2 = New Ticket_Thread;
+                $thread2 = new Ticket_Thread();
                 $thread2->ticket_id = $thread->ticket_id;
                 $thread2->user_id = Auth::user()->id;
                 $thread2->is_internal = 1;
-                $thread2->body = "This Ticket have been assigned to " . Auth::user()->first_name . " " . Auth::user()->last_name;
+                $thread2->body = 'This Ticket have been assigned to '.Auth::user()->first_name.' '.Auth::user()->last_name;
                 $thread2->save();
             }
             if ($tickets->status > 1) {
@@ -280,7 +300,6 @@ class TicketController extends Controller {
             }
             $thread->save();
 
-
             if (!empty($attach)) {
                 $check_attachment = $this->attach($thread->id, $attach);
             }
@@ -313,22 +332,20 @@ class TicketController extends Controller {
 //             }, true);
 
 try {
-                        $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket-by-agent', 'body' => $body], $template_variables = ['agent_sign' => Auth::user()->agent_sign, 'ticket_number' => $ticket_number2]);
-                    } catch (\Exception $e) {
-                        
-                    }
+    $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket-by-agent', 'body' => $body], $template_variables = ['agent_sign' => Auth::user()->agent_sign, 'ticket_number' => $ticket_number2]);
+} catch (\Exception $e) {
+}
 
-               
             $collaborators = Ticket_Collaborator::where('ticket_id', '=', $ticket_id)->get();
             foreach ($collaborators as $collaborator) {
                 //mail to collaborators
                 $collab_user_id = $collaborator->user_id;
                 $user_id_collab = User::where('id', '=', $collab_user_id)->first();
                 $collab_email = $user_id_collab->email;
-                if ($user_id_collab->role == "user") {
+                if ($user_id_collab->role == 'user') {
                     $collab_user_name = $user_id_collab->user_name;
                 } else {
-                    $collab_user_name = $user_id_collab->first_name . " " . $user_id_collab->last_name;
+                    $collab_user_name = $user_id_collab->first_name.' '.$user_id_collab->last_name;
                 }
 //                 Mail::send('emails.ticket_re-reply', ['content' => $reply_content, 'ticket_number' => $ticket_number, 'From' => $company, 'name' => $collab_user_name, 'Agent_Signature' => $agentsign], function ($message) use ($collab_email, $collab_user_name, $ticket_number, $ticket_subject, $check_attachment) {
 //                     $message->to($collab_email, $collab_user_name)->subject($ticket_subject . '[#' . $ticket_number . ']');
@@ -341,13 +358,11 @@ try {
 //                 }, true);
 
                  try {
-                        $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $admin_user, 'email' => $admin_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $admin_user, 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]);
-                    } catch (\Exception $e) {
-                        
-                    }
-
-
+                     $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $admin_user, 'email' => $admin_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $admin_user, 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]);
+                 } catch (\Exception $e) {
+                 }
             }
+
             return $thread;
         } catch (\Exception $e) {
             return $e->getMessage();
@@ -355,17 +370,20 @@ try {
     }
 
     /**
-     * company
+     * company.
+     *
      * @return type
      */
-    public function company() {
+    public function company()
+    {
         try {
             $company = Company::Where('id', '=', '1')->first();
             if ($company->company_name == null) {
-                $company = "Support Center";
+                $company = 'Support Center';
             } else {
                 $company = $company->company_name;
             }
+
             return $company;
         } catch (\Exception $e) {
             return $e->getMessage();
@@ -373,25 +391,28 @@ try {
     }
 
     /**
-     * Ticket edit and save ticket data
-     * @param type $ticket_id
+     * Ticket edit and save ticket data.
+     *
+     * @param type               $ticket_id
      * @param type Ticket_Thread $thread
+     *
      * @return type bool
      */
-    public function ticketEditPost($ticket_id, $thread, $ticket) {
+    public function ticketEditPost($ticket_id, $thread, $ticket)
+    {
         try {
-
             $ticket = $ticket->where('id', '=', $ticket_id)->first();
 
-            $ticket->sla = Input::get("sla_plan");
-            $ticket->help_topic_id = Input::get("help_topic");
-            $ticket->source = Input::get("ticket_source");
-            $ticket->priority_id = Input::get("ticket_priority");
+            $ticket->sla = Input::get('sla_plan');
+            $ticket->help_topic_id = Input::get('help_topic');
+            $ticket->source = Input::get('ticket_source');
+            $ticket->priority_id = Input::get('ticket_priority');
             $ticket->save();
 
             $threads = $thread->where('ticket_id', '=', $ticket_id)->first();
-            $threads->title = Input::get("subject");
+            $threads->title = Input::get('subject');
             $threads->save();
+
             return $threads;
         } catch (\Exception $e) {
             return $e->getMessage();
@@ -399,11 +420,14 @@ try {
     }
 
     /**
-     * function to assign ticket
+     * function to assign ticket.
+     *
      * @param type $id
+     *
      * @return type bool
      */
-    public function assign($id) {
+    public function assign($id)
+    {
         try {
             $UserEmail = Input::get('user');
             //dd($UserEmail);
@@ -425,11 +449,11 @@ try {
                 return ['error' => 'No thread not found'];
             }
             $ticket_subject = $ticket_thread->title;
-            $thread = New Ticket_Thread;
+            $thread = new Ticket_Thread();
             $thread->ticket_id = $ticket->id;
             $thread->user_id = Auth::user()->id;
             $thread->is_internal = 1;
-            $thread->body = "This Ticket has been assigned to " . $user->first_name . " " . $user->last_name;
+            $thread->body = 'This Ticket has been assigned to '.$user->first_name.' '.$user->last_name;
             $thread->save();
 
             $company = $this->company();
@@ -438,7 +462,7 @@ try {
             $agent = $user->first_name;
             $agent_email = $user->email;
 
-            $master = Auth::user()->first_name . " " . Auth::user()->last_name;
+            $master = Auth::user()->first_name.' '.Auth::user()->last_name;
             if (Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) {
                 // // ticket assigned send mail
                 // Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from' => $company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) {
@@ -446,13 +470,10 @@ try {
                 // });
 
                 try {
-                $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject . '[#' . $ticket_number . ']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master]);
+                    $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master]);
                 } catch (\Exception $e) {
                     return 0;
                 }
-
-
-
             }
 
             return 1;
@@ -462,13 +483,15 @@ try {
     }
 
     /**
-     * Function to delete ticket
-     * @param type $id
+     * Function to delete ticket.
+     *
+     * @param type         $id
      * @param type Tickets $ticket
+     *
      * @return type string
      */
-    public function delete($ids, $ticket) {
-
+    public function delete($ids, $ticket)
+    {
         try {
             foreach ($ids as $id) {
                 $ticket_delete = $ticket->where('id', '=', $id)->first();
@@ -496,29 +519,33 @@ try {
                         $ticket_delete->status = 5;
                         $ticket_delete->save();
                         $ticket_status_message = Ticket_Status::where('id', '=', $ticket_delete->status)->first();
-                        $thread = New Ticket_Thread;
+                        $thread = new Ticket_Thread();
                         $thread->ticket_id = $ticket_delete->id;
                         $thread->user_id = Auth::user()->id;
                         $thread->is_internal = 1;
-                        $thread->body = $ticket_status_message->message . " " . Auth::user()->first_name . " " . Auth::user()->last_name;
+                        $thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name;
                         $thread->save();
                     }
                 } else {
-                    return "ticket not found";
+                    return 'ticket not found';
                 }
             }
-            return "your tickets has been deleted";
+
+            return 'your tickets has been deleted';
         } catch (\Exception $e) {
             return $e->getMessage();
         }
     }
 
     /**
-     * check email for dublicate entry
+     * check email for dublicate entry.
+     *
      * @param type $email
+     *
      * @return type bool
      */
-    public function checkEmail($email) {
+    public function checkEmail($email)
+    {
         try {
             $check = User::where('email', '=', $email)->first();
             if ($check == true) {
@@ -532,17 +559,20 @@ try {
     }
 
     /**
-     * system
+     * system.
+     *
      * @return type
      */
-    public function system() {
+    public function system()
+    {
         try {
             $system = System::Where('id', '=', '1')->first();
             if ($system->name == null) {
-                $system = "Support Center";
+                $system = 'Support Center';
             } else {
                 $system = $system->name;
             }
+
             return $system;
         } catch (\Exception $e) {
             return $e->getMessage();
@@ -550,22 +580,25 @@ try {
     }
 
     /**
-     * Create Attachment
+     * Create Attachment.
+     *
      * @param type $thread
      * @param type $attach
+     *
      * @return int
      */
-    public function attach($thread, $attach) {
+    public function attach($thread, $attach)
+    {
         try {
             $ta = new Ticket_attachments();
             foreach ($attach as $file) {
                 $ta->create(['thread_id' => $thread, 'name' => $file['name'], 'size' => $file['size'], 'type' => $file['type'], 'file' => $file['file'], 'poster' => 'ATTACHMENT']);
             }
             $ta->create(['thread_id' => $thread, 'name' => $name, 'size' => $size, 'type' => $type, 'file' => $file, 'poster' => 'ATTACHMENT']);
+
             return 1;
         } catch (\Exception $e) {
             return $e->getMessage();
         }
     }
-
 }
diff --git a/app/Http/Controllers/Api/v1/TokenAuthController.php b/app/Http/Controllers/Api/v1/TokenAuthController.php
index c9057f11f..4d05a7ee5 100644
--- a/app/Http/Controllers/Api/v1/TokenAuthController.php
+++ b/app/Http/Controllers/Api/v1/TokenAuthController.php
@@ -3,39 +3,40 @@
 namespace App\Http\Controllers\Api\v1;
 
 use App\Http\Controllers\Controller;
+use App\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
 use JWTAuth;
 use Tymon\JWTAuth\Exceptions\JWTException;
-use App\Http\Requests;
-use Illuminate\Http\Request;
-use App\User;
-use Illuminate\Support\Facades\Hash;
 
 /**
  * -----------------------------------------------------------------------------
  * Token authenticate Controller
- * -----------------------------------------------------------------------------
+ * -----------------------------------------------------------------------------.
  * 
  * 
  * @author Vijay Sebastian <vijay.sebastian@ladybirdweb.com>
  * @copyright (c) 2016, Ladybird Web Solution
  * @name Faveo HELPDESK
+ *
  * @version v1
- * 
- * 
  */
-class TokenAuthController extends Controller {
-
-    public function __construct() {
+class TokenAuthController extends Controller
+{
+    public function __construct()
+    {
         $this->middleware('api');
     }
 
     /**
-     * Authenticating user with username and password and retuen token
+     * Authenticating user with username and password and retuen token.
+     *
      * @param Request $request
+     *
      * @return type json
      */
-    public function authenticate(Request $request) {
-
+    public function authenticate(Request $request)
+    {
         $usernameinput = $request->input('username');
         $password = $request->input('password');
         $field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name';
@@ -50,6 +51,7 @@ class TokenAuthController extends Controller {
             return response()->json(['error' => 'could_not_create_token', 500]);
         } catch (\Exception $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
 
@@ -58,27 +60,26 @@ class TokenAuthController extends Controller {
     }
 
     /**
-     * Get the user details from token
+     * Get the user details from token.
+     *
      * @return type json
      */
-    public function getAuthenticatedUser() {
+    public function getAuthenticatedUser()
+    {
         //dd(JWTAuth::parseToken()->authenticate());
         try {
-
             if (!$user = JWTAuth::parseToken()->authenticate()) {
                 return response()->json(['user_not_found', 404]);
             }
         } catch (\Tymon\JWTAuth\Exceptions\TokenExpiredException $e) {
-
             return response()->json(['token_expired', $e->getStatusCode()]);
         } catch (\Tymon\JWTAuth\Exceptions\TokenInvalidException $e) {
-
             return response()->json(['token_invalid', $e->getStatusCode()]);
         } catch (\Tymon\JWTAuth\Exceptions\JWTException $e) {
-
             return response()->json(['token_absent', $e->getStatusCode()]);
         } catch (\Exception $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
         //dd($user);
@@ -86,18 +87,22 @@ class TokenAuthController extends Controller {
     }
 
     /**
-     * Register a user with username and password
+     * Register a user with username and password.
+     *
      * @param Request $request
+     *
      * @return type json
      */
-    public function register(Request $request) {
+    public function register(Request $request)
+    {
         try {
             $v = \Validator::make($request->all(), [
-                        'email' => 'required|email|unique:users',
+                        'email'    => 'required|email|unique:users',
                         'password' => 'required',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
             $newuser = $request->all();
@@ -108,30 +113,34 @@ class TokenAuthController extends Controller {
             return User::create($newuser);
         } catch (\Exception $e) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
 
     /**
-     * verify the url is existing or not
+     * verify the url is existing or not.
+     *
      * @return type json
      */
-    public function checkUrl() {
+    public function checkUrl()
+    {
         try {
             $v = \Validator::make($request->all(), [
-                        'url' => 'required|url'
+                        'url' => 'required|url',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
+
                 return response()->json(compact('error'));
             }
 
             $url = $this->request->input('url');
-            $url = $url . '/api/v1/helpdesk/check-url';
+            $url = $url.'/api/v1/helpdesk/check-url';
         } catch (Exception $ex) {
             $error = $e->getMessage();
+
             return response()->json(compact('error'));
         }
     }
-
 }
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index ac9217403..7619d34f5 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -3,21 +3,20 @@
 namespace App\Http\Controllers\Auth;
 
 // controllers
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Common\SettingsController;
 use App\Http\Controllers\Common\PhpMailController;
+use App\Http\Controllers\Common\SettingsController;
+use App\Http\Controllers\Controller;
 // requests
 use App\Http\Requests\helpdesk\LoginRequest;
 use App\Http\Requests\helpdesk\RegisterRequest;
 use App\User;
 // classes
+use Auth;
 use Hash;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\Registrar;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 use Mail;
-use Auth;
-use Exception;
 
 /**
  * ---------------------------------------------------
@@ -27,12 +26,10 @@ use Exception;
  * authentication of existing users. By default, this controller uses
  * a simple trait to add these behaviors. Why don't you explore it?
  *
- * @package Controllers
- * @subpackage Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class AuthController extends Controller {
-
+class AuthController extends Controller
+{
     use AuthenticatesAndRegistersUsers;
     /* to redirect after login */
 
@@ -47,11 +44,13 @@ class AuthController extends Controller {
     /**
      * Create a new authentication controller instance.
      *
-     * @param  \Illuminate\Contracts\Auth\Guard  $auth
-     * @param  \Illuminate\Contracts\Auth\Registrar  $registrar
+     * @param \Illuminate\Contracts\Auth\Guard     $auth
+     * @param \Illuminate\Contracts\Auth\Registrar $registrar
+     *
      * @return void
      */
-    public function __construct(Guard $auth, Registrar $registrar, PhpMailController $PhpMailController) {
+    public function __construct(Guard $auth, Registrar $registrar, PhpMailController $PhpMailController)
+    {
         $this->PhpMailController = $PhpMailController;
         SettingsController::smtp();
         $this->auth = $auth;
@@ -60,17 +59,19 @@ class AuthController extends Controller {
     }
 
     /**
-     * Get the form for registration
+     * Get the form for registration.
+     *
      * @return type Response
      */
-    public function getRegister() {
+    public function getRegister()
+    {
         // Event for login
         \Event::fire(new \App\Events\FormRegisterEvent());
         if (Auth::user()) {
-            if (Auth::user()->role == "admin" || Auth::user()->role == "agent") {
+            if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') {
                 return \Redirect::route('dashboard');
-            } elseif (Auth::user()->role == "user") {
-                // return view('auth.register');	
+            } elseif (Auth::user()->role == 'user') {
+                // return view('auth.register');
             }
         } else {
             return view('auth.register');
@@ -78,12 +79,15 @@ class AuthController extends Controller {
     }
 
     /**
-     * Post registration form
-     * @param type User $user
+     * Post registration form.
+     *
+     * @param type User            $user
      * @param type RegisterRequest $request
+     *
      * @return type Response
      */
-    public function postRegister(User $user, RegisterRequest $request) {
+    public function postRegister(User $user, RegisterRequest $request)
+    {
         // Event for login
         \Event::fire(new \App\Events\LoginEvent($request));
 
@@ -105,24 +109,26 @@ class AuthController extends Controller {
         // 	$message->to($user->email, $user->full_name)->subject('active your account');
         // });
 
-        $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('password/reset/' . $code)]);
-
-
+        $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('password/reset/'.$code)]);
 
         return redirect('home')->with('success', 'Activate Your Account ! Click on Link that send to your mail');
     }
 
     /**
-     * Get mail function
-     * @param type $token
+     * Get mail function.
+     *
+     * @param type      $token
      * @param type User $user
+     *
      * @return type Response
      */
-    public function getMail($token, User $user) {
+    public function getMail($token, User $user)
+    {
         $user = $user->where('remember_token', $token)->where('active', 0)->first();
         if ($user) {
             $user->active = 1;
             $user->save();
+
             return redirect('auth/login');
         } else {
             return redirect('auth/login');
@@ -130,14 +136,16 @@ class AuthController extends Controller {
     }
 
     /**
-     * Get login page
+     * Get login page.
+     *
      * @return type Response
      */
-    public function getLogin() {
+    public function getLogin()
+    {
         if (Auth::user()) {
-            if (Auth::user()->role == "admin" || Auth::user()->role == "agent") {
+            if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') {
                 return \Redirect::route('dashboard');
-            } elseif (Auth::user()->role == "user") {
+            } elseif (Auth::user()->role == 'user') {
                 return \Redirect::route('home');
             }
         } else {
@@ -146,11 +154,14 @@ class AuthController extends Controller {
     }
 
     /**
-     * Post of login page
+     * Post of login page.
+     *
      * @param type LoginRequest $request
+     *
      * @return type Response
      */
-    public function postLogin(LoginRequest $request) {
+    public function postLogin(LoginRequest $request)
+    {
         // Set login attempts and login time
         $loginAttempts = 1;
         $usernameinput = $request->input('email');
@@ -186,21 +197,23 @@ class AuthController extends Controller {
                 return redirect()->intended($this->redirectPath());
             }
         }
+
         return redirect($this->loginPath())
                         ->withInput($request->only('email', 'remember'))
                         ->withErrors([
-                            'email' => $this->getFailedLoginMessage(),
+                            'email'    => $this->getFailedLoginMessage(),
                             'password' => $this->getFailedLoginMessage(),
         ]);
         // Increment login attempts
     }
 
     /**
-     * Get Failed login message
+     * Get Failed login message.
+     *
      * @return type string
      */
-    protected function getFailedLoginMessage() {
+    protected function getFailedLoginMessage()
+    {
         return 'This Field do not match our records.';
     }
-
 }
diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
index 094ce8090..75140a67c 100644
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ b/app/Http/Controllers/Auth/PasswordController.php
@@ -3,39 +3,37 @@
 namespace App\Http\Controllers\Auth;
 
 // controllers
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Common\SettingsController;
 use App\Http\Controllers\Common\PhpMailController;
+use App\Http\Controllers\Common\SettingsController;
+use App\Http\Controllers\Controller;
 // request
-use Illuminate\Http\Request;
-// model
 use App\User;
-// classes
+// model
 use Illuminate\Contracts\Auth\Guard;
+// classes
 use Illuminate\Contracts\Auth\PasswordBroker;
 use Illuminate\Foundation\Auth\ResetsPasswords;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Exception;
+use Illuminate\Http\Request;
 
 /**
- * PasswordController
+ * PasswordController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class PasswordController extends Controller {
-
+class PasswordController extends Controller
+{
     use ResetsPasswords;
 
     /**
      * Create a new password controller instance.
      *
-     * @param  \Illuminate\Contracts\Auth\Guard  $auth
-     * @param  \Illuminate\Contracts\Auth\PasswordBroker  $passwords
+     * @param \Illuminate\Contracts\Auth\Guard          $auth
+     * @param \Illuminate\Contracts\Auth\PasswordBroker $passwords
+     *
      * @return void
      */
-    public function __construct(Guard $auth, PasswordBroker $passwords, PhpMailController $PhpMailController) {
+    public function __construct(Guard $auth, PasswordBroker $passwords, PhpMailController $PhpMailController)
+    {
         $this->PhpMailController = $PhpMailController;
         $this->auth = $auth;
         $this->passwords = $passwords;
@@ -48,7 +46,8 @@ class PasswordController extends Controller {
      *
      * @return Response
      */
-    public function getEmail() {
+    public function getEmail()
+    {
         return view('auth.password');
     }
 
@@ -57,7 +56,8 @@ class PasswordController extends Controller {
      *
      * @return Response
      */
-    public function postEmail(Request $request) {
+    public function postEmail(Request $request)
+    {
         $date = date('Y-m-d H:i:s');
         $this->validate($request, ['email' => 'required|email']);
         $user = User::where('email', '=', $request->only('email'))->first();
@@ -67,7 +67,6 @@ class PasswordController extends Controller {
             $code = str_random(60);
             $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
             if (isset($password_reset_table)) {
-
                 $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
                 // $password_reset_table->token = $code;
                 // $password_reset_table->update(['token' => $code]);
@@ -75,12 +74,11 @@ class PasswordController extends Controller {
                 $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
             }
 
-            $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->user_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/' . $code)]);
+            $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->user_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code)]);
 
             return redirect()->back()->with('status', 'We have e-mailed your password reset link!');
         } else {
             return redirect()->back()->with('errors', "We can't find a user with that e-mail address.");
         }
     }
-
 }
diff --git a/app/Http/Controllers/Auth/UserController.php b/app/Http/Controllers/Auth/UserController.php
index f155bfced..70ec8ca83 100644
--- a/app/Http/Controllers/Auth/UserController.php
+++ b/app/Http/Controllers/Auth/UserController.php
@@ -32,24 +32,23 @@ use Input;
 use Redirect;
 
 /**
- * UserController
+ * UserController.
  *
- * @package   Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class UserController extends Controller {
-
+class UserController extends Controller
+{
     /**
      * Create a new controller instance.
      * constructor to check
      * 1. authentication
      * 2. user roles
-     * 3. roles must be agent
+     * 3. roles must be agent.
      *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->middleware('auth');
         $this->middleware('role.agent');
         // $this->middleware('roles');
@@ -57,10 +56,13 @@ class UserController extends Controller {
 
     /**
      * Display a listing of the resource.
+     *
      * @param type User $user
+     *
      * @return type Response
      */
-    public function index() {
+    public function index()
+    {
         try {
             /* get all values in Sys_user */
             return view('themes.default1.agent.helpdesk.user.index');
@@ -70,11 +72,12 @@ class UserController extends Controller {
     }
 
     /**
-     * This function is used to display the list of users
+     * This function is used to display the list of users.
+     *
      * @return datatable
      */
-    public function user_list() {
-
+    public function user_list()
+    {
         return \Datatable::collection(User::where('role', '!=', 'admin')->where('role', '!=', 'agent')->get())
                         ->searchColumns('user_name')
                         ->orderColumns('user_name', 'email')
@@ -83,18 +86,20 @@ class UserController extends Controller {
                         })
                         ->addColumn('email', function ($model) {
                             $email = $model->email;
+
                             return $email;
                         })
                         ->addColumn('phone', function ($model) {
-                            $phone = "";
+                            $phone = '';
                             if ($model->phone_number) {
-                                $phone = $model->ext . ' ' . $model->phone_number;
+                                $phone = $model->ext.' '.$model->phone_number;
                             }
-                            $mobile = "";
+                            $mobile = '';
                             if ($model->mobile) {
                                 $mobile = $model->mobile;
                             }
-                            $phone = $phone . "&nbsp;&nbsp;&nbsp;" . $mobile;
+                            $phone = $phone.'&nbsp;&nbsp;&nbsp;'.$mobile;
+
                             return $phone;
                         })
                         ->addColumn('status', function ($model) {
@@ -104,17 +109,19 @@ class UserController extends Controller {
                             } else {
                                 $stat = '<button class="btn btn-danger btn-xs">Inactive</button>';
                             }
+
                             return $stat;
                         })
                         ->addColumn('lastlogin', function ($model) {
                             $t = $model->updated_at;
+
                             return TicketController::usertimezone($t);
                         })
                         ->addColumn('Actions', function ($model) {
                             //return '<a href=article/delete/ ' . $model->id . ' class="btn btn-danger btn-flat" onclick="myFunction()">Delete</a>&nbsp;<a href=article/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=show/' . $model->id . ' class="btn btn-warning btn-flat">View</a>';
                             //return '<form action="article/delete/ ' . $model->id . '" method="post" onclick="alert()"><button type="sumbit" value="Delete"></button></form><a href=article/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=show/' . $model->id . ' class="btn btn-warning btn-flat">View</a>';
-                            return '<span  data-toggle="modal" data-target="#deletearticle' . $model->id . '"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . ' </button></span>&nbsp;<a href="' . route('user.edit', $model->id) . '" class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href="' . route('user.show', $model->id) . '" class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
-				<div class="modal fade" id="deletearticle' . $model->id . '">
+                            return '<span  data-toggle="modal" data-target="#deletearticle'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').' </button></span>&nbsp;<a href="'.route('user.edit', $model->id).'" class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
+				<div class="modal fade" id="deletearticle'.$model->id.'">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
@@ -122,11 +129,11 @@ class UserController extends Controller {
                     <h4 class="modal-title">Are You Sure ?</h4>
                 </div>
                 <div class="modal-body">
-                ' . $model->user_name . '
+                '.$model->user_name.'
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
-                    <a href="' . route('user.delete', $model->id) . '"><button class="btn btn-danger">delete</button></a>
+                    <a href="'.route('user.delete', $model->id).'"><button class="btn btn-danger">delete</button></a>
                 </div>
             </div><!-- /.modal-content -->
         </div><!-- /.modal-dialog -->
@@ -137,9 +144,11 @@ class UserController extends Controller {
 
     /**
      * Show the form for creating a new resource.
+     *
      * @return type Response
      */
-    public function create() {
+    public function create()
+    {
         try {
             return view('themes.default1.agent.helpdesk.user.create');
         } catch (Exception $e) {
@@ -149,11 +158,14 @@ class UserController extends Controller {
 
     /**
      * Store a newly created resource in storage.
-     * @param type User $user
+     *
+     * @param type User            $user
      * @param type Sys_userRequest $request
+     *
      * @return type Response
      */
-    public function store(User $user, Sys_userRequest $request) {
+    public function store(User $user, Sys_userRequest $request)
+    {
         try {
             /* insert the input request to sys_user table */
             /* Check whether function success or not */
@@ -180,14 +192,18 @@ class UserController extends Controller {
 
     /**
      * Display the specified resource.
+     *
      * @param type int  $id
      * @param type User $user
+     *
      * @return type Response
      */
-    public function show($id, User $user) {
+    public function show($id, User $user)
+    {
         try {
             /* select the field where id = $id(request Id) */
             $users = $user->whereId($id)->first();
+
             return view('themes.default1.agent.helpdesk.user.show', compact('users'));
         } catch (Exception $e) {
             return view('404');
@@ -196,14 +212,18 @@ class UserController extends Controller {
 
     /**
      * Show the form for editing the specified resource.
-     * @param type int $id
+     *
+     * @param type int  $id
      * @param type User $user
+     *
      * @return type Response
      */
-    public function edit($id, User $user) {
+    public function edit($id, User $user)
+    {
         try {
             /* select the field where id = $id(request Id) */
             $users = $user->whereId($id)->first();
+
             return view('themes.default1.agent.helpdesk.user.edit', compact('users'));
         } catch (Exception $e) {
             return view('404');
@@ -212,12 +232,15 @@ class UserController extends Controller {
 
     /**
      * Update the specified resource in storage.
-     * @param type int $id
-     * @param type User $user
+     *
+     * @param type int            $id
+     * @param type User           $user
      * @param type Sys_userUpdate $request
+     *
      * @return type Response
      */
-    public function update($id, User $user, Sys_userUpdate $request) {
+    public function update($id, User $user, Sys_userUpdate $request)
+    {
         try {
             /* select the field where id = $id(request Id) */
             $users = $user->whereId($id)->first();
@@ -238,11 +261,14 @@ class UserController extends Controller {
 
     /**
      * Remove the specified resource from storage.
-     * @param type int $id
+     *
+     * @param type int  $id
      * @param type User $user
+     *
      * @return type Response
      */
-    public function destroy($id, User $user) {
+    public function destroy($id, User $user)
+    {
         try {
             /* select the field where id = $id(request Id) */
             $users = $user->whereId($id)->first();
@@ -262,30 +288,39 @@ class UserController extends Controller {
     }
 
     /**
-     * get profile page
+     * get profile page.
+     *
      * @return type Response
      */
-    public function getProfile() {
+    public function getProfile()
+    {
         $user = Auth::user();
+
         return view('themes.default1.agent.helpdesk.user.profile', compact('user'));
     }
 
     /**
-     * get profile edit page
+     * get profile edit page.
+     *
      * @return type Response
      */
-    public function getProfileedit() {
+    public function getProfileedit()
+    {
         $user = Auth::user();
+
         return view('themes.default1.agent.helpdesk.user.profile-edit', compact('user'));
     }
 
     /**
-     * post profile page
-     * @param type int $id
+     * post profile page.
+     *
+     * @param type int            $id
      * @param type ProfileRequest $request
+     *
      * @return type Response
      */
-    public function postProfileedit(ProfileRequest $request) {
+    public function postProfileedit(ProfileRequest $request)
+    {
         $user = Auth::user();
         $user->gender = $request->input('gender');
         $user->save();
@@ -304,12 +339,13 @@ class UserController extends Controller {
             //$extension = Input::file('profile_pic')->getClientOriginalExtension();
             $name = Input::file('profile_pic')->getClientOriginalName();
             $destinationPath = 'lb-faveo/profilepic';
-            $fileName = rand(0000, 9999) . '.' . $name;
+            $fileName = rand(0000, 9999).'.'.$name;
             //echo $fileName;
             Input::file('profile_pic')->move($destinationPath, $fileName);
             $user->profile_pic = $fileName;
         } else {
             $user->fill($request->except('profile_pic', 'gender'))->save();
+
             return Redirect::route('profile')->with('success', 'Profile Updated sucessfully');
         }
         if ($user->fill($request->except('profile_pic'))->save()) {
@@ -318,17 +354,21 @@ class UserController extends Controller {
     }
 
     /**
-     * Post profile password
-     * @param type int $id
+     * Post profile password.
+     *
+     * @param type int             $id
      * @param type ProfilePassword $request
+     *
      * @return type Response
      */
-    public function postProfilePassword($id, ProfilePassword $request) {
+    public function postProfilePassword($id, ProfilePassword $request)
+    {
         $user = Auth::user();
         //echo $user->password;
         if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
             $user->password = Hash::make($request->input('new_password'));
             $user->save();
+
             return redirect('profile-edit')->with('success1', 'Password Updated sucessfully');
         } else {
             return redirect('profile-edit')->with('fails1', 'Password was not Updated. Incorrect old password');
@@ -336,25 +376,30 @@ class UserController extends Controller {
     }
 
     /**
-     * User Assign Org
-     * @param type $id 
+     * User Assign Org.
+     *
+     * @param type $id
+     *
      * @return type boolean
      */
-    public function UserAssignOrg($id) {
+    public function UserAssignOrg($id)
+    {
         $org = Input::get('org');
-        $user_org = new User_org;
+        $user_org = new User_org();
         $user_org->org_id = $org;
         $user_org->user_id = $id;
         $user_org->save();
+
         return 1;
     }
 
     /**
-     * user create organisation
+     * user create organisation.
+     *
      * @return type value
      */
-    public function User_Create_Org($id) {
-
+    public function User_Create_Org($id)
+    {
         if (Input::get('website') != null) {
             // checking website
             $check = Organization::where('website', '=', Input::get('website'))->first();
@@ -366,13 +411,13 @@ class UserController extends Controller {
         $check2 = Organization::where('name', '=', Input::get('name'))->first();
 
         if (\Input::get('name') == null) {
-            return "Name is required";
+            return 'Name is required';
         } elseif ($check2 != null) {
-            return "Name should be Unique";
+            return 'Name should be Unique';
         } elseif ($check != null) {
-            return "Website should be Unique";
+            return 'Website should be Unique';
         } else {
-            $org = new Organization;
+            $org = new Organization();
             $org->name = Input::get('name');
             $org->phone = Input::get('phone');
             $org->website = Input::get('website');
@@ -380,7 +425,7 @@ class UserController extends Controller {
             $org->internal_notes = Input::get('internal');
             $org->save();
 
-            $user_org = new User_org;
+            $user_org = new User_org();
             $user_org->org_id = $org->id;
             $user_org->user_id = $id;
             $user_org->save();
@@ -388,5 +433,4 @@ class UserController extends Controller {
             return 0;
         }
     }
-
 }
diff --git a/app/Http/Controllers/Client/helpdesk/ClientTicketController.php b/app/Http/Controllers/Client/helpdesk/ClientTicketController.php
index c5215aff2..e92d9ac6d 100644
--- a/app/Http/Controllers/Client/helpdesk/ClientTicketController.php
+++ b/app/Http/Controllers/Client/helpdesk/ClientTicketController.php
@@ -3,70 +3,60 @@
 namespace App\Http\Controllers\Client\helpdesk;
 
 // controllers
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Agent\helpdesk\TicketController;
 use App\Http\Controllers\Common\SettingsController;
+use App\Http\Controllers\Controller;
 // requests
-use Illuminate\Http\Request;
-use App\Http\Requests\helpdesk\CreateTicketRequest;
-use App\Http\Requests\helpdesk\TicketRequest;
-use App\Http\Requests\helpdesk\TicketEditRequest;
-// models
-use App\Model\helpdesk\Email\Banlist;
-use App\Model\helpdesk\Ticket\Tickets;
-use App\Model\helpdesk\Ticket\Ticket_attachments;
-use App\Model\helpdesk\Ticket\Ticket_Collaborator;
 use App\Model\helpdesk\Ticket\Ticket_Thread;
-use App\Model\helpdesk\Settings\Company;
-use App\Model\helpdesk\Settings\System;
-use App\Model\helpdesk\Settings\Alert;
-use App\Model\helpdesk\Ticket\Ticket_Status;
-use App\Model\helpdesk\Email\Emails;
-use App\Model\helpdesk\Agent\Department;
+// models
+use App\Model\helpdesk\Ticket\Tickets;
 use App\User;
-// classes
 use Auth;
-use Hash;
-use Input;
-use Mail;
-use PDF;
+// classes
 use Exception;
+use Illuminate\Http\Request;
+use Input;
 
 /**
- * TicketController2
+ * TicketController2.
  *
- * @package 	Controllers
- * @subpackage 	Controller
  * @author     	Ladybird <info@ladybirdweb.com>
  */
-class ClientTicketController extends Controller {
-
+class ClientTicketController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type response
      */
-    public function __construct() {
+    public function __construct()
+    {
         SettingsController::smtp();
         // $this->middleware('auth');
         // $this->middleware('role.user');
     }
 
     /**
-     * Get Checked ticket
+     * Get Checked ticket.
+     *
      * @param type Tickets $ticket
-     * @param type User $user
+     * @param type User    $user
+     *
      * @return type response
      */
-    public function getCheckTicket(Tickets $ticket, User $user) {
+    public function getCheckTicket(Tickets $ticket, User $user)
+    {
         return view('themes.default1.client.helpdesk.guest-user.newticket', compact('ticket'));
     }
 
     /**
-     * reply
-     * @param type $value 
+     * reply.
+     *
+     * @param type $value
+     *
      * @return type view
      */
-    public function reply($id, Request $request) {
+    public function reply($id, Request $request)
+    {
         $comment = $request->input('comment');
         if ($comment != null) {
             $tickets = Tickets::where('id', '=', $id)->first();
@@ -74,14 +64,15 @@ class ClientTicketController extends Controller {
             $tickets->closed = 0;
             $tickets->reopened_at = date('Y-m-d H:i:s');
             $tickets->reopened = 1;
-            $threads = new Ticket_Thread;
+            $threads = new Ticket_Thread();
             $threads->user_id = Auth::user()->id;
             $threads->ticket_id = $tickets->id;
-            $threads->poster = "client";
+            $threads->poster = 'client';
             $threads->body = $comment;
             try {
                 $threads->save();
                 $tickets->save();
+
                 return \Redirect::back()->with('success1', 'Successfully replied');
             } catch (Exception $e) {
                 return \Redirect::back()->with('fails1', $e->errorInfo[2]);
@@ -90,5 +81,4 @@ class ClientTicketController extends Controller {
             return \Redirect::back()->with('fails1', 'Please fill some data!');
         }
     }
-
 }
diff --git a/app/Http/Controllers/Client/helpdesk/EmailController.php b/app/Http/Controllers/Client/helpdesk/EmailController.php
index 2050b86d2..577b036ff 100644
--- a/app/Http/Controllers/Client/helpdesk/EmailController.php
+++ b/app/Http/Controllers/Client/helpdesk/EmailController.php
@@ -7,45 +7,47 @@ use App\Http\Controllers\Controller;
 // models
 use App\Model\helpdesk\Email\Emails;
 // classes
-use Exception;
 
 /**
- * EmailController
+ * EmailController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class OuthouseController extends Controller {
-
+class EmailController extends Controller
+{
     /**
-     * post port
+     * post port.
      *
      * @return string
      */
-    public static function port() {
+    public static function port()
+    {
         $port = Emails::where('id', '=', '1')->first();
         $portvalue = $port->option_value;
+
         return $portvalue;
     }
 
     /**
-     * post host
+     * post host.
      *
      * @return string
      */
-    public static function host() {
+    public static function host()
+    {
         $host = Option::where('option_name', '=', 'host')->first();
         $hostvalue = $host->option_value;
+
         return $hostvalue;
     }
 
     /**
-     * post username
+     * post username.
      *
      * @return string
      */
-    public static function username() {
+    public static function username()
+    {
         $username = Option::where('option_name', '=', 'username')->first();
         $uservalue = $username->option_value;
 
@@ -53,11 +55,12 @@ class OuthouseController extends Controller {
     }
 
     /**
-     * post passowrd
+     * post passowrd.
      *
      * @return string
      */
-    public static function password() {
+    public static function password()
+    {
         $password = Option::where('option_name', '=', 'password')->first();
         $passvalue = $password->option_value;
 
@@ -65,15 +68,15 @@ class OuthouseController extends Controller {
     }
 
     /**
-     * post encryption
+     * post encryption.
      *
      * @return string
      */
-    public static function encryption() {
+    public static function encryption()
+    {
         $encryption = Option::where('option_name', '=', 'encryption')->first();
         $encryptvalue = $encryption->option_value;
 
         return $encryptvalue;
     }
-
 }
diff --git a/app/Http/Controllers/Client/helpdesk/FormController.php b/app/Http/Controllers/Client/helpdesk/FormController.php
index cc9f3a48d..1032248d2 100644
--- a/app/Http/Controllers/Client/helpdesk/FormController.php
+++ b/app/Http/Controllers/Client/helpdesk/FormController.php
@@ -3,51 +3,44 @@
 namespace App\Http\Controllers\Client\helpdesk;
 
 // controllers
-use App\Http\Controllers\Controller;
 use App\Http\Controllers\Agent\helpdesk\TicketController;
 use App\Http\Controllers\Common\SettingsController;
+use App\Http\Controllers\Controller;
 // requests
-use Illuminate\Http\Request;
 use App\Http\Requests\helpdesk\ClientRequest;
+use App\Model\helpdesk\Agent\Department;
 // models
-use App\Model\helpdesk\Form\Forms;
+use App\Model\helpdesk\Form\Fields;
 use App\Model\helpdesk\Manage\Help_topic;
-use App\Model\helpdesk\Settings\Company;
-use App\Model\helpdesk\Ticket\Tickets;
-use App\Model\helpdesk\Ticket\Ticket_Thread;
 use App\Model\helpdesk\Settings\System;
 use App\Model\helpdesk\Settings\Ticket;
-use App\Model\helpdesk\Agent\Department;
 use App\Model\helpdesk\Ticket\Ticket_source;
+use App\Model\helpdesk\Ticket\Ticket_Thread;
+use App\Model\helpdesk\Ticket\Tickets;
 use App\User;
-use App\Model\helpdesk\Form\Fields;
-use App\Model\helpdesk\Form\Form_value;
+use Exception;
 // classes
 use Form;
+use Illuminate\Http\Request;
 use Input;
 use Mail;
-use Hash;
 use Redirect;
-use Config;
-use DateTime;
-use DateTimeZone;
-use Exception;
 
 /**
- * FormController
+ * FormController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class FormController extends Controller {
-
+class FormController extends Controller
+{
     /**
      * Create a new controller instance.
-     * Constructor to check
+     * Constructor to check.
+     *
      * @return void
      */
-    public function __construct(TicketController $TicketController) {
+    public function __construct(TicketController $TicketController)
+    {
         // mail smtp settings
         SettingsController::smtp();
         // creating a TicketController instance
@@ -55,16 +48,20 @@ class FormController extends Controller {
     }
 
     /**
-     * getform
-     * @param type Help_topic $topic 
+     * getform.
+     *
+     * @param type Help_topic $topic
+     *
      * @return type
      */
-    public function getForm(Help_topic $topic) {
+    public function getForm(Help_topic $topic)
+    {
         if (\Config::get('database.install') == '%0%') {
             return \Redirect::route('license');
         }
         if (System::first()->status == 1) {
             $topics = $topic->get();
+
             return view('themes.default1.client.helpdesk.form', compact('topics'));
         } else {
             return \Redirect::route('home');
@@ -72,64 +69,68 @@ class FormController extends Controller {
     }
 
     /**
-     * This Function to post the form for the ticket
-     * @param type Form_name $name
+     * This Function to post the form for the ticket.
+     *
+     * @param type Form_name    $name
      * @param type Form_details $details
+     *
      * @return type string
      */
-    public function postForm($id, Help_topic $topic) {
+    public function postForm($id, Help_topic $topic)
+    {
         // dd($id);
         if ($id != 0) {
             $helptopic = $topic->where('id', '=', $id)->first();
             $custom_form = $helptopic->custom_form;
             $values = Fields::where('forms_id', '=', $custom_form)->get();
             if (!$values) {
-                
-            } if ($values) {
+            }
+            if ($values) {
                 foreach ($values as $value) {
-                    if ($value->type == "select") {
+                    if ($value->type == 'select') {
                         $data = $value->value;
                         $value = explode(',', $data);
                         echo '<select class="form-control">';
                         foreach ($value as $option) {
-                            echo '<option>' . $option . '</option>';
+                            echo '<option>'.$option.'</option>';
                         }
                         echo '</select></br>';
-                    } elseif ($value->type == "radio") {
+                    } elseif ($value->type == 'radio') {
                         $type2 = $value->value;
                         $val = explode(',', $type2);
-                        echo '<label class="radio-inline">' . $value->label . '</label>&nbsp&nbsp&nbsp<input type="' . $value->type . '" name="' . $value->name . '">&nbsp;&nbsp;' . $val[0] . '
-		            	&nbsp&nbsp&nbsp<input type="' . $value->type . '" name="' . $value->name . '">&nbsp;&nbsp;' . $val[1] . '</br>';
-                    } elseif ($value->type == "textarea") {
+                        echo '<label class="radio-inline">'.$value->label.'</label>&nbsp&nbsp&nbsp<input type="'.$value->type.'" name="'.$value->name.'">&nbsp;&nbsp;'.$val[0].'
+		            	&nbsp&nbsp&nbsp<input type="'.$value->type.'" name="'.$value->name.'">&nbsp;&nbsp;'.$val[1].'</br>';
+                    } elseif ($value->type == 'textarea') {
                         $type3 = $value->value;
                         $v = explode(',', $type3);
                         //dd($v);
                         if (array_key_exists(1, $v)) {
-                            echo '<label>' . $value->label . '</label></br><textarea class=form-control rows="' . $v[0] . '" cols="' . $v[1] . '"></textarea></br>';
+                            echo '<label>'.$value->label.'</label></br><textarea class=form-control rows="'.$v[0].'" cols="'.$v[1].'"></textarea></br>';
                         } else {
-                            echo '<label>' . $value->label . '</label></br><textarea class=form-control rows="10" cols="60"></textarea></br>';
+                            echo '<label>'.$value->label.'</label></br><textarea class=form-control rows="10" cols="60"></textarea></br>';
                         }
-                    } elseif ($value->type == "checkbox") {
+                    } elseif ($value->type == 'checkbox') {
                         $type4 = $value->value;
                         $check = explode(',', $type4);
-                        echo '<label class="radio-inline">' . $value->label . '&nbsp&nbsp&nbsp<input type="' . $value->type . '" name="' . $value->name . '">&nbsp&nbsp' . $check[0] . '</label><label class="radio-inline"><input type="' . $value->type . '" name="' . $value->name . '">&nbsp&nbsp' . $check[1] . '</label></br>';
+                        echo '<label class="radio-inline">'.$value->label.'&nbsp&nbsp&nbsp<input type="'.$value->type.'" name="'.$value->name.'">&nbsp&nbsp'.$check[0].'</label><label class="radio-inline"><input type="'.$value->type.'" name="'.$value->name.'">&nbsp&nbsp'.$check[1].'</label></br>';
                     } else {
-                        echo '<label>' . $value->label . '</label><input type="' . $value->type . '" class="form-control"   name="' . $value->name . '" /></br>';
+                        echo '<label>'.$value->label.'</label><input type="'.$value->type.'" class="form-control"   name="'.$value->name.'" /></br>';
                     }
                 }
             }
         } else {
-            return null;
+            return;
         }
     }
 
     /**
-     * Posted form
+     * Posted form.
+     *
      * @param type Request $request
-     * @param type User $user
+     * @param type User    $user
      */
-    public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source) {
-
+    public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source)
+    {
         $form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token');
 
         $name = $request->input('Name');
@@ -157,26 +158,30 @@ class FormController extends Controller {
     }
 
     /**
-     * reply
-     * @param type $value 
+     * reply.
+     *
+     * @param type $value
+     *
      * @return type view
      */
-    public function post_ticket_reply($id, Request $request) {
+    public function post_ticket_reply($id, Request $request)
+    {
         $comment = $request->input('comment');
         if ($comment != null) {
             $tickets = Tickets::where('id', '=', $id)->first();
-            $threads = new Ticket_Thread;
+            $threads = new Ticket_Thread();
             $tickets->closed_at = null;
             $tickets->closed = 0;
             $tickets->reopened_at = date('Y-m-d H:i:s');
             $tickets->reopened = 1;
             $threads->user_id = $tickets->user_id;
             $threads->ticket_id = $tickets->id;
-            $threads->poster = "client";
+            $threads->poster = 'client';
             $threads->body = $comment;
             try {
                 $threads->save();
                 $tickets->save();
+
                 return \Redirect::back()->with('success1', 'Successfully replied');
             } catch (Exception $e) {
                 return \Redirect::back()->with('fails1', $e->errorInfo[2]);
@@ -185,5 +190,4 @@ class FormController extends Controller {
             return \Redirect::back()->with('fails1', 'Please fill some data!');
         }
     }
-
 }
diff --git a/app/Http/Controllers/Client/helpdesk/GuestController.php b/app/Http/Controllers/Client/helpdesk/GuestController.php
index 4d0299460..9fcb4e228 100644
--- a/app/Http/Controllers/Client/helpdesk/GuestController.php
+++ b/app/Http/Controllers/Client/helpdesk/GuestController.php
@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Client\helpdesk;
 
 // controllers
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Common\SettingsController;
 use App\Http\Controllers\Common\PhpMailController;
+use App\Http\Controllers\Common\SettingsController;
+use App\Http\Controllers\Controller;
 // requests
 use App\Http\Requests\helpdesk\CheckTicket;
 use App\Http\Requests\helpdesk\ProfilePassword;
@@ -13,31 +13,31 @@ use App\Http\Requests\helpdesk\ProfileRequest;
 use App\Http\Requests\helpdesk\TicketRequest;
 // models
 use App\Model\helpdesk\Manage\Help_topic;
-use App\Model\helpdesk\Ticket\Tickets;
-use App\Model\helpdesk\Ticket\Ticket_Thread;
 use App\Model\helpdesk\Settings\Company;
 use App\Model\helpdesk\Settings\System;
+use App\Model\helpdesk\Ticket\Ticket_Thread;
+use App\Model\helpdesk\Ticket\Tickets;
 use App\User;
 // classes
 use Auth;
+use Exception;
 use Hash;
 use Input;
-use Exception;
 
 /**
- * GuestController
+ * GuestController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class GuestController extends Controller {
-
+class GuestController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type void
      */
-    public function __construct(PhpMailController $PhpMailController) {
+    public function __construct(PhpMailController $PhpMailController)
+    {
         $this->PhpMailController = $PhpMailController;
         SettingsController::smtp();
         // checking authentication
@@ -45,21 +45,27 @@ class GuestController extends Controller {
     }
 
     /**
-     * Get profile
+     * Get profile.
+     *
      * @return type Response
      */
-    public function getProfile() {
+    public function getProfile()
+    {
         $user = Auth::user();
+
         return view('themes.default1.client.helpdesk.profile', compact('user'));
     }
 
     /**
-     * Save profile data
-     * @param type $id
+     * Save profile data.
+     *
+     * @param type                $id
      * @param type ProfileRequest $request
+     *
      * @return type Response
      */
-    public function postProfile(ProfileRequest $request) {
+    public function postProfile(ProfileRequest $request)
+    {
         $user = User::where('id', '=', Auth::user()->id)->first();
         $user->gender = $request->get('gender');
         $user->save();
@@ -78,12 +84,13 @@ class GuestController extends Controller {
             //$extension = Input::file('profile_pic')->getClientOriginalExtension();
             $name = Input::file('profile_pic')->getClientOriginalName();
             $destinationPath = 'lb-faveo/media/profilepic';
-            $fileName = rand(0000, 9999) . '.' . $name;
+            $fileName = rand(0000, 9999).'.'.$name;
             //echo $fileName;
             Input::file('profile_pic')->move($destinationPath, $fileName);
             $user->profile_pic = $fileName;
         } else {
             $user->fill($request->except('profile_pic', 'gender'))->save();
+
             return redirect()->back()->with('success1', 'Profile Updated sucessfully');
         }
         if ($user->fill($request->except('profile_pic'))->save()) {
@@ -92,26 +99,34 @@ class GuestController extends Controller {
     }
 
     /**
-     * Get Ticket page
+     * Get Ticket page.
+     *
      * @param type Help_topic $topic
+     *
      * @return type Response
      */
-    public function getTicket(Help_topic $topic) {
+    public function getTicket(Help_topic $topic)
+    {
         $topics = $topic->get();
+
         return view('themes.default1.client.helpdesk.tickets.form', compact('topics'));
     }
 
     /**
-     * getform
-     * @param type Help_topic $topic 
+     * getform.
+     *
+     * @param type Help_topic $topic
+     *
      * @return type
      */
-    public function getForm(Help_topic $topic) {
+    public function getForm(Help_topic $topic)
+    {
         if (\Config::get('database.install') == '%0%') {
             return \Redirect::route('license');
         }
         if (System::first()->status == 1) {
             $topics = $topic->get();
+
             return view('themes.default1.client.helpdesk.form', compact('topics'));
         } else {
             return \Redirect::route('home');
@@ -119,24 +134,30 @@ class GuestController extends Controller {
     }
 
     /**
-     * Get my ticket
-     * @param type Tickets $tickets
+     * Get my ticket.
+     *
+     * @param type Tickets       $tickets
      * @param type Ticket_Thread $thread
-     * @param type User $user
+     * @param type User          $user
+     *
      * @return type Response
      */
-    public function getMyticket() {
+    public function getMyticket()
+    {
         return view('themes.default1.client.helpdesk.mytickets');
     }
 
     /**
-     * Get ticket-thread
+     * Get ticket-thread.
+     *
      * @param type Ticket_Thread $thread
-     * @param type Tickets $tickets
-     * @param type User $user
+     * @param type Tickets       $tickets
+     * @param type User          $user
+     *
      * @return type Response
      */
-    public function thread(Ticket_Thread $thread, Tickets $tickets, User $user) {
+    public function thread(Ticket_Thread $thread, Tickets $tickets, User $user)
+    {
         $user_id = Auth::user()->id;
         //dd($user_id);
         /* get the ticket's id == ticket_id of thread  */
@@ -149,26 +170,31 @@ class GuestController extends Controller {
     }
 
     /**
-     * ticket Edit
+     * ticket Edit.
+     *
      * @return
      */
-    public function ticketEdit() {
-        
+    public function ticketEdit()
+    {
     }
 
     /**
-     * Post porfile password
-     * @param type $id
+     * Post porfile password.
+     *
+     * @param type                 $id
      * @param type ProfilePassword $request
+     *
      * @return type Response
      */
-    public function postProfilePassword(ProfilePassword $request) {
+    public function postProfilePassword(ProfilePassword $request)
+    {
         $user = Auth::user();
         //echo $user->password;
         if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
             $user->password = Hash::make($request->input('new_password'));
             try {
                 $user->save();
+
                 return redirect()->back()->with('success2', 'Password Updated sucessfully');
             } catch (Exception $e) {
                 return redirect()->back()->with('fails2', $e->errorInfo[2]);
@@ -179,12 +205,15 @@ class GuestController extends Controller {
     }
 
     /**
-     * Ticekt reply
+     * Ticekt reply.
+     *
      * @param type Ticket_Thread $thread
      * @param type TicketRequest $request
+     *
      * @return type Response
      */
-    public function reply(Ticket_Thread $thread, TicketRequest $request) {
+    public function reply(Ticket_Thread $thread, TicketRequest $request)
+    {
         $thread->ticket_id = $request->input('ticket_ID');
         $thread->title = $request->input('To');
         $thread->user_id = Auth::user()->id;
@@ -194,29 +223,35 @@ class GuestController extends Controller {
         $ticket_id = $request->input('ticket_ID');
         $tickets = Tickets::where('id', '=', $ticket_id)->first();
         $thread = Ticket_Thread::where('ticket_id', '=', $ticket_id)->first();
-        return Redirect("thread/" . $ticket_id);
+
+        return Redirect('thread/'.$ticket_id);
     }
 
     /**
-     * Get Checked ticket
+     * Get Checked ticket.
+     *
      * @param type Tickets $ticket
-     * @param type User $user
+     * @param type User    $user
+     *
      * @return type response
      */
-    public function getCheckTicket(Tickets $ticket, User $user) {
+    public function getCheckTicket(Tickets $ticket, User $user)
+    {
         return view('themes.default1.client.helpdesk.guest-user.newticket', compact('ticket'));
     }
 
     /**
-     * Post Check ticket
-     * @param type CheckTicket $request
-     * @param type User $user
-     * @param type Tickets $ticket
+     * Post Check ticket.
+     *
+     * @param type CheckTicket   $request
+     * @param type User          $user
+     * @param type Tickets       $ticket
      * @param type Ticket_Thread $thread
+     *
      * @return type Response
      */
-    public function PostCheckTicket() {
-
+    public function PostCheckTicket()
+    {
         $Email = \Input::get('email');
         $Ticket_number = \Input::get('ticket_number');
 
@@ -230,7 +265,7 @@ class GuestController extends Controller {
             if ($user->role == 'user') {
                 $username = $user->user_name;
             } else {
-                $username = $user->first_name . " " . $user->last_name;
+                $username = $user->first_name.' '.$user->last_name;
             }
 
             if ($user->email != $Email) {
@@ -242,7 +277,7 @@ class GuestController extends Controller {
                 $company = $this->company();
 
                 $this->PhpMailController->sendmail(
-                        $from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $user->email], $message = ['subject' => 'Ticket link Request [' . $Ticket_number . ']', 'scenario' => 'check-ticket'], $template_variables = ['user' => $username, 'ticket_link_with_number' => \URL::route('check_ticket', $code)]
+                        $from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $user->email], $message = ['subject' => 'Ticket link Request ['.$Ticket_number.']', 'scenario' => 'check-ticket'], $template_variables = ['user' => $username, 'ticket_link_with_number' => \URL::route('check_ticket', $code)]
                 );
 
                 return \Redirect::back()
@@ -252,36 +287,45 @@ class GuestController extends Controller {
     }
 
     /**
-     * get ticket email
-     * @param type $id 
+     * get ticket email.
+     *
+     * @param type $id
+     *
      * @return type
      */
-    public function get_ticket_email($id) {
+    public function get_ticket_email($id)
+    {
         $id1 = \Crypt::decrypt($id);
+
         return view('themes.default1.client.helpdesk.ckeckticket', compact('id'));
     }
 
     /**
-     * get ticket status
-     * @param type Tickets $ticket 
+     * get ticket status.
+     *
+     * @param type Tickets $ticket
+     *
      * @return type
      */
-    public function getTicketStat(Tickets $ticket) {
+    public function getTicketStat(Tickets $ticket)
+    {
         return view('themes.default1.client.helpdesk.ckeckticket', compact('ticket'));
     }
 
     /**
-     * get company
+     * get company.
+     *
      * @return type
      */
-    public function company() {
+    public function company()
+    {
         $company = Company::Where('id', '=', '1')->first();
         if ($company->company_name == null) {
-            $company = "Support Center";
+            $company = 'Support Center';
         } else {
             $company = $company->company_name;
         }
+
         return $company;
     }
-
 }
diff --git a/app/Http/Controllers/Client/helpdesk/WelcomepageController.php b/app/Http/Controllers/Client/helpdesk/WelcomepageController.php
index 8a17d96bc..04ef25a02 100644
--- a/app/Http/Controllers/Client/helpdesk/WelcomepageController.php
+++ b/app/Http/Controllers/Client/helpdesk/WelcomepageController.php
@@ -9,23 +9,21 @@ use App\Model\helpdesk\Settings\System;
 // classes
 use Config;
 use Redirect;
-use Exception;
 
 /**
- * OuthouseController
+ * OuthouseController.
  *
- * @package     Controllers
- * @subpackage  Controller
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class WelcomepageController extends Controller {
-
+class WelcomepageController extends Controller
+{
     /**
      * Display a listing of the resource.
      *
      * @return Response
      */
-    public function get(System $note) {
+    public function get(System $note)
+    {
         if (Config::get('database.install') == '%0%') {
             return Redirect::route('licence');
         }
@@ -33,14 +31,16 @@ class WelcomepageController extends Controller {
         foreach ($notes as $note) {
             $content = $note->content;
         }
+
         return view('themes.default1.client.guest-user.guest', compact('heading', 'content'));
     }
 
-    public function index() {
+    public function index()
+    {
         if (Config::get('database.install') == '%0%') {
             return Redirect::route('licence');
         }
+
         return view('themes.default1.client.helpdesk.guest-user.index');
     }
-
 }
diff --git a/app/Http/Controllers/Client/kb/UserController.php b/app/Http/Controllers/Client/kb/UserController.php
index 62c21ce5b..2ecf9da39 100644
--- a/app/Http/Controllers/Client/kb/UserController.php
+++ b/app/Http/Controllers/Client/kb/UserController.php
@@ -5,8 +5,8 @@ namespace App\Http\Controllers\Client\kb;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\kb\CommentRequest;
 use App\Http\Requests\kb\ContactRequest;
-use App\Http\Requests\kb\SearchRequest;
 use App\Http\Requests\kb\ProfilePassword;
+use App\Http\Requests\kb\SearchRequest;
 use App\Model\kb\Article;
 use App\Model\kb\Category;
 use App\Model\kb\Comment;
@@ -15,18 +15,18 @@ use App\Model\kb\Faq;
 use App\Model\kb\Page;
 use App\Model\kb\Relationship;
 use App\Model\kb\Settings;
-use Config;
+use Auth;
 // use Creativeorange\Gravatar\Gravatar;
+use Config;
+use Hash;
 use Illuminate\Http\Request;
 use Mail;
-use Auth;
 use Redirect;
-use Hash;
-use Exception;
 
-class UserController extends Controller {
-
-    public function __construct() {
+class UserController extends Controller
+{
+    public function __construct()
+    {
         //$this->middleware('auth');
         //SettingsController::language();
         // $this->port();
@@ -38,11 +38,11 @@ class UserController extends Controller {
 
     /**
      * @param
+     *
      * @return response
-     * @package default
      */
-    public function getArticle(Article $article, Category $category, Settings $settings) {
-
+    public function getArticle(Article $article, Category $category, Settings $settings)
+    {
         $settings = $settings->first();
         $pagination = $settings->pagination;
         // $article = $article->where('status', '1');
@@ -56,14 +56,16 @@ class UserController extends Controller {
     }
 
     /**
-     * Get excerpt from string
+     * Get excerpt from string.
      *
-     * @param String $str String to get an excerpt from
-     * @param Integer $startPos Position int string to start excerpt from
-     * @param Integer $maxLength Maximum length the excerpt may be
-     * @return String excerpt
+     * @param string $str       String to get an excerpt from
+     * @param int    $startPos  Position int string to start excerpt from
+     * @param int    $maxLength Maximum length the excerpt may be
+     *
+     * @return string excerpt
      */
-    static function getExcerpt($str, $startPos = 0, $maxLength = 50) {
+    public static function getExcerpt($str, $startPos = 0, $maxLength = 50)
+    {
         if (strlen($str) > $maxLength) {
             $excerpt = substr($str, $startPos, $maxLength - 3);
             $lastSpace = strrpos($excerpt, ' ');
@@ -76,7 +78,8 @@ class UserController extends Controller {
         return $excerpt;
     }
 
-    public function search(SearchRequest $request, Category $category, Article $article, Settings $settings) {
+    public function search(SearchRequest $request, Category $category, Article $article, Settings $settings)
+    {
         $settings = $settings->first();
         $pagination = $settings->pagination;
         $search = $request->input('s');
@@ -84,14 +87,17 @@ class UserController extends Controller {
         $result->setPath('search');
         //dd($result);
         $categorys = $category->get();
+
         return view('themes.default1.client.kb.article-list.search', compact('categorys', 'result'));
     }
 
     /**
-     * to show the seleted article
+     * to show the seleted article.
+     *
      * @return response
      */
-    public function show($slug, Article $article, Category $category) {
+    public function show($slug, Article $article, Category $category)
+    {
         //ArticleController::timezone();
         $tz = \App\Model\helpdesk\Settings\System::where('id', '1')->first()->time_zone;
         $tz = \App\Model\helpdesk\Utility\Timezones::where('id', $tz)->first()->name;
@@ -105,7 +111,8 @@ class UserController extends Controller {
         }
     }
 
-    public function getCategory($slug, Article $article, Category $category, Relationship $relation) {
+    public function getCategory($slug, Article $article, Category $category, Relationship $relation)
+    {
         /* get the article_id where category_id == current category */
         $catid = $category->where('slug', $slug)->first();
         $id = $catid->id;
@@ -118,7 +125,8 @@ class UserController extends Controller {
         return view('themes.default1.client.kb.article-list.category', compact('all', 'id', 'categorys', 'article_id'));
     }
 
-    public function home(Article $article, Category $category, Relationship $relation) {
+    public function home(Article $article, Category $category, Relationship $relation)
+    {
         if (Config::get('database.install') == '%0%') {
             return redirect('step1');
         } else {
@@ -130,27 +138,34 @@ class UserController extends Controller {
         }
     }
 
-    public function Faq(Faq $faq, Category $category) {
+    public function Faq(Faq $faq, Category $category)
+    {
         $faq = $faq->where('id', '1')->first();
         $categorys = $category->get();
+
         return view('themes.default1.client.kb.article-list.faq', compact('categorys', 'faq'));
     }
 
     /**
-     * get the contact page for user
+     * get the contact page for user.
+     *
      * @return response
      */
-    public function contact(Category $category, Settings $settings) {
+    public function contact(Category $category, Settings $settings)
+    {
         $settings = $settings->whereId('1')->first();
         $categorys = $category->get();
+
         return view('themes.default1.client.kb.article-list.contact', compact('settings', 'categorys'));
     }
 
     /**
-     * send message to the mail adderess that define in the system
+     * send message to the mail adderess that define in the system.
+     *
      * @return response
      */
-    public function postContact(ContactRequest $request, Contact $contact) {
+    public function postContact(ContactRequest $request, Contact $contact)
+    {
         $this->port();
         $this->host();
         $this->encryption();
@@ -167,7 +182,7 @@ class UserController extends Controller {
         $details = $request->input('message');
         //echo $message;
         //echo $contact->email;
-        $mail = Mail::send('themes.default1.client.kb.article-list.contact-details', array('name' => $name, 'email' => $email, 'subject' => $subject, 'details' => $details), function ($message) use ($contact) {
+        $mail = Mail::send('themes.default1.client.kb.article-list.contact-details', ['name' => $name, 'email' => $email, 'subject' => $subject, 'details' => $details], function ($message) use ($contact) {
                     $message->to($contact->email, $contact->name)->subject('Contact');
                 });
         if ($mail) {
@@ -177,19 +192,23 @@ class UserController extends Controller {
         }
     }
 
-    public function contactDetails() {
+    public function contactDetails()
+    {
         return view('themes.default1.client.kb.article-list.contact-details');
     }
 
     /**
-     * To insert the values to the comment table
+     * To insert the values to the comment table.
+     *
      * @param type Article $article
      * @param type Request $request
      * @param type Comment $comment
-     * @param type Id $id
+     * @param type Id      $id
+     *
      * @return type response
      */
-    public function postComment($slug, Article $article, CommentRequest $request, Comment $comment) {
+    public function postComment($slug, Article $article, CommentRequest $request, Comment $comment)
+    {
         $article = $article->where('slug', $slug)->first();
         $id = $article->id;
         $comment->article_id = $id;
@@ -200,39 +219,46 @@ class UserController extends Controller {
         }
     }
 
-    public function getPage($name, Page $page) {
+    public function getPage($name, Page $page)
+    {
         $page = $page->where('slug', $name)->first();
         //$this->timezone($page->created_at);
         return view('themes.default1.client.kb.article-list.pages', compact('page'));
     }
 
-    static function port() {
+    public static function port()
+    {
         $setting = Settings::whereId('1')->first();
         Config::set('mail.port', $setting->port);
     }
 
-    static function host() {
+    public static function host()
+    {
         $setting = Settings::whereId('1')->first();
         Config::set('mail.host', $setting->host);
     }
 
-    static function encryption() {
+    public static function encryption()
+    {
         $setting = Settings::whereId('1')->first();
         Config::set(['mail.encryption' => $setting->encryption, 'mail.username' => $setting->email]);
     }
 
-    static function email() {
+    public static function email()
+    {
         $setting = Settings::whereId('1')->first();
         Config::set(['mail.from' => ['address' => $setting->email, 'name' => 'asd']]);
         //dd(Config::get('mail'));
     }
 
-    static function password() {
+    public static function password()
+    {
         $setting = Settings::whereId('1')->first();
         Config::set(['mail.password' => $setting->password, 'mail.sendmail' => $setting->email]);
     }
 
-    public function getCategoryList(Article $article, Category $category, Relationship $relation) {
+    public function getCategoryList(Article $article, Category $category, Relationship $relation)
+    {
         //$categorys = $category->get();
         $categorys = $category->get();
         // $categorys->setPath('home');
@@ -254,12 +280,15 @@ class UserController extends Controller {
     // 	//return substr($date, 0, -6);
     // }
 
-    public function clientProfile() {
+    public function clientProfile()
+    {
         $user = Auth::user();
+
         return view('themes.default1.client.kb.article-list.profile', compact('user'));
     }
 
-    public function postClientProfile($id, ProfileRequest $request) {
+    public function postClientProfile($id, ProfileRequest $request)
+    {
         $user = Auth::user();
         $user->gender = $request->input('gender');
         $user->save();
@@ -278,12 +307,13 @@ class UserController extends Controller {
             //$extension = Input::file('profile_pic')->getClientOriginalExtension();
             $name = Input::file('profile_pic')->getClientOriginalName();
             $destinationPath = 'lb-faveo/dist/img';
-            $fileName = rand(0000, 9999) . '.' . $name;
+            $fileName = rand(0000, 9999).'.'.$name;
             //echo $fileName;
             Input::file('profile_pic')->move($destinationPath, $fileName);
             $user->profile_pic = $fileName;
         } else {
             $user->fill($request->except('profile_pic', 'gender'))->save();
+
             return redirect('guest')->with('success', 'Profile Updated sucessfully');
         }
         if ($user->fill($request->except('profile_pic'))->save()) {
@@ -291,16 +321,17 @@ class UserController extends Controller {
         }
     }
 
-    public function postClientProfilePassword($id, ProfilePassword $request) {
+    public function postClientProfilePassword($id, ProfilePassword $request)
+    {
         $user = Auth::user();
         //echo $user->password;
         if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
             $user->password = Hash::make($request->input('new_password'));
             $user->save();
+
             return redirect()->back()->with('success', 'Password Updated sucessfully');
         } else {
             return redirect()->back()->with('fails', 'Password was not Updated');
         }
     }
-
 }
diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php
index 4d46e084a..8309ac289 100644
--- a/app/Http/Controllers/Common/PhpMailController.php
+++ b/app/Http/Controllers/Common/PhpMailController.php
@@ -2,21 +2,20 @@
 
 namespace App\Http\Controllers\Common;
 
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
-use Phpmailer\PHPMailerautoload;
-use Illuminate\Http\Request;
-use Auth;
+use App\Model\helpdesk\Agent\Department;
 use App\Model\helpdesk\Email\Emails;
+use App\Model\helpdesk\Settings\Company;
 use App\Model\helpdesk\Settings\Email;
 use App\User;
-use App\Model\helpdesk\Settings\Company;
-use App\Model\helpdesk\Agent\Department;
+use Auth;
 
-class PhpMailController extends Controller {
-
-    public function fetch_smtp_details($id) {
+class PhpMailController extends Controller
+{
+    public function fetch_smtp_details($id)
+    {
         $emails = Emails::where('id', '=', $id)->first();
+
         return $emails;
     }
 
@@ -25,7 +24,8 @@ class PhpMailController extends Controller {
      *
      * @return Mail
      */
-    public function sendmail($from, $to, $message, $template_variables) {
+    public function sendmail($from, $to, $message, $template_variables)
+    {
         // dd($from);
         $from_address = $this->fetch_smtp_details($from);
 
@@ -169,21 +169,21 @@ class PhpMailController extends Controller {
 
         $system_from = $this->company();
 
-        $mail = new \PHPMailer;
+        $mail = new \PHPMailer();
 
         $status = \DB::table('settings_email')->first();
 
         $path2 = \Config::get('view.paths');
 
-        $directory = $path2[0] . '\emails' . DIRECTORY_SEPARATOR . $status->template . DIRECTORY_SEPARATOR;
+        $directory = $path2[0].'\emails'.DIRECTORY_SEPARATOR.$status->template.DIRECTORY_SEPARATOR;
 
-        $handle = fopen($directory . $template . '.blade.php', "r");
-        $contents = fread($handle, filesize($directory . $template . '.blade.php'));
+        $handle = fopen($directory.$template.'.blade.php', 'r');
+        $contents = fread($handle, filesize($directory.$template.'.blade.php'));
         fclose($handle);
 
-        $variables = array('{!!$user!!}', '{!!$agent!!}', '{!!$ticket_number!!}', '{!!$content!!}', '{!!$from!!}', '{!!$ticket_agent_name!!}', '{!!$ticket_client_name!!}', '{!!$ticket_client_email!!}', '{!!$ticket_body!!}', '{!!$ticket_assigner!!}', '{!!$ticket_link_with_number!!}', '{!!$system_error!!}', '{!!$agent_sign!!}', '{!!$department_sign!!}', '{!!$password_reset_link!!}', '{!!$email_address!!}', '{!!$user_password!!}', '{!!$system_from!!}', '{!!$system_link!!}');
+        $variables = ['{!!$user!!}', '{!!$agent!!}', '{!!$ticket_number!!}', '{!!$content!!}', '{!!$from!!}', '{!!$ticket_agent_name!!}', '{!!$ticket_client_name!!}', '{!!$ticket_client_email!!}', '{!!$ticket_body!!}', '{!!$ticket_assigner!!}', '{!!$ticket_link_with_number!!}', '{!!$system_error!!}', '{!!$agent_sign!!}', '{!!$department_sign!!}', '{!!$password_reset_link!!}', '{!!$email_address!!}', '{!!$user_password!!}', '{!!$system_from!!}', '{!!$system_link!!}'];
 
-        $data = array($user, $agent, $ticket_number, $content, $from, $ticket_agent_name, $ticket_client_name, $ticket_client_email, $ticket_body, $ticket_assigner, $ticket_link_with_number, $system_error, $agent_sign, $department_sign, $password_reset_link, $email_address, $user_password, $system_from, $system_link);
+        $data = [$user, $agent, $ticket_number, $content, $from, $ticket_agent_name, $ticket_client_name, $ticket_client_email, $ticket_body, $ticket_assigner, $ticket_link_with_number, $system_error, $agent_sign, $department_sign, $password_reset_link, $email_address, $user_password, $system_from, $system_link];
 
         // dd($variables,$data,$contents);
         // $messagebody = str_replace($variables, $data, $contents);
@@ -195,7 +195,6 @@ class PhpMailController extends Controller {
             $contents = $messagebody;
         }
 
-
         // dd($messagebody);
         //$mail->SMTPDebug = 3;                               // Enable verbose debug output
 
@@ -226,7 +225,7 @@ class PhpMailController extends Controller {
         $mail->addBCC($bc);
 
         if ($attachment != null) {
-            $size = sizeOf($message['attachments']);
+            $size = count($message['attachments']);
             $attach = $message['attachments'];
             for ($i = 0; $i < $size; $i++) {
                 $file_path = $attach[$i]->getRealPath();
@@ -237,8 +236,8 @@ class PhpMailController extends Controller {
 
         $mail->Subject = $subject;
         if ($template == 'ticket-reply-agent') {
-            $line = "---Reply above this line--- <br/><br/>";
-            $mail->Body = $line . $messagebody;
+            $line = '---Reply above this line--- <br/><br/>';
+            $mail->Body = $line.$messagebody;
         } else {
             $mail->Body = $messagebody;
         }
@@ -247,23 +246,26 @@ class PhpMailController extends Controller {
 
         if (!$mail->send()) {
             echo 'Message could not be sent.';
-            echo 'Mailer Error: ' . $mail->ErrorInfo;
+            echo 'Mailer Error: '.$mail->ErrorInfo;
         } else {
             echo 'Message has been sent';
         }
     }
 
     /**
-     * Fetching comapny name to send mail
+     * Fetching comapny name to send mail.
+     *
      * @return type
      */
-    public function company() {
+    public function company()
+    {
         $company = Company::Where('id', '=', '1')->first();
         if ($company->company_name == null) {
-            $company = "Support Center";
+            $company = 'Support Center';
         } else {
             $company = $company->company_name;
         }
+
         return $company;
     }
 
@@ -311,12 +313,15 @@ class PhpMailController extends Controller {
     // }
 
     /**
-     * Function to choose from address
-     * @param type Reg $reg
+     * Function to choose from address.
+     *
+     * @param type Reg        $reg
      * @param type Department $dept_id
+     *
      * @return type integer
      */
-    public function mailfrom($reg, $dept_id) {
+    public function mailfrom($reg, $dept_id)
+    {
         $email = Email::where('id', '=', '1')->first();
         if ($reg == 1) {
             return $email->sys_email;
@@ -329,5 +334,4 @@ class PhpMailController extends Controller {
             }
         }
     }
-
 }
diff --git a/app/Http/Controllers/Common/SettingsController.php b/app/Http/Controllers/Common/SettingsController.php
index 874b1c6c4..9478a1181 100644
--- a/app/Http/Controllers/Common/SettingsController.php
+++ b/app/Http/Controllers/Common/SettingsController.php
@@ -5,60 +5,65 @@ namespace App\Http\Controllers\Common;
 // controllers
 use App\Http\Controllers\Controller;
 // requests
-use Illuminate\Http\Request;
-use App\Http\Requests\helpdesk\SmtpRequest;
 use App\Http\Requests;
-// models
-use App\Model\helpdesk\Theme\Widgets;
+use App\Http\Requests\helpdesk\SmtpRequest;
 use App\Model\helpdesk\Email\Smtp;
-use App\Model\helpdesk\Utility\Version_Check;
+// models
 use App\Model\helpdesk\Settings\Plugin;
-// classes
+use App\Model\helpdesk\Theme\Widgets;
+use App\Model\helpdesk\Utility\Version_Check;
 use Config;
-use Input;
+// classes
 use Crypt;
-use Illuminate\Support\Collection;
 use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Input;
 
 /**
  * ***************************
  * Settings Controllers
  * ***************************
- * Controller to keep smtp details and fetch where ever needed
- * @package default
+ * Controller to keep smtp details and fetch where ever needed.
  */
-class SettingsController extends Controller {
-
+class SettingsController extends Controller
+{
     /**
      * Create a new controller instance.
+     *
      * @return type void
      */
-    public function __construct() {
-// $this->smtp();
+    public function __construct()
+    {
+        // $this->smtp();
         $this->middleware('auth');
         $this->middleware('roles');
-        SettingsController::driver();
-        SettingsController::host();
-        SettingsController::port();
-        SettingsController::from();
-        SettingsController::encryption();
-        SettingsController::username();
-        SettingsController::password();
+        self::driver();
+        self::host();
+        self::port();
+        self::from();
+        self::encryption();
+        self::username();
+        self::password();
     }
 
     /**
-     * get the page to create the footer
+     * get the page to create the footer.
+     *
      * @return response
      */
-    public function widgets() {
+    public function widgets()
+    {
         return view('themes.default1.admin.helpdesk.theme.widgets');
     }
 
     /**
-     * get the page to create the footer
+     * get the page to create the footer.
+     *
      * @return response
      */
-    public function list_widget() {
+    public function list_widget()
+    {
         return \Datatable::collection(Widgets::where('id', '<', '7')->get())
                         ->searchColumns('name')
                         ->orderColumns('name', 'title', 'value')
@@ -72,33 +77,33 @@ class SettingsController extends Controller {
                             return $model->value;
                         })
                         ->addColumn('Actions', function ($model) {
-                            return '<span data-toggle="modal" data-target="#edit_widget' . $model->id . '"><a class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a></span>
-                <div class="modal fade" id="edit_widget' . $model->id . '">
+                            return '<span data-toggle="modal" data-target="#edit_widget'.$model->id.'"><a class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a></span>
+                <div class="modal fade" id="edit_widget'.$model->id.'">
                     <div class="modal-dialog">
                         <div class="modal-content">
-                            <form action="' . url('edit-widget/' . $model->id) . '" method="POST">
+                            <form action="'.url('edit-widget/'.$model->id).'" method="POST">
                                 <div class="modal-header">
                                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                                    <h4 class="modal-title">' . strtoupper($model->name) . ' </h4>
+                                    <h4 class="modal-title">'.strtoupper($model->name).' </h4>
                                 </div>
                                 <div class="modal-body">
                                     <div class="form-group" style="width:100%">
-                                        <label>' . \Lang::get("lang.title") . '</label><br/>
-                                        <input type="text" name="title" value="' . $model->title . '" class="form-control" style="width:100%">
+                                        <label>'.\Lang::get('lang.title').'</label><br/>
+                                        <input type="text" name="title" value="'.$model->title.'" class="form-control" style="width:100%">
                                     </div>
                                     <br/>
                                     <div class="form-group" style="width:100%">
-                                        <label>' . \Lang::get("lang.content") . '</label><br/>
-                                        <textarea name="content" class="form-control" style="width:100%" id="Content' . $model->id . '">' . $model->value . '</textarea>
+                                        <label>'.\Lang::get('lang.content').'</label><br/>
+                                        <textarea name="content" class="form-control" style="width:100%" id="Content'.$model->id.'">'.$model->value.'</textarea>
                                     </div>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">' . \Lang::get('lang.close') . '</button>
-                                    <input type="submit" class="btn btn-primary" value="' . \Lang::get('lang.update') . '">
+                                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">'.\Lang::get('lang.close').'</button>
+                                    <input type="submit" class="btn btn-primary" value="'.\Lang::get('lang.update').'">
                                 </div>
                                 <script>
                                     $(function () {
-                                        $("#Content' . $model->id . '").wysihtml5();
+                                        $("#Content'.$model->id.'").wysihtml5();
                                     });
                                 </script>
                             </form>
@@ -110,36 +115,44 @@ class SettingsController extends Controller {
     }
 
     /**
-     * Post footer
-     * @param type Footer $footer
+     * Post footer.
+     *
+     * @param type Footer  $footer
      * @param type Request $request
+     *
      * @return type response
      */
-    public function edit_widget($id, Widgets $widgets, Request $request) {
+    public function edit_widget($id, Widgets $widgets, Request $request)
+    {
         $widget = $widgets->where('id', '=', $id)->first();
         $widget->title = $request->title;
         $widget->value = $request->content;
         try {
             $widget->save();
-            return redirect()->back()->with('success', $widget->name . ' Saved Successfully');
+
+            return redirect()->back()->with('success', $widget->name.' Saved Successfully');
         } catch (Exception $e) {
             return redirect()->back()->with('fails', $e->errorInfo[2]);
         }
     }
 
     /**
-     * get the page to create the footer
+     * get the page to create the footer.
+     *
      * @return response
      */
-    public function social_buttons() {
+    public function social_buttons()
+    {
         return view('themes.default1.admin.helpdesk.theme.social');
     }
 
     /**
-     * get the page to create the footer
+     * get the page to create the footer.
+     *
      * @return response
      */
-    public function list_social_buttons() {
+    public function list_social_buttons()
+    {
         return \Datatable::collection(Widgets::where('id', '>', '6')->get())
                         ->searchColumns('name')
                         ->orderColumns('name', 'value')
@@ -150,25 +163,25 @@ class SettingsController extends Controller {
                             return $model->value;
                         })
                         ->addColumn('Actions', function ($model) {
-                            return '<span data-toggle="modal" data-target="#edit_widget' . $model->id . '"><a class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a></span>
-                <div class="modal fade" id="edit_widget' . $model->id . '">
+                            return '<span data-toggle="modal" data-target="#edit_widget'.$model->id.'"><a class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a></span>
+                <div class="modal fade" id="edit_widget'.$model->id.'">
                     <div class="modal-dialog">
                         <div class="modal-content">
-                            <form action="' . url('edit-widget/' . $model->id) . '" method="POST">
+                            <form action="'.url('edit-widget/'.$model->id).'" method="POST">
                                 <div class="modal-header">
                                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                                    <h4 class="modal-title">' . strtoupper($model->name) . ' </h4>
+                                    <h4 class="modal-title">'.strtoupper($model->name).' </h4>
                                 </div>
                                 <div class="modal-body">
                                     <br/>
                                     <div class="form-group" style="width:100%">
-                                        <label>' . \Lang::get("lang.link") . '</label><br/>
-                                        <input type="url" name="content" class="form-control" style="width:100%" value="' . $model->value . '">
+                                        <label>'.\Lang::get('lang.link').'</label><br/>
+                                        <input type="url" name="content" class="form-control" style="width:100%" value="'.$model->value.'">
                                     </div>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">' . \Lang::get('lang.close') . '</button>
-                                    <input type="submit" class="btn btn-primary" value="' . \Lang::get('lang.update') . '">
+                                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">'.\Lang::get('lang.close').'</button>
+                                    <input type="submit" class="btn btn-primary" value="'.\Lang::get('lang.update').'">
                                 </div>
                             </form>
                         </div>
@@ -179,88 +192,106 @@ class SettingsController extends Controller {
     }
 
     /**
-     * Post footer
-     * @param type Footer $footer
+     * Post footer.
+     *
+     * @param type Footer  $footer
      * @param type Request $request
+     *
      * @return type response
      */
-    public function edit_social_buttons($id, Widgets $widgets, Request $request) {
+    public function edit_social_buttons($id, Widgets $widgets, Request $request)
+    {
         $widget = $widgets->where('id', '=', $id)->first();
         $widget->title = $request->title;
         $widget->value = $request->content;
         try {
             $widget->save();
-            return redirect()->back()->with('success', $widget->name . ' Saved Successfully');
+
+            return redirect()->back()->with('success', $widget->name.' Saved Successfully');
         } catch (Exception $e) {
             return redirect()->back()->with('fails', $e->errorInfo[2]);
         }
     }
 
     /**
-     * Driver
+     * Driver.
+     *
      * @return type void
      */
-    static function driver() {
-        $set = new Smtp;
+    public static function driver()
+    {
+        $set = new Smtp();
         $settings = Smtp::where('id', '=', '1')->first();
         Config::set('mail.host', $settings->driver);
     }
 
     /**
-     * SMTP host
+     * SMTP host.
+     *
      * @return type void
      */
-    static function host() {
-        $set = new Smtp;
+    public static function host()
+    {
+        $set = new Smtp();
         $settings = Smtp::where('id', '=', '1')->first();
         Config::set('mail.host', $settings->host);
     }
 
     /**
-     * SMTP port
+     * SMTP port.
+     *
      * @return type void
      */
-    static function port() {
-        $set = new Smtp;
+    public static function port()
+    {
+        $set = new Smtp();
         $settings = Smtp::where('id', '=', '1')->first();
         Config::set('mail.port', intval($settings->port));
     }
 
     /**
-     * SMTP from
+     * SMTP from.
+     *
      * @return type void
      */
-    static function from() {
-        $set = new Smtp;
+    public static function from()
+    {
+        $set = new Smtp();
         $settings = Smtp::where('id', '=', '1')->first();
         Config::set('mail.from', ['address' => $settings->email, 'name' => $settings->company_name]);
     }
 
     /**
-     * SMTP encryption
+     * SMTP encryption.
+     *
      * @return type void
      */
-    static function encryption() {
-        $set = new Smtp;
+    public static function encryption()
+    {
+        $set = new Smtp();
         $settings = Smtp::where('id', '=', '1')->first();
         Config::set('mail.encryption', $settings->encryption);
     }
 
     /**
-     * SMTP username
+     * SMTP username.
+     *
      * @return type void
      */
-    static function username() {
-        $set = new Smtp;
+    public static function username()
+    {
+        $set = new Smtp();
         $settings = Smtp::where('id', '=', '1')->first();
         Config::set('mail.username', $settings->email);
     }
 
     /**
-     * SMTP password
+     * SMTP password.
+     *
      * @return type void
      */
-    static function password() {
+    public static function password()
+    {
         $settings = Smtp::first();
         if ($settings->password) {
             $pass = $settings->password;
@@ -270,19 +301,24 @@ class SettingsController extends Controller {
     }
 
     /**
-     * get SMTP
+     * get SMTP.
+     *
      * @return type view
      */
-    public function getsmtp() {
+    public function getsmtp()
+    {
         $settings = Smtp::where('id', '=', '1')->first();
+
         return view('themes.default1.admin.helpdesk.emails.smtp', compact('settings'));
     }
 
     /**
-     * POST SMTP
+     * POST SMTP.
+     *
      * @return type view
      */
-    public function postsmtp(SmtpRequest $request) {
+    public function postsmtp(SmtpRequest $request)
+    {
         $data = Smtp::where('id', '=', 1)->first();
         $data->driver = $request->input('driver');
         $data->host = $request->input('host');
@@ -293,6 +329,7 @@ class SettingsController extends Controller {
         $data->password = Crypt::encrypt($request->input('password'));
         try {
             $data->save();
+
             return \Redirect::route('getsmtp')->with('success', 'success');
         } catch (Exception $e) {
             return \Redirect::route('getsmtp')->with('fails', $e->errorInfo[2]);
@@ -300,10 +337,12 @@ class SettingsController extends Controller {
     }
 
     /**
-     * SMTP
+     * SMTP.
+     *
      * @return type void
      */
-    static function smtp() {
+    public static function smtp()
+    {
         $settings = Smtp::where('id', '=', '1')->first();
         if ($settings->password) {
             $password = Crypt::decrypt($settings->password);
@@ -318,22 +357,29 @@ class SettingsController extends Controller {
     }
 
     /**
-     * Settings
-     * @param type Smtp $set 
+     * Settings.
+     *
+     * @param type Smtp $set
+     *
      * @return type view\
      */
-    public function settings(Smtp $set) {
+    public function settings(Smtp $set)
+    {
         $settings = $set->where('id', '1')->first();
+
         return view('themes.default1.admin.settings', compact('settings'));
     }
 
     /**
-     * Post settings
-     * @param type Settings $set 
-     * @param type Request $request 
+     * Post settings.
+     *
+     * @param type Settings $set
+     * @param type Request  $request
+     *
      * @return type view
      */
-    public function PostSettings(Settings $set, Request $request) {
+    public function PostSettings(Settings $set, Request $request)
+    {
         $settings = $set->where('id', '1')->first();
         $pass = $request->input('password');
         $password = Crypt::encrypt($pass);
@@ -346,13 +392,14 @@ class SettingsController extends Controller {
         if (Input::file('logo')) {
             $name = Input::file('logo')->getClientOriginalName();
             $destinationPath = 'dist/logo';
-            $fileName = rand(0000, 9999) . '.' . $name;
+            $fileName = rand(0000, 9999).'.'.$name;
             Input::file('logo')->move($destinationPath, $fileName);
             $settings->logo = $fileName;
             $settings->save();
         }
         try {
             $settings->fill($request->except('logo', 'password'))->save();
+
             return redirect()->back()->with('success', 'Settings updated Successfully');
         } catch (Exception $e) {
             return redirect()->back()->with('fails', $e->errorInfo[2]);
@@ -360,25 +407,29 @@ class SettingsController extends Controller {
     }
 
     /**
-     * version_check
+     * version_check.
+     *
      * @return type
      */
-    public function version_check() {
+    public function version_check()
+    {
         $response_url = \URL::route('post-version-check');
         echo "<form action='http://www.faveohelpdesk.com/bill/version' method='post' name='redirect'>";
         echo "<input type='hidden' name='_token' value='csrf_token()'/>";
         echo "<input type='hidden' name='title' value='helpdeskcommunityedition'/>";
         echo "<input type='hidden' name='id' value='19'/>";
-        echo "<input type='hidden' name='response_url' value='" . $response_url . "' />";
-        echo "</form>";
+        echo "<input type='hidden' name='response_url' value='".$response_url."' />";
+        echo '</form>';
         echo "<script language='javascript'>document.redirect.submit();</script>";
     }
 
     /**
-     * post_version_check
+     * post_version_check.
+     *
      * @return type
      */
-    public function post_version_check(Request $request) {
+    public function post_version_check(Request $request)
+    {
         $current_version = \Config::get('app.version');
         $new_version = $request->value;
         if ($current_version == $new_version) {
@@ -390,38 +441,41 @@ class SettingsController extends Controller {
             $version->new_version = $new_version;
             $version->save();
             // echo "Version " . $new_version . " is Available";
-            return redirect()->route('checkupdate')->with('info', ' Version ' . $new_version . ' is Available');
+            return redirect()->route('checkupdate')->with('info', ' Version '.$new_version.' is Available');
         } else {
             // echo "Error Checking Version";
             return redirect()->route('checkupdate')->with('info', ' Error Checking Version');
         }
     }
 
-    public function getupdate() {
+    public function getupdate()
+    {
         return \View::make('themes.default1.admin.helpdesk.settings.checkupdate');
     }
 
-    public function Plugins() {
+    public function Plugins()
+    {
         return view('themes.default1.admin.helpdesk.settings.plugins');
     }
 
-    public function GetPlugin() {
+    public function GetPlugin()
+    {
         $plugins = $this->fetchConfig();
 
         return \Datatable::collection(new Collection($plugins))
                         ->searchColumns('name')
-                        ->addColumn('name', function($model) {
+                        ->addColumn('name', function ($model) {
                             if (array_has($model, 'path')) {
                                 if ($model['status'] == 0) {
-                                    $activate = "<a href=" . url('plugin/status/' . $model['path']) . ">Activate</a>";
-                                    $settings = " ";
+                                    $activate = '<a href='.url('plugin/status/'.$model['path']).'>Activate</a>';
+                                    $settings = ' ';
                                 } else {
-                                    $settings = "<a href=" . url($model['settings']) . ">Settings</a> | ";
-                                    $activate = "<a href=" . url('plugin/status/' . $model['path']) . ">Deactivate</a>";
+                                    $settings = '<a href='.url($model['settings']).'>Settings</a> | ';
+                                    $activate = '<a href='.url('plugin/status/'.$model['path']).'>Deactivate</a>';
                                 }
 
-                                $delete = "<a href=  id=delete" . $model['path'] . " data-toggle=modal data-target=#del" . $model['path'] . "><span style='color:red'>Delete</span></a>"
-                                        . "<div class='modal fade' id=del" . $model['path'] . ">
+                                $delete = '<a href=  id=delete'.$model['path'].' data-toggle=modal data-target=#del'.$model['path']."><span style='color:red'>Delete</span></a>"
+                                        ."<div class='modal fade' id=del".$model['path'].">
                                             <div class='modal-dialog'>
                                                 <div class=modal-content>  
                                                     <div class=modal-header>
@@ -430,8 +484,8 @@ class SettingsController extends Controller {
                                                     <div class=modal-body>
                                                        <p>Are you Sure ?</p>
                                                         <div class=modal-footer>
-                                                            <button type=button class='btn btn-default pull-left' data-dismiss=modal id=dismis>" . \Lang::get('lang.close') . "</button>
-                                                            <a href=" . url('plugin/delete/' . $model['path']) . "><button class='btn btn-danger'>Delete</button></a>
+                                                            <button type=button class='btn btn-default pull-left' data-dismiss=modal id=dismis>".\Lang::get('lang.close').'</button>
+                                                            <a href='.url('plugin/delete/'.$model['path'])."><button class='btn btn-danger'>Delete</button></a>
                                                         </div>
 
 
@@ -439,116 +493,129 @@ class SettingsController extends Controller {
                                                 </div>
                                             </div>
                                         </div>";
-                                $action = "<br><br>" . $delete . " | " . $settings . $activate;
+                                $action = '<br><br>'.$delete.' | '.$settings.$activate;
                             } else {
                                 $action = '';
                             }
-                            return ucfirst($model['name']) . $action;
+
+                            return ucfirst($model['name']).$action;
                         })
-                        ->addColumn('description', function($model) {
+                        ->addColumn('description', function ($model) {
                             return ucfirst($model['description']);
                         })
-                        ->addColumn('author', function($model) {
+                        ->addColumn('author', function ($model) {
                             return ucfirst($model['author']);
                         })
-                        ->addColumn('website', function($model) {
-                            return "<a href=" . $model['website'] . " target=_blank>" . $model['website'] . "</a>";
+                        ->addColumn('website', function ($model) {
+                            return '<a href='.$model['website'].' target=_blank>'.$model['website'].'</a>';
                         })
-                        ->addColumn('version', function($model) {
+                        ->addColumn('version', function ($model) {
                             return $model['version'];
                         })
                         ->make();
     }
 
     /**
-     * Reading the Filedirectory
+     * Reading the Filedirectory.
+     *
      * @return type
      */
-    public function ReadPlugins() {
-        $dir = app_path() . '/Plugins';
-        $plugins = array_diff(scandir($dir), array('.', '..'));
+    public function ReadPlugins()
+    {
+        $dir = app_path().'/Plugins';
+        $plugins = array_diff(scandir($dir), ['.', '..']);
+
         return $plugins;
     }
 
     /**
-     * After plugin post
+     * After plugin post.
+     *
      * @param Request $request
+     *
      * @return type
      */
-    public function PostPlugins(Request $request) {
+    public function PostPlugins(Request $request)
+    {
         $v = $this->validate($request, ['plugin' => 'required|mimes:application/zip,zip,Zip']);
         $plug = new Plugin();
         $file = $request->file('plugin');
         //dd($file);
-        $destination = app_path() . '/Plugins';
+        $destination = app_path().'/Plugins';
         $zipfile = $file->getRealPath();
-        /**
+        /*
          * get the file name and remove .zip
          */
         $filename2 = $file->getClientOriginalName();
         $filename2 = str_replace('.zip', '', $filename2);
         $filename1 = ucfirst($file->getClientOriginalName());
         $filename = str_replace('.zip', '', $filename1);
-        mkdir($destination . '/' . $filename);
-        /**
+        mkdir($destination.'/'.$filename);
+        /*
          * extract the zip file using zipper
          */
-        \Zipper::make($zipfile)->folder($filename2)->extractTo($destination . '/' . $filename);
+        \Zipper::make($zipfile)->folder($filename2)->extractTo($destination.'/'.$filename);
 
-        $file = app_path() . '/Plugins/' . $filename; // Plugin file path
+        $file = app_path().'/Plugins/'.$filename; // Plugin file path
 
         if (file_exists($file)) {
-
-            $seviceporvider = $file . '/ServiceProvider.php';
-            $config = $file . '/config.php';
+            $seviceporvider = $file.'/ServiceProvider.php';
+            $config = $file.'/config.php';
             if (file_exists($seviceporvider) && file_exists($config)) {
-                /**
+                /*
                  * move to faveo config
                  */
-                $faveoconfig = config_path() . '/plugins/' . $filename . '.php';
+                $faveoconfig = config_path().'/plugins/'.$filename.'.php';
                 if ($faveoconfig) {
 
                     //copy($config, $faveoconfig);
-                    /**
+                    /*
                      * write provider list in app.php line 128
                      */
-                    $app = base_path() . '/config/app.php';
-                    $str = "\n\n\t\t\t'App\\Plugins\\$filename" . "\\ServiceProvider',";
+                    $app = base_path().'/config/app.php';
+                    $str = "\n\n\t\t\t'App\\Plugins\\$filename"."\\ServiceProvider',";
                     $line_i_am_looking_for = 144;
                     $lines = file($app, FILE_IGNORE_NEW_LINES);
                     $lines[$line_i_am_looking_for] = $str;
                     file_put_contents($app, implode("\n", $lines));
                     $plug->create(['name' => $filename, 'path' => $filename, 'status' => 1]);
+
                     return redirect()->back()->with('success', 'Installed SuccessFully');
                 } else {
-                    /**
+                    /*
                      * delete if the plugin hasn't config.php and ServiceProvider.php
                      */
                     $this->deleteDirectory($file);
-                    return redirect()->back()->with('fails', 'Their is no ' . $file);
+
+                    return redirect()->back()->with('fails', 'Their is no '.$file);
                 }
             } else {
-                /**
+                /*
                  * delete if the plugin hasn't config.php and ServiceProvider.php
                  */
                 $this->deleteDirectory($file);
-                return redirect()->back()->with('fails', 'Their is no <b>config.php or ServiceProvider.php</b>  ' . $file);
+
+                return redirect()->back()->with('fails', 'Their is no <b>config.php or ServiceProvider.php</b>  '.$file);
             }
         } else {
-            /**
+            /*
              * delete if the plugin Name is not equal to the folder name
              */
             $this->deleteDirectory($file);
-            return redirect()->back()->with('fails', '<b>Plugin File Path is not exist</b>  ' . $file);
+
+            return redirect()->back()->with('fails', '<b>Plugin File Path is not exist</b>  '.$file);
         }
     }
 
     /**
-     * Delete the directory
+     * Delete the directory.
+     *
      * @param type $dir
-     * @return boolean
+     *
+     * @return bool
      */
-    public function deleteDirectory($dir) {
+    public function deleteDirectory($dir)
+    {
         if (!file_exists($dir)) {
             return true;
         }
@@ -559,21 +626,23 @@ class SettingsController extends Controller {
             if ($item == '.' || $item == '..') {
                 continue;
             }
-            if (!$this->deleteDirectory($dir . DIRECTORY_SEPARATOR . $item)) {
+            if (!$this->deleteDirectory($dir.DIRECTORY_SEPARATOR.$item)) {
                 return false;
             }
         }
+
         return rmdir($dir);
     }
 
-    public function ReadConfigs() {
-        $dir = app_path() . '/Plugins/';
-        $files = array_diff(scandir($dir), array('.', '..', 'ServiceProvider.php'));
-        $plugins = array();
+    public function ReadConfigs()
+    {
+        $dir = app_path().'/Plugins/';
+        $files = array_diff(scandir($dir), ['.', '..', 'ServiceProvider.php']);
+        $plugins = [];
         if ($files) {
             foreach ($files as $key => $file) {
-                $plugin = $dir . $file;
-                $plugins[$key] = array_diff(scandir($plugin), array('.', '..', 'ServiceProvider.php'));
+                $plugin = $dir.$file;
+                $plugins[$key] = array_diff(scandir($plugin), ['.', '..', 'ServiceProvider.php']);
                 $plugins[$key]['file'] = $plugin;
             }
             foreach ($plugins as $plugin) {
@@ -582,22 +651,24 @@ class SettingsController extends Controller {
                 if ($dh = opendir($dir)) {
                     while (($file = readdir($dh)) !== false) {
                         if ($file == 'config.php') {
-                            $config[] = $dir . '/' . $file;
+                            $config[] = $dir.'/'.$file;
                         }
                     }
                     closedir($dh);
                 }
             }
+
             return $config;
         } else {
             return 'null';
         }
     }
 
-    public function fetchConfig() {
+    public function fetchConfig()
+    {
         $configs = $this->ReadConfigs();
         //dd($configs);
-        $plug = new Plugin;
+        $plug = new Plugin();
         $plug = $plug->select('path', 'status')->orderBy('name')->get()->toArray();
         //dd($plug[0]['path']);
         if ($configs !== 'null') {
@@ -608,38 +679,42 @@ class SettingsController extends Controller {
                     $fields[$key]['status'] = $plug[$key]['status'];
                 }
             }
+
             return $fields;
         } else {
-            return array();
+            return [];
         }
     }
 
-    public function DeletePlugin($slug) {
-        $dir = app_path() . '/Plugins/' . $slug;
+    public function DeletePlugin($slug)
+    {
+        $dir = app_path().'/Plugins/'.$slug;
         $this->deleteDirectory($dir);
-        /**
+        /*
          * remove service provider from app.php
          */
-        $str = "'App\\Plugins\\$slug" . "\\ServiceProvider',";
-        $path_to_file = base_path() . '/config/app.php';
+        $str = "'App\\Plugins\\$slug"."\\ServiceProvider',";
+        $path_to_file = base_path().'/config/app.php';
         $file_contents = file_get_contents($path_to_file);
-        $file_contents = str_replace($str, "//", $file_contents);
+        $file_contents = str_replace($str, '//', $file_contents);
         file_put_contents($path_to_file, $file_contents);
         $plugin = new Plugin();
         $plugin = $plugin->where('path', $slug)->first();
         $plugin->delete();
+
         return redirect()->back()->with('success', 'Deleted Successfully');
     }
 
-    public function StatusPlugin($slug) {
-        $plug = new Plugin;
+    public function StatusPlugin($slug)
+    {
+        $plug = new Plugin();
         $plug = $plug->where('name', $slug)->first();
         $status = $plug->status;
         if ($status == 0) {
             $plug->status = 1;
 
-            $app = base_path() . '/config/app.php';
-            $str = "'App\\Plugins\\$slug" . "\\ServiceProvider',";
+            $app = base_path().'/config/app.php';
+            $str = "'App\\Plugins\\$slug"."\\ServiceProvider',";
             $line_i_am_looking_for = 144;
             $lines = file($app, FILE_IGNORE_NEW_LINES);
             $lines[$line_i_am_looking_for] = $str;
@@ -647,18 +722,18 @@ class SettingsController extends Controller {
         }
         if ($status == 1) {
             $plug->status = 0;
-            /**
+            /*
              * remove service provider from app.php
              */
-            $str = "'App\\Plugins\\$slug" . "\\ServiceProvider',";
-            $path_to_file = base_path() . '/config/app.php';
+            $str = "'App\\Plugins\\$slug"."\\ServiceProvider',";
+            $path_to_file = base_path().'/config/app.php';
 
             $file_contents = file_get_contents($path_to_file);
-            $file_contents = str_replace($str, "//", $file_contents);
+            $file_contents = str_replace($str, '//', $file_contents);
             file_put_contents($path_to_file, $file_contents);
         }
         $plug->save();
+
         return redirect()->back()->with('success', 'Status has changed');
     }
-
 }
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 1d1e73fd3..a5844f692 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -4,11 +4,11 @@ namespace App\Http\Controllers;
 
 // classes
 use Illuminate\Foundation\Bus\DispatchesCommands;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
-abstract class Controller extends BaseController {
-
+abstract class Controller extends BaseController
+{
     use DispatchesCommands,
         ValidatesRequests;
 }
diff --git a/app/Http/Controllers/Error/ErrorController.php b/app/Http/Controllers/Error/ErrorController.php
index ef582b4be..888164054 100644
--- a/app/Http/Controllers/Error/ErrorController.php
+++ b/app/Http/Controllers/Error/ErrorController.php
@@ -6,20 +6,19 @@ namespace App\Http\Controllers\Error;
 use App\Http\Controllers\Controller;
 
 /**
- * ErrorController
+ * ErrorController.
  *
- * @package 	Controllers
- * @subpackage 	Controller
  * @author     	Ladybird <info@ladybirdweb.com>
  */
-class ErrorController extends Controller {
-
+class ErrorController extends Controller
+{
     /**
      * Display a Error Page of 404.
+     *
      * @return Response
      */
-    public function error404() {
+    public function error404()
+    {
         return view('404');
     }
-
 }
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 77b2e8560..9f3ecfa38 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\Model\helpdesk\Manage\Sla_plan;
 use App\Model\helpdesk\Ticket\Tickets;
 
-class HomeController extends Controller {
+class HomeController extends Controller
+{
     /*
       |--------------------------------------------------------------------------
       | Home Controller
@@ -22,7 +22,8 @@ class HomeController extends Controller {
      *
      * @return void
      */
-    public function __construct() {
+    public function __construct()
+    {
         // $this->middleware('auth');
     }
 
@@ -31,48 +32,52 @@ class HomeController extends Controller {
      *
      * @return Response
      */
-    public function index() {
+    public function index()
+    {
         // ksjdckjdsnc
         return view('themes/default1/admin/dashboard');
     }
 
-    public function getsmtp() {
+    public function getsmtp()
+    {
         $smtp = \App\Model\helpdesk\Email\Smtp::where('id', '=', '1')->first();
+
         return $smtp->host;
     }
 
-    Public function getdata() {
+    public function getdata()
+    {
         return \View::make('emails/notifications/agent');
     }
 
-    public function getreport() {
+    public function getreport()
+    {
         return \View::make('test');
     }
 
-    public function pushdata() {
-
-        $date2 = strtotime(Date('Y-m-d'));
-        $date3 = Date('Y-m-d');
+    public function pushdata()
+    {
+        $date2 = strtotime(date('Y-m-d'));
+        $date3 = date('Y-m-d');
         $format = 'Y-m-d';
-        $date1 = strtotime(Date($format, strtotime('-1 month' . $date3)));
+        $date1 = strtotime(date($format, strtotime('-1 month'.$date3)));
 
-        $return = "";
-        $last = "";
+        $return = '';
+        $last = '';
         for ($i = $date1; $i <= $date2; $i = $i + 86400) {
             $thisDate = date('Y-m-d', $i);
 
-            $created = \DB::table('tickets')->select('created_at')->where('created_at', 'LIKE', '%' . $thisDate . '%')->count();
-            $closed = \DB::table('tickets')->select('closed_at')->where('closed_at', 'LIKE', '%' . $thisDate . '%')->count();
-            $reopened = \DB::table('tickets')->select('reopened_at')->where('reopened_at', 'LIKE', '%' . $thisDate . '%')->count();
+            $created = \DB::table('tickets')->select('created_at')->where('created_at', 'LIKE', '%'.$thisDate.'%')->count();
+            $closed = \DB::table('tickets')->select('closed_at')->where('closed_at', 'LIKE', '%'.$thisDate.'%')->count();
+            $reopened = \DB::table('tickets')->select('reopened_at')->where('reopened_at', 'LIKE', '%'.$thisDate.'%')->count();
 
             $value = ['date' => $thisDate, 'open' => $created, 'closed' => $closed, 'reopened' => $reopened];
             $array = array_map('htmlentities', $value);
             $json = html_entity_decode(json_encode($array));
-            $return .= $json . ',';
+            $return .= $json.',';
         }
         $last = rtrim($return, ',');
 
-        return '[' . $last . ']';
+        return '['.$last.']';
     }
-
 }
diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php
index 6c282a476..dacf7fe39 100644
--- a/app/Http/Controllers/Installer/helpdesk/InstallController.php
+++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php
@@ -7,43 +7,40 @@ use App\Http\Controllers\Controller;
 // requests
 use App\Http\Requests\helpdesk\InstallerRequest;
 // models
-use App\User;
 use App\Model\helpdesk\Settings\System;
-use App\Model\helpdesk\Form\Form_details;
 use App\Model\helpdesk\Utility\Date_time_format;
 use App\Model\helpdesk\Utility\Timezones;
+use App\User;
 // classes
-use App;
 use Artisan;
 use Config;
+use Exception;
 use File;
 use Hash;
 use Input;
 use Redirect;
 use Session;
 use View;
-use Exception;
 
 /**
  * |=======================================================================
  * |Class: InstallController
- * |=======================================================================
+ * |=======================================================================.
  *
  *  Class to perform the first install operation without this the database
  *  settings could not be started
  *
- *  @package    Faveo HELPDESK
- *  @subpackage Controller
  *  @author     Ladybird <info@ladybirdweb.com>
- *
  */
-class InstallController extends Controller {
-
+class InstallController extends Controller
+{
     /**
-     * Get Licence (step 1)
+     * Get Licence (step 1).
+     *
      * @return type view
      */
-    public function licence() {
+    public function licence()
+    {
         // checking if the installation is running for the first time or not
         if (Config::get('database.install') == '%0%') {
             return view('themes/default1/installer/helpdesk/view1');
@@ -54,14 +51,17 @@ class InstallController extends Controller {
     }
 
     /**
-     * Post Licencecheck
+     * Post Licencecheck.
+     *
      * @return type view
      */
-    public function licencecheck() {
+    public function licencecheck()
+    {
         // checking if the user have accepted the licence agreement
         $accept = (Input::has('accept1')) ? true : false;
         if ($accept == 'accept') {
             Session::put('step1', 'step1');
+
             return Redirect::route('prerequisites');
         } else {
             return Redirect::route('licence')->with('fails', 'Failed! first accept the licence agreeement');
@@ -70,13 +70,15 @@ class InstallController extends Controller {
     }
 
     /**
-     * Get prerequisites (step 2)
+     * Get prerequisites (step 2).
      * 
      * Checking the extensions enabled required for installing the faveo
      * without which the project cannot be executed properly
+     *
      * @return type view
      */
-    public function prerequisites() {
+    public function prerequisites()
+    {
         // checking if the installation is running for the first time or not
         if (Config::get('database.install') == '%0%') {
             if (Session::get('step1') == 'step1') {
@@ -91,20 +93,25 @@ class InstallController extends Controller {
 
     /**
      * Post Prerequisitescheck
-     * checking prerequisites
+     * checking prerequisites.
+     *
      * @return type view
      */
-    public function prerequisitescheck() {
+    public function prerequisitescheck()
+    {
         Session::put('step2', 'step2');
+
         return Redirect::route('configuration');
     }
 
     /**
      * Get Localization (step 3)
-     * Requesting user recomended settings for installation
+     * Requesting user recomended settings for installation.
+     *
      * @return type view
      */
-    public function localization() {
+    public function localization()
+    {
         // checking if the installation is running for the first time or not
         if (Config::get('database.install') == '%0%') {
             if (Session::get('step2') == 'step2') {
@@ -119,11 +126,12 @@ class InstallController extends Controller {
 
     /**
      * Post localizationcheck
-     * checking prerequisites
+     * checking prerequisites.
+     *
      * @return type view
      */
-    public function localizationcheck() {
-
+    public function localizationcheck()
+    {
         Session::put('step3', 'step3');
 
         Session::put('language', Input::get('language'));
@@ -136,10 +144,12 @@ class InstallController extends Controller {
 
     /**
      * Get Configuration (step 4)
-     * checking prerequisites
+     * checking prerequisites.
+     *
      * @return type view
      */
-    public function configuration() {
+    public function configuration()
+    {
         // checking if the installation is running for the first time or not
         if (Config::get('database.install') == '%0%') {
             if (Session::get('step2') == 'step2') {
@@ -154,11 +164,12 @@ class InstallController extends Controller {
 
     /**
      * Post configurationcheck
-     * checking prerequisites
+     * checking prerequisites.
+     *
      * @return type view
      */
-    public function configurationcheck() {
-
+    public function configurationcheck()
+    {
         Session::put('step4', 'step4');
         // dd(Input::get('default'));
         // dd(Input::get('host'));
@@ -166,7 +177,7 @@ class InstallController extends Controller {
         // dd(Input::get('username'));
         // dd(Input::get('password'));
         // dd(Input::get('port'));
-        
+
         Session::put('default', Input::get('default'));
         Session::put('host', Input::get('host'));
         Session::put('databasename', Input::get('databasename'));
@@ -178,10 +189,12 @@ class InstallController extends Controller {
     }
 
     /**
-     * postconnection
+     * postconnection.
+     *
      * @return type view
      */
-    public function postconnection() {
+    public function postconnection()
+    {
         error_reporting(E_ALL & ~E_NOTICE);
         $default = Input::get('default');
         $host = Input::get('host');
@@ -203,7 +216,7 @@ class InstallController extends Controller {
             $config .= "{$key}={$val}\n";
         }
         // Write environment file
-        $fp = fopen(base_path() . "/.env", 'w');
+        $fp = fopen(base_path().'/.env', 'w');
         fwrite($fp, $config);
         fclose($fp);
 
@@ -212,10 +225,12 @@ class InstallController extends Controller {
 
     /**
      * Get database
-     * checking prerequisites
+     * checking prerequisites.
+     *
      * @return type view
      */
-    public function database() {
+    public function database()
+    {
         // checking if the installation is running for the first time or not
         if (Config::get('database.install') == '%0%') {
             if (Session::get('step4') == 'step4') {
@@ -230,10 +245,12 @@ class InstallController extends Controller {
 
     /**
      * Get account
-     * checking prerequisites
+     * checking prerequisites.
+     *
      * @return type view
      */
-    public function account() {
+    public function account()
+    {
         // checking if the installation is running for the first time or not
         if (Config::get('database.install') == '%0%') {
             if (Session::get('step4') == 'step4') {
@@ -241,6 +258,7 @@ class InstallController extends Controller {
                 Session::forget('step1');
                 Session::forget('step2');
                 Session::forget('step3');
+
                 return View::make('themes/default1/installer/helpdesk/view5');
             } else {
                 return Redirect::route('configuration');
@@ -252,15 +270,18 @@ class InstallController extends Controller {
 
     /**
      * Post accountcheck
-     * checking prerequisites
-     * @param type InstallerRequest $request 
+     * checking prerequisites.
+     *
+     * @param type InstallerRequest $request
+     *
      * @return type view
      */
-    public function accountcheck(InstallerRequest $request) {
+    public function accountcheck(InstallerRequest $request)
+    {
 
         // migrate database
-        Artisan::call('migrate', array('--force' => true));
-        Artisan::call('db:seed', array('--force' => true));
+        Artisan::call('migrate', ['--force' => true]);
+        Artisan::call('db:seed', ['--force' => true]);
 
         // create user
         $firstname = $request->input('firstname');
@@ -274,9 +295,8 @@ class InstallController extends Controller {
         $date = $request->input('date');
         $datetime = $request->input('datetime');
 
-        
         //\Cache::forever('language', $language);
-        
+
         //\App::setLocale($language);
         // $system = System::where('id','=','1')->first();
         // $system->time_zone = $timezone;
@@ -296,39 +316,41 @@ class InstallController extends Controller {
         }
 
         // Creating minum settings for system
-        $system = new System;
+        $system = new System();
         $system->status = 1;
         $system->department = 1;
         $system->date_time_format = $date_time_format->id;
         $system->time_zone = $timezones->id;
         $system->save();
 
-
         // creating an user
-        $user = User::create(array(
-                    'first_name' => $firstname,
-                    'last_name' => $lastname,
-                    'email' => $email,
-                    'user_name' => $username,
-                    'password' => Hash::make($password),
+        $user = User::create([
+                    'first_name'   => $firstname,
+                    'last_name'    => $lastname,
+                    'email'        => $email,
+                    'user_name'    => $username,
+                    'password'     => Hash::make($password),
                     'assign_group' => 1,
-                    'primary_dpt' => 1,
-                    'active' => 1,
-                    'role' => 'admin',
-        ));
+                    'primary_dpt'  => 1,
+                    'active'       => 1,
+                    'role'         => 'admin',
+        ]);
         // checking if the user have been created
         if ($user) {
             Session::put('step6', 'step6');
+
             return Redirect::route('final');
         }
     }
 
     /**
      * Get finalize
-     * checking prerequisites
+     * checking prerequisites.
+     *
      * @return type view
      */
-    public function finalize() {
+    public function finalize()
+    {
         // checking if the installation have been completed or not
         if (Session::get('step6') == 'step6') {
             $value = '1';
@@ -354,6 +376,7 @@ class InstallController extends Controller {
                 Session::forget('step4');
                 Session::forget('step5');
                 Session::forget('step6');
+
                 return View::make('themes/default1/installer/helpdesk/view6');
             } catch (Exception $e) {
                 return Redirect::route('npl');
@@ -365,15 +388,16 @@ class InstallController extends Controller {
 
     /**
      * Post finalcheck
-     * checking prerequisites
+     * checking prerequisites.
+     *
      * @return type view
      */
-    public function finalcheck() {
+    public function finalcheck()
+    {
         try {
             return redirect('/auth/login');
         } catch (Exception $e) {
             return redirect('/auth/login');
         }
     }
-
 }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 8770232fd..7ee874d85 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -5,12 +5,10 @@ namespace App\Http;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 /**
- * Kernel
- *
- * @package HttpKernel
+ * Kernel.
  */
-class Kernel extends HttpKernel {
-
+class Kernel extends HttpKernel
+{
     /**
      * The application's global HTTP middleware stack.
      *
@@ -32,15 +30,14 @@ class Kernel extends HttpKernel {
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => 'App\Http\Middleware\Authenticate',
-        'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
-        'guest' => 'App\Http\Middleware\RedirectIfAuthenticated',
-        'roles' => 'App\Http\Middleware\CheckRole',
-        'role.agent' => 'App\Http\Middleware\CheckRoleAgent',
-        'role.user' => 'App\Http\Middleware\CheckRoleUser',
-        'api' => 'App\Http\Middleware\ApiKey',
-        'jwt.auth' => \Tymon\JWTAuth\Middleware\GetUserFromToken::class,
-        'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class
+        'auth'        => 'App\Http\Middleware\Authenticate',
+        'auth.basic'  => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
+        'guest'       => 'App\Http\Middleware\RedirectIfAuthenticated',
+        'roles'       => 'App\Http\Middleware\CheckRole',
+        'role.agent'  => 'App\Http\Middleware\CheckRoleAgent',
+        'role.user'   => 'App\Http\Middleware\CheckRoleUser',
+        'api'         => 'App\Http\Middleware\ApiKey',
+        'jwt.auth'    => \Tymon\JWTAuth\Middleware\GetUserFromToken::class,
+        'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class,
     ];
-
 }
diff --git a/app/Http/Middleware/ApiKey.php b/app/Http/Middleware/ApiKey.php
index e3e23f2ec..67d689888 100644
--- a/app/Http/Middleware/ApiKey.php
+++ b/app/Http/Middleware/ApiKey.php
@@ -2,14 +2,15 @@
 
 namespace App\Http\Middleware;
 
-use Closure;
 use App\Model\helpdesk\Settings\System;
+use Closure;
 
-class ApiKey {
-
+class ApiKey
+{
     public $setting;
 
-    public function __construct() {
+    public function __construct()
+    {
         $setting = new System();
         $this->setting = $setting;
     }
@@ -17,11 +18,13 @@ class ApiKey {
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next) {
+    public function handle($request, Closure $next)
+    {
         $set = $this->setting->where('id', '1')->first();
         if ($set->api_enable == 1) {
             $key = $set->api_key;
@@ -29,12 +32,13 @@ class ApiKey {
                 return $next($request);
             } else {
                 $result = 'wrong api key';
+
                 return response()->json(compact('result'));
             }
         } else {
             $result = 'please enable api';
+
             return response()->json(compact('result'));
         }
     }
-
 }
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 9736a8b5b..8c72e4ed4 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -6,13 +6,12 @@ use Closure;
 use Illuminate\Contracts\Auth\Guard;
 
 /**
- * Authenticate
+ * Authenticate.
  *
- * @package   Middleware
  * @author    Ladybird <info@ladybirdweb.com>
  */
-class Authenticate {
-
+class Authenticate
+{
     /**
      * The Guard implementation.
      *
@@ -23,21 +22,25 @@ class Authenticate {
     /**
      * Create a new filter instance.
      *
-     * @param  Guard  $auth
+     * @param Guard $auth
+     *
      * @return void
      */
-    public function __construct(Guard $auth) {
+    public function __construct(Guard $auth)
+    {
         $this->auth = $auth;
     }
 
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next) {
+    public function handle($request, Closure $next)
+    {
         if ($this->auth->guest()) {
             if ($request->ajax()) {
                 return response('Unauthorized.', 401);
@@ -48,5 +51,4 @@ class Authenticate {
 
         return $next($request);
     }
-
 }
diff --git a/app/Http/Middleware/CheckRole.php b/app/Http/Middleware/CheckRole.php
index fb96eec35..763cac976 100644
--- a/app/Http/Middleware/CheckRole.php
+++ b/app/Http/Middleware/CheckRole.php
@@ -5,26 +5,26 @@ namespace App\Http\Middleware;
 use Closure;
 
 /**
- * CheckRole
+ * CheckRole.
  *
- * @package  Middleware
  * @author   Ladybird <info@ladybirdweb.com>
  */
-class CheckRole {
-
+class CheckRole
+{
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next) {
-
+    public function handle($request, Closure $next)
+    {
         if ($request->user()->role == 'admin') {
             return $next($request);
         }
+
         return redirect('guest')->with('fails', 'You are not Autherised');
     }
-
 }
diff --git a/app/Http/Middleware/CheckRoleAgent.php b/app/Http/Middleware/CheckRoleAgent.php
index be8d9718f..e2e73012a 100644
--- a/app/Http/Middleware/CheckRoleAgent.php
+++ b/app/Http/Middleware/CheckRoleAgent.php
@@ -5,25 +5,26 @@ namespace App\Http\Middleware;
 use Closure;
 
 /**
- * CheckRoleAgent
+ * CheckRoleAgent.
  *
- * @package     default
  * @author      Ladybird <info@ladybirdweb.com>
  */
-class CheckRoleAgent {
-
+class CheckRoleAgent
+{
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next) {
+    public function handle($request, Closure $next)
+    {
         if ($request->user()->role == 'agent' || $request->user()->role == 'admin') {
             return $next($request);
         }
+
         return redirect('dashboard')->with('fails', 'You are not Autherised');
     }
-
 }
diff --git a/app/Http/Middleware/CheckRoleUser.php b/app/Http/Middleware/CheckRoleUser.php
index aecf4f221..02b47c16f 100644
--- a/app/Http/Middleware/CheckRoleUser.php
+++ b/app/Http/Middleware/CheckRoleUser.php
@@ -5,25 +5,26 @@ namespace App\Http\Middleware;
 use Closure;
 
 /**
- * CheckRoleUser
+ * CheckRoleUser.
  *
- * @package Middleware
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class CheckRoleUser {
-
+class CheckRoleUser
+{
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next) {
+    public function handle($request, Closure $next)
+    {
         if ($request->user()->role == 'user') {
             return $next($request);
         }
+
         return redirect('guest')->with('fails', 'You are not Autherised');
     }
-
 }
diff --git a/app/Http/Middleware/LanguageMiddleware.php b/app/Http/Middleware/LanguageMiddleware.php
index 1300e2d33..52ac91e93 100644
--- a/app/Http/Middleware/LanguageMiddleware.php
+++ b/app/Http/Middleware/LanguageMiddleware.php
@@ -5,22 +5,19 @@ namespace App\Http\Middleware;
 use Cache;
 use Closure;
 use Illuminate\Contracts\Routing\Middleware;
-use Illuminate\Foundation\Application;
-use Illuminate\Http\Request;
-use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Session;
 
-class LanguageMiddleware implements Middleware {
-
-    public function handle($request, Closure $next) {
-        if (Cache::has('language') AND array_key_exists(Cache::get('language'), Config::get('languages'))) {
+class LanguageMiddleware implements Middleware
+{
+    public function handle($request, Closure $next)
+    {
+        if (Cache::has('language') and array_key_exists(Cache::get('language'), Config::get('languages'))) {
             App::setLocale(Cache::get('language'));
         } else { // This is optional as Laravel will automatically set the fallback language if there is none specified
             App::setLocale(Config::get('app.fallback_locale'));
         }
+
         return $next($request);
     }
-
 }
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index 45bb7bcfa..4a038f03f 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -6,8 +6,8 @@ use Closure;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\RedirectResponse;
 
-class RedirectIfAuthenticated {
-
+class RedirectIfAuthenticated
+{
     /**
      * The Guard implementation.
      *
@@ -18,26 +18,29 @@ class RedirectIfAuthenticated {
     /**
      * Create a new filter instance.
      *
-     * @param  Guard  $auth
+     * @param Guard $auth
+     *
      * @return void
      */
-    public function __construct(Guard $auth) {
+    public function __construct(Guard $auth)
+    {
         $this->auth = $auth;
     }
 
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next) {
+    public function handle($request, Closure $next)
+    {
         if ($this->auth->check()) {
             return new RedirectResponse(url('dashboard'));
         }
 
         return $next($request);
     }
-
 }
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index ec5c58a81..53b5e1992 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -5,17 +5,18 @@ namespace App\Http\Middleware;
 use Closure;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
 
-class VerifyCsrfToken extends BaseVerifier {
-
+class VerifyCsrfToken extends BaseVerifier
+{
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next) {
+    public function handle($request, Closure $next)
+    {
         return parent::handle($request, $next);
     }
-
 }
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index da2f81bff..76b2ffd43 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -4,6 +4,7 @@ namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-abstract class Request extends FormRequest {
+abstract class Request extends FormRequest
+{
     //
 }
diff --git a/app/Http/Requests/helpdesk/AgentRequest.php b/app/Http/Requests/helpdesk/AgentRequest.php
index 5ed8e35f5..13b8e7288 100644
--- a/app/Http/Requests/helpdesk/AgentRequest.php
+++ b/app/Http/Requests/helpdesk/AgentRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * AgentRequest
+ * AgentRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class AgentRequest extends Request {
-
+class AgentRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,21 +26,21 @@ class AgentRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'user_name' => 'required|unique:users',
+            'user_name'  => 'required|unique:users',
             'first_name' => 'required',
-            'last_name' => 'required',
-            'email' => 'required',
-            'active' => 'required',
+            'last_name'  => 'required',
+            'email'      => 'required',
+            'active'     => 'required',
             // 'account_status' => 'required',
             'assign_group' => 'required',
-            'primary_dpt' => 'required',
-            'agent_tzone' => 'required',
+            'primary_dpt'  => 'required',
+            'agent_tzone'  => 'required',
             // 'phone_number' => 'phone:IN',
             // 'mobile' => 'phone:IN',
             'team_id' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/AgentUpdate.php b/app/Http/Requests/helpdesk/AgentUpdate.php
index 074b4a6ec..fbe570559 100644
--- a/app/Http/Requests/helpdesk/AgentUpdate.php
+++ b/app/Http/Requests/helpdesk/AgentUpdate.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * AgentUpdate
+ * AgentUpdate.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class AgentUpdate extends Request {
-
+class AgentUpdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,20 +26,20 @@ class AgentUpdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'first_name' => 'required',
-            'last_name' => 'required',
-            'email' => 'required|email',
-            'active' => 'required',
-            'role' => 'required',
+            'first_name'   => 'required',
+            'last_name'    => 'required',
+            'email'        => 'required|email',
+            'active'       => 'required',
+            'role'         => 'required',
             'assign_group' => 'required',
-            'primary_dpt' => 'required',
-            'agent_tzone' => 'required',
+            'primary_dpt'  => 'required',
+            'agent_tzone'  => 'required',
             // 'phone_number' => 'phone:IN',
             // 'mobile' => 'phone:IN',
             'team_id' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/ArticleRequest.php b/app/Http/Requests/helpdesk/ArticleRequest.php
index b9f6db152..f431060e0 100644
--- a/app/Http/Requests/helpdesk/ArticleRequest.php
+++ b/app/Http/Requests/helpdesk/ArticleRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\helpdesk;
 
 use App\Http\Requests\Request;
 
-class ArticleRequest extends Request {
-
+class ArticleRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,11 +21,11 @@ class ArticleRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required',
+            'name'        => 'required',
             'description' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/BanRequest.php b/app/Http/Requests/helpdesk/BanRequest.php
index 33f7c1870..53a592c61 100644
--- a/app/Http/Requests/helpdesk/BanRequest.php
+++ b/app/Http/Requests/helpdesk/BanRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * BanRequest
+ * BanRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class BanRequest extends Request {
-
+class BanRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,11 +26,11 @@ class BanRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'email' => 'required|email',
-            'ban' => 'required',
+            'ban'   => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/BanlistRequest.php b/app/Http/Requests/helpdesk/BanlistRequest.php
index f78b42f34..17089c6cb 100644
--- a/app/Http/Requests/helpdesk/BanlistRequest.php
+++ b/app/Http/Requests/helpdesk/BanlistRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * BanlistRequest
+ * BanlistRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class BanlistRequest extends Request {
-
+class BanlistRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,11 +26,11 @@ class BanlistRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'email' => 'email',
-            'ban' => 'required',
+            'ban'   => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/CannedRequest.php b/app/Http/Requests/helpdesk/CannedRequest.php
index d44723f8d..c6d0183ce 100644
--- a/app/Http/Requests/helpdesk/CannedRequest.php
+++ b/app/Http/Requests/helpdesk/CannedRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * AgentRequest
+ * AgentRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class CannedRequest extends Request {
-
+class CannedRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,11 +26,11 @@ class CannedRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'title' => 'required',
+            'title'   => 'required',
             'message' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/CannedUpdateRequest.php b/app/Http/Requests/helpdesk/CannedUpdateRequest.php
index 37cf4f946..da5bb968f 100644
--- a/app/Http/Requests/helpdesk/CannedUpdateRequest.php
+++ b/app/Http/Requests/helpdesk/CannedUpdateRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * AgentRequest
+ * AgentRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class CannedUpdateRequest extends Request {
-
+class CannedUpdateRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,11 +26,11 @@ class CannedUpdateRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'title' => 'required',
+            'title'   => 'required',
             'message' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/CheckTicket.php b/app/Http/Requests/helpdesk/CheckTicket.php
index f36337cc5..d43cce1f1 100644
--- a/app/Http/Requests/helpdesk/CheckTicket.php
+++ b/app/Http/Requests/helpdesk/CheckTicket.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * CheckTicket
+ * CheckTicket.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class CheckTicket extends Request {
-
+class CheckTicket extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,11 +26,11 @@ class CheckTicket extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'email' => 'required|email',
+            'email'         => 'required|email',
             'ticket_number' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/ClientRequest.php b/app/Http/Requests/helpdesk/ClientRequest.php
index e8dcccb4d..156fa9631 100644
--- a/app/Http/Requests/helpdesk/ClientRequest.php
+++ b/app/Http/Requests/helpdesk/ClientRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * CompanyRequest
+ * CompanyRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class ClientRequest extends Request {
-
+class ClientRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,13 +26,13 @@ class ClientRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'Name' => 'required',
-            'Email' => 'required',
+            'Name'    => 'required',
+            'Email'   => 'required',
             'Subject' => 'required',
             'Details' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/CommentRequest.php b/app/Http/Requests/helpdesk/CommentRequest.php
index d20c1bbea..076f175dd 100644
--- a/app/Http/Requests/helpdesk/CommentRequest.php
+++ b/app/Http/Requests/helpdesk/CommentRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\helpdesk;
 
 use App\Http\Requests\Request;
 
-class CommentRequest extends Request {
-
+class CommentRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,13 +21,13 @@ class CommentRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required|max:10',
-            'email' => 'required|email',
+            'name'    => 'required|max:10',
+            'email'   => 'required|email',
             'website' => 'url',
             'comment' => 'required|max:60',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/CompanyRequest.php b/app/Http/Requests/helpdesk/CompanyRequest.php
index 46942c5d1..21ce56665 100644
--- a/app/Http/Requests/helpdesk/CompanyRequest.php
+++ b/app/Http/Requests/helpdesk/CompanyRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * CompanyRequest
+ * CompanyRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class CompanyRequest extends Request {
-
+class CompanyRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,13 +26,13 @@ class CompanyRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'company_name' => 'required',
-            'website' => 'url',
-            'phone' => 'numeric',
-            'logo' => 'image',
+            'website'      => 'url',
+            'phone'        => 'numeric',
+            'logo'         => 'image',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/ContactRequest.php b/app/Http/Requests/helpdesk/ContactRequest.php
index d9ec3249a..64cde45f8 100644
--- a/app/Http/Requests/helpdesk/ContactRequest.php
+++ b/app/Http/Requests/helpdesk/ContactRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\helpdesk;
 
 use App\Http\Requests\Request;
 
-class ContactRequest extends Request {
-
+class ContactRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,13 +21,13 @@ class ContactRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required',
-            'email' => 'required|email',
+            'name'    => 'required',
+            'email'   => 'required|email',
             'subject' => 'required',
             'message' => 'required|max:50',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/CreateTicketRequest.php b/app/Http/Requests/helpdesk/CreateTicketRequest.php
index 708d0c8ac..923724038 100644
--- a/app/Http/Requests/helpdesk/CreateTicketRequest.php
+++ b/app/Http/Requests/helpdesk/CreateTicketRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * CreateTicketRequest
+ * CreateTicketRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class CreateTicketRequest extends Request {
-
+class CreateTicketRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,18 +26,18 @@ class CreateTicketRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
 
-            'email' => 'required|email',
-            'fullname' => 'required|min:3',
+            'email'     => 'required|email',
+            'fullname'  => 'required|min:3',
             'helptopic' => 'required',
             // 'dept' => 'required',
-            'sla' => 'required',
-            'subject' => 'required|min:5',
-            'body' => 'required|min:20',
+            'sla'      => 'required',
+            'subject'  => 'required|min:5',
+            'body'     => 'required|min:20',
             'priority' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/DepartmentRequest.php b/app/Http/Requests/helpdesk/DepartmentRequest.php
index df53cdc54..4974bccfb 100644
--- a/app/Http/Requests/helpdesk/DepartmentRequest.php
+++ b/app/Http/Requests/helpdesk/DepartmentRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * DepartmentRequest
+ * DepartmentRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class DepartmentRequest extends Request {
-
+class DepartmentRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,7 +26,8 @@ class DepartmentRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'name' => 'required|unique:department',
                 // 'outgoing_email' => 'required',
@@ -34,5 +35,4 @@ class DepartmentRequest extends Request {
                 // 'group_id' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/DepartmentUpdate.php b/app/Http/Requests/helpdesk/DepartmentUpdate.php
index 049124aab..1147ff13d 100644
--- a/app/Http/Requests/helpdesk/DepartmentUpdate.php
+++ b/app/Http/Requests/helpdesk/DepartmentUpdate.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * DepartmentUpdate
+ * DepartmentUpdate.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class DepartmentUpdate extends Request {
-
+class DepartmentUpdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,7 +26,8 @@ class DepartmentUpdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
 
                 // 'outgoing_email' => 'required',
@@ -34,5 +35,4 @@ class DepartmentUpdate extends Request {
                 // 'group_id' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/DiagnoRequest.php b/app/Http/Requests/helpdesk/DiagnoRequest.php
index bab9d998c..6a6a0c7cb 100644
--- a/app/Http/Requests/helpdesk/DiagnoRequest.php
+++ b/app/Http/Requests/helpdesk/DiagnoRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * DiagnoRequest
+ * DiagnoRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class DiagnoRequest extends Request {
-
+class DiagnoRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,13 +26,13 @@ class DiagnoRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'from' => 'required|email',
-            'to' => 'required|email',
+            'from'    => 'required|email',
+            'to'      => 'required|email',
             'subject' => 'required',
             'message' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/EmailRequest.php b/app/Http/Requests/helpdesk/EmailRequest.php
index f9c453bae..a4c5bf877 100644
--- a/app/Http/Requests/helpdesk/EmailRequest.php
+++ b/app/Http/Requests/helpdesk/EmailRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * EmailRequest
+ * EmailRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class EmailRequest extends Request {
-
+class EmailRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,9 +26,9 @@ class EmailRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/EmailsEditRequest.php b/app/Http/Requests/helpdesk/EmailsEditRequest.php
index 618cf7611..498ec4c87 100644
--- a/app/Http/Requests/helpdesk/EmailsEditRequest.php
+++ b/app/Http/Requests/helpdesk/EmailsEditRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * EmailsEditRequest
+ * EmailsEditRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class EmailsEditRequest extends Request {
-
+class EmailsEditRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,10 +26,11 @@ class EmailsEditRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'email_address' => 'email',
-            'email_name' => 'required',
+            'email_name'    => 'required',
             // 'department' => 'required',
             // 'priority' => 'required',
             // 'help_topic' => 'required',
@@ -39,10 +40,9 @@ class EmailsEditRequest extends Request {
             // 'sending_host' => 'required',
             // 'sending_port' => 'required',
             //'mailbox_protocol'	=>		'required'
-            'fetching_host' => 'required',
-            'fetching_port' => 'required',
+            'fetching_host'    => 'required',
+            'fetching_port'    => 'required',
             'mailbox_protocol' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/EmailsRequest.php b/app/Http/Requests/helpdesk/EmailsRequest.php
index 8abaac4a1..fd290d58e 100644
--- a/app/Http/Requests/helpdesk/EmailsRequest.php
+++ b/app/Http/Requests/helpdesk/EmailsRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * EmailsRequest
+ * EmailsRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class EmailsRequest extends Request {
-
+class EmailsRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,10 +26,11 @@ class EmailsRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'email_address' => 'required|email|unique:emails',
-            'email_name' => 'required',
+            'email_name'    => 'required',
             // 'department' => 'required',
             // 'priority' => 'required',
             // 'help_topic' => 'required',
@@ -38,10 +39,9 @@ class EmailsRequest extends Request {
             // 'user_name' => 'required',
             // 'sending_host' => 'required',
             // 'sending_port' => 'required',
-            'fetching_host' => 'required',
-            'fetching_port' => 'required',
+            'fetching_host'    => 'required',
+            'fetching_port'    => 'required',
             'mailbox_protocol' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/FormRequest.php b/app/Http/Requests/helpdesk/FormRequest.php
index eca8e5714..28572ddf7 100644
--- a/app/Http/Requests/helpdesk/FormRequest.php
+++ b/app/Http/Requests/helpdesk/FormRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * FormRequest
+ * FormRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class FormRequest extends Request {
-
+class FormRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,14 +26,14 @@ class FormRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
 
-            'title' => 'required',
-            'label' => 'required',
-            'type' => 'required',
+            'title'      => 'required',
+            'label'      => 'required',
+            'type'       => 'required',
             'visibility' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/GroupRequest.php b/app/Http/Requests/helpdesk/GroupRequest.php
index b1c642a33..33a920dd2 100644
--- a/app/Http/Requests/helpdesk/GroupRequest.php
+++ b/app/Http/Requests/helpdesk/GroupRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * GroupRequest
+ * GroupRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class GroupRequest extends Request {
-
+class GroupRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,10 +26,10 @@ class GroupRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'name' => 'required|unique:groups',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/HelptopicRequest.php b/app/Http/Requests/helpdesk/HelptopicRequest.php
index 5ac70d248..bc5f6b314 100644
--- a/app/Http/Requests/helpdesk/HelptopicRequest.php
+++ b/app/Http/Requests/helpdesk/HelptopicRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * HelptopicRequest
+ * HelptopicRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class HelptopicRequest extends Request {
-
+class HelptopicRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,16 +26,16 @@ class HelptopicRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'topic' => 'required|unique:help_topic',
             // 'parent_topic' => 'required',
             // 'custom_form' => 'required',
             'department' => 'required',
-            'priority' => 'required',
-            'sla_plan' => 'required',
+            'priority'   => 'required',
+            'sla_plan'   => 'required',
                 // 'auto_assign' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/HelptopicUpdate.php b/app/Http/Requests/helpdesk/HelptopicUpdate.php
index 3c2fac541..7f4f0ce35 100644
--- a/app/Http/Requests/helpdesk/HelptopicUpdate.php
+++ b/app/Http/Requests/helpdesk/HelptopicUpdate.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * HelptopicUpdate
+ * HelptopicUpdate.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class HelptopicUpdate extends Request {
-
+class HelptopicUpdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,15 +26,15 @@ class HelptopicUpdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             // 'parent_topic' => 'required',
             // 'custom_form' => 'required',
             'department' => 'required',
-            'priority' => 'required',
-            'sla_plan' => 'required',
+            'priority'   => 'required',
+            'sla_plan'   => 'required',
                 // 'auto_assign' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/InstallerRequest.php b/app/Http/Requests/helpdesk/InstallerRequest.php
index 9ca5cb935..f0c78de00 100644
--- a/app/Http/Requests/helpdesk/InstallerRequest.php
+++ b/app/Http/Requests/helpdesk/InstallerRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * InstallerRequest
+ * InstallerRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class InstallerRequest extends Request {
-
+class InstallerRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,15 +26,15 @@ class InstallerRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'firstname' => 'required|max:20',
-            'Lastname' => 'required|max:20',
-            'email' => 'required|max:50|email',
-            'username' => 'required|max:50|min:3',
-            'password' => 'required|min:6',
+            'firstname'       => 'required|max:20',
+            'Lastname'        => 'required|max:20',
+            'email'           => 'required|max:50|email',
+            'username'        => 'required|max:50|min:3',
+            'password'        => 'required|min:6',
             'confirmpassword' => 'required|same:password',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/LoginRequest.php b/app/Http/Requests/helpdesk/LoginRequest.php
index dc5576c9f..641eed539 100644
--- a/app/Http/Requests/helpdesk/LoginRequest.php
+++ b/app/Http/Requests/helpdesk/LoginRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * LoginRequest
+ * LoginRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class LoginRequest extends Request {
-
+class LoginRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,11 +26,11 @@ class LoginRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'email' => 'required',
+            'email'    => 'required',
             'password' => 'required|min:6',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/MessageRequest.php b/app/Http/Requests/helpdesk/MessageRequest.php
index 8909ee3fc..83da576fa 100644
--- a/app/Http/Requests/helpdesk/MessageRequest.php
+++ b/app/Http/Requests/helpdesk/MessageRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\helpdesk;
 
 use App\Http\Requests\Request;
 
-class MessageRequest extends Request {
-
+class MessageRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,13 +21,12 @@ class MessageRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
 
-
             'message_title' => 'required',
-            'message' => 'required'
+            'message'       => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/OrganizationRequest.php b/app/Http/Requests/helpdesk/OrganizationRequest.php
index 4e27be8f2..ee74044ad 100644
--- a/app/Http/Requests/helpdesk/OrganizationRequest.php
+++ b/app/Http/Requests/helpdesk/OrganizationRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * OrganizationRequest
+ * OrganizationRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class OrganizationRequest extends Request {
-
+class OrganizationRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,13 +26,13 @@ class OrganizationRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
 
-            'name' => 'required|unique:organization',
+            'name'    => 'required|unique:organization',
             'website' => 'url',
                 // 'phone' => 'size:10',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/OrganizationUpdate.php b/app/Http/Requests/helpdesk/OrganizationUpdate.php
index 8ec2e613b..6d4ea4f12 100644
--- a/app/Http/Requests/helpdesk/OrganizationUpdate.php
+++ b/app/Http/Requests/helpdesk/OrganizationUpdate.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * OrganizationUpdate
+ * OrganizationUpdate.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class OrganizationUpdate extends Request {
-
+class OrganizationUpdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,12 +26,12 @@ class OrganizationUpdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
 
             'website' => 'url',
                 // 'phone' => 'size:10',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/ProfilePassword.php b/app/Http/Requests/helpdesk/ProfilePassword.php
index bbbbd249f..4a0858525 100644
--- a/app/Http/Requests/helpdesk/ProfilePassword.php
+++ b/app/Http/Requests/helpdesk/ProfilePassword.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * ProfilePassword
+ * ProfilePassword.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class ProfilePassword extends Request {
-
+class ProfilePassword extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,12 +26,12 @@ class ProfilePassword extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'old_password' => 'required',
-            'new_password' => 'required|min:6',
+            'old_password'     => 'required',
+            'new_password'     => 'required|min:6',
             'confirm_password' => 'required|same:new_password',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/ProfileRequest.php b/app/Http/Requests/helpdesk/ProfileRequest.php
index a00d48510..fa5c95759 100644
--- a/app/Http/Requests/helpdesk/ProfileRequest.php
+++ b/app/Http/Requests/helpdesk/ProfileRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * ProfileRequest
+ * ProfileRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class ProfileRequest extends Request {
-
+class ProfileRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,11 +26,11 @@ class ProfileRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'first_name' => 'required',
+            'first_name'  => 'required',
             'profile_pic' => 'mimes:png,jpeg',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/RegisterRequest.php b/app/Http/Requests/helpdesk/RegisterRequest.php
index cbe16371c..0284e63f2 100644
--- a/app/Http/Requests/helpdesk/RegisterRequest.php
+++ b/app/Http/Requests/helpdesk/RegisterRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * RegisterRequest
+ * RegisterRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class RegisterRequest extends Request {
-
+class RegisterRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,13 +26,13 @@ class RegisterRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'email' => 'required|max:50|email|unique:users',
-            'full_name' => 'required',
-            'password' => 'required|min:6',
+            'email'                 => 'required|max:50|email|unique:users',
+            'full_name'             => 'required',
+            'password'              => 'required|min:6',
             'password_confirmation' => 'required|same:password',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/SlaRequest.php b/app/Http/Requests/helpdesk/SlaRequest.php
index 8514ea267..5eb65011f 100644
--- a/app/Http/Requests/helpdesk/SlaRequest.php
+++ b/app/Http/Requests/helpdesk/SlaRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * SlaRequest
+ * SlaRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class SlaRequest extends Request {
-
+class SlaRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,11 +26,11 @@ class SlaRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required|unique:sla_plan',
+            'name'         => 'required|unique:sla_plan',
             'grace_period' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/SlaUpdate.php b/app/Http/Requests/helpdesk/SlaUpdate.php
index e08982da3..834631d5f 100644
--- a/app/Http/Requests/helpdesk/SlaUpdate.php
+++ b/app/Http/Requests/helpdesk/SlaUpdate.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * SlaUpdate
+ * SlaUpdate.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class SlaUpdate extends Request {
-
+class SlaUpdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,10 +26,10 @@ class SlaUpdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'grace_period' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/SmtpRequest.php b/app/Http/Requests/helpdesk/SmtpRequest.php
index 4e6cf6504..984eb3e2c 100644
--- a/app/Http/Requests/helpdesk/SmtpRequest.php
+++ b/app/Http/Requests/helpdesk/SmtpRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * TicketForm
+ * TicketForm.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class SmtpRequest extends Request {
-
+class SmtpRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,15 +26,15 @@ class SmtpRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'host' => 'required',
-            'port' => 'required',
+            'host'       => 'required',
+            'port'       => 'required',
             'encryption' => 'required',
-            'name' => 'required',
-            'email' => 'required',
-            'password' => 'required',
+            'name'       => 'required',
+            'email'      => 'required',
+            'password'   => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/Sys_userRequest.php b/app/Http/Requests/helpdesk/Sys_userRequest.php
index 648f61a0a..dac19a814 100644
--- a/app/Http/Requests/helpdesk/Sys_userRequest.php
+++ b/app/Http/Requests/helpdesk/Sys_userRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * Sys_userRequest
+ * Sys_userRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class Sys_userRequest extends Request {
-
+class Sys_userRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,13 +26,13 @@ class Sys_userRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
 
-            'email' => 'required|unique:users,email',
+            'email'     => 'required|unique:users,email',
             'full_name' => 'required',
                 // 'phone' => 'size:10',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/Sys_userUpdate.php b/app/Http/Requests/helpdesk/Sys_userUpdate.php
index b63dcb0e3..5cd320b33 100644
--- a/app/Http/Requests/helpdesk/Sys_userUpdate.php
+++ b/app/Http/Requests/helpdesk/Sys_userUpdate.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * Sys_userUpdate
+ * Sys_userUpdate.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class Sys_userUpdate extends Request {
-
+class Sys_userUpdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,12 +26,12 @@ class Sys_userUpdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'user_name' => 'required',
                 // 'email' => 'required|email',
                 // 'phone' => 'size:10',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/SystemRequest.php b/app/Http/Requests/helpdesk/SystemRequest.php
index f21f0d773..49074a6bf 100644
--- a/app/Http/Requests/helpdesk/SystemRequest.php
+++ b/app/Http/Requests/helpdesk/SystemRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * SystemRequest
+ * SystemRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class SystemRequest extends Request {
-
+class SystemRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,12 +26,12 @@ class SystemRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
 
             'name' => '',
-            'url' => 'url',
+            'url'  => 'url',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/TeamRequest.php b/app/Http/Requests/helpdesk/TeamRequest.php
index 880d9fbe6..050c7e757 100644
--- a/app/Http/Requests/helpdesk/TeamRequest.php
+++ b/app/Http/Requests/helpdesk/TeamRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * TeamRequest
+ * TeamRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class TeamRequest extends Request {
-
+class TeamRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,11 +26,11 @@ class TeamRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required|unique:teams',
+            'name'   => 'required|unique:teams',
             'status' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/TeamUpdate.php b/app/Http/Requests/helpdesk/TeamUpdate.php
index 8f7464df2..530aad77e 100644
--- a/app/Http/Requests/helpdesk/TeamUpdate.php
+++ b/app/Http/Requests/helpdesk/TeamUpdate.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * TeamUpdate
+ * TeamUpdate.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class TeamUpdate extends Request {
-
+class TeamUpdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,9 +26,9 @@ class TeamUpdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/TemplateRequest.php b/app/Http/Requests/helpdesk/TemplateRequest.php
index 2264ed5eb..065eb8dc6 100644
--- a/app/Http/Requests/helpdesk/TemplateRequest.php
+++ b/app/Http/Requests/helpdesk/TemplateRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * TemplateRequest
+ * TemplateRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class TemplateRequest extends Request {
-
+class TemplateRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,13 +26,13 @@ class TemplateRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required|unique:template',
-            'ban_status' => 'required',
+            'name'                  => 'required|unique:template',
+            'ban_status'            => 'required',
             'template_set_to_clone' => 'required',
-            'language' => 'required',
+            'language'              => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/TemplateUdate.php b/app/Http/Requests/helpdesk/TemplateUdate.php
index c748d8c50..98150b262 100644
--- a/app/Http/Requests/helpdesk/TemplateUdate.php
+++ b/app/Http/Requests/helpdesk/TemplateUdate.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * TemplateUdate
+ * TemplateUdate.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class TemplateUdate extends Request {
-
+class TemplateUdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,13 +26,13 @@ class TemplateUdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
 
-            'ban_status' => 'required',
+            'ban_status'            => 'required',
             'template_set_to_clone' => 'required',
-            'language' => 'required',
+            'language'              => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/TicketEditRequest.php b/app/Http/Requests/helpdesk/TicketEditRequest.php
index 36d43fc54..c9a38806e 100644
--- a/app/Http/Requests/helpdesk/TicketEditRequest.php
+++ b/app/Http/Requests/helpdesk/TicketEditRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * AgentRequest
+ * AgentRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class TicketEditRequest extends Request {
-
+class TicketEditRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,7 +26,8 @@ class TicketEditRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
                 // 'subject' => 'required',
                 // 'sla_paln' => 'required',
@@ -35,5 +36,4 @@ class TicketEditRequest extends Request {
                 // 'ticket_priority' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/TicketForm.php b/app/Http/Requests/helpdesk/TicketForm.php
index 81c7af58d..1283e8094 100644
--- a/app/Http/Requests/helpdesk/TicketForm.php
+++ b/app/Http/Requests/helpdesk/TicketForm.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * TicketForm
+ * TicketForm.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class TicketForm extends Request {
-
+class TicketForm extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,13 +26,13 @@ class TicketForm extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'help_topic' => 'required',
-            'Email' => 'required',
-            'Subject' => 'required',
-            'Detail' => 'required',
+            'Email'      => 'required',
+            'Subject'    => 'required',
+            'Detail'     => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/helpdesk/TicketRequest.php b/app/Http/Requests/helpdesk/TicketRequest.php
index f2658bf61..5cfd5b9c1 100644
--- a/app/Http/Requests/helpdesk/TicketRequest.php
+++ b/app/Http/Requests/helpdesk/TicketRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\helpdesk;
 use App\Http\Requests\Request;
 
 /**
- * TicketRequest
+ * TicketRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class TicketRequest extends Request {
-
+class TicketRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,12 +26,12 @@ class TicketRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             // 'To' => 'required',
-            'ticket_ID' => 'required',
+            'ticket_ID'     => 'required',
             'reply_content' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/ArticleRequest.php b/app/Http/Requests/kb/ArticleRequest.php
index 65e0bdf21..db58b9475 100644
--- a/app/Http/Requests/kb/ArticleRequest.php
+++ b/app/Http/Requests/kb/ArticleRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class ArticleRequest extends Request {
-
+class ArticleRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,13 +21,13 @@ class ArticleRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required',
-            'slug' => 'required|unique:kb_article',
+            'name'        => 'required',
+            'slug'        => 'required|unique:kb_article',
             'description' => 'required',
             'category_id' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/ArticleUpdate.php b/app/Http/Requests/kb/ArticleUpdate.php
index 06f3b4bd7..7d6394c64 100644
--- a/app/Http/Requests/kb/ArticleUpdate.php
+++ b/app/Http/Requests/kb/ArticleUpdate.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class ArticleUpdate extends Request {
-
+class ArticleUpdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,13 +21,13 @@ class ArticleUpdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required',
-            'slug' => 'required',
+            'name'        => 'required',
+            'slug'        => 'required',
             'description' => 'required',
             'category_id' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/CategoryRequest.php b/app/Http/Requests/kb/CategoryRequest.php
index 476153013..cd8d5d87f 100644
--- a/app/Http/Requests/kb/CategoryRequest.php
+++ b/app/Http/Requests/kb/CategoryRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class CategoryRequest extends Request {
-
+class CategoryRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,12 +21,12 @@ class CategoryRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required',
-            'slug' => 'required|unique:kb_category',
+            'name'        => 'required',
+            'slug'        => 'required|unique:kb_category',
             'description' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/CategoryUpdate.php b/app/Http/Requests/kb/CategoryUpdate.php
index 61bfb062b..ecb16752e 100644
--- a/app/Http/Requests/kb/CategoryUpdate.php
+++ b/app/Http/Requests/kb/CategoryUpdate.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class CategoryUpdate extends Request {
-
+class CategoryUpdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,12 +21,12 @@ class CategoryUpdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required',
-            'slug' => 'required',
+            'name'        => 'required',
+            'slug'        => 'required',
             'description' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/CommentRequest.php b/app/Http/Requests/kb/CommentRequest.php
index 3d151c7a8..3bf33e31d 100644
--- a/app/Http/Requests/kb/CommentRequest.php
+++ b/app/Http/Requests/kb/CommentRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class CommentRequest extends Request {
-
+class CommentRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,13 +21,13 @@ class CommentRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required|max:50',
-            'email' => 'required|email',
+            'name'    => 'required|max:50',
+            'email'   => 'required|email',
             'website' => 'url',
             'comment' => 'required|max:500',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/ContactRequest.php b/app/Http/Requests/kb/ContactRequest.php
index 340b82059..df0c6d800 100644
--- a/app/Http/Requests/kb/ContactRequest.php
+++ b/app/Http/Requests/kb/ContactRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class ContactRequest extends Request {
-
+class ContactRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,13 +21,13 @@ class ContactRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'name' => 'required',
-            'email' => 'required|email',
+            'name'    => 'required',
+            'email'   => 'required|email',
             'subject' => 'required|max:20',
             'message' => 'required|max:60',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/FooterRequest.php b/app/Http/Requests/kb/FooterRequest.php
index da1a26010..ff29c1e7b 100644
--- a/app/Http/Requests/kb/FooterRequest.php
+++ b/app/Http/Requests/kb/FooterRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class FooterRequest extends Request {
-
+class FooterRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,11 +21,11 @@ class FooterRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'title' => 'required',
                 //'description' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/InstallerRequest.php b/app/Http/Requests/kb/InstallerRequest.php
index 57acfeec5..a9685ded7 100644
--- a/app/Http/Requests/kb/InstallerRequest.php
+++ b/app/Http/Requests/kb/InstallerRequest.php
@@ -5,19 +5,19 @@ namespace App\Http\Requests\kb;
 use App\Http\Requests\Request;
 
 /**
- * InstallerRequest
+ * InstallerRequest.
  *
- * @package Request
  * @author  Ladybird <info@ladybirdweb.com>
  */
-class InstallerRequest extends Request {
-
+class InstallerRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -26,15 +26,15 @@ class InstallerRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'firstname' => 'required|max:20',
-            'Lastname' => 'required|max:20',
-            'email' => 'required|max:50|email',
-            'username' => 'required|max:50|min:3',
-            'password' => 'required|min:6',
+            'firstname'       => 'required|max:20',
+            'Lastname'        => 'required|max:20',
+            'email'           => 'required|max:50|email',
+            'username'        => 'required|max:50|min:3',
+            'password'        => 'required|min:6',
             'confirmpassword' => 'required|same:password',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/PageRequest.php b/app/Http/Requests/kb/PageRequest.php
index 76af0a195..50d9c86a7 100644
--- a/app/Http/Requests/kb/PageRequest.php
+++ b/app/Http/Requests/kb/PageRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class PageRequest extends Request {
-
+class PageRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,12 +21,12 @@ class PageRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'name' => 'required',
             'slug' => 'required|unique:kb_pages',
                 //'description' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/PageUpdate.php b/app/Http/Requests/kb/PageUpdate.php
index d752fed19..c04072c69 100644
--- a/app/Http/Requests/kb/PageUpdate.php
+++ b/app/Http/Requests/kb/PageUpdate.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class PageUpdate extends Request {
-
+class PageUpdate extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,12 +21,12 @@ class PageUpdate extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             'name' => 'required',
             'slug' => 'required',
                 //'description' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/ProfilePassword.php b/app/Http/Requests/kb/ProfilePassword.php
index 3538088e0..5525c8cf6 100644
--- a/app/Http/Requests/kb/ProfilePassword.php
+++ b/app/Http/Requests/kb/ProfilePassword.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class ProfilePassword extends Request {
-
+class ProfilePassword extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,12 +21,12 @@ class ProfilePassword extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'old_password' => 'required',
-            'new_password' => 'required|min:6',
-            'confirm_password' => 'required|same:new_password'
+            'old_password'     => 'required',
+            'new_password'     => 'required|min:6',
+            'confirm_password' => 'required|same:new_password',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/ProfileRequest.php b/app/Http/Requests/kb/ProfileRequest.php
index d3b8d83ab..984ebf947 100644
--- a/app/Http/Requests/kb/ProfileRequest.php
+++ b/app/Http/Requests/kb/ProfileRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class ProfileRequest extends Request {
-
+class ProfileRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,12 +21,12 @@ class ProfileRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'firstname' => 'required',
-            'lastname' => 'required',
+            'firstname'   => 'required',
+            'lastname'    => 'required',
             'profile_pic' => 'mimes:png,jpeg',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/SearchRequest.php b/app/Http/Requests/kb/SearchRequest.php
index dc51e6e07..431e90d72 100644
--- a/app/Http/Requests/kb/SearchRequest.php
+++ b/app/Http/Requests/kb/SearchRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class SearchRequest extends Request {
-
+class SearchRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,10 +21,10 @@ class SearchRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
             's' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/SettingsRequests.php b/app/Http/Requests/kb/SettingsRequests.php
index c6bc136af..864411076 100644
--- a/app/Http/Requests/kb/SettingsRequests.php
+++ b/app/Http/Requests/kb/SettingsRequests.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class SettingsRequests extends Request {
-
+class SettingsRequests extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,11 +21,11 @@ class SettingsRequests extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
                 // 'company_name' => 'required',
                 // 'website' => 'required|url',
         ];
     }
-
 }
diff --git a/app/Http/Requests/kb/SocialRequest.php b/app/Http/Requests/kb/SocialRequest.php
index e341b96ec..8edf62880 100644
--- a/app/Http/Requests/kb/SocialRequest.php
+++ b/app/Http/Requests/kb/SocialRequest.php
@@ -4,14 +4,15 @@ namespace App\Http\Requests\kb;
 
 use App\Http\Requests\Request;
 
-class SocialRequest extends Request {
-
+class SocialRequest extends Request
+{
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize() {
+    public function authorize()
+    {
         return true;
     }
 
@@ -20,23 +21,23 @@ class SocialRequest extends Request {
      *
      * @return array
      */
-    public function rules() {
+    public function rules()
+    {
         return [
-            'linkedin' => 'url',
-            'stumble' => 'url',
-            'google' => 'url',
+            'linkedin'   => 'url',
+            'stumble'    => 'url',
+            'google'     => 'url',
             'deviantart' => 'url',
-            'flickr' => 'url',
-            'skype' => 'url',
-            'rss' => 'url',
-            'twitter' => 'url',
-            'facebook' => 'url',
-            'youtube' => 'url',
-            'vimeo' => 'url',
-            'pinterest' => 'url',
-            'dribbble' => 'url',
-            'instagram' => 'url'
+            'flickr'     => 'url',
+            'skype'      => 'url',
+            'rss'        => 'url',
+            'twitter'    => 'url',
+            'facebook'   => 'url',
+            'youtube'    => 'url',
+            'vimeo'      => 'url',
+            'pinterest'  => 'url',
+            'dribbble'   => 'url',
+            'instagram'  => 'url',
         ];
     }
-
 }
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 141a271cd..6828e1744 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -1,6 +1,6 @@
 <?php
 
-"%smtplink%";
+'%smtplink%';
 
 /*
   |--------------------------------------------------------------------------
@@ -14,7 +14,7 @@
  */
 
 Route::controllers([
-    'auth' => 'Auth\AuthController',
+    'auth'     => 'Auth\AuthController',
     'password' => 'Auth\PasswordController',
 ]);
 
@@ -147,34 +147,34 @@ Route::group(['middleware' => 'roles', 'middleware' => 'auth'], function () {
 
     Route::get('checkUpdate', ['as' => 'checkupdate', 'uses' => 'Common\SettingsController@getupdate']); /* get Check update */
 
-    Route::get('admin', array('as' => 'setting', 'uses' => 'Admin\helpdesk\SettingsController@settings'));
+    Route::get('admin', ['as' => 'setting', 'uses' => 'Admin\helpdesk\SettingsController@settings']);
 
     Route::get('plugins', ['as' => 'plugins', 'uses' => 'Common\SettingsController@Plugins']);
 
-    Route::get('getplugin', array('as' => 'get.plugin', 'uses' => 'Common\SettingsController@GetPlugin'));
+    Route::get('getplugin', ['as' => 'get.plugin', 'uses' => 'Common\SettingsController@GetPlugin']);
 
     Route::post('post-plugin', ['as' => 'post.plugin', 'uses' => 'Common\SettingsController@PostPlugins']);
 
-    Route::get('getconfig', array('as' => 'get.config', 'uses' => 'Common\SettingsController@fetchConfig'));
+    Route::get('getconfig', ['as' => 'get.config', 'uses' => 'Common\SettingsController@fetchConfig']);
 
-    Route::get('plugin/delete/{slug}', array('as' => 'delete.plugin', 'uses' => 'Common\SettingsController@DeletePlugin'));
+    Route::get('plugin/delete/{slug}', ['as' => 'delete.plugin', 'uses' => 'Common\SettingsController@DeletePlugin']);
 
-    Route::get('plugin/status/{slug}', array('as' => 'status.plugin', 'uses' => 'Common\SettingsController@StatusPlugin'));
+    Route::get('plugin/status/{slug}', ['as' => 'status.plugin', 'uses' => 'Common\SettingsController@StatusPlugin']);
 
     //Routes for showing language table and switching language
     Route::get('languages', ['as' => 'LanguageController', 'uses' => 'Admin\helpdesk\LanguageController@index']);
 
-    Route::get('get-languages', array('as' => 'getAllLanguages', 'uses' => 'Admin\helpdesk\LanguageController@getLanguages'));
+    Route::get('get-languages', ['as' => 'getAllLanguages', 'uses' => 'Admin\helpdesk\LanguageController@getLanguages']);
 
     Route::get('change-language/{lang}', ['as' => 'lang.switch', 'uses' => 'Admin\helpdesk\LanguageController@switchLanguage']);
 
     //Route for download language template package
-    Route::get('/download-template', array('as' => 'download', 'uses' => 'Admin\helpdesk\LanguageController@download'));
+    Route::get('/download-template', ['as' => 'download', 'uses' => 'Admin\helpdesk\LanguageController@download']);
 
     //Routes for language file upload form-----------You may want to use csrf protection for these route--------------
     Route::post('language/add', 'Admin\helpdesk\LanguageController@postForm');
 
-    Route::get('language/add', array('as' => 'add-language', 'uses' => 'Admin\helpdesk\LanguageController@getForm'));
+    Route::get('language/add', ['as' => 'add-language', 'uses' => 'Admin\helpdesk\LanguageController@getForm']);
 
     //Routes for  delete language package
     Route::get('delete-language/{lang}', ['as' => 'lang.delete', 'uses' => 'Admin\helpdesk\LanguageController@deleteLanguage']);
@@ -355,24 +355,24 @@ Route::group(['middleware' => 'role.agent', 'middleware' => 'auth'], function ()
   |
  */
 // seasrch
-Route::POST('tickets/search/', function() {
+Route::POST('tickets/search/', function () {
     $keyword = Illuminate\Support\Str::lower(Input::get('auto'));
     $models = App\Model\Ticket\Tickets::where('ticket_number', '=', $keyword)->orderby('ticket_number')->take(10)->skip(0)->get();
     $count = count($models);
-    return Illuminate\Support\Facades\Redirect::back()->with("contents", $models)->with("counts", $count);
+
+    return Illuminate\Support\Facades\Redirect::back()->with('contents', $models)->with('counts', $count);
 });
-Route::any('getdata', function() {
+Route::any('getdata', function () {
 
     $term = Illuminate\Support\Str::lower(Input::get('term'));
-    $data = Illuminate\Support\Facades\DB::table("tickets")->distinct()->select('ticket_number')->where('ticket_number', 'LIKE', $term . '%')->groupBy('ticket_number')->take(10)->get();
+    $data = Illuminate\Support\Facades\DB::table('tickets')->distinct()->select('ticket_number')->where('ticket_number', 'LIKE', $term.'%')->groupBy('ticket_number')->take(10)->get();
     foreach ($data as $v) {
         return [
-            'value' => $v->ticket_number
+            'value' => $v->ticket_number,
         ];
     }
 });
 
-
 Route::get('getform', ['as' => 'guest.getform', 'uses' => 'Client\helpdesk\FormController@getForm']); /* get the form for create a ticket by guest user */
 
 Route::post('postform/{id}', 'Client\helpdesk\FormController@postForm'); /* post the AJAX form for create a ticket by guest user */
@@ -425,7 +425,6 @@ Route::get('postcheck', 'Client\helpdesk\GuestController@PostCheckTicket');
 
 Route::post('post-ticket-reply/{id}', 'Client\helpdesk\FormController@post_ticket_reply');
 
-
 /* 404 page */
 // Route::get('404', 'error\ErrorController@error404');
 
@@ -463,30 +462,29 @@ Route::post('/postconnection', ['as' => 'postconnection', 'uses' => 'Installer\h
 Route::get('readmails', ['as' => 'readmails', 'uses' => 'Agent\helpdesk\MailController@readmails']);
 Route::get('notification', ['as' => 'notification', 'uses' => 'Agent\helpdesk\NotificationController@send_notification']);
 
-
 /*
   |=============================================================
   |  View all the Routes
   |=============================================================
  */
-Route::get('/aaa', function() {
+Route::get('/aaa', function () {
     $routeCollection = Route::getRoutes();
     echo "<table style='width:100%'>";
-    echo "<tr>";
+    echo '<tr>';
     echo "<td width='10%'><h4>HTTP Method</h4></td>";
     echo "<td width='10%'><h4>Route</h4></td>";
     echo "<td width='10%'><h4>Url</h4></td>";
     echo "<td width='80%'><h4>Corresponding Action</h4></td>";
-    echo "</tr>";
+    echo '</tr>';
     foreach ($routeCollection as $value) {
-        echo "<tr>";
-        echo "<td>" . $value->getMethods()[0] . "</td>";
-        echo "<td>" . $value->getName() . "</td>";
-        echo "<td>" . $value->getPath() . "</td>";
-        echo "<td>" . $value->getActionName() . "</td>";
-        echo "</tr>";
+        echo '<tr>';
+        echo '<td>'.$value->getMethods()[0].'</td>';
+        echo '<td>'.$value->getName().'</td>';
+        echo '<td>'.$value->getPath().'</td>';
+        echo '<td>'.$value->getActionName().'</td>';
+        echo '</tr>';
     }
-    echo "</table>";
+    echo '</table>';
 });
 
 /*
@@ -494,10 +492,10 @@ Route::get('/aaa', function() {
   |  Error Routes
   |=============================================================
  */
-Route::get('503', function() {
+Route::get('503', function () {
     return view('errors.503');
 });
-Route::get('404', function() {
+Route::get('404', function () {
     return view('errors.404');
 });
 
@@ -506,17 +504,14 @@ Route::get('404', function() {
   |  Test mail Routes
   |=============================================================
  */
-Route::get('testmail', function() {
-    $e = "hello";
+Route::get('testmail', function () {
+    $e = 'hello';
     Config::set('mail.host', 'smtp.gmail.com');
-    \Mail::send('errors.report', array('e' => $e), function ($message) {
+    \Mail::send('errors.report', ['e' => $e], function ($message) {
         $message->to('sujitprasad4567@gmail.com', 'sujit prasad')->subject('Error');
     });
 });
 
-
-
-
 /*  For the crud of catogory  */
 $router->resource('category', 'Agent\kb\CategoryController');
 $router->get('category/delete/{id}', 'Agent\kb\CategoryController@destroy');
@@ -558,14 +553,6 @@ $router->get('direct', function () {
     return view('direct');
 });
 
-
-
-
-
-
-
-
-
 // Route::get('/',['as'=>'home' , 'uses'=> 'client\kb\UserController@home'] );
 /* post the comment from show page */
 $router->post('postcomment/{slug}', ['as' => 'postcomment', 'uses' => 'Client\kb\UserController@postComment']);
@@ -593,29 +580,12 @@ $router->get('pages/{name}', ['as' => 'pages', 'uses' => 'Client\kb\UserControll
 // Route::patch('client-profile-edit',['as' => 'client-profile-edit', 'uses' => 'Client\kb\UserController@postClientProfile']);
 // Route::patch('client-profile-password/{id}',['as' => 'client-profile-password', 'uses' => 'Client\kb\UserController@postClientProfilePassword']);
 
-
-
-
-
-
-
-
-
 Route::get('/inbox/data', ['as' => 'api.inbox', 'uses' => 'Agent\helpdesk\TicketController@get_inbox']);
 
-
-
-
 Route::get('/report', 'HomeController@getreport');
 Route::get('/reportdata', 'HomeController@pushdata');
 
-
-
-
-
-
-
-/**
+/*
  * ================================================================================================
  * @version v1
  * @access public
@@ -623,7 +593,7 @@ Route::get('/reportdata', 'HomeController@pushdata');
  * @author Vijay Sebastian<vijay.sebastian@ladybirdweb.com>
  * @name Faveo
  */
-Route::group(['prefix' => 'api/v1'], function() {
+Route::group(['prefix' => 'api/v1'], function () {
     Route::post('register', 'Api\v1\TokenAuthController@register');
     Route::post('authenticate', 'Api\v1\TokenAuthController@authenticate');
     Route::get('authenticate/user', 'Api\v1\TokenAuthController@getAuthenticatedUser');
@@ -631,10 +601,10 @@ Route::group(['prefix' => 'api/v1'], function() {
     Route::get('/database-config', ['as' => 'database-config', 'uses' => 'Api\v1\InstallerApiController@config_database']);
     Route::get('/system-config', ['as' => 'database-config', 'uses' => 'Api\v1\InstallerApiController@config_system']);
 
-    /**
+    /*
      * Helpdesk
      */
-    Route::group(['prefix' => 'helpdesk'], function() {
+    Route::group(['prefix' => 'helpdesk'], function () {
 
         Route::post('create', 'Api\v1\ApiController@createTicket');
         Route::post('reply', 'Api\v1\ApiController@ticketReply');
@@ -665,7 +635,7 @@ Route::group(['prefix' => 'api/v1'], function() {
         Route::post('internal-note', 'Api\v1\ApiController@internalNote');
     });
 
-    /**
+    /*
      * Testing Url
      */
     Route::get('create/user', 'Api\v1\TestController@createUser');
@@ -698,4 +668,4 @@ Route::group(['prefix' => 'api/v1'], function() {
 
     Route::get('generate/token', 'Api\v1\TestController@generateToken');
     Route::get('get/user', 'Api\v1\TestController@getAuthUser');
-});
\ No newline at end of file
+});
diff --git a/app/Model/helpdesk/Agent/Agents.php b/app/Model/helpdesk/Agent/Agents.php
index 3ebd6ec80..0ef2e461e 100644
--- a/app/Model/helpdesk/Agent/Agents.php
+++ b/app/Model/helpdesk/Agent/Agents.php
@@ -4,13 +4,12 @@ namespace App\Model\helpdesk\Agent;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Agents extends Model {
-
+class Agents extends Model
+{
     protected $table = 'agents';
     protected $fillable = [
         'user_name', 'first_name', 'last_name', 'email', 'phone', 'mobile', 'agent_sign',
         'account_type', 'account_status', 'assign_group', 'primary_dpt', 'agent_tzone',
-        'daylight_save', 'limit_access', 'directory_listing', 'vocation_mode', 'assign_team'
+        'daylight_save', 'limit_access', 'directory_listing', 'vocation_mode', 'assign_team',
     ];
-
 }
diff --git a/app/Model/helpdesk/Agent/Assign_team_agent.php b/app/Model/helpdesk/Agent/Assign_team_agent.php
index d6ae46a22..4af6622b6 100644
--- a/app/Model/helpdesk/Agent/Assign_team_agent.php
+++ b/app/Model/helpdesk/Agent/Assign_team_agent.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Agent;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Assign_team_agent extends Model {
-
+class Assign_team_agent extends Model
+{
     protected $table = 'team_assign_agent';
     protected $fillable = ['id', 'team_id', 'agent_id'];
-
 }
diff --git a/app/Model/helpdesk/Agent/Department.php b/app/Model/helpdesk/Agent/Department.php
index 7d7916771..06ae85873 100644
--- a/app/Model/helpdesk/Agent/Department.php
+++ b/app/Model/helpdesk/Agent/Department.php
@@ -4,13 +4,12 @@ namespace App\Model\helpdesk\Agent;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Department extends Model {
-
+class Department extends Model
+{
     protected $table = 'department';
     protected $fillable = [
         'name', 'type', 'sla', 'manager', 'ticket_assignment', 'outgoing_email',
         'template_set', 'auto_ticket_response', 'auto_message_response',
-        'auto_response_email', 'recipient', 'group_access', 'department_sign'
+        'auto_response_email', 'recipient', 'group_access', 'department_sign',
     ];
-
 }
diff --git a/app/Model/helpdesk/Agent/Group_assign_department.php b/app/Model/helpdesk/Agent/Group_assign_department.php
index 7d0896640..459526964 100644
--- a/app/Model/helpdesk/Agent/Group_assign_department.php
+++ b/app/Model/helpdesk/Agent/Group_assign_department.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Agent;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Group_assign_department extends Model {
-
+class Group_assign_department extends Model
+{
     protected $table = 'group_assign_department';
     protected $fillable = ['group_id', 'department_id'];
-
 }
diff --git a/app/Model/helpdesk/Agent/Groups.php b/app/Model/helpdesk/Agent/Groups.php
index eade988e4..086302e94 100644
--- a/app/Model/helpdesk/Agent/Groups.php
+++ b/app/Model/helpdesk/Agent/Groups.php
@@ -4,15 +4,14 @@ namespace App\Model\helpdesk\Agent;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Groups extends Model {
-
+class Groups extends Model
+{
     protected $table = 'groups';
     protected $fillable = [
         'name', 'group_status', 'can_create_ticket', 'can_edit_ticket',
         'can_post_ticket', 'can_close_ticket', 'can_assign_ticket',
         'can_transfer_ticket', 'can_delete_ticket', 'can_ban_email',
         'can_manage_canned', 'can_manage_faq', 'can_view_agent_stats',
-        'department_access', 'admin_notes'
+        'department_access', 'admin_notes',
     ];
-
 }
diff --git a/app/Model/helpdesk/Agent/Teams.php b/app/Model/helpdesk/Agent/Teams.php
index 05cbd45b7..141ad49e2 100644
--- a/app/Model/helpdesk/Agent/Teams.php
+++ b/app/Model/helpdesk/Agent/Teams.php
@@ -4,11 +4,10 @@ namespace App\Model\helpdesk\Agent;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Teams extends Model {
-
+class Teams extends Model
+{
     protected $table = 'teams';
     protected $fillable = [
-        'name', 'status', 'team_lead', 'assign_alert', 'admin_notes'
+        'name', 'status', 'team_lead', 'assign_alert', 'admin_notes',
     ];
-
 }
diff --git a/app/Model/helpdesk/Agent_panel/Canned.php b/app/Model/helpdesk/Agent_panel/Canned.php
index 92d31687a..69b57f768 100644
--- a/app/Model/helpdesk/Agent_panel/Canned.php
+++ b/app/Model/helpdesk/Agent_panel/Canned.php
@@ -4,12 +4,12 @@ namespace App\Model\helpdesk\Agent_panel;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Canned extends Model {
+class Canned extends Model
+{
     /* define the table name */
 
     protected $table = 'canned_response';
 
     /* Define the fillable fields */
     protected $fillable = ['user_id', 'title', 'message', 'created_at', 'updated_at'];
-
 }
diff --git a/app/Model/helpdesk/Agent_panel/Organization.php b/app/Model/helpdesk/Agent_panel/Organization.php
index 355c6661c..abc61adc1 100644
--- a/app/Model/helpdesk/Agent_panel/Organization.php
+++ b/app/Model/helpdesk/Agent_panel/Organization.php
@@ -4,12 +4,12 @@ namespace App\Model\helpdesk\Agent_panel;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Organization extends Model {
+class Organization extends Model
+{
     /* define the table name */
 
     protected $table = 'organization';
 
     /* Define the fillable fields */
     protected $fillable = ['id', 'name', 'phone', 'website', 'address', 'head', 'internal_notes'];
-
 }
diff --git a/app/Model/helpdesk/Agent_panel/User_org.php b/app/Model/helpdesk/Agent_panel/User_org.php
index c09b13ee0..57590ad07 100644
--- a/app/Model/helpdesk/Agent_panel/User_org.php
+++ b/app/Model/helpdesk/Agent_panel/User_org.php
@@ -4,12 +4,12 @@ namespace App\Model\helpdesk\Agent_panel;
 
 use Illuminate\Database\Eloquent\Model;
 
-class User_org extends Model {
+class User_org extends Model
+{
     /* define table name  */
 
     protected $table = 'user_assign_organization';
 
     /* define fillable fields */
     protected $fillable = ['id', 'org_id', 'user_id'];
-
 }
diff --git a/app/Model/helpdesk/Agent_panel/User_org_head.php b/app/Model/helpdesk/Agent_panel/User_org_head.php
index f866f04f4..8db241e6b 100644
--- a/app/Model/helpdesk/Agent_panel/User_org_head.php
+++ b/app/Model/helpdesk/Agent_panel/User_org_head.php
@@ -4,12 +4,12 @@ namespace App\Model\helpdesk\Agent_panel;
 
 use Illuminate\Database\Eloquent\Model;
 
-class User_org_head extends Model {
+class User_org_head extends Model
+{
     /* define table name  */
 
     protected $table = 'user_org_head';
 
     /* define fillable fields */
     protected $fillable = ['id', 'org_id', 'user_id', 'updated_at', 'created_at'];
-
 }
diff --git a/app/Model/helpdesk/Email/Banlist.php b/app/Model/helpdesk/Email/Banlist.php
index 0b634c29f..3ffc85152 100644
--- a/app/Model/helpdesk/Email/Banlist.php
+++ b/app/Model/helpdesk/Email/Banlist.php
@@ -4,11 +4,10 @@ namespace App\Model\helpdesk\Email;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Banlist extends Model {
-
+class Banlist extends Model
+{
     protected $table = 'banlist';
     protected $fillable = [
         'id', 'ban_status', 'email_address', 'internal_notes',
     ];
-
 }
diff --git a/app/Model/helpdesk/Email/Emails.php b/app/Model/helpdesk/Email/Emails.php
index 110247b74..d98ccaf34 100644
--- a/app/Model/helpdesk/Email/Emails.php
+++ b/app/Model/helpdesk/Email/Emails.php
@@ -4,15 +4,14 @@ namespace App\Model\helpdesk\Email;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Emails extends Model {
-
+class Emails extends Model
+{
     protected $table = 'emails';
     protected $fillable = [
         'email_address', 'email_name', 'department', 'priority', 'help_topic',
         'user_name', 'password', 'fetching_host', 'fetching_port', 'mailbox_protocol',
         'folder', 'sending_host', 'sending_port', 'sending_encryption', 'internal_notes', 'auto_response',
         'fetching_status', 'move_to_folder', 'delete_email', 'do_nothing',
-        'sending_status', 'authentication', 'header_spoofing', 'imap_config'
+        'sending_status', 'authentication', 'header_spoofing', 'imap_config',
     ];
-
 }
diff --git a/app/Model/helpdesk/Email/Smtp.php b/app/Model/helpdesk/Email/Smtp.php
index ee74924bd..0fb095f53 100644
--- a/app/Model/helpdesk/Email/Smtp.php
+++ b/app/Model/helpdesk/Email/Smtp.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Email;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Smtp extends Model {
-
+class Smtp extends Model
+{
     public $timestamps = false;
     protected $table = 'send_mail';
     protected $fillable = ['driver', 'port', 'host', 'encryption', 'name', 'email', 'password'];
-
 }
diff --git a/app/Model/helpdesk/Email/Template.php b/app/Model/helpdesk/Email/Template.php
index 8bd7e7631..f1a4aeeee 100644
--- a/app/Model/helpdesk/Email/Template.php
+++ b/app/Model/helpdesk/Email/Template.php
@@ -4,11 +4,10 @@ namespace App\Model\helpdesk\Email;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Template extends Model {
-
+class Template extends Model
+{
     protected $table = 'template';
     protected $fillable = [
-        'id', 'name', 'status', 'template_set_to_clone', 'language', 'internal_note'
+        'id', 'name', 'status', 'template_set_to_clone', 'language', 'internal_note',
     ];
-
 }
diff --git a/app/Model/helpdesk/Form/Fields.php b/app/Model/helpdesk/Form/Fields.php
index 74aa36880..67d73f12a 100644
--- a/app/Model/helpdesk/Form/Fields.php
+++ b/app/Model/helpdesk/Form/Fields.php
@@ -4,8 +4,8 @@ namespace App\Model\helpdesk\Form;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Fields extends Model {
-
+class Fields extends Model
+{
     protected $table = 'custom_form_fields';
 
     /**
@@ -14,5 +14,4 @@ class Fields extends Model {
      * @var array
      */
     protected $fillable = ['forms_id', 'label', 'name', 'type', 'value', 'required'];
-
 }
diff --git a/app/Model/helpdesk/Form/Form_details.php b/app/Model/helpdesk/Form/Form_details.php
index 952a57729..42d9be821 100644
--- a/app/Model/helpdesk/Form/Form_details.php
+++ b/app/Model/helpdesk/Form/Form_details.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Form;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Form_details extends Model {
-
+class Form_details extends Model
+{
     public $timestamps = false;
     protected $table = 'form_details';
     protected $fillable = ['id', 'label', 'type'];
-
 }
diff --git a/app/Model/helpdesk/Form/Form_name.php b/app/Model/helpdesk/Form/Form_name.php
index 5b07220e6..78dcae475 100644
--- a/app/Model/helpdesk/Form/Form_name.php
+++ b/app/Model/helpdesk/Form/Form_name.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Form;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Form_name extends Model {
-
+class Form_name extends Model
+{
     public $timestamps = false;
     protected $table = 'form_name';
     protected $fillable = ['id', 'name', 'status', 'no_of_fields'];
-
 }
diff --git a/app/Model/helpdesk/Form/Form_value.php b/app/Model/helpdesk/Form/Form_value.php
index cc1197b2c..2f45e17de 100644
--- a/app/Model/helpdesk/Form/Form_value.php
+++ b/app/Model/helpdesk/Form/Form_value.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Form;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Form_value extends Model {
-
+class Form_value extends Model
+{
     public $timestamps = false;
     protected $table = 'form_value';
     protected $fillable = ['id', 'values'];
-
 }
diff --git a/app/Model/helpdesk/Form/Forms.php b/app/Model/helpdesk/Form/Forms.php
index 50a4f7bd0..faf8c3f18 100644
--- a/app/Model/helpdesk/Form/Forms.php
+++ b/app/Model/helpdesk/Form/Forms.php
@@ -4,8 +4,8 @@ namespace App\Model\helpdesk\Form;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Forms extends Model {
-
+class Forms extends Model
+{
     protected $table = 'custom_forms';
 
     /**
@@ -14,5 +14,4 @@ class Forms extends Model {
      * @var array
      */
     protected $fillable = ['formname'];
-
 }
diff --git a/app/Model/helpdesk/Guest/Guest_note.php b/app/Model/helpdesk/Guest/Guest_note.php
index 9eb2606ff..714f88d72 100644
--- a/app/Model/helpdesk/Guest/Guest_note.php
+++ b/app/Model/helpdesk/Guest/Guest_note.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Guest;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Guest_note extends Model {
-
+class Guest_note extends Model
+{
     public $timestamps = false;
     protected $table = 'guest_note';
     protected $fillable = ['id', 'heading', 'content'];
-
 }
diff --git a/app/Model/helpdesk/Manage/Forms.php b/app/Model/helpdesk/Manage/Forms.php
index b6e80e928..eb46334cc 100644
--- a/app/Model/helpdesk/Manage/Forms.php
+++ b/app/Model/helpdesk/Manage/Forms.php
@@ -4,12 +4,11 @@ namespace App\Model\helpdesk\Manage;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Forms extends Model {
-
+class Forms extends Model
+{
     protected $table = 'forms';
     /*
       this is a custom Forms created by user himself
      */
     protected $fillable = ['id', 'title', 'instruction', 'label', 'type', 'visibility', 'variable', 'internal_notes'];
-
 }
diff --git a/app/Model/helpdesk/Manage/Help_topic.php b/app/Model/helpdesk/Manage/Help_topic.php
index 9549a055e..9a7bf25ea 100644
--- a/app/Model/helpdesk/Manage/Help_topic.php
+++ b/app/Model/helpdesk/Manage/Help_topic.php
@@ -4,13 +4,12 @@ namespace App\Model\helpdesk\Manage;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Help_topic extends Model {
-
+class Help_topic extends Model
+{
     protected $table = 'help_topic';
     protected $fillable = [
         'id', 'topic', 'parent_topic', 'custom_form', 'department', 'ticket_status', 'priority',
         'sla_plan', 'thank_page', 'ticket_num_format', 'internal_notes', 'status', 'type', 'auto_assign',
-        'auto_response'
+        'auto_response',
     ];
-
 }
diff --git a/app/Model/helpdesk/Manage/Sla_plan.php b/app/Model/helpdesk/Manage/Sla_plan.php
index f7838d17f..f00fe4e53 100644
--- a/app/Model/helpdesk/Manage/Sla_plan.php
+++ b/app/Model/helpdesk/Manage/Sla_plan.php
@@ -4,11 +4,10 @@ namespace App\Model\helpdesk\Manage;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Sla_plan extends Model {
-
+class Sla_plan extends Model
+{
     protected $table = 'sla_plan';
     protected $fillable = [
-        'name', 'grace_period', 'admin_note', 'status', 'transient', 'ticket_overdue'
+        'name', 'grace_period', 'admin_note', 'status', 'transient', 'ticket_overdue',
     ];
-
 }
diff --git a/app/Model/helpdesk/Settings/Access.php b/app/Model/helpdesk/Settings/Access.php
index 63b743859..3753144ae 100644
--- a/app/Model/helpdesk/Settings/Access.php
+++ b/app/Model/helpdesk/Settings/Access.php
@@ -4,13 +4,12 @@ namespace App\Model\helpdesk\Settings;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Access extends Model {
-
+class Access extends Model
+{
     protected $table = 'access';
     protected $fillable = [
         'password_expire', 'reg_method', 'user_session',
         'agent_session', 'reset_ticket_expire', 'password_reset',
-        'bind_agent_ip', 'reg_require', 'quick_access'
+        'bind_agent_ip', 'reg_require', 'quick_access',
     ];
-
 }
diff --git a/app/Model/helpdesk/Settings/Alert.php b/app/Model/helpdesk/Settings/Alert.php
index b5a1f3bef..fc1a4fcb3 100644
--- a/app/Model/helpdesk/Settings/Alert.php
+++ b/app/Model/helpdesk/Settings/Alert.php
@@ -4,7 +4,8 @@ namespace App\Model\helpdesk\Settings;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Alert extends Model {
+class Alert extends Model
+{
     /* Using alert_notice table  */
 
     protected $table = 'settings_alert_notice';
@@ -17,7 +18,6 @@ class Alert extends Model {
         'internal_assigned_agent', 'internal_department_manager', 'assignment_status', 'assignment_assigned_agent',
         'assignment_team_leader', 'assignment_team_member', 'transfer_status', 'transfer_assigned_agent', 'transfer_department_manager',
         'transfer_department_member', 'overdue_status', 'overdue_assigned_agent', 'overdue_department_manager',
-        'overdue_department_member', 'system_error', 'sql_error', 'excessive_failure'
+        'overdue_department_member', 'system_error', 'sql_error', 'excessive_failure',
     ];
-
 }
diff --git a/app/Model/helpdesk/Settings/Company.php b/app/Model/helpdesk/Settings/Company.php
index 94322d3d3..34acbc270 100644
--- a/app/Model/helpdesk/Settings/Company.php
+++ b/app/Model/helpdesk/Settings/Company.php
@@ -4,12 +4,11 @@ namespace App\Model\helpdesk\Settings;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Company extends Model {
-
+class Company extends Model
+{
     protected $table = 'settings_company';
     protected $fillable = [
         'company_name', 'website', 'phone', 'address', 'landing_page', 'offline_page',
-        'thank_page', 'logo', 'use_logo'
+        'thank_page', 'logo', 'use_logo',
     ];
-
 }
diff --git a/app/Model/helpdesk/Settings/Email.php b/app/Model/helpdesk/Settings/Email.php
index 5802df163..153f842b7 100644
--- a/app/Model/helpdesk/Settings/Email.php
+++ b/app/Model/helpdesk/Settings/Email.php
@@ -4,14 +4,14 @@ namespace App\Model\helpdesk\Settings;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Email extends Model {
+class Email extends Model
+{
     /* Using Email table  */
 
     protected $table = 'settings_email';
     /* Set fillable fields in table */
     protected $fillable = [
         'id', 'template', 'sys_email', 'alert_email', 'admin_email', 'mta', 'email_fetching', 'strip',
-        'separator', 'all_emails', 'email_collaborator', 'attachment'
+        'separator', 'all_emails', 'email_collaborator', 'attachment',
     ];
-
 }
diff --git a/app/Model/helpdesk/Settings/Plugin.php b/app/Model/helpdesk/Settings/Plugin.php
index fcf44afc2..b4a4667e3 100644
--- a/app/Model/helpdesk/Settings/Plugin.php
+++ b/app/Model/helpdesk/Settings/Plugin.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Settings;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Plugin extends Model {
-
+class Plugin extends Model
+{
     protected $table = 'plugins';
     protected $fillable = ['name', 'path', 'status'];
-
 }
diff --git a/app/Model/helpdesk/Settings/Responder.php b/app/Model/helpdesk/Settings/Responder.php
index b8da185c9..d10c0c381 100644
--- a/app/Model/helpdesk/Settings/Responder.php
+++ b/app/Model/helpdesk/Settings/Responder.php
@@ -4,14 +4,14 @@ namespace App\Model\helpdesk\Settings;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Responder extends Model {
+class Responder extends Model
+{
     /* Using auto_response table  */
 
     protected $table = 'settings_auto_response';
     /* Set fillable fields in table */
     protected $fillable = [
 
-        'id', 'new_ticket', 'agent_new_ticket', 'submitter', 'participants', 'overlimit'
+        'id', 'new_ticket', 'agent_new_ticket', 'submitter', 'participants', 'overlimit',
     ];
-
 }
diff --git a/app/Model/helpdesk/Settings/System.php b/app/Model/helpdesk/Settings/System.php
index 275dcf80d..1244b0d09 100644
--- a/app/Model/helpdesk/Settings/System.php
+++ b/app/Model/helpdesk/Settings/System.php
@@ -4,14 +4,14 @@ namespace App\Model\helpdesk\Settings;
 
 use Illuminate\Database\Eloquent\Model;
 
-class System extends Model {
+class System extends Model
+{
     /* Using System Table */
 
     protected $table = 'settings_system';
     protected $fillable = [
 
         'id', 'status', 'url', 'name', 'department', 'page_size', 'log_level', 'purge_log', 'name_format',
-        'time_farmat', 'date_format', 'date_time_format', 'day_date_time', 'time_zone', 'content', 'api_key', 'api_enable'
+        'time_farmat', 'date_format', 'date_time_format', 'day_date_time', 'time_zone', 'content', 'api_key', 'api_enable',
     ];
-
 }
diff --git a/app/Model/helpdesk/Settings/Ticket.php b/app/Model/helpdesk/Settings/Ticket.php
index 1037ae4e3..47c703feb 100644
--- a/app/Model/helpdesk/Settings/Ticket.php
+++ b/app/Model/helpdesk/Settings/Ticket.php
@@ -4,14 +4,14 @@ namespace App\Model\helpdesk\Settings;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Ticket extends Model {
+class Ticket extends Model
+{
     /* Using Ticket table  */
 
     protected $table = 'settings_ticket';
     /* Set fillable fields in table */
     protected $fillable = [
         'id', 'num_format', 'num_sequence', 'priority', 'sla', 'help_topic', 'max_open_ticket', 'collision_avoid',
-        'captcha', 'status', 'claim_response', 'assigned_ticket', 'answered_ticket', 'agent_mask', 'html', 'client_update', 'max_file_size'
+        'captcha', 'status', 'claim_response', 'assigned_ticket', 'answered_ticket', 'agent_mask', 'html', 'client_update', 'max_file_size',
     ];
-
 }
diff --git a/app/Model/helpdesk/Theme/Footer.php b/app/Model/helpdesk/Theme/Footer.php
index 527aebf45..7f3d9600f 100644
--- a/app/Model/helpdesk/Theme/Footer.php
+++ b/app/Model/helpdesk/Theme/Footer.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Theme;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Footer extends Model {
-
+class Footer extends Model
+{
     protected $table = 'footer';
     protected $fillable = ['title', 'footer'];
-
 }
diff --git a/app/Model/helpdesk/Theme/Footer2.php b/app/Model/helpdesk/Theme/Footer2.php
index e08eaa35e..1c21e184d 100644
--- a/app/Model/helpdesk/Theme/Footer2.php
+++ b/app/Model/helpdesk/Theme/Footer2.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Theme;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Footer2 extends Model {
-
+class Footer2 extends Model
+{
     protected $table = 'footer2';
     protected $fillable = ['title', 'footer'];
-
 }
diff --git a/app/Model/helpdesk/Theme/Footer3.php b/app/Model/helpdesk/Theme/Footer3.php
index 1854434e7..c0226f887 100644
--- a/app/Model/helpdesk/Theme/Footer3.php
+++ b/app/Model/helpdesk/Theme/Footer3.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Theme;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Footer3 extends Model {
-
+class Footer3 extends Model
+{
     protected $table = 'footer3';
     protected $fillable = ['title', 'footer'];
-
 }
diff --git a/app/Model/helpdesk/Theme/Footer4.php b/app/Model/helpdesk/Theme/Footer4.php
index 68165e915..e5e6d4d64 100644
--- a/app/Model/helpdesk/Theme/Footer4.php
+++ b/app/Model/helpdesk/Theme/Footer4.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Theme;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Footer4 extends Model {
-
+class Footer4 extends Model
+{
     protected $table = 'footer4';
     protected $fillable = ['title', 'footer'];
-
 }
diff --git a/app/Model/helpdesk/Theme/Widgets.php b/app/Model/helpdesk/Theme/Widgets.php
index 10d8d38be..9fa277fc6 100644
--- a/app/Model/helpdesk/Theme/Widgets.php
+++ b/app/Model/helpdesk/Theme/Widgets.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Theme;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Widgets extends Model {
-
+class Widgets extends Model
+{
     protected $table = 'widgets';
     protected $fillable = ['name', 'value', 'created_at', 'updated_at'];
-
 }
diff --git a/app/Model/helpdesk/Ticket/Ticket_Collaborator.php b/app/Model/helpdesk/Ticket/Ticket_Collaborator.php
index 28ecc18a8..321f8c33d 100644
--- a/app/Model/helpdesk/Ticket/Ticket_Collaborator.php
+++ b/app/Model/helpdesk/Ticket/Ticket_Collaborator.php
@@ -1,11 +1,13 @@
-<?php namespace App\Model\helpdesk\Ticket;
+<?php
+
+namespace App\Model\helpdesk\Ticket;
 
 use Illuminate\Database\Eloquent\Model;
 
 class Ticket_Collaborator extends Model
 {
-	protected $table = 'ticket_collaborator';
-	protected $fillable = [
-							'id','isactive','ticket_id','user_id','role','updated_at','created_at'
-							];
+    protected $table = 'ticket_collaborator';
+    protected $fillable = [
+                            'id', 'isactive', 'ticket_id', 'user_id', 'role', 'updated_at', 'created_at',
+                            ];
 }
diff --git a/app/Model/helpdesk/Ticket/Ticket_Form_Data.php b/app/Model/helpdesk/Ticket/Ticket_Form_Data.php
index ce4e2a5b7..2c4664bf1 100644
--- a/app/Model/helpdesk/Ticket/Ticket_Form_Data.php
+++ b/app/Model/helpdesk/Ticket/Ticket_Form_Data.php
@@ -1,9 +1,11 @@
-<?php namespace App\Model\helpdesk\Ticket;
+<?php
+
+namespace App\Model\helpdesk\Ticket;
 
 use Illuminate\Database\Eloquent\Model;
 
 class Ticket_Form_Data extends Model
 {
-	protected $table = 'ticket_form_data';
-	protected $fillable = ['id','ticket_id','title','content','created_at','updated_at'];
+    protected $table = 'ticket_form_data';
+    protected $fillable = ['id', 'ticket_id', 'title', 'content', 'created_at', 'updated_at'];
 }
diff --git a/app/Model/helpdesk/Ticket/Ticket_Priority.php b/app/Model/helpdesk/Ticket/Ticket_Priority.php
index 2d2e3eb4a..3eb68d1e8 100644
--- a/app/Model/helpdesk/Ticket/Ticket_Priority.php
+++ b/app/Model/helpdesk/Ticket/Ticket_Priority.php
@@ -1,11 +1,14 @@
-<?php namespace App\Model\helpdesk\Ticket;
+<?php
+
+namespace App\Model\helpdesk\Ticket;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Ticket_Priority extends Model {
-	public $timestamps = false;
-	protected $table = 'ticket_priority';
-	protected $fillable = [
-		'priority_id', 'priority', 'priority_desc', 'priority_color', 'priority_urgency', 'ispublic',
-	];
+class Ticket_Priority extends Model
+{
+    public $timestamps = false;
+    protected $table = 'ticket_priority';
+    protected $fillable = [
+        'priority_id', 'priority', 'priority_desc', 'priority_color', 'priority_urgency', 'ispublic',
+    ];
 }
diff --git a/app/Model/helpdesk/Ticket/Ticket_Status.php b/app/Model/helpdesk/Ticket/Ticket_Status.php
index e1c2d6514..755a1e98b 100644
--- a/app/Model/helpdesk/Ticket/Ticket_Status.php
+++ b/app/Model/helpdesk/Ticket/Ticket_Status.php
@@ -4,11 +4,10 @@ namespace App\Model\helpdesk\Ticket;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Ticket_Status extends Model {
-
+class Ticket_Status extends Model
+{
     protected $table = 'ticket_status';
     protected $fillable = [
-        'id', 'name', 'state', 'message', 'mode', 'flag', 'sort', 'properties'
+        'id', 'name', 'state', 'message', 'mode', 'flag', 'sort', 'properties',
     ];
-
 }
diff --git a/app/Model/helpdesk/Ticket/Ticket_Thread.php b/app/Model/helpdesk/Ticket/Ticket_Thread.php
index 0c8febae2..6d694575c 100644
--- a/app/Model/helpdesk/Ticket/Ticket_Thread.php
+++ b/app/Model/helpdesk/Ticket/Ticket_Thread.php
@@ -3,22 +3,21 @@
 namespace App\Model\helpdesk\Ticket;
 
 use Illuminate\Database\Eloquent\Model;
-use App\Model\helpdesk\Ticket\Ticket_attachments;
-
-class Ticket_Thread extends Model {
-
+class Ticket_Thread extends Model
+{
     protected $table = 'ticket_thread';
     protected $fillable = [
-        'id', 'pid', 'ticket_id', 'staff_id', 'user_id', 'thread_type', 'poster', 'source', 'is_internal', 'title', 'body', 'format', 'ip_address', 'created_at', 'updated_at'
+        'id', 'pid', 'ticket_id', 'staff_id', 'user_id', 'thread_type', 'poster', 'source', 'is_internal', 'title', 'body', 'format', 'ip_address', 'created_at', 'updated_at',
     ];
 
-    public function attach() {
+    public function attach()
+    {
         return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_attachments', 'thread_id');
     }
 
-    public function delete() {
+    public function delete()
+    {
         $$this->attach()->delete();
         parent::delete();
     }
-
 }
diff --git a/app/Model/helpdesk/Ticket/Ticket_attachments.php b/app/Model/helpdesk/Ticket/Ticket_attachments.php
index 3c824151d..33de6ad66 100644
--- a/app/Model/helpdesk/Ticket/Ticket_attachments.php
+++ b/app/Model/helpdesk/Ticket/Ticket_attachments.php
@@ -1,11 +1,13 @@
-<?php namespace App\Model\helpdesk\Ticket;
+<?php
+
+namespace App\Model\helpdesk\Ticket;
 
 use Illuminate\Database\Eloquent\Model;
 
 class Ticket_attachments extends Model
 {
-	protected $table = 'ticket_attachment';
-	protected $fillable = [
-							'id','thread_id','name','size','type','file','data','poster','updated_at','created_at'
-							];
+    protected $table = 'ticket_attachment';
+    protected $fillable = [
+                            'id', 'thread_id', 'name', 'size', 'type', 'file', 'data', 'poster', 'updated_at', 'created_at',
+                            ];
 }
diff --git a/app/Model/helpdesk/Ticket/Ticket_source.php b/app/Model/helpdesk/Ticket/Ticket_source.php
index 4ab63f5bf..46d5fa0e7 100644
--- a/app/Model/helpdesk/Ticket/Ticket_source.php
+++ b/app/Model/helpdesk/Ticket/Ticket_source.php
@@ -1,11 +1,14 @@
-<?php namespace App\Model\helpdesk\Ticket;
+<?php
+
+namespace App\Model\helpdesk\Ticket;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Ticket_source extends Model {
-	public $timestamps = false;
-	protected $table = 'ticket_source';
-	protected $fillable = [
-		'name','value',
-	];
+class Ticket_source extends Model
+{
+    public $timestamps = false;
+    protected $table = 'ticket_source';
+    protected $fillable = [
+        'name', 'value',
+    ];
 }
diff --git a/app/Model/helpdesk/Ticket/Tickets.php b/app/Model/helpdesk/Ticket/Tickets.php
index 5536bd3fe..445dfffad 100644
--- a/app/Model/helpdesk/Ticket/Tickets.php
+++ b/app/Model/helpdesk/Ticket/Tickets.php
@@ -3,37 +3,35 @@
 namespace App\Model\helpdesk\Ticket;
 
 use Illuminate\Database\Eloquent\Model;
-use App\Model\helpdesk\Ticket\Ticket_attachments;
-use App\Model\helpdesk\Ticket\Ticket_Thread;
-use App\Model\helpdesk\Ticket\Ticket_Collaborator;
-use App\Model\helpdesk\Ticket\Ticket_Form_Data;
-
-class Tickets extends Model {
-
+class Tickets extends Model
+{
     protected $table = 'tickets';
     protected $fillable = ['id', 'ticket_number', 'num_sequence', 'user_id', 'priority_id', 'sla', 'help_topic_id', 'max_open_ticket', 'captcha', 'status', 'lock_by', 'lock_at', 'source', 'isoverdue', 'reopened', 'isanswered', 'is_deleted', 'closed', 'is_transfer', 'transfer_at', 'reopened_at', 'duedate', 'closed_at', 'last_message_at', 'last_response_at', 'created_at', 'updated_at'];
 
 //        public function attach(){
 //            return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_attachments',);
-//            
+//
 //        }
-    public function thread() {
+    public function thread()
+    {
         return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_thread', 'ticket_id');
     }
 
-    public function collaborator() {
+    public function collaborator()
+    {
         return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_Collaborator', 'ticket_id');
     }
 
-    public function formdata() {
+    public function formdata()
+    {
         return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_Form_Data', 'ticket_id');
     }
 
-    public function delete() {
+    public function delete()
+    {
         $this->thread()->delete();
         $this->collaborator()->delete();
         $this->formdata()->delete();
         parent::delete();
     }
-
 }
diff --git a/app/Model/helpdesk/Utility/Date_format.php b/app/Model/helpdesk/Utility/Date_format.php
index 08c288c9e..aabbd43d0 100644
--- a/app/Model/helpdesk/Utility/Date_format.php
+++ b/app/Model/helpdesk/Utility/Date_format.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class date_format extends Model {
-
+class Date_format extends Model
+{
     public $timestamps = false;
     protected $table = 'date_format';
     protected $fillable = ['id', 'format'];
-
 }
diff --git a/app/Model/helpdesk/Utility/Date_time_format.php b/app/Model/helpdesk/Utility/Date_time_format.php
index 751e0f460..d257fa45a 100644
--- a/app/Model/helpdesk/Utility/Date_time_format.php
+++ b/app/Model/helpdesk/Utility/Date_time_format.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class date_time_format extends Model {
-
+class Date_time_format extends Model
+{
     public $timestamps = false;
     protected $table = 'date_time_format';
     protected $fillable = ['id', 'format'];
-
 }
diff --git a/app/Model/helpdesk/Utility/Email.php b/app/Model/helpdesk/Utility/Email.php
index bf4c46093..de7691678 100644
--- a/app/Model/helpdesk/Utility/Email.php
+++ b/app/Model/helpdesk/Utility/Email.php
@@ -4,14 +4,14 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Email extends Model {
+class Email extends Model
+{
     /* Using Email table  */
 
     protected $table = 'email';
     /* Set fillable fields in table */
     protected $fillable = [
         'id', 'template', 'sys_email', 'alert_email', 'admin_email', 'mta', 'email_fetching', 'strip',
-        'separator', 'all_emails', 'email_collaborator', 'attachment'
+        'separator', 'all_emails', 'email_collaborator', 'attachment',
     ];
-
 }
diff --git a/app/Model/helpdesk/Utility/Form_type.php b/app/Model/helpdesk/Utility/Form_type.php
index 0e6dd78f1..4cf51d105 100644
--- a/app/Model/helpdesk/Utility/Form_type.php
+++ b/app/Model/helpdesk/Utility/Form_type.php
@@ -4,11 +4,10 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Form_type extends Model {
-
+class Form_type extends Model
+{
     protected $table = 'form_type';
     protected $fillable = [
-        'id', 'type'
+        'id', 'type',
     ];
-
 }
diff --git a/app/Model/helpdesk/Utility/Form_visibility.php b/app/Model/helpdesk/Utility/Form_visibility.php
index 16317373a..7db2d6496 100644
--- a/app/Model/helpdesk/Utility/Form_visibility.php
+++ b/app/Model/helpdesk/Utility/Form_visibility.php
@@ -4,11 +4,10 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Form_visibility extends Model {
-
+class Form_visibility extends Model
+{
     protected $table = 'form_visibility';
     protected $fillable = [
-        'id', 'visibility'
+        'id', 'visibility',
     ];
-
 }
diff --git a/app/Model/helpdesk/Utility/Languages.php b/app/Model/helpdesk/Utility/Languages.php
index 9c863c8a8..9d5da2292 100644
--- a/app/Model/helpdesk/Utility/Languages.php
+++ b/app/Model/helpdesk/Utility/Languages.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Languages extends Model {
-
+class Languages extends Model
+{
     public $timestamps = false;
     protected $table = 'languages';
     protected $fillable = ['name', 'locale'];
-
 }
diff --git a/app/Model/helpdesk/Utility/Limit_Login.php b/app/Model/helpdesk/Utility/Limit_Login.php
index 3fe0534df..d6c0bab37 100644
--- a/app/Model/helpdesk/Utility/Limit_Login.php
+++ b/app/Model/helpdesk/Utility/Limit_Login.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Limit_Login extends Model {
-
+class Limit_Login extends Model
+{
     protected $table = 'limit_login';
     protected $fillable = ['email', 'ip_address', 'duration', 'attempt_time', 'created_at', 'updated_at'];
-
 }
diff --git a/app/Model/helpdesk/Utility/Log_notification.php b/app/Model/helpdesk/Utility/Log_notification.php
index 0d5d70644..297ab27be 100644
--- a/app/Model/helpdesk/Utility/Log_notification.php
+++ b/app/Model/helpdesk/Utility/Log_notification.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Log_notification extends Model {
-
+class Log_notification extends Model
+{
     protected $table = 'log_notification';
     protected $fillable = ['id', 'log'];
-
 }
diff --git a/app/Model/helpdesk/Utility/Logs.php b/app/Model/helpdesk/Utility/Logs.php
index 81bf46002..996d46d13 100644
--- a/app/Model/helpdesk/Utility/Logs.php
+++ b/app/Model/helpdesk/Utility/Logs.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Logs extends Model {
-
+class Logs extends Model
+{
     public $timestamps = false;
     protected $table = 'logs';
     protected $fillable = ['id', 'level'];
-
 }
diff --git a/app/Model/helpdesk/Utility/MailboxProtocol.php b/app/Model/helpdesk/Utility/MailboxProtocol.php
index 251cec2d0..3dd9393fc 100644
--- a/app/Model/helpdesk/Utility/MailboxProtocol.php
+++ b/app/Model/helpdesk/Utility/MailboxProtocol.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class MailboxProtocol extends Model {
-
+class MailboxProtocol extends Model
+{
     public $timestamps = false;
     protected $table = 'mailbox_protocol';
     protected $fillable = ['id', 'name', 'value'];
-
 }
diff --git a/app/Model/helpdesk/Utility/Priority.php b/app/Model/helpdesk/Utility/Priority.php
index cfa2d1a7f..dacc2a697 100644
--- a/app/Model/helpdesk/Utility/Priority.php
+++ b/app/Model/helpdesk/Utility/Priority.php
@@ -4,12 +4,11 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Priority extends Model {
-
+class Priority extends Model
+{
     public $timestamps = false;
     protected $table = 'priority';
     protected $fillable = [
-        'id', 'name'
+        'id', 'name',
     ];
-
 }
diff --git a/app/Model/helpdesk/Utility/Ticket_thread.php b/app/Model/helpdesk/Utility/Ticket_thread.php
index 94e37035a..174d35888 100644
--- a/app/Model/helpdesk/Utility/Ticket_thread.php
+++ b/app/Model/helpdesk/Utility/Ticket_thread.php
@@ -4,11 +4,10 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Ticket_thread extends Model {
-
+class Ticket_thread extends Model
+{
     protected $table = 'ticket_thread';
     protected $fillable = [
-        'id', 'ticket_id', 'ticket_subject', 'ticket_message', 'time', 'poster', 'created_at', 'updated_at'
+        'id', 'ticket_id', 'ticket_subject', 'ticket_message', 'time', 'poster', 'created_at', 'updated_at',
     ];
-
 }
diff --git a/app/Model/helpdesk/Utility/Time_format.php b/app/Model/helpdesk/Utility/Time_format.php
index 330a451cd..bf80150f7 100644
--- a/app/Model/helpdesk/Utility/Time_format.php
+++ b/app/Model/helpdesk/Utility/Time_format.php
@@ -4,10 +4,9 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Time_format extends Model {
-
+class Time_format extends Model
+{
     public $timestamps = false;
     protected $table = 'time_format';
     protected $fillable = ['id', 'format'];
-
 }
diff --git a/app/Model/helpdesk/Utility/Timezones.php b/app/Model/helpdesk/Utility/Timezones.php
index d96864fcb..935fe10af 100644
--- a/app/Model/helpdesk/Utility/Timezones.php
+++ b/app/Model/helpdesk/Utility/Timezones.php
@@ -1,10 +1,12 @@
-<?php namespace App\Model\helpdesk\Utility;
+<?php
+
+namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Timezones extends Model {
-
-	public $timestamps = false;
-	protected $table = 'timezone';
-	protected $fillable = ['name', 'location'];
+class Timezones extends Model
+{
+    public $timestamps = false;
+    protected $table = 'timezone';
+    protected $fillable = ['name', 'location'];
 }
diff --git a/app/Model/helpdesk/Utility/Version_Check.php b/app/Model/helpdesk/Utility/Version_Check.php
index 067b31639..4115b24fe 100644
--- a/app/Model/helpdesk/Utility/Version_Check.php
+++ b/app/Model/helpdesk/Utility/Version_Check.php
@@ -4,9 +4,8 @@ namespace App\Model\helpdesk\Utility;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Version_Check extends Model {
-
+class Version_Check extends Model
+{
     protected $table = 'version_check';
     protected $fillable = ['current_version', 'new_version', 'updated_at', 'created_at'];
-
 }
diff --git a/app/Model/kb/Article.php b/app/Model/kb/Article.php
index 393e0d93b..200cb4b3b 100644
--- a/app/Model/kb/Article.php
+++ b/app/Model/kb/Article.php
@@ -5,8 +5,8 @@ namespace App\Model\kb;
 use Illuminate\Database\Eloquent\Model;
 use Nicolaslopezj\Searchable\SearchableTrait;
 
-class Article extends Model {
-
+class Article extends Model
+{
     use SearchableTrait;
 
     /**
@@ -16,8 +16,8 @@ class Article extends Model {
      */
     protected $searchable = [
         'columns' => [
-            'name' => 10,
-            'slug' => 10,
+            'name'        => 10,
+            'slug'        => 10,
             'description' => 10,
         ],
     ];
@@ -26,5 +26,4 @@ class Article extends Model {
     protected $table = 'kb_article';
     /* define the fillable field in the table */
     protected $fillable = ['name', 'slug', 'description', 'type', 'status', 'publish_time'];
-
 }
diff --git a/app/Model/kb/Category.php b/app/Model/kb/Category.php
index ac4c1096c..bbecc68ef 100644
--- a/app/Model/kb/Category.php
+++ b/app/Model/kb/Category.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Category extends Model {
-
+class Category extends Model
+{
     protected $table = 'kb_category';
     protected $fillable = ['id', 'slug', 'name', 'description', 'status', 'parent', 'created_at', 'updated_at'];
-
 }
diff --git a/app/Model/kb/Comment.php b/app/Model/kb/Comment.php
index aa91056ba..5c8b819f3 100644
--- a/app/Model/kb/Comment.php
+++ b/app/Model/kb/Comment.php
@@ -5,12 +5,10 @@ namespace App\Model\kb;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Define the Model of comment table
- * @package default
+ * Define the Model of comment table.
  */
-class Comment extends Model {
-
+class Comment extends Model
+{
     protected $table = 'kb_comment';
     protected $fillable = ['article_id', 'name', 'email', 'website', 'comment', 'status'];
-
 }
diff --git a/app/Model/kb/Contact.php b/app/Model/kb/Contact.php
index 75acb492f..41021c3d3 100644
--- a/app/Model/kb/Contact.php
+++ b/app/Model/kb/Contact.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Contact extends Model {
-
+class Contact extends Model
+{
     protected $table = 'contact';
     protected $fillable = ['name', 'subject', 'email', 'message'];
-
 }
diff --git a/app/Model/kb/Country.php b/app/Model/kb/Country.php
index e94df9651..b96e232e2 100644
--- a/app/Model/kb/Country.php
+++ b/app/Model/kb/Country.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Country extends Model {
-
+class Country extends Model
+{
     public $table = 'country';
     protected $fillable = ['country_code', 'country_name'];
-
 }
diff --git a/app/Model/kb/DateFormat.php b/app/Model/kb/DateFormat.php
index ff759ea63..6d5bed5e6 100644
--- a/app/Model/kb/DateFormat.php
+++ b/app/Model/kb/DateFormat.php
@@ -4,8 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class DateFormat extends Model {
-
+class DateFormat extends Model
+{
     protected $table = 'date_time_format';
 
     //protected $fillable = ['id', 'name', 'description', 'status', 'parent', 'created_at', 'updated_at'];
diff --git a/app/Model/kb/Faq.php b/app/Model/kb/Faq.php
index fedbf6c97..a742b4154 100644
--- a/app/Model/kb/Faq.php
+++ b/app/Model/kb/Faq.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Faq extends Model {
-
+class Faq extends Model
+{
     protected $table = 'faq';
     protected $fillable = ['id', 'faq'];
-
 }
diff --git a/app/Model/kb/Options.php b/app/Model/kb/Options.php
index 901c205a0..385672755 100644
--- a/app/Model/kb/Options.php
+++ b/app/Model/kb/Options.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Options extends Model {
-
+class Options extends Model
+{
     protected $table = 'options';
     protected $fillable = ['option_name', 'option_value', 'created_at', 'updated_at'];
-
 }
diff --git a/app/Model/kb/Page.php b/app/Model/kb/Page.php
index 6d030c570..ec222e056 100644
--- a/app/Model/kb/Page.php
+++ b/app/Model/kb/Page.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Page extends Model {
-
+class Page extends Model
+{
     protected $table = 'kb_pages';
     protected $fillable = ['name', 'slug', 'status', 'visibility', 'description'];
-
 }
diff --git a/app/Model/kb/Relationship.php b/app/Model/kb/Relationship.php
index 8924803b7..cbd8e7b46 100644
--- a/app/Model/kb/Relationship.php
+++ b/app/Model/kb/Relationship.php
@@ -4,11 +4,11 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Relationship extends Model {
+class Relationship extends Model
+{
     /* define the table  */
 
     protected $table = 'kb_article_relationship';
     /* define fillable fields */
     protected $fillable = ['id', 'category_id', 'article_id'];
-
 }
diff --git a/app/Model/kb/Settings.php b/app/Model/kb/Settings.php
index 59eaec9c9..d395daf82 100644
--- a/app/Model/kb/Settings.php
+++ b/app/Model/kb/Settings.php
@@ -4,14 +4,12 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Settings extends Model {
-
+class Settings extends Model
+{
     /**
      * @param $table, $fillable
-     * @package default
      */
     protected $table = 'kb_settings';
     protected $fillable = ['language', 'dateformat', 'company_name', 'website', 'phone', 'address', 'logo', 'timezone',
-        'background', 'version', 'pagination', 'port', 'host', 'encryption', 'email', 'password'];
-
+        'background', 'version', 'pagination', 'port', 'host', 'encryption', 'email', 'password', ];
 }
diff --git a/app/Model/kb/Side1.php b/app/Model/kb/Side1.php
index c1bcd3134..7afb5ac3f 100644
--- a/app/Model/kb/Side1.php
+++ b/app/Model/kb/Side1.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Side1 extends Model {
-
+class Side1 extends Model
+{
     protected $table = 'side1';
     protected $fillable = ['title', 'content'];
-
 }
diff --git a/app/Model/kb/Side2.php b/app/Model/kb/Side2.php
index cf19b38e1..3a62b461c 100644
--- a/app/Model/kb/Side2.php
+++ b/app/Model/kb/Side2.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Side2 extends Model {
-
+class Side2 extends Model
+{
     protected $table = 'side2';
     protected $fillable = ['title', 'content'];
-
 }
diff --git a/app/Model/kb/Social.php b/app/Model/kb/Social.php
index 2c862af18..ec9ae33d2 100644
--- a/app/Model/kb/Social.php
+++ b/app/Model/kb/Social.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Social extends Model {
-
+class Social extends Model
+{
     protected $table = 'social';
     protected $fillable = ['linkedin', 'stumble', 'google', 'deviantart', 'flickr', 'skype', 'rss', 'twitter', 'facebook', 'youtube', 'vimeo', 'pinterest', 'dribbble', 'instagram'];
-
 }
diff --git a/app/Model/kb/Timezone.php b/app/Model/kb/Timezone.php
index 7091764c3..16d21a19a 100644
--- a/app/Model/kb/Timezone.php
+++ b/app/Model/kb/Timezone.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Timezone extends Model {
-
+class Timezone extends Model
+{
     protected $table = 'timezones';
     protected $fillable = ['id', 'name', 'location'];
-
 }
diff --git a/app/Model/kb/Zone.php b/app/Model/kb/Zone.php
index 90ae9aaa9..1f72e18f4 100644
--- a/app/Model/kb/Zone.php
+++ b/app/Model/kb/Zone.php
@@ -4,9 +4,8 @@ namespace App\Model\kb;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Zone extends Model {
-
+class Zone extends Model
+{
     protected $table = 'zone';
     protected $fillable = ['zone_id', 'country_code', 'zone_name'];
-
 }
diff --git a/app/Plugins/ServiceProvider.php b/app/Plugins/ServiceProvider.php
index 55321610e..d0eecf39f 100644
--- a/app/Plugins/ServiceProvider.php
+++ b/app/Plugins/ServiceProvider.php
@@ -2,43 +2,45 @@
 
 namespace App\Plugins;
 
-abstract class ServiceProvider extends \Illuminate\Support\ServiceProvider {
-
-    public function boot() {
+abstract class ServiceProvider extends \Illuminate\Support\ServiceProvider
+{
+    public function boot()
+    {
         if ($module = $this->getModule(func_get_args())) {
             //$this->package('app/' . $module, $module, app_path() . '/modules/' . $module);
 //            $this->publishes([
 //                'app/' . $module => app_path() . '/Plugins/' . $module . '/config',
 //            ]);
             $this->publishes([
-                'app/plugins/' . $module . '/Config/config.php' => config_path($module . '/config.php'),
+                'app/plugins/'.$module.'/Config/config.php' => config_path($module.'/config.php'),
             ]);
         }
     }
 
-    public function register() {
+    public function register()
+    {
         if ($module = $this->getModule(func_get_args())) {
             //$this->app['config']->package('app/' . $module, app_path() . '/modules/' . $module . '/config');
 //            $this->publishes([
 //                'app/' . $module => app_path() . '/Plugins/' . $module . '/config',
 //            ]);
 
-
             $this->publishes([
-                'app/plugins/' . $module . '/Config/config.php' => config_path($module . '/config.php'),
+                'app/plugins/'.$module.'/Config/config.php' => config_path($module.'/config.php'),
             ]);
 
             // Add routes
-            $routes = app_path() . '/Plugins/' . $module . '/routes.php';
-            if (file_exists($routes))
+            $routes = app_path().'/Plugins/'.$module.'/routes.php';
+            if (file_exists($routes)) {
                 require $routes;
+            }
         }
     }
 
-    public function getModule($args) {
+    public function getModule($args)
+    {
         $module = (isset($args[0]) and is_string($args[0])) ? $args[0] : null;
 
         return $module;
     }
-
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index dda1eef55..0c82934b5 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,10 +3,9 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use App\Http\Controllers\WelcomeController;
-
-class AppServiceProvider extends ServiceProvider {
 
+class AppServiceProvider extends ServiceProvider
+{
     /**
      * Register any application services.
      *
@@ -16,31 +15,33 @@ class AppServiceProvider extends ServiceProvider {
      *
      * @return void
      */
-    public function register() {
+    public function register()
+    {
         $this->app->bind(
                 'Illuminate\Contracts\Auth\Registrar', 'App\Services\Registrar'
         );
     }
 
-    public function boot() {
-        // Please note the different namespace 
+    public function boot()
+    {
+        // Please note the different namespace
         // and please add a \ in front of your classes in the global namespace
-        \Event::listen('cron.collectJobs', function() {
+        \Event::listen('cron.collectJobs', function () {
 
-            \Cron::add('example1', '* * * * *', function() {
+            \Cron::add('example1', '* * * * *', function () {
                 $this->index();
+
                 return 'No';
             });
 
-            \Cron::add('example2', '*/2 * * * *', function() {
+            \Cron::add('example2', '*/2 * * * *', function () {
                 // Do some crazy things successfully every two minute
-                return null;
+                return;
             });
 
-            \Cron::add('disabled job', '0 * * * *', function() {
+            \Cron::add('disabled job', '0 * * * *', function () {
                 // Do some crazy things successfully every hour
             }, false);
         });
     }
-
 }
diff --git a/app/Providers/BusServiceProvider.php b/app/Providers/BusServiceProvider.php
index 6fe492c8a..dbec57a07 100644
--- a/app/Providers/BusServiceProvider.php
+++ b/app/Providers/BusServiceProvider.php
@@ -5,16 +5,18 @@ namespace App\Providers;
 use Illuminate\Bus\Dispatcher;
 use Illuminate\Support\ServiceProvider;
 
-class BusServiceProvider extends ServiceProvider {
-
+class BusServiceProvider extends ServiceProvider
+{
     /**
      * Bootstrap any application services.
      *
-     * @param  \Illuminate\Bus\Dispatcher  $dispatcher
+     * @param \Illuminate\Bus\Dispatcher $dispatcher
+     *
      * @return void
      */
-    public function boot(Dispatcher $dispatcher) {
-        $dispatcher->mapUsing(function($command) {
+    public function boot(Dispatcher $dispatcher)
+    {
+        $dispatcher->mapUsing(function ($command) {
             return Dispatcher::simpleMapping(
                             $command, 'App\Commands', 'App\Handlers\Commands'
             );
@@ -26,8 +28,8 @@ class BusServiceProvider extends ServiceProvider {
      *
      * @return void
      */
-    public function register() {
+    public function register()
+    {
         //
     }
-
 }
diff --git a/app/Providers/ConfigServiceProvider.php b/app/Providers/ConfigServiceProvider.php
index 5d177d493..3069f4cc6 100644
--- a/app/Providers/ConfigServiceProvider.php
+++ b/app/Providers/ConfigServiceProvider.php
@@ -4,8 +4,8 @@ namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
-class ConfigServiceProvider extends ServiceProvider {
-
+class ConfigServiceProvider extends ServiceProvider
+{
     /**
      * Overwrite any vendor / package configuration.
      *
@@ -15,10 +15,10 @@ class ConfigServiceProvider extends ServiceProvider {
      *
      * @return void
      */
-    public function register() {
+    public function register()
+    {
         config([
                 //
         ]);
     }
-
 }
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 746018f48..55a2e7692 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -5,8 +5,8 @@ namespace App\Providers;
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
-class EventServiceProvider extends ServiceProvider {
-
+class EventServiceProvider extends ServiceProvider
+{
     /**
      * The event handler mappings for the application.
      *
@@ -21,13 +21,14 @@ class EventServiceProvider extends ServiceProvider {
     /**
      * Register any other events for your application.
      *
-     * @param  \Illuminate\Contracts\Events\Dispatcher  $events
+     * @param \Illuminate\Contracts\Events\Dispatcher $events
+     *
      * @return void
      */
-    public function boot(DispatcherContract $events) {
+    public function boot(DispatcherContract $events)
+    {
         parent::boot($events);
 
         //
     }
-
 }
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index cb6b9cc4a..c3cc7da4a 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,11 +2,11 @@
 
 namespace App\Providers;
 
-use Illuminate\Routing\Router;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Routing\Router;
 
-class RouteServiceProvider extends ServiceProvider {
-
+class RouteServiceProvider extends ServiceProvider
+{
     /**
      * This namespace is applied to the controller routes in your routes file.
      *
@@ -19,10 +19,12 @@ class RouteServiceProvider extends ServiceProvider {
     /**
      * Define your route model bindings, pattern filters, etc.
      *
-     * @param  \Illuminate\Routing\Router  $router
+     * @param \Illuminate\Routing\Router $router
+     *
      * @return void
      */
-    public function boot(Router $router) {
+    public function boot(Router $router)
+    {
         //
 
         parent::boot($router);
@@ -31,13 +33,14 @@ class RouteServiceProvider extends ServiceProvider {
     /**
      * Define the routes for the application.
      *
-     * @param  \Illuminate\Routing\Router  $router
+     * @param \Illuminate\Routing\Router $router
+     *
      * @return void
      */
-    public function map(Router $router) {
-        $router->group(['namespace' => $this->namespace], function($router) {
+    public function map(Router $router)
+    {
+        $router->group(['namespace' => $this->namespace], function ($router) {
             require app_path('Http/routes.php');
         });
     }
-
 }
diff --git a/app/Services/Registrar.php b/app/Services/Registrar.php
index 0212ab1cb..e43cc2aaf 100644
--- a/app/Services/Registrar.php
+++ b/app/Services/Registrar.php
@@ -3,21 +3,23 @@
 namespace App\Services;
 
 use App\User;
-use Validator;
 use Illuminate\Contracts\Auth\Registrar as RegistrarContract;
+use Validator;
 
-class Registrar implements RegistrarContract {
-
+class Registrar implements RegistrarContract
+{
     /**
      * Get a validator for an incoming registration request.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return \Illuminate\Contracts\Validation\Validator
      */
-    public function validator(array $data) {
+    public function validator(array $data)
+    {
         return Validator::make($data, [
-                    'name' => 'required|max:255',
-                    'email' => 'required|email|max:255|unique:users',
+                    'name'     => 'required|max:255',
+                    'email'    => 'required|email|max:255|unique:users',
                     'password' => 'required|confirmed|min:6',
         ]);
     }
@@ -25,15 +27,16 @@ class Registrar implements RegistrarContract {
     /**
      * Create a new user instance after a valid registration.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return User
      */
-    public function create(array $data) {
+    public function create(array $data)
+    {
         return User::create([
-                    'name' => $data['name'],
-                    'email' => $data['email'],
+                    'name'     => $data['name'],
+                    'email'    => $data['email'],
                     'password' => bcrypt($data['password']),
         ]);
     }
-
 }
diff --git a/app/User.php b/app/User.php
index 70f825a6b..69adfb80e 100644
--- a/app/User.php
+++ b/app/User.php
@@ -8,8 +8,8 @@ use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Database\Eloquent\Model;
 
-class User extends Model implements AuthenticatableContract, CanResetPasswordContract {
-
+class User extends Model implements AuthenticatableContract, CanResetPasswordContract
+{
     use Authenticatable,
         CanResetPassword;
 
@@ -28,7 +28,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     protected $fillable = ['user_name', 'email', 'password', 'active', 'first_name', 'last_name', 'ban', 'ext', 'mobile', 'profile_pic',
         'phone_number', 'company', 'agent_sign', 'account_type', 'account_status',
         'assign_group', 'primary_dpt', 'agent_tzone', 'daylight_save', 'limit_access',
-        'directory_listing', 'vacation_mode', 'role', 'internal_note'];
+        'directory_listing', 'vacation_mode', 'role', 'internal_note', ];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -36,5 +36,4 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      * @var array
      */
     protected $hidden = ['password', 'remember_token'];
-
 }
diff --git a/bootstrap/app.php b/bootstrap/app.php
index aebdc89b1..d4889b4a8 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -12,7 +12,7 @@
  */
 
 $app = new Illuminate\Foundation\Application(
-        realpath(__DIR__ . '/../')
+        realpath(__DIR__.'/../')
 );
 
 /*
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 3ea3423e9..4130f78c0 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -14,7 +14,7 @@ define('LARAVEL_START', microtime(true));
   |
  */
 
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 /*
   |--------------------------------------------------------------------------
@@ -27,8 +27,8 @@ require __DIR__ . '/../vendor/autoload.php';
   |
  */
 
-if (file_exists($compiledPath = __DIR__ . '/../vendor/compiled.php')) {
+if (file_exists($compiledPath = __DIR__.'/../vendor/compiled.php')) {
     require $compiledPath;
-} elseif (file_exists($compiledPath = __DIR__ . '/../storage/framework/compiled.php')) {
+} elseif (file_exists($compiledPath = __DIR__.'/../storage/framework/compiled.php')) {
     require $compiledPath;
 }
diff --git a/config/app.php b/config/app.php
index 9e556c4fb..853328a7c 100644
--- a/config/app.php
+++ b/config/app.php
@@ -2,277 +2,255 @@
 
 return [
 
-	/*
-	|--------------------------------------------------------------------------
-	| Application Debug Mode
-	|--------------------------------------------------------------------------
-	|
-	| When your application is in debug mode, detailed error messages with
-	| stack traces will be shown on every error that occurs within your
-	| application. If disabled, a simple generic error page is shown.
-	|
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Application Debug Mode
+    |--------------------------------------------------------------------------
+    |
+    | When your application is in debug mode, detailed error messages with
+    | stack traces will be shown on every error that occurs within your
+    | application. If disabled, a simple generic error page is shown.
+    |
+     */
 
-	'debug' => false,
+    'debug' => false,
 
-	/*
-	|--------------------------------------------------------------------------
-	| Error Log
-	|--------------------------------------------------------------------------
-	|
-	| This error log will send email to faveo about the errors. So that before 
-	| reporting about the errors we at faveo will start solving the issues already. 
-	| The errors mails will never share your files or data. it will only share 
-	| the line number and error occured.
-	| To dissable you may just change '%1%' to 0.
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Error Log
+    |--------------------------------------------------------------------------
+    |
+    | This error log will send email to faveo about the errors. So that before 
+    | reporting about the errors we at faveo will start solving the issues already. 
+    | The errors mails will never share your files or data. it will only share 
+    | the line number and error occured.
+    | To dissable you may just change '%1%' to 0.
+     */
 
-	'ErrorLog'  =>  '%0%',
+    'ErrorLog'  => '%0%',
 
-	/*
-	|--------------------------------------------------------------------------
-	| Application Version
-	|--------------------------------------------------------------------------
-	|
-	| This tells about aplication current version.
-	|
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Application Version
+    |--------------------------------------------------------------------------
+    |
+    | This tells about aplication current version.
+    |
+     */
 
-	'version' => 'Community 1.0.6.2',
+    'version' => 'Community 1.0.6.2',
 
-	/*
-	|--------------------------------------------------------------------------
-	| Application URL
-	|--------------------------------------------------------------------------
-	|
-	| This URL is used by the console to properly generate URLs when using
-	| the Artisan command line tool. You should set this to the root of
-	| your application so that it is used when running Artisan tasks.
-	|
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Application URL
+    |--------------------------------------------------------------------------
+    |
+    | This URL is used by the console to properly generate URLs when using
+    | the Artisan command line tool. You should set this to the root of
+    | your application so that it is used when running Artisan tasks.
+    |
+     */
 
-	'url' => 'http://localhost',
+    'url' => 'http://localhost',
 
-	/*
-	|--------------------------------------------------------------------------
-	| Application Timezone
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the default timezone for your application, which
-	| will be used by the PHP date and date-time functions. We have gone
-	| ahead and set this to a sensible default for you out of the box.
-	|
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Application Timezone
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the default timezone for your application, which
+    | will be used by the PHP date and date-time functions. We have gone
+    | ahead and set this to a sensible default for you out of the box.
+    |
+     */
 
-	'timezone' => 'UTC',
+    'timezone' => 'UTC',
 
-	/*
-	|--------------------------------------------------------------------------
-	| Application Locale Configuration
-	|--------------------------------------------------------------------------
-	|
-	| The application locale determines the default locale that will be used
-	| by the translation service provider. You are free to set this value
-	| to any of the locales which will be supported by the application.
-	|
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Application Locale Configuration
+    |--------------------------------------------------------------------------
+    |
+    | The application locale determines the default locale that will be used
+    | by the translation service provider. You are free to set this value
+    | to any of the locales which will be supported by the application.
+    |
+     */
 
-	'locale' => 'en',
+    'locale' => 'en',
 
-	/*
-	|--------------------------------------------------------------------------
-	| Application Fallback Locale
-	|--------------------------------------------------------------------------
-	|
-	| The fallback locale determines the locale to use when the current one
-	| is not available. You may change the value to correspond to any of
-	| the language folders that are provided through your application.
-	|
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Application Fallback Locale
+    |--------------------------------------------------------------------------
+    |
+    | The fallback locale determines the locale to use when the current one
+    | is not available. You may change the value to correspond to any of
+    | the language folders that are provided through your application.
+    |
+     */
 
-	'fallback_locale' => 'en',
+    'fallback_locale' => 'en',
 
-	/*
-	|--------------------------------------------------------------------------
-	| Encryption Key
-	|--------------------------------------------------------------------------
-	|
-	| This key is used by the Illuminate encrypter service and should be set
-	| to a random, 32 character string, otherwise these encrypted strings
-	| will not be safe. Please do this before deploying an application!
-	|
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Encryption Key
+    |--------------------------------------------------------------------------
+    |
+    | This key is used by the Illuminate encrypter service and should be set
+    | to a random, 32 character string, otherwise these encrypted strings
+    | will not be safe. Please do this before deploying an application!
+    |
+     */
 
-	'key' => env('APP_KEY', 'AEVQf2ecD6Czpw6r2jairFxbXohG72fH'),
+    'key' => env('APP_KEY', 'AEVQf2ecD6Czpw6r2jairFxbXohG72fH'),
 
-	'cipher' => MCRYPT_RIJNDAEL_128,
+    'cipher' => MCRYPT_RIJNDAEL_128,
 
-	/*
-	|--------------------------------------------------------------------------
-	| Logging Configuration
-	|--------------------------------------------------------------------------
-	|
-	| Here you may configure the log settings for your application. Out of
-	| the box, Laravel uses the Monolog PHP logging library. This gives
-	| you a variety of powerful log handlers / formatters to utilize.
-	|
-	| Available Settings: "single", "daily", "syslog", "errorlog"
-	|
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Logging Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the log settings for your application. Out of
+    | the box, Laravel uses the Monolog PHP logging library. This gives
+    | you a variety of powerful log handlers / formatters to utilize.
+    |
+    | Available Settings: "single", "daily", "syslog", "errorlog"
+    |
+     */
 
-	'log' => 'daily',
+    'log' => 'daily',
 
-	/*
-	|--------------------------------------------------------------------------
-	| Autoloaded Service Providers
-	|--------------------------------------------------------------------------
-	|
-	| The service providers listed here will be automatically loaded on the
-	| request to your application. Feel free to add your own services to
-	| this array to grant expanded functionality to your applications.
-	|
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Autoloaded Service Providers
+    |--------------------------------------------------------------------------
+    |
+    | The service providers listed here will be automatically loaded on the
+    | request to your application. Feel free to add your own services to
+    | this array to grant expanded functionality to your applications.
+    |
+     */
+
+    'providers' => [
 
-	'providers' => [
-            
-            
-            
-            
-            
-            
-            
-            
 //
 
-			//
+            //
 
-			//
+            //
 
-			//
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
+            //
 
-		/*
-		 * Laravel Framework Service Providers...
-		 */
-		'Illuminate\Foundation\Providers\ArtisanServiceProvider',
-		'Illuminate\Auth\AuthServiceProvider',
-		'Illuminate\Bus\BusServiceProvider',
-		'Illuminate\Cache\CacheServiceProvider',
-		'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
-		'Illuminate\Routing\ControllerServiceProvider',
-		'Illuminate\Cookie\CookieServiceProvider',
-		'Illuminate\Database\DatabaseServiceProvider',
-		'Illuminate\Encryption\EncryptionServiceProvider',
-		'Illuminate\Filesystem\FilesystemServiceProvider',
-		'Illuminate\Foundation\Providers\FoundationServiceProvider',
-		'Illuminate\Hashing\HashServiceProvider',
-		'Illuminate\Mail\MailServiceProvider',
-		'Illuminate\Pagination\PaginationServiceProvider',
-		'Illuminate\Pipeline\PipelineServiceProvider',
-		'Illuminate\Queue\QueueServiceProvider',
-		'Illuminate\Redis\RedisServiceProvider',
-		'Illuminate\Auth\Passwords\PasswordResetServiceProvider',
-		'Illuminate\Session\SessionServiceProvider',
-		'Illuminate\Translation\TranslationServiceProvider',
-		'Illuminate\Validation\ValidationServiceProvider',
-		'Illuminate\View\ViewServiceProvider',
-		'Illuminate\Html\HtmlServiceProvider',
-		/*
-		 * Application Service Providers...
-		 */
-		'App\Providers\AppServiceProvider',
-		'App\Providers\BusServiceProvider',
-		'App\Providers\ConfigServiceProvider',
-		'App\Providers\EventServiceProvider',
-		'App\Providers\RouteServiceProvider',
-		'Propaganistas\LaravelPhone\LaravelPhoneServiceProvider',
-		'Bugsnag\BugsnagLaravel\BugsnagLaravelServiceProvider',
-		'Vsmoraes\Pdf\PdfServiceProvider',
-		'Thomaswelton\LaravelGravatar\LaravelGravatarServiceProvider',
-		'Chumper\Datatable\DatatableServiceProvider',
+        /*
+         * Laravel Framework Service Providers...
+         */
+        'Illuminate\Foundation\Providers\ArtisanServiceProvider',
+        'Illuminate\Auth\AuthServiceProvider',
+        'Illuminate\Bus\BusServiceProvider',
+        'Illuminate\Cache\CacheServiceProvider',
+        'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
+        'Illuminate\Routing\ControllerServiceProvider',
+        'Illuminate\Cookie\CookieServiceProvider',
+        'Illuminate\Database\DatabaseServiceProvider',
+        'Illuminate\Encryption\EncryptionServiceProvider',
+        'Illuminate\Filesystem\FilesystemServiceProvider',
+        'Illuminate\Foundation\Providers\FoundationServiceProvider',
+        'Illuminate\Hashing\HashServiceProvider',
+        'Illuminate\Mail\MailServiceProvider',
+        'Illuminate\Pagination\PaginationServiceProvider',
+        'Illuminate\Pipeline\PipelineServiceProvider',
+        'Illuminate\Queue\QueueServiceProvider',
+        'Illuminate\Redis\RedisServiceProvider',
+        'Illuminate\Auth\Passwords\PasswordResetServiceProvider',
+        'Illuminate\Session\SessionServiceProvider',
+        'Illuminate\Translation\TranslationServiceProvider',
+        'Illuminate\Validation\ValidationServiceProvider',
+        'Illuminate\View\ViewServiceProvider',
+        'Illuminate\Html\HtmlServiceProvider',
+        /*
+         * Application Service Providers...
+         */
+        'App\Providers\AppServiceProvider',
+        'App\Providers\BusServiceProvider',
+        'App\Providers\ConfigServiceProvider',
+        'App\Providers\EventServiceProvider',
+        'App\Providers\RouteServiceProvider',
+        'Propaganistas\LaravelPhone\LaravelPhoneServiceProvider',
+        'Bugsnag\BugsnagLaravel\BugsnagLaravelServiceProvider',
+        'Vsmoraes\Pdf\PdfServiceProvider',
+        'Thomaswelton\LaravelGravatar\LaravelGravatarServiceProvider',
+        'Chumper\Datatable\DatatableServiceProvider',
         'Chumper\Zipper\ZipperServiceProvider',
         Bestmomo\Filemanager\FilemanagerServiceProvider::class,
         Unisharp\Laravelfilemanager\LaravelFilemanagerServiceProvider::class,
         Intervention\Image\ImageServiceProvider::class,
         'Tymon\JWTAuth\Providers\JWTAuthServiceProvider',
 
-	],
+    ],
 
-	/*
-	|--------------------------------------------------------------------------
-	| Class Aliases
-	|--------------------------------------------------------------------------
-	|
-	| This array of class aliases will be registered when this application
-	| is started. However, feel free to register as many as you wish as
-	| the aliases are "lazy" loaded so they don't hinder performance.
-	|
-	 */
+    /*
+    |--------------------------------------------------------------------------
+    | Class Aliases
+    |--------------------------------------------------------------------------
+    |
+    | This array of class aliases will be registered when this application
+    | is started. However, feel free to register as many as you wish as
+    | the aliases are "lazy" loaded so they don't hinder performance.
+    |
+     */
 
-	'aliases' => [
+    'aliases' => [
 
-		'App' => 'Illuminate\Support\Facades\App',
-		'Artisan' => 'Illuminate\Support\Facades\Artisan',
-		'Auth' => 'Illuminate\Support\Facades\Auth',
-		'Blade' => 'Illuminate\Support\Facades\Blade',
-		'Bus' => 'Illuminate\Support\Facades\Bus',
-		'Cache' => 'Illuminate\Support\Facades\Cache',
-		'Config' => 'Illuminate\Support\Facades\Config',
-		'Cookie' => 'Illuminate\Support\Facades\Cookie',
-		'Crypt' => 'Illuminate\Support\Facades\Crypt',
-		'DB' => 'Illuminate\Support\Facades\DB',
-		'Eloquent' => 'Illuminate\Database\Eloquent\Model',
-		'Event' => 'Illuminate\Support\Facades\Event',
-		'File' => 'Illuminate\Support\Facades\File',
-		'Hash' => 'Illuminate\Support\Facades\Hash',
-		'Input' => 'Illuminate\Support\Facades\Input',
-		'Inspiring' => 'Illuminate\Foundation\Inspiring',
-		'Lang' => 'Illuminate\Support\Facades\Lang',
-		'Log' => 'Illuminate\Support\Facades\Log',
-		'Mail' => 'Illuminate\Support\Facades\Mail',
-		'Password' => 'Illuminate\Support\Facades\Password',
-		'Queue' => 'Illuminate\Support\Facades\Queue',
-		'Redirect' => 'Illuminate\Support\Facades\Redirect',
-		'Redis' => 'Illuminate\Support\Facades\Redis',
-		'Request' => 'Illuminate\Support\Facades\Request',
-		'Response' => 'Illuminate\Support\Facades\Response',
-		'Route' => 'Illuminate\Support\Facades\Route',
-		'Schema' => 'Illuminate\Support\Facades\Schema',
-		'Session' => 'Illuminate\Support\Facades\Session',
-		'Storage' => 'Illuminate\Support\Facades\Storage',
-		'URL' => 'Illuminate\Support\Facades\URL',
-		'Validator' => 'Illuminate\Support\Facades\Validator',
-		'View' => 'Illuminate\Support\Facades\View',
-		'Form' => 'Illuminate\Html\FormFacade',
-		'HTML' => 'Illuminate\Html\HtmlFacade',
-		"phone" => "The :attribute field contains an invalid number.",
-		'Bugsnag' => 'Bugsnag\BugsnagLaravel\BugsnagFacade',
-		'PDF' => 'Vsmoraes\Pdf\PdfFacade',
-		'Gravatar' => 'Thomaswelton\LaravelGravatar\Facades\Gravatar',
-		'UTC' => 'App\Http\Controllers\Agent\helpdesk\TicketController',
-		'SMTPS' => 'App\Http\Controllers\HomeController',
-		'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade',
-        'Zipper' => 'Chumper\Zipper\Zipper',
-        'Image' => Intervention\Image\Facades\Image::class,
-        'JWTAuth' => 'Tymon\JWTAuth\Facades\JWTAuth',
-        'JWTFactory' => 'Tymon\JWTAuth\Facades\JWTFactory'
+        'App'        => 'Illuminate\Support\Facades\App',
+        'Artisan'    => 'Illuminate\Support\Facades\Artisan',
+        'Auth'       => 'Illuminate\Support\Facades\Auth',
+        'Blade'      => 'Illuminate\Support\Facades\Blade',
+        'Bus'        => 'Illuminate\Support\Facades\Bus',
+        'Cache'      => 'Illuminate\Support\Facades\Cache',
+        'Config'     => 'Illuminate\Support\Facades\Config',
+        'Cookie'     => 'Illuminate\Support\Facades\Cookie',
+        'Crypt'      => 'Illuminate\Support\Facades\Crypt',
+        'DB'         => 'Illuminate\Support\Facades\DB',
+        'Eloquent'   => 'Illuminate\Database\Eloquent\Model',
+        'Event'      => 'Illuminate\Support\Facades\Event',
+        'File'       => 'Illuminate\Support\Facades\File',
+        'Hash'       => 'Illuminate\Support\Facades\Hash',
+        'Input'      => 'Illuminate\Support\Facades\Input',
+        'Inspiring'  => 'Illuminate\Foundation\Inspiring',
+        'Lang'       => 'Illuminate\Support\Facades\Lang',
+        'Log'        => 'Illuminate\Support\Facades\Log',
+        'Mail'       => 'Illuminate\Support\Facades\Mail',
+        'Password'   => 'Illuminate\Support\Facades\Password',
+        'Queue'      => 'Illuminate\Support\Facades\Queue',
+        'Redirect'   => 'Illuminate\Support\Facades\Redirect',
+        'Redis'      => 'Illuminate\Support\Facades\Redis',
+        'Request'    => 'Illuminate\Support\Facades\Request',
+        'Response'   => 'Illuminate\Support\Facades\Response',
+        'Route'      => 'Illuminate\Support\Facades\Route',
+        'Schema'     => 'Illuminate\Support\Facades\Schema',
+        'Session'    => 'Illuminate\Support\Facades\Session',
+        'Storage'    => 'Illuminate\Support\Facades\Storage',
+        'URL'        => 'Illuminate\Support\Facades\URL',
+        'Validator'  => 'Illuminate\Support\Facades\Validator',
+        'View'       => 'Illuminate\Support\Facades\View',
+        'Form'       => 'Illuminate\Html\FormFacade',
+        'HTML'       => 'Illuminate\Html\HtmlFacade',
+        'phone'      => 'The :attribute field contains an invalid number.',
+        'Bugsnag'    => 'Bugsnag\BugsnagLaravel\BugsnagFacade',
+        'PDF'        => 'Vsmoraes\Pdf\PdfFacade',
+        'Gravatar'   => 'Thomaswelton\LaravelGravatar\Facades\Gravatar',
+        'UTC'        => 'App\Http\Controllers\Agent\helpdesk\TicketController',
+        'SMTPS'      => 'App\Http\Controllers\HomeController',
+        'Datatable'  => 'Chumper\Datatable\Facades\DatatableFacade',
+        'Zipper'     => 'Chumper\Zipper\Zipper',
+        'Image'      => Intervention\Image\Facades\Image::class,
+        'JWTAuth'    => 'Tymon\JWTAuth\Facades\JWTAuth',
+        'JWTFactory' => 'Tymon\JWTAuth\Facades\JWTFactory',
+
+    ],
+
+    'token' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwiaXNzIjoiaHR0cDpcL1wvbG9jYWxob3N0XC9mYXZlby1oZWxwZGVzay1naXRodWJcL3B1YmxpY1wvYXBpXC92MVwvYXV0aGVudGljYXRlIiwiaWF0IjoxNDU1NzAyNDEyLCJleHAiOjE0NTU3MDYwMTIsIm5iZiI6MTQ1NTcwMjQxMiwianRpIjoiOTdlODg1ODNjOWQyNDIzNWQ4MzI3Y2ExNzI1NDY1MDQifQ.37E7H2kRCQuz5oBRkQLKhNNpaNXyk4FiEYS9RQ7HZPY',
 
-	],
-    
-    'token'=>"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwiaXNzIjoiaHR0cDpcL1wvbG9jYWxob3N0XC9mYXZlby1oZWxwZGVzay1naXRodWJcL3B1YmxpY1wvYXBpXC92MVwvYXV0aGVudGljYXRlIiwiaWF0IjoxNDU1NzAyNDEyLCJleHAiOjE0NTU3MDYwMTIsIm5iZiI6MTQ1NTcwMjQxMiwianRpIjoiOTdlODg1ODNjOWQyNDIzNWQ4MzI3Y2ExNzI1NDY1MDQifQ.37E7H2kRCQuz5oBRkQLKhNNpaNXyk4FiEYS9RQ7HZPY"
-    
     ];
diff --git a/config/auth.php b/config/auth.php
index a8e927be5..147211188 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -53,8 +53,8 @@ return [
       |
      */
     'password' => [
-        'email' => 'emails.password',
-        'table' => 'password_resets',
+        'email'  => 'emails.password',
+        'table'  => 'password_resets',
         'expire' => 60,
     ],
 ];
diff --git a/config/bugsnag.php b/config/bugsnag.php
index 9bc7978eb..f58e0d051 100644
--- a/config/bugsnag.php
+++ b/config/bugsnag.php
@@ -1,7 +1,7 @@
 <?php
 
-# config/bugsnag.php
+// config/bugsnag.php
 
 // return array(
 //     'api_key' => 'f27b54f858d9bff115b84ae438876380'
-// );
\ No newline at end of file
+// );
diff --git a/config/cache.php b/config/cache.php
index 52fd74bc1..4b2cfc5a9 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -27,30 +27,30 @@ return [
     'stores' => [
 
         'apc' => [
-            'driver' => 'apc'
+            'driver' => 'apc',
         ],
         'array' => [
-            'driver' => 'array'
+            'driver' => 'array',
         ],
         'database' => [
-            'driver' => 'database',
-            'table' => 'cache',
+            'driver'     => 'database',
+            'table'      => 'cache',
             'connection' => null,
         ],
         'file' => [
             'driver' => 'file',
-            'path' => storage_path() . '/framework/cache',
+            'path'   => storage_path().'/framework/cache',
         ],
         'memcached' => [
-            'driver' => 'memcached',
+            'driver'  => 'memcached',
             'servers' => [
                 [
-                    'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100
+                    'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
                 ],
             ],
         ],
         'redis' => [
-            'driver' => 'redis',
+            'driver'     => 'redis',
             'connection' => 'default',
         ],
     ],
diff --git a/config/chumper.datatable.php b/config/chumper.datatable.php
index 1edcd7825..af0925c74 100644
--- a/config/chumper.datatable.php
+++ b/config/chumper.datatable.php
@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
     /*
       |--------------------------------------------------------------------------
       | Table specific configuration options.
@@ -8,7 +8,7 @@ return array(
       |
      */
 
-    'table' => array(
+    'table' => [
         /*
           |--------------------------------------------------------------------------
           | Table class
@@ -42,10 +42,10 @@ return array(
           | Supported: array
           |
          */
-        'options' => array(
-            "sPaginationType" => "full_numbers",
-            "bProcessing" => false
-        ),
+        'options' => [
+            'sPaginationType' => 'full_numbers',
+            'bProcessing'     => false,
+        ],
         /*
           |--------------------------------------------------------------------------
           | DataTable callbacks
@@ -57,7 +57,7 @@ return array(
           | Supported: array
           |
          */
-        'callbacks' => array(),
+        'callbacks' => [],
         /*
           |--------------------------------------------------------------------------
           | Skip javascript in table template
@@ -88,14 +88,14 @@ return array(
           |
          */
         'script_view' => 'chumper.datatable::javascript',
-    ),
+    ],
     /*
       |--------------------------------------------------------------------------
       | Engine specific configuration options.
       |--------------------------------------------------------------------------
       |
      */
-    'engine' => array(
+    'engine' => [
         /*
           |--------------------------------------------------------------------------
           | Search for exact words
@@ -107,16 +107,16 @@ return array(
          */
 
         'exactWordSearch' => false,
-    ),
+    ],
     /*
       |--------------------------------------------------------------------------
       | Allow overrides Datatable core classes
       |--------------------------------------------------------------------------
       |
      */
-    'classmap' => array(
+    'classmap' => [
         'CollectionEngine' => 'Chumper\Datatable\Engines\CollectionEngine',
-        'QueryEngine' => 'Chumper\Datatable\Engines\QueryEngine',
-        'Table' => 'Chumper\Datatable\Table',
-    )
-);
+        'QueryEngine'      => 'Chumper\Datatable\Engines\QueryEngine',
+        'Table'            => 'Chumper\Datatable\Table',
+    ],
+];
diff --git a/config/compile.php b/config/compile.php
index d19932277..30438b3bc 100644
--- a/config/compile.php
+++ b/config/compile.php
@@ -15,11 +15,11 @@ return [
 
     'files' => [
 
-        realpath(__DIR__ . '/../app/Providers/AppServiceProvider.php'),
-        realpath(__DIR__ . '/../app/Providers/BusServiceProvider.php'),
-        realpath(__DIR__ . '/../app/Providers/ConfigServiceProvider.php'),
-        realpath(__DIR__ . '/../app/Providers/EventServiceProvider.php'),
-        realpath(__DIR__ . '/../app/Providers/RouteServiceProvider.php'),
+        realpath(__DIR__.'/../app/Providers/AppServiceProvider.php'),
+        realpath(__DIR__.'/../app/Providers/BusServiceProvider.php'),
+        realpath(__DIR__.'/../app/Providers/ConfigServiceProvider.php'),
+        realpath(__DIR__.'/../app/Providers/EventServiceProvider.php'),
+        realpath(__DIR__.'/../app/Providers/RouteServiceProvider.php'),
     ],
     /*
       |--------------------------------------------------------------------------
diff --git a/config/database.php b/config/database.php
index 812f681d4..a53ea36ce 100644
--- a/config/database.php
+++ b/config/database.php
@@ -43,42 +43,42 @@ return [
     'connections' => [
 
         'sqlite' => [
-            'driver' => 'sqlite',
-            'database' => storage_path() . '/database.sqlite',
-            'prefix' => '',
+            'driver'   => 'sqlite',
+            'database' => storage_path().'/database.sqlite',
+            'prefix'   => '',
         ],
         'mysql' => [
-            'driver' => 'mysql',
-            'host' => env('DB_HOST', 'localhost'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST', 'localhost'),
+            'database'  => env('DB_DATABASE', 'forge'),
+            'username'  => env('DB_USERNAME', 'forge'),
+            'password'  => env('DB_PASSWORD', ''),
+            'charset'   => 'utf8',
             'collation' => 'utf8_unicode_ci',
-            'port' => env('DB_PORT', ''),
-            'prefix' => '',
-            'strict' => false,
+            'port'      => env('DB_PORT', ''),
+            'prefix'    => '',
+            'strict'    => false,
         ],
         'pgsql' => [
-            'driver' => 'pgsql',
-            'host' => env('DB_HOST', 'localhost'),
+            'driver'   => 'pgsql',
+            'host'     => env('DB_HOST', 'localhost'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
-            'port' => env('DB_PORT', ''),
-            'charset' => 'utf8',
-            'prefix' => '',
-            'schema' => 'public',
+            'port'     => env('DB_PORT', ''),
+            'charset'  => 'utf8',
+            'prefix'   => '',
+            'schema'   => 'public',
         ],
         'sqlsrv' => [
 
-            'driver' => 'sqlsrv',
-            'host' => env('DB_HOST', 'localhost'),
+            'driver'   => 'sqlsrv',
+            'host'     => env('DB_HOST', 'localhost'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
-            'port' => env('DB_PORT', ''),
-            'prefix' => '',
+            'port'     => env('DB_PORT', ''),
+            'prefix'   => '',
         ],
     ],
     /*
@@ -116,8 +116,8 @@ return [
 
         'cluster' => false,
         'default' => [
-            'host' => '127.0.0.1',
-            'port' => 6379,
+            'host'     => '127.0.0.1',
+            'port'     => 6379,
             'database' => 0,
         ],
     ],
diff --git a/config/filemanager.php b/config/filemanager.php
index 4948e8d3b..4a49e393b 100644
--- a/config/filemanager.php
+++ b/config/filemanager.php
@@ -2,5 +2,5 @@
 
 return [
     // needs to be set in filemanager.config.js too
-    'folder_path' => "filemanager/userfiles/"
+    'folder_path' => 'filemanager/userfiles/',
 ];
diff --git a/config/filesystems.php b/config/filesystems.php
index d48693121..7cc20cf66 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -41,23 +41,23 @@ return [
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path() . '/app',
+            'root'   => storage_path().'/app',
         ],
         's3' => [
             'driver' => 's3',
-            'key' => 'your-key',
+            'key'    => 'your-key',
             'secret' => 'your-secret',
             'region' => 'your-region',
             'bucket' => 'your-bucket',
         ],
         'rackspace' => [
-            'driver' => 'rackspace',
-            'username' => 'your-username',
-            'key' => 'your-key',
+            'driver'    => 'rackspace',
+            'username'  => 'your-username',
+            'key'       => 'your-key',
             'container' => 'your-container',
-            'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
-            'region' => 'IAD',
-            'url_type' => 'publicURL'
+            'endpoint'  => 'https://identity.api.rackspacecloud.com/v2.0/',
+            'region'    => 'IAD',
+            'url_type'  => 'publicURL',
         ],
     ],
 ];
diff --git a/config/gravatar.php b/config/gravatar.php
index 9ee17a898..0a1059829 100644
--- a/config/gravatar.php
+++ b/config/gravatar.php
@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
     // --- The default avatar size
     'size' => 80,
     // --- The default avatar to display if we have no results
@@ -17,5 +17,5 @@ return array(
     // - pg: may contain rude gestures, provocatively dressed individuals, the lesser swear words, or mild violence.
     // - r: may contain such things as harsh profanity, intense violence, nudity, or hard drug use.
     // - x: may contain hardcore sexual imagery or extremely disturbing violence.
-    'maxRating' => 'g'
-);
+    'maxRating' => 'g',
+];
diff --git a/config/image.php b/config/image.php
index 5cccefa6a..5fde4adb2 100644
--- a/config/image.php
+++ b/config/image.php
@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
     /*
       |--------------------------------------------------------------------------
       | Image Driver
@@ -14,5 +14,5 @@ return array(
       |
      */
 
-    'driver' => 'gd'
-);
+    'driver' => 'gd',
+];
diff --git a/config/jwt.php b/config/jwt.php
index 5a3545500..3aaa414d4 100644
--- a/config/jwt.php
+++ b/config/jwt.php
@@ -139,6 +139,6 @@ return [
          */
         'storage' => function ($app) {
     return new Tymon\JWTAuth\Providers\Storage\IlluminateCacheAdapter($app['cache']);
-}
-    ]
+},
+    ],
 ];
diff --git a/config/languages.php b/config/languages.php
index 69aed7eff..414aa7f9b 100644
--- a/config/languages.php
+++ b/config/languages.php
@@ -2,140 +2,140 @@
 
 //Iso codes for languages
 return [
-    'aa' => "Afar",
-    'ab' => "Abkhazian",
-    'af' => "Afrikaans",
-    'am' => "Amharic",
-    'ar' => "Arabic",
-    'as' => "Assamese",
-    'ay' => "Aymara",
-    'az' => "Azerbaijani",
-    'ba' => "Bashkir",
-    'be' => "Byelorussian",
-    'bg' => "Bulgarian",
-    'bh' => "Bihari",
-    'bi' => "Bislama",
-    'bn' => "Bengali",
-    'bo' => "Tibetan",
-    'br' => "Breton",
-    'ca' => "Catalan",
-    'co' => "Corsican",
-    'cs' => "Czech",
-    'cy' => "Welsh",
-    'da' => "Danish",
-    'de' => "German",
-    'dz' => "Bhutani",
-    'el' => "Greek",
-    'en' => "English",
-    'eo' => "Esperanto",
-    'es' => "Spanish",
-    'et' => "Estonian",
-    'eu' => "Basque",
-    'fa' => "Persian",
-    'fi' => "Finnish",
-    'fj' => "Fiji",
-    'fo' => "Faeroese",
-    'fr' => "French",
-    'fy' => "Frisian",
-    'ga' => "Irish",
-    'gd' => "Gaelic",
-    'gl' => "Galician",
-    'gn' => "Guarani",
-    'gu' => "Gujarati",
-    'ha' => "Hausa",
-    'hi' => "Hindi",
-    'hr' => "Croatian",
-    'hu' => "Hungarian",
-    'hy' => "Armenian",
-    'ia' => "Interlingua",
-    'ie' => "Interlingue",
-    'ik' => "Inupiak",
-    'in' => "Indonesian",
-    'is' => "Icelandic",
-    'it' => "Italian",
-    'iw' => "Hebrew",
-    'ja' => "Japanese",
-    'ji' => "Yiddish",
-    'jw' => "Javanese",
-    'ka' => "Georgian",
-    'kk' => "Kazakh",
-    'kl' => "Greenlandic",
-    'km' => "Cambodian",
-    'kn' => "Kannada",
-    'ko' => "Korean",
-    'ks' => "Kashmiri",
-    'ku' => "Kurdish",
-    'ky' => "Kirghiz",
-    'la' => "Latin",
-    'ln' => "Lingala",
-    'lo' => "Laothian",
-    'lt' => "Lithuanian",
-    'lv' => "Latvian",
-    'mg' => "Malagasy",
-    'mi' => "Maori",
-    'mk' => "Macedonian",
-    'ml' => "Malayalam",
-    'mn' => "Mongolian",
-    'mo' => "Moldavian",
-    'mr' => "Marathi",
-    'ms' => "Malay",
-    'mt' => "Maltese",
-    'my' => "Burmese",
-    'na' => "Nauru",
-    'ne' => "Nepali",
-    'nl' => "Dutch",
-    'no' => "Norwegian",
-    'oc' => "Occitan",
-    'om' => "Oromo",
-    'or' => "Oriya",
-    'pa' => "Punjabi",
-    'pl' => "Polish",
-    'ps' => "Pashto",
-    'pt' => "Portuguese",
-    'qu' => "Quechua",
-    'rm' => "Rhaeto-Romance",
-    'rn' => "Kirundi",
-    'ro' => "Romanian",
-    'ru' => "Russian",
-    'rw' => "Kinyarwanda",
-    'sa' => "Sanskrit",
-    'sd' => "Sindhi",
-    'sg' => "Sangro",
-    'sh' => "Serbo-Croatian",
-    'si' => "Singhalese",
-    'sk' => "Slovak",
-    'sl' => "Slovenian",
-    'sm' => "Samoan",
-    'sn' => "Shona",
-    'so' => "Somali",
-    'sq' => "Albanian",
-    'sr' => "Serbian",
-    'ss' => "Siswati",
-    'st' => "Sesotho",
-    'su' => "Sudanese",
-    'sv' => "Swedish",
-    'sw' => "Swahili",
-    'ta' => "Tamil",
-    'te' => "Tegulu",
-    'tg' => "Tajik",
-    'th' => "Thai",
-    'ti' => "Tigrinya",
-    'tk' => "Turkmen",
-    'tl' => "Tagalog",
-    'tn' => "Setswana",
-    'to' => "Tonga",
-    'tr' => "Turkish",
-    'ts' => "Tsonga",
-    'tt' => "Tatar",
-    'tw' => "Twi",
-    'uk' => "Ukrainian",
-    'ur' => "Urdu",
-    'uz' => "Uzbek",
-    'vi' => "Vietnamese",
-    'vo' => "Volapuk",
-    'wo' => "Wolof",
-    'xh' => "Xhosa",
-    'yo' => "Yoruba",
-    'zh' => "Chinese",
-    'zu' => "Zulu",
+    'aa' => 'Afar',
+    'ab' => 'Abkhazian',
+    'af' => 'Afrikaans',
+    'am' => 'Amharic',
+    'ar' => 'Arabic',
+    'as' => 'Assamese',
+    'ay' => 'Aymara',
+    'az' => 'Azerbaijani',
+    'ba' => 'Bashkir',
+    'be' => 'Byelorussian',
+    'bg' => 'Bulgarian',
+    'bh' => 'Bihari',
+    'bi' => 'Bislama',
+    'bn' => 'Bengali',
+    'bo' => 'Tibetan',
+    'br' => 'Breton',
+    'ca' => 'Catalan',
+    'co' => 'Corsican',
+    'cs' => 'Czech',
+    'cy' => 'Welsh',
+    'da' => 'Danish',
+    'de' => 'German',
+    'dz' => 'Bhutani',
+    'el' => 'Greek',
+    'en' => 'English',
+    'eo' => 'Esperanto',
+    'es' => 'Spanish',
+    'et' => 'Estonian',
+    'eu' => 'Basque',
+    'fa' => 'Persian',
+    'fi' => 'Finnish',
+    'fj' => 'Fiji',
+    'fo' => 'Faeroese',
+    'fr' => 'French',
+    'fy' => 'Frisian',
+    'ga' => 'Irish',
+    'gd' => 'Gaelic',
+    'gl' => 'Galician',
+    'gn' => 'Guarani',
+    'gu' => 'Gujarati',
+    'ha' => 'Hausa',
+    'hi' => 'Hindi',
+    'hr' => 'Croatian',
+    'hu' => 'Hungarian',
+    'hy' => 'Armenian',
+    'ia' => 'Interlingua',
+    'ie' => 'Interlingue',
+    'ik' => 'Inupiak',
+    'in' => 'Indonesian',
+    'is' => 'Icelandic',
+    'it' => 'Italian',
+    'iw' => 'Hebrew',
+    'ja' => 'Japanese',
+    'ji' => 'Yiddish',
+    'jw' => 'Javanese',
+    'ka' => 'Georgian',
+    'kk' => 'Kazakh',
+    'kl' => 'Greenlandic',
+    'km' => 'Cambodian',
+    'kn' => 'Kannada',
+    'ko' => 'Korean',
+    'ks' => 'Kashmiri',
+    'ku' => 'Kurdish',
+    'ky' => 'Kirghiz',
+    'la' => 'Latin',
+    'ln' => 'Lingala',
+    'lo' => 'Laothian',
+    'lt' => 'Lithuanian',
+    'lv' => 'Latvian',
+    'mg' => 'Malagasy',
+    'mi' => 'Maori',
+    'mk' => 'Macedonian',
+    'ml' => 'Malayalam',
+    'mn' => 'Mongolian',
+    'mo' => 'Moldavian',
+    'mr' => 'Marathi',
+    'ms' => 'Malay',
+    'mt' => 'Maltese',
+    'my' => 'Burmese',
+    'na' => 'Nauru',
+    'ne' => 'Nepali',
+    'nl' => 'Dutch',
+    'no' => 'Norwegian',
+    'oc' => 'Occitan',
+    'om' => 'Oromo',
+    'or' => 'Oriya',
+    'pa' => 'Punjabi',
+    'pl' => 'Polish',
+    'ps' => 'Pashto',
+    'pt' => 'Portuguese',
+    'qu' => 'Quechua',
+    'rm' => 'Rhaeto-Romance',
+    'rn' => 'Kirundi',
+    'ro' => 'Romanian',
+    'ru' => 'Russian',
+    'rw' => 'Kinyarwanda',
+    'sa' => 'Sanskrit',
+    'sd' => 'Sindhi',
+    'sg' => 'Sangro',
+    'sh' => 'Serbo-Croatian',
+    'si' => 'Singhalese',
+    'sk' => 'Slovak',
+    'sl' => 'Slovenian',
+    'sm' => 'Samoan',
+    'sn' => 'Shona',
+    'so' => 'Somali',
+    'sq' => 'Albanian',
+    'sr' => 'Serbian',
+    'ss' => 'Siswati',
+    'st' => 'Sesotho',
+    'su' => 'Sudanese',
+    'sv' => 'Swedish',
+    'sw' => 'Swahili',
+    'ta' => 'Tamil',
+    'te' => 'Tegulu',
+    'tg' => 'Tajik',
+    'th' => 'Thai',
+    'ti' => 'Tigrinya',
+    'tk' => 'Turkmen',
+    'tl' => 'Tagalog',
+    'tn' => 'Setswana',
+    'to' => 'Tonga',
+    'tr' => 'Turkish',
+    'ts' => 'Tsonga',
+    'tt' => 'Tatar',
+    'tw' => 'Twi',
+    'uk' => 'Ukrainian',
+    'ur' => 'Urdu',
+    'uz' => 'Uzbek',
+    'vi' => 'Vietnamese',
+    'vo' => 'Volapuk',
+    'wo' => 'Wolof',
+    'xh' => 'Xhosa',
+    'yo' => 'Yoruba',
+    'zh' => 'Chinese',
+    'zu' => 'Zulu',
 ];
diff --git a/config/lfm.php b/config/lfm.php
index fc47eca31..3e94eb37d 100644
--- a/config/lfm.php
+++ b/config/lfm.php
@@ -1,43 +1,43 @@
 <?php
 
 return [
-    'rename_file' => true,
+    'rename_file'        => true,
     'use_package_routes' => true,
-    'middlewares' => ['auth'],
-    'allow_multi_user' => true,
-    'user_field' => 'id',
+    'middlewares'        => ['auth'],
+    'allow_multi_user'   => true,
+    'user_field'         => 'id',
     'shared_folder_name' => 'shares',
-    'thumb_folder_name' => 'thumbs',
-    'images_dir' => 'public/photos/',
-    'images_url' => '%url%',
-    'files_dir' => 'public/files/',
-    'files_url' => '/files/',
-    'file_type_array' => [
-        'pdf' => 'Adobe Acrobat',
+    'thumb_folder_name'  => 'thumbs',
+    'images_dir'         => 'public/photos/',
+    'images_url'         => '%url%',
+    'files_dir'          => 'public/files/',
+    'files_url'          => '/files/',
+    'file_type_array'    => [
+        'pdf'  => 'Adobe Acrobat',
         'docx' => 'Microsoft Word',
         'docx' => 'Microsoft Word',
-        'xls' => 'Microsoft Excel',
-        'xls' => 'Microsoft Excel',
-        'zip' => 'Archive',
-        'gif' => 'GIF Image',
-        'jpg' => 'JPEG Image',
+        'xls'  => 'Microsoft Excel',
+        'xls'  => 'Microsoft Excel',
+        'zip'  => 'Archive',
+        'gif'  => 'GIF Image',
+        'jpg'  => 'JPEG Image',
         'jpeg' => 'JPEG Image',
-        'png' => 'PNG Image',
-        'ppt' => 'Microsoft PowerPoint',
+        'png'  => 'PNG Image',
+        'ppt'  => 'Microsoft PowerPoint',
         'pptx' => 'Microsoft PowerPoint',
     ],
     'file_icon_array' => [
-        'pdf' => 'fa-file-pdf-o',
+        'pdf'  => 'fa-file-pdf-o',
         'docx' => 'fa-file-word-o',
         'docx' => 'fa-file-word-o',
-        'xls' => 'fa-file-excel-o',
-        'xls' => 'fa-file-excel-o',
-        'zip' => 'fa-file-archive-o',
-        'gif' => 'fa-file-image-o',
-        'jpg' => 'fa-file-image-o',
+        'xls'  => 'fa-file-excel-o',
+        'xls'  => 'fa-file-excel-o',
+        'zip'  => 'fa-file-archive-o',
+        'gif'  => 'fa-file-image-o',
+        'jpg'  => 'fa-file-image-o',
         'jpeg' => 'fa-file-image-o',
-        'png' => 'fa-file-image-o',
-        'ppt' => 'fa-file-powerpoint-o',
+        'png'  => 'fa-file-image-o',
+        'ppt'  => 'fa-file-powerpoint-o',
         'pptx' => 'fa-file-powerpoint-o',
     ],
 ];
diff --git a/config/liebigCron.php b/config/liebigCron.php
index 7e7daae38..863894da5 100644
--- a/config/liebigCron.php
+++ b/config/liebigCron.php
@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
     // Interval defines the time in minutes between two run method calls - in other words, the time between the Cron route or command will be called
     'runInterval' => 1,
     // Should the Laravel integrated logger handle the logging
@@ -15,6 +15,6 @@ return array(
     'preventOverlapping' => true,
     // Enable or disable the check if the current Cron run is in time
     'inTimeCheck' => true,
-    // Cron application key for securing the integrated Cron run route - if the value is empty, the route is disabled 
-    'cronKey' => 'Sv9zmTTmLVODDEkI1NrRnAbfBJIPH2nf'
-);
+    // Cron application key for securing the integrated Cron run route - if the value is empty, the route is disabled
+    'cronKey' => 'Sv9zmTTmLVODDEkI1NrRnAbfBJIPH2nf',
+];
diff --git a/config/queue.php b/config/queue.php
index 05b6c479f..53c98b4bb 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -34,34 +34,34 @@ return [
         ],
         'database' => [
             'driver' => 'database',
-            'table' => 'jobs',
-            'queue' => 'default',
+            'table'  => 'jobs',
+            'queue'  => 'default',
             'expire' => 60,
         ],
         'beanstalkd' => [
             'driver' => 'beanstalkd',
-            'host' => 'localhost',
-            'queue' => 'default',
-            'ttr' => 60,
+            'host'   => 'localhost',
+            'queue'  => 'default',
+            'ttr'    => 60,
         ],
         'sqs' => [
             'driver' => 'sqs',
-            'key' => 'your-public-key',
+            'key'    => 'your-public-key',
             'secret' => 'your-secret-key',
-            'queue' => 'your-queue-url',
+            'queue'  => 'your-queue-url',
             'region' => 'us-east-1',
         ],
         'iron' => [
-            'driver' => 'iron',
-            'host' => 'mq-aws-us-east-1.iron.io',
-            'token' => 'your-token',
+            'driver'  => 'iron',
+            'host'    => 'mq-aws-us-east-1.iron.io',
+            'token'   => 'your-token',
             'project' => 'your-project-id',
-            'queue' => 'your-queue-name',
+            'queue'   => 'your-queue-name',
             'encrypt' => true,
         ],
         'redis' => [
             'driver' => 'redis',
-            'queue' => 'default',
+            'queue'  => 'default',
             'expire' => 60,
         ],
     ],
diff --git a/config/services.php b/config/services.php
index 9a14c7752..e78df5f11 100644
--- a/config/services.php
+++ b/config/services.php
@@ -22,12 +22,12 @@ return [
         'secret' => '',
     ],
     'ses' => [
-        'key' => '',
+        'key'    => '',
         'secret' => '',
         'region' => 'us-east-1',
     ],
     'stripe' => [
-        'model' => 'User',
+        'model'  => 'User',
         'secret' => '',
     ],
 ];
diff --git a/config/session.php b/config/session.php
index d0c7f4b5b..b863df156 100644
--- a/config/session.php
+++ b/config/session.php
@@ -27,7 +27,7 @@ return [
       | to immediately expire on the browser closing, set that option.
       |
      */
-    'lifetime' => 120,
+    'lifetime'        => 120,
     'expire_on_close' => false,
     /*
       |--------------------------------------------------------------------------
@@ -50,7 +50,7 @@ return [
       | location may be specified. This is only needed for file sessions.
       |
      */
-    'files' => storage_path() . '/framework/sessions',
+    'files' => storage_path().'/framework/sessions',
     /*
       |--------------------------------------------------------------------------
       | Session Database Connection
diff --git a/config/testing/database.php b/config/testing/database.php
index c072cef0d..2bf490040 100644
--- a/config/testing/database.php
+++ b/config/testing/database.php
@@ -43,41 +43,41 @@ return [
     'connections' => [
 
         'sqlite' => [
-            'driver' => 'sqlite',
-            'database' => storage_path() . '/database.sqlite',
-            'prefix' => '',
+            'driver'   => 'sqlite',
+            'database' => storage_path().'/database.sqlite',
+            'prefix'   => '',
         ],
         'mysql' => [
-            'driver' => 'mysql',
-            'host' => env('DB_HOST', 'localhost'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST', 'localhost'),
+            'database'  => env('DB_DATABASE', 'forge'),
+            'username'  => env('DB_USERNAME', 'forge'),
+            'password'  => env('DB_PASSWORD', ''),
+            'charset'   => 'utf8',
             'collation' => 'utf8_unicode_ci',
-            'prefix' => '',
-            'strict' => false,
-            'options' => array(
+            'prefix'    => '',
+            'strict'    => false,
+            'options'   => [
                 PDO::ATTR_PERSISTENT => true,
-            ),
+            ],
         ],
         'pgsql' => [
-            'driver' => 'pgsql',
-            'host' => env('DB_HOST', 'localhost'),
+            'driver'   => 'pgsql',
+            'host'     => env('DB_HOST', 'localhost'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
-            'prefix' => '',
-            'schema' => 'public',
+            'charset'  => 'utf8',
+            'prefix'   => '',
+            'schema'   => 'public',
         ],
         'sqlsrv' => [
-            'driver' => 'sqlsrv',
-            'host' => env('DB_HOST', 'localhost'),
+            'driver'   => 'sqlsrv',
+            'host'     => env('DB_HOST', 'localhost'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
-            'prefix' => '',
+            'prefix'   => '',
         ],
     ],
     /*
@@ -105,8 +105,8 @@ return [
 
         'cluster' => false,
         'default' => [
-            'host' => '127.0.0.1',
-            'port' => 6379,
+            'host'     => '127.0.0.1',
+            'port'     => 6379,
             'database' => 0,
         ],
     ],
diff --git a/config/view.php b/config/view.php
index fe78c326e..a5095b3c0 100644
--- a/config/view.php
+++ b/config/view.php
@@ -14,7 +14,7 @@ return [
      */
 
     'paths' => [
-        realpath(base_path('resources/views'))
+        realpath(base_path('resources/views')),
     ],
     /*
       |--------------------------------------------------------------------------
@@ -26,5 +26,5 @@ return [
       | directory. However, as usual, you are free to change this value.
       |
      */
-    'compiled' => realpath(storage_path() . '/framework/views'),
+    'compiled' => realpath(storage_path().'/framework/views'),
 ];
diff --git a/database/migrations/2016_02_16_140450_create_banlist_table.php b/database/migrations/2016_02_16_140450_create_banlist_table.php
index 259996904..3dd91fe0c 100644
--- a/database/migrations/2016_02_16_140450_create_banlist_table.php
+++ b/database/migrations/2016_02_16_140450_create_banlist_table.php
@@ -3,34 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateBanlistTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('banlist', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->boolean('ban_status');
-			$table->string('email_address');
-			$table->string('internal_notes');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('banlist');
-	}
+class CreateBanlistTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('banlist', function (Blueprint $table) {
+            $table->increments('id');
+            $table->boolean('ban_status');
+            $table->string('email_address');
+            $table->string('internal_notes');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('banlist');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_canned_response_table.php b/database/migrations/2016_02_16_140450_create_canned_response_table.php
index fd4e203f3..1f6b2a898 100644
--- a/database/migrations/2016_02_16_140450_create_canned_response_table.php
+++ b/database/migrations/2016_02_16_140450_create_canned_response_table.php
@@ -3,34 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateCannedResponseTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('canned_response', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->integer('user_id')->unsigned()->index('user_id');
-			$table->string('title');
-			$table->text('message', 65535);
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('canned_response');
-	}
+class CreateCannedResponseTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('canned_response', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('user_id')->unsigned()->index('user_id');
+            $table->string('title');
+            $table->text('message', 65535);
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('canned_response');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_custom_form_fields_table.php b/database/migrations/2016_02_16_140450_create_custom_form_fields_table.php
index 61c312c9d..06797dc73 100644
--- a/database/migrations/2016_02_16_140450_create_custom_form_fields_table.php
+++ b/database/migrations/2016_02_16_140450_create_custom_form_fields_table.php
@@ -3,37 +3,34 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateCustomFormFieldsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('custom_form_fields', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->integer('forms_id');
-			$table->string('label');
-			$table->string('name');
-			$table->string('type');
-			$table->string('value');
-			$table->string('required');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('custom_form_fields');
-	}
+class CreateCustomFormFieldsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('custom_form_fields', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('forms_id');
+            $table->string('label');
+            $table->string('name');
+            $table->string('type');
+            $table->string('value');
+            $table->string('required');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('custom_form_fields');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_custom_forms_table.php b/database/migrations/2016_02_16_140450_create_custom_forms_table.php
index bfd386634..68080dbd2 100644
--- a/database/migrations/2016_02_16_140450_create_custom_forms_table.php
+++ b/database/migrations/2016_02_16_140450_create_custom_forms_table.php
@@ -3,32 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateCustomFormsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('custom_forms', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('formname');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('custom_forms');
-	}
+class CreateCustomFormsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('custom_forms', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('formname');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('custom_forms');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_date_format_table.php b/database/migrations/2016_02_16_140450_create_date_format_table.php
index 647524d27..37669aff8 100644
--- a/database/migrations/2016_02_16_140450_create_date_format_table.php
+++ b/database/migrations/2016_02_16_140450_create_date_format_table.php
@@ -3,31 +3,28 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateDateFormatTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('date_format', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('format');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('date_format');
-	}
+class CreateDateFormatTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('date_format', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('format');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('date_format');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_date_time_format_table.php b/database/migrations/2016_02_16_140450_create_date_time_format_table.php
index 16162a6cf..25312615e 100644
--- a/database/migrations/2016_02_16_140450_create_date_time_format_table.php
+++ b/database/migrations/2016_02_16_140450_create_date_time_format_table.php
@@ -3,31 +3,28 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateDateTimeFormatTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('date_time_format', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('format');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('date_time_format');
-	}
+class CreateDateTimeFormatTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('date_time_format', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('format');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('date_time_format');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_department_table.php b/database/migrations/2016_02_16_140450_create_department_table.php
index 9275e415d..ed326ed5d 100644
--- a/database/migrations/2016_02_16_140450_create_department_table.php
+++ b/database/migrations/2016_02_16_140450_create_department_table.php
@@ -3,44 +3,41 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateDepartmentTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('department', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('type');
-			$table->integer('sla')->unsigned()->nullable()->index('sla');
-			$table->integer('manager')->unsigned()->nullable()->index('manager_2');
-			$table->string('ticket_assignment');
-			$table->string('outgoing_email');
-			$table->string('template_set');
-			$table->string('auto_ticket_response');
-			$table->string('auto_message_response');
-			$table->string('auto_response_email');
-			$table->string('recipient');
-			$table->string('group_access');
-			$table->string('department_sign');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('department');
-	}
+class CreateDepartmentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('department', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('type');
+            $table->integer('sla')->unsigned()->nullable()->index('sla');
+            $table->integer('manager')->unsigned()->nullable()->index('manager_2');
+            $table->string('ticket_assignment');
+            $table->string('outgoing_email');
+            $table->string('template_set');
+            $table->string('auto_ticket_response');
+            $table->string('auto_message_response');
+            $table->string('auto_response_email');
+            $table->string('recipient');
+            $table->string('group_access');
+            $table->string('department_sign');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('department');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_emails_table.php b/database/migrations/2016_02_16_140450_create_emails_table.php
index d9442d933..dd9f372be 100644
--- a/database/migrations/2016_02_16_140450_create_emails_table.php
+++ b/database/migrations/2016_02_16_140450_create_emails_table.php
@@ -3,57 +3,54 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateEmailsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('emails', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('email_address');
-			$table->string('email_name');
-			$table->integer('department')->unsigned()->nullable();
-			$table->integer('priority')->unsigned()->nullable()->index('priority');
-			$table->integer('help_topic')->unsigned()->nullable()->index('help_topic');
-			$table->string('user_name');
-			$table->string('password');
-			$table->string('fetching_host');
-			$table->string('fetching_port');
-			$table->string('mailbox_protocol');
-			$table->string('imap_config');
-			$table->string('folder');
-			$table->string('sending_host');
-			$table->string('sending_port');
-			$table->string('sending_encryption');
-			$table->string('internal_notes');
-			$table->boolean('auto_response');
-			$table->boolean('fetching_status');
-			$table->boolean('move_to_folder');
-			$table->boolean('delete_email');
-			$table->boolean('do_nothing');
-			$table->boolean('sending_status');
-			$table->boolean('authentication');
-			$table->boolean('header_spoofing');
-			$table->timestamps();
-			$table->index(['department','priority','help_topic'], 'department');
-			$table->index(['department','priority','help_topic'], 'department_2');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('emails');
-	}
+class CreateEmailsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('emails', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('email_address');
+            $table->string('email_name');
+            $table->integer('department')->unsigned()->nullable();
+            $table->integer('priority')->unsigned()->nullable()->index('priority');
+            $table->integer('help_topic')->unsigned()->nullable()->index('help_topic');
+            $table->string('user_name');
+            $table->string('password');
+            $table->string('fetching_host');
+            $table->string('fetching_port');
+            $table->string('mailbox_protocol');
+            $table->string('imap_config');
+            $table->string('folder');
+            $table->string('sending_host');
+            $table->string('sending_port');
+            $table->string('sending_encryption');
+            $table->string('internal_notes');
+            $table->boolean('auto_response');
+            $table->boolean('fetching_status');
+            $table->boolean('move_to_folder');
+            $table->boolean('delete_email');
+            $table->boolean('do_nothing');
+            $table->boolean('sending_status');
+            $table->boolean('authentication');
+            $table->boolean('header_spoofing');
+            $table->timestamps();
+            $table->index(['department', 'priority', 'help_topic'], 'department');
+            $table->index(['department', 'priority', 'help_topic'], 'department_2');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('emails');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_group_assign_department_table.php b/database/migrations/2016_02_16_140450_create_group_assign_department_table.php
index bda9a7f81..c5945d9b8 100644
--- a/database/migrations/2016_02_16_140450_create_group_assign_department_table.php
+++ b/database/migrations/2016_02_16_140450_create_group_assign_department_table.php
@@ -3,33 +3,30 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateGroupAssignDepartmentTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('group_assign_department', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->integer('group_id')->unsigned()->index('group_id');
-			$table->integer('department_id')->unsigned()->index('department_id');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('group_assign_department');
-	}
+class CreateGroupAssignDepartmentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('group_assign_department', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('group_id')->unsigned()->index('group_id');
+            $table->integer('department_id')->unsigned()->index('department_id');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('group_assign_department');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_groups_table.php b/database/migrations/2016_02_16_140450_create_groups_table.php
index bdcfb7333..58ae2d01f 100644
--- a/database/migrations/2016_02_16_140450_create_groups_table.php
+++ b/database/migrations/2016_02_16_140450_create_groups_table.php
@@ -3,46 +3,43 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateGroupsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('groups', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->boolean('group_status');
-			$table->boolean('can_create_ticket');
-			$table->boolean('can_edit_ticket');
-			$table->boolean('can_post_ticket');
-			$table->boolean('can_close_ticket');
-			$table->boolean('can_assign_ticket');
-			$table->boolean('can_transfer_ticket');
-			$table->boolean('can_delete_ticket');
-			$table->boolean('can_ban_email');
-			$table->boolean('can_manage_canned');
-			$table->boolean('can_manage_faq');
-			$table->boolean('can_view_agent_stats');
-			$table->boolean('department_access');
-			$table->string('admin_notes');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('groups');
-	}
+class CreateGroupsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('groups', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->boolean('group_status');
+            $table->boolean('can_create_ticket');
+            $table->boolean('can_edit_ticket');
+            $table->boolean('can_post_ticket');
+            $table->boolean('can_close_ticket');
+            $table->boolean('can_assign_ticket');
+            $table->boolean('can_transfer_ticket');
+            $table->boolean('can_delete_ticket');
+            $table->boolean('can_ban_email');
+            $table->boolean('can_manage_canned');
+            $table->boolean('can_manage_faq');
+            $table->boolean('can_view_agent_stats');
+            $table->boolean('department_access');
+            $table->string('admin_notes');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('groups');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_help_topic_table.php b/database/migrations/2016_02_16_140450_create_help_topic_table.php
index e4a9b8436..4978a8375 100644
--- a/database/migrations/2016_02_16_140450_create_help_topic_table.php
+++ b/database/migrations/2016_02_16_140450_create_help_topic_table.php
@@ -3,45 +3,42 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateHelpTopicTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('help_topic', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('topic');
-			$table->string('parent_topic');
-			$table->integer('custom_form')->unsigned()->nullable()->index('custom_form');
-			$table->integer('department')->unsigned()->nullable()->index('department');
-			$table->integer('ticket_status')->unsigned()->nullable()->index('ticket_status');
-			$table->integer('priority')->unsigned()->nullable()->index('priority');
-			$table->integer('sla_plan')->unsigned()->nullable()->index('sla_plan');
-			$table->string('thank_page');
-			$table->string('ticket_num_format');
-			$table->string('internal_notes');
-			$table->boolean('status');
-			$table->boolean('type');
-			$table->integer('auto_assign')->unsigned()->nullable()->index('auto_assign_2');
-			$table->boolean('auto_response');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('help_topic');
-	}
+class CreateHelpTopicTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('help_topic', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('topic');
+            $table->string('parent_topic');
+            $table->integer('custom_form')->unsigned()->nullable()->index('custom_form');
+            $table->integer('department')->unsigned()->nullable()->index('department');
+            $table->integer('ticket_status')->unsigned()->nullable()->index('ticket_status');
+            $table->integer('priority')->unsigned()->nullable()->index('priority');
+            $table->integer('sla_plan')->unsigned()->nullable()->index('sla_plan');
+            $table->string('thank_page');
+            $table->string('ticket_num_format');
+            $table->string('internal_notes');
+            $table->boolean('status');
+            $table->boolean('type');
+            $table->integer('auto_assign')->unsigned()->nullable()->index('auto_assign_2');
+            $table->boolean('auto_response');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('help_topic');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_kb_article_relationship_table.php b/database/migrations/2016_02_16_140450_create_kb_article_relationship_table.php
index ce8f8ba18..18dd2efe3 100644
--- a/database/migrations/2016_02_16_140450_create_kb_article_relationship_table.php
+++ b/database/migrations/2016_02_16_140450_create_kb_article_relationship_table.php
@@ -3,33 +3,30 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateKbArticleRelationshipTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('kb_article_relationship', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->integer('article_id')->unsigned()->index('article_relationship_article_id_foreign');
-			$table->integer('category_id')->unsigned()->index('article_relationship_category_id_foreign');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('kb_article_relationship');
-	}
+class CreateKbArticleRelationshipTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('kb_article_relationship', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('article_id')->unsigned()->index('article_relationship_article_id_foreign');
+            $table->integer('category_id')->unsigned()->index('article_relationship_category_id_foreign');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('kb_article_relationship');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_kb_article_table.php b/database/migrations/2016_02_16_140450_create_kb_article_table.php
index fb19e3bf6..afb27bf7c 100644
--- a/database/migrations/2016_02_16_140450_create_kb_article_table.php
+++ b/database/migrations/2016_02_16_140450_create_kb_article_table.php
@@ -3,37 +3,34 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateKbArticleTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('kb_article', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('slug');
-			$table->text('description', 65535);
-			$table->boolean('status');
-			$table->boolean('type');
-			$table->dateTime('publish_time')->nullable();
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('kb_article');
-	}
+class CreateKbArticleTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('kb_article', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('slug');
+            $table->text('description', 65535);
+            $table->boolean('status');
+            $table->boolean('type');
+            $table->dateTime('publish_time')->nullable();
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('kb_article');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_kb_category_table.php b/database/migrations/2016_02_16_140450_create_kb_category_table.php
index 785586a54..df7f02ed5 100644
--- a/database/migrations/2016_02_16_140450_create_kb_category_table.php
+++ b/database/migrations/2016_02_16_140450_create_kb_category_table.php
@@ -3,36 +3,33 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateKbCategoryTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('kb_category', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('slug');
-			$table->text('description', 65535);
-			$table->boolean('status');
-			$table->integer('parent');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('kb_category');
-	}
+class CreateKbCategoryTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('kb_category', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('slug');
+            $table->text('description', 65535);
+            $table->boolean('status');
+            $table->integer('parent');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('kb_category');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_kb_comment_table.php b/database/migrations/2016_02_16_140450_create_kb_comment_table.php
index b92ba8196..01e54587b 100644
--- a/database/migrations/2016_02_16_140450_create_kb_comment_table.php
+++ b/database/migrations/2016_02_16_140450_create_kb_comment_table.php
@@ -3,37 +3,34 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateKbCommentTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('kb_comment', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->integer('article_id')->unsigned()->index('comment_article_id_foreign');
-			$table->string('name');
-			$table->string('email');
-			$table->string('website');
-			$table->string('comment');
-			$table->boolean('status');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('kb_comment');
-	}
+class CreateKbCommentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('kb_comment', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('article_id')->unsigned()->index('comment_article_id_foreign');
+            $table->string('name');
+            $table->string('email');
+            $table->string('website');
+            $table->string('comment');
+            $table->boolean('status');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('kb_comment');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_kb_pages_table.php b/database/migrations/2016_02_16_140450_create_kb_pages_table.php
index 2ade2e867..ff8617144 100644
--- a/database/migrations/2016_02_16_140450_create_kb_pages_table.php
+++ b/database/migrations/2016_02_16_140450_create_kb_pages_table.php
@@ -3,36 +3,33 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateKbPagesTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('kb_pages', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->boolean('status');
-			$table->boolean('visibility');
-			$table->string('slug');
-			$table->text('description', 65535);
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('kb_pages');
-	}
+class CreateKbPagesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('kb_pages', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->boolean('status');
+            $table->boolean('visibility');
+            $table->string('slug');
+            $table->text('description', 65535);
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('kb_pages');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_kb_settings_table.php b/database/migrations/2016_02_16_140450_create_kb_settings_table.php
index 0027e6335..c50dd0ae7 100644
--- a/database/migrations/2016_02_16_140450_create_kb_settings_table.php
+++ b/database/migrations/2016_02_16_140450_create_kb_settings_table.php
@@ -3,32 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateKbSettingsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('kb_settings', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->integer('pagination');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('kb_settings');
-	}
+class CreateKbSettingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('kb_settings', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('pagination');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('kb_settings');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_languages_table.php b/database/migrations/2016_02_16_140450_create_languages_table.php
index ef6fdba3e..30952d5e6 100644
--- a/database/migrations/2016_02_16_140450_create_languages_table.php
+++ b/database/migrations/2016_02_16_140450_create_languages_table.php
@@ -3,32 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateLanguagesTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('languages', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('locale');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('languages');
-	}
+class CreateLanguagesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('languages', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('locale');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('languages');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_log_notification_table.php b/database/migrations/2016_02_16_140450_create_log_notification_table.php
index c4bd472b2..6287ebb30 100644
--- a/database/migrations/2016_02_16_140450_create_log_notification_table.php
+++ b/database/migrations/2016_02_16_140450_create_log_notification_table.php
@@ -3,32 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateLogNotificationTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('log_notification', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('log');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('log_notification');
-	}
+class CreateLogNotificationTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('log_notification', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('log');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('log_notification');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_mailbox_protocol_table.php b/database/migrations/2016_02_16_140450_create_mailbox_protocol_table.php
index e682d36ab..ef7cb551b 100644
--- a/database/migrations/2016_02_16_140450_create_mailbox_protocol_table.php
+++ b/database/migrations/2016_02_16_140450_create_mailbox_protocol_table.php
@@ -3,32 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateMailboxProtocolTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('mailbox_protocol', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('value', 50)->nullable();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('mailbox_protocol');
-	}
+class CreateMailboxProtocolTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('mailbox_protocol', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('value', 50)->nullable();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('mailbox_protocol');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_organization_table.php b/database/migrations/2016_02_16_140450_create_organization_table.php
index 0ffd1e704..b3584f2bc 100644
--- a/database/migrations/2016_02_16_140450_create_organization_table.php
+++ b/database/migrations/2016_02_16_140450_create_organization_table.php
@@ -3,37 +3,34 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateOrganizationTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('organization', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('phone');
-			$table->string('website');
-			$table->string('address');
-			$table->integer('head')->unsigned()->nullable()->index('head');
-			$table->string('internal_notes');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('organization');
-	}
+class CreateOrganizationTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('organization', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('phone');
+            $table->string('website');
+            $table->string('address');
+            $table->integer('head')->unsigned()->nullable()->index('head');
+            $table->string('internal_notes');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('organization');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_password_resets_table.php b/database/migrations/2016_02_16_140450_create_password_resets_table.php
index 0a007bb1d..282e3c6d4 100644
--- a/database/migrations/2016_02_16_140450_create_password_resets_table.php
+++ b/database/migrations/2016_02_16_140450_create_password_resets_table.php
@@ -3,32 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreatePasswordResetsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('password_resets', function(Blueprint $table)
-		{
-			$table->string('email')->index();
-			$table->string('token')->index();
-			$table->dateTime('created_at')->default('0000-00-00 00:00:00');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('password_resets');
-	}
+class CreatePasswordResetsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('password_resets', function (Blueprint $table) {
+            $table->string('email')->index();
+            $table->string('token')->index();
+            $table->dateTime('created_at')->default('0000-00-00 00:00:00');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('password_resets');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_plugins_table.php b/database/migrations/2016_02_16_140450_create_plugins_table.php
index 711f26fa1..5d76c7958 100644
--- a/database/migrations/2016_02_16_140450_create_plugins_table.php
+++ b/database/migrations/2016_02_16_140450_create_plugins_table.php
@@ -3,34 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreatePluginsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('plugins', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('path');
-			$table->integer('status');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('plugins');
-	}
+class CreatePluginsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('plugins', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('path');
+            $table->integer('status');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('plugins');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_send_mail_table.php b/database/migrations/2016_02_16_140450_create_send_mail_table.php
index 9aa53b0d6..f86822b1b 100644
--- a/database/migrations/2016_02_16_140450_create_send_mail_table.php
+++ b/database/migrations/2016_02_16_140450_create_send_mail_table.php
@@ -3,37 +3,34 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSendMailTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('send_mail', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('driver');
-			$table->string('host');
-			$table->string('port');
-			$table->string('encryption');
-			$table->string('name');
-			$table->string('email');
-			$table->string('password');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('send_mail');
-	}
+class CreateSendMailTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('send_mail', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('driver');
+            $table->string('host');
+            $table->string('port');
+            $table->string('encryption');
+            $table->string('name');
+            $table->string('email');
+            $table->string('password');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('send_mail');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_settings_alert_notice_table.php b/database/migrations/2016_02_16_140450_create_settings_alert_notice_table.php
index 2e839b7ca..5fd6d7d45 100644
--- a/database/migrations/2016_02_16_140450_create_settings_alert_notice_table.php
+++ b/database/migrations/2016_02_16_140450_create_settings_alert_notice_table.php
@@ -3,60 +3,57 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSettingsAlertNoticeTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('settings_alert_notice', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->boolean('ticket_status');
-			$table->boolean('ticket_admin_email');
-			$table->boolean('ticket_department_manager');
-			$table->boolean('ticket_department_member');
-			$table->boolean('ticket_organization_accmanager');
-			$table->boolean('message_status');
-			$table->boolean('message_last_responder');
-			$table->boolean('message_assigned_agent');
-			$table->boolean('message_department_manager');
-			$table->boolean('message_organization_accmanager');
-			$table->boolean('internal_status');
-			$table->boolean('internal_last_responder');
-			$table->boolean('internal_assigned_agent');
-			$table->boolean('internal_department_manager');
-			$table->boolean('assignment_status');
-			$table->boolean('assignment_assigned_agent');
-			$table->boolean('assignment_team_leader');
-			$table->boolean('assignment_team_member');
-			$table->boolean('transfer_status');
-			$table->boolean('transfer_assigned_agent');
-			$table->boolean('transfer_department_manager');
-			$table->boolean('transfer_department_member');
-			$table->boolean('overdue_status');
-			$table->boolean('overdue_assigned_agent');
-			$table->boolean('overdue_department_manager');
-			$table->boolean('overdue_department_member');
-			$table->boolean('system_error');
-			$table->boolean('sql_error');
-			$table->boolean('excessive_failure');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('settings_alert_notice');
-	}
+class CreateSettingsAlertNoticeTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('settings_alert_notice', function (Blueprint $table) {
+            $table->increments('id');
+            $table->boolean('ticket_status');
+            $table->boolean('ticket_admin_email');
+            $table->boolean('ticket_department_manager');
+            $table->boolean('ticket_department_member');
+            $table->boolean('ticket_organization_accmanager');
+            $table->boolean('message_status');
+            $table->boolean('message_last_responder');
+            $table->boolean('message_assigned_agent');
+            $table->boolean('message_department_manager');
+            $table->boolean('message_organization_accmanager');
+            $table->boolean('internal_status');
+            $table->boolean('internal_last_responder');
+            $table->boolean('internal_assigned_agent');
+            $table->boolean('internal_department_manager');
+            $table->boolean('assignment_status');
+            $table->boolean('assignment_assigned_agent');
+            $table->boolean('assignment_team_leader');
+            $table->boolean('assignment_team_member');
+            $table->boolean('transfer_status');
+            $table->boolean('transfer_assigned_agent');
+            $table->boolean('transfer_department_manager');
+            $table->boolean('transfer_department_member');
+            $table->boolean('overdue_status');
+            $table->boolean('overdue_assigned_agent');
+            $table->boolean('overdue_department_manager');
+            $table->boolean('overdue_department_member');
+            $table->boolean('system_error');
+            $table->boolean('sql_error');
+            $table->boolean('excessive_failure');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('settings_alert_notice');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_settings_auto_response_table.php b/database/migrations/2016_02_16_140450_create_settings_auto_response_table.php
index caab3f80a..f83eb210b 100644
--- a/database/migrations/2016_02_16_140450_create_settings_auto_response_table.php
+++ b/database/migrations/2016_02_16_140450_create_settings_auto_response_table.php
@@ -3,36 +3,33 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSettingsAutoResponseTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('settings_auto_response', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->boolean('new_ticket');
-			$table->boolean('agent_new_ticket');
-			$table->boolean('submitter');
-			$table->boolean('participants');
-			$table->boolean('overlimit');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('settings_auto_response');
-	}
+class CreateSettingsAutoResponseTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('settings_auto_response', function (Blueprint $table) {
+            $table->increments('id');
+            $table->boolean('new_ticket');
+            $table->boolean('agent_new_ticket');
+            $table->boolean('submitter');
+            $table->boolean('participants');
+            $table->boolean('overlimit');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('settings_auto_response');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_settings_company_table.php b/database/migrations/2016_02_16_140450_create_settings_company_table.php
index eb043bc28..279199f87 100644
--- a/database/migrations/2016_02_16_140450_create_settings_company_table.php
+++ b/database/migrations/2016_02_16_140450_create_settings_company_table.php
@@ -3,40 +3,37 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSettingsCompanyTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('settings_company', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('company_name');
-			$table->string('website');
-			$table->string('phone');
-			$table->string('address');
-			$table->string('landing_page');
-			$table->string('offline_page');
-			$table->string('thank_page');
-			$table->string('logo');
-			$table->string('use_logo');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('settings_company');
-	}
+class CreateSettingsCompanyTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('settings_company', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('company_name');
+            $table->string('website');
+            $table->string('phone');
+            $table->string('address');
+            $table->string('landing_page');
+            $table->string('offline_page');
+            $table->string('thank_page');
+            $table->string('logo');
+            $table->string('use_logo');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('settings_company');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_settings_email_table.php b/database/migrations/2016_02_16_140450_create_settings_email_table.php
index d71261f71..afc293605 100644
--- a/database/migrations/2016_02_16_140450_create_settings_email_table.php
+++ b/database/migrations/2016_02_16_140450_create_settings_email_table.php
@@ -3,43 +3,40 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSettingsEmailTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('settings_email', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('template');
-			$table->string('sys_email')->nullable();
-			$table->string('alert_email');
-			$table->string('admin_email');
-			$table->string('mta');
-			$table->boolean('email_fetching');
-			$table->boolean('notification_cron');
-			$table->boolean('strip');
-			$table->boolean('separator');
-			$table->boolean('all_emails');
-			$table->boolean('email_collaborator');
-			$table->boolean('attachment');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('settings_email');
-	}
+class CreateSettingsEmailTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('settings_email', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('template');
+            $table->string('sys_email')->nullable();
+            $table->string('alert_email');
+            $table->string('admin_email');
+            $table->string('mta');
+            $table->boolean('email_fetching');
+            $table->boolean('notification_cron');
+            $table->boolean('strip');
+            $table->boolean('separator');
+            $table->boolean('all_emails');
+            $table->boolean('email_collaborator');
+            $table->boolean('attachment');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('settings_email');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_settings_ratings_table.php b/database/migrations/2016_02_16_140450_create_settings_ratings_table.php
index 06c7db279..04c57a2d1 100644
--- a/database/migrations/2016_02_16_140450_create_settings_ratings_table.php
+++ b/database/migrations/2016_02_16_140450_create_settings_ratings_table.php
@@ -3,35 +3,32 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSettingsRatingsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('settings_ratings', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('rating_name');
-			$table->integer('publish');
-			$table->integer('modify');
-			$table->string('slug')->unique();
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('settings_ratings');
-	}
+class CreateSettingsRatingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('settings_ratings', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('rating_name');
+            $table->integer('publish');
+            $table->integer('modify');
+            $table->string('slug')->unique();
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('settings_ratings');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_settings_system_table.php b/database/migrations/2016_02_16_140450_create_settings_system_table.php
index bb575ac18..85d33128b 100644
--- a/database/migrations/2016_02_16_140450_create_settings_system_table.php
+++ b/database/migrations/2016_02_16_140450_create_settings_system_table.php
@@ -3,47 +3,44 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSettingsSystemTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('settings_system', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->boolean('status');
-			$table->string('url');
-			$table->string('name');
-			$table->string('department');
-			$table->string('page_size');
-			$table->string('log_level');
-			$table->string('purge_log');
-			$table->integer('api_enable');
-			$table->string('api_key');
-			$table->string('name_format');
-			$table->integer('time_farmat')->unsigned()->nullable()->index('time_farmat');
-			$table->integer('date_format')->unsigned()->nullable()->index('date_format');
-			$table->integer('date_time_format')->unsigned()->nullable()->index('date_time_format');
-			$table->string('day_date_time');
-			$table->integer('time_zone')->unsigned()->nullable()->index('time_zone');
-			$table->string('content');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('settings_system');
-	}
+class CreateSettingsSystemTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('settings_system', function (Blueprint $table) {
+            $table->increments('id');
+            $table->boolean('status');
+            $table->string('url');
+            $table->string('name');
+            $table->string('department');
+            $table->string('page_size');
+            $table->string('log_level');
+            $table->string('purge_log');
+            $table->integer('api_enable');
+            $table->string('api_key');
+            $table->string('name_format');
+            $table->integer('time_farmat')->unsigned()->nullable()->index('time_farmat');
+            $table->integer('date_format')->unsigned()->nullable()->index('date_format');
+            $table->integer('date_time_format')->unsigned()->nullable()->index('date_time_format');
+            $table->string('day_date_time');
+            $table->integer('time_zone')->unsigned()->nullable()->index('time_zone');
+            $table->string('content');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('settings_system');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_settings_ticket_table.php b/database/migrations/2016_02_16_140450_create_settings_ticket_table.php
index b9e188518..4087efcb6 100644
--- a/database/migrations/2016_02_16_140450_create_settings_ticket_table.php
+++ b/database/migrations/2016_02_16_140450_create_settings_ticket_table.php
@@ -3,47 +3,44 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSettingsTicketTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('settings_ticket', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('num_format');
-			$table->string('num_sequence');
-			$table->string('priority');
-			$table->string('sla');
-			$table->string('help_topic');
-			$table->string('max_open_ticket');
-			$table->string('collision_avoid');
-			$table->string('captcha');
-			$table->boolean('status');
-			$table->boolean('claim_response');
-			$table->boolean('assigned_ticket');
-			$table->boolean('answered_ticket');
-			$table->boolean('agent_mask');
-			$table->boolean('html');
-			$table->boolean('client_update');
-			$table->boolean('max_file_size');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('settings_ticket');
-	}
+class CreateSettingsTicketTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('settings_ticket', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('num_format');
+            $table->string('num_sequence');
+            $table->string('priority');
+            $table->string('sla');
+            $table->string('help_topic');
+            $table->string('max_open_ticket');
+            $table->string('collision_avoid');
+            $table->string('captcha');
+            $table->boolean('status');
+            $table->boolean('claim_response');
+            $table->boolean('assigned_ticket');
+            $table->boolean('answered_ticket');
+            $table->boolean('agent_mask');
+            $table->boolean('html');
+            $table->boolean('client_update');
+            $table->boolean('max_file_size');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('settings_ticket');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_sla_plan_table.php b/database/migrations/2016_02_16_140450_create_sla_plan_table.php
index 79dbad5e1..03e0d8793 100644
--- a/database/migrations/2016_02_16_140450_create_sla_plan_table.php
+++ b/database/migrations/2016_02_16_140450_create_sla_plan_table.php
@@ -3,37 +3,34 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSlaPlanTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('sla_plan', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('grace_period');
-			$table->string('admin_note');
-			$table->boolean('status');
-			$table->boolean('transient');
-			$table->boolean('ticket_overdue');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('sla_plan');
-	}
+class CreateSlaPlanTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('sla_plan', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('grace_period');
+            $table->string('admin_note');
+            $table->boolean('status');
+            $table->boolean('transient');
+            $table->boolean('ticket_overdue');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('sla_plan');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_team_assign_agent_table.php b/database/migrations/2016_02_16_140450_create_team_assign_agent_table.php
index c69985169..62e9665bd 100644
--- a/database/migrations/2016_02_16_140450_create_team_assign_agent_table.php
+++ b/database/migrations/2016_02_16_140450_create_team_assign_agent_table.php
@@ -3,33 +3,30 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTeamAssignAgentTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('team_assign_agent', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->integer('team_id')->unsigned()->nullable()->index('team_id');
-			$table->integer('agent_id')->unsigned()->nullable()->index('agent_id');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('team_assign_agent');
-	}
+class CreateTeamAssignAgentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('team_assign_agent', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('team_id')->unsigned()->nullable()->index('team_id');
+            $table->integer('agent_id')->unsigned()->nullable()->index('agent_id');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('team_assign_agent');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_teams_table.php b/database/migrations/2016_02_16_140450_create_teams_table.php
index b1aa0ce9c..7315f3207 100644
--- a/database/migrations/2016_02_16_140450_create_teams_table.php
+++ b/database/migrations/2016_02_16_140450_create_teams_table.php
@@ -3,36 +3,33 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTeamsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('teams', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->boolean('status');
-			$table->integer('team_lead')->unsigned()->nullable()->index('team_lead');
-			$table->boolean('assign_alert');
-			$table->string('admin_notes');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('teams');
-	}
+class CreateTeamsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('teams', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->boolean('status');
+            $table->integer('team_lead')->unsigned()->nullable()->index('team_lead');
+            $table->boolean('assign_alert');
+            $table->string('admin_notes');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('teams');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_template_table.php b/database/migrations/2016_02_16_140450_create_template_table.php
index a2ff68c81..5e95e54e2 100644
--- a/database/migrations/2016_02_16_140450_create_template_table.php
+++ b/database/migrations/2016_02_16_140450_create_template_table.php
@@ -3,36 +3,33 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTemplateTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('template', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->boolean('status');
-			$table->string('template_set_to_clone');
-			$table->string('language');
-			$table->string('internal_note');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('template');
-	}
+class CreateTemplateTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('template', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->boolean('status');
+            $table->string('template_set_to_clone');
+            $table->string('language');
+            $table->string('internal_note');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('template');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_ticket_attachment_table.php b/database/migrations/2016_02_16_140450_create_ticket_attachment_table.php
index 72b2b405a..a896175ab 100644
--- a/database/migrations/2016_02_16_140450_create_ticket_attachment_table.php
+++ b/database/migrations/2016_02_16_140450_create_ticket_attachment_table.php
@@ -3,37 +3,34 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTicketAttachmentTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('ticket_attachment', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->integer('thread_id')->unsigned()->nullable()->index('thread_id');
-			$table->string('size');
-			$table->string('type');
-			$table->string('poster');
-			$table->timestamps();
-			$table->binary('file', 65535)->nullable();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('ticket_attachment');
-	}
+class CreateTicketAttachmentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('ticket_attachment', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->integer('thread_id')->unsigned()->nullable()->index('thread_id');
+            $table->string('size');
+            $table->string('type');
+            $table->string('poster');
+            $table->timestamps();
+            $table->binary('file', 65535)->nullable();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('ticket_attachment');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_ticket_collaborator_table.php b/database/migrations/2016_02_16_140450_create_ticket_collaborator_table.php
index b69c8928a..a65fec878 100644
--- a/database/migrations/2016_02_16_140450_create_ticket_collaborator_table.php
+++ b/database/migrations/2016_02_16_140450_create_ticket_collaborator_table.php
@@ -3,35 +3,32 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTicketCollaboratorTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('ticket_collaborator', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->boolean('isactive');
-			$table->integer('ticket_id')->unsigned()->nullable()->index('ticket_id');
-			$table->integer('user_id')->unsigned()->nullable()->index('user_id');
-			$table->string('role');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('ticket_collaborator');
-	}
+class CreateTicketCollaboratorTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('ticket_collaborator', function (Blueprint $table) {
+            $table->increments('id');
+            $table->boolean('isactive');
+            $table->integer('ticket_id')->unsigned()->nullable()->index('ticket_id');
+            $table->integer('user_id')->unsigned()->nullable()->index('user_id');
+            $table->string('role');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('ticket_collaborator');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_ticket_form_data_table.php b/database/migrations/2016_02_16_140450_create_ticket_form_data_table.php
index 685556e8a..fd08323fe 100644
--- a/database/migrations/2016_02_16_140450_create_ticket_form_data_table.php
+++ b/database/migrations/2016_02_16_140450_create_ticket_form_data_table.php
@@ -3,34 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTicketFormDataTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('ticket_form_data', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->integer('ticket_id')->unsigned()->nullable()->index('ticket_id');
-			$table->text('title', 65535);
-			$table->text('content', 65535);
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('ticket_form_data');
-	}
+class CreateTicketFormDataTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('ticket_form_data', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('ticket_id')->unsigned()->nullable()->index('ticket_id');
+            $table->text('title', 65535);
+            $table->text('content', 65535);
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('ticket_form_data');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_ticket_priority_table.php b/database/migrations/2016_02_16_140450_create_ticket_priority_table.php
index bbc884fa7..760b44d2c 100644
--- a/database/migrations/2016_02_16_140450_create_ticket_priority_table.php
+++ b/database/migrations/2016_02_16_140450_create_ticket_priority_table.php
@@ -3,35 +3,32 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTicketPriorityTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('ticket_priority', function(Blueprint $table)
-		{
-			$table->increments('priority_id');
-			$table->string('priority');
-			$table->string('priority_desc');
-			$table->string('priority_color');
-			$table->boolean('priority_urgency');
-			$table->boolean('ispublic');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('ticket_priority');
-	}
+class CreateTicketPriorityTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('ticket_priority', function (Blueprint $table) {
+            $table->increments('priority_id');
+            $table->string('priority');
+            $table->string('priority_desc');
+            $table->string('priority_color');
+            $table->boolean('priority_urgency');
+            $table->boolean('ispublic');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('ticket_priority');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_ticket_source_table.php b/database/migrations/2016_02_16_140450_create_ticket_source_table.php
index f9672545a..18d82d68e 100644
--- a/database/migrations/2016_02_16_140450_create_ticket_source_table.php
+++ b/database/migrations/2016_02_16_140450_create_ticket_source_table.php
@@ -3,32 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTicketSourceTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('ticket_source', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('value');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('ticket_source');
-	}
+class CreateTicketSourceTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('ticket_source', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('value');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('ticket_source');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_ticket_status_table.php b/database/migrations/2016_02_16_140450_create_ticket_status_table.php
index 4bcfb65de..68231e87c 100644
--- a/database/migrations/2016_02_16_140450_create_ticket_status_table.php
+++ b/database/migrations/2016_02_16_140450_create_ticket_status_table.php
@@ -3,38 +3,35 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTicketStatusTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('ticket_status', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('state');
-			$table->integer('mode');
-			$table->string('message');
-			$table->integer('flags');
-			$table->integer('sort');
-			$table->string('properties');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('ticket_status');
-	}
+class CreateTicketStatusTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('ticket_status', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('state');
+            $table->integer('mode');
+            $table->string('message');
+            $table->integer('flags');
+            $table->integer('sort');
+            $table->string('properties');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('ticket_status');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_ticket_thread_table.php b/database/migrations/2016_02_16_140450_create_ticket_thread_table.php
index 5055d732c..da7a53855 100644
--- a/database/migrations/2016_02_16_140450_create_ticket_thread_table.php
+++ b/database/migrations/2016_02_16_140450_create_ticket_thread_table.php
@@ -3,40 +3,37 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTicketThreadTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('ticket_thread', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->integer('ticket_id')->unsigned()->nullable()->index('ticket_id_2');
-			$table->integer('user_id')->unsigned()->nullable()->index('user_id');
-			$table->string('poster');
-			$table->integer('source')->unsigned()->nullable()->index('source');
-			$table->boolean('is_internal');
-			$table->string('title');
-			$table->text('body', 65535);
-			$table->string('format');
-			$table->string('ip_address');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('ticket_thread');
-	}
+class CreateTicketThreadTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('ticket_thread', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('ticket_id')->unsigned()->nullable()->index('ticket_id_2');
+            $table->integer('user_id')->unsigned()->nullable()->index('user_id');
+            $table->string('poster');
+            $table->integer('source')->unsigned()->nullable()->index('source');
+            $table->boolean('is_internal');
+            $table->string('title');
+            $table->text('body', 65535);
+            $table->string('format');
+            $table->string('ip_address');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('ticket_thread');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_tickets_table.php b/database/migrations/2016_02_16_140450_create_tickets_table.php
index e670fc714..fdb0c0990 100644
--- a/database/migrations/2016_02_16_140450_create_tickets_table.php
+++ b/database/migrations/2016_02_16_140450_create_tickets_table.php
@@ -3,60 +3,57 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTicketsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('tickets', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('ticket_number');
-			$table->integer('user_id')->unsigned()->nullable()->index('user_id');
-			$table->integer('dept_id')->unsigned()->nullable()->index('dept_id');
-			$table->integer('team_id')->unsigned()->nullable()->index('team_id');
-			$table->integer('priority_id')->unsigned()->nullable()->index('priority_id');
-			$table->integer('sla')->unsigned()->nullable()->index('sla');
-			$table->integer('help_topic_id')->unsigned()->nullable()->index('help_topic_id');
-			$table->integer('status')->unsigned()->nullable()->index('status');
-			$table->boolean('rating');
-			$table->boolean('ratingreply');
-			$table->integer('flags');
-			$table->integer('ip_address');
-			$table->integer('assigned_to')->unsigned()->nullable()->index('assigned_to');
-			$table->integer('lock_by');
-			$table->dateTime('lock_at')->nullable();
-			$table->integer('source')->unsigned()->nullable()->index('source');
-			$table->integer('isoverdue');
-			$table->integer('reopened');
-			$table->integer('isanswered');
-			$table->integer('html');
-			$table->integer('is_deleted');
-			$table->integer('closed');
-			$table->boolean('is_transferred');
-			$table->dateTime('transferred_at');
-			$table->dateTime('reopened_at')->nullable();
-			$table->dateTime('duedate')->nullable();
-			$table->dateTime('closed_at')->nullable();
-			$table->dateTime('last_message_at')->nullable();
-			$table->dateTime('last_response_at')->nullable();
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('tickets');
-	}
+class CreateTicketsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('tickets', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('ticket_number');
+            $table->integer('user_id')->unsigned()->nullable()->index('user_id');
+            $table->integer('dept_id')->unsigned()->nullable()->index('dept_id');
+            $table->integer('team_id')->unsigned()->nullable()->index('team_id');
+            $table->integer('priority_id')->unsigned()->nullable()->index('priority_id');
+            $table->integer('sla')->unsigned()->nullable()->index('sla');
+            $table->integer('help_topic_id')->unsigned()->nullable()->index('help_topic_id');
+            $table->integer('status')->unsigned()->nullable()->index('status');
+            $table->boolean('rating');
+            $table->boolean('ratingreply');
+            $table->integer('flags');
+            $table->integer('ip_address');
+            $table->integer('assigned_to')->unsigned()->nullable()->index('assigned_to');
+            $table->integer('lock_by');
+            $table->dateTime('lock_at')->nullable();
+            $table->integer('source')->unsigned()->nullable()->index('source');
+            $table->integer('isoverdue');
+            $table->integer('reopened');
+            $table->integer('isanswered');
+            $table->integer('html');
+            $table->integer('is_deleted');
+            $table->integer('closed');
+            $table->boolean('is_transferred');
+            $table->dateTime('transferred_at');
+            $table->dateTime('reopened_at')->nullable();
+            $table->dateTime('duedate')->nullable();
+            $table->dateTime('closed_at')->nullable();
+            $table->dateTime('last_message_at')->nullable();
+            $table->dateTime('last_response_at')->nullable();
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('tickets');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_time_format_table.php b/database/migrations/2016_02_16_140450_create_time_format_table.php
index 056243d4a..262367db0 100644
--- a/database/migrations/2016_02_16_140450_create_time_format_table.php
+++ b/database/migrations/2016_02_16_140450_create_time_format_table.php
@@ -3,31 +3,28 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTimeFormatTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('time_format', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('format');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('time_format');
-	}
+class CreateTimeFormatTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('time_format', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('format');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('time_format');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_timezone_table.php b/database/migrations/2016_02_16_140450_create_timezone_table.php
index 36fd6ae05..d0b8d4bce 100644
--- a/database/migrations/2016_02_16_140450_create_timezone_table.php
+++ b/database/migrations/2016_02_16_140450_create_timezone_table.php
@@ -3,32 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateTimezoneTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('timezone', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('location');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('timezone');
-	}
+class CreateTimezoneTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('timezone', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('location');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('timezone');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_user_assign_organization_table.php b/database/migrations/2016_02_16_140450_create_user_assign_organization_table.php
index 55997f4db..ffbea8d2e 100644
--- a/database/migrations/2016_02_16_140450_create_user_assign_organization_table.php
+++ b/database/migrations/2016_02_16_140450_create_user_assign_organization_table.php
@@ -3,33 +3,30 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateUserAssignOrganizationTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('user_assign_organization', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->integer('org_id')->unsigned()->nullable()->index('org_id');
-			$table->integer('user_id')->unsigned()->nullable()->index('user_id');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('user_assign_organization');
-	}
+class CreateUserAssignOrganizationTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_assign_organization', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('org_id')->unsigned()->nullable()->index('org_id');
+            $table->integer('user_id')->unsigned()->nullable()->index('user_id');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('user_assign_organization');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_users_table.php b/database/migrations/2016_02_16_140450_create_users_table.php
index c0e448c07..bd17eec08 100644
--- a/database/migrations/2016_02_16_140450_create_users_table.php
+++ b/database/migrations/2016_02_16_140450_create_users_table.php
@@ -3,57 +3,54 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateUsersTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('users', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('user_name');
-			$table->string('first_name');
-			$table->string('last_name');
-			$table->boolean('gender');
-			$table->string('email')->unique();
-			$table->boolean('ban');
-			$table->string('password', 60);
-			$table->integer('active');
-			$table->string('ext');
-			$table->string('phone_number');
-			$table->string('mobile');
-			$table->text('agent_sign', 65535);
-			$table->string('account_type');
-			$table->string('account_status');
-			$table->integer('assign_group')->unsigned()->nullable()->index('assign_group_3');
-			$table->integer('primary_dpt')->unsigned()->nullable()->index('primary_dpt_2');
-			$table->string('agent_tzone');
-			$table->string('daylight_save');
-			$table->string('limit_access');
-			$table->string('directory_listing');
-			$table->string('vacation_mode');
-			$table->string('company');
-			$table->string('role');
-			$table->string('internal_note');
-			$table->string('profile_pic');
-			$table->string('remember_token', 100)->nullable();
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('users');
-	}
+class CreateUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('users', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('user_name');
+            $table->string('first_name');
+            $table->string('last_name');
+            $table->boolean('gender');
+            $table->string('email')->unique();
+            $table->boolean('ban');
+            $table->string('password', 60);
+            $table->integer('active');
+            $table->string('ext');
+            $table->string('phone_number');
+            $table->string('mobile');
+            $table->text('agent_sign', 65535);
+            $table->string('account_type');
+            $table->string('account_status');
+            $table->integer('assign_group')->unsigned()->nullable()->index('assign_group_3');
+            $table->integer('primary_dpt')->unsigned()->nullable()->index('primary_dpt_2');
+            $table->string('agent_tzone');
+            $table->string('daylight_save');
+            $table->string('limit_access');
+            $table->string('directory_listing');
+            $table->string('vacation_mode');
+            $table->string('company');
+            $table->string('role');
+            $table->string('internal_note');
+            $table->string('profile_pic');
+            $table->string('remember_token', 100)->nullable();
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('users');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_version_check_table.php b/database/migrations/2016_02_16_140450_create_version_check_table.php
index 6ecd50ae9..b008d36b1 100644
--- a/database/migrations/2016_02_16_140450_create_version_check_table.php
+++ b/database/migrations/2016_02_16_140450_create_version_check_table.php
@@ -3,33 +3,30 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateVersionCheckTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('version_check', function(Blueprint $table)
-		{
-			$table->increments('id');
-			$table->string('current_version');
-			$table->string('new_version');
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('version_check');
-	}
+class CreateVersionCheckTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('version_check', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('current_version');
+            $table->string('new_version');
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('version_check');
+    }
 }
diff --git a/database/migrations/2016_02_16_140450_create_widgets_table.php b/database/migrations/2016_02_16_140450_create_widgets_table.php
index 8bf54996a..b895285f8 100644
--- a/database/migrations/2016_02_16_140450_create_widgets_table.php
+++ b/database/migrations/2016_02_16_140450_create_widgets_table.php
@@ -3,34 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateWidgetsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('widgets', function(Blueprint $table)
-		{
-			$table->integer('id', true);
-			$table->string('name', 30)->nullable();
-			$table->string('title', 50)->nullable();
-			$table->text('value', 65535)->nullable();
-			$table->timestamps();
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('widgets');
-	}
+class CreateWidgetsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('widgets', function (Blueprint $table) {
+            $table->integer('id', true);
+            $table->string('name', 30)->nullable();
+            $table->string('title', 50)->nullable();
+            $table->text('value', 65535)->nullable();
+            $table->timestamps();
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('widgets');
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_canned_response_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_canned_response_table.php
index 26e13693a..2ad9df00f 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_canned_response_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_canned_response_table.php
@@ -3,33 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToCannedResponseTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('canned_response', function(Blueprint $table)
-		{
-			$table->foreign('user_id', 'canned_response_ibfk_1')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('NO ACTION');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('canned_response', function(Blueprint $table)
-		{
-			$table->dropForeign('canned_response_ibfk_1');
-		});
-	}
+class AddForeignKeysToCannedResponseTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('canned_response', function (Blueprint $table) {
+            $table->foreign('user_id', 'canned_response_ibfk_1')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('NO ACTION');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('canned_response', function (Blueprint $table) {
+            $table->dropForeign('canned_response_ibfk_1');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_department_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_department_table.php
index 8a17915a8..4c8b3a07b 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_department_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_department_table.php
@@ -3,35 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToDepartmentTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('department', function(Blueprint $table)
-		{
-			$table->foreign('sla', 'department_ibfk_1')->references('id')->on('sla_plan')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('manager', 'department_ibfk_2')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('department', function(Blueprint $table)
-		{
-			$table->dropForeign('department_ibfk_1');
-			$table->dropForeign('department_ibfk_2');
-		});
-	}
+class AddForeignKeysToDepartmentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('department', function (Blueprint $table) {
+            $table->foreign('sla', 'department_ibfk_1')->references('id')->on('sla_plan')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('manager', 'department_ibfk_2')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('department', function (Blueprint $table) {
+            $table->dropForeign('department_ibfk_1');
+            $table->dropForeign('department_ibfk_2');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_emails_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_emails_table.php
index f75388154..343ec740b 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_emails_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_emails_table.php
@@ -3,37 +3,33 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToEmailsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('emails', function(Blueprint $table)
-		{
-			$table->foreign('department', 'emails_ibfk_1')->references('id')->on('department')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('priority', 'emails_ibfk_2')->references('priority_id')->on('ticket_priority')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('help_topic', 'emails_ibfk_3')->references('id')->on('help_topic')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('emails', function(Blueprint $table)
-		{
-			$table->dropForeign('emails_ibfk_1');
-			$table->dropForeign('emails_ibfk_2');
-			$table->dropForeign('emails_ibfk_3');
-		});
-	}
+class AddForeignKeysToEmailsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('emails', function (Blueprint $table) {
+            $table->foreign('department', 'emails_ibfk_1')->references('id')->on('department')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('priority', 'emails_ibfk_2')->references('priority_id')->on('ticket_priority')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('help_topic', 'emails_ibfk_3')->references('id')->on('help_topic')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('emails', function (Blueprint $table) {
+            $table->dropForeign('emails_ibfk_1');
+            $table->dropForeign('emails_ibfk_2');
+            $table->dropForeign('emails_ibfk_3');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_group_assign_department_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_group_assign_department_table.php
index 63193fb6e..3b083505a 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_group_assign_department_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_group_assign_department_table.php
@@ -3,35 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToGroupAssignDepartmentTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('group_assign_department', function(Blueprint $table)
-		{
-			$table->foreign('group_id', 'group_assign_department_ibfk_1')->references('id')->on('groups')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('department_id', 'group_assign_department_ibfk_2')->references('id')->on('department')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('group_assign_department', function(Blueprint $table)
-		{
-			$table->dropForeign('group_assign_department_ibfk_1');
-			$table->dropForeign('group_assign_department_ibfk_2');
-		});
-	}
+class AddForeignKeysToGroupAssignDepartmentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('group_assign_department', function (Blueprint $table) {
+            $table->foreign('group_id', 'group_assign_department_ibfk_1')->references('id')->on('groups')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('department_id', 'group_assign_department_ibfk_2')->references('id')->on('department')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('group_assign_department', function (Blueprint $table) {
+            $table->dropForeign('group_assign_department_ibfk_1');
+            $table->dropForeign('group_assign_department_ibfk_2');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_help_topic_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_help_topic_table.php
index 34773f0f0..b958a0a58 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_help_topic_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_help_topic_table.php
@@ -3,43 +3,39 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToHelpTopicTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('help_topic', function(Blueprint $table)
-		{
-			$table->foreign('custom_form', 'help_topic_ibfk_1')->references('id')->on('custom_forms')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('department', 'help_topic_ibfk_2')->references('id')->on('department')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('ticket_status', 'help_topic_ibfk_3')->references('id')->on('ticket_status')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('priority', 'help_topic_ibfk_4')->references('priority_id')->on('ticket_priority')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('sla_plan', 'help_topic_ibfk_5')->references('id')->on('sla_plan')->onUpdate('RESTRICT')->onDelete('RESTRICT');
-			$table->foreign('auto_assign', 'help_topic_ibfk_6')->references('id')->on('users')->onUpdate('RESTRICT')->onDelete('SET NULL');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('help_topic', function(Blueprint $table)
-		{
-			$table->dropForeign('help_topic_ibfk_1');
-			$table->dropForeign('help_topic_ibfk_2');
-			$table->dropForeign('help_topic_ibfk_3');
-			$table->dropForeign('help_topic_ibfk_4');
-			$table->dropForeign('help_topic_ibfk_5');
-			$table->dropForeign('help_topic_ibfk_6');
-		});
-	}
+class AddForeignKeysToHelpTopicTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('help_topic', function (Blueprint $table) {
+            $table->foreign('custom_form', 'help_topic_ibfk_1')->references('id')->on('custom_forms')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('department', 'help_topic_ibfk_2')->references('id')->on('department')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('ticket_status', 'help_topic_ibfk_3')->references('id')->on('ticket_status')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('priority', 'help_topic_ibfk_4')->references('priority_id')->on('ticket_priority')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('sla_plan', 'help_topic_ibfk_5')->references('id')->on('sla_plan')->onUpdate('RESTRICT')->onDelete('RESTRICT');
+            $table->foreign('auto_assign', 'help_topic_ibfk_6')->references('id')->on('users')->onUpdate('RESTRICT')->onDelete('SET NULL');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('help_topic', function (Blueprint $table) {
+            $table->dropForeign('help_topic_ibfk_1');
+            $table->dropForeign('help_topic_ibfk_2');
+            $table->dropForeign('help_topic_ibfk_3');
+            $table->dropForeign('help_topic_ibfk_4');
+            $table->dropForeign('help_topic_ibfk_5');
+            $table->dropForeign('help_topic_ibfk_6');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_kb_article_relationship_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_kb_article_relationship_table.php
index d8390609d..ccb8c62c0 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_kb_article_relationship_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_kb_article_relationship_table.php
@@ -3,35 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToKbArticleRelationshipTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('kb_article_relationship', function(Blueprint $table)
-		{
-			$table->foreign('article_id', 'article_relationship_article_id_foreign')->references('id')->on('kb_article')->onUpdate('RESTRICT')->onDelete('RESTRICT');
-			$table->foreign('category_id', 'article_relationship_category_id_foreign')->references('id')->on('kb_category')->onUpdate('RESTRICT')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('kb_article_relationship', function(Blueprint $table)
-		{
-			$table->dropForeign('article_relationship_article_id_foreign');
-			$table->dropForeign('article_relationship_category_id_foreign');
-		});
-	}
+class AddForeignKeysToKbArticleRelationshipTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('kb_article_relationship', function (Blueprint $table) {
+            $table->foreign('article_id', 'article_relationship_article_id_foreign')->references('id')->on('kb_article')->onUpdate('RESTRICT')->onDelete('RESTRICT');
+            $table->foreign('category_id', 'article_relationship_category_id_foreign')->references('id')->on('kb_category')->onUpdate('RESTRICT')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('kb_article_relationship', function (Blueprint $table) {
+            $table->dropForeign('article_relationship_article_id_foreign');
+            $table->dropForeign('article_relationship_category_id_foreign');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_kb_comment_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_kb_comment_table.php
index f8f1409ba..6b6acb2c7 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_kb_comment_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_kb_comment_table.php
@@ -3,33 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToKbCommentTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('kb_comment', function(Blueprint $table)
-		{
-			$table->foreign('article_id', 'comment_article_id_foreign')->references('id')->on('kb_article')->onUpdate('RESTRICT')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('kb_comment', function(Blueprint $table)
-		{
-			$table->dropForeign('comment_article_id_foreign');
-		});
-	}
+class AddForeignKeysToKbCommentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('kb_comment', function (Blueprint $table) {
+            $table->foreign('article_id', 'comment_article_id_foreign')->references('id')->on('kb_article')->onUpdate('RESTRICT')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('kb_comment', function (Blueprint $table) {
+            $table->dropForeign('comment_article_id_foreign');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_organization_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_organization_table.php
index 577737b7a..182098b66 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_organization_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_organization_table.php
@@ -3,33 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToOrganizationTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('organization', function(Blueprint $table)
-		{
-			$table->foreign('head', 'organization_ibfk_1')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('NO ACTION');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('organization', function(Blueprint $table)
-		{
-			$table->dropForeign('organization_ibfk_1');
-		});
-	}
+class AddForeignKeysToOrganizationTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('organization', function (Blueprint $table) {
+            $table->foreign('head', 'organization_ibfk_1')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('NO ACTION');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('organization', function (Blueprint $table) {
+            $table->dropForeign('organization_ibfk_1');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_settings_system_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_settings_system_table.php
index 79f7a162e..abefcef7a 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_settings_system_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_settings_system_table.php
@@ -3,39 +3,35 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToSettingsSystemTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('settings_system', function(Blueprint $table)
-		{
-			$table->foreign('time_zone', 'settings_system_ibfk_1')->references('id')->on('timezone')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('time_farmat', 'settings_system_ibfk_2')->references('id')->on('time_format')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('date_format', 'settings_system_ibfk_3')->references('id')->on('date_format')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('date_time_format', 'settings_system_ibfk_4')->references('id')->on('date_time_format')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('settings_system', function(Blueprint $table)
-		{
-			$table->dropForeign('settings_system_ibfk_1');
-			$table->dropForeign('settings_system_ibfk_2');
-			$table->dropForeign('settings_system_ibfk_3');
-			$table->dropForeign('settings_system_ibfk_4');
-		});
-	}
+class AddForeignKeysToSettingsSystemTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings_system', function (Blueprint $table) {
+            $table->foreign('time_zone', 'settings_system_ibfk_1')->references('id')->on('timezone')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('time_farmat', 'settings_system_ibfk_2')->references('id')->on('time_format')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('date_format', 'settings_system_ibfk_3')->references('id')->on('date_format')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('date_time_format', 'settings_system_ibfk_4')->references('id')->on('date_time_format')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings_system', function (Blueprint $table) {
+            $table->dropForeign('settings_system_ibfk_1');
+            $table->dropForeign('settings_system_ibfk_2');
+            $table->dropForeign('settings_system_ibfk_3');
+            $table->dropForeign('settings_system_ibfk_4');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_team_assign_agent_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_team_assign_agent_table.php
index 94603ea90..07f8d14c5 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_team_assign_agent_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_team_assign_agent_table.php
@@ -3,35 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToTeamAssignAgentTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('team_assign_agent', function(Blueprint $table)
-		{
-			$table->foreign('team_id', 'team_assign_agent_ibfk_1')->references('id')->on('teams')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('agent_id', 'team_assign_agent_ibfk_2')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('team_assign_agent', function(Blueprint $table)
-		{
-			$table->dropForeign('team_assign_agent_ibfk_1');
-			$table->dropForeign('team_assign_agent_ibfk_2');
-		});
-	}
+class AddForeignKeysToTeamAssignAgentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('team_assign_agent', function (Blueprint $table) {
+            $table->foreign('team_id', 'team_assign_agent_ibfk_1')->references('id')->on('teams')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('agent_id', 'team_assign_agent_ibfk_2')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('team_assign_agent', function (Blueprint $table) {
+            $table->dropForeign('team_assign_agent_ibfk_1');
+            $table->dropForeign('team_assign_agent_ibfk_2');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_teams_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_teams_table.php
index d9bc1de73..611e4c168 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_teams_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_teams_table.php
@@ -3,33 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToTeamsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('teams', function(Blueprint $table)
-		{
-			$table->foreign('team_lead', 'teams_ibfk_1')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('teams', function(Blueprint $table)
-		{
-			$table->dropForeign('teams_ibfk_1');
-		});
-	}
+class AddForeignKeysToTeamsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->foreign('team_lead', 'teams_ibfk_1')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->dropForeign('teams_ibfk_1');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_attachment_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_attachment_table.php
index ed630905a..1259974c7 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_attachment_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_attachment_table.php
@@ -3,33 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToTicketAttachmentTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('ticket_attachment', function(Blueprint $table)
-		{
-			$table->foreign('thread_id', 'ticket_attachment_ibfk_1')->references('id')->on('ticket_thread')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('ticket_attachment', function(Blueprint $table)
-		{
-			$table->dropForeign('ticket_attachment_ibfk_1');
-		});
-	}
+class AddForeignKeysToTicketAttachmentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('ticket_attachment', function (Blueprint $table) {
+            $table->foreign('thread_id', 'ticket_attachment_ibfk_1')->references('id')->on('ticket_thread')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('ticket_attachment', function (Blueprint $table) {
+            $table->dropForeign('ticket_attachment_ibfk_1');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_collaborator_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_collaborator_table.php
index 0e333765d..8d3b56861 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_collaborator_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_collaborator_table.php
@@ -3,35 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToTicketCollaboratorTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('ticket_collaborator', function(Blueprint $table)
-		{
-			$table->foreign('ticket_id', 'ticket_collaborator_ibfk_1')->references('id')->on('tickets')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('user_id', 'ticket_collaborator_ibfk_2')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('ticket_collaborator', function(Blueprint $table)
-		{
-			$table->dropForeign('ticket_collaborator_ibfk_1');
-			$table->dropForeign('ticket_collaborator_ibfk_2');
-		});
-	}
+class AddForeignKeysToTicketCollaboratorTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('ticket_collaborator', function (Blueprint $table) {
+            $table->foreign('ticket_id', 'ticket_collaborator_ibfk_1')->references('id')->on('tickets')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('user_id', 'ticket_collaborator_ibfk_2')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('ticket_collaborator', function (Blueprint $table) {
+            $table->dropForeign('ticket_collaborator_ibfk_1');
+            $table->dropForeign('ticket_collaborator_ibfk_2');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_form_data_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_form_data_table.php
index aae4ccd73..3bf92bd85 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_form_data_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_form_data_table.php
@@ -3,33 +3,29 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToTicketFormDataTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('ticket_form_data', function(Blueprint $table)
-		{
-			$table->foreign('ticket_id', 'ticket_form_data_ibfk_1')->references('id')->on('tickets')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('ticket_form_data', function(Blueprint $table)
-		{
-			$table->dropForeign('ticket_form_data_ibfk_1');
-		});
-	}
+class AddForeignKeysToTicketFormDataTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('ticket_form_data', function (Blueprint $table) {
+            $table->foreign('ticket_id', 'ticket_form_data_ibfk_1')->references('id')->on('tickets')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('ticket_form_data', function (Blueprint $table) {
+            $table->dropForeign('ticket_form_data_ibfk_1');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_thread_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_thread_table.php
index 701353ac1..926a00433 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_thread_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_ticket_thread_table.php
@@ -3,37 +3,33 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToTicketThreadTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('ticket_thread', function(Blueprint $table)
-		{
-			$table->foreign('ticket_id', 'ticket_thread_ibfk_1')->references('id')->on('tickets')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('user_id', 'ticket_thread_ibfk_2')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('source', 'ticket_thread_ibfk_3')->references('id')->on('ticket_source')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('ticket_thread', function(Blueprint $table)
-		{
-			$table->dropForeign('ticket_thread_ibfk_1');
-			$table->dropForeign('ticket_thread_ibfk_2');
-			$table->dropForeign('ticket_thread_ibfk_3');
-		});
-	}
+class AddForeignKeysToTicketThreadTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('ticket_thread', function (Blueprint $table) {
+            $table->foreign('ticket_id', 'ticket_thread_ibfk_1')->references('id')->on('tickets')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('user_id', 'ticket_thread_ibfk_2')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('source', 'ticket_thread_ibfk_3')->references('id')->on('ticket_source')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('ticket_thread', function (Blueprint $table) {
+            $table->dropForeign('ticket_thread_ibfk_1');
+            $table->dropForeign('ticket_thread_ibfk_2');
+            $table->dropForeign('ticket_thread_ibfk_3');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_tickets_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_tickets_table.php
index 4c63cbcbb..28c00e3ca 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_tickets_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_tickets_table.php
@@ -3,49 +3,45 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToTicketsTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('tickets', function(Blueprint $table)
-		{
-			$table->foreign('user_id', 'tickets_ibfk_1')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('dept_id', 'tickets_ibfk_2')->references('id')->on('department')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('team_id', 'tickets_ibfk_3')->references('id')->on('teams')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('priority_id', 'tickets_ibfk_4')->references('priority_id')->on('ticket_priority')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('sla', 'tickets_ibfk_5')->references('id')->on('sla_plan')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('help_topic_id', 'tickets_ibfk_6')->references('id')->on('help_topic')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('status', 'tickets_ibfk_7')->references('id')->on('ticket_status')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('source', 'tickets_ibfk_8')->references('id')->on('ticket_source')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('assigned_to', 'tickets_ibfk_9')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('tickets', function(Blueprint $table)
-		{
-			$table->dropForeign('tickets_ibfk_1');
-			$table->dropForeign('tickets_ibfk_2');
-			$table->dropForeign('tickets_ibfk_3');
-			$table->dropForeign('tickets_ibfk_4');
-			$table->dropForeign('tickets_ibfk_5');
-			$table->dropForeign('tickets_ibfk_6');
-			$table->dropForeign('tickets_ibfk_7');
-			$table->dropForeign('tickets_ibfk_8');
-			$table->dropForeign('tickets_ibfk_9');
-		});
-	}
+class AddForeignKeysToTicketsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('tickets', function (Blueprint $table) {
+            $table->foreign('user_id', 'tickets_ibfk_1')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('dept_id', 'tickets_ibfk_2')->references('id')->on('department')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('team_id', 'tickets_ibfk_3')->references('id')->on('teams')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('priority_id', 'tickets_ibfk_4')->references('priority_id')->on('ticket_priority')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('sla', 'tickets_ibfk_5')->references('id')->on('sla_plan')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('help_topic_id', 'tickets_ibfk_6')->references('id')->on('help_topic')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('status', 'tickets_ibfk_7')->references('id')->on('ticket_status')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('source', 'tickets_ibfk_8')->references('id')->on('ticket_source')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('assigned_to', 'tickets_ibfk_9')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('tickets', function (Blueprint $table) {
+            $table->dropForeign('tickets_ibfk_1');
+            $table->dropForeign('tickets_ibfk_2');
+            $table->dropForeign('tickets_ibfk_3');
+            $table->dropForeign('tickets_ibfk_4');
+            $table->dropForeign('tickets_ibfk_5');
+            $table->dropForeign('tickets_ibfk_6');
+            $table->dropForeign('tickets_ibfk_7');
+            $table->dropForeign('tickets_ibfk_8');
+            $table->dropForeign('tickets_ibfk_9');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_user_assign_organization_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_user_assign_organization_table.php
index 3bcd0054e..92ac389bb 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_user_assign_organization_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_user_assign_organization_table.php
@@ -3,35 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToUserAssignOrganizationTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('user_assign_organization', function(Blueprint $table)
-		{
-			$table->foreign('org_id', 'user_assign_organization_ibfk_1')->references('id')->on('organization')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('user_id', 'user_assign_organization_ibfk_2')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('user_assign_organization', function(Blueprint $table)
-		{
-			$table->dropForeign('user_assign_organization_ibfk_1');
-			$table->dropForeign('user_assign_organization_ibfk_2');
-		});
-	}
+class AddForeignKeysToUserAssignOrganizationTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user_assign_organization', function (Blueprint $table) {
+            $table->foreign('org_id', 'user_assign_organization_ibfk_1')->references('id')->on('organization')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('user_id', 'user_assign_organization_ibfk_2')->references('id')->on('users')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user_assign_organization', function (Blueprint $table) {
+            $table->dropForeign('user_assign_organization_ibfk_1');
+            $table->dropForeign('user_assign_organization_ibfk_2');
+        });
+    }
 }
diff --git a/database/migrations/2016_02_16_140454_add_foreign_keys_to_users_table.php b/database/migrations/2016_02_16_140454_add_foreign_keys_to_users_table.php
index 750458fba..81eac92aa 100644
--- a/database/migrations/2016_02_16_140454_add_foreign_keys_to_users_table.php
+++ b/database/migrations/2016_02_16_140454_add_foreign_keys_to_users_table.php
@@ -3,35 +3,31 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddForeignKeysToUsersTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('users', function(Blueprint $table)
-		{
-			$table->foreign('assign_group', 'users_ibfk_1')->references('id')->on('groups')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-			$table->foreign('primary_dpt', 'users_ibfk_2')->references('id')->on('department')->onUpdate('NO ACTION')->onDelete('RESTRICT');
-		});
-	}
-
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('users', function(Blueprint $table)
-		{
-			$table->dropForeign('users_ibfk_1');
-			$table->dropForeign('users_ibfk_2');
-		});
-	}
+class AddForeignKeysToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->foreign('assign_group', 'users_ibfk_1')->references('id')->on('groups')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+            $table->foreign('primary_dpt', 'users_ibfk_2')->references('id')->on('department')->onUpdate('NO ACTION')->onDelete('RESTRICT');
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropForeign('users_ibfk_1');
+            $table->dropForeign('users_ibfk_2');
+        });
+    }
 }
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 472467d12..46a0f5dc3 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -3,39 +3,40 @@
 use App\Model\helpdesk\Agent\Department;
 use App\Model\helpdesk\Agent\Groups;
 use App\Model\helpdesk\Agent\Teams;
+use App\Model\helpdesk\Email\Smtp;
 use App\Model\helpdesk\Manage\Help_topic;
 use App\Model\helpdesk\Manage\Sla_plan;
-use App\Model\helpdesk\Settings\Ticket;
-use App\Model\helpdesk\Ticket\Ticket_Priority;
-use App\Model\helpdesk\Ticket\Ticket_Status;
-use App\Model\helpdesk\Utility\Date_format;
-use App\Model\helpdesk\Utility\Date_time_format;
-use App\Model\helpdesk\Utility\Languages;
-use App\Model\helpdesk\Utility\MailboxProtocol;
-use App\Model\helpdesk\Utility\Timezones;
-use App\Model\helpdesk\Utility\Time_format;
-use Illuminate\Database\Seeder;
 use App\Model\helpdesk\Settings\Alert;
 use App\Model\helpdesk\Settings\Company;
 use App\Model\helpdesk\Settings\Email;
 use App\Model\helpdesk\Settings\Responder;
 use App\Model\helpdesk\Settings\System;
-use App\Model\helpdesk\Ticket\Ticket_source;
-use App\Model\helpdesk\Email\Smtp;
-use App\Model\helpdesk\Utility\Version_Check;
-use App\Model\helpdesk\Utility\Log_notification;
+use App\Model\helpdesk\Settings\Ticket;
 use App\Model\helpdesk\Theme\Widgets;
-// Knowledge base 
+use App\Model\helpdesk\Ticket\Ticket_Priority;
+use App\Model\helpdesk\Ticket\Ticket_source;
+use App\Model\helpdesk\Ticket\Ticket_Status;
+use App\Model\helpdesk\Utility\Date_format;
+use App\Model\helpdesk\Utility\Date_time_format;
+use App\Model\helpdesk\Utility\Languages;
+use App\Model\helpdesk\Utility\Log_notification;
+use App\Model\helpdesk\Utility\MailboxProtocol;
+use App\Model\helpdesk\Utility\Time_format;
+use App\Model\helpdesk\Utility\Timezones;
+use App\Model\helpdesk\Utility\Version_Check;
 use App\Model\kb\Settings;
+// Knowledge base
+use Illuminate\Database\Seeder;
 
-class DatabaseSeeder extends Seeder {
-
+class DatabaseSeeder extends Seeder
+{
     /**
      * Run the database seeds.
      *
      * @return void
      */
-    public function run() {
+    public function run()
+    {
 
         /* Date time format */
         $date_time_formats = [
@@ -47,7 +48,7 @@ class DatabaseSeeder extends Seeder {
             'm-d-Y H:i:s',
             'Y/m/d H:i:s',
             'Y.m.d H:i:s',
-            'Y-m-d H:i:s'];
+            'Y-m-d H:i:s', ];
 
         foreach ($date_time_formats as $date_time_format) {
             Date_time_format::create(['format' => $date_time_format]);
@@ -62,203 +63,203 @@ class DatabaseSeeder extends Seeder {
             'mm-dd-yyyy',
             'yyyy/mm/dd',
             'yyyy.mm.dd',
-            'yyyy-mm-dd'];
+            'yyyy-mm-dd', ];
 
         foreach ($date_formats as $date_format) {
             Date_format::create(['format' => $date_format]);
         }
         /* Time format */
-        Time_format::create(array('format' => 'H:i:s'));
-        Time_format::create(array('format' => 'H.i.s'));
+        Time_format::create(['format' => 'H:i:s']);
+        Time_format::create(['format' => 'H.i.s']);
         /* Timezone */
         $timezone = ['Pacific/Midway' => '(GMT-11:00) Midway Island',
-            'US/Samoa' => '(GMT-11:00) Samoa',
-            'US/Hawaii' => '(GMT-10:00) Hawaii',
-            'US/Alaska' => '(GMT-09:00) Alaska',
-            'US/Pacific' => '(GMT-08:00) Pacific Time (US &amp; Canada)',
-            'America/Tijuana' => '(GMT-08:00) Tijuana',
-            'US/Arizona' => '(GMT-07:00) Arizona',
-            'US/Mountain' => '(GMT-07:00) Mountain Time (US &amp; Canada)',
-            'America/Chihuahua' => '(GMT-07:00) Chihuahua',
-            'America/Mazatlan' => '(GMT-07:00) Mazatlan',
-            'America/Mexico_City' => '(GMT-06:00) Mexico City',
-            'America/Monterrey' => '(GMT-06:00) Monterrey',
-            'Canada/Saskatchewan' => '(GMT-06:00) Saskatchewan',
-            'US/Central' => '(GMT-06:00) Central Time (US &amp; Canada)',
-            'US/Eastern' => '(GMT-05:00) Eastern Time (US &amp; Canada)',
-            'US/East-Indiana' => '(GMT-05:00) Indiana (East)',
-            'America/Bogota' => '(GMT-05:00) Bogota',
-            'America/Lima' => '(GMT-05:00) Lima',
-            'America/Caracas' => '(GMT-04:30) Caracas',
-            'Canada/Atlantic' => '(GMT-04:00) Atlantic Time (Canada)',
-            'America/La_Paz' => '(GMT-04:00) La Paz',
-            'America/Santiago' => '(GMT-04:00) Santiago',
-            'Canada/Newfoundland' => '(GMT-03:30) Newfoundland',
-            'America/Buenos_Aires' => '(GMT-03:00) Buenos Aires',
-            'Greenland' => '(GMT-03:00) Greenland',
-            'Atlantic/Stanley' => '(GMT-02:00) Stanley',
-            'Atlantic/Azores' => '(GMT-01:00) Azores',
-            'Atlantic/Cape_Verde' => '(GMT-01:00) Cape Verde Is.',
-            'Africa/Casablanca' => '(GMT) Casablanca',
-            'Europe/Dublin' => '(GMT) Dublin',
-            'Europe/Lisbon' => '(GMT) Lisbon',
-            'Europe/London' => '(GMT) London',
-            'Africa/Monrovia' => '(GMT) Monrovia',
-            'Europe/Amsterdam' => '(GMT+01:00) Amsterdam',
-            'Europe/Belgrade' => '(GMT+01:00) Belgrade',
-            'Europe/Berlin' => '(GMT+01:00) Berlin',
-            'Europe/Bratislava' => '(GMT+01:00) Bratislava',
-            'Europe/Brussels' => '(GMT+01:00) Brussels',
-            'Europe/Budapest' => '(GMT+01:00) Budapest',
-            'Europe/Copenhagen' => '(GMT+01:00) Copenhagen',
-            'Europe/Ljubljana' => '(GMT+01:00) Ljubljana',
-            'Europe/Madrid' => '(GMT+01:00) Madrid',
-            'Europe/Paris' => '(GMT+01:00) Paris',
-            'Europe/Prague' => '(GMT+01:00) Prague',
-            'Europe/Rome' => '(GMT+01:00) Rome',
-            'Europe/Sarajevo' => '(GMT+01:00) Sarajevo',
-            'Europe/Skopje' => '(GMT+01:00) Skopje',
-            'Europe/Stockholm' => '(GMT+01:00) Stockholm',
-            'Europe/Vienna' => '(GMT+01:00) Vienna',
-            'Europe/Warsaw' => '(GMT+01:00) Warsaw',
-            'Europe/Zagreb' => '(GMT+01:00) Zagreb',
-            'Europe/Athens' => '(GMT+02:00) Athens',
-            'Europe/Bucharest' => '(GMT+02:00) Bucharest',
-            'Africa/Cairo' => '(GMT+02:00) Cairo',
-            'Africa/Harare' => '(GMT+02:00) Harare',
-            'Europe/Helsinki' => '(GMT+02:00) Helsinki',
-            'Europe/Istanbul' => '(GMT+02:00) Istanbul',
-            'Asia/Jerusalem' => '(GMT+02:00) Jerusalem',
-            'Europe/Kiev' => '(GMT+02:00) Kyiv',
-            'Europe/Minsk' => '(GMT+02:00) Minsk',
-            'Europe/Riga' => '(GMT+02:00) Riga',
-            'Europe/Sofia' => '(GMT+02:00) Sofia',
-            'Europe/Tallinn' => '(GMT+02:00) Tallinn',
-            'Europe/Vilnius' => '(GMT+02:00) Vilnius',
-            'Asia/Baghdad' => '(GMT+03:00) Baghdad',
-            'Asia/Kuwait' => '(GMT+03:00) Kuwait',
-            'Africa/Nairobi' => '(GMT+03:00) Nairobi',
-            'Asia/Riyadh' => '(GMT+03:00) Riyadh',
-            'Asia/Tehran' => '(GMT+03:30) Tehran',
-            'Europe/Moscow' => '(GMT+04:00) Moscow',
-            'Asia/Baku' => '(GMT+04:00) Baku',
-            'Europe/Volgograd' => '(GMT+04:00) Volgograd',
-            'Asia/Muscat' => '(GMT+04:00) Muscat',
-            'Asia/Tbilisi' => '(GMT+04:00) Tbilisi',
-            'Asia/Yerevan' => '(GMT+04:00) Yerevan',
-            'Asia/Kabul' => '(GMT+04:30) Kabul',
-            'Asia/Karachi' => '(GMT+05:00) Karachi',
-            'Asia/Tashkent' => '(GMT+05:00) Tashkent',
-            'Asia/Kolkata' => '(GMT+05:30) Kolkata',
-            'Asia/Kathmandu' => '(GMT+05:45) Kathmandu',
-            'Asia/Yekaterinburg' => '(GMT+06:00) Ekaterinburg',
-            'Asia/Almaty' => '(GMT+06:00) Almaty',
-            'Asia/Dhaka' => '(GMT+06:00) Dhaka',
-            'Asia/Novosibirsk' => '(GMT+07:00) Novosibirsk',
-            'Asia/Bangkok' => '(GMT+07:00) Bangkok',
-            'Asia/Ho_Chi_Minh' => '(GMT+07.00) Ho Chi Minh',
-            'Asia/Jakarta' => '(GMT+07:00) Jakarta',
-            'Asia/Krasnoyarsk' => '(GMT+08:00) Krasnoyarsk',
-            'Asia/Chongqing' => '(GMT+08:00) Chongqing',
-            'Asia/Hong_Kong' => '(GMT+08:00) Hong Kong',
-            'Asia/Kuala_Lumpur' => '(GMT+08:00) Kuala Lumpur',
-            'Australia/Perth' => '(GMT+08:00) Perth',
-            'Asia/Singapore' => '(GMT+08:00) Singapore',
-            'Asia/Taipei' => '(GMT+08:00) Taipei',
-            'Asia/Ulaanbaatar' => '(GMT+08:00) Ulaan Bataar',
-            'Asia/Urumqi' => '(GMT+08:00) Urumqi',
-            'Asia/Irkutsk' => '(GMT+09:00) Irkutsk',
-            'Asia/Seoul' => '(GMT+09:00) Seoul',
-            'Asia/Tokyo' => '(GMT+09:00) Tokyo',
-            'Australia/Adelaide' => '(GMT+09:30) Adelaide',
-            'Australia/Darwin' => '(GMT+09:30) Darwin',
-            'Asia/Yakutsk' => '(GMT+10:00) Yakutsk',
-            'Australia/Brisbane' => '(GMT+10:00) Brisbane',
-            'Australia/Canberra' => '(GMT+10:00) Canberra',
-            'Pacific/Guam' => '(GMT+10:00) Guam',
-            'Australia/Hobart' => '(GMT+10:00) Hobart',
-            'Australia/Melbourne' => '(GMT+10:00) Melbourne',
-            'Pacific/Port_Moresby' => '(GMT+10:00) Port Moresby',
-            'Australia/Sydney' => '(GMT+10:00) Sydney',
-            'Asia/Vladivostok' => '(GMT+11:00) Vladivostok',
-            'Asia/Magadan' => '(GMT+12:00) Magadan',
-            'Pacific/Auckland' => '(GMT+12:00) Auckland',
-            'Pacific/Fiji' => '(GMT+12:00) Fiji'];
+            'US/Samoa'                => '(GMT-11:00) Samoa',
+            'US/Hawaii'               => '(GMT-10:00) Hawaii',
+            'US/Alaska'               => '(GMT-09:00) Alaska',
+            'US/Pacific'              => '(GMT-08:00) Pacific Time (US &amp; Canada)',
+            'America/Tijuana'         => '(GMT-08:00) Tijuana',
+            'US/Arizona'              => '(GMT-07:00) Arizona',
+            'US/Mountain'             => '(GMT-07:00) Mountain Time (US &amp; Canada)',
+            'America/Chihuahua'       => '(GMT-07:00) Chihuahua',
+            'America/Mazatlan'        => '(GMT-07:00) Mazatlan',
+            'America/Mexico_City'     => '(GMT-06:00) Mexico City',
+            'America/Monterrey'       => '(GMT-06:00) Monterrey',
+            'Canada/Saskatchewan'     => '(GMT-06:00) Saskatchewan',
+            'US/Central'              => '(GMT-06:00) Central Time (US &amp; Canada)',
+            'US/Eastern'              => '(GMT-05:00) Eastern Time (US &amp; Canada)',
+            'US/East-Indiana'         => '(GMT-05:00) Indiana (East)',
+            'America/Bogota'          => '(GMT-05:00) Bogota',
+            'America/Lima'            => '(GMT-05:00) Lima',
+            'America/Caracas'         => '(GMT-04:30) Caracas',
+            'Canada/Atlantic'         => '(GMT-04:00) Atlantic Time (Canada)',
+            'America/La_Paz'          => '(GMT-04:00) La Paz',
+            'America/Santiago'        => '(GMT-04:00) Santiago',
+            'Canada/Newfoundland'     => '(GMT-03:30) Newfoundland',
+            'America/Buenos_Aires'    => '(GMT-03:00) Buenos Aires',
+            'Greenland'               => '(GMT-03:00) Greenland',
+            'Atlantic/Stanley'        => '(GMT-02:00) Stanley',
+            'Atlantic/Azores'         => '(GMT-01:00) Azores',
+            'Atlantic/Cape_Verde'     => '(GMT-01:00) Cape Verde Is.',
+            'Africa/Casablanca'       => '(GMT) Casablanca',
+            'Europe/Dublin'           => '(GMT) Dublin',
+            'Europe/Lisbon'           => '(GMT) Lisbon',
+            'Europe/London'           => '(GMT) London',
+            'Africa/Monrovia'         => '(GMT) Monrovia',
+            'Europe/Amsterdam'        => '(GMT+01:00) Amsterdam',
+            'Europe/Belgrade'         => '(GMT+01:00) Belgrade',
+            'Europe/Berlin'           => '(GMT+01:00) Berlin',
+            'Europe/Bratislava'       => '(GMT+01:00) Bratislava',
+            'Europe/Brussels'         => '(GMT+01:00) Brussels',
+            'Europe/Budapest'         => '(GMT+01:00) Budapest',
+            'Europe/Copenhagen'       => '(GMT+01:00) Copenhagen',
+            'Europe/Ljubljana'        => '(GMT+01:00) Ljubljana',
+            'Europe/Madrid'           => '(GMT+01:00) Madrid',
+            'Europe/Paris'            => '(GMT+01:00) Paris',
+            'Europe/Prague'           => '(GMT+01:00) Prague',
+            'Europe/Rome'             => '(GMT+01:00) Rome',
+            'Europe/Sarajevo'         => '(GMT+01:00) Sarajevo',
+            'Europe/Skopje'           => '(GMT+01:00) Skopje',
+            'Europe/Stockholm'        => '(GMT+01:00) Stockholm',
+            'Europe/Vienna'           => '(GMT+01:00) Vienna',
+            'Europe/Warsaw'           => '(GMT+01:00) Warsaw',
+            'Europe/Zagreb'           => '(GMT+01:00) Zagreb',
+            'Europe/Athens'           => '(GMT+02:00) Athens',
+            'Europe/Bucharest'        => '(GMT+02:00) Bucharest',
+            'Africa/Cairo'            => '(GMT+02:00) Cairo',
+            'Africa/Harare'           => '(GMT+02:00) Harare',
+            'Europe/Helsinki'         => '(GMT+02:00) Helsinki',
+            'Europe/Istanbul'         => '(GMT+02:00) Istanbul',
+            'Asia/Jerusalem'          => '(GMT+02:00) Jerusalem',
+            'Europe/Kiev'             => '(GMT+02:00) Kyiv',
+            'Europe/Minsk'            => '(GMT+02:00) Minsk',
+            'Europe/Riga'             => '(GMT+02:00) Riga',
+            'Europe/Sofia'            => '(GMT+02:00) Sofia',
+            'Europe/Tallinn'          => '(GMT+02:00) Tallinn',
+            'Europe/Vilnius'          => '(GMT+02:00) Vilnius',
+            'Asia/Baghdad'            => '(GMT+03:00) Baghdad',
+            'Asia/Kuwait'             => '(GMT+03:00) Kuwait',
+            'Africa/Nairobi'          => '(GMT+03:00) Nairobi',
+            'Asia/Riyadh'             => '(GMT+03:00) Riyadh',
+            'Asia/Tehran'             => '(GMT+03:30) Tehran',
+            'Europe/Moscow'           => '(GMT+04:00) Moscow',
+            'Asia/Baku'               => '(GMT+04:00) Baku',
+            'Europe/Volgograd'        => '(GMT+04:00) Volgograd',
+            'Asia/Muscat'             => '(GMT+04:00) Muscat',
+            'Asia/Tbilisi'            => '(GMT+04:00) Tbilisi',
+            'Asia/Yerevan'            => '(GMT+04:00) Yerevan',
+            'Asia/Kabul'              => '(GMT+04:30) Kabul',
+            'Asia/Karachi'            => '(GMT+05:00) Karachi',
+            'Asia/Tashkent'           => '(GMT+05:00) Tashkent',
+            'Asia/Kolkata'            => '(GMT+05:30) Kolkata',
+            'Asia/Kathmandu'          => '(GMT+05:45) Kathmandu',
+            'Asia/Yekaterinburg'      => '(GMT+06:00) Ekaterinburg',
+            'Asia/Almaty'             => '(GMT+06:00) Almaty',
+            'Asia/Dhaka'              => '(GMT+06:00) Dhaka',
+            'Asia/Novosibirsk'        => '(GMT+07:00) Novosibirsk',
+            'Asia/Bangkok'            => '(GMT+07:00) Bangkok',
+            'Asia/Ho_Chi_Minh'        => '(GMT+07.00) Ho Chi Minh',
+            'Asia/Jakarta'            => '(GMT+07:00) Jakarta',
+            'Asia/Krasnoyarsk'        => '(GMT+08:00) Krasnoyarsk',
+            'Asia/Chongqing'          => '(GMT+08:00) Chongqing',
+            'Asia/Hong_Kong'          => '(GMT+08:00) Hong Kong',
+            'Asia/Kuala_Lumpur'       => '(GMT+08:00) Kuala Lumpur',
+            'Australia/Perth'         => '(GMT+08:00) Perth',
+            'Asia/Singapore'          => '(GMT+08:00) Singapore',
+            'Asia/Taipei'             => '(GMT+08:00) Taipei',
+            'Asia/Ulaanbaatar'        => '(GMT+08:00) Ulaan Bataar',
+            'Asia/Urumqi'             => '(GMT+08:00) Urumqi',
+            'Asia/Irkutsk'            => '(GMT+09:00) Irkutsk',
+            'Asia/Seoul'              => '(GMT+09:00) Seoul',
+            'Asia/Tokyo'              => '(GMT+09:00) Tokyo',
+            'Australia/Adelaide'      => '(GMT+09:30) Adelaide',
+            'Australia/Darwin'        => '(GMT+09:30) Darwin',
+            'Asia/Yakutsk'            => '(GMT+10:00) Yakutsk',
+            'Australia/Brisbane'      => '(GMT+10:00) Brisbane',
+            'Australia/Canberra'      => '(GMT+10:00) Canberra',
+            'Pacific/Guam'            => '(GMT+10:00) Guam',
+            'Australia/Hobart'        => '(GMT+10:00) Hobart',
+            'Australia/Melbourne'     => '(GMT+10:00) Melbourne',
+            'Pacific/Port_Moresby'    => '(GMT+10:00) Port Moresby',
+            'Australia/Sydney'        => '(GMT+10:00) Sydney',
+            'Asia/Vladivostok'        => '(GMT+11:00) Vladivostok',
+            'Asia/Magadan'            => '(GMT+12:00) Magadan',
+            'Pacific/Auckland'        => '(GMT+12:00) Auckland',
+            'Pacific/Fiji'            => '(GMT+12:00) Fiji', ];
 
         foreach ($timezone as $name => $location) {
-            Timezones::create(array('name' => $name, 'location' => $location));
+            Timezones::create(['name' => $name, 'location' => $location]);
         }
         /* Ticket status */
-        Ticket_status::create(array('name' => 'Open', 'state' => 'open', 'mode' => '3', 'message' => 'Ticket have been Reopened by', 'flags' => '0', 'sort' => '1', 'properties' => 'Open tickets.'));
-        Ticket_status::create(array('name' => 'Resolved', 'state' => 'closed', 'mode' => '1', 'message' => 'Ticket have been Resolved by', 'flags' => '0', 'sort' => '2', 'properties' => 'Resolved tickets.'));
-        Ticket_status::create(array('name' => 'Closed', 'state' => 'closed', 'mode' => '3', 'message' => 'Ticket have been Closed by', 'flags' => '0', 'sort' => '3', 'properties' => 'Closed tickets. Tickets will still be accessible on client and staff panels.'));
-        Ticket_status::create(array('name' => 'Archived', 'state' => 'archived', 'mode' => '3', 'message' => 'Ticket have been Archived by', 'flags' => '0', 'sort' => '4', 'properties' => 'Tickets only adminstratively available but no longer accessible on ticket queues and client panel.'));
-        Ticket_status::create(array('name' => 'Deleted', 'state' => 'deleted', 'mode' => '3', 'message' => 'Ticket have been Deleted by', 'flags' => '0', 'sort' => '5', 'properties' => 'Tickets queued for deletion. Not accessible on ticket queues.'));
+        Ticket_status::create(['name' => 'Open', 'state' => 'open', 'mode' => '3', 'message' => 'Ticket have been Reopened by', 'flags' => '0', 'sort' => '1', 'properties' => 'Open tickets.']);
+        Ticket_status::create(['name' => 'Resolved', 'state' => 'closed', 'mode' => '1', 'message' => 'Ticket have been Resolved by', 'flags' => '0', 'sort' => '2', 'properties' => 'Resolved tickets.']);
+        Ticket_status::create(['name' => 'Closed', 'state' => 'closed', 'mode' => '3', 'message' => 'Ticket have been Closed by', 'flags' => '0', 'sort' => '3', 'properties' => 'Closed tickets. Tickets will still be accessible on client and staff panels.']);
+        Ticket_status::create(['name' => 'Archived', 'state' => 'archived', 'mode' => '3', 'message' => 'Ticket have been Archived by', 'flags' => '0', 'sort' => '4', 'properties' => 'Tickets only adminstratively available but no longer accessible on ticket queues and client panel.']);
+        Ticket_status::create(['name' => 'Deleted', 'state' => 'deleted', 'mode' => '3', 'message' => 'Ticket have been Deleted by', 'flags' => '0', 'sort' => '5', 'properties' => 'Tickets queued for deletion. Not accessible on ticket queues.']);
         /* Ticket priority */
-        Ticket_priority::create(array('priority' => 'low', 'priority_desc' => 'Low', 'priority_color' => 'info', 'priority_urgency' => '4', 'ispublic' => '1'));
-        Ticket_priority::create(array('priority' => 'normal', 'priority_desc' => 'Normal', 'priority_color' => 'info', 'priority_urgency' => '3', 'ispublic' => '1'));
-        Ticket_priority::create(array('priority' => 'high', 'priority_desc' => 'High', 'priority_color' => 'warning', 'priority_urgency' => '2', 'ispublic' => '1'));
-        Ticket_priority::create(array('priority' => 'emergency', 'priority_desc' => 'Emergency', 'priority_color' => 'danger', 'priority_urgency' => '1', 'ispublic' => '1'));
+        Ticket_priority::create(['priority' => 'low', 'priority_desc' => 'Low', 'priority_color' => 'info', 'priority_urgency' => '4', 'ispublic' => '1']);
+        Ticket_priority::create(['priority' => 'normal', 'priority_desc' => 'Normal', 'priority_color' => 'info', 'priority_urgency' => '3', 'ispublic' => '1']);
+        Ticket_priority::create(['priority' => 'high', 'priority_desc' => 'High', 'priority_color' => 'warning', 'priority_urgency' => '2', 'ispublic' => '1']);
+        Ticket_priority::create(['priority' => 'emergency', 'priority_desc' => 'Emergency', 'priority_color' => 'danger', 'priority_urgency' => '1', 'ispublic' => '1']);
         /* SLA Plans */
-        Sla_plan::create(array('name' => 'Sla 1', 'grace_period' => '6 Hours', 'status' => '1'));
-        Sla_plan::create(array('name' => 'Sla 2', 'grace_period' => '12 Hours', 'status' => '1'));
-        Sla_plan::create(array('name' => 'Sla 3', 'grace_period' => '24 Hours', 'status' => '1'));
+        Sla_plan::create(['name' => 'Sla 1', 'grace_period' => '6 Hours', 'status' => '1']);
+        Sla_plan::create(['name' => 'Sla 2', 'grace_period' => '12 Hours', 'status' => '1']);
+        Sla_plan::create(['name' => 'Sla 3', 'grace_period' => '24 Hours', 'status' => '1']);
         /* Mailbox protocol */
         $mailbox = [
-            'IMAP' => '/imap',
-            'IMAP+SSL' => '/imap/ssl',
-            'IMAP+TLS' => '/imap/tls',
-            'IMAP+SSL/No-validate' => '/imap/ssl/novalidate-cert'];
+            'IMAP'                 => '/imap',
+            'IMAP+SSL'             => '/imap/ssl',
+            'IMAP+TLS'             => '/imap/tls',
+            'IMAP+SSL/No-validate' => '/imap/ssl/novalidate-cert', ];
 
         foreach ($mailbox as $name => $value) {
             MailboxProtocol::create(['name' => $name, 'value' => $value]);
         }
         /* Languages */
         $languages = [
-            'English' => 'en',
-            'Italian' => 'it',
-            'German' => 'de',
-            'French' => 'fr',
+            'English'              => 'en',
+            'Italian'              => 'it',
+            'German'               => 'de',
+            'French'               => 'fr',
             'Brazilian Portuguese' => 'pt_BR',
-            'Dutch' => 'nl',
-            'Spanish' => 'es',
-            'Norwegian' => 'nb_NO',
-            'Danish' => 'da'];
+            'Dutch'                => 'nl',
+            'Spanish'              => 'es',
+            'Norwegian'            => 'nb_NO',
+            'Danish'               => 'da', ];
 
         foreach ($languages as $language => $locale) {
             Languages::create(['name' => $language, 'locale' => $locale]);
         }
         /* Teams */
-        Teams::create(array('name' => 'Level 1 Support', 'status' => '1'));
-        Teams::create(array('name' => 'Level 2 Support'));
-        Teams::create(array('name' => 'Developer'));
+        Teams::create(['name' => 'Level 1 Support', 'status' => '1']);
+        Teams::create(['name' => 'Level 2 Support']);
+        Teams::create(['name' => 'Developer']);
         /* Groups */
-        Groups::create(array('name' => 'Group A', 'group_status' => '1', 'can_create_ticket' => '1', 'can_edit_ticket' => '1', 'can_post_ticket' => '1', 'can_close_ticket' => '1', 'can_assign_ticket' => '1', 'can_transfer_ticket' => '1', 'can_delete_ticket' => '1', 'can_ban_email' => '1', 'can_manage_canned' => '1', 'can_view_agent_stats' => '1', 'department_access' => '1'));
-        Groups::create(array('name' => 'Group B', 'group_status' => '1', 'can_create_ticket' => '1', 'can_edit_ticket' => '0', 'can_post_ticket' => '0', 'can_close_ticket' => '1', 'can_assign_ticket' => '1', 'can_transfer_ticket' => '1', 'can_delete_ticket' => '1', 'can_ban_email' => '1', 'can_manage_canned' => '1', 'can_view_agent_stats' => '1', 'department_access' => '1'));
-        Groups::create(array('name' => 'Group C', 'group_status' => '1', 'can_create_ticket' => '0', 'can_edit_ticket' => '0', 'can_post_ticket' => '0', 'can_close_ticket' => '1', 'can_assign_ticket' => '0', 'can_transfer_ticket' => '0', 'can_delete_ticket' => '0', 'can_ban_email' => '0', 'can_manage_canned' => '0', 'can_view_agent_stats' => '0', 'department_access' => '0'));
+        Groups::create(['name' => 'Group A', 'group_status' => '1', 'can_create_ticket' => '1', 'can_edit_ticket' => '1', 'can_post_ticket' => '1', 'can_close_ticket' => '1', 'can_assign_ticket' => '1', 'can_transfer_ticket' => '1', 'can_delete_ticket' => '1', 'can_ban_email' => '1', 'can_manage_canned' => '1', 'can_view_agent_stats' => '1', 'department_access' => '1']);
+        Groups::create(['name' => 'Group B', 'group_status' => '1', 'can_create_ticket' => '1', 'can_edit_ticket' => '0', 'can_post_ticket' => '0', 'can_close_ticket' => '1', 'can_assign_ticket' => '1', 'can_transfer_ticket' => '1', 'can_delete_ticket' => '1', 'can_ban_email' => '1', 'can_manage_canned' => '1', 'can_view_agent_stats' => '1', 'department_access' => '1']);
+        Groups::create(['name' => 'Group C', 'group_status' => '1', 'can_create_ticket' => '0', 'can_edit_ticket' => '0', 'can_post_ticket' => '0', 'can_close_ticket' => '1', 'can_assign_ticket' => '0', 'can_transfer_ticket' => '0', 'can_delete_ticket' => '0', 'can_ban_email' => '0', 'can_manage_canned' => '0', 'can_view_agent_stats' => '0', 'department_access' => '0']);
         /* Department */
-        Department::create(array('name' => 'Support', 'sla' => '1'));
-        Department::create(array('name' => 'Sales', 'sla' => '1'));
-        Department::create(array('name' => 'Operation', 'sla' => '1'));
+        Department::create(['name' => 'Support', 'sla' => '1']);
+        Department::create(['name' => 'Sales', 'sla' => '1']);
+        Department::create(['name' => 'Operation', 'sla' => '1']);
         /* Helptopic */
-        help_topic::create(array('topic' => 'Support query', 'department' => '1', 'ticket_status' => '1', 'priority' => '2', 'sla_plan' => '1', 'ticket_num_format' => '1', 'status' => '1', 'type' => '1', 'auto_response' => '0'));
-        help_topic::create(array('topic' => 'Sales query', 'department' => '2', 'ticket_status' => '1', 'priority' => '2', 'sla_plan' => '1', 'ticket_num_format' => '1', 'status' => '0', 'type' => '1', 'auto_response' => '0'));
-        help_topic::create(array('topic' => 'Operational query', 'department' => '3', 'ticket_status' => '1', 'priority' => '2', 'sla_plan' => '1', 'ticket_num_format' => '1', 'status' => '0', 'type' => '1', 'auto_response' => '0'));
+        help_topic::create(['topic' => 'Support query', 'department' => '1', 'ticket_status' => '1', 'priority' => '2', 'sla_plan' => '1', 'ticket_num_format' => '1', 'status' => '1', 'type' => '1', 'auto_response' => '0']);
+        help_topic::create(['topic' => 'Sales query', 'department' => '2', 'ticket_status' => '1', 'priority' => '2', 'sla_plan' => '1', 'ticket_num_format' => '1', 'status' => '0', 'type' => '1', 'auto_response' => '0']);
+        help_topic::create(['topic' => 'Operational query', 'department' => '3', 'ticket_status' => '1', 'priority' => '2', 'sla_plan' => '1', 'ticket_num_format' => '1', 'status' => '0', 'type' => '1', 'auto_response' => '0']);
         /* Daily notification log */
         Log_notification::create(['log' => 'NOT-1']);
         /* System complete settings */
         Alert::create(['id' => '1', 'ticket_status' => '1', 'ticket_admin_email' => '1', 'assignment_status' => '1', 'assignment_assigned_status' => '1', 'assignment_assigned_agent' => '1']);
-        Company::create(array('id' => '1'));
-        Email::create(array('id' => '1', 'template' => 'default', 'email_fetching' => '1', 'notification_cron' => '1', 'all_emails' => '1', 'email_collaborator' => '1', 'attachment' => '1'));
-        Responder::create(array('id' => '1', 'new_ticket' => '1', 'agent_new_ticket' => '1'));
+        Company::create(['id' => '1']);
+        Email::create(['id' => '1', 'template' => 'default', 'email_fetching' => '1', 'notification_cron' => '1', 'all_emails' => '1', 'email_collaborator' => '1', 'attachment' => '1']);
+        Responder::create(['id' => '1', 'new_ticket' => '1', 'agent_new_ticket' => '1']);
         // System::create(array('id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32'));
-        Ticket::create(array('num_format' => '#ABCD 1234 1234567', 'num_sequence' => '0', 'collision_avoid' => '2', 'priority' => '1', 'sla' => '2', 'help_topic' => '1', 'status' => '1'));
+        Ticket::create(['num_format' => '#ABCD 1234 1234567', 'num_sequence' => '0', 'collision_avoid' => '2', 'priority' => '1', 'sla' => '2', 'help_topic' => '1', 'status' => '1']);
         /* Ticket source */
-        Ticket_source::create(array('name' => 'web', 'value' => 'Web'));
-        Ticket_source::create(array('name' => 'email', 'value' => 'E-mail'));
-        Ticket_source::create(array('name' => 'agent', 'value' => 'Agent Panel'));
+        Ticket_source::create(['name' => 'web', 'value' => 'Web']);
+        Ticket_source::create(['name' => 'email', 'value' => 'E-mail']);
+        Ticket_source::create(['name' => 'agent', 'value' => 'Agent Panel']);
         /* Mail configuration */
-        Smtp::create(array('id' => '1'));
+        Smtp::create(['id' => '1']);
         /* Version check */
         Version_Check::create(['id' => '1']);
         /* System widgets */
@@ -285,5 +286,4 @@ class DatabaseSeeder extends Seeder {
         /* Knowledge base setting */
         Settings::create(['id' => 'id', 'pagination' => '10']);
     }
-
 }
diff --git a/public/ckeditor/samples/old/assets/posteddata.php b/public/ckeditor/samples/old/assets/posteddata.php
index 1e1406f23..7006ce62f 100644
--- a/public/ckeditor/samples/old/assets/posteddata.php
+++ b/public/ckeditor/samples/old/assets/posteddata.php
@@ -25,24 +25,27 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 		</thead>
 <?php
 
-if (!empty($_POST))
-{
-	foreach ( $_POST as $key => $value )
-	{
-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )
-			continue;
+if (!empty($_POST)) {
+    foreach ($_POST as $key => $value) {
+        if ((!is_string($value) && !is_numeric($value)) || !is_string($key)) {
+            continue;
+        }
 
-		if ( get_magic_quotes_gpc() )
-			$value = htmlspecialchars( stripslashes((string)$value) );
-		else
-			$value = htmlspecialchars( (string)$value );
-?>
+        if (get_magic_quotes_gpc()) {
+            $value = htmlspecialchars(stripslashes((string) $value));
+        } else {
+            $value = htmlspecialchars((string) $value);
+        }
+        ?>
 		<tr>
-			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>
-			<td><pre class="samples"><?php echo $value; ?></pre></td>
+			<th style="vertical-align: top"><?php echo htmlspecialchars((string) $key);
+        ?></th>
+			<td><pre class="samples"><?php echo $value;
+        ?></pre></td>
 		</tr>
 	<?php
-	}
+
+    }
 }
 ?>
 	</table>
diff --git a/public/ckeditor/samples/old/sample_posteddata.php b/public/ckeditor/samples/old/sample_posteddata.php
index e560d204e..c66bc68a2 100644
--- a/public/ckeditor/samples/old/sample_posteddata.php
+++ b/public/ckeditor/samples/old/sample_posteddata.php
@@ -13,4 +13,4 @@
   For licensing, see LICENSE.md or http://ckeditor.com/license
 -------------------------------------------------------------------------------------------
 
-</pre><div style="display:none"></body> */ include "assets/posteddata.php"; ?>
+</pre><div style="display:none"></body> */ include 'assets/posteddata.php';
diff --git a/public/filemanager/connectors/php/default.config.php b/public/filemanager/connectors/php/default.config.php
index a72da929e..483a0c883 100644
--- a/public/filemanager/connectors/php/default.config.php
+++ b/public/filemanager/connectors/php/default.config.php
@@ -2,7 +2,7 @@
 /**
  *  Filemanager PHP connector
  *  This file should at least declare auth() function 
- *  and instantiate the Filemanager as '$fm'
+ *  and instantiate the Filemanager as '$fm'.
  *  
  *  IMPORTANT : by default Read and Write access is granted to everyone
  *  Copy/paste this file to 'user.config.php' file to implement your own auth() function
@@ -17,8 +17,8 @@
  */
 
 // Laravel init
-require getcwd() . '/../../../../bootstrap/autoload.php';
-$app = require_once getcwd() . '/../../../../bootstrap/app.php';
+require getcwd().'/../../../../bootstrap/autoload.php';
+$app = require_once getcwd().'/../../../../bootstrap/app.php';
 
 $kernel = $app->make('Illuminate\Contracts\Http\Kernel');
 
@@ -31,58 +31,44 @@ $app['session']->driver()->setId($id);
 $app['session']->driver()->start();
 
 // Folder path
-$folderPath = $app->basePath() . '/public/'.config('filemanager.folder_path');     
+$folderPath = $app->basePath().'/public/'.config('filemanager.folder_path');
 
 // Check if user in authentified
-if(!$app['auth']->check()) 
-{
-  $laravelAuth = false;
-} 
-else 
-{
-  // Check if user has all access
-  if($app['auth']->user()->accessMediasAll())
-  {
-    $laravelAuth = true; 
-  } 
-  elseif(method_exists($app['auth']->user(), 'accessMediasFolder'))
-  {
-    // Check if user has access to one folder
-    if($app['auth']->user()->accessMediasFolder())
-    {
-      // Folder name with user id
-      $folderPath .= 'user' . $app['auth']->id();
-      // Create folder if doesn't exist
-      if (!is_dir($folderPath))
-      {
-        mkdir($folderPath); 
-      }  
-      $laravelAuth = true;  
-    } 
-    else
-    {
-      $laravelAuth = false;
-    }    
-  }
-  else
-  {
+if (!$app['auth']->check()) {
     $laravelAuth = false;
-  } 
+} else {
+    // Check if user has all access
+  if ($app['auth']->user()->accessMediasAll()) {
+      $laravelAuth = true;
+  } elseif (method_exists($app['auth']->user(), 'accessMediasFolder')) {
+      // Check if user has access to one folder
+    if ($app['auth']->user()->accessMediasFolder()) {
+        // Folder name with user id
+      $folderPath .= 'user'.$app['auth']->id();
+      // Create folder if doesn't exist
+      if (!is_dir($folderPath)) {
+          mkdir($folderPath);
+      }
+        $laravelAuth = true;
+    } else {
+        $laravelAuth = false;
+    }
+  } else {
+      $laravelAuth = false;
+  }
 }
 
 /**
- *  Check if user is authorized
+ *  Check if user is authorized.
  *  
  *
- *  @return boolean true if access granted, false if no access
+ *  @return bool true if access granted, false if no access
  */
-function auth() 
+function auth()
 {
-  return $GLOBALS['laravelAuth'];
+    return $GLOBALS['laravelAuth'];
 }
 
 $fm = new Filemanager();
 
 $fm->setFileRoot($folderPath);
-
-?>
\ No newline at end of file
diff --git a/public/filemanager/connectors/php/filemanager.class.php b/public/filemanager/connectors/php/filemanager.class.php
index 305b725b1..f532e5fac 100644
--- a/public/filemanager/connectors/php/filemanager.class.php
+++ b/public/filemanager/connectors/php/filemanager.class.php
@@ -1,6 +1,6 @@
 <?php
 /**
- *	Filemanager PHP class
+ *	Filemanager PHP class.
  *
  *	filemanager.class.php
  *	class for the filemanager.php connector
@@ -10,1164 +10,1161 @@
  *	@author		Simon Georget <simon (at) linea21 (dot) com>
  *	@copyright	Authors
  */
-
-class Filemanager {
-
-	protected $config = array();
-	protected $language = array();
-	protected $get = array();
-	protected $post = array();
-	protected $properties = array();
-	protected $item = array();
-	protected $languages = array();
-	protected $allowed_actions = array();
-	protected $root = '';				// Filemanager root folder
-	protected $doc_root = '';		// root folder known by JS : $this->config['options']['fileRoot'] (filepath or '/') or $_SERVER['DOCUMENT_ROOT'] - overwritten by setFileRoot() method
-	protected $dynamic_fileroot = ''; // Only set if setFileRoot() is called. Second part of the path : '/Filemanager/assets/' ( doc_root - $_SERVER['DOCUMENT_ROOT'])
-	protected $path_to_files = ''; // path to FM userfiles folder - automatically computed by the PHP class, something like '/var/www/Filemanager/userfiles'
-	protected $logger = false;
-	protected $logfile = '';
-	protected $cachefolder = '_thumbs/';
-	protected $thumbnail_width = 64;
-	protected $thumbnail_height = 64;
-	protected $separator = 'userfiles'; // @todo fix keep it or not?
-
-	public function __construct($extraConfig = '') {
-		
-		// getting default config file
-		$content = file_get_contents("../../scripts/filemanager.config.js.default");
-		$config_default = json_decode($content, true);
-		
-		// getting user config file
-		if(isset($_REQUEST['config'])) {
-			$this->getvar('config');
-			if (file_exists("../../scripts/" . $_REQUEST['config'])) {
-				$this->__log('Loading ' . basename($this->get['config']) . ' config file.');
-				$content = file_get_contents("../../scripts/" . basename($this->get['config']));
-			} else {
-				$this->__log($this->get['config'] . ' config file does not exists.');
-				$this->error("Given config file (".basename($this->get['config']).") does not exist !");
-			}
-		}	else {
-			$content = file_get_contents("../../scripts/filemanager.config.js");
-		}
-		$config = json_decode($content, true);
-		
-		// Prevent following bug https://github.com/simogeo/Filemanager/issues/398
-		$config_default['security']['uploadRestrictions'] = array();
-		
-		if(!$config) {
-			$this->error("Error parsing the settings file! Please check your JSON syntax.");
-		}
-		$this->config = array_replace_recursive ($config_default, $config);
-
-		// override config options if needed
-		if(!empty($extraConfig)) {
-			$this->setup($extraConfig);
-		}
-		
-		// set logfile path according to system if not set into config file
-		if(!isset($this->config['options']['logfile']))
-			$this->config['options']['logfile'] = sys_get_temp_dir(). '/filemanager.log';
-
-		$this->root = dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR;
-		$this->properties = array(
-				'Date Created'=>null,
-				'Date Modified'=>null,
-				'Height'=>null,
-				'Width'=>null,
-				'Size'=>null
-		);
-
-		// Log actions or not?
-		if ($this->config['options']['logger'] == true ) {
-			if(isset($this->config['options']['logfile'])) {
-				$this->logfile = $this->config['options']['logfile'];
-			}
-			$this->enableLog();
-		}
-
-		// if fileRoot is set manually, $this->doc_root takes fileRoot value
-		// for security check in is_valid_path() method
-		// else it takes $_SERVER['DOCUMENT_ROOT'] default value
-		if ($this->config['options']['fileRoot'] !== false ) {
-			if($this->config['options']['serverRoot'] === true) {
-				$this->doc_root = $_SERVER['DOCUMENT_ROOT'];
-				$this->separator = basename($this->config['options']['fileRoot']);
-				$this->path_to_files = $_SERVER['DOCUMENT_ROOT'] .'/' . $this->config['options']['fileRoot'];
-			} else {
-				$this->doc_root = $this->config['options']['fileRoot'];
-				$this->separator = basename($this->config['options']['fileRoot']);
-				$this->path_to_files = $this->config['options']['fileRoot'];
-			}
-		} else {
-			$this->doc_root = $_SERVER['DOCUMENT_ROOT'];
-			$this->path_to_files = $this->root . $this->separator .'/' ;
-		}
-
-		$this->__log(__METHOD__ . ' $this->root value ' . $this->root);
-		$this->__log(__METHOD__ . ' $this->path_to_files ' . $this->path_to_files);
-		$this->__log(__METHOD__ . ' $this->doc_root value ' . $this->doc_root);
-		$this->__log(__METHOD__ . ' $this->separator value ' . $this->separator);
-
-		$this->setParams();
-		$this->setPermissions();
-		$this->availableLanguages();
-		$this->loadLanguageFile();
-	}
-
-	// $extraconfig should be formatted as json config array.
-	public function setup($extraconfig) {
-
-		// Prevent following bug https://github.com/simogeo/Filemanager/issues/398
-		$config_default['security']['uploadRestrictions'] = array();
-		
-		$this->config = array_replace_recursive($this->config, $extraconfig);
-			
-	}
-
-	// allow Filemanager to be used with dynamic folders
-	public function setFileRoot($path, $mkdir = false) {
-
-		// Paths are bit complex to handle - kind of nightmare actually ....
-		// 3 parts are availables
-		// [1] $this->doc_root. The first part of the path : '/var/www'
-		// [2] $this->dynamic_fileroot. The second part of the path : '/Filemanager/assets/' ( doc_root - $_SERVER['DOCUMENT_ROOT'])
-		// [3] $this->path_to_files or $this->doc_root. The full path : '/var/www/Filemanager/assets/'
-		
-		$path = rtrim($path, '/') . '/';
-		if($this->config['options']['serverRoot'] === true) {
-			$this->doc_root = $_SERVER['DOCUMENT_ROOT']. '/'.  $path; // i.e  '/var/www/'
-		} else {
-			$this->doc_root =  $path; // i.e  '/var/www/'
-		}
-		
-		// necessary for retrieving path when set dynamically with $fm->setFileRoot() method
-		// https://github.com/simogeo/Filemanager/issues/258 @todo to explore deeper
-		$this->dynamic_fileroot = str_replace("//","/",str_replace($_SERVER['DOCUMENT_ROOT'], '', $this->doc_root));
-		$this->path_to_files = $this->doc_root;
-		$this->separator = basename($this->doc_root);
-		
-		// do we create folder ?
-		if($mkdir && !file_exists($this->doc_root)) {
-			mkdir($this->doc_root, 0755, true);
-			$this->__log(__METHOD__ . ' creating  ' . $this->doc_root. ' folder through mkdir()');
-		}
-		
-		$this->__log(__METHOD__ . ' $this->doc_root value overwritten : ' . $this->doc_root);
-		$this->__log(__METHOD__ . ' $this->dynamic_fileroot value ' . $this->dynamic_fileroot);
-		$this->__log(__METHOD__ . ' $this->path_to_files ' . $this->path_to_files);
-		$this->__log(__METHOD__ . ' $this->separator value ' . $this->separator);
-	}
-
-	public function error($string,$textarea=false) {
-		$array = array(
-				'Error'=>$string,
-				'Code'=>'-1',
-				'Properties'=>$this->properties
-		);
-
-		$this->__log( __METHOD__ . ' - error message : ' . $string);
-
-		if($textarea) {
-			echo '<textarea>' . json_encode($array) . '</textarea>';
-		} else {
-			echo json_encode($array);
-		}
-		die();
-	}
-
-	public function lang($string) {
-		if(isset($this->language[$string]) && $this->language[$string]!='') {
-			return $this->language[$string];
-		} else {
-			return 'Language string error on ' . $string;
-		}
-	}
-
-	public function getvar($var, $sanitize = true) {
-		if(!isset($_GET[$var]) || $_GET[$var]=='') {
-			$this->error(sprintf($this->lang('INVALID_VAR'),$var));
-		} else {
-			if($sanitize) {
-				$this->get[$var] = $this->sanitize($_GET[$var]);
-			} else {
-				$this->get[$var] = $_GET[$var];
-			}
-			return true;
-		}
-	}
-	public function postvar($var, $sanitize = true) {
-		if(!isset($_POST[$var]) || ($var != 'content' && $_POST[$var]=='')) {
-			$this->error(sprintf($this->lang('INVALID_VAR'),$var));
-		} else {
-			if($sanitize) {
-				$this->post[$var] = $this->sanitize($_POST[$var]);
-			} else {
-				$this->post[$var] = $_POST[$var];
-			}
-			return true;
-		}
-	}
-
-	public function getinfo() {
-		$this->item = array();
-		$this->item['properties'] = $this->properties;
-		$this->get_file_info('', false);
-		
-		// handle path when set dynamically with $fm->setFileRoot() method
-		if($this->dynamic_fileroot != '') {
-			$path = $this->dynamic_fileroot. $this->get['path'];
-			// $path = str_replace($_SERVER['DOCUMENT_ROOT'], '', $this->path_to_files) . $this->get['path']; // instruction could replace the line above
-			$path = preg_replace('~/+~', '/', $path); // remove multiple slashes
-		} else {
-			$path = $this->get['path'];
-		}
-		
-		$array = array(
-				'Path'=> $path,
-				'Filename'=>$this->item['filename'],
-				'File Type'=>$this->item['filetype'],
-				'Protected'=>$this->item['protected'],
-				'Preview'=>$this->item['preview'],
-				'Properties'=>$this->item['properties'],
-				'Error'=>"",
-				'Code'=>0
-		);
-		return $array;
-	}
-
-	public function getfolder() {
-		$array = array();
-		$filesDir = array();
-
-		$current_path = $this->getFullPath();
-
-
-		if(!$this->is_valid_path($current_path)) {
-			$this->error("No way.");
-		}
-		
-		if(!is_dir($current_path)) {
-			$this->error(sprintf($this->lang('DIRECTORY_NOT_EXIST'),$this->get['path']));
-		}
-		
-		// check if file is readable
-		if(!$this->has_system_permission($current_path, array('r'))) {
-			$this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
-		}
-		
-		if(!$handle = @opendir($current_path)) {
-			$this->error(sprintf($this->lang('UNABLE_TO_OPEN_DIRECTORY'),$this->get['path']));
-		} else {
-			while (false !== ($file = readdir($handle))) {
-				if($file != "." && $file != "..") {
-					array_push($filesDir, $file);
-				}
-			}
-			closedir($handle);
-			
-			// By default
-			// Sorting files by name ('default' or 'NAME_DESC' cases from $this->config['options']['fileSorting']
-			natcasesort($filesDir);
-
-			foreach($filesDir as $file) {
-				
-				if(is_dir($current_path . $file)) {
-					if(!in_array($file, $this->config['exclude']['unallowed_dirs']) && !preg_match( $this->config['exclude']['unallowed_dirs_REGEXP'], $file)) {
-						
-						// check if file is writable and readable
-						if(!$this->has_system_permission($current_path . $file, array('w', 'r'))) {
-							$protected = 1;
-							$previewPath = $this->config['icons']['path'] . 'locked_' . $this->config['icons']['directory'];
-						} else {
-							$protected =0;
-							$previewPath = $this->config['icons']['path'] . $this->config['icons']['directory'];
-						}
-						
-						$array[$this->get['path'] . $file .'/'] = array(
-								'Path'=> $this->get['path'] . $file .'/',
-								'Filename'=>$file,
-								'File Type'=>'dir',
-								'Protected'=>$protected,
-								'Preview'=> $previewPath,
-								'Properties'=>array(
-										'Date Created'=> date($this->config['options']['dateFormat'], filectime($this->getFullPath($this->get['path'] . $file .'/'))),
-										'Date Modified'=> date($this->config['options']['dateFormat'], filemtime($this->getFullPath($this->get['path'] . $file .'/'))),
-										'filemtime'=> filemtime($this->getFullPath($this->get['path'] . $file .'/')),
-										'Height'=>null,
-										'Width'=>null,
-										'Size'=>null
-								),
-								'Error'=>"",
-								'Code'=>0
-						);
-					}
-				} else if (!in_array($file, $this->config['exclude']['unallowed_files'])  && !preg_match( $this->config['exclude']['unallowed_files_REGEXP'], $file)) {
-					$this->item = array();
-					$this->item['properties'] = $this->properties;
-					$this->get_file_info($this->get['path'] . $file, true);
-					
-
-					if(!isset($this->params['type']) || (isset($this->params['type']) && strtolower($this->params['type'])=='images' && in_array(strtolower($this->item['filetype']),array_map('strtolower', $this->config['images']['imagesExt'])))) {
-						if($this->config['upload']['imagesOnly']== false || ($this->config['upload']['imagesOnly']== true && in_array(strtolower($this->item['filetype']),array_map('strtolower', $this->config['images']['imagesExt'])))) {
-							$array[$this->get['path'] . $file] = array(
-									'Path'=>$this->get['path'] . $file,
-									'Filename'=>$this->item['filename'],
-									'File Type'=>$this->item['filetype'],
-									'Protected'=>$this->item['protected'],
-									'Preview'=>$this->item['preview'],
-									'Properties'=>$this->item['properties'],
-									'Error'=>"",
-									'Code'=>0
-							);
-						}
-					}
-				}
-			}
-		}
-		
-		$array = $this->sortFiles($array);
-
-		return $array;
-	}
-	
-	
-	public function editfile() {
-
-		$current_path = $this->getFullPath();
-		
-		// check if file is writable
-		if(!$this->has_system_permission($current_path, array('w'))) {
-			$this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
-		}
-		
-		if(!$this->has_permission('edit') || !$this->is_valid_path($current_path) || !$this->is_editable($current_path)) {
-			$this->error("No way.");
-		}
-
-		$this->__log(__METHOD__ . ' - editing file '. $current_path);
-
-		$content = file_get_contents($current_path);
-		$content = htmlspecialchars($content);
-
-		if($content === false) {
-			$this->error(sprintf($this->lang('ERROR_OPENING_FILE')));
-		}
-
-		$array = array(
-				'Error'=>"",
-				'Code'=>0,
-				'Path'=>$this->get['path'],
-				'Content'=>$this->formatPath($content)
-		);
-		
-		return $array;
-	}
-
-	public function savefile() {
-	
-		$current_path = $this->getFullPath($this->post['path']);
-	
-		if(!$this->has_permission('edit') || !$this->is_valid_path($current_path) || !$this->is_editable($current_path)) {
-			$this->error("No way.");
-		}
-	
-		if(!$this->has_system_permission($current_path, array('w'))) {
-			$this->error(sprintf($this->lang('ERROR_WRITING_PERM')));
-		}
-		
-		$this->__log(__METHOD__ . ' - saving file '. $current_path);
-		
-		$content =  htmlspecialchars_decode($this->post['content']);
-		$r = file_put_contents($current_path, $content, LOCK_EX);
-
-		if(!is_numeric($r)) {
-			$this->error(sprintf($this->lang('ERROR_SAVING_FILE')));
-		}
-	
-		$array = array(
-					'Error'=>"",
-					'Code'=>0,
-					'Path'=>$this->formatPath($this->post['path'])
-			);
-		
-		return $array;
-	}
-
-	public function rename() {
-
-		$suffix='';
-
-		if(substr($this->get['old'],-1,1)=='/') {
-			$this->get['old'] = substr($this->get['old'],0,(strlen($this->get['old'])-1));
-			$suffix='/';
-		}
-		$tmp = explode('/',$this->get['old']);
-		$filename = $tmp[(sizeof($tmp)-1)];
-		$path = str_replace('/' . $filename,'',$this->get['old']);
-
-		$new_file = $this->getFullPath($path . '/' . $this->get['new']). $suffix;
-		$old_file = $this->getFullPath($this->get['old']) . $suffix;
-
-		if(!$this->has_permission('rename') || !$this->is_valid_path($old_file)) {
-			$this->error("No way.");
-		}
-		
-		// check if file is writable
-		if(!$this->has_system_permission($old_file, array('w'))) {
-			$this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
-		}
-		
-		// check if not requesting main FM userfiles folder
-		if($this->is_root_folder($old_file)) {
-			$this->error(sprintf($this->lang('NOT_ALLOWED')));
-		}
-		
-		// For file only - we check if the new given extension is allowed regarding the security Policy settings
-		if(is_file($old_file) && $this->config['security']['allowChangeExtensions'] && !$this->is_allowed_file_type($new_file)) {
-			$this->error(sprintf($this->lang('INVALID_FILE_TYPE')));
-		}
-
-		$this->__log(__METHOD__ . ' - renaming '. $old_file. ' to ' . $new_file);
-
-		if(file_exists ($new_file)) {
-			if($suffix=='/' && is_dir($new_file)) {
-				$this->error(sprintf($this->lang('DIRECTORY_ALREADY_EXISTS'),$this->get['new']));
-			}
-			if($suffix=='' && is_file($new_file)) {
-				$this->error(sprintf($this->lang('FILE_ALREADY_EXISTS'),$this->get['new']));
-			}
-		}
-
-		if(!rename($old_file,$new_file)) {
-			if(is_dir($old_file)) {
-				$this->error(sprintf($this->lang('ERROR_RENAMING_DIRECTORY'),$filename,$this->get['new']));
-			} else {
-				$this->error(sprintf($this->lang('ERROR_RENAMING_FILE'),$filename,$this->get['new']));
-			}
-		}
-		$array = array(
-				'Error'=>"",
-				'Code'=>0,
-				'Old Path'=>$this->formatPath($this->get['old'].$suffix),
-				'Old Name'=>$filename,
-				'New Path'=>$this->formatPath($path . '/' . $this->get['new'].$suffix),
-				'New Name'=>$this->get['new']
-		);
-		return $array;
-	}
-
-	public function move() {
-		
-		// dynamic fileroot dir must be used when enabled
-		if($this->dynamic_fileroot != '') {
-			$rootDir = $this->dynamic_fileroot;
-			//$rootDir = str_replace($_SERVER['DOCUMENT_ROOT'], '', $this->path_to_files); // instruction could replace the line above
-		} else {
-			$rootDir = $this->get['root'];
-		}
-
-		$rootDir = str_replace('//', '/', $rootDir);
-		$oldPath = $this->getFullPath($this->get['old']);
-		
-		// check if file is writable
-		if(!$this->has_system_permission($oldPath, array('w'))) {
-			$this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')),true);
-		}
-		
-		
-		// check if not requesting main FM userfiles folder
-		if($this->is_root_folder($oldPath)) {
-			$this->error(sprintf($this->lang('NOT_ALLOWED')),true);
-		}
-
-		// old path
-		$tmp = explode('/',trim($this->get['old'], '/'));
-		$fileName = array_pop($tmp); // file name or new dir name
-		$path = '/' . implode('/', $tmp) . '/';
-
-		// new path
-		if (substr($this->get['new'], 0, 1) != "/") {
-			// make path relative from old dir
-			$newPath = $path . '/' . $this->get['new'] . '/';
-		} else {
-			$newPath = $rootDir . '/' . $this->get['new'] . '/';
-		}
-
-		$newPath = preg_replace('#/+#', '/', $newPath);
-		$newPath = $this->expandPath($newPath, true);		
-
-		$newRelativePath = str_replace('./', '',$newPath);
-		$newPath = $this->getFullPath($newPath);
-		
-		if(!$this->has_permission('move') || !$this->is_valid_path($oldPath) || !$this->is_valid_path($newPath)) {
-			$this->error("No way.");
-		}
-
-		// check if file already exists
-		if (file_exists($newPath.$fileName)) {
-			if(is_dir($newPath.$fileName)) {
-				$this->error(sprintf($this->lang('DIRECTORY_ALREADY_EXISTS'),rtrim($this->get['new'], '/').'/'.$fileName));
-			} else {
-				$this->error(sprintf($this->lang('FILE_ALREADY_EXISTS'),rtrim($this->get['new'], '/').'/'.$fileName));
-			}
-		}
-
-		// create dir if not exists
-		if (!file_exists($newPath)) {
-			if(!mkdir($newPath,0755, true)) {
-				$this->error(sprintf($this->lang('UNABLE_TO_CREATE_DIRECTORY'),$newPath));
-			}
-		}
-
-		// move
-		$this->__log(__METHOD__ . ' - moving '. $oldPath. ' to directory ' . $newPath);
-
-		if(!rename($oldPath,$newPath . $fileName)) {
-			if(is_dir($oldPath)) {
-				$this->error(sprintf($this->lang('ERROR_RENAMING_DIRECTORY'),$path,$this->get['new']));
-			} else {
-				$this->error(sprintf($this->lang('ERROR_RENAMING_FILE'),$path . $fileName,$this->get['new']));
-			}
-		}
-
-		$array = array(
-				'Error'=>"",
-				'Code'=>0,
-				'Old Path'=>$path,
-				'Old Name'=>$fileName,
-				'New Path'=>$this->formatPath($newRelativePath),
-				'New Name'=>$fileName,
-		);
-		return $array;
-	}
-
-	public function delete() {
-
-		$current_path = $this->getFullPath();
-		$thumbnail_path = $this->get_thumbnail_path($current_path);
-		
-		
-		if(!$this->has_permission('delete') || !$this->is_valid_path($current_path)) {
-			$this->error("No way.");
-		}
-		
-		// check if file is writable
-		if(!$this->has_system_permission($current_path, array('w'))) {
-			$this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
-		}
-		
-		// check if not requesting main FM userfiles folder
-		if($this->is_root_folder($current_path)) {
-			$this->error(sprintf($this->lang('NOT_ALLOWED')));
-		}
-			
-		if(is_dir($current_path)) {
-			
-			$this->unlinkRecursive($current_path);
-			
-			// we remove thumbnails if needed
-			$this->__log(__METHOD__ . ' - deleting thumbnails folder '. $thumbnail_path);
-			$this->unlinkRecursive($thumbnail_path);
-			
-			$array = array(
-					'Error'=>"",
-					'Code'=>0,
-					'Path'=>$this->formatPath($this->get['path'])
-			);
-
-			$this->__log(__METHOD__ . ' - deleting folder '. $current_path);
-			return $array;
-
-		} else if(file_exists($current_path)) {
-			
-			unlink($current_path);
-			
-			// delete thumbail if exists
-			$this->__log(__METHOD__ . ' - deleting thumbnail file '. $thumbnail_path);
-			if(file_exists($thumbnail_path)) unlink($thumbnail_path);
-			
-			$array = array(
-					'Error'=>"",
-					'Code'=>0,
-					'Path'=>$this->formatPath($this->get['path'])
-			);
-
-			$this->__log(__METHOD__ . ' - deleting file '. $current_path);
-			return $array;
-
-		} else {
-			$this->error(sprintf($this->lang('INVALID_DIRECTORY_OR_FILE')));
-		}
-	}
-	
-	public function replace() {
-		
-		$this->setParams();
-
-		if(!isset($_FILES['fileR']) || !is_uploaded_file($_FILES['fileR']['tmp_name'])) {
-			
-			// if fileSize limit set by the user is greater than size allowed in php.ini file, we apply server restrictions
-			// and log a warning into file
-			if($this->config['upload']['fileSizeLimit'] > $this->getMaxUploadFileSize()) {
-				$this->__log(__METHOD__ . ' [WARNING] : file size limit set by user is greater than size allowed in php.ini file : '. $this->config['upload']['fileSizeLimit']. $this->lang('mb') .' > '. $this->getMaxUploadFileSize(). $this->lang('mb'). '.');
-				$this->config['upload']['fileSizeLimit'] = $this->getMaxUploadFileSize();
-				$this->error(sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'),$this->config['upload']['fileSizeLimit'] . $this->lang('mb')),true);
-			}
-			
-			$this->error(sprintf($this->lang('INVALID_FILE_UPLOAD') . ' '. sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'),$this->config['upload']['fileSizeLimit'] . $this->lang('mb'))),true);
-		}
-		// we determine max upload size if not set
-		if($this->config['upload']['fileSizeLimit'] == 'auto') {
-			$this->config['upload']['fileSizeLimit'] = $this->getMaxUploadFileSize();
-		}
-
-		if($_FILES['fileR']['size'] > ($this->config['upload']['fileSizeLimit'] * 1024 * 1024)) {
-			$this->error(sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'),$this->config['upload']['fileSizeLimit'] . $this->lang('mb')),true);
-		}
-		
-		// we check the given file has the same extension as the old one
-		if(strtolower(pathinfo($_FILES['fileR']['name'], PATHINFO_EXTENSION)) != strtolower(pathinfo($this->post['newfilepath'], PATHINFO_EXTENSION))) {
-			$this->error(sprintf($this->lang('ERROR_REPLACING_FILE') . ' '. pathinfo($this->post['newfilepath'], PATHINFO_EXTENSION)),true);
-		}
-		
-		if(!$this->is_allowed_file_type($_FILES['fileR']['name'])) {
-			$this->error(sprintf($this->lang('INVALID_FILE_TYPE')),true);
-		}
-		
-		// we check if extension is allowed regarding the security Policy settings
-		if(!$this->is_allowed_file_type($_FILES['fileR']['name'])) {
-			$this->error(sprintf($this->lang('INVALID_FILE_TYPE')),true);
-		}
-		
-		// we check if only images are allowed
-		if($this->config['upload']['imagesOnly'] || (isset($this->params['type']) && strtolower($this->params['type'])=='images')) {
-			if(!($size = @getimagesize($_FILES['fileR']['tmp_name']))){
-				$this->error(sprintf($this->lang('UPLOAD_IMAGES_ONLY')),true);
-			}
-			if(!in_array($size[2], array(1, 2, 3, 7, 8))) {
-				$this->error(sprintf($this->lang('UPLOAD_IMAGES_TYPE_JPEG_GIF_PNG')),true);
-			}
-		}
-
-		$current_path = $this->getFullPath($this->post['newfilepath']);
-		
-		// check if file is writable
-		if(!$this->has_system_permission($current_path, array('w'))) {
-			$this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')), true);
-		}
-
-		if(!$this->has_permission('replace') || !$this->is_valid_path($current_path)) {
-			$this->error("No way.");
-		}
-
-		move_uploaded_file($_FILES['fileR']['tmp_name'], $current_path);
-		
-		// we delete thumbnail if file is image and thumbnail already
-		if($this->is_image($current_path) && file_exists($this->get_thumbnail($current_path))) {
-			unlink($this->get_thumbnail($current_path));
-		}
-
-		// automatically resize image if it's too big
-		$imagePath = $current_path;
-		if($this->is_image($imagePath) && $this->config['images']['resize']['enabled']) {
-			if ($size = @getimagesize($imagePath)){
-				if ($size[0] > $this->config['images']['resize']['maxWidth'] || $size[1] > $this->config['images']['resize']['maxHeight']) {
-					require_once('./inc/wideimage/lib/WideImage.php');
-					
-					$image = WideImage::load($imagePath);
-					$resized = $image->resize($this->config['images']['resize']['maxWidth'], $this->config['images']['resize']['maxHeight'], 'inside');
-					$resized->saveToFile($imagePath);
-					
-					$this->__log(__METHOD__ . ' - resizing image : '. $current_path);
-				}
-			}
-		}
-
-		chmod($current_path, 0644);
-
-		$response = array(
-				'Path'=>dirname($this->post['newfilepath']),
-				'Name'=>basename($this->post['newfilepath']),
-				'Error'=>"",
-				'Code'=>0
-		);
-
-		$this->__log(__METHOD__ . ' - replacing file '. $current_path);
-
-		echo '<textarea>' . json_encode($response) . '</textarea>';
-		die();
-	}
-
-	public function add() {
-			
-		$this->setParams();
-
-		if(!isset($_FILES['newfile']) || !is_uploaded_file($_FILES['newfile']['tmp_name'])) {
-			
-			// if fileSize limit set by the user is greater than size allowed in php.ini file, we apply server restrictions
-			// and log a warning into file
-			if($this->config['upload']['fileSizeLimit'] > $this->getMaxUploadFileSize()) {
-				$this->__log(__METHOD__ . ' [WARNING] : file size limit set by user is greater than size allowed in php.ini file : '. $this->config['upload']['fileSizeLimit'] . 'Mb > '. $this->getMaxUploadFileSize() .'Mb.');
-				$this->config['upload']['fileSizeLimit'] = $this->getMaxUploadFileSize();
-				$this->error(sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'),$this->config['upload']['fileSizeLimit'] . $this->lang('mb')),true);
-			}
-			
-			$this->error(sprintf($this->lang('INVALID_FILE_UPLOAD') . ' '. sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'),$this->config['upload']['fileSizeLimit'] . $this->lang('mb'))),true);
-		}
-		// we determine max upload size if not set
-		if($this->config['upload']['fileSizeLimit'] == 'auto') {
-			$this->config['upload']['fileSizeLimit'] = $this->getMaxUploadFileSize();
-		}
-
-		if($_FILES['newfile']['size'] > ($this->config['upload']['fileSizeLimit'] * 1024 * 1024)) {
-			$this->error(sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'),$this->config['upload']['fileSizeLimit'] . $this->lang('mb')),true);
-		}
-		
-		// we check if extension is allowed regarding the security Policy settings
-		if(!$this->is_allowed_file_type($_FILES['newfile']['name'])) {
-			$this->error(sprintf($this->lang('INVALID_FILE_TYPE')),true);
-		}
-		
-		// we check if only images are allowed
-		if($this->config['upload']['imagesOnly'] || (isset($this->params['type']) && strtolower($this->params['type'])=='images')) {
-			if(!($size = @getimagesize($_FILES['newfile']['tmp_name']))){
-				$this->error(sprintf($this->lang('UPLOAD_IMAGES_ONLY')),true);
-			}
-			if(!in_array($size[2], array(1, 2, 3, 7, 8))) {
-				$this->error(sprintf($this->lang('UPLOAD_IMAGES_TYPE_JPEG_GIF_PNG')),true);
-			}
-		}
-		$_FILES['newfile']['name'] = $this->cleanString($_FILES['newfile']['name'],array('.','-'));
-
-		$current_path = $this->getFullPath($this->post['currentpath']);
-
-		if(!$this->is_valid_path($current_path)) {
-			$this->error("No way.");
-		}
-
-		if(!$this->config['upload']['overwrite']) {
-			$_FILES['newfile']['name'] = $this->checkFilename($current_path,$_FILES['newfile']['name']);
-		}
-		move_uploaded_file($_FILES['newfile']['tmp_name'], $current_path . $_FILES['newfile']['name']);
-
-		// automatically resize image if it's too big
-		$imagePath = $current_path . $_FILES['newfile']['name'];
-		if($this->is_image($imagePath) && $this->config['images']['resize']['enabled']) {
-			if ($size = @getimagesize($imagePath)){
-				if ($size[0] > $this->config['images']['resize']['maxWidth'] || $size[1] > $this->config['images']['resize']['maxHeight']) {
-					require_once('./inc/wideimage/lib/WideImage.php');
-					
-					$image = WideImage::load($imagePath);
-					$resized = $image->resize($this->config['images']['resize']['maxWidth'], $this->config['images']['resize']['maxHeight'], 'inside');
-					$resized->saveToFile($imagePath);
-					
-					$this->__log(__METHOD__ . ' - resizing image : '. $_FILES['newfile']['name']. ' into '. $current_path);
-				}
-			}
-		}
-
-		chmod($current_path . $_FILES['newfile']['name'], 0644);
-
-		$response = array(
-				'Path'=>$this->post['currentpath'],
-				'Name'=>$_FILES['newfile']['name'],
-				'Error'=>"",
-				'Code'=>0
-		);
-
-		$this->__log(__METHOD__ . ' - adding file '. $_FILES['newfile']['name']. ' into '. $current_path);
-
-		echo '<textarea>' . json_encode($response) . '</textarea>';
-		die();
-	}
-
-	public function addfolder() {
-			
-		$current_path = $this->getFullPath();
-			
-		if(!$this->is_valid_path($current_path)) {
-			$this->error("No way.");
-		}
-		if(is_dir($current_path . $this->get['name'])) {
-			$this->error(sprintf($this->lang('DIRECTORY_ALREADY_EXISTS'),$this->get['name']));
-
-		}
-		$newdir = $this->cleanString($this->get['name']);
-		if(!mkdir($current_path . $newdir,0755)) {
-			$this->error(sprintf($this->lang('UNABLE_TO_CREATE_DIRECTORY'),$newdir));
-		}
-		$array = array(
-				'Parent'=>$this->get['path'],
-				'Name'=>$this->get['name'],
-				'Error'=>"",
-				'Code'=>0
-		);
-		$this->__log(__METHOD__ . ' - adding folder '. $current_path . $newdir);
-
-		return $array;
-	}
-	
-	/**
-	 * function zipFile.  Creates a zip file from source to destination
-	 *
-	 * @param  string $source Source path for zip
-	 * @param  string $destination Destination path for zip
-	 * @param  string|boolean $flag OPTIONAL If true includes the folder also
-	 * @return boolean
-	 * @link 	 http://stackoverflow.com/questions/17584869/zip-main-folder-with-sub-folder-inside
-	 */
-	public function zipFile($source, $destination, $flag = '')
-	{
-		if (!extension_loaded('zip') || !file_exists($source)) {
-			return false;
-		}
-	
-		$zip = new ZipArchive();
-		if (!$zip->open($destination, ZIPARCHIVE::CREATE)) {
-			return false;
-		}
-	
-		$source = str_replace('\\', '/', realpath($source));
-		if($flag)
-		{
-			$flag = basename($source) . '/';
-			//$zip->addEmptyDir(basename($source) . '/');
-		}
-	
-		if (is_dir($source) === true)
-		{
-			// add file to prevent empty archive error on download
-			$zip->addFromString('fm', "This archive has been generated by simogeo's Filemanager : https://github.com/simogeo/Filemanager/");
-			
-			$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($source), RecursiveIteratorIterator::SELF_FIRST);
-			foreach ($files as $file)
-			{
-				$file = str_replace('\\', '/', realpath($file));
-	
-				if (is_dir($file) === true)
-				{
-					$zip->addEmptyDir(str_replace($source . '/', '', $flag.$file . '/'));
-				}
-				else if (is_file($file) === true)
-				{
-					$zip->addFromString(str_replace($source . '/', '', $flag.$file), file_get_contents($file));
-				}
-			}
-		}
-		else if (is_file($source) === true)
-		{
-			$zip->addFromString($flag.basename($source), file_get_contents($source));
-		}
-	
-		return $zip->close();
-	}
-
-	public function download() {
-			
-		$current_path = $this->getFullPath();
-		
-		if(!$this->has_permission('download') || !$this->is_valid_path($current_path)) {
-			$this->error("No way.");
-		}
-		
-		// check if file is writable
-		if(!$this->has_system_permission($current_path, array('w'))) {
-			$this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')),true);
-		}
-		
-		// we check if extension is allowed regarding the security Policy settings
-		if(is_file($current_path)) {
-			if(!$this->is_allowed_file_type(basename($current_path))) {
-				$this->error(sprintf($this->lang('INVALID_FILE_TYPE')),true);
-			}
-			
-		} else {
-			
-			// check if permission is granted
-			if(is_dir($current_path) && $this->config['security']['allowFolderDownload'] == false ) {
-				$this->error(sprintf($this->lang('NOT_ALLOWED')),true);
-			}
-			
-			// check if not requesting main FM userfiles folder
-			if($this->is_root_folder($current_path)) {
-				$this->error(sprintf($this->lang('NOT_ALLOWED')),true);
-			}
-			
-			$destination_path = sys_get_temp_dir().'/'.uniqid().'.zip';
-			
-			// if Zip archive is created
-			if($this->zipFile($current_path, $destination_path, true)) {
-				$current_path = $destination_path;
-			} else {
-				$this->error($this->lang('ERROR_CREATING_ZIP'));
-			}
-			
-		}
-
-		if(isset($this->get['path']) && file_exists($current_path)) {
-			header("Content-type: application/force-download");
-			header('Content-Disposition: inline; filename="' . basename($current_path) . '"');
-			header("Content-Transfer-Encoding: Binary");
-			header("Content-length: ".filesize($current_path));
-			header('Content-Type: application/octet-stream');
-			header('Content-Disposition: attachment; filename="' . basename($current_path) . '"');
-			readfile($current_path);
-			$this->__log(__METHOD__ . ' - downloading '. $current_path);
-			exit();
-		} else {
-			$this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'),$current_path));
-		}
-	}
-
-	public function preview($thumbnail) {
-			
-		$current_path = $this->getFullPath();
-			
-		if(isset($this->get['path']) && file_exists($current_path)) {
-			
-			// if $thumbnail is set to true we return the thumbnail
-			if($this->config['options']['generateThumbnails'] == true && $thumbnail == true) {
-				// get thumbnail (and create it if needed)
-				$returned_path = $this->get_thumbnail($current_path);
-			} else {
-				$returned_path = $current_path;
-			}
-			
-			header("Content-type: image/" . strtolower(pathinfo($returned_path, PATHINFO_EXTENSION)));
-			header("Content-Transfer-Encoding: Binary");
-			header("Content-length: ".filesize($returned_path));
-			header('Content-Disposition: inline; filename="' . basename($returned_path) . '"');
-			readfile($returned_path);
-			
-			exit();
-			
-		} else {
-			$this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'),$current_path));
-		}
-	}
-
-	public function getMaxUploadFileSize() {
-			
-		$max_upload = (int) ini_get('upload_max_filesize');
-		$max_post = (int) ini_get('post_max_size');
-		$memory_limit = (int) ini_get('memory_limit');
-
-		$upload_mb = min($max_upload, $max_post, $memory_limit);
-
-		$this->__log(__METHOD__ . ' - max upload file size is '. $upload_mb. 'Mb');
-
-		return $upload_mb;
-	}
-
-	private function setParams() {
-		$tmp = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/');
-		$tmp = explode('?',$tmp);
-		$params = array();
-		if(isset($tmp[1]) && $tmp[1]!='') {
-			$params_tmp = explode('&',$tmp[1]);
-			if(is_array($params_tmp)) {
-				foreach($params_tmp as $value) {
-					$tmp = explode('=',$value);
-					if(isset($tmp[0]) && $tmp[0]!='' && isset($tmp[1]) && $tmp[1]!='') {
-						$params[$tmp[0]] = $tmp[1];
-					}
-				}
-			}
-		}
-		$this->params = $params;
-	}
-	
-	private function setPermissions() {
-		
-		$this->allowed_actions = $this->config['options']['capabilities'];
-		
-		if($this->config['edit']['enabled']) array_push($this->allowed_actions, 'edit');
-		
-	}
-	
-	// check if system permission is granted
-	private function has_system_permission($filepath, $perms) {
-		
-		if(in_array('r', $perms)) {
-			if(!is_readable($filepath)) return false;
-		}
-		if(in_array('w', $perms)) {
-			if(!is_writable($filepath)) return false;
-		}
-		
-		return true;
-
-	}
-
-
-	private function get_file_info($path='', $thumbnail = false) {
-			
-		// DO NOT  rawurlencode() since $current_path it
-		// is used for displaying name file
-		if($path=='') {
-			$current_path = $this->get['path'];
-		} else {
-			$current_path = $path;
-		}
-		$tmp = explode('/',$current_path);
-		$this->item['filename'] = $tmp[(sizeof($tmp)-1)];
-
-		$tmp = explode('.',$this->item['filename']);
-		$this->item['filetype'] = $tmp[(sizeof($tmp)-1)];
-		$this->item['filemtime'] = filemtime($this->getFullPath($current_path));
-		$this->item['filectime'] = filectime($this->getFullPath($current_path));
-		
-		// check if file is writable and readable
-		if(!$this->has_system_permission($this->getFullPath($current_path), array('w', 'r'))) {
-			$this->item['protected'] = 1;
-			$this->item['preview'] = $this->config['icons']['path'] . 'locked_' . $this->config['icons']['default'];
-			// prevent Internal Server Error HTTP_CODE 500 on non readable files/folders
-			// without returning errors
-			return;
-			
-		}	else {
-			$this->item['protected'] = 0;
-			$this->item['preview'] = $this->config['icons']['path'] . $this->config['icons']['default'];
-		}
-		
-		if(is_dir($current_path)) {
-
-			$this->item['preview'] = $this->config['icons']['path'] . $this->config['icons']['directory'];
-
-		} else if(in_array(strtolower($this->item['filetype']),array_map('strtolower', $this->config['images']['imagesExt']))) {
-			
-			// svg should not be previewed as raster formats images
-			if($this->item['filetype'] == 'svg') {
-				$this->item['preview'] = $current_path;
-			} else {
-				$this->item['preview'] = 'connectors/php/filemanager.php?mode=preview&path='. rawurlencode($current_path).'&'. time();
-				if($thumbnail) $this->item['preview'] .= '&thumbnail=true';
-			}
-			//if(isset($get['getsize']) && $get['getsize']=='true') {
-			$this->item['properties']['Size'] = filesize($this->getFullPath($current_path));
-			if ($this->item['properties']['Size']) {
-				list($width, $height, $type, $attr) = getimagesize($this->getFullPath($current_path));
-			} else {
-				$this->item['properties']['Size'] = 0;
-				list($width, $height) = array(0, 0);
-			}
-			$this->item['properties']['Height'] = $height;
-			$this->item['properties']['Width'] = $width;
-			$this->item['properties']['Size'] = filesize($this->getFullPath($current_path));
-			//}
-
-	} else if(file_exists($this->root . $this->config['icons']['path'] . strtolower($this->item['filetype']) . '.png')) {
-
-		$this->item['preview'] = $this->config['icons']['path'] . strtolower($this->item['filetype']) . '.png';
-		$this->item['properties']['Size'] = filesize($this->getFullPath($current_path));
-		if (!$this->item['properties']['Size']) $this->item['properties']['Size'] = 0;
-
-	}
-
-	$this->item['properties']['Date Modified'] = date($this->config['options']['dateFormat'], $this->item['filemtime']);
-	$this->item['properties']['filemtime'] = filemtime($this->getFullPath($current_path));
-	//$return['properties']['Date Created'] = $this->config['options']['dateFormat'], $return['filectime']); // PHP cannot get create timestamp
-}
-
-private function getFullPath($path = '') {
-		
-	if($path == '') {
-		if(isset($this->get['path'])) $path = $this->get['path'];
-	}
-	
-	if($this->config['options']['fileRoot'] !== false) {
-		$full_path = $this->doc_root . rawurldecode(str_replace ( $this->doc_root , '' , $path));
-		if($this->dynamic_fileroot != '') {
-			$full_path = $this->doc_root . rawurldecode(str_replace ( $this->dynamic_fileroot , '' , $path));
-			// $dynPart = str_replace($_SERVER['DOCUMENT_ROOT'], '', $this->path_to_files); // instruction could replace the line above
-			// $full_path = $this->path_to_files . rawurldecode(str_replace ( $dynPart , '' , $path)); // instruction could replace the line above
-		}
-	} else {
-		$full_path = $this->doc_root . rawurldecode($path);
-	}
-		
-	$full_path = str_replace("//", "/", $full_path);
-		
-	// $this->__log("getFullPath() returned path : " . $full_path);
-		
-	return $full_path;
-		
-}
+class Filemanager
+{
+    protected $config = [];
+    protected $language = [];
+    protected $get = [];
+    protected $post = [];
+    protected $properties = [];
+    protected $item = [];
+    protected $languages = [];
+    protected $allowed_actions = [];
+    protected $root = '';                // Filemanager root folder
+    protected $doc_root = '';        // root folder known by JS : $this->config['options']['fileRoot'] (filepath or '/') or $_SERVER['DOCUMENT_ROOT'] - overwritten by setFileRoot() method
+    protected $dynamic_fileroot = ''; // Only set if setFileRoot() is called. Second part of the path : '/Filemanager/assets/' ( doc_root - $_SERVER['DOCUMENT_ROOT'])
+    protected $path_to_files = ''; // path to FM userfiles folder - automatically computed by the PHP class, something like '/var/www/Filemanager/userfiles'
+    protected $logger = false;
+    protected $logfile = '';
+    protected $cachefolder = '_thumbs/';
+    protected $thumbnail_width = 64;
+    protected $thumbnail_height = 64;
+    protected $separator = 'userfiles'; // @todo fix keep it or not?
+
+    public function __construct($extraConfig = '')
+    {
+
+        // getting default config file
+        $content = file_get_contents('../../scripts/filemanager.config.js.default');
+        $config_default = json_decode($content, true);
+
+        // getting user config file
+        if (isset($_REQUEST['config'])) {
+            $this->getvar('config');
+            if (file_exists('../../scripts/'.$_REQUEST['config'])) {
+                $this->__log('Loading '.basename($this->get['config']).' config file.');
+                $content = file_get_contents('../../scripts/'.basename($this->get['config']));
+            } else {
+                $this->__log($this->get['config'].' config file does not exists.');
+                $this->error('Given config file ('.basename($this->get['config']).') does not exist !');
+            }
+        } else {
+            $content = file_get_contents('../../scripts/filemanager.config.js');
+        }
+        $config = json_decode($content, true);
+
+        // Prevent following bug https://github.com/simogeo/Filemanager/issues/398
+        $config_default['security']['uploadRestrictions'] = [];
+
+        if (!$config) {
+            $this->error('Error parsing the settings file! Please check your JSON syntax.');
+        }
+        $this->config = array_replace_recursive($config_default, $config);
+
+        // override config options if needed
+        if (!empty($extraConfig)) {
+            $this->setup($extraConfig);
+        }
+
+        // set logfile path according to system if not set into config file
+        if (!isset($this->config['options']['logfile'])) {
+            $this->config['options']['logfile'] = sys_get_temp_dir().'/filemanager.log';
+        }
+
+        $this->root = dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR;
+        $this->properties = [
+                'Date Created'  => null,
+                'Date Modified' => null,
+                'Height'        => null,
+                'Width'         => null,
+                'Size'          => null,
+        ];
+
+        // Log actions or not?
+        if ($this->config['options']['logger'] == true) {
+            if (isset($this->config['options']['logfile'])) {
+                $this->logfile = $this->config['options']['logfile'];
+            }
+            $this->enableLog();
+        }
+
+        // if fileRoot is set manually, $this->doc_root takes fileRoot value
+        // for security check in is_valid_path() method
+        // else it takes $_SERVER['DOCUMENT_ROOT'] default value
+        if ($this->config['options']['fileRoot'] !== false) {
+            if ($this->config['options']['serverRoot'] === true) {
+                $this->doc_root = $_SERVER['DOCUMENT_ROOT'];
+                $this->separator = basename($this->config['options']['fileRoot']);
+                $this->path_to_files = $_SERVER['DOCUMENT_ROOT'].'/'.$this->config['options']['fileRoot'];
+            } else {
+                $this->doc_root = $this->config['options']['fileRoot'];
+                $this->separator = basename($this->config['options']['fileRoot']);
+                $this->path_to_files = $this->config['options']['fileRoot'];
+            }
+        } else {
+            $this->doc_root = $_SERVER['DOCUMENT_ROOT'];
+            $this->path_to_files = $this->root.$this->separator.'/';
+        }
+
+        $this->__log(__METHOD__.' $this->root value '.$this->root);
+        $this->__log(__METHOD__.' $this->path_to_files '.$this->path_to_files);
+        $this->__log(__METHOD__.' $this->doc_root value '.$this->doc_root);
+        $this->__log(__METHOD__.' $this->separator value '.$this->separator);
+
+        $this->setParams();
+        $this->setPermissions();
+        $this->availableLanguages();
+        $this->loadLanguageFile();
+    }
+
+    // $extraconfig should be formatted as json config array.
+    public function setup($extraconfig)
+    {
+
+        // Prevent following bug https://github.com/simogeo/Filemanager/issues/398
+        $config_default['security']['uploadRestrictions'] = [];
+
+        $this->config = array_replace_recursive($this->config, $extraconfig);
+    }
+
+    // allow Filemanager to be used with dynamic folders
+    public function setFileRoot($path, $mkdir = false)
+    {
+
+        // Paths are bit complex to handle - kind of nightmare actually ....
+        // 3 parts are availables
+        // [1] $this->doc_root. The first part of the path : '/var/www'
+        // [2] $this->dynamic_fileroot. The second part of the path : '/Filemanager/assets/' ( doc_root - $_SERVER['DOCUMENT_ROOT'])
+        // [3] $this->path_to_files or $this->doc_root. The full path : '/var/www/Filemanager/assets/'
+
+        $path = rtrim($path, '/').'/';
+        if ($this->config['options']['serverRoot'] === true) {
+            $this->doc_root = $_SERVER['DOCUMENT_ROOT'].'/'.$path; // i.e  '/var/www/'
+        } else {
+            $this->doc_root = $path; // i.e  '/var/www/'
+        }
+
+        // necessary for retrieving path when set dynamically with $fm->setFileRoot() method
+        // https://github.com/simogeo/Filemanager/issues/258 @todo to explore deeper
+        $this->dynamic_fileroot = str_replace('//', '/', str_replace($_SERVER['DOCUMENT_ROOT'], '', $this->doc_root));
+        $this->path_to_files = $this->doc_root;
+        $this->separator = basename($this->doc_root);
+
+        // do we create folder ?
+        if ($mkdir && !file_exists($this->doc_root)) {
+            mkdir($this->doc_root, 0755, true);
+            $this->__log(__METHOD__.' creating  '.$this->doc_root.' folder through mkdir()');
+        }
+
+        $this->__log(__METHOD__.' $this->doc_root value overwritten : '.$this->doc_root);
+        $this->__log(__METHOD__.' $this->dynamic_fileroot value '.$this->dynamic_fileroot);
+        $this->__log(__METHOD__.' $this->path_to_files '.$this->path_to_files);
+        $this->__log(__METHOD__.' $this->separator value '.$this->separator);
+    }
+
+    public function error($string, $textarea = false)
+    {
+        $array = [
+                'Error'      => $string,
+                'Code'       => '-1',
+                'Properties' => $this->properties,
+        ];
+
+        $this->__log(__METHOD__.' - error message : '.$string);
+
+        if ($textarea) {
+            echo '<textarea>'.json_encode($array).'</textarea>';
+        } else {
+            echo json_encode($array);
+        }
+        die();
+    }
+
+    public function lang($string)
+    {
+        if (isset($this->language[$string]) && $this->language[$string] != '') {
+            return $this->language[$string];
+        } else {
+            return 'Language string error on '.$string;
+        }
+    }
+
+    public function getvar($var, $sanitize = true)
+    {
+        if (!isset($_GET[$var]) || $_GET[$var] == '') {
+            $this->error(sprintf($this->lang('INVALID_VAR'), $var));
+        } else {
+            if ($sanitize) {
+                $this->get[$var] = $this->sanitize($_GET[$var]);
+            } else {
+                $this->get[$var] = $_GET[$var];
+            }
+
+            return true;
+        }
+    }
+
+    public function postvar($var, $sanitize = true)
+    {
+        if (!isset($_POST[$var]) || ($var != 'content' && $_POST[$var] == '')) {
+            $this->error(sprintf($this->lang('INVALID_VAR'), $var));
+        } else {
+            if ($sanitize) {
+                $this->post[$var] = $this->sanitize($_POST[$var]);
+            } else {
+                $this->post[$var] = $_POST[$var];
+            }
+
+            return true;
+        }
+    }
+
+    public function getinfo()
+    {
+        $this->item = [];
+        $this->item['properties'] = $this->properties;
+        $this->get_file_info('', false);
+
+        // handle path when set dynamically with $fm->setFileRoot() method
+        if ($this->dynamic_fileroot != '') {
+            $path = $this->dynamic_fileroot.$this->get['path'];
+            // $path = str_replace($_SERVER['DOCUMENT_ROOT'], '', $this->path_to_files) . $this->get['path']; // instruction could replace the line above
+            $path = preg_replace('~/+~', '/', $path); // remove multiple slashes
+        } else {
+            $path = $this->get['path'];
+        }
+
+        $array = [
+                'Path'       => $path,
+                'Filename'   => $this->item['filename'],
+                'File Type'  => $this->item['filetype'],
+                'Protected'  => $this->item['protected'],
+                'Preview'    => $this->item['preview'],
+                'Properties' => $this->item['properties'],
+                'Error'      => '',
+                'Code'       => 0,
+        ];
+
+        return $array;
+    }
+
+    public function getfolder()
+    {
+        $array = [];
+        $filesDir = [];
+
+        $current_path = $this->getFullPath();
+
+        if (!$this->is_valid_path($current_path)) {
+            $this->error('No way.');
+        }
+
+        if (!is_dir($current_path)) {
+            $this->error(sprintf($this->lang('DIRECTORY_NOT_EXIST'), $this->get['path']));
+        }
+
+        // check if file is readable
+        if (!$this->has_system_permission($current_path, ['r'])) {
+            $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
+        }
+
+        if (!$handle = @opendir($current_path)) {
+            $this->error(sprintf($this->lang('UNABLE_TO_OPEN_DIRECTORY'), $this->get['path']));
+        } else {
+            while (false !== ($file = readdir($handle))) {
+                if ($file != '.' && $file != '..') {
+                    array_push($filesDir, $file);
+                }
+            }
+            closedir($handle);
+
+            // By default
+            // Sorting files by name ('default' or 'NAME_DESC' cases from $this->config['options']['fileSorting']
+            natcasesort($filesDir);
+
+            foreach ($filesDir as $file) {
+                if (is_dir($current_path.$file)) {
+                    if (!in_array($file, $this->config['exclude']['unallowed_dirs']) && !preg_match($this->config['exclude']['unallowed_dirs_REGEXP'], $file)) {
+
+                        // check if file is writable and readable
+                        if (!$this->has_system_permission($current_path.$file, ['w', 'r'])) {
+                            $protected = 1;
+                            $previewPath = $this->config['icons']['path'].'locked_'.$this->config['icons']['directory'];
+                        } else {
+                            $protected = 0;
+                            $previewPath = $this->config['icons']['path'].$this->config['icons']['directory'];
+                        }
+
+                        $array[$this->get['path'].$file.'/'] = [
+                                'Path'       => $this->get['path'].$file.'/',
+                                'Filename'   => $file,
+                                'File Type'  => 'dir',
+                                'Protected'  => $protected,
+                                'Preview'    => $previewPath,
+                                'Properties' => [
+                                        'Date Created'  => date($this->config['options']['dateFormat'], filectime($this->getFullPath($this->get['path'].$file.'/'))),
+                                        'Date Modified' => date($this->config['options']['dateFormat'], filemtime($this->getFullPath($this->get['path'].$file.'/'))),
+                                        'filemtime'     => filemtime($this->getFullPath($this->get['path'].$file.'/')),
+                                        'Height'        => null,
+                                        'Width'         => null,
+                                        'Size'          => null,
+                                ],
+                                'Error' => '',
+                                'Code'  => 0,
+                        ];
+                    }
+                } elseif (!in_array($file, $this->config['exclude']['unallowed_files'])  && !preg_match($this->config['exclude']['unallowed_files_REGEXP'], $file)) {
+                    $this->item = [];
+                    $this->item['properties'] = $this->properties;
+                    $this->get_file_info($this->get['path'].$file, true);
+
+                    if (!isset($this->params['type']) || (isset($this->params['type']) && strtolower($this->params['type']) == 'images' && in_array(strtolower($this->item['filetype']), array_map('strtolower', $this->config['images']['imagesExt'])))) {
+                        if ($this->config['upload']['imagesOnly'] == false || ($this->config['upload']['imagesOnly'] == true && in_array(strtolower($this->item['filetype']), array_map('strtolower', $this->config['images']['imagesExt'])))) {
+                            $array[$this->get['path'].$file] = [
+                                    'Path'       => $this->get['path'].$file,
+                                    'Filename'   => $this->item['filename'],
+                                    'File Type'  => $this->item['filetype'],
+                                    'Protected'  => $this->item['protected'],
+                                    'Preview'    => $this->item['preview'],
+                                    'Properties' => $this->item['properties'],
+                                    'Error'      => '',
+                                    'Code'       => 0,
+                            ];
+                        }
+                    }
+                }
+            }
+        }
+
+        $array = $this->sortFiles($array);
+
+        return $array;
+    }
+
+    public function editfile()
+    {
+        $current_path = $this->getFullPath();
+
+        // check if file is writable
+        if (!$this->has_system_permission($current_path, ['w'])) {
+            $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
+        }
+
+        if (!$this->has_permission('edit') || !$this->is_valid_path($current_path) || !$this->is_editable($current_path)) {
+            $this->error('No way.');
+        }
+
+        $this->__log(__METHOD__.' - editing file '.$current_path);
+
+        $content = file_get_contents($current_path);
+        $content = htmlspecialchars($content);
+
+        if ($content === false) {
+            $this->error(sprintf($this->lang('ERROR_OPENING_FILE')));
+        }
+
+        $array = [
+                'Error'   => '',
+                'Code'    => 0,
+                'Path'    => $this->get['path'],
+                'Content' => $this->formatPath($content),
+        ];
+
+        return $array;
+    }
+
+    public function savefile()
+    {
+        $current_path = $this->getFullPath($this->post['path']);
+
+        if (!$this->has_permission('edit') || !$this->is_valid_path($current_path) || !$this->is_editable($current_path)) {
+            $this->error('No way.');
+        }
+
+        if (!$this->has_system_permission($current_path, ['w'])) {
+            $this->error(sprintf($this->lang('ERROR_WRITING_PERM')));
+        }
+
+        $this->__log(__METHOD__.' - saving file '.$current_path);
+
+        $content = htmlspecialchars_decode($this->post['content']);
+        $r = file_put_contents($current_path, $content, LOCK_EX);
+
+        if (!is_numeric($r)) {
+            $this->error(sprintf($this->lang('ERROR_SAVING_FILE')));
+        }
+
+        $array = [
+                    'Error' => '',
+                    'Code'  => 0,
+                    'Path'  => $this->formatPath($this->post['path']),
+            ];
+
+        return $array;
+    }
+
+    public function rename()
+    {
+        $suffix = '';
+
+        if (substr($this->get['old'], -1, 1) == '/') {
+            $this->get['old'] = substr($this->get['old'], 0, (strlen($this->get['old']) - 1));
+            $suffix = '/';
+        }
+        $tmp = explode('/', $this->get['old']);
+        $filename = $tmp[(count($tmp) - 1)];
+        $path = str_replace('/'.$filename, '', $this->get['old']);
+
+        $new_file = $this->getFullPath($path.'/'.$this->get['new']).$suffix;
+        $old_file = $this->getFullPath($this->get['old']).$suffix;
+
+        if (!$this->has_permission('rename') || !$this->is_valid_path($old_file)) {
+            $this->error('No way.');
+        }
+
+        // check if file is writable
+        if (!$this->has_system_permission($old_file, ['w'])) {
+            $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
+        }
+
+        // check if not requesting main FM userfiles folder
+        if ($this->is_root_folder($old_file)) {
+            $this->error(sprintf($this->lang('NOT_ALLOWED')));
+        }
+
+        // For file only - we check if the new given extension is allowed regarding the security Policy settings
+        if (is_file($old_file) && $this->config['security']['allowChangeExtensions'] && !$this->is_allowed_file_type($new_file)) {
+            $this->error(sprintf($this->lang('INVALID_FILE_TYPE')));
+        }
+
+        $this->__log(__METHOD__.' - renaming '.$old_file.' to '.$new_file);
+
+        if (file_exists($new_file)) {
+            if ($suffix == '/' && is_dir($new_file)) {
+                $this->error(sprintf($this->lang('DIRECTORY_ALREADY_EXISTS'), $this->get['new']));
+            }
+            if ($suffix == '' && is_file($new_file)) {
+                $this->error(sprintf($this->lang('FILE_ALREADY_EXISTS'), $this->get['new']));
+            }
+        }
+
+        if (!rename($old_file, $new_file)) {
+            if (is_dir($old_file)) {
+                $this->error(sprintf($this->lang('ERROR_RENAMING_DIRECTORY'), $filename, $this->get['new']));
+            } else {
+                $this->error(sprintf($this->lang('ERROR_RENAMING_FILE'), $filename, $this->get['new']));
+            }
+        }
+        $array = [
+                'Error'    => '',
+                'Code'     => 0,
+                'Old Path' => $this->formatPath($this->get['old'].$suffix),
+                'Old Name' => $filename,
+                'New Path' => $this->formatPath($path.'/'.$this->get['new'].$suffix),
+                'New Name' => $this->get['new'],
+        ];
+
+        return $array;
+    }
+
+    public function move()
+    {
+
+        // dynamic fileroot dir must be used when enabled
+        if ($this->dynamic_fileroot != '') {
+            $rootDir = $this->dynamic_fileroot;
+            //$rootDir = str_replace($_SERVER['DOCUMENT_ROOT'], '', $this->path_to_files); // instruction could replace the line above
+        } else {
+            $rootDir = $this->get['root'];
+        }
+
+        $rootDir = str_replace('//', '/', $rootDir);
+        $oldPath = $this->getFullPath($this->get['old']);
+
+        // check if file is writable
+        if (!$this->has_system_permission($oldPath, ['w'])) {
+            $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')), true);
+        }
+
+        // check if not requesting main FM userfiles folder
+        if ($this->is_root_folder($oldPath)) {
+            $this->error(sprintf($this->lang('NOT_ALLOWED')), true);
+        }
+
+        // old path
+        $tmp = explode('/', trim($this->get['old'], '/'));
+        $fileName = array_pop($tmp); // file name or new dir name
+        $path = '/'.implode('/', $tmp).'/';
+
+        // new path
+        if (substr($this->get['new'], 0, 1) != '/') {
+            // make path relative from old dir
+            $newPath = $path.'/'.$this->get['new'].'/';
+        } else {
+            $newPath = $rootDir.'/'.$this->get['new'].'/';
+        }
+
+        $newPath = preg_replace('#/+#', '/', $newPath);
+        $newPath = $this->expandPath($newPath, true);
+
+        $newRelativePath = str_replace('./', '', $newPath);
+        $newPath = $this->getFullPath($newPath);
+
+        if (!$this->has_permission('move') || !$this->is_valid_path($oldPath) || !$this->is_valid_path($newPath)) {
+            $this->error('No way.');
+        }
+
+        // check if file already exists
+        if (file_exists($newPath.$fileName)) {
+            if (is_dir($newPath.$fileName)) {
+                $this->error(sprintf($this->lang('DIRECTORY_ALREADY_EXISTS'), rtrim($this->get['new'], '/').'/'.$fileName));
+            } else {
+                $this->error(sprintf($this->lang('FILE_ALREADY_EXISTS'), rtrim($this->get['new'], '/').'/'.$fileName));
+            }
+        }
+
+        // create dir if not exists
+        if (!file_exists($newPath)) {
+            if (!mkdir($newPath, 0755, true)) {
+                $this->error(sprintf($this->lang('UNABLE_TO_CREATE_DIRECTORY'), $newPath));
+            }
+        }
+
+        // move
+        $this->__log(__METHOD__.' - moving '.$oldPath.' to directory '.$newPath);
+
+        if (!rename($oldPath, $newPath.$fileName)) {
+            if (is_dir($oldPath)) {
+                $this->error(sprintf($this->lang('ERROR_RENAMING_DIRECTORY'), $path, $this->get['new']));
+            } else {
+                $this->error(sprintf($this->lang('ERROR_RENAMING_FILE'), $path.$fileName, $this->get['new']));
+            }
+        }
+
+        $array = [
+                'Error'    => '',
+                'Code'     => 0,
+                'Old Path' => $path,
+                'Old Name' => $fileName,
+                'New Path' => $this->formatPath($newRelativePath),
+                'New Name' => $fileName,
+        ];
+
+        return $array;
+    }
+
+    public function delete()
+    {
+        $current_path = $this->getFullPath();
+        $thumbnail_path = $this->get_thumbnail_path($current_path);
+
+        if (!$this->has_permission('delete') || !$this->is_valid_path($current_path)) {
+            $this->error('No way.');
+        }
+
+        // check if file is writable
+        if (!$this->has_system_permission($current_path, ['w'])) {
+            $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
+        }
+
+        // check if not requesting main FM userfiles folder
+        if ($this->is_root_folder($current_path)) {
+            $this->error(sprintf($this->lang('NOT_ALLOWED')));
+        }
+
+        if (is_dir($current_path)) {
+            $this->unlinkRecursive($current_path);
+
+            // we remove thumbnails if needed
+            $this->__log(__METHOD__.' - deleting thumbnails folder '.$thumbnail_path);
+            $this->unlinkRecursive($thumbnail_path);
+
+            $array = [
+                    'Error' => '',
+                    'Code'  => 0,
+                    'Path'  => $this->formatPath($this->get['path']),
+            ];
+
+            $this->__log(__METHOD__.' - deleting folder '.$current_path);
+
+            return $array;
+        } elseif (file_exists($current_path)) {
+            unlink($current_path);
+
+            // delete thumbail if exists
+            $this->__log(__METHOD__.' - deleting thumbnail file '.$thumbnail_path);
+            if (file_exists($thumbnail_path)) {
+                unlink($thumbnail_path);
+            }
+
+            $array = [
+                    'Error' => '',
+                    'Code'  => 0,
+                    'Path'  => $this->formatPath($this->get['path']),
+            ];
+
+            $this->__log(__METHOD__.' - deleting file '.$current_path);
+
+            return $array;
+        } else {
+            $this->error(sprintf($this->lang('INVALID_DIRECTORY_OR_FILE')));
+        }
+    }
+
+    public function replace()
+    {
+        $this->setParams();
+
+        if (!isset($_FILES['fileR']) || !is_uploaded_file($_FILES['fileR']['tmp_name'])) {
+
+            // if fileSize limit set by the user is greater than size allowed in php.ini file, we apply server restrictions
+            // and log a warning into file
+            if ($this->config['upload']['fileSizeLimit'] > $this->getMaxUploadFileSize()) {
+                $this->__log(__METHOD__.' [WARNING] : file size limit set by user is greater than size allowed in php.ini file : '.$this->config['upload']['fileSizeLimit'].$this->lang('mb').' > '.$this->getMaxUploadFileSize().$this->lang('mb').'.');
+                $this->config['upload']['fileSizeLimit'] = $this->getMaxUploadFileSize();
+                $this->error(sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'), $this->config['upload']['fileSizeLimit'].$this->lang('mb')), true);
+            }
+
+            $this->error(sprintf($this->lang('INVALID_FILE_UPLOAD').' '.sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'), $this->config['upload']['fileSizeLimit'].$this->lang('mb'))), true);
+        }
+        // we determine max upload size if not set
+        if ($this->config['upload']['fileSizeLimit'] == 'auto') {
+            $this->config['upload']['fileSizeLimit'] = $this->getMaxUploadFileSize();
+        }
+
+        if ($_FILES['fileR']['size'] > ($this->config['upload']['fileSizeLimit'] * 1024 * 1024)) {
+            $this->error(sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'), $this->config['upload']['fileSizeLimit'].$this->lang('mb')), true);
+        }
+
+        // we check the given file has the same extension as the old one
+        if (strtolower(pathinfo($_FILES['fileR']['name'], PATHINFO_EXTENSION)) != strtolower(pathinfo($this->post['newfilepath'], PATHINFO_EXTENSION))) {
+            $this->error(sprintf($this->lang('ERROR_REPLACING_FILE').' '.pathinfo($this->post['newfilepath'], PATHINFO_EXTENSION)), true);
+        }
+
+        if (!$this->is_allowed_file_type($_FILES['fileR']['name'])) {
+            $this->error(sprintf($this->lang('INVALID_FILE_TYPE')), true);
+        }
+
+        // we check if extension is allowed regarding the security Policy settings
+        if (!$this->is_allowed_file_type($_FILES['fileR']['name'])) {
+            $this->error(sprintf($this->lang('INVALID_FILE_TYPE')), true);
+        }
+
+        // we check if only images are allowed
+        if ($this->config['upload']['imagesOnly'] || (isset($this->params['type']) && strtolower($this->params['type']) == 'images')) {
+            if (!($size = @getimagesize($_FILES['fileR']['tmp_name']))) {
+                $this->error(sprintf($this->lang('UPLOAD_IMAGES_ONLY')), true);
+            }
+            if (!in_array($size[2], [1, 2, 3, 7, 8])) {
+                $this->error(sprintf($this->lang('UPLOAD_IMAGES_TYPE_JPEG_GIF_PNG')), true);
+            }
+        }
+
+        $current_path = $this->getFullPath($this->post['newfilepath']);
+
+        // check if file is writable
+        if (!$this->has_system_permission($current_path, ['w'])) {
+            $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')), true);
+        }
+
+        if (!$this->has_permission('replace') || !$this->is_valid_path($current_path)) {
+            $this->error('No way.');
+        }
+
+        move_uploaded_file($_FILES['fileR']['tmp_name'], $current_path);
+
+        // we delete thumbnail if file is image and thumbnail already
+        if ($this->is_image($current_path) && file_exists($this->get_thumbnail($current_path))) {
+            unlink($this->get_thumbnail($current_path));
+        }
+
+        // automatically resize image if it's too big
+        $imagePath = $current_path;
+        if ($this->is_image($imagePath) && $this->config['images']['resize']['enabled']) {
+            if ($size = @getimagesize($imagePath)) {
+                if ($size[0] > $this->config['images']['resize']['maxWidth'] || $size[1] > $this->config['images']['resize']['maxHeight']) {
+                    require_once './inc/wideimage/lib/WideImage.php';
+
+                    $image = WideImage::load($imagePath);
+                    $resized = $image->resize($this->config['images']['resize']['maxWidth'], $this->config['images']['resize']['maxHeight'], 'inside');
+                    $resized->saveToFile($imagePath);
+
+                    $this->__log(__METHOD__.' - resizing image : '.$current_path);
+                }
+            }
+        }
+
+        chmod($current_path, 0644);
+
+        $response = [
+                'Path'  => dirname($this->post['newfilepath']),
+                'Name'  => basename($this->post['newfilepath']),
+                'Error' => '',
+                'Code'  => 0,
+        ];
+
+        $this->__log(__METHOD__.' - replacing file '.$current_path);
+
+        echo '<textarea>'.json_encode($response).'</textarea>';
+        die();
+    }
+
+    public function add()
+    {
+        $this->setParams();
+
+        if (!isset($_FILES['newfile']) || !is_uploaded_file($_FILES['newfile']['tmp_name'])) {
+
+            // if fileSize limit set by the user is greater than size allowed in php.ini file, we apply server restrictions
+            // and log a warning into file
+            if ($this->config['upload']['fileSizeLimit'] > $this->getMaxUploadFileSize()) {
+                $this->__log(__METHOD__.' [WARNING] : file size limit set by user is greater than size allowed in php.ini file : '.$this->config['upload']['fileSizeLimit'].'Mb > '.$this->getMaxUploadFileSize().'Mb.');
+                $this->config['upload']['fileSizeLimit'] = $this->getMaxUploadFileSize();
+                $this->error(sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'), $this->config['upload']['fileSizeLimit'].$this->lang('mb')), true);
+            }
+
+            $this->error(sprintf($this->lang('INVALID_FILE_UPLOAD').' '.sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'), $this->config['upload']['fileSizeLimit'].$this->lang('mb'))), true);
+        }
+        // we determine max upload size if not set
+        if ($this->config['upload']['fileSizeLimit'] == 'auto') {
+            $this->config['upload']['fileSizeLimit'] = $this->getMaxUploadFileSize();
+        }
+
+        if ($_FILES['newfile']['size'] > ($this->config['upload']['fileSizeLimit'] * 1024 * 1024)) {
+            $this->error(sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'), $this->config['upload']['fileSizeLimit'].$this->lang('mb')), true);
+        }
+
+        // we check if extension is allowed regarding the security Policy settings
+        if (!$this->is_allowed_file_type($_FILES['newfile']['name'])) {
+            $this->error(sprintf($this->lang('INVALID_FILE_TYPE')), true);
+        }
+
+        // we check if only images are allowed
+        if ($this->config['upload']['imagesOnly'] || (isset($this->params['type']) && strtolower($this->params['type']) == 'images')) {
+            if (!($size = @getimagesize($_FILES['newfile']['tmp_name']))) {
+                $this->error(sprintf($this->lang('UPLOAD_IMAGES_ONLY')), true);
+            }
+            if (!in_array($size[2], [1, 2, 3, 7, 8])) {
+                $this->error(sprintf($this->lang('UPLOAD_IMAGES_TYPE_JPEG_GIF_PNG')), true);
+            }
+        }
+        $_FILES['newfile']['name'] = $this->cleanString($_FILES['newfile']['name'], ['.', '-']);
+
+        $current_path = $this->getFullPath($this->post['currentpath']);
+
+        if (!$this->is_valid_path($current_path)) {
+            $this->error('No way.');
+        }
+
+        if (!$this->config['upload']['overwrite']) {
+            $_FILES['newfile']['name'] = $this->checkFilename($current_path, $_FILES['newfile']['name']);
+        }
+        move_uploaded_file($_FILES['newfile']['tmp_name'], $current_path.$_FILES['newfile']['name']);
+
+        // automatically resize image if it's too big
+        $imagePath = $current_path.$_FILES['newfile']['name'];
+        if ($this->is_image($imagePath) && $this->config['images']['resize']['enabled']) {
+            if ($size = @getimagesize($imagePath)) {
+                if ($size[0] > $this->config['images']['resize']['maxWidth'] || $size[1] > $this->config['images']['resize']['maxHeight']) {
+                    require_once './inc/wideimage/lib/WideImage.php';
+
+                    $image = WideImage::load($imagePath);
+                    $resized = $image->resize($this->config['images']['resize']['maxWidth'], $this->config['images']['resize']['maxHeight'], 'inside');
+                    $resized->saveToFile($imagePath);
+
+                    $this->__log(__METHOD__.' - resizing image : '.$_FILES['newfile']['name'].' into '.$current_path);
+                }
+            }
+        }
+
+        chmod($current_path.$_FILES['newfile']['name'], 0644);
+
+        $response = [
+                'Path'  => $this->post['currentpath'],
+                'Name'  => $_FILES['newfile']['name'],
+                'Error' => '',
+                'Code'  => 0,
+        ];
+
+        $this->__log(__METHOD__.' - adding file '.$_FILES['newfile']['name'].' into '.$current_path);
+
+        echo '<textarea>'.json_encode($response).'</textarea>';
+        die();
+    }
+
+    public function addfolder()
+    {
+        $current_path = $this->getFullPath();
+
+        if (!$this->is_valid_path($current_path)) {
+            $this->error('No way.');
+        }
+        if (is_dir($current_path.$this->get['name'])) {
+            $this->error(sprintf($this->lang('DIRECTORY_ALREADY_EXISTS'), $this->get['name']));
+        }
+        $newdir = $this->cleanString($this->get['name']);
+        if (!mkdir($current_path.$newdir, 0755)) {
+            $this->error(sprintf($this->lang('UNABLE_TO_CREATE_DIRECTORY'), $newdir));
+        }
+        $array = [
+                'Parent' => $this->get['path'],
+                'Name'   => $this->get['name'],
+                'Error'  => '',
+                'Code'   => 0,
+        ];
+        $this->__log(__METHOD__.' - adding folder '.$current_path.$newdir);
+
+        return $array;
+    }
+
+    /**
+     * function zipFile.  Creates a zip file from source to destination.
+     *
+     * @param string      $source      Source path for zip
+     * @param string      $destination Destination path for zip
+     * @param string|bool $flag        OPTIONAL If true includes the folder also
+     *
+     * @return bool
+     *
+     * @link 	 http://stackoverflow.com/questions/17584869/zip-main-folder-with-sub-folder-inside
+     */
+    public function zipFile($source, $destination, $flag = '')
+    {
+        if (!extension_loaded('zip') || !file_exists($source)) {
+            return false;
+        }
+
+        $zip = new ZipArchive();
+        if (!$zip->open($destination, ZIPARCHIVE::CREATE)) {
+            return false;
+        }
+
+        $source = str_replace('\\', '/', realpath($source));
+        if ($flag) {
+            $flag = basename($source).'/';
+            //$zip->addEmptyDir(basename($source) . '/');
+        }
+
+        if (is_dir($source) === true) {
+            // add file to prevent empty archive error on download
+            $zip->addFromString('fm', "This archive has been generated by simogeo's Filemanager : https://github.com/simogeo/Filemanager/");
+
+            $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($source), RecursiveIteratorIterator::SELF_FIRST);
+            foreach ($files as $file) {
+                $file = str_replace('\\', '/', realpath($file));
+
+                if (is_dir($file) === true) {
+                    $zip->addEmptyDir(str_replace($source.'/', '', $flag.$file.'/'));
+                } elseif (is_file($file) === true) {
+                    $zip->addFromString(str_replace($source.'/', '', $flag.$file), file_get_contents($file));
+                }
+            }
+        } elseif (is_file($source) === true) {
+            $zip->addFromString($flag.basename($source), file_get_contents($source));
+        }
+
+        return $zip->close();
+    }
+
+    public function download()
+    {
+        $current_path = $this->getFullPath();
+
+        if (!$this->has_permission('download') || !$this->is_valid_path($current_path)) {
+            $this->error('No way.');
+        }
+
+        // check if file is writable
+        if (!$this->has_system_permission($current_path, ['w'])) {
+            $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')), true);
+        }
+
+        // we check if extension is allowed regarding the security Policy settings
+        if (is_file($current_path)) {
+            if (!$this->is_allowed_file_type(basename($current_path))) {
+                $this->error(sprintf($this->lang('INVALID_FILE_TYPE')), true);
+            }
+        } else {
+
+            // check if permission is granted
+            if (is_dir($current_path) && $this->config['security']['allowFolderDownload'] == false) {
+                $this->error(sprintf($this->lang('NOT_ALLOWED')), true);
+            }
+
+            // check if not requesting main FM userfiles folder
+            if ($this->is_root_folder($current_path)) {
+                $this->error(sprintf($this->lang('NOT_ALLOWED')), true);
+            }
+
+            $destination_path = sys_get_temp_dir().'/'.uniqid().'.zip';
+
+            // if Zip archive is created
+            if ($this->zipFile($current_path, $destination_path, true)) {
+                $current_path = $destination_path;
+            } else {
+                $this->error($this->lang('ERROR_CREATING_ZIP'));
+            }
+        }
+
+        if (isset($this->get['path']) && file_exists($current_path)) {
+            header('Content-type: application/force-download');
+            header('Content-Disposition: inline; filename="'.basename($current_path).'"');
+            header('Content-Transfer-Encoding: Binary');
+            header('Content-length: '.filesize($current_path));
+            header('Content-Type: application/octet-stream');
+            header('Content-Disposition: attachment; filename="'.basename($current_path).'"');
+            readfile($current_path);
+            $this->__log(__METHOD__.' - downloading '.$current_path);
+            exit();
+        } else {
+            $this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'), $current_path));
+        }
+    }
+
+    public function preview($thumbnail)
+    {
+        $current_path = $this->getFullPath();
+
+        if (isset($this->get['path']) && file_exists($current_path)) {
+
+            // if $thumbnail is set to true we return the thumbnail
+            if ($this->config['options']['generateThumbnails'] == true && $thumbnail == true) {
+                // get thumbnail (and create it if needed)
+                $returned_path = $this->get_thumbnail($current_path);
+            } else {
+                $returned_path = $current_path;
+            }
+
+            header('Content-type: image/'.strtolower(pathinfo($returned_path, PATHINFO_EXTENSION)));
+            header('Content-Transfer-Encoding: Binary');
+            header('Content-length: '.filesize($returned_path));
+            header('Content-Disposition: inline; filename="'.basename($returned_path).'"');
+            readfile($returned_path);
+
+            exit();
+        } else {
+            $this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'), $current_path));
+        }
+    }
+
+    public function getMaxUploadFileSize()
+    {
+        $max_upload = (int) ini_get('upload_max_filesize');
+        $max_post = (int) ini_get('post_max_size');
+        $memory_limit = (int) ini_get('memory_limit');
+
+        $upload_mb = min($max_upload, $max_post, $memory_limit);
+
+        $this->__log(__METHOD__.' - max upload file size is '.$upload_mb.'Mb');
+
+        return $upload_mb;
+    }
+
+    private function setParams()
+    {
+        $tmp = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/');
+        $tmp = explode('?', $tmp);
+        $params = [];
+        if (isset($tmp[1]) && $tmp[1] != '') {
+            $params_tmp = explode('&', $tmp[1]);
+            if (is_array($params_tmp)) {
+                foreach ($params_tmp as $value) {
+                    $tmp = explode('=', $value);
+                    if (isset($tmp[0]) && $tmp[0] != '' && isset($tmp[1]) && $tmp[1] != '') {
+                        $params[$tmp[0]] = $tmp[1];
+                    }
+                }
+            }
+        }
+        $this->params = $params;
+    }
+
+    private function setPermissions()
+    {
+        $this->allowed_actions = $this->config['options']['capabilities'];
+
+        if ($this->config['edit']['enabled']) {
+            array_push($this->allowed_actions, 'edit');
+        }
+    }
+
+    // check if system permission is granted
+    private function has_system_permission($filepath, $perms)
+    {
+        if (in_array('r', $perms)) {
+            if (!is_readable($filepath)) {
+                return false;
+            }
+        }
+        if (in_array('w', $perms)) {
+            if (!is_writable($filepath)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private function get_file_info($path = '', $thumbnail = false)
+    {
+
+        // DO NOT  rawurlencode() since $current_path it
+        // is used for displaying name file
+        if ($path == '') {
+            $current_path = $this->get['path'];
+        } else {
+            $current_path = $path;
+        }
+        $tmp = explode('/', $current_path);
+        $this->item['filename'] = $tmp[(count($tmp) - 1)];
+
+        $tmp = explode('.', $this->item['filename']);
+        $this->item['filetype'] = $tmp[(count($tmp) - 1)];
+        $this->item['filemtime'] = filemtime($this->getFullPath($current_path));
+        $this->item['filectime'] = filectime($this->getFullPath($current_path));
+
+        // check if file is writable and readable
+        if (!$this->has_system_permission($this->getFullPath($current_path), ['w', 'r'])) {
+            $this->item['protected'] = 1;
+            $this->item['preview'] = $this->config['icons']['path'].'locked_'.$this->config['icons']['default'];
+            // prevent Internal Server Error HTTP_CODE 500 on non readable files/folders
+            // without returning errors
+            return;
+        } else {
+            $this->item['protected'] = 0;
+            $this->item['preview'] = $this->config['icons']['path'].$this->config['icons']['default'];
+        }
+
+        if (is_dir($current_path)) {
+            $this->item['preview'] = $this->config['icons']['path'].$this->config['icons']['directory'];
+        } elseif (in_array(strtolower($this->item['filetype']), array_map('strtolower', $this->config['images']['imagesExt']))) {
+
+            // svg should not be previewed as raster formats images
+            if ($this->item['filetype'] == 'svg') {
+                $this->item['preview'] = $current_path;
+            } else {
+                $this->item['preview'] = 'connectors/php/filemanager.php?mode=preview&path='.rawurlencode($current_path).'&'.time();
+                if ($thumbnail) {
+                    $this->item['preview'] .= '&thumbnail=true';
+                }
+            }
+            //if(isset($get['getsize']) && $get['getsize']=='true') {
+            $this->item['properties']['Size'] = filesize($this->getFullPath($current_path));
+            if ($this->item['properties']['Size']) {
+                list($width, $height, $type, $attr) = getimagesize($this->getFullPath($current_path));
+            } else {
+                $this->item['properties']['Size'] = 0;
+                list($width, $height) = [0, 0];
+            }
+            $this->item['properties']['Height'] = $height;
+            $this->item['properties']['Width'] = $width;
+            $this->item['properties']['Size'] = filesize($this->getFullPath($current_path));
+            //}
+        } elseif (file_exists($this->root.$this->config['icons']['path'].strtolower($this->item['filetype']).'.png')) {
+            $this->item['preview'] = $this->config['icons']['path'].strtolower($this->item['filetype']).'.png';
+            $this->item['properties']['Size'] = filesize($this->getFullPath($current_path));
+            if (!$this->item['properties']['Size']) {
+                $this->item['properties']['Size'] = 0;
+            }
+        }
+
+        $this->item['properties']['Date Modified'] = date($this->config['options']['dateFormat'], $this->item['filemtime']);
+        $this->item['properties']['filemtime'] = filemtime($this->getFullPath($current_path));
+    //$return['properties']['Date Created'] = $this->config['options']['dateFormat'], $return['filectime']); // PHP cannot get create timestamp
+    }
+
+    private function getFullPath($path = '')
+    {
+        if ($path == '') {
+            if (isset($this->get['path'])) {
+                $path = $this->get['path'];
+            }
+        }
+
+        if ($this->config['options']['fileRoot'] !== false) {
+            $full_path = $this->doc_root.rawurldecode(str_replace($this->doc_root, '', $path));
+            if ($this->dynamic_fileroot != '') {
+                $full_path = $this->doc_root.rawurldecode(str_replace($this->dynamic_fileroot, '', $path));
+            // $dynPart = str_replace($_SERVER['DOCUMENT_ROOT'], '', $this->path_to_files); // instruction could replace the line above
+            // $full_path = $this->path_to_files . rawurldecode(str_replace ( $dynPart , '' , $path)); // instruction could replace the line above
+            }
+        } else {
+            $full_path = $this->doc_root.rawurldecode($path);
+        }
+
+        $full_path = str_replace('//', '/', $full_path);
+
+    // $this->__log("getFullPath() returned path : " . $full_path);
+
+    return $full_path;
+    }
 
 /**
- * format path regarding the initial configuration
+ * format path regarding the initial configuration.
+ *
  * @param string $path
  */
-private function formatPath($path) {
-	
-	if($this->dynamic_fileroot != '') {
-		
-		$a = explode($this->separator, $path);
-		return end($a);
-		
-	} else {
-		
-		return $path;
-		
-	}
+private function formatPath($path)
+{
+    if ($this->dynamic_fileroot != '') {
+        $a = explode($this->separator, $path);
 
+        return end($a);
+    } else {
+        return $path;
+    }
 }
 
-private function sortFiles($array) {
+    private function sortFiles($array)
+    {
 
-	// handle 'NAME_ASC'
-	if($this->config['options']['fileSorting'] == 'NAME_ASC') {
-		$array = array_reverse($array);
-	}
+    // handle 'NAME_ASC'
+    if ($this->config['options']['fileSorting'] == 'NAME_ASC') {
+        $array = array_reverse($array);
+    }
 
-	// handle 'TYPE_ASC' and 'TYPE_DESC'
-	if(strpos($this->config['options']['fileSorting'], 'TYPE_') !== false || $this->config['options']['fileSorting'] == 'default') {
-		
-		$a = array();
-		$b = array();
-		
-		foreach ($array as $key=>$item){
-			if(strcmp($item["File Type"], "dir") == 0) {
-				$a[$key]=$item;
-			}else{
-				$b[$key]=$item;
-			}
-		}
+    // handle 'TYPE_ASC' and 'TYPE_DESC'
+    if (strpos($this->config['options']['fileSorting'], 'TYPE_') !== false || $this->config['options']['fileSorting'] == 'default') {
+        $a = [];
+        $b = [];
 
-		if($this->config['options']['fileSorting'] == 'TYPE_ASC') {
-			$array = array_merge($a, $b);
-		}
+        foreach ($array as $key => $item) {
+            if (strcmp($item['File Type'], 'dir') == 0) {
+                $a[$key] = $item;
+            } else {
+                $b[$key] = $item;
+            }
+        }
 
-		if($this->config['options']['fileSorting'] == 'TYPE_DESC' || $this->config['options']['fileSorting'] == 'default') {
-			$array = array_merge($b, $a);
-		}
-	}
+        if ($this->config['options']['fileSorting'] == 'TYPE_ASC') {
+            $array = array_merge($a, $b);
+        }
 
-	// handle 'MODIFIED_ASC' and 'MODIFIED_DESC'
-	if(strpos($this->config['options']['fileSorting'], 'MODIFIED_') !== false) {
+        if ($this->config['options']['fileSorting'] == 'TYPE_DESC' || $this->config['options']['fileSorting'] == 'default') {
+            $array = array_merge($b, $a);
+        }
+    }
 
-		$modified_order_array = array();  // new array as a column to sort collector
+    // handle 'MODIFIED_ASC' and 'MODIFIED_DESC'
+    if (strpos($this->config['options']['fileSorting'], 'MODIFIED_') !== false) {
+        $modified_order_array = [];  // new array as a column to sort collector
 
-		foreach ($array as $item) {
-			$modified_order_array[] = $item['Properties']['filemtime'];
-		}
+        foreach ($array as $item) {
+            $modified_order_array[] = $item['Properties']['filemtime'];
+        }
 
-		if($this->config['options']['fileSorting'] == 'MODIFIED_ASC') {
-			array_multisort($modified_order_array, SORT_ASC, $array);
-		}
-		if($this->config['options']['fileSorting'] == 'MODIFIED_DESC') {
-			array_multisort($modified_order_array, SORT_DESC, $array);
-		}
-		return $array;
+        if ($this->config['options']['fileSorting'] == 'MODIFIED_ASC') {
+            array_multisort($modified_order_array, SORT_ASC, $array);
+        }
+        if ($this->config['options']['fileSorting'] == 'MODIFIED_DESC') {
+            array_multisort($modified_order_array, SORT_DESC, $array);
+        }
 
-	}
-	
-	return $array;
+        return $array;
+    }
 
-
-}
+        return $array;
+    }
 
 // @todo to remove
 // private function startsWith($haystack, $needle) {
@@ -1175,359 +1172,360 @@ private function sortFiles($array) {
 //     return $needle === "" || strrpos($haystack, $needle, -strlen($haystack)) !== FALSE;
 // }
 
-private function is_valid_path($path) {
-	
-	//  @todo to remove
+private function is_valid_path($path)
+{
+
+    //  @todo to remove
   // if(!$this->startsWith(realpath($path), realpath($this->path_to_files))) return false;
   // @see https://github.com/simogeo/Filemanager/issues/332
   // @see http://stackoverflow.com/questions/5642785/php-a-good-way-to-universalize-paths-across-oss-slash-directions
-  
-	// $givenpath = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);
-	// $rootpath = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->path_to_files);
-	// $this->__log('substr doc_root : ' . substr(realpath($path) . DIRECTORY_SEPARATOR, 0, strlen($this->doc_root)));
-	// $this->__log('doc_root : ' . realpath($this->doc_root) . DIRECTORY_SEPARATOR);
-	
-	// return $this->startsWith($givenpath, $rootpath);
-	
-	$this->__log('substr path_to_files : ' . substr(realpath($path) . DIRECTORY_SEPARATOR, 0, strlen($this->path_to_files)));
-	$this->__log('path_to_files : ' . realpath($this->path_to_files) . DIRECTORY_SEPARATOR);
-	
-	return (substr(realpath($path) . DIRECTORY_SEPARATOR, 0, strlen(realpath($this->path_to_files))) . DIRECTORY_SEPARATOR) == (realpath($this->path_to_files) . DIRECTORY_SEPARATOR);
-	
-	
+
+    // $givenpath = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);
+    // $rootpath = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->path_to_files);
+    // $this->__log('substr doc_root : ' . substr(realpath($path) . DIRECTORY_SEPARATOR, 0, strlen($this->doc_root)));
+    // $this->__log('doc_root : ' . realpath($this->doc_root) . DIRECTORY_SEPARATOR);
+
+    // return $this->startsWith($givenpath, $rootpath);
+
+    $this->__log('substr path_to_files : '.substr(realpath($path).DIRECTORY_SEPARATOR, 0, strlen($this->path_to_files)));
+    $this->__log('path_to_files : '.realpath($this->path_to_files).DIRECTORY_SEPARATOR);
+
+    return (substr(realpath($path).DIRECTORY_SEPARATOR, 0, strlen(realpath($this->path_to_files))).DIRECTORY_SEPARATOR) == (realpath($this->path_to_files).DIRECTORY_SEPARATOR);
 }
 
-private function unlinkRecursive($dir,$deleteRootToo=true) {
-	if(!$dh = @opendir($dir)) {
-		return;
-	}
-	while (false !== ($obj = readdir($dh))) {
-		if($obj == '.' || $obj == '..') {
-			continue;
-		}
+    private function unlinkRecursive($dir, $deleteRootToo = true)
+    {
+        if (!$dh = @opendir($dir)) {
+            return;
+        }
+        while (false !== ($obj = readdir($dh))) {
+            if ($obj == '.' || $obj == '..') {
+                continue;
+            }
 
-		if (!@unlink($dir . '/' . $obj)) {
-			$this->unlinkRecursive($dir.'/'.$obj, true);
-		}
-	}
+            if (!@unlink($dir.'/'.$obj)) {
+                $this->unlinkRecursive($dir.'/'.$obj, true);
+            }
+        }
 
-	closedir($dh);
+        closedir($dh);
 
-	if ($deleteRootToo) {
-		@rmdir($dir);
-	}
+        if ($deleteRootToo) {
+            @rmdir($dir);
+        }
 
-	return;
-}
+        return;
+    }
 
 /**
  * is_allowed_file_type()
- * check if extension is allowed regarding the security Policy / Restrictions settings
+ * check if extension is allowed regarding the security Policy / Restrictions settings.
+ *
  * @param string $file
  */
-private function is_allowed_file_type($file) {
-	
-	$path_parts = pathinfo($file);
-			
-	// if there is no extension
-	if (! isset ( $path_parts ['extension'] )) {
-		// we check if no extension file are allowed
-		return (bool) $this->config['security']['allowNoExtension'];
-	}
-	
-	$exts = array_map('strtolower', $this->config['security']['uploadRestrictions']);
-	
-	if($this->config['security']['uploadPolicy'] == 'DISALLOW_ALL') {
-			
-		if(!in_array(strtolower($path_parts['extension']), $exts))
-			return false;
-	}
-	if($this->config['security']['uploadPolicy'] == 'ALLOW_ALL') {
-	
-		if(in_array(strtolower($path_parts['extension']), $exts))
-			return false;
-	}
-	
-	return true;
-	
+private function is_allowed_file_type($file)
+{
+    $path_parts = pathinfo($file);
+
+    // if there is no extension
+    if (!isset($path_parts ['extension'])) {
+        // we check if no extension file are allowed
+        return (bool) $this->config['security']['allowNoExtension'];
+    }
+
+    $exts = array_map('strtolower', $this->config['security']['uploadRestrictions']);
+
+    if ($this->config['security']['uploadPolicy'] == 'DISALLOW_ALL') {
+        if (!in_array(strtolower($path_parts['extension']), $exts)) {
+            return false;
+        }
+    }
+    if ($this->config['security']['uploadPolicy'] == 'ALLOW_ALL') {
+        if (in_array(strtolower($path_parts['extension']), $exts)) {
+            return false;
+        }
+    }
+
+    return true;
 }
 
-private function cleanString($string, $allowed = array()) {
-	$allow = null;
+    private function cleanString($string, $allowed = [])
+    {
+        $allow = null;
 
-	if (!empty($allowed)) {
-		foreach ($allowed as $value) {
-			$allow .= "\\$value";
-		}
-	}
+        if (!empty($allowed)) {
+            foreach ($allowed as $value) {
+                $allow .= "\\$value";
+            }
+        }
 
-	$mapping = array(
-			'Š'=>'S', 'š'=>'s', 'Đ'=>'Dj', 'đ'=>'dj', 'Ž'=>'Z', 'ž'=>'z', 'Č'=>'C', 'č'=>'c', 'Ć'=>'C', 'ć'=>'c',
-			'À'=>'A', 'Á'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Ä'=>'A', 'Å'=>'A', 'Æ'=>'A', 'Ç'=>'C', 'È'=>'E', 'É'=>'E',
-			'Ê'=>'E', 'Ë'=>'E', 'Ì'=>'I', 'Í'=>'I', 'Î'=>'I', 'Ï'=>'I', 'Ñ'=>'N', 'Ò'=>'O', 'Ó'=>'O', 'Ô'=>'O',
-			'Õ'=>'O', 'Ö'=>'O', 'Ő'=>'O', 'Ø'=>'O', 'Ù'=>'U', 'Ú'=>'U', 'Û'=>'U', 'Ü'=>'U', 'Ű'=>'U', 'Ý'=>'Y',
-			'Þ'=>'B', 'ß'=>'Ss','à'=>'a', 'á'=>'a', 'â'=>'a', 'ã'=>'a', 'ä'=>'a', 'å'=>'a', 'æ'=>'a', 'ç'=>'c',
-			'è'=>'e', 'é'=>'e', 'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'o', 'ñ'=>'n',
-			'ò'=>'o', 'ó'=>'o', 'ô'=>'o', 'õ'=>'o', 'ö'=>'o', 'ő'=>'o', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'ű'=>'u',
-			'û'=>'u', 'ü'=>'u', 'ý'=>'y', 'ý'=>'y', 'þ'=>'b', 'ÿ'=>'y', 'Ŕ'=>'R', 'ŕ'=>'r', ' '=>'_', "'"=>'_', '/'=>''
-	);
+        $mapping = [
+            'Š' => 'S', 'š' => 's', 'Đ' => 'Dj', 'đ' => 'dj', 'Ž' => 'Z', 'ž' => 'z', 'Č' => 'C', 'č' => 'c', 'Ć' => 'C', 'ć' => 'c',
+            'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A', 'Æ' => 'A', 'Ç' => 'C', 'È' => 'E', 'É' => 'E',
+            'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I', 'Ñ' => 'N', 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O',
+            'Õ' => 'O', 'Ö' => 'O', 'Ő' => 'O', 'Ø' => 'O', 'Ù' => 'U', 'Ú' => 'U', 'Û' => 'U', 'Ü' => 'U', 'Ű' => 'U', 'Ý' => 'Y',
+            'Þ' => 'B', 'ß' => 'Ss', 'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a', 'å' => 'a', 'æ' => 'a', 'ç' => 'c',
+            'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e', 'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i', 'ð' => 'o', 'ñ' => 'n',
+            'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ő' => 'o', 'ø' => 'o', 'ù' => 'u', 'ú' => 'u', 'ű' => 'u',
+            'û' => 'u', 'ü' => 'u', 'ý' => 'y', 'ý' => 'y', 'þ' => 'b', 'ÿ' => 'y', 'Ŕ' => 'R', 'ŕ' => 'r', ' ' => '_', "'" => '_', '/' => '',
+    ];
 
-	if (is_array($string)) {
+        if (is_array($string)) {
+            $cleaned = [];
 
-		$cleaned = array();
+            foreach ($string as $key => $clean) {
+                $clean = strtr($clean, $mapping);
 
-		foreach ($string as $key => $clean) {
-			$clean = strtr($clean, $mapping);
+                if ($this->config['options']['chars_only_latin'] == true) {
+                    $clean = preg_replace("/[^{$allow}_a-zA-Z0-9]/u", '', $clean);
+                // $clean = preg_replace("/[^{$allow}_a-zA-Z0-9\x{0430}-\x{044F}\x{0410}-\x{042F}]/u", '', $clean); // allow only latin alphabet with cyrillic
+                }
+                $cleaned[$key] = preg_replace('/[_]+/', '_', $clean); // remove double underscore
+            }
+        } else {
+            $clean = strtr($string, $mapping);
+            if ($this->config['options']['chars_only_latin'] == true) {
+                $clean = preg_replace("/[^{$allow}_a-zA-Z0-9]/u", '', $clean);
+            // $clean = preg_replace("/[^{$allow}_a-zA-Z0-9\x{0430}-\x{044F}\x{0410}-\x{042F}]/u", '', $string); // allow only latin alphabet with cyrillic
+            }
+            $cleaned = preg_replace('/[_]+/', '_', $clean); // remove double underscore
+        }
 
-			if($this->config['options']['chars_only_latin'] == true) {
-				$clean = preg_replace("/[^{$allow}_a-zA-Z0-9]/u", '', $clean);
-				// $clean = preg_replace("/[^{$allow}_a-zA-Z0-9\x{0430}-\x{044F}\x{0410}-\x{042F}]/u", '', $clean); // allow only latin alphabet with cyrillic
-			}
-			$cleaned[$key] = preg_replace('/[_]+/', '_', $clean); // remove double underscore
-		}
-	} else {
-		$clean = strtr($string, $mapping);
-		if($this->config['options']['chars_only_latin'] == true) {
-			$clean = preg_replace("/[^{$allow}_a-zA-Z0-9]/u", '', $clean);
-			// $clean = preg_replace("/[^{$allow}_a-zA-Z0-9\x{0430}-\x{044F}\x{0410}-\x{042F}]/u", '', $string); // allow only latin alphabet with cyrillic
-		}
-		$cleaned = preg_replace('/[_]+/', '_', $clean); // remove double underscore
-		
-	}
-	return $cleaned;
-}
+        return $cleaned;
+    }
 
 /**
- * Checking if permission is set or not for a given action
+ * Checking if permission is set or not for a given action.
+ *
  * @param string $action
- * @return boolean
+ *
+ * @return bool
  */
-private function has_permission($action) {
-	return in_array($action, $this->allowed_actions);
+private function has_permission($action)
+{
+    return in_array($action, $this->allowed_actions);
 }
 
 /**
  * Return Thumbnail path from given path
- * works for both file and dir path
+ * works for both file and dir path.
+ *
  * @param string $path
  */
-private function get_thumbnail_path($path) {
-	
-	$pos = strrpos($path, $this->separator);
-	$a[0] = substr($path,0,$pos);
-	$a[1] = substr($path,$pos+strlen($this->separator));
+private function get_thumbnail_path($path)
+{
+    $pos = strrpos($path, $this->separator);
+    $a[0] = substr($path, 0, $pos);
+    $a[1] = substr($path, $pos + strlen($this->separator));
 
-	$path_parts = pathinfo($path);
+    $path_parts = pathinfo($path);
 
-	$thumbnail_path = $a[0].$this->separator.'/'.$this->cachefolder.dirname(end($a)).'/';
-	if(!is_dir($path)) $thumbnail_name = $path_parts['filename'] . '_' . $this->thumbnail_width . 'x' . $this->thumbnail_height . 'px.' . $path_parts['extension'];
-	
-	if(is_dir($path)) {
-		$thumbnail_fullpath = $thumbnail_path;
-	} else {
-		$thumbnail_fullpath = $thumbnail_path.$thumbnail_name;
-	}
+    $thumbnail_path = $a[0].$this->separator.'/'.$this->cachefolder.dirname(end($a)).'/';
+    if (!is_dir($path)) {
+        $thumbnail_name = $path_parts['filename'].'_'.$this->thumbnail_width.'x'.$this->thumbnail_height.'px.'.$path_parts['extension'];
+    }
 
-	return $thumbnail_fullpath;
+    if (is_dir($path)) {
+        $thumbnail_fullpath = $thumbnail_path;
+    } else {
+        $thumbnail_fullpath = $thumbnail_path.$thumbnail_name;
+    }
 
+    return $thumbnail_fullpath;
 }
 
 /**
  * For debugging just call
  * the direct URL http://localhost/Filemanager/connectors/php/filemanager.php?mode=preview&path=%2FFilemanager%2Fuserfiles%2FMy%20folder3%2Fblanches_neiges.jPg&thumbnail=true
- * and echo vars below
+ * and echo vars below.
+ *
  * @param string $path
  */
-private function get_thumbnail($path) {
-	
-	require_once('./inc/wideimage/lib/WideImage.php');
-	
-	$thumbnail_fullpath = $this->get_thumbnail_path($path);
-	
-	// echo $thumbnail_fullpath.'<br>';
-	
-	// if thumbnail does not exist we generate it or cacheThumbnail is set to false
-	if(!file_exists($thumbnail_fullpath) || $this->config['options']['cacheThumbnails'] == false) {
-		
-		// create folder if it does not exist
-		if(!file_exists(dirname($thumbnail_fullpath))) {
-			mkdir(dirname($thumbnail_fullpath), 0755, true);
-		}
-		$image = WideImage::load($path);
-		$resized = $image->resize($this->thumbnail_width, $this->thumbnail_height, 'outside')->crop('center', 'center', $this->thumbnail_width, $this->thumbnail_height);
-		$resized->saveToFile($thumbnail_fullpath);
-
-		$this->__log(__METHOD__ . ' - generating thumbnail :  '. $thumbnail_fullpath);
-		
-	}
-	
-	return $thumbnail_fullpath;
-}
-
-private function sanitize($var) {
-	
-	$sanitized = strip_tags($var);
-	$sanitized = str_replace('http://', '', $sanitized);
-	$sanitized = str_replace('https://', '', $sanitized);
-	$sanitized = str_replace('../', '', $sanitized);
-
-	return $sanitized;
-}
-
-private function checkFilename($path,$filename,$i='') {
-	if(!file_exists($path . $filename)) {
-		return $filename;
-	} else {
-		$_i = $i;
-		$tmp = explode(/*$this->config['upload']['suffix'] . */$i . '.',$filename);
-		if($i=='') {
-			$i=1;
-		} else {
-			$i++;
-		}
-		$filename = str_replace($_i . '.' . $tmp[(sizeof($tmp)-1)],$i . '.' . $tmp[(sizeof($tmp)-1)],$filename);
-		return $this->checkFilename($path,$filename,$i);
-	}
-}
-
-private function loadLanguageFile() {
-
-	// we load langCode var passed into URL if present and if exists
-	// else, we use default configuration var
-	$lang = $this->config['options']['culture'];
-	if(isset($this->params['langCode']) && in_array($this->params['langCode'], $this->languages)) $lang = $this->params['langCode'];
-
-	if(file_exists($this->root. 'scripts/languages/'.$lang.'.js')) {
-		$stream =file_get_contents($this->root. 'scripts/languages/'.$lang.'.js');
-		$this->language = json_decode($stream, true);
-	} else {
-		$l = substr($lang,0,2); // we try with 2 chars language file
-		if(file_exists($this->root. 'scripts/languages/'.$l.'.js')) {
-			$stream =file_get_contents($this->root. 'scripts/languages/'.$l.'.js');
-			$this->language = json_decode($stream, true);
-		} else {
-			// we include default language file
-			$stream =file_get_contents($this->root. 'scripts/languages/'.$this->config['options']['culture'].'.js');
-			$this->language = json_decode($stream, true);
-		}
-		
-	}
-}
-
-private function availableLanguages() {
-
-	if ($handle = opendir($this->root.'/scripts/languages/')) {
-		while (false !== ($file = readdir($handle))) {
-			if ($file != "." && $file != "..") {
-				array_push($this->languages, pathinfo($file, PATHINFO_FILENAME));
-			}
-		}
-		closedir($handle);
-	}
-}
-
-private function is_image($path) {
-	
-	$a = getimagesize($path);
-	$image_type = $a[2];
-
-	return in_array($image_type , array(IMAGETYPE_GIF , IMAGETYPE_JPEG ,IMAGETYPE_PNG , IMAGETYPE_BMP));
-}
-
-private function is_root_folder($path) {
-	return rtrim($this->path_to_files,"/") == rtrim($path,"/");
-}
-
-private function is_editable($file) {
-
-	$path_parts = pathinfo($file);
-	
-	$exts = array_map('strtolower', $this->config['edit']['editExt']);
-	
-	return in_array($path_parts['extension'], $exts);
-}
-
-
-private function get_user_ip()
+private function get_thumbnail($path)
 {
-	$client  = @$_SERVER['HTTP_CLIENT_IP'];
-	$forward = @$_SERVER['HTTP_X_FORWARDED_FOR'];
-	$remote  = $_SERVER['REMOTE_ADDR'];
+    require_once './inc/wideimage/lib/WideImage.php';
 
-	if(filter_var($client, FILTER_VALIDATE_IP))
-	{
-		$ip = $client;
-	}
-	elseif(filter_var($forward, FILTER_VALIDATE_IP))
-	{
-		$ip = $forward;
-	}
-	else
-	{
-		$ip = $remote;
-	}
+    $thumbnail_fullpath = $this->get_thumbnail_path($path);
 
-	return $ip;
+    // echo $thumbnail_fullpath.'<br>';
+
+    // if thumbnail does not exist we generate it or cacheThumbnail is set to false
+    if (!file_exists($thumbnail_fullpath) || $this->config['options']['cacheThumbnails'] == false) {
+
+        // create folder if it does not exist
+        if (!file_exists(dirname($thumbnail_fullpath))) {
+            mkdir(dirname($thumbnail_fullpath), 0755, true);
+        }
+        $image = WideImage::load($path);
+        $resized = $image->resize($this->thumbnail_width, $this->thumbnail_height, 'outside')->crop('center', 'center', $this->thumbnail_width, $this->thumbnail_height);
+        $resized->saveToFile($thumbnail_fullpath);
+
+        $this->__log(__METHOD__.' - generating thumbnail :  '.$thumbnail_fullpath);
+    }
+
+    return $thumbnail_fullpath;
 }
 
+    private function sanitize($var)
+    {
+        $sanitized = strip_tags($var);
+        $sanitized = str_replace('http://', '', $sanitized);
+        $sanitized = str_replace('https://', '', $sanitized);
+        $sanitized = str_replace('../', '', $sanitized);
 
-private function __log($msg) {
-		
-	if($this->logger == true) {
+        return $sanitized;
+    }
 
-		$fp = fopen($this->logfile, "a");
-		$str = "[" . date("d/m/Y h:i:s", time()) . "]#".  $this->get_user_ip() . "#" . $msg;
-		fwrite($fp, $str . PHP_EOL);
-		fclose($fp);
-	}
-		
-}
+    private function checkFilename($path, $filename, $i = '')
+    {
+        if (!file_exists($path.$filename)) {
+            return $filename;
+        } else {
+            $_i = $i;
+            $tmp = explode(/*$this->config['upload']['suffix'] . */$i.'.', $filename);
+            if ($i == '') {
+                $i = 1;
+            } else {
+                $i++;
+            }
+            $filename = str_replace($_i.'.'.$tmp[(count($tmp) - 1)], $i.'.'.$tmp[(count($tmp) - 1)], $filename);
 
-public function enableLog($logfile = '') {
-		
-	$this->logger = true;
-		
-	if($logfile != '') {
-		$this->logfile = $logfile;
-	}
-		
-	$this->__log(__METHOD__ . ' - Log enabled (in '. $this->logfile. ' file)');
-		
-}
+            return $this->checkFilename($path, $filename, $i);
+        }
+    }
 
-public function disableLog() {
+    private function loadLanguageFile()
+    {
 
-	$this->logger = false;
+    // we load langCode var passed into URL if present and if exists
+    // else, we use default configuration var
+    $lang = $this->config['options']['culture'];
+        if (isset($this->params['langCode']) && in_array($this->params['langCode'], $this->languages)) {
+            $lang = $this->params['langCode'];
+        }
 
-	$this->__log(__METHOD__ . ' - Log disabled');
-}
+        if (file_exists($this->root.'scripts/languages/'.$lang.'.js')) {
+            $stream = file_get_contents($this->root.'scripts/languages/'.$lang.'.js');
+            $this->language = json_decode($stream, true);
+        } else {
+            $l = substr($lang, 0, 2); // we try with 2 chars language file
+        if (file_exists($this->root.'scripts/languages/'.$l.'.js')) {
+            $stream = file_get_contents($this->root.'scripts/languages/'.$l.'.js');
+            $this->language = json_decode($stream, true);
+        } else {
+            // we include default language file
+            $stream = file_get_contents($this->root.'scripts/languages/'.$this->config['options']['culture'].'.js');
+            $this->language = json_decode($stream, true);
+        }
+        }
+    }
+
+    private function availableLanguages()
+    {
+        if ($handle = opendir($this->root.'/scripts/languages/')) {
+            while (false !== ($file = readdir($handle))) {
+                if ($file != '.' && $file != '..') {
+                    array_push($this->languages, pathinfo($file, PATHINFO_FILENAME));
+                }
+            }
+            closedir($handle);
+        }
+    }
+
+    private function is_image($path)
+    {
+        $a = getimagesize($path);
+        $image_type = $a[2];
+
+        return in_array($image_type, [IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP]);
+    }
+
+    private function is_root_folder($path)
+    {
+        return rtrim($this->path_to_files, '/') == rtrim($path, '/');
+    }
+
+    private function is_editable($file)
+    {
+        $path_parts = pathinfo($file);
+
+        $exts = array_map('strtolower', $this->config['edit']['editExt']);
+
+        return in_array($path_parts['extension'], $exts);
+    }
+
+    private function get_user_ip()
+    {
+        $client = @$_SERVER['HTTP_CLIENT_IP'];
+        $forward = @$_SERVER['HTTP_X_FORWARDED_FOR'];
+        $remote = $_SERVER['REMOTE_ADDR'];
+
+        if (filter_var($client, FILTER_VALIDATE_IP)) {
+            $ip = $client;
+        } elseif (filter_var($forward, FILTER_VALIDATE_IP)) {
+            $ip = $forward;
+        } else {
+            $ip = $remote;
+        }
+
+        return $ip;
+    }
+
+    private function __log($msg)
+    {
+        if ($this->logger == true) {
+            $fp = fopen($this->logfile, 'a');
+            $str = '['.date('d/m/Y h:i:s', time()).']#'.$this->get_user_ip().'#'.$msg;
+            fwrite($fp, $str.PHP_EOL);
+            fclose($fp);
+        }
+    }
+
+    public function enableLog($logfile = '')
+    {
+        $this->logger = true;
+
+        if ($logfile != '') {
+            $this->logfile = $logfile;
+        }
+
+        $this->__log(__METHOD__.' - Log enabled (in '.$this->logfile.' file)');
+    }
+
+    public function disableLog()
+    {
+        $this->logger = false;
+
+        $this->__log(__METHOD__.' - Log disabled');
+    }
 
 /**
- * Remove "../" from path
+ * Remove "../" from path.
  *
  * @param string path to be converted
  * @param bool if dir names should be cleaned
+ *
  * @return string or false in case of error (as exception are not used here)
  */
 public function expandPath($path, $clean = false)
 {
-	$todo  = explode('/', $path);
-	$fullPath = array();
+    $todo = explode('/', $path);
+    $fullPath = [];
 
-	foreach ($todo as $dir) {
-		if ($dir == '..') {
-			$element = array_pop($fullPath);
-			if (is_null($element)) {
-				return false;
-			}
-		} else {
-			if ($clean) {
-				$dir = $this->cleanString($dir);
-			}
-			array_push($fullPath, $dir);
-		}
-	}
-	return implode('/', $fullPath);
+    foreach ($todo as $dir) {
+        if ($dir == '..') {
+            $element = array_pop($fullPath);
+            if (is_null($element)) {
+                return false;
+            }
+        } else {
+            if ($clean) {
+                $dir = $this->cleanString($dir);
+            }
+            array_push($fullPath, $dir);
+        }
+    }
+
+    return implode('/', $fullPath);
 }
 }
-?>
diff --git a/public/filemanager/connectors/php/filemanager.php b/public/filemanager/connectors/php/filemanager.php
index fc3aa39f5..5ceeee09b 100644
--- a/public/filemanager/connectors/php/filemanager.php
+++ b/public/filemanager/connectors/php/filemanager.php
@@ -1,9 +1,10 @@
 <?php
+
 // only for debug
 // error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);
 // ini_set('display_errors', '1');
 /**
- *	Filemanager PHP connector
+ *	Filemanager PHP connector.
  *
  *	filemanager.php
  *	use for ckeditor filemanager plug-in by Core Five - http://labs.corefive.com/Projects/FileManager/
@@ -13,64 +14,64 @@
  *  @author		Simon Georget <simon (at) linea21 (dot) com>
  *	@copyright	Authors
  */
-
-require_once('filemanager.class.php');
+require_once 'filemanager.class.php';
 
 // for php 5.2 compatibility
 if (!function_exists('array_replace_recursive')) {
-	function array_replace_recursive($array, $array1) {
-		function recurse($array, $array1) {
-			foreach($array1 as $key => $value) {
-				// create new key in $array, if it is empty or not an array
-				if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
-					$array[$key] = array();
-				}
+    function array_replace_recursive($array, $array1)
+    {
+        function recurse($array, $array1)
+        {
+            foreach ($array1 as $key => $value) {
+                // create new key in $array, if it is empty or not an array
+                if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
+                    $array[$key] = [];
+                }
 
-				// overwrite the value in the base array
-				if (is_array($value)) {
-					$value = recurse($array[$key], $value);
-				}
-				$array[$key] = $value;
-			}
-			return $array;
-		}
+                // overwrite the value in the base array
+                if (is_array($value)) {
+                    $value = recurse($array[$key], $value);
+                }
+                $array[$key] = $value;
+            }
 
-		// handle the arguments, merge one by one
-		$args = func_get_args();
-		$array = $args[0];
-		if (!is_array($array)) {
-			return $array;
-		}
-		for ($i = 1; $i < count($args); $i++) {
-			if (is_array($args[$i])) {
-				$array = recurse($array, $args[$i]);
-			}
-		}
-		return $array;
+            return $array;
+        }
 
-	}
+        // handle the arguments, merge one by one
+        $args = func_get_args();
+        $array = $args[0];
+        if (!is_array($array)) {
+            return $array;
+        }
+        for ($i = 1; $i < count($args); $i++) {
+            if (is_array($args[$i])) {
+                $array = recurse($array, $args[$i]);
+            }
+        }
+
+        return $array;
+    }
 }
 
 // if user file is defined we include it, else we include the default file
-(file_exists('user.config.php')) ? include_once('user.config.php') : include_once('default.config.php');
+(file_exists('user.config.php')) ? include_once('user.config.php') : include_once 'default.config.php';
 
 // auth() function is already defined
 // and Filemanager is instantiated as $fm
 
 $response = '';
 
-if(!auth()) {
-  $fm->error($fm->lang('AUTHORIZATION_REQUIRED'));
+if (!auth()) {
+    $fm->error($fm->lang('AUTHORIZATION_REQUIRED'));
 }
 
-if(!isset($_GET)) {
-  $fm->error($fm->lang('INVALID_ACTION'));
+if (!isset($_GET)) {
+    $fm->error($fm->lang('INVALID_ACTION'));
 } else {
+    if (isset($_GET['mode']) && $_GET['mode'] != '') {
+        switch ($_GET['mode']) {
 
-  if(isset($_GET['mode']) && $_GET['mode']!='') {
-
-    switch($_GET['mode']) {
-      	
       default:
 
         $fm->error($fm->lang('MODE_ERROR'));
@@ -78,105 +79,101 @@ if(!isset($_GET)) {
 
       case 'getinfo':
 
-        if($fm->getvar('path')) {
-          $response = $fm->getinfo();
+        if ($fm->getvar('path')) {
+            $response = $fm->getinfo();
         }
         break;
 
       case 'getfolder':
-        	
-        if($fm->getvar('path')) {
-          $response = $fm->getfolder();
+
+        if ($fm->getvar('path')) {
+            $response = $fm->getfolder();
         }
         break;
 
       case 'rename':
 
-        if($fm->getvar('old') && $fm->getvar('new')) {
-          $response = $fm->rename();
+        if ($fm->getvar('old') && $fm->getvar('new')) {
+            $response = $fm->rename();
         }
         break;
 
       case 'move':
         // allow "../"
-        if($fm->getvar('old') && $fm->getvar('new') && $fm->getvar('root')) {
-          $response = $fm->move();
+        if ($fm->getvar('old') && $fm->getvar('new') && $fm->getvar('root')) {
+            $response = $fm->move();
         }
         break;
 
       case 'editfile':
-        	 
-        if($fm->getvar('path')) {
-        	$response = $fm->editfile();
+
+        if ($fm->getvar('path')) {
+            $response = $fm->editfile();
         }
         break;
-        
+
       case 'delete':
 
-        if($fm->getvar('path')) {
-          $response = $fm->delete();
+        if ($fm->getvar('path')) {
+            $response = $fm->delete();
         }
         break;
 
       case 'addfolder':
 
-        if($fm->getvar('path') && $fm->getvar('name')) {
-          $response = $fm->addfolder();
+        if ($fm->getvar('path') && $fm->getvar('name')) {
+            $response = $fm->addfolder();
         }
         break;
 
       case 'download':
-        if($fm->getvar('path')) {
-          $fm->download();
+        if ($fm->getvar('path')) {
+            $fm->download();
         }
         break;
-        
+
       case 'preview':
-        if($fm->getvar('path')) {
-        	if(isset($_GET['thumbnail'])) {
-        		$thumbnail = true;
-        	} else {
-        		$thumbnail = false;
-        	}
-          $fm->preview($thumbnail);
+        if ($fm->getvar('path')) {
+            if (isset($_GET['thumbnail'])) {
+                $thumbnail = true;
+            } else {
+                $thumbnail = false;
+            }
+            $fm->preview($thumbnail);
         }
         break;
     }
+    } elseif (isset($_POST['mode']) && $_POST['mode'] != '') {
+        switch ($_POST['mode']) {
 
-  } else if(isset($_POST['mode']) && $_POST['mode']!='') {
-
-    switch($_POST['mode']) {
-      	
       default:
 
         $fm->error($fm->lang('MODE_ERROR'));
         break;
-        	
+
       case 'add':
 
-        if($fm->postvar('currentpath')) {
-          $fm->add();
+        if ($fm->postvar('currentpath')) {
+            $fm->add();
         }
         break;
 
-    	case 'replace':
-    
-	    	if($fm->postvar('newfilepath')) {
-	    		$fm->replace();
-	    	}
-	    	break;
-    
-	    case 'savefile':
-	    	
-	    	if($fm->postvar('content', false) && $fm->postvar('path')) {
-	    		$response = $fm->savefile();
-	    	}
-	    	break;
-    }
+        case 'replace':
 
-  }
+            if ($fm->postvar('newfilepath')) {
+                $fm->replace();
+            }
+            break;
+
+        case 'savefile':
+
+            if ($fm->postvar('content', false) && $fm->postvar('path')) {
+                $response = $fm->savefile();
+            }
+            break;
+    }
+    }
 }
 
 echo json_encode($response);
 die();
-?>
\ No newline at end of file
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demo_screen.php b/public/filemanager/connectors/php/inc/wideimage/demo/demo_screen.php
index 44127ddee..e4f810bb5 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demo_screen.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demo_screen.php
@@ -1,15 +1,15 @@
 <?php
-	/**
-	 * @package Demos
-	 */
+/**
+ */
 ?>
 <form style="font-family: Verdana, Tahoma; font-size: 11px">
 	<input type="hidden" name="demo" value="<?php echo $activeDemo->name; ?>" />
 	<div style="background-color: #f0f0f0; padding: 5px;">
 		<input type="submit" value="refresh" />
 <?php
-	foreach ($activeDemo->fields as $field)
-		$field->render();
+    foreach ($activeDemo->fields as $field) {
+        $field->render();
+    }
 ?>
 		<br />
 		<span style="font-family: Verdana, Tahoma; font-size: 11px">
@@ -18,49 +18,51 @@
 	
 	<div style="background-color: #d0d0d0; padding: 5px; text-align: right; float: right; width: 300px;">
 <?php
-	$top_form['output']->render();
-	echo "<br />\n";
-	echo ' Palette options (only for <em>png8</em> and <em>gif</em> output):<br />';
-	$top_form['ncolors']->render();
-	echo "<br />\n";
-	$top_form['dither']->render();
-	$top_form['match_palette']->render();
+    $top_form['output']->render();
+    echo "<br />\n";
+    echo ' Palette options (only for <em>png8</em> and <em>gif</em> output):<br />';
+    $top_form['ncolors']->render();
+    echo "<br />\n";
+    $top_form['dither']->render();
+    $top_form['match_palette']->render();
 ?>
 	</div>
 	</div>
 </form>
 
 <?php
-	$activeDemo->text();
+    $activeDemo->text();
 ?>
 
 
 <?php
-	$images_in_row = 2;
-	$in_row = 0;
-	$images = array();
-	$di = new DirectoryIterator(dirname(__FILE__) . '/images/');
-	foreach ($di as $file)
-		if (!$file->isDot() && strpos($file->getFilename(), '.') !== 0)
-			$images[] = $file->getFilename();
-	
-	asort($images);
-	foreach ($images as $image_file)
-		{
-			echo '<div class="images">';
-			echo '<img src="images/' . $image_file . '" />';
-			$img_url = 'image.php?image=' . $image_file . '&output=' . $top_form['output']->value . 
-				'&colors=' . $top_form['ncolors']->value . '&dither=' . $top_form['dither']->value . 
-				'&match_palette=' . $top_form['match_palette']->value . '&demo=' . $activeDemo->name;
-			foreach ($activeDemo->fields as $field)
-				$img_url .= '&' . $field->getURLValue();
-			
-			echo '&nbsp;';
-			echo '<a href="' . $img_url . '">';
-			echo '<img src="' . $img_url . '" />';
-			echo '</a>';
-			echo "</div>\n";
-		}
+    $images_in_row = 2;
+    $in_row = 0;
+    $images = [];
+    $di = new DirectoryIterator(dirname(__FILE__).'/images/');
+    foreach ($di as $file) {
+        if (!$file->isDot() && strpos($file->getFilename(), '.') !== 0) {
+            $images[] = $file->getFilename();
+        }
+    }
+
+    asort($images);
+    foreach ($images as $image_file) {
+        echo '<div class="images">';
+        echo '<img src="images/'.$image_file.'" />';
+        $img_url = 'image.php?image='.$image_file.'&output='.$top_form['output']->value.
+                '&colors='.$top_form['ncolors']->value.'&dither='.$top_form['dither']->value.
+                '&match_palette='.$top_form['match_palette']->value.'&demo='.$activeDemo->name;
+        foreach ($activeDemo->fields as $field) {
+            $img_url .= '&'.$field->getURLValue();
+        }
+
+        echo '&nbsp;';
+        echo '<a href="'.$img_url.'">';
+        echo '<img src="'.$img_url.'" />';
+        echo '</a>';
+        echo "</div>\n";
+    }
 ?>
 <div style="clear: both"></div>
 
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/addNoise.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/addNoise.php
index d1b485f0d..d75512842 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/addNoise.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/addNoise.php
@@ -1,19 +1,18 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_addNoise extends Demo
-	{
-		public $order = 9350;
+    /**
+     */
+    class Demo_addNoise extends Demo
+    {
+        public $order = 9350;
 
-		function init()
-		{
-			$this->addField(new IntField('amount', 300));
-			$this->addField(new SelectField('type', array('salt&pepper','mono','color'), 'mono'));
-		}
-		
-		function execute($image, $request)
-		{
-			return $image->addNoise($this->fields['amount']->value, $this->fields['type']->value);
-		}
-	}
+        public function init()
+        {
+            $this->addField(new IntField('amount', 300));
+            $this->addField(new SelectField('type', ['salt&pepper', 'mono', 'color'], 'mono'));
+        }
+
+        public function execute($image, $request)
+        {
+            return $image->addNoise($this->fields['amount']->value, $this->fields['type']->value);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyConvolution.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyConvolution.php
index 10e1450d8..5f98a91b8 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyConvolution.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyConvolution.php
@@ -1,45 +1,44 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_applyConvolution extends Demo
-	{
-		public $order = 2025;
-		
-		protected $base_matrix = array(array(2, 0, 0), array(0, -1, 0), array(0, 0, -1));
-		
-		function init()
-		{
-			$this->addField(new Field('matrix', '2 0 0, 0 -1 0, 0 0 -1', '3x3 float matrix; separate rows with a comma, and columns with a space'));
-			$this->addField(new FloatField('div', 1));
-			$this->addField(new FloatField('offset', 220));
-		}
-		
-		function execute($image, $request)
-		{
-			$mstr = $this->fval('matrix');
-			$rows = explode(',', $mstr);
-			
-			$matrix = array();
-			foreach ($this->base_matrix as $idx => $base_row)
-			{
-				$build_row = array();
-				if (isset($rows[$idx]))
-				{
-					$row = trim($rows[$idx]);
-					$cols = explode(' ', $row);
-					for ($c = 0; $c < 3; $c++)
-						if (isset($cols[$c]))
-							$build_row[] = floatval(trim($cols[$c]));
-						else
-							$build_row[] = $base_row[$c];
-				}
-				else
-					$build_row = $base_row;
-				
-				$matrix[] = $build_row;
-			}
-			
-			return $image->applyConvolution($matrix, $this->fval('div'), $this->fval('offset'));
-		}
-	}
+    /**
+     */
+    class Demo_applyConvolution extends Demo
+    {
+        public $order = 2025;
+
+        protected $base_matrix = [[2, 0, 0], [0, -1, 0], [0, 0, -1]];
+
+        public function init()
+        {
+            $this->addField(new Field('matrix', '2 0 0, 0 -1 0, 0 0 -1', '3x3 float matrix; separate rows with a comma, and columns with a space'));
+            $this->addField(new FloatField('div', 1));
+            $this->addField(new FloatField('offset', 220));
+        }
+
+        public function execute($image, $request)
+        {
+            $mstr = $this->fval('matrix');
+            $rows = explode(',', $mstr);
+
+            $matrix = [];
+            foreach ($this->base_matrix as $idx => $base_row) {
+                $build_row = [];
+                if (isset($rows[$idx])) {
+                    $row = trim($rows[$idx]);
+                    $cols = explode(' ', $row);
+                    for ($c = 0; $c < 3; $c++) {
+                        if (isset($cols[$c])) {
+                            $build_row[] = floatval(trim($cols[$c]));
+                        } else {
+                            $build_row[] = $base_row[$c];
+                        }
+                    }
+                } else {
+                    $build_row = $base_row;
+                }
+
+                $matrix[] = $build_row;
+            }
+
+            return $image->applyConvolution($matrix, $this->fval('div'), $this->fval('offset'));
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyFilter.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyFilter.php
index 48c636c45..fe0bc4b64 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyFilter.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyFilter.php
@@ -1,39 +1,38 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_applyFilter extends Demo
-	{
-		public $order = 2000;
+    /**
+     */
+    class Demo_applyFilter extends Demo
+    {
+        public $order = 2000;
 
-		function init()
-		{
-			$this->addField(new SelectField('filter', array(
-					'IMG_FILTER_NEGATE', 
-					'IMG_FILTER_GRAYSCALE', 
-					'IMG_FILTER_BRIGHTNESS', 
-					'IMG_FILTER_CONTRAST',
-					'IMG_FILTER_COLORIZE',
-					'IMG_FILTER_EDGEDETECT',
-					'IMG_FILTER_EMBOSS',
-					'IMG_FILTER_GAUSSIAN_BLUR',
-					'IMG_FILTER_SELECTIVE_BLUR',
-					'IMG_FILTER_MEAN_REMOVAL',
-					'IMG_FILTER_SMOOTH'
-					))
-				);
-			$this->addField(new IntField('arg1', null));
-			$this->addField(new IntField('arg2', null));
-			$this->addField(new IntField('arg3', null));
-		}
-		
-		function execute($image)
-		{
-			$filter = constant($this->fields['filter']->value);
-			$arg1 = $this->fields['arg1']->value;
-			$arg2 = $this->fields['arg2']->value;
-			$arg3 = $this->fields['arg3']->value;
-			
-			return $image->applyFilter($filter, $arg1, $arg2, $arg3);
-		}
-	}
+        public function init()
+        {
+            $this->addField(new SelectField('filter', [
+                    'IMG_FILTER_NEGATE',
+                    'IMG_FILTER_GRAYSCALE',
+                    'IMG_FILTER_BRIGHTNESS',
+                    'IMG_FILTER_CONTRAST',
+                    'IMG_FILTER_COLORIZE',
+                    'IMG_FILTER_EDGEDETECT',
+                    'IMG_FILTER_EMBOSS',
+                    'IMG_FILTER_GAUSSIAN_BLUR',
+                    'IMG_FILTER_SELECTIVE_BLUR',
+                    'IMG_FILTER_MEAN_REMOVAL',
+                    'IMG_FILTER_SMOOTH',
+                    ])
+                );
+            $this->addField(new IntField('arg1', null));
+            $this->addField(new IntField('arg2', null));
+            $this->addField(new IntField('arg3', null));
+        }
+
+        public function execute($image)
+        {
+            $filter = constant($this->fields['filter']->value);
+            $arg1 = $this->fields['arg1']->value;
+            $arg2 = $this->fields['arg2']->value;
+            $arg3 = $this->fields['arg3']->value;
+
+            return $image->applyFilter($filter, $arg1, $arg2, $arg3);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyMask.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyMask.php
index 05ad53e45..9edff3845 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyMask.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/applyMask.php
@@ -1,32 +1,32 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_applyMask extends Demo
-	{
-		public $order = 600;
-		
-		function init()
-		{
-			$this->addField(new FileSelectField('mask', 'masks'));
-			$this->addField(new CoordinateField('left', 10));
-			$this->addField(new CoordinateField('top', '30%'));
-			
-			if (!$this->request->get('mask'))
-				$this->request->set('mask', 'mask-circle.gif');
-		}
-		
-		function execute($image)
-		{
-			$mask = WideImage::load(DEMO_PATH . 'masks/' . $this->fields['mask']->value);
-			$left = $this->fields['left']->value;
-			$top = $this->fields['top']->value;
-			
-			return $image->applyMask($mask, $left, $top);
-		}
-		
-		function getFormat()
-		{
-			return 'png';
-		}
-	}
+    /**
+     */
+    class Demo_applyMask extends Demo
+    {
+        public $order = 600;
+
+        public function init()
+        {
+            $this->addField(new FileSelectField('mask', 'masks'));
+            $this->addField(new CoordinateField('left', 10));
+            $this->addField(new CoordinateField('top', '30%'));
+
+            if (!$this->request->get('mask')) {
+                $this->request->set('mask', 'mask-circle.gif');
+            }
+        }
+
+        public function execute($image)
+        {
+            $mask = WideImage::load(DEMO_PATH.'masks/'.$this->fields['mask']->value);
+            $left = $this->fields['left']->value;
+            $top = $this->fields['top']->value;
+
+            return $image->applyMask($mask, $left, $top);
+        }
+
+        public function getFormat()
+        {
+            return 'png';
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/asGrayscale.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/asGrayscale.php
index b58c855ae..6b6d2b638 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/asGrayscale.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/asGrayscale.php
@@ -1,13 +1,12 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_asGrayscale extends Demo
-	{
-		public $order = 300;
-		
-		function execute($img, $request)
-		{
-			return $img->asGrayscale();
-		}
-	}
+    /**
+     */
+    class Demo_asGrayscale extends Demo
+    {
+        public $order = 300;
+
+        public function execute($img, $request)
+        {
+            return $img->asGrayscale();
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/asNegative.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/asNegative.php
index 0112f6b04..11395b0be 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/asNegative.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/asNegative.php
@@ -1,13 +1,12 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_asNegative extends Demo
-	{
-		public $order = 300;
-		
-		function execute($img, $request)
-		{
-			return $img->asNegative();
-		}
-	}
+    /**
+     */
+    class Demo_asNegative extends Demo
+    {
+        public $order = 300;
+
+        public function execute($img, $request)
+        {
+            return $img->asNegative();
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/autoCrop.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/autoCrop.php
index 7adf6b76b..368caf79f 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/autoCrop.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/autoCrop.php
@@ -1,26 +1,25 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_autoCrop extends Demo
-	{
-		public $order = 1050;
-		
-		function init()
-		{
-			$this->addField(new IntField('margin', 0));
-			$this->addField(new IntField('rgb_threshold', 0));
-			$this->addField(new IntField('pixel_cutoff', 1));
-			$this->addField(new IntField('base_color', null, 'Index of the color'));
-		}
-		
-		function execute($image, $request)
-		{
-			$margin = $this->fields['margin']->value;
-			$rgb_threshold = $this->fields['rgb_threshold']->value;
-			$pixel_cutoff = $this->fields['pixel_cutoff']->value;
-			$base_color = $this->fields['base_color']->value;
-			
-			return $image->autoCrop($margin, $rgb_threshold, $pixel_cutoff, $base_color);
-		}
-	}
+    /**
+     */
+    class Demo_autoCrop extends Demo
+    {
+        public $order = 1050;
+
+        public function init()
+        {
+            $this->addField(new IntField('margin', 0));
+            $this->addField(new IntField('rgb_threshold', 0));
+            $this->addField(new IntField('pixel_cutoff', 1));
+            $this->addField(new IntField('base_color', null, 'Index of the color'));
+        }
+
+        public function execute($image, $request)
+        {
+            $margin = $this->fields['margin']->value;
+            $rgb_threshold = $this->fields['rgb_threshold']->value;
+            $pixel_cutoff = $this->fields['pixel_cutoff']->value;
+            $base_color = $this->fields['base_color']->value;
+
+            return $image->autoCrop($margin, $rgb_threshold, $pixel_cutoff, $base_color);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/correctGamma.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/correctGamma.php
index 4c3f85562..2079de1c0 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/correctGamma.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/correctGamma.php
@@ -1,19 +1,18 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_correctGamma extends Demo
-	{
-		public $order = 2050;
-		
-		function init()
-		{
-			$this->addField(new FloatField('in_gamma', 1.1));
-			$this->addField(new FloatField('out_gamma', 3.7));
-		}
-		
-		function execute($image, $request)
-		{
-			return $image->correctGamma($this->fval('in_gamma'), $this->fval('out_gamma'));
-		}
-	}
+    /**
+     */
+    class Demo_correctGamma extends Demo
+    {
+        public $order = 2050;
+
+        public function init()
+        {
+            $this->addField(new FloatField('in_gamma', 1.1));
+            $this->addField(new FloatField('out_gamma', 3.7));
+        }
+
+        public function execute($image, $request)
+        {
+            return $image->correctGamma($this->fval('in_gamma'), $this->fval('out_gamma'));
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/crop.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/crop.php
index 9dba09995..0c8ea71e3 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/crop.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/crop.php
@@ -1,26 +1,25 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_crop extends Demo
-	{
-		public $order = 1000;
-		
-		function init()
-		{
-			$this->addField(new CoordinateField('left', 10));
-			$this->addField(new CoordinateField('top', 20));
-			$this->addField(new CoordinateField('width', 120));
-			$this->addField(new CoordinateField('height', 60));
-		}
-		
-		function execute($image, $request)
-		{
-			$left = $this->fields['left']->value;
-			$top = $this->fields['top']->value;
-			$width = $this->fields['width']->value;
-			$height = $this->fields['height']->value;
-			
-			return $image->crop($left, $top, $width, $height);
-		}
-	}
+    /**
+     */
+    class Demo_crop extends Demo
+    {
+        public $order = 1000;
+
+        public function init()
+        {
+            $this->addField(new CoordinateField('left', 10));
+            $this->addField(new CoordinateField('top', 20));
+            $this->addField(new CoordinateField('width', 120));
+            $this->addField(new CoordinateField('height', 60));
+        }
+
+        public function execute($image, $request)
+        {
+            $left = $this->fields['left']->value;
+            $top = $this->fields['top']->value;
+            $width = $this->fields['width']->value;
+            $height = $this->fields['height']->value;
+
+            return $image->crop($left, $top, $width, $height);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/flip.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/flip.php
index 0e738f64f..c66545045 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/flip.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/flip.php
@@ -1,13 +1,12 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_flip extends Demo
-	{
-		public $order = 1200;
-		
-		function execute($image, $request)
-		{
-			return $image->flip();
-		}
-	}
+    /**
+     */
+    class Demo_flip extends Demo
+    {
+        public $order = 1200;
+
+        public function execute($image, $request)
+        {
+            return $image->flip();
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/getCanvas.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/getCanvas.php
index 296668c4e..4b36540ac 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/getCanvas.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/getCanvas.php
@@ -1,54 +1,53 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_getCanvas extends Demo
-	{
-		public $order = 1300;
-		
-		function init()
-		{
-			$this->addField(new Field('text', 'Hello world!'));
-			$this->addField(new CoordinateField('x', 'middle'));
-			$this->addField(new CoordinateField('y', 'bottom-5'));
-			$this->addField(new IntField('angle', 5));
-			$this->addField(new FileSelectField('font', 'fonts', array('show' => false, 'pattern' => '/(.*)\.ttf$/', 'default' => 'VeraSe.ttf')));
-			$this->addField(new IntField('size', 18));
-		}
-		
-		function execute($image, $request)
-		{
-			$text = $this->fields['text']->value;
-			$x = $this->fields['x']->value;
-			$y = $this->fields['y']->value;
-			$angle = $this->fields['angle']->value;
-			$font = $this->fields['font']->value;
-			$font_size = $this->fields['size']->value;
-			
-			$canvas = $image->getCanvas();
-			
-			$canvas->filledRectangle(10, 10, 80, 40, $image->allocateColor(255, 127, 255));
-			$canvas->line(60, 80, 30, 100, $image->allocateColor(255, 0, 0));
-			
-			$font_file = DEMO_PATH . 'fonts/' . $font;
-			
-			$canvas->useFont($font_file, $font_size, $image->allocateColor(0, 0, 0));
-			$canvas->writeText("$x+1", "$y+1", $text, $angle);
-			
-			$canvas->useFont($font_file, $font_size, $image->allocateColor(200, 220, 255));
-			$canvas->writeText($x, $y, $text, $angle);
-			
-			return $image;
-		}
-		
-		function et($name)
-		{
-			return htmlentities($this->fval($name));
-		}
-		
-		function text()
-		{
-			echo "This demo executes:
+    /**
+     */
+    class Demo_getCanvas extends Demo
+    {
+        public $order = 1300;
+
+        public function init()
+        {
+            $this->addField(new Field('text', 'Hello world!'));
+            $this->addField(new CoordinateField('x', 'middle'));
+            $this->addField(new CoordinateField('y', 'bottom-5'));
+            $this->addField(new IntField('angle', 5));
+            $this->addField(new FileSelectField('font', 'fonts', ['show' => false, 'pattern' => '/(.*)\.ttf$/', 'default' => 'VeraSe.ttf']));
+            $this->addField(new IntField('size', 18));
+        }
+
+        public function execute($image, $request)
+        {
+            $text = $this->fields['text']->value;
+            $x = $this->fields['x']->value;
+            $y = $this->fields['y']->value;
+            $angle = $this->fields['angle']->value;
+            $font = $this->fields['font']->value;
+            $font_size = $this->fields['size']->value;
+
+            $canvas = $image->getCanvas();
+
+            $canvas->filledRectangle(10, 10, 80, 40, $image->allocateColor(255, 127, 255));
+            $canvas->line(60, 80, 30, 100, $image->allocateColor(255, 0, 0));
+
+            $font_file = DEMO_PATH.'fonts/'.$font;
+
+            $canvas->useFont($font_file, $font_size, $image->allocateColor(0, 0, 0));
+            $canvas->writeText("$x+1", "$y+1", $text, $angle);
+
+            $canvas->useFont($font_file, $font_size, $image->allocateColor(200, 220, 255));
+            $canvas->writeText($x, $y, $text, $angle);
+
+            return $image;
+        }
+
+        public function et($name)
+        {
+            return htmlentities($this->fval($name));
+        }
+
+        public function text()
+        {
+            echo "This demo executes:
 <pre>
 	\$canvas->filledRectangle(10, 10, 80, 40, \$img->allocateColor(255, 127, 255));
 	\$canvas->line(60, 80, 30, 100, \$img->allocateColor(255, 0, 0));
@@ -59,5 +58,5 @@
 	\$canvas->useFont('{$this->et('font')}', '{$this->et('size')}', \$image->allocateColor(200, 220, 255));
 	\$canvas->writeText('{$this->et('x')}', '{$this->et('y')}', '{$this->et('text')}', {$this->et('angle')});
 	</pre>";
-		}
-	}
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/getChannels.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/getChannels.php
index fb1024e6d..c40147e75 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/getChannels.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/getChannels.php
@@ -1,28 +1,29 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_getChannels extends Demo
-	{
-		public $order = 500;
-		
-		protected $channels = array('red', 'green', 'blue', 'alpha');
-		
-		function init()
-		{
-			$this->addField(new CheckboxField('red', true));
-			$this->addField(new CheckboxField('green', false));
-			$this->addField(new CheckboxField('blue', true));
-			$this->addField(new CheckboxField('alpha', false));
-		}
-		
-		function execute($img, $request)
-		{
-			$on = array();
-			foreach ($this->channels as $name)
-				if ($this->fields[$name]->value)
-					$on[] = $name;
-			
-			return $img->getChannels($on);
-		}
-	}
+    /**
+     */
+    class Demo_getChannels extends Demo
+    {
+        public $order = 500;
+
+        protected $channels = ['red', 'green', 'blue', 'alpha'];
+
+        public function init()
+        {
+            $this->addField(new CheckboxField('red', true));
+            $this->addField(new CheckboxField('green', false));
+            $this->addField(new CheckboxField('blue', true));
+            $this->addField(new CheckboxField('alpha', false));
+        }
+
+        public function execute($img, $request)
+        {
+            $on = [];
+            foreach ($this->channels as $name) {
+                if ($this->fields[$name]->value) {
+                    $on[] = $name;
+                }
+            }
+
+            return $img->getChannels($on);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/getMask.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/getMask.php
index 20051a902..76a12bd47 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/getMask.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/getMask.php
@@ -1,13 +1,12 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_getMask extends Demo
-	{
-		public $order = 550;
-		
-		function execute($img, $request)
-		{
-			return $img->getMask();
-		}
-	}
+    /**
+     */
+    class Demo_getMask extends Demo
+    {
+        public $order = 550;
+
+        public function execute($img, $request)
+        {
+            return $img->getMask();
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/merge.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/merge.php
index 47c78e969..cf5313e8c 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/merge.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/merge.php
@@ -1,31 +1,30 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_merge extends Demo
-	{
-		public $order = 800;
-		
-		function init()
-		{
-			$this->addField(new FileSelectField('overlay', 'images', array('default' => '6-logo.gif')));
-			$this->addField(new CoordinateField('left', 'right-10'));
-			$this->addField(new CoordinateField('top', 'bottom-15%'));
-			$this->addField(new IntField('opacity', 50));
-		}
-		
-		function execute($image, $request)
-		{
-			$overlay = WideImage::load(DEMO_PATH . 'images/' . $this->fields['overlay']->value);
-			$left = $this->fields['left']->value;
-			$top = $this->fields['top']->value;
-			$opacity = $this->fields['opacity']->value;
-			
-			return $image->merge($overlay, $left, $top, $opacity);
-		}
-		
-		function text()
-		{
-			echo "For alpha images, set opacity=100, otherwise alpha channel won't work.";
-		}
-	}
+    /**
+     */
+    class Demo_merge extends Demo
+    {
+        public $order = 800;
+
+        public function init()
+        {
+            $this->addField(new FileSelectField('overlay', 'images', ['default' => '6-logo.gif']));
+            $this->addField(new CoordinateField('left', 'right-10'));
+            $this->addField(new CoordinateField('top', 'bottom-15%'));
+            $this->addField(new IntField('opacity', 50));
+        }
+
+        public function execute($image, $request)
+        {
+            $overlay = WideImage::load(DEMO_PATH.'images/'.$this->fields['overlay']->value);
+            $left = $this->fields['left']->value;
+            $top = $this->fields['top']->value;
+            $opacity = $this->fields['opacity']->value;
+
+            return $image->merge($overlay, $left, $top, $opacity);
+        }
+
+        public function text()
+        {
+            echo "For alpha images, set opacity=100, otherwise alpha channel won't work.";
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/mirror.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/mirror.php
index 40436828a..1a284b184 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/mirror.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/mirror.php
@@ -1,13 +1,12 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_mirror extends Demo
-	{
-		public $order = 1150;
-		
-		function execute($image, $request)
-		{
-			return $image->mirror();
-		}
-	}
+    /**
+     */
+    class Demo_mirror extends Demo
+    {
+        public $order = 1150;
+
+        public function execute($image, $request)
+        {
+            return $image->mirror();
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/resize.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/resize.php
index 8e7366087..3506c8c34 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/resize.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/resize.php
@@ -1,26 +1,25 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_resize extends Demo
-	{
-		public $order = 900;
-		
-		function init()
-		{
-			$this->addField(new CoordinateField('width', 120));
-			$this->addField(new CoordinateField('height', null));
-			$this->addField(new SelectField('fit', array('inside', 'fill', 'outside')));
-			$this->addField(new SelectField('scale', array('any', 'down', 'up')));
-		}
-		
-		function execute($image, $request)
-		{
-			$width = $this->fields['width']->value;
-			$height = $this->fields['height']->value;
-			$fit = $this->fields['fit']->value;
-			$scale = $this->fields['scale']->value;
-			
-			return $image->resize($width, $height, $fit, $scale);
-		}
-	}
+    /**
+     */
+    class Demo_resize extends Demo
+    {
+        public $order = 900;
+
+        public function init()
+        {
+            $this->addField(new CoordinateField('width', 120));
+            $this->addField(new CoordinateField('height', null));
+            $this->addField(new SelectField('fit', ['inside', 'fill', 'outside']));
+            $this->addField(new SelectField('scale', ['any', 'down', 'up']));
+        }
+
+        public function execute($image, $request)
+        {
+            $width = $this->fields['width']->value;
+            $height = $this->fields['height']->value;
+            $fit = $this->fields['fit']->value;
+            $scale = $this->fields['scale']->value;
+
+            return $image->resize($width, $height, $fit, $scale);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/resizeCanvas.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/resizeCanvas.php
index 316dcdccc..29bb69c62 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/resizeCanvas.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/resizeCanvas.php
@@ -1,32 +1,31 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_resizeCanvas extends Demo
-	{
-		public $order = 910;
-		
-		function init()
-		{
-			$this->addField(new CoordinateField('width', '100%+30'));
-			$this->addField(new CoordinateField('height', 200));
-			$this->addField(new CoordinateField('left', '2'));
-			$this->addField(new CoordinateField('top', 'bottom-10'));
-			$this->addField(new ColorField('color', 'ffffff'));
-			$this->addField(new SelectField('scale', array('any', 'down', 'up'), 'any'));
-			$this->addField(new CheckboxField('merge', false, "Merge or copy over"));
-		}
-		
-		function execute($image, $request)
-		{
-			$width = $this->fields['width']->value;
-			$height = $this->fields['height']->value;
-			$left = $this->fields['left']->value;
-			$top = $this->fields['top']->value;
-			$color = $this->fields['color']->value;
-			$scale = $this->fields['scale']->value;
-			$merge = $this->fields['merge']->value;
-			
-			return $image->resizeCanvas($width, $height, $left, $top, $color ? hexdec($color) : null, $scale, $merge);
-		}
-	}
+    /**
+     */
+    class Demo_resizeCanvas extends Demo
+    {
+        public $order = 910;
+
+        public function init()
+        {
+            $this->addField(new CoordinateField('width', '100%+30'));
+            $this->addField(new CoordinateField('height', 200));
+            $this->addField(new CoordinateField('left', '2'));
+            $this->addField(new CoordinateField('top', 'bottom-10'));
+            $this->addField(new ColorField('color', 'ffffff'));
+            $this->addField(new SelectField('scale', ['any', 'down', 'up'], 'any'));
+            $this->addField(new CheckboxField('merge', false, 'Merge or copy over'));
+        }
+
+        public function execute($image, $request)
+        {
+            $width = $this->fields['width']->value;
+            $height = $this->fields['height']->value;
+            $left = $this->fields['left']->value;
+            $top = $this->fields['top']->value;
+            $color = $this->fields['color']->value;
+            $scale = $this->fields['scale']->value;
+            $merge = $this->fields['merge']->value;
+
+            return $image->resizeCanvas($width, $height, $left, $top, $color ? hexdec($color) : null, $scale, $merge);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/rotate.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/rotate.php
index 55c169c22..d123e1b98 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/rotate.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/rotate.php
@@ -1,22 +1,21 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_rotate extends Demo
-	{
-		public $order = 1100;
+    /**
+     */
+    class Demo_rotate extends Demo
+    {
+        public $order = 1100;
 
-		function init()
-		{
-			$this->addField(new AngleField('angle', 25));
-			$this->addField(new ColorField('color', ''));
-		}
-		
-		function execute($image, $request)
-		{
-			$angle = $this->fields['angle']->value;
-			$color = $this->fields['color']->value;
-			
-			return $image->rotate($angle, $color ? hexdec($color) : null);
-		}
-	}
+        public function init()
+        {
+            $this->addField(new AngleField('angle', 25));
+            $this->addField(new ColorField('color', ''));
+        }
+
+        public function execute($image, $request)
+        {
+            $angle = $this->fields['angle']->value;
+            $color = $this->fields['color']->value;
+
+            return $image->rotate($angle, $color ? hexdec($color) : null);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/roundCorners.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/roundCorners.php
index 36aa6763f..455a68617 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/roundCorners.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/roundCorners.php
@@ -1,42 +1,45 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_roundCorners extends Demo
-	{
-		public $order = 1075;
-		
-		function init()
-		{
-			$this->addField(new IntField('radius', 30));
-			$this->addField(new ColorField('color', 'ffffff'));
-			$this->addField(new IntField('smoothness', 2));
-			
-			$this->addField(new CheckboxField('top-left', true));
-			$this->addField(new CheckboxField('top-right', true));
-			$this->addField(new CheckboxField('bottom-right', true));
-			$this->addField(new CheckboxField('bottom-left', true));
-		}
-		
-		function execute($image, $request)
-		{
-			$color = $this->fields['color']->value;
-			$radius = $this->fields['radius']->value;
-			$smoothness = $this->fields['smoothness']->value;
-			
-			$corners = 0;
-			if ($this->fval('top-left'))
-				$corners += WideImage::SIDE_TOP_LEFT;
-			
-			if ($this->fval('top-right'))
-				$corners += WideImage::SIDE_TOP_RIGHT;
-			
-			if ($this->fval('bottom-right'))
-				$corners += WideImage::SIDE_BOTTOM_RIGHT;
-			
-			if ($this->fval('bottom-left'))
-				$corners += WideImage::SIDE_BOTTOM_LEFT;
-			
-			return $image->roundCorners($radius, $color ? hexdec($color) : null, $smoothness, $corners);
-		}
-	}
+    /**
+     */
+    class Demo_roundCorners extends Demo
+    {
+        public $order = 1075;
+
+        public function init()
+        {
+            $this->addField(new IntField('radius', 30));
+            $this->addField(new ColorField('color', 'ffffff'));
+            $this->addField(new IntField('smoothness', 2));
+
+            $this->addField(new CheckboxField('top-left', true));
+            $this->addField(new CheckboxField('top-right', true));
+            $this->addField(new CheckboxField('bottom-right', true));
+            $this->addField(new CheckboxField('bottom-left', true));
+        }
+
+        public function execute($image, $request)
+        {
+            $color = $this->fields['color']->value;
+            $radius = $this->fields['radius']->value;
+            $smoothness = $this->fields['smoothness']->value;
+
+            $corners = 0;
+            if ($this->fval('top-left')) {
+                $corners += WideImage::SIDE_TOP_LEFT;
+            }
+
+            if ($this->fval('top-right')) {
+                $corners += WideImage::SIDE_TOP_RIGHT;
+            }
+
+            if ($this->fval('bottom-right')) {
+                $corners += WideImage::SIDE_BOTTOM_RIGHT;
+            }
+
+            if ($this->fval('bottom-left')) {
+                $corners += WideImage::SIDE_BOTTOM_LEFT;
+            }
+
+            return $image->roundCorners($radius, $color ? hexdec($color) : null, $smoothness, $corners);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/unsharp.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/unsharp.php
index 1b2042413..7c1bc14ae 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/unsharp.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/unsharp.php
@@ -1,20 +1,19 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo_unsharp extends Demo
-	{
-		public $order = 1350;
+    /**
+     */
+    class Demo_unsharp extends Demo
+    {
+        public $order = 1350;
 
-		function init()
-		{
-			$this->addField(new IntField('amount', 300));
-			$this->addField(new IntField('radius', 3));
-			$this->addField(new IntField('threshold', 2));
-		}
-		
-		function execute($image, $request)
-		{
-			return $image->unsharp($this->fields['amount']->value, $this->fields['radius']->value, $this->fields['threshold']->value);
-		}
-	}
+        public function init()
+        {
+            $this->addField(new IntField('amount', 300));
+            $this->addField(new IntField('radius', 3));
+            $this->addField(new IntField('threshold', 2));
+        }
+
+        public function execute($image, $request)
+        {
+            return $image->unsharp($this->fields['amount']->value, $this->fields['radius']->value, $this->fields['threshold']->value);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/font.php b/public/filemanager/connectors/php/inc/wideimage/demo/font.php
index 36e1ce8d7..83b24fe5a 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/font.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/font.php
@@ -1,5 +1,6 @@
 <?php
-include('../lib/WideImage.php');
+
+include '../lib/WideImage.php';
 
 $img = WideImage::createTrueColorImage(400, 200);
 $canvas = $img->getCanvas();
@@ -31,40 +32,39 @@ $text = '#j';
 // First we create our bounding box
 $bbox = imageftbbox($font_size, $angle, $font, $text);
 
-
 function normalize_bbox($bbox)
 {
-	return array(
-			'up-left' => array('x' => $bbox[6], 'y' => $bbox[7]),
-			'up-right' => array('x' => $bbox[4], 'y' => $bbox[5]),
-			'down-left' => array('x' => $bbox[0], 'y' => $bbox[1]),
-			'down-right' => array('x' => $bbox[2], 'y' => $bbox[3]),
-		);
+    return [
+            'up-left'    => ['x' => $bbox[6], 'y' => $bbox[7]],
+            'up-right'   => ['x' => $bbox[4], 'y' => $bbox[5]],
+            'down-left'  => ['x' => $bbox[0], 'y' => $bbox[1]],
+            'down-right' => ['x' => $bbox[2], 'y' => $bbox[3]],
+        ];
 }
 
 function outer_box($box)
 {
-	return array(
-		'left' => min($box['up-left']['x'], $box['up-right']['x'], $box['down-left']['x'], $box['down-right']['x']),
-		'top' => min($box['up-left']['y'], $box['up-right']['y'], $box['down-left']['y'], $box['down-right']['y']),
-		'right' => max($box['up-left']['x'], $box['up-right']['x'], $box['down-left']['x'], $box['down-right']['x']),
-		'bottom' => max($box['up-left']['y'], $box['up-right']['y'], $box['down-left']['y'], $box['down-right']['y'])
-	);
+    return [
+        'left'   => min($box['up-left']['x'], $box['up-right']['x'], $box['down-left']['x'], $box['down-right']['x']),
+        'top'    => min($box['up-left']['y'], $box['up-right']['y'], $box['down-left']['y'], $box['down-right']['y']),
+        'right'  => max($box['up-left']['x'], $box['up-right']['x'], $box['down-left']['x'], $box['down-right']['x']),
+        'bottom' => max($box['up-left']['y'], $box['up-right']['y'], $box['down-left']['y'], $box['down-right']['y']),
+    ];
 }
 
 $box = normalize_bbox($bbox);
 
 // This is our cordinates for X and Y
-#$x = $bbox[0] + (imagesx($im) / 2) - ($bbox[4] / 2) - 5;
-#$y = $bbox[1] + (imagesy($im) / 2) - ($bbox[5] / 2) - 5;
-#$x = 300;
-#$y = 175;
+//$x = $bbox[0] + (imagesx($im) / 2) - ($bbox[4] / 2) - 5;
+//$y = $bbox[1] + (imagesy($im) / 2) - ($bbox[5] / 2) - 5;
+//$x = 300;
+//$y = 175;
 
 $obox = outer_box(normalize_bbox(imageftbbox($font_size, $angle, $font, '')));
 $obox = outer_box(normalize_bbox(imageftbbox($font_size, $angle, $font, $text)));
 
-#$x = imagesx($im) - $obox['right'] - 1;
-#$y = imagesy($im) - $obox['bottom'] - 1;
+//$x = imagesx($im) - $obox['right'] - 1;
+//$y = imagesy($im) - $obox['bottom'] - 1;
 $x = 0;
 $y = 0;
 
@@ -72,9 +72,8 @@ $gc = imagecolorallocate($im, 255, 200, 200);
 imageline($im, imagesx($im) / 2, 0, imagesx($im) / 2, imagesy($im), $gc);
 imageline($im, 0, imagesy($im) / 2, imagesx($im), imagesy($im) / 2, $gc);
 
-
 imagefttext($im, $font_size, $angle, $x, $y, $black, $font, $text);
-#imagefttext($im, $font_size, $angle, $x, $y, $black, $font, 'aj');
+//imagefttext($im, $font_size, $angle, $x, $y, $black, $font, 'aj');
 
 $c = imagecolorallocate($im, 0, 255, 0);
 imageline($im, $box['up-left']['x'] + $x, $box['up-left']['y'] + $y, $box['up-right']['x'] + $x, $box['up-right']['y'] + $y, $c);
@@ -91,7 +90,6 @@ imageline($im, $obox['left'] + $x, $obox['bottom'] + $y, $obox['left'] + $x, $ob
 
 imagefilledellipse($im, $x, $y, 3, 3, imagecolorallocate($im, 255, 0, 0));
 
-
 // Output to browser
 header('Content-type: image/png');
 
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/AngleField.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/AngleField.php
index a30dbf5bf..78fe7bae2 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/AngleField.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/AngleField.php
@@ -1,11 +1,10 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class AngleField extends IntField
-	{
-		function __construct($name, $default, $hint = 'In degrees clockwise, negative values accepted')
-		{
-			parent::__construct($name, $default, $hint);
-		}
-	}
+    /**
+     */
+    class AngleField extends IntField
+    {
+        public function __construct($name, $default, $hint = 'In degrees clockwise, negative values accepted')
+        {
+            parent::__construct($name, $default, $hint);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CheckboxField.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CheckboxField.php
index 3dbc62087..a5391986a 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CheckboxField.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CheckboxField.php
@@ -1,22 +1,22 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class CheckboxField extends Field
-	{
-		function init($request)
-		{
-			$this->value = $request->get($this->name, $this->default ? '1' : null) === '1';
-		}
-		
-		function renderBody($name, $id)
-		{
-			if ($this->value)
-				$chk = 'checked="checked"';
-			else
-				$chk = '';
-			
-			echo '<input type="hidden" name="' . $name . '" id="' . $id . '_val" value="' . ($this->value ? '1' : '') . '" />';
-			echo '<input type="checkbox" ' . $chk . ' name="' . $name . '_cb" id="' . $id . '" value="1" onclick="document.getElementById(\'' . $id . '_val\').value = Number(this.checked);" />';
-		}
-	}
+    /**
+     */
+    class CheckboxField extends Field
+    {
+        public function init($request)
+        {
+            $this->value = $request->get($this->name, $this->default ? '1' : null) === '1';
+        }
+
+        public function renderBody($name, $id)
+        {
+            if ($this->value) {
+                $chk = 'checked="checked"';
+            } else {
+                $chk = '';
+            }
+
+            echo '<input type="hidden" name="'.$name.'" id="'.$id.'_val" value="'.($this->value ? '1' : '').'" />';
+            echo '<input type="checkbox" '.$chk.' name="'.$name.'_cb" id="'.$id.'" value="1" onclick="document.getElementById(\''.$id.'_val\').value = Number(this.checked);" />';
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CheckboxSetField.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CheckboxSetField.php
index 4e0c2b740..8919c6511 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CheckboxSetField.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CheckboxSetField.php
@@ -1,50 +1,53 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class CheckboxSetField extends Field
-	{
-		public $options;
-		public $request;
-		
-		function __construct($name, $options)
-		{
-			$this->name = $name;
-			$this->options = $options;
-		}
-		
-		function init($request)
-		{
-			$this->value = array();
-			if (is_array($request->get($this->name)))
-				foreach ($request->get($this->name) as $val)
-					if (in_array($val, $this->options))
-						$this->value[] = $val;
-		}
-		
-		function render()
-		{
-			$request = $this->request;
-			foreach ($this->options as $option)
-			{
-				if (is_array($request->get($this->name)) && in_array($option, $request->get($this->name)))
-					$chk = 'checked="checked"';
-				else
-					$chk = '';
+    /**
+     */
+    class CheckboxSetField extends Field
+    {
+        public $options;
+        public $request;
 
-				$name = $this->name . '[]';
-				$id = $this->name . '_' . $option;
-				echo '<input type="checkbox" ' . $chk . ' name="' . $name . '" id="' . $id . '" value="' . $option . '" />';
-				echo '<label for="' . $id . '">' . $option . '</label> ';
-			}
-		}
-		
-		function getURLValue()
-		{
-			$v = '';
-			foreach ($this->value as $value)
-				$v .= $this->name . '[]=' . $value . '&';
-			return $v;
-		}
-	}
-	
\ No newline at end of file
+        public function __construct($name, $options)
+        {
+            $this->name = $name;
+            $this->options = $options;
+        }
+
+        public function init($request)
+        {
+            $this->value = [];
+            if (is_array($request->get($this->name))) {
+                foreach ($request->get($this->name) as $val) {
+                    if (in_array($val, $this->options)) {
+                        $this->value[] = $val;
+                    }
+                }
+            }
+        }
+
+        public function render()
+        {
+            $request = $this->request;
+            foreach ($this->options as $option) {
+                if (is_array($request->get($this->name)) && in_array($option, $request->get($this->name))) {
+                    $chk = 'checked="checked"';
+                } else {
+                    $chk = '';
+                }
+
+                $name = $this->name.'[]';
+                $id = $this->name.'_'.$option;
+                echo '<input type="checkbox" '.$chk.' name="'.$name.'" id="'.$id.'" value="'.$option.'" />';
+                echo '<label for="'.$id.'">'.$option.'</label> ';
+            }
+        }
+
+        public function getURLValue()
+        {
+            $v = '';
+            foreach ($this->value as $value) {
+                $v .= $this->name.'[]='.$value.'&';
+            }
+
+            return $v;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/ColorField.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/ColorField.php
index e356520c8..a448c4357 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/ColorField.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/ColorField.php
@@ -1,25 +1,25 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class ColorField extends Field
-	{
-		function __construct($name, $default, $hint = 'RRGGBB hex, leave blank for transparent background')
-		{
-			parent::__construct($name, $default, $hint);
-		}
-		
-		function init($request)
-		{
-			$c = $request->getColor($this->name, $this->default);
-			if ($c === '')
-				$this->value = null;
-			else
-				$this->value = str_pad(dechex(hexdec($c)), 6, '0', STR_PAD_LEFT);
-		}
-		
-		function getRenderValue()
-		{
-			return $this->value;
-		}
-	}
+    /**
+     */
+    class ColorField extends Field
+    {
+        public function __construct($name, $default, $hint = 'RRGGBB hex, leave blank for transparent background')
+        {
+            parent::__construct($name, $default, $hint);
+        }
+
+        public function init($request)
+        {
+            $c = $request->getColor($this->name, $this->default);
+            if ($c === '') {
+                $this->value = null;
+            } else {
+                $this->value = str_pad(dechex(hexdec($c)), 6, '0', STR_PAD_LEFT);
+            }
+        }
+
+        public function getRenderValue()
+        {
+            return $this->value;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CoordinateField.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CoordinateField.php
index 4f8a9c321..e6007ad6b 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CoordinateField.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/CoordinateField.php
@@ -1,18 +1,18 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class CoordinateField extends Field
-	{
-		function __construct($name, $default, $hint = 'Smart coordinate')
-		{
-			parent::__construct($name, $default, $hint);
-		}
-		
-		function init($request)
-		{
-			$this->value = $request->getCoordinate($this->name, $this->default);
-			if ($this->value > 1000)
-				$this->value = 1000;
-		}
-	}
+    /**
+     */
+    class CoordinateField extends Field
+    {
+        public function __construct($name, $default, $hint = 'Smart coordinate')
+        {
+            parent::__construct($name, $default, $hint);
+        }
+
+        public function init($request)
+        {
+            $this->value = $request->getCoordinate($this->name, $this->default);
+            if ($this->value > 1000) {
+                $this->value = 1000;
+            }
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Demo.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Demo.php
index 3c317b2a3..1c31f1385 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Demo.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Demo.php
@@ -1,63 +1,62 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Demo
-	{
-		public $name;
-		public $format = null;
-		public $fields = array();
-		public $order = 1000;
-		
-		function __construct($name)
-		{
-			$this->name = $name;
-		}
-		
-		function init()
-		{
-		}
-		
-		static function create($name)
-		{
-			$file = DEMO_PATH . '/demos/' . $name . '.php';
-			if (!file_exists($file))
-				throw new Exception("Invalid demo: {$name}");
-			include $file;
-			$className = 'Demo_' . $name;
-			$demo = new $className($name);
-			$demo->request = Request::getInstance();
-			$demo->init();
-			foreach ($demo->fields as $field)
-			{
-				$field->request = Request::getInstance();
-				$field->init(Request::getInstance());
-			}
-			return $demo;
-		}
-		
-		function getFormat()
-		{
-			return 'as input';
-		}
-		
-		function addField($field)
-		{
-			$this->fields[$field->name] = $field;
-		}
-		
-		function __toString()
-		{
-			return $this->name;
-		}
-		
-		function text()
-		{
-		}
-		
-		function fval($name)
-		{
-			return $this->fields[$name]->value;
-		}
-	}
-	
\ No newline at end of file
+    /**
+     */
+    class Demo
+    {
+        public $name;
+        public $format = null;
+        public $fields = [];
+        public $order = 1000;
+
+        public function __construct($name)
+        {
+            $this->name = $name;
+        }
+
+        public function init()
+        {
+        }
+
+        public static function create($name)
+        {
+            $file = DEMO_PATH.'/demos/'.$name.'.php';
+            if (!file_exists($file)) {
+                throw new Exception("Invalid demo: {$name}");
+            }
+            include $file;
+            $className = 'Demo_'.$name;
+            $demo = new $className($name);
+            $demo->request = Request::getInstance();
+            $demo->init();
+            foreach ($demo->fields as $field) {
+                $field->request = Request::getInstance();
+                $field->init(Request::getInstance());
+            }
+
+            return $demo;
+        }
+
+        public function getFormat()
+        {
+            return 'as input';
+        }
+
+        public function addField($field)
+        {
+            $this->fields[$field->name] = $field;
+        }
+
+        public function __toString()
+        {
+            return $this->name;
+        }
+
+        public function text()
+        {
+        }
+
+        public function fval($name)
+        {
+            return $this->fields[$name]->value;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Field.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Field.php
index b15c8909a..fd7de01cc 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Field.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Field.php
@@ -1,52 +1,52 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class Field
-	{
-		public $name;
-		public $default;
-		public $value;
-		public $request;
-		public $hint;
-		
-		function __construct($name, $default = null, $hint = '')
-		{
-			$this->name = $name;
-			$this->default = $default;
-			
-			if ($hint == '')
-				$hint = $name;
-			
-			$this->hint = $hint;
-		}
-		
-		function init($request)
-		{
-			$this->value = $request->get($this->name, $this->default);
-		}
-		
-		function render()
-		{
-			$id = htmlentities($this->name);
-			echo '<label style="background-color: #c0c0c0; padding: 5px; margin: 2px;" for="imgparam_' . $id . '" title="' . htmlentities($this->hint) . '">';
-			echo $this->name . ': ';
-			$this->renderBody($id, 'imgparam_' . $id);
-			echo '</label> ';
-		}
-		
-		function renderBody($name, $id)
-		{
-			echo '<input id="' . $id . '" type="text" size="15" name="' . $name . '" value="' . $this->getRenderValue() . '" />';
-		}
-		
-		function getRenderValue()
-		{
-			return $this->value;
-		}
-		
-		function getUrlValue()
-		{
-			return urlencode($this->name) . '=' . urlencode($this->value);
-		}
-	}
+    /**
+     */
+    class Field
+    {
+        public $name;
+        public $default;
+        public $value;
+        public $request;
+        public $hint;
+
+        public function __construct($name, $default = null, $hint = '')
+        {
+            $this->name = $name;
+            $this->default = $default;
+
+            if ($hint == '') {
+                $hint = $name;
+            }
+
+            $this->hint = $hint;
+        }
+
+        public function init($request)
+        {
+            $this->value = $request->get($this->name, $this->default);
+        }
+
+        public function render()
+        {
+            $id = htmlentities($this->name);
+            echo '<label style="background-color: #c0c0c0; padding: 5px; margin: 2px;" for="imgparam_'.$id.'" title="'.htmlentities($this->hint).'">';
+            echo $this->name.': ';
+            $this->renderBody($id, 'imgparam_'.$id);
+            echo '</label> ';
+        }
+
+        public function renderBody($name, $id)
+        {
+            echo '<input id="'.$id.'" type="text" size="15" name="'.$name.'" value="'.$this->getRenderValue().'" />';
+        }
+
+        public function getRenderValue()
+        {
+            return $this->value;
+        }
+
+        public function getUrlValue()
+        {
+            return urlencode($this->name).'='.urlencode($this->value);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FileSelectField.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FileSelectField.php
index ab8e30364..ecff76f2a 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FileSelectField.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FileSelectField.php
@@ -1,83 +1,83 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class FileSelectField extends Field
-	{
-		public $request;
-		public $files = array();
-		public $options;
-		
-		function __construct($name, $path, $options = array())
-		{
-			$this->name = $name;
-			$this->path = $path;
-			$this->options = $options;
-			
-			if (!isset($options['show']))
-				$this->options['show'] = true;
-			
-			if (!isset($options['pattern']))
-				$this->options['pattern'] = '/(.*)/';
-		}
-		
-		function init($request)
-		{
-			$this->value = null;
-			$di = new DirectoryIterator(DEMO_PATH . $this->path);
-			foreach ($di as $file)
-				if (!$file->isDot() && strpos($file->getFilename(), '.') !== 0 && preg_match($this->options['pattern'], $file->getFilename()))
-				{
-					$this->files[] = $file->getFilename();
-					if ($this->value === null && isset($this->options['default']) && $this->options['default'] == $file->getFilename())
-						$this->value = $this->options['default'];
-					
-					if ($this->request->get($this->name) == $file->getFilename())
-						$this->value = $file->getFilename();
-				}
-			
-			sort($this->files);
-			
-			if (!$this->value && count($this->files) > 0)
-				$this->value = $this->files[0];
-		}
-		
-		function renderBody($name, $id)
-		{
-			if ($this->options['show'])
-			{
-				$onch = "document.getElementById('sel_{$id}').src = '{$this->path}/' + this.options[this.selectedIndex].value;";
-			}
-			else
-				$onch = '';
-			
-			echo '<select id="' . $id . '" name="' . $name . '" onchange="' . $onch . '">';
-			$selected_file = null;
-			foreach ($this->files as $file)
-			{
-				if ($this->value == $file)
-				{
-					$sel = 'selected="selected"';
-					$selected_file = $file;
-				}
-				else
-					$sel = '';
-				
-				echo '<option ' . $sel . ' value="' . $file . '">' . $file . '</option>' . PHP_EOL;
-			}
-			echo '</select>';
-			
-			if ($this->options['show'] && $selected_file)
-			{
-				echo '<div style="display: inline; min-width: 50px; min-height: 50px">';
-				echo '<img style="position: absolute" id="sel_' . $id . '" width="50" src="' . $this->path . '/' . $selected_file . '" /> ';
-				echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-				echo '</div>';
-			}
-		}
-		
-		function getURLValue()
-		{
-			return $this->name . '=' . $this->value;
-		}
-	}
+    /**
+     */
+    class FileSelectField extends Field
+    {
+        public $request;
+        public $files = [];
+        public $options;
+
+        public function __construct($name, $path, $options = [])
+        {
+            $this->name = $name;
+            $this->path = $path;
+            $this->options = $options;
+
+            if (!isset($options['show'])) {
+                $this->options['show'] = true;
+            }
+
+            if (!isset($options['pattern'])) {
+                $this->options['pattern'] = '/(.*)/';
+            }
+        }
+
+        public function init($request)
+        {
+            $this->value = null;
+            $di = new DirectoryIterator(DEMO_PATH.$this->path);
+            foreach ($di as $file) {
+                if (!$file->isDot() && strpos($file->getFilename(), '.') !== 0 && preg_match($this->options['pattern'], $file->getFilename())) {
+                    $this->files[] = $file->getFilename();
+                    if ($this->value === null && isset($this->options['default']) && $this->options['default'] == $file->getFilename()) {
+                        $this->value = $this->options['default'];
+                    }
+
+                    if ($this->request->get($this->name) == $file->getFilename()) {
+                        $this->value = $file->getFilename();
+                    }
+                }
+            }
+
+            sort($this->files);
+
+            if (!$this->value && count($this->files) > 0) {
+                $this->value = $this->files[0];
+            }
+        }
+
+        public function renderBody($name, $id)
+        {
+            if ($this->options['show']) {
+                $onch = "document.getElementById('sel_{$id}').src = '{$this->path}/' + this.options[this.selectedIndex].value;";
+            } else {
+                $onch = '';
+            }
+
+            echo '<select id="'.$id.'" name="'.$name.'" onchange="'.$onch.'">';
+            $selected_file = null;
+            foreach ($this->files as $file) {
+                if ($this->value == $file) {
+                    $sel = 'selected="selected"';
+                    $selected_file = $file;
+                } else {
+                    $sel = '';
+                }
+
+                echo '<option '.$sel.' value="'.$file.'">'.$file.'</option>'.PHP_EOL;
+            }
+            echo '</select>';
+
+            if ($this->options['show'] && $selected_file) {
+                echo '<div style="display: inline; min-width: 50px; min-height: 50px">';
+                echo '<img style="position: absolute" id="sel_'.$id.'" width="50" src="'.$this->path.'/'.$selected_file.'" /> ';
+                echo '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+                echo '</div>';
+            }
+        }
+
+        public function getURLValue()
+        {
+            return $this->name.'='.$this->value;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FloatField.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FloatField.php
index a9c313492..f471a17ba 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FloatField.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FloatField.php
@@ -1,16 +1,15 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class FloatField extends Field
-	{
-		function __construct($name, $default, $hint = 'Float')
-		{
-			parent::__construct($name, $default, $hint);
-		}
-		
-		function init($request)
-		{
-			$this->value = $request->getFloat($this->name, $this->default);
-		}
-	}
+    /**
+     */
+    class FloatField extends Field
+    {
+        public function __construct($name, $default, $hint = 'Float')
+        {
+            parent::__construct($name, $default, $hint);
+        }
+
+        public function init($request)
+        {
+            $this->value = $request->getFloat($this->name, $this->default);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FormatSelectField.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FormatSelectField.php
index b730fdf0c..5e214bb8b 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FormatSelectField.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/FormatSelectField.php
@@ -1,11 +1,10 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class FormatSelectField extends SelectField
-	{
-		function __construct($name)
-		{
-			parent::__construct($name, array('preset for demo', 'as input', 'png8', 'png24', 'jpeg', 'gif', 'bmp'), null, 'Image format');
-		}
-	}
+    /**
+     */
+    class FormatSelectField extends SelectField
+    {
+        public function __construct($name)
+        {
+            parent::__construct($name, ['preset for demo', 'as input', 'png8', 'png24', 'jpeg', 'gif', 'bmp'], null, 'Image format');
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/IntField.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/IntField.php
index b939ba04c..16d5ecb95 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/IntField.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/IntField.php
@@ -1,16 +1,15 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class IntField extends Field
-	{
-		function __construct($name, $default, $hint = 'Integer')
-		{
-			parent::__construct($name, $default, $hint);
-		}
-		
-		function init($request)
-		{
-			$this->value = $request->getInt($this->name, $this->default);
-		}
-	}
+    /**
+     */
+    class IntField extends Field
+    {
+        public function __construct($name, $default, $hint = 'Integer')
+        {
+            parent::__construct($name, $default, $hint);
+        }
+
+        public function init($request)
+        {
+            $this->value = $request->getInt($this->name, $this->default);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Request.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Request.php
index 6bc8d28ff..cdef0076d 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Request.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/Request.php
@@ -1,135 +1,131 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  **/
-	
-	/**
-	 * @package Demos
-	 */
-	class Request
-	{
-		protected $vars = array();
-		
-		protected static $instance;
-		static function getInstance()
-		{
-			if (self::$instance === null)
-				self::$instance = new Request;
-			return self::$instance;
-		}
-		
-		protected function __construct()
-		{
-			$this->vars = $_GET;
-			
-			/*
-			// have to rely on parsing QUERY_STRING, thanks to PHP
-			// http://bugs.php.net/bug.php?id=39078
-			// http://bugs.php.net/bug.php?id=45149
-			$all_vars = explode('&', $_SERVER['QUERY_STRING']);
-			foreach ($all_vars as $keyval)
-			{
-				if (strlen($keyval) == 0)
-					continue;
-				
-				if (strpos($keyval, '=') === false)
-				{
-					$key = $keyval;
-					$value = true;
-				}
-				else
-				{
-					list($key, $value) = explode('=', $keyval);
-					#$value = str_replace('%2B', '[[PLUS]]', $value);
-					$value = urldecode($value);
-					#$value = str_replace('[[PLUS]]', '+', $value);
-				}
-				$this->vars[$key] = $value;
-			}
-			*/
-		}
-		
-		function get($key, $default = null)
-		{
-			if (isset($this->vars[$key]))
-				return $this->vars[$key];
-			else
-				return $default;
-		}
-		
-		function set($key, $value)
-		{
-			$this->vars[$key] = $value;
-		}
-		
-		function getInt($key, $default = 0)
-		{
-			$value = self::get($key);
-			if (strlen($value) > 0)
-				return intval($value);
-			else
-				return $default;
-		}
-		
-		function getFloat($key, $default = 0)
-		{
-			$value = self::get($key);
-			if (strlen($value) > 0)
-				return floatval($value);
-			else
-				return $default;
-		}
-		
-		function getCoordinate($key, $default = 0)
-		{
-			$v = self::get($key);
-			if (strlen($v) > 0 && WideImage_Coordinate::parse($v) !== null)
-				return self::get($key);
-			else
-				return $default;
-		}
-		
-		function getOption($key, $valid = array(), $default = null)
-		{
-			$value = self::get($key);
-			if ($value !== null && in_array($value, $valid))
-				return strval($value);
-			else
-				return $default;
-		}
-		
-		function getColor($key, $default = '000000')
-		{
-			$value = self::get($key);
-			if (substr($value, 0, 1) == '#')
-				$value = substr($value, 1);
-			
-			if ($value === '' || preg_match('~^[0-9a-f]{1,6}$~i', $value))
-				return $value;
-			else
-				return $default;
-		}
-		
-		function getRegex($key, $regex, $default = null)
-		{
-			$value = self::get($key);
-			if ($value !== null && preg_match($regex, $value))
-				return $value;
-			else
-				return $default;
-		}
-	}
+    /**
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
+
+    /**
+     */
+    class Request
+    {
+        protected $vars = [];
+
+        protected static $instance;
+
+        public static function getInstance()
+        {
+            if (self::$instance === null) {
+                self::$instance = new self();
+            }
+
+            return self::$instance;
+        }
+
+        protected function __construct()
+        {
+            $this->vars = $_GET;
+
+            /*
+            // have to rely on parsing QUERY_STRING, thanks to PHP
+            // http://bugs.php.net/bug.php?id=39078
+            // http://bugs.php.net/bug.php?id=45149
+            $all_vars = explode('&', $_SERVER['QUERY_STRING']);
+            foreach ($all_vars as $keyval)
+            {
+                if (strlen($keyval) == 0)
+                    continue;
+                
+                if (strpos($keyval, '=') === false)
+                {
+                    $key = $keyval;
+                    $value = true;
+                }
+                else
+                {
+                    list($key, $value) = explode('=', $keyval);
+                    #$value = str_replace('%2B', '[[PLUS]]', $value);
+                    $value = urldecode($value);
+                    #$value = str_replace('[[PLUS]]', '+', $value);
+                }
+                $this->vars[$key] = $value;
+            }
+            */
+        }
+
+        public function get($key, $default = null)
+        {
+            if (isset($this->vars[$key])) {
+                return $this->vars[$key];
+            } else {
+                return $default;
+            }
+        }
+
+        public function set($key, $value)
+        {
+            $this->vars[$key] = $value;
+        }
+
+        public function getInt($key, $default = 0)
+        {
+            $value = self::get($key);
+            if (strlen($value) > 0) {
+                return intval($value);
+            } else {
+                return $default;
+            }
+        }
+
+        public function getFloat($key, $default = 0)
+        {
+            $value = self::get($key);
+            if (strlen($value) > 0) {
+                return floatval($value);
+            } else {
+                return $default;
+            }
+        }
+
+        public function getCoordinate($key, $default = 0)
+        {
+            $v = self::get($key);
+            if (strlen($v) > 0 && WideImage_Coordinate::parse($v) !== null) {
+                return self::get($key);
+            } else {
+                return $default;
+            }
+        }
+
+        public function getOption($key, $valid = [], $default = null)
+        {
+            $value = self::get($key);
+            if ($value !== null && in_array($value, $valid)) {
+                return strval($value);
+            } else {
+                return $default;
+            }
+        }
+
+        public function getColor($key, $default = '000000')
+        {
+            $value = self::get($key);
+            if (substr($value, 0, 1) == '#') {
+                $value = substr($value, 1);
+            }
+
+            if ($value === '' || preg_match('~^[0-9a-f]{1,6}$~i', $value)) {
+                return $value;
+            } else {
+                return $default;
+            }
+        }
+
+        public function getRegex($key, $regex, $default = null)
+        {
+            $value = self::get($key);
+            if ($value !== null && preg_match($regex, $value)) {
+                return $value;
+            } else {
+                return $default;
+            }
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/SelectField.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/SelectField.php
index e0520292e..fb1c15f66 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/SelectField.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/SelectField.php
@@ -1,42 +1,43 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	class SelectField extends Field
-	{
-		public $options;
-		
-		function __construct($name, $options, $default = null, $hint = null)
-		{
-			parent::__construct($name, $default, $hint);
-			$this->name = $name;
-			$this->options = $options;
-			if ($default === null)
-				$this->default = $options[0];
-			else
-				$this->default = $default;
-		}
-		
-		function init($request)
-		{
-			$this->value = $this->default;
-			$v = str_replace('+', ' ', $request->get($this->name));
-			if (in_array($v, $this->options))
-				$this->value = $v;
-		}
-		
-		function renderBody($name, $id)
-		{
-			echo '<select id="' . $id . '" name="' . $name . '">';
-			foreach ($this->options as $option)
-			{
-				if ($this->value == $option)
-					$sel = 'selected="selected"';
-				else
-					$sel = '';
-				
-				echo '<option ' . $sel . ' value="' . $option . '">' . $option . '</option>';
-			}
-			echo '</select>';
-		}
-	}
+    /**
+     */
+    class SelectField extends Field
+    {
+        public $options;
+
+        public function __construct($name, $options, $default = null, $hint = null)
+        {
+            parent::__construct($name, $default, $hint);
+            $this->name = $name;
+            $this->options = $options;
+            if ($default === null) {
+                $this->default = $options[0];
+            } else {
+                $this->default = $default;
+            }
+        }
+
+        public function init($request)
+        {
+            $this->value = $this->default;
+            $v = str_replace('+', ' ', $request->get($this->name));
+            if (in_array($v, $this->options)) {
+                $this->value = $v;
+            }
+        }
+
+        public function renderBody($name, $id)
+        {
+            echo '<select id="'.$id.'" name="'.$name.'">';
+            foreach ($this->options as $option) {
+                if ($this->value == $option) {
+                    $sel = 'selected="selected"';
+                } else {
+                    $sel = '';
+                }
+
+                echo '<option '.$sel.' value="'.$option.'">'.$option.'</option>';
+            }
+            echo '</select>';
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/common.php b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/common.php
index 643727ef5..db82a21e3 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/helpers/common.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/helpers/common.php
@@ -1,22 +1,20 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	define('DEMO_PATH', realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..') . DIRECTORY_SEPARATOR);
-	
-	error_reporting(E_ALL | E_STRICT);
-	ini_set('display_errors', true);
-	
-	require_once DEMO_PATH . 'helpers/Request.php';
-	require_once DEMO_PATH . 'helpers/Demo.php';
-	require_once DEMO_PATH . 'helpers/Field.php';
-	require_once DEMO_PATH . 'helpers/CheckboxField.php';
-	require_once DEMO_PATH . 'helpers/FileSelectField.php';
-	require_once DEMO_PATH . 'helpers/CoordinateField.php';
-	require_once DEMO_PATH . 'helpers/IntField.php';
-	require_once DEMO_PATH . 'helpers/FloatField.php';
-	require_once DEMO_PATH . 'helpers/AngleField.php';
-	require_once DEMO_PATH . 'helpers/SelectField.php';
-	require_once DEMO_PATH . 'helpers/FormatSelectField.php';
-	require_once DEMO_PATH . 'helpers/ColorField.php';
+    /**
+     */
+    define('DEMO_PATH', realpath(dirname(__FILE__).DIRECTORY_SEPARATOR.'..').DIRECTORY_SEPARATOR);
 
+    error_reporting(E_ALL | E_STRICT);
+    ini_set('display_errors', true);
+
+    require_once DEMO_PATH.'helpers/Request.php';
+    require_once DEMO_PATH.'helpers/Demo.php';
+    require_once DEMO_PATH.'helpers/Field.php';
+    require_once DEMO_PATH.'helpers/CheckboxField.php';
+    require_once DEMO_PATH.'helpers/FileSelectField.php';
+    require_once DEMO_PATH.'helpers/CoordinateField.php';
+    require_once DEMO_PATH.'helpers/IntField.php';
+    require_once DEMO_PATH.'helpers/FloatField.php';
+    require_once DEMO_PATH.'helpers/AngleField.php';
+    require_once DEMO_PATH.'helpers/SelectField.php';
+    require_once DEMO_PATH.'helpers/FormatSelectField.php';
+    require_once DEMO_PATH.'helpers/ColorField.php';
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/image.php b/public/filemanager/connectors/php/inc/wideimage/demo/image.php
index f64470aea..c38b8f037 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/image.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/image.php
@@ -1,52 +1,49 @@
 <?php
-	/**
-	 * @package Demos
-	 */
-	
-	require_once dirname(__FILE__) . '/helpers/common.php';
-	require_once dirname(__FILE__) . '/../lib/WideImage.php';
-	
-	$request = Request::getInstance();
-	$demo = Demo::create($request->get('demo'));
-	$image = WideImage::load('images/' . $request->get('image'));
-	
-	$result = $demo->execute($image, $request);
-	
-	$output = new FormatSelectField('output');
-	$output->init(Request::getInstance());
-	
-	if ($output->value == 'preset for demo')
-		$format = $demo->getFormat();
-	else
-		$format = $output->value;
-	
-	if ($format === 'as input')
-		$format = substr($request->get('image'), -3);
-	
-	$output = 24;
-	if ($format == 'png8')
-	{
-		$output = 8;
-		$format = 'png';
-	}
-	elseif ($format == 'png24')
-		$format = 'png';
-	elseif ($format == 'gif')
-		$output = 8;
-	
-	if ($output == 8)
-	{
-		$ncolors = new IntField('colors', 255);
-		$ncolors->init(Request::getInstance());
-		
-		$dither = new CheckboxField('dither', true);
-		$dither->init(Request::getInstance());
-		
-		$match_palette = new CheckboxField('match_palette', true);
-		$match_palette->init(Request::getInstance());
-		
-		$result = $result->asPalette($ncolors->value, $dither->value, $match_palette->value);
-	}
-	
-	$result->output($format);
-	
\ No newline at end of file
+    /**
+     */
+    require_once dirname(__FILE__).'/helpers/common.php';
+    require_once dirname(__FILE__).'/../lib/WideImage.php';
+
+    $request = Request::getInstance();
+    $demo = Demo::create($request->get('demo'));
+    $image = WideImage::load('images/'.$request->get('image'));
+
+    $result = $demo->execute($image, $request);
+
+    $output = new FormatSelectField('output');
+    $output->init(Request::getInstance());
+
+    if ($output->value == 'preset for demo') {
+        $format = $demo->getFormat();
+    } else {
+        $format = $output->value;
+    }
+
+    if ($format === 'as input') {
+        $format = substr($request->get('image'), -3);
+    }
+
+    $output = 24;
+    if ($format == 'png8') {
+        $output = 8;
+        $format = 'png';
+    } elseif ($format == 'png24') {
+        $format = 'png';
+    } elseif ($format == 'gif') {
+        $output = 8;
+    }
+
+    if ($output == 8) {
+        $ncolors = new IntField('colors', 255);
+        $ncolors->init(Request::getInstance());
+
+        $dither = new CheckboxField('dither', true);
+        $dither->init(Request::getInstance());
+
+        $match_palette = new CheckboxField('match_palette', true);
+        $match_palette->init(Request::getInstance());
+
+        $result = $result->asPalette($ncolors->value, $dither->value, $match_palette->value);
+    }
+
+    $result->output($format);
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/index.php b/public/filemanager/connectors/php/inc/wideimage/demo/index.php
index e14d1e492..dc9867ec8 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/index.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/index.php
@@ -1,63 +1,53 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-	* @package Demos
-  **/
-	
-	include 'helpers/common.php';
-	require_once '../lib/WideImage.php';
-	
-	$demos = array();
-	$di = new DirectoryIterator(dirname(__FILE__) . '/demos/');
-	foreach ($di as $file)
-		if (substr($file->getFilename(), -4) == '.php')
-			$demos[] = Demo::create(substr($file->getFilename(), 0, -4));
-	
-	usort($demos, 'cmp_demos');
-	
-	function cmp_demos($d1, $d2)
-	{
-		if ($d1->order === $d2->order)
-			return 0;
-		
-		return ($d1->order < $d2->order ? -1 : 1);
-	}
-	
-	if (isset($_GET['demo']))
-		$activeDemoName = $_GET['demo'];
-	else
-		$activeDemoName = null;
-	
-	$activeDemo = null;
-	foreach ($demos as $demo)
-		if ($demo->name == $activeDemoName)
-		{
-			$activeDemo = $demo;
-			break;
-		}
-	
-	if (!$activeDemo)
-		$activeDemoName = null;
-	
+    /**
+     
+     **/
+    include 'helpers/common.php';
+    require_once '../lib/WideImage.php';
+
+    $demos = [];
+    $di = new DirectoryIterator(dirname(__FILE__).'/demos/');
+    foreach ($di as $file) {
+        if (substr($file->getFilename(), -4) == '.php') {
+            $demos[] = Demo::create(substr($file->getFilename(), 0, -4));
+        }
+    }
+
+    usort($demos, 'cmp_demos');
+
+    function cmp_demos($d1, $d2)
+    {
+        if ($d1->order === $d2->order) {
+            return 0;
+        }
+
+        return $d1->order < $d2->order ? -1 : 1;
+    }
+
+    if (isset($_GET['demo'])) {
+        $activeDemoName = $_GET['demo'];
+    } else {
+        $activeDemoName = null;
+    }
+
+    $activeDemo = null;
+    foreach ($demos as $demo) {
+        if ($demo->name == $activeDemoName) {
+            $activeDemo = $demo;
+            break;
+        }
+    }
+
+    if (!$activeDemo) {
+        $activeDemoName = null;
+    }
+
 ?>
 <html>
 	<head>
-			<title>WideImage -<?php if ($activeDemo) echo " " . $activeDemo->name; ?> demo</title>
+			<title>WideImage -<?php if ($activeDemo) {
+    echo ' '.$activeDemo->name;
+} ?> demo</title>
 
 <style>
 	body
@@ -119,28 +109,28 @@
 			
 			<ul>
 <?php
-	$top_form = array();
-	
-	$top_form['output'] = new FormatSelectField('output');
-	$top_form['output']->init(Request::getInstance());
-	
-	$top_form['ncolors'] = new IntField('colors', 255);
-	$top_form['ncolors']->init(Request::getInstance());
-	
-	$top_form['dither'] = new CheckboxField('dither', true);
-	$top_form['dither']->init(Request::getInstance());
-	$top_form['match_palette'] = new CheckboxField('match_palette', true);
-	$top_form['match_palette']->init(Request::getInstance());
-	
-	foreach ($demos as $demo)
-	{
-		if ($activeDemo !== null && $demo->name == $activeDemo->name)
-			$css = 'active_demo';
-		else
-			$css = '';
-		
-		echo "<li><a class=\"$css\" href=\"?demo={$demo->name}&output={$top_form['output']->value}&colors={$top_form['ncolors']->value}&dither={$top_form['dither']->value}&match_palette={$top_form['match_palette']->value}\">{$demo->name}</a></li>\n";
-	}
+    $top_form = [];
+
+    $top_form['output'] = new FormatSelectField('output');
+    $top_form['output']->init(Request::getInstance());
+
+    $top_form['ncolors'] = new IntField('colors', 255);
+    $top_form['ncolors']->init(Request::getInstance());
+
+    $top_form['dither'] = new CheckboxField('dither', true);
+    $top_form['dither']->init(Request::getInstance());
+    $top_form['match_palette'] = new CheckboxField('match_palette', true);
+    $top_form['match_palette']->init(Request::getInstance());
+
+    foreach ($demos as $demo) {
+        if ($activeDemo !== null && $demo->name == $activeDemo->name) {
+            $css = 'active_demo';
+        } else {
+            $css = '';
+        }
+
+        echo "<li><a class=\"$css\" href=\"?demo={$demo->name}&output={$top_form['output']->value}&colors={$top_form['ncolors']->value}&dither={$top_form['dither']->value}&match_palette={$top_form['match_palette']->value}\">{$demo->name}</a></li>\n";
+    }
 ?>
 			</ul>
 			
@@ -164,10 +154,9 @@
 		</div>
 		<div style="margin-left: 200px">
 <?php
-	if ($activeDemo)
-	{
-		include 'demo_screen.php';
-	}
+    if ($activeDemo) {
+        include 'demo_screen.php';
+    }
 ?>
 		</div>
 	</body>
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Canvas.php b/public/filemanager/connectors/php/inc/wideimage/lib/Canvas.php
index 359ef51bc..cdbd8c521 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Canvas.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Canvas.php
@@ -1,167 +1,156 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_NoFontException extends WideImage_Exception {}
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidFontFileException extends WideImage_Exception {}
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidCanvasMethodException extends WideImage_Exception {}
-	
-	/**
-	 * @package WideImage
-	 */
-	class WideImage_Canvas
-	{
-		protected $handle = 0;
-		protected $image = null;
-		protected $font = null;
-		
-		/**
-		 * Creates a canvas object that writes to the image passed as a parameter
-		 *
-		 * Shouldn't be used directly, use WideImage_Image::getCanvas() instead.
-		 *
-		 * @param WideImage_Image $img Image object
-		 */
-		function __construct($img)
-		{
-			$this->handle = $img->getHandle();
-			$this->image = $img;
-		}
-		
-		/**
-		 * Sets the active font. Can be an instance of 
-		 * WideImage_Font_TTF, WideImage_Font_PS, or WideImage_Font_GDF.
-		 *
-		 *
-		 *
-		 *
-		 * @param object $font Font object to set for writeText()
-		 */
-		function setFont($font)
-		{
-			$this->font = $font;
-		}
-		
-		/**
-		 * Creates and sets the current font
-		 * 
-		 * The supported font types are: TTF/OTF, PS, and GDF.
-		 * Font type is detected from the extension. If the $file parameter doesn't have an extension, TTF font is presumed.
-		 * 
-		 * Note: not all parameters are supported by all fonts.
-		 * 
-		 * @param string $file Font file name (string)
-		 * @param int $size Font size (supported for TTF/OTF and PS fonts, ignored for GDF)
-		 * @param int $color Text color
-		 * @param int $bgcolor Background color (supported only for PS font, ignored for TTF and PS)
-		 * @return mixed One of the WideImage_Font_* objects
-		 */
-		function useFont($file, $size = 12, $color = 0, $bgcolor = null)
-		{
-			$p = strrpos($file, '.');
-			if ($p === false || $p < strlen($file) - 4)
-				$ext = 'ttf';
-			else
-				$ext = strtolower(substr($file, $p + 1));
-			
-			if ($ext == 'ttf' || $ext == 'otf')
-				$font = new WideImage_Font_TTF($file, $size, $color);
-			elseif ($ext == 'ps')
-				$font = new WideImage_Font_PS($file, $size, $color, $bgcolor);
-			elseif ($ext == 'gdf')
-				$font = new WideImage_Font_GDF($file, $color);
-			else
-				throw new WideImage_InvalidFontFileException("'$file' appears to be an invalid font file.");
-			
-			$this->setFont($font);
-			return $font;
-		}
-		
-		/**
-		 * Write text on the image at specified position
-		 * 
-		 * You must set a font with a call to WideImage_Canvas::setFont() prior to writing text to the image.
-		 * 
-		 * Smart coordinates are supported for $x and $y arguments, but currently only for TTF/OTF fonts.
-		 * 
-		 * Example:
-		 * <code>
-		 * $img = WideImage::load('pic.jpg');
-		 * $canvas = $img->getCanvas();
-		 * $canvas->useFont('Verdana.ttf', 16, $img->allocateColor(255, 0, 0));
-		 * $canvas->writeText('right', 'bottom', 'www.website.com');
-		 * </code>
-		 * 
-		 * @param int $x Left
-		 * @param int $y Top
-		 * @param string $text Text to write
-		 * @param int $angle The angle, defaults to 0
-		 */
-		function writeText($x, $y, $text, $angle = 0)
-		{
-			if ($this->font === null)
-				throw new WideImage_NoFontException("Can't write text without a font.");
-			
-			$angle = - floatval($angle);
-			if ($angle < 0)
-				$angle = 360 + $angle;
-			$angle = $angle % 360;
-			
-			$this->font->writeText($this->image, $x, $y, $text, $angle);
-		}
-		
-		/**
-		 * A magic method that allows you to call any PHP function that starts with "image".
-		 * 
-		 * This is a shortcut to call custom functions on the image handle.
-		 * 
-		 * Example:
-		 * <code>
-		 * $img = WideImage::load('pic.jpg');
-		 * $canvas = $img->getCanvas();
-		 * $canvas->filledRect(10, 10, 20, 30, $img->allocateColor(0, 0, 0));
-		 * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
-		 * </code>
-		 */
-		function __call($method, $params)
-		{
-			if (function_exists('image' . $method))
-			{
-				array_unshift($params, $this->handle);
-				call_user_func_array('image' . $method, $params);
-			}
-			else
-				throw new WideImage_InvalidCanvasMethodException("Function doesn't exist: image{$method}.");
-		}
-	}
+    /**
+     */
+    class WideImage_NoFontException extends WideImage_Exception
+    {
+    }
+
+    /**
+     */
+    class WideImage_InvalidFontFileException extends WideImage_Exception
+    {
+    }
+
+    /**
+     */
+    class WideImage_InvalidCanvasMethodException extends WideImage_Exception
+    {
+    }
+
+    /**
+     */
+    class WideImage_Canvas
+    {
+        protected $handle = 0;
+        protected $image = null;
+        protected $font = null;
+
+        /**
+         * Creates a canvas object that writes to the image passed as a parameter.
+         *
+         * Shouldn't be used directly, use WideImage_Image::getCanvas() instead.
+         *
+         * @param WideImage_Image $img Image object
+         */
+        public function __construct($img)
+        {
+            $this->handle = $img->getHandle();
+            $this->image = $img;
+        }
+
+        /**
+         * Sets the active font. Can be an instance of 
+         * WideImage_Font_TTF, WideImage_Font_PS, or WideImage_Font_GDF.
+         *
+         *
+         *
+         *
+         * @param object $font Font object to set for writeText()
+         */
+        public function setFont($font)
+        {
+            $this->font = $font;
+        }
+
+        /**
+         * Creates and sets the current font.
+         * 
+         * The supported font types are: TTF/OTF, PS, and GDF.
+         * Font type is detected from the extension. If the $file parameter doesn't have an extension, TTF font is presumed.
+         * 
+         * Note: not all parameters are supported by all fonts.
+         * 
+         * @param string $file    Font file name (string)
+         * @param int    $size    Font size (supported for TTF/OTF and PS fonts, ignored for GDF)
+         * @param int    $color   Text color
+         * @param int    $bgcolor Background color (supported only for PS font, ignored for TTF and PS)
+         *
+         * @return mixed One of the WideImage_Font_* objects
+         */
+        public function useFont($file, $size = 12, $color = 0, $bgcolor = null)
+        {
+            $p = strrpos($file, '.');
+            if ($p === false || $p < strlen($file) - 4) {
+                $ext = 'ttf';
+            } else {
+                $ext = strtolower(substr($file, $p + 1));
+            }
+
+            if ($ext == 'ttf' || $ext == 'otf') {
+                $font = new WideImage_Font_TTF($file, $size, $color);
+            } elseif ($ext == 'ps') {
+                $font = new WideImage_Font_PS($file, $size, $color, $bgcolor);
+            } elseif ($ext == 'gdf') {
+                $font = new WideImage_Font_GDF($file, $color);
+            } else {
+                throw new WideImage_InvalidFontFileException("'$file' appears to be an invalid font file.");
+            }
+
+            $this->setFont($font);
+
+            return $font;
+        }
+
+        /**
+         * Write text on the image at specified position.
+         * 
+         * You must set a font with a call to WideImage_Canvas::setFont() prior to writing text to the image.
+         * 
+         * Smart coordinates are supported for $x and $y arguments, but currently only for TTF/OTF fonts.
+         * 
+         * Example:
+         * <code>
+         * $img = WideImage::load('pic.jpg');
+         * $canvas = $img->getCanvas();
+         * $canvas->useFont('Verdana.ttf', 16, $img->allocateColor(255, 0, 0));
+         * $canvas->writeText('right', 'bottom', 'www.website.com');
+         * </code>
+         * 
+         * @param int    $x     Left
+         * @param int    $y     Top
+         * @param string $text  Text to write
+         * @param int    $angle The angle, defaults to 0
+         */
+        public function writeText($x, $y, $text, $angle = 0)
+        {
+            if ($this->font === null) {
+                throw new WideImage_NoFontException("Can't write text without a font.");
+            }
+
+            $angle = -floatval($angle);
+            if ($angle < 0) {
+                $angle = 360 + $angle;
+            }
+            $angle = $angle % 360;
+
+            $this->font->writeText($this->image, $x, $y, $text, $angle);
+        }
+
+        /**
+         * A magic method that allows you to call any PHP function that starts with "image".
+         * 
+         * This is a shortcut to call custom functions on the image handle.
+         * 
+         * Example:
+         * <code>
+         * $img = WideImage::load('pic.jpg');
+         * $canvas = $img->getCanvas();
+         * $canvas->filledRect(10, 10, 20, 30, $img->allocateColor(0, 0, 0));
+         * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
+         * </code>
+         */
+        public function __call($method, $params)
+        {
+            if (function_exists('image'.$method)) {
+                array_unshift($params, $this->handle);
+                call_user_func_array('image'.$method, $params);
+            } else {
+                throw new WideImage_InvalidCanvasMethodException("Function doesn't exist: image{$method}.");
+            }
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php b/public/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php
index a3f6f6373..7b3a14360 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php
@@ -1,208 +1,179 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     */
+    class WideImage_InvalidCoordinateException extends WideImage_Exception
+    {
+    }
 
-	* @package Internals
-  **/
-	
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidCoordinateException extends WideImage_Exception {}
-	
-	/**
-	 * A utility class for smart coordinates
-	 *  
-	 * @package Internals
-	 **/
-	class WideImage_Coordinate
-	{
-		static protected $coord_align = array("left", "center", "right", "top", "middle", "bottom");
-		static protected $coord_numeric = array("[0-9]+", "[0-9]+\.[0-9]+", "[0-9]+%", "[0-9]+\.[0-9]+%");
-		
-		/**
-		 * Parses a numeric or string representation of a corrdinate into a structure
-		 * 
-		 * @param string $coord Smart coordinate
-		 * @return array Parsed smart coordinate
-		 */
-		static function parse($c)
-		{
-			$tokens = array();
-			$operators = array('+', '-');
-			
-			$flush_operand = false;
-			$flush_operator = false;
-			$current_operand = '';
-			$current_operator = '';
-			$coordinate = strval($c);
-			$expr_len = strlen($coordinate);
-			
-			for ($i = 0; $i < $expr_len; $i++)
-			{
-				$char = $coordinate[$i];
-				
-				if (in_array($char, $operators))
-				{
-					$flush_operand = true;
-					$flush_operator = true;
-					$current_operator = $char;
-				}
-				else
-				{
-					$current_operand .= $char;
-					if ($i == $expr_len - 1)
-						$flush_operand = true;
-				}
-				
-				if ($flush_operand)
-				{
-					if (trim($current_operand) != '')
-						$tokens[] = array('type' => 'operand', 'value' => trim($current_operand));
-					
-					$current_operand = '';
-					$flush_operand = false;
-				}
-				
-				if ($flush_operator)
-				{
-					$tokens[] = array('type' => 'operator', 'value' => $char);
-					$flush_operator = false;
-				}
-			}
-			return $tokens;
-		}
-		
-		/**
-		 * Evaluates the $coord relatively to $dim
-		 * 
-		 * @param string $coord A numeric value or percent string
-		 * @param int $dim Dimension
-		 * @param int $sec_dim Secondary dimension (for align)
-		 * @return int Calculated value
-		 */
-		static function evaluate($coord, $dim, $sec_dim = null)
-		{
-			$comp_regex = implode('|', self::$coord_align) . '|' . implode('|', self::$coord_numeric);
-			if (preg_match("/^([+-])?({$comp_regex})$/", $coord, $matches))
-			{
-				$sign = intval($matches[1] . "1");
-				$val = $matches[2];
-				if (in_array($val, self::$coord_align))
-				{
-					if ($sec_dim === null)
-					{
-						switch ($val)
-						{
-							case 'left':
-							case 'top':
-								return 0;
-								break;
-							case 'center':
-							case 'middle':
-								return $sign * intval($dim / 2);
-								break;
-							case 'right':
-							case 'bottom':
-								return $sign * $dim;
-								break;
-							default:
-								return null;
-						}
-					}
-					else
-					{
-						switch ($val)
-						{
-							case 'left':
-							case 'top':
-								return 0;
-								break;
-							case 'center':
-							case 'middle':
-								return $sign * intval($dim / 2 - $sec_dim / 2);
-								break;
-							case 'right':
-							case 'bottom':
-								return $sign * ($dim - $sec_dim);
-								break;
-							default:
-								return null;
-						}
-					}
-				}
-				elseif (substr($val, -1) === '%')
-					return intval(round($sign * $dim * floatval(str_replace('%', '', $val)) / 100));
-				else
-					return $sign * intval(round($val));
-			}
-		}
-		
-		/**
-		 * Calculates and fixes a smart coordinate into a numeric value
-		 * 
-		 * @param mixed $value Smart coordinate, relative to $dim
-		 * @param int $dim Coordinate to which $value is relative
-		 * @param int $sec_dim Secondary dimension (for align)
-		 * @return int Calculated value
-		 */
-		static function fix($value, $dim, $sec_dim = null)
-		{
-			$coord_tokens = self::parse($value);
-			
-			if (count($coord_tokens) == 0 || $coord_tokens[count($coord_tokens) - 1]['type'] != 'operand')
-				throw new WideImage_InvalidCoordinateException("Couldn't parse coordinate '$value' properly.");
-			
-			$value = 0;
-			$operation = 1;
-			foreach ($coord_tokens as $token)
-			{
-				if ($token['type'] == 'operand')
-				{
-					$operand_value = self::evaluate($token['value'], $dim, $sec_dim);
-					if ($operation == 1)
-						$value = $value + $operand_value;
-					elseif ($operation == -1)
-						$value = $value - $operand_value;
-					else
-						throw new WideImage_InvalidCoordinateException("Invalid coordinate syntax.");
-					
-					$operation = 0;
-				}
-				elseif ($token['type'] == 'operator')
-				{
-					if ($token['value'] == '-')
-					{
-						if ($operation == 0)
-							$operation = -1;
-						else
-							$operation = $operation * -1;
-					}
-					elseif ($token['value'] == '+')
-					{
-						if ($operation == 0)
-							$operation = '1';
-					}
-				}
-			}
-			return $value;
-		}
-	}
+    /**
+     * A utility class for smart coordinates.
+     **/
+    class WideImage_Coordinate
+    {
+        protected static $coord_align = ['left', 'center', 'right', 'top', 'middle', 'bottom'];
+        protected static $coord_numeric = ['[0-9]+', "[0-9]+\.[0-9]+", '[0-9]+%', "[0-9]+\.[0-9]+%"];
+
+        /**
+         * Parses a numeric or string representation of a corrdinate into a structure.
+         * 
+         * @param string $coord Smart coordinate
+         *
+         * @return array Parsed smart coordinate
+         */
+        public static function parse($c)
+        {
+            $tokens = [];
+            $operators = ['+', '-'];
+
+            $flush_operand = false;
+            $flush_operator = false;
+            $current_operand = '';
+            $current_operator = '';
+            $coordinate = strval($c);
+            $expr_len = strlen($coordinate);
+
+            for ($i = 0; $i < $expr_len; $i++) {
+                $char = $coordinate[$i];
+
+                if (in_array($char, $operators)) {
+                    $flush_operand = true;
+                    $flush_operator = true;
+                    $current_operator = $char;
+                } else {
+                    $current_operand .= $char;
+                    if ($i == $expr_len - 1) {
+                        $flush_operand = true;
+                    }
+                }
+
+                if ($flush_operand) {
+                    if (trim($current_operand) != '') {
+                        $tokens[] = ['type' => 'operand', 'value' => trim($current_operand)];
+                    }
+
+                    $current_operand = '';
+                    $flush_operand = false;
+                }
+
+                if ($flush_operator) {
+                    $tokens[] = ['type' => 'operator', 'value' => $char];
+                    $flush_operator = false;
+                }
+            }
+
+            return $tokens;
+        }
+
+        /**
+         * Evaluates the $coord relatively to $dim.
+         * 
+         * @param string $coord   A numeric value or percent string
+         * @param int    $dim     Dimension
+         * @param int    $sec_dim Secondary dimension (for align)
+         *
+         * @return int Calculated value
+         */
+        public static function evaluate($coord, $dim, $sec_dim = null)
+        {
+            $comp_regex = implode('|', self::$coord_align).'|'.implode('|', self::$coord_numeric);
+            if (preg_match("/^([+-])?({$comp_regex})$/", $coord, $matches)) {
+                $sign = intval($matches[1].'1');
+                $val = $matches[2];
+                if (in_array($val, self::$coord_align)) {
+                    if ($sec_dim === null) {
+                        switch ($val) {
+                            case 'left':
+                            case 'top':
+                                return 0;
+                                break;
+                            case 'center':
+                            case 'middle':
+                                return $sign * intval($dim / 2);
+                                break;
+                            case 'right':
+                            case 'bottom':
+                                return $sign * $dim;
+                                break;
+                            default:
+                                return;
+                        }
+                    } else {
+                        switch ($val) {
+                            case 'left':
+                            case 'top':
+                                return 0;
+                                break;
+                            case 'center':
+                            case 'middle':
+                                return $sign * intval($dim / 2 - $sec_dim / 2);
+                                break;
+                            case 'right':
+                            case 'bottom':
+                                return $sign * ($dim - $sec_dim);
+                                break;
+                            default:
+                                return;
+                        }
+                    }
+                } elseif (substr($val, -1) === '%') {
+                    return intval(round($sign * $dim * floatval(str_replace('%', '', $val)) / 100));
+                } else {
+                    return $sign * intval(round($val));
+                }
+            }
+        }
+
+        /**
+         * Calculates and fixes a smart coordinate into a numeric value.
+         * 
+         * @param mixed $value   Smart coordinate, relative to $dim
+         * @param int   $dim     Coordinate to which $value is relative
+         * @param int   $sec_dim Secondary dimension (for align)
+         *
+         * @return int Calculated value
+         */
+        public static function fix($value, $dim, $sec_dim = null)
+        {
+            $coord_tokens = self::parse($value);
+
+            if (count($coord_tokens) == 0 || $coord_tokens[count($coord_tokens) - 1]['type'] != 'operand') {
+                throw new WideImage_InvalidCoordinateException("Couldn't parse coordinate '$value' properly.");
+            }
+
+            $value = 0;
+            $operation = 1;
+            foreach ($coord_tokens as $token) {
+                if ($token['type'] == 'operand') {
+                    $operand_value = self::evaluate($token['value'], $dim, $sec_dim);
+                    if ($operation == 1) {
+                        $value = $value + $operand_value;
+                    } elseif ($operation == -1) {
+                        $value = $value - $operand_value;
+                    } else {
+                        throw new WideImage_InvalidCoordinateException('Invalid coordinate syntax.');
+                    }
+
+                    $operation = 0;
+                } elseif ($token['type'] == 'operator') {
+                    if ($token['value'] == '-') {
+                        if ($operation == 0) {
+                            $operation = -1;
+                        } else {
+                            $operation = $operation * -1;
+                        }
+                    } elseif ($token['value'] == '+') {
+                        if ($operation == 0) {
+                            $operation = '1';
+                        }
+                    }
+                }
+            }
+
+            return $value;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Exception.php b/public/filemanager/connectors/php/inc/wideimage/lib/Exception.php
index 0aae4f0f9..6c3417ecd 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Exception.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Exception.php
@@ -1,31 +1,12 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-
-	/**
-	 * Base Exception class
-	 * 
-	 * @package Exceptions
-	 **/
-	class WideImage_Exception extends RuntimeException {}
-	
\ No newline at end of file
+    /**
+     * Base Exception class.
+     **/
+    class WideImage_Exception extends RuntimeException
+    {
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Font/GDF.php b/public/filemanager/connectors/php/inc/wideimage/lib/Font/GDF.php
index c83122e6c..40efefa06 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Font/GDF.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Font/GDF.php
@@ -1,48 +1,29 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-	
-	/**
-	 * GDF font support class
-	 * 
-	 * @package WideImage
-	 */
-	class WideImage_Font_GDF
-	{
-		protected $font;
-		protected $color;
-		
-		function __construct($face, $color)
-		{
-			if (is_int($face) && $face >= 1 && $face <= 5)
-				$this->font = $face;
-			else
-				$this->font = imageloadfont($face);
-			$this->color = $color;
-		}
-		
-		function writeText($image, $x, $y, $text)
-		{
-			imagestring($image->getHandle(), $this->font, $x, $y, $text, $this->color);
-		}
-	}
+    /**
+     * GDF font support class.
+     */
+    class WideImage_Font_GDF
+    {
+        protected $font;
+        protected $color;
+
+        public function __construct($face, $color)
+        {
+            if (is_int($face) && $face >= 1 && $face <= 5) {
+                $this->font = $face;
+            } else {
+                $this->font = imageloadfont($face);
+            }
+            $this->color = $color;
+        }
+
+        public function writeText($image, $x, $y, $text)
+        {
+            imagestring($image->getHandle(), $this->font, $x, $y, $text, $this->color);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Font/PS.php b/public/filemanager/connectors/php/inc/wideimage/lib/Font/PS.php
index 9359e2e5c..5dd33b580 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Font/PS.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Font/PS.php
@@ -1,60 +1,42 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * PS font support class.
+     */
+    class WideImage_Font_PS
+    {
+        public $size;
+        public $color;
+        public $handle;
 
-    * @package WideImage
-  **/
-	
-	/**
-	 * PS font support class
-	 * 
-	 * @package WideImage
-	 */
-	class WideImage_Font_PS
-	{
-		public $size;
-		public $color;
-		public $handle;
-		
-		function __construct($file, $size, $color, $bgcolor = null)
-		{
-			$this->handle = imagepsloadfont($file);
-			$this->size = $size;
-			$this->color = $color;
-			if ($bgcolor === null)
-				$this->bgcolor = $color;
-			else
-				$this->color = $color;
-		}
-		
-		function writeText($image, $x, $y, $text, $angle = 0)
-		{
-			if ($image->isTrueColor())
-				$image->alphaBlending(true);
-			
-			imagepstext($image->getHandle(), $text, $this->handle, $this->size, $this->color, $this->bgcolor, $x, $y, 0, 0, $angle, 4);
-		}
-		
-		function __destruct()
-		{
-			imagepsfreefont($this->handle);
-			$this->handle = null;
-		}
-	}
+        public function __construct($file, $size, $color, $bgcolor = null)
+        {
+            $this->handle = imagepsloadfont($file);
+            $this->size = $size;
+            $this->color = $color;
+            if ($bgcolor === null) {
+                $this->bgcolor = $color;
+            } else {
+                $this->color = $color;
+            }
+        }
+
+        public function writeText($image, $x, $y, $text, $angle = 0)
+        {
+            if ($image->isTrueColor()) {
+                $image->alphaBlending(true);
+            }
+
+            imagepstext($image->getHandle(), $text, $this->handle, $this->size, $this->color, $this->bgcolor, $x, $y, 0, 0, $angle, 4);
+        }
+
+        public function __destruct()
+        {
+            imagepsfreefont($this->handle);
+            $this->handle = null;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php b/public/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php
index 10877117f..8501ec379 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php
@@ -1,75 +1,56 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * TTF font support class.
+     */
+    class WideImage_Font_TTF
+    {
+        public $face;
+        public $size;
+        public $color;
 
-    * @package WideImage
-  **/
-	
-	/**
-	 * TTF font support class
-	 * 
-	 * @package WideImage
-	 */
-	class WideImage_Font_TTF
-	{
-		public $face;
-		public $size;
-		public $color;
-		
-		function __construct($face, $size, $color)
-		{
-			$this->face = $face;
-			$this->size = $size;
-			$this->color = $color;
-		}
-		
-		/**
-		 * Writes text onto an image
-		 * 
-		 * @param WideImage_Image $image
-		 * @param mixed $x smart coordinate
-		 * @param mixed $y smart coordinate
-		 * @param string $text
-		 * @param int $angle Angle in degrees clockwise
-		 */
-		function writeText($image, $x, $y, $text, $angle = 0)
-		{
-			if ($image->isTrueColor())
-				$image->alphaBlending(true);
-			
-			$box = imageftbbox($this->size, $angle, $this->face, $text);
-			$obox = array(
-				'left' => min($box[0], $box[2], $box[4], $box[6]),
-				'top' => min($box[1], $box[3], $box[5], $box[7]),
-				'right' => max($box[0], $box[2], $box[4], $box[6]) - 1,
-				'bottom' => max($box[1], $box[3], $box[5], $box[7]) - 1
-			);
-			$obox['width'] = abs($obox['left']) + abs($obox['right']);
-			$obox['height'] = abs($obox['top']) + abs($obox['bottom']);
-			
-			$x = WideImage_Coordinate::fix($x, $image->getWidth(), $obox['width']);
-			$y = WideImage_Coordinate::fix($y, $image->getHeight(), $obox['height']);
-			
-			$fixed_x = $x - $obox['left'];
-			$fixed_y = $y - $obox['top'];
-			
-			imagettftext($image->getHandle(), $this->size, $angle, $fixed_x, $fixed_y, $this->color, $this->face, $text);
-		}
-	}
+        public function __construct($face, $size, $color)
+        {
+            $this->face = $face;
+            $this->size = $size;
+            $this->color = $color;
+        }
+
+        /**
+         * Writes text onto an image.
+         * 
+         * @param WideImage_Image $image
+         * @param mixed           $x     smart coordinate
+         * @param mixed           $y     smart coordinate
+         * @param string          $text
+         * @param int             $angle Angle in degrees clockwise
+         */
+        public function writeText($image, $x, $y, $text, $angle = 0)
+        {
+            if ($image->isTrueColor()) {
+                $image->alphaBlending(true);
+            }
+
+            $box = imageftbbox($this->size, $angle, $this->face, $text);
+            $obox = [
+                'left'   => min($box[0], $box[2], $box[4], $box[6]),
+                'top'    => min($box[1], $box[3], $box[5], $box[7]),
+                'right'  => max($box[0], $box[2], $box[4], $box[6]) - 1,
+                'bottom' => max($box[1], $box[3], $box[5], $box[7]) - 1,
+            ];
+            $obox['width'] = abs($obox['left']) + abs($obox['right']);
+            $obox['height'] = abs($obox['top']) + abs($obox['bottom']);
+
+            $x = WideImage_Coordinate::fix($x, $image->getWidth(), $obox['width']);
+            $y = WideImage_Coordinate::fix($y, $image->getHeight(), $obox['height']);
+
+            $fixed_x = $x - $obox['left'];
+            $fixed_y = $y - $obox['top'];
+
+            imagettftext($image->getHandle(), $this->size, $angle, $fixed_x, $fixed_y, $this->color, $this->face, $text);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Image.php b/public/filemanager/connectors/php/inc/wideimage/lib/Image.php
index 3a9928000..d0617bc31 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Image.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Image.php
@@ -1,964 +1,986 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Thrown when an invalid dimension is passed for some operations.
+     */
+    class WideImage_InvalidImageDimensionException extends WideImage_Exception
+    {
+    }
 
-	* @package WideImage
-  **/
-	
-	/**
-	 * Thrown when an invalid dimension is passed for some operations
-	 * 
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidImageDimensionException extends WideImage_Exception {}
-	
-	/**
-	 * Thrown when an image can't be saved (returns false by the mapper)
-	 * 
-	 * @package Exceptions
-	 */
-	class WideImage_UnknownErrorWhileMappingException extends WideImage_Exception {}
-	
-	/**
-	 * Base class for images
-	 * 
-	 * @package WideImage
-	 */
-	abstract class WideImage_Image
-	{
-		/**
-		 * Holds the image resource
-		 * @var resource
-		 */
-		protected $handle = null;
-		
-		/**
-		 * Flag that determines if WideImage should call imagedestroy() upon object destruction
-		 * @var bool
-		 */
-		protected $handleReleased = false;
-		
-		/**
-		 * Canvas object
-		 * @var WideImage_Canvas
-		 */
-		protected $canvas = null;
-		
-		/**
-		 * @var string
-		 */
-		protected $sdata = null;
-		
-		/**
-		 * The base class constructor
-		 *
-		 * @param resource $handle Image handle (GD2 resource)
-		 */
-		function __construct($handle)
-		{
-			WideImage::assertValidImageHandle($handle);
-			$this->handle = $handle;
-		}
-		
-		/**
-		 * Cleanup
-		 * 
-		 * Destroys the handle via WideImage_Image::destroy() when called by the GC.
-		 */
-		function __destruct()
-		{
-			$this->destroy();
-		}
-		
-		/**
-		 * This method destroy the image handle, and releases the image resource.
-		 * 
-		 * After this is called, the object doesn't hold a valid image any more.
-		 * No operation should be called after that.
-		 */
-		function destroy()
-		{
-			if ($this->isValid() && !$this->handleReleased)
-				imagedestroy($this->handle);
-			
-			$this->handle = null;
-		}
-		
-		/**
-		 * Returns the GD image resource
-		 * 
-		 * @return resource GD image resource
-		 */
-		function getHandle()
-		{
-			return $this->handle;
-		}
-		
-		/**
-		 * @return bool True, if the image object holds a valid GD image, false otherwise
-		 */
-		function isValid()
-		{
-			return WideImage::isValidImageHandle($this->handle);
-		}
-		
-		/**
-		 * Releases the handle
-		 */
-		function releaseHandle()
-		{
-			$this->handleReleased = true;
-		}
-		
-		/**
-		 * Saves an image to a file
-		 * 
-		 * The file type is recognized from the $uri. If you save to a GIF8, truecolor images
-		 * are automatically converted to palette.
-		 * 
-		 * This method supports additional parameters: quality (for jpeg images) and 
-		 * compression quality and filters (for png images). See http://www.php.net/imagejpeg and
-		 * http://www.php.net/imagepng for details.
-		 * 
-		 * Examples:
-		 * <code>
-		 * // save to a GIF
-		 * $image->saveToFile('image.gif');
-		 * 
-		 * // save to a PNG with compression=7 and no filters
-		 * $image->saveToFile('image.png', 7, PNG_NO_FILTER);
-		 * 
-		 * // save to a JPEG with quality=80
-		 * $image->saveToFile('image.jpg', 80);
-		 * 
-		 * // save to a JPEG with default quality=100
-		 * $image->saveToFile('image.jpg');
-		 * </code>
-		 * 
-		 * @param string $uri File location
-		 */
-		function saveToFile($uri)
-		{
-			$mapper = WideImage_MapperFactory::selectMapper($uri, null);
-			$args = func_get_args();
-			array_unshift($args, $this->getHandle());
-			$res = call_user_func_array(array($mapper, 'save'), $args);
-			if (!$res)
-				throw new WideImage_UnknownErrorWhileMappingException(get_class($mapper) . " returned an invalid result while saving to $uri");
-		}
-		
-		/**
-		 * Returns binary string with image data in format specified by $format
-		 * 
-		 * Additional parameters may be passed to the function. See WideImage_Image::saveToFile() for more details.
-		 * 
-		 * @param string $format The format of the image
-		 * @return string The binary image data in specified format
-		 */
-		function asString($format)
-		{
-			ob_start();
-			$args = func_get_args();
-			$args[0] = null;
-			array_unshift($args, $this->getHandle());
-			
-			$mapper = WideImage_MapperFactory::selectMapper(null, $format);
-			$res = call_user_func_array(array($mapper, 'save'), $args);
-			if (!$res)
-				throw new WideImage_UnknownErrorWhileMappingException(get_class($mapper) . " returned an invalid result while writing the image data");
-			
-			return ob_get_clean();
-		}
-		
-		/**
-		 * Output a header to browser.
-		 * 
-		 * @param $name Name of the header
-		 * @param $data Data
-		 */
-		protected function writeHeader($name, $data)
-		{
-			header($name . ": " . $data);
-		}
-		
-		/**
-		 * Outputs the image to browser
-		 * 
-		 * Sets headers Content-length and Content-type, and echoes the image in the specified format.
-		 * All other headers (such as Content-disposition) must be added manually. 
-		 * 
-		 * Example:
-		 * <code>
-		 * WideImage::load('image1.png')->resize(100, 100)->output('gif');
-		 * </code>
-		 * 
-		 * @param string $format Image format
-		 */
-		function output($format)
-		{
-			$args = func_get_args();
-			$data = call_user_func_array(array($this, 'asString'), $args);
-			
-			$this->writeHeader('Content-length', strlen($data));
-			$this->writeHeader('Content-type', WideImage_MapperFactory::mimeType($format));
-			echo $data;
-		}
-		
-		/**
-		 * @return int Image width
-		 */
-		function getWidth()
-		{
-			return imagesx($this->handle);
-		}
-		
-		/**
-		 * @return int Image height
-		 */
-		function getHeight()
-		{
-			return imagesy($this->handle);
-		}
-		
-		/**
-		 * Allocate a color by RGB values.
-		 * 
-		 * @param mixed $R Red-component value or an RGB array (with red, green, blue keys)
-		 * @param int $G If $R is int, this is the green component
-		 * @param int $B If $R is int, this is the blue component
-		 * @return int Image color index
-		 */
-		function allocateColor($R, $G = null, $B = null)
-		{
-			if (is_array($R))
-				return imageColorAllocate($this->handle, $R['red'], $R['green'], $R['blue']);
-			else
-				return imageColorAllocate($this->handle, $R, $G, $B);
-		}
-		
-		/**
-		 * @return bool True if the image is transparent, false otherwise
-		 */
-		function isTransparent()
-		{
-			return $this->getTransparentColor() >= 0;
-		}
-		
-		/**
-		 * @return int Transparent color index
-		 */
-		function getTransparentColor()
-		{
-			return imagecolortransparent($this->handle);
-		}
-		
-		/**
-		 * Sets the current transparent color index. Only makes sense for palette images (8-bit).
-		 * 
-		 * @param int $color Transparent color index
-		 */
-		function setTransparentColor($color)
-		{
-			return imagecolortransparent($this->handle, $color);
-		}
-		
-		/**
-		 * Returns a RGB array of the transparent color or null if none.
-		 * 
-		 * @return mixed Transparent color RGBA array
-		 */
-		function getTransparentColorRGB()
-		{
-			$total = imagecolorstotal($this->handle);
-			$tc = $this->getTransparentColor();
-			
-			if ($tc >= $total && $total > 0)
-				return null;
-			else
-				return $this->getColorRGB($tc);
-		}
-		
-		/**
-		 * Returns a RGBA array for pixel at $x, $y
-		 * 
-		 * @param int $x
-		 * @param int $y
-		 * @return array RGB array 
-		 */
-		function getRGBAt($x, $y)
-		{
-			return $this->getColorRGB($this->getColorAt($x, $y));
-		}
-		
-		/**
-		 * Writes a pixel at the designated coordinates
-		 * 
-		 * Takes an associative array of colours and uses getExactColor() to
-		 * retrieve the exact index color to write to the image with.
-		 *
-		 * @param int $x
-		 * @param int $y
-		 * @param array $color
-		 */
-		function setRGBAt($x, $y, $color)
-		{
-			$this->setColorAt($x, $y, $this->getExactColor($color));
-		}
-		
-		/**
-		 * Returns a color's RGB
-		 * 
-		 * @param int $colorIndex Color index
-		 * @return mixed RGBA array for a color with index $colorIndex
-		 */
-		function getColorRGB($colorIndex)
-		{
-			return imageColorsForIndex($this->handle, $colorIndex);
-		}
-		
-		/**
-		 * Returns an index of the color at $x, $y
-		 * 
-		 * @param int $x
-		 * @param int $y
-		 * @return int Color index for a pixel at $x, $y
-		 */
-		function getColorAt($x, $y)
-		{
-			return imagecolorat($this->handle, $x, $y);
-		}
-		
-		/**
-		 * Set the color index $color to a pixel at $x, $y
-		 * 
-		 * @param int $x
-		 * @param int $y
-		 * @param int $color Color index
-		 */
-		function setColorAt($x, $y, $color)
-		{
-			return imagesetpixel($this->handle, $x, $y, $color);
-		}
-		
-		/**
-		 * Returns closest color index that matches the given RGB value. Uses
-		 * PHP's imagecolorclosest()
-		 * 
-		 * @param mixed $R Red or RGBA array
-		 * @param int $G Green component (or null if $R is an RGB array)
-		 * @param int $B Blue component (or null if $R is an RGB array)
-		 * @return int Color index
-		 */
-		function getClosestColor($R, $G = null, $B = null)
-		{
-			if (is_array($R))
-				return imagecolorclosest($this->handle, $R['red'], $R['green'], $R['blue']);
-			else
-				return imagecolorclosest($this->handle, $R, $G, $B);
-		}
-		
-		/**
-		 * Returns the color index that exactly matches the given RGB value. Uses
-		 * PHP's imagecolorexact()
-		 * 
-		 * @param mixed $R Red or RGBA array
-		 * @param int $G Green component (or null if $R is an RGB array)
-		 * @param int $B Blue component (or null if $R is an RGB array)
-		 * @return int Color index
-		 */
-		function getExactColor($R, $G = null, $B = null)
-		{
-			if (is_array($R))
-				return imagecolorexact($this->handle, $R['red'], $R['green'], $R['blue']);
-			else
-				return imagecolorexact($this->handle, $R, $G, $B);
-		}
-		
-		/**
-		 * Copies transparency information from $sourceImage. Optionally fills
-		 * the image with the transparent color at (0, 0).
-		 * 
-		 * @param object $sourceImage
-		 * @param bool $fill True if you want to fill the image with transparent color
-		 */
-		function copyTransparencyFrom($sourceImage, $fill = true)
-		{
-			if ($sourceImage->isTransparent())
-			{
-				$rgba = $sourceImage->getTransparentColorRGB();
-				if ($rgba === null)
-					return;
-				
-				if ($this->isTrueColor())
-				{
-					$rgba['alpha'] = 127;
-					$color = $this->allocateColorAlpha($rgba);
-				}
-				else
-					$color = $this->allocateColor($rgba);
-				
-				$this->setTransparentColor($color);
-				if ($fill)
-					$this->fill(0, 0, $color);
-			}
-		}
-		
-		/**
-		 * Fill the image at ($x, $y) with color index $color
-		 * 
-		 * @param int $x
-		 * @param int $y
-		 * @param int $color
-		 */
-		function fill($x, $y, $color)
-		{
-			return imagefill($this->handle, $x, $y, $color);
-		}
-		
-		/**
-		 * Used internally to create Operation objects
-		 *
-		 * @param string $name
-		 * @return object
-		 */
-		protected function getOperation($name)
-		{
-			return WideImage_OperationFactory::get($name);
-		}
-		
-		/**
-		 * Returns the image's mask
-		 * 
-		 * Mask is a greyscale image where the shade defines the alpha channel (black = transparent, white = opaque).
-		 * 
-		 * For opaque images (JPEG), the result will be white. For images with single-color transparency (GIF, 8-bit PNG), 
-		 * the areas with the transparent color will be black. For images with alpha channel transparenct, 
-		 * the result will be alpha channel.
-		 * 
-		 * @return WideImage_Image An image mask
-		 **/
-		function getMask()
-		{
-			return $this->getOperation('GetMask')->execute($this);
-		}
-		
-		/**
-		 * Resize the image to given dimensions.
-		 * 
-		 * $width and $height are both smart coordinates. This means that you can pass any of these values in:
-		 *   - positive or negative integer (100, -20, ...)
-		 *   - positive or negative percent string (30%, -15%, ...)
-		 *   - complex coordinate (50% - 20, 15 + 30%, ...)
-		 * 
-		 * If $width is null, it's calculated proportionally from $height, and vice versa.
-		 * 
-		 * Example (resize to half-size):
-		 * <code>
-		 * $smaller = $image->resize('50%');
-		 * 
-		 * $smaller = $image->resize('100', '100', 'inside', 'down');
-		 * is the same as
-		 * $smaller = $image->resizeDown(100, 100, 'inside');
-		 * </code>
-		 * 
-		 * @param mixed $width The new width (smart coordinate), or null.
-		 * @param mixed $height The new height (smart coordinate), or null.
-		 * @param string $fit 'inside', 'outside', 'fill'
-		 * @param string $scale 'down', 'up', 'any'
-		 * @return WideImage_Image The resized image
-		 */
-		function resize($width = null, $height = null, $fit = 'inside', $scale = 'any')
-		{
-			return $this->getOperation('Resize')->execute($this, $width, $height, $fit, $scale);
-		}
-		
-		/**
-		 * Same as WideImage_Image::resize(), but the image is only applied if it is larger then the given dimensions.
-		 * Otherwise, the resulting image retains the source's dimensions.
-		 * 
-		 * @param int $width New width, smart coordinate
-		 * @param int $height New height, smart coordinate
-		 * @param string $fit 'inside', 'outside', 'fill'
-		 * @return WideImage_Image resized image
-		 */
-		function resizeDown($width = null, $height = null, $fit = 'inside')
-		{
-			return $this->resize($width, $height, $fit, 'down');
-		}
-		
-		/**
-		 * Same as WideImage_Image::resize(), but the image is only applied if it is smaller then the given dimensions.
-		 * Otherwise, the resulting image retains the source's dimensions.
-		 * 
-		 * @param int $width New width, smart coordinate
-		 * @param int $height New height, smart coordinate
-		 * @param string $fit 'inside', 'outside', 'fill'
-		 * @return WideImage_Image resized image
-		 */
-		function resizeUp($width = null, $height = null, $fit = 'inside')
-		{
-			return $this->resize($width, $height, $fit, 'up');
-		}
-		
-		/**
-		 * Rotate the image for angle $angle clockwise.
-		 * 
-		 * Preserves transparency. Has issues when saving to a BMP.
-		 * 
-		 * @param int $angle Angle in degrees, clock-wise
-		 * @param int $bgColor color of the new background
-		 * @param bool $ignoreTransparent
-		 * @return WideImage_Image The rotated image
-		 */
-		function rotate($angle, $bgColor = null, $ignoreTransparent = true)
-		{
-			return $this->getOperation('Rotate')->execute($this, $angle, $bgColor, $ignoreTransparent);
-		}
-		
-		/**
-		 * This method lays the overlay (watermark) on the image.
-		 * 
-		 * Hint: if the overlay is a truecolor image with alpha channel, you should leave $pct at 100.
-		 * 
-		 * This operation supports alignment notation in coordinates:
-		 * <code>
-		 * $watermark = WideImage::load('logo.gif');
-		 * $base = WideImage::load('picture.jpg');
-		 * $result = $base->merge($watermark, "right - 10", "bottom - 10", 50);
-		 * // applies a logo aligned to bottom-right corner with a 10 pixel margin
-		 * </code>
-		 * 
-		 * @param WideImage_Image $overlay The overlay image
-		 * @param mixed $left Left position of the overlay, smart coordinate
-		 * @param mixed $top Top position of the overlay, smart coordinate
-		 * @param int $pct The opacity of the overlay
-		 * @return WideImage_Image The merged image
-		 */
-		function merge($overlay, $left = 0, $top = 0, $pct = 100)
-		{
-			return $this->getOperation('Merge')->execute($this, $overlay, $left, $top, $pct);
-		}
-		
-		/**
-		 * Resizes the canvas of the image, but doesn't scale the content of the image
-		 * 
-		 * This operation creates an empty canvas with dimensions $width x $height, filled with 
-		 * background color $bg_color and draws the original image onto it at position [$pos_x, $pos_y].
-		 * 
-		 * Arguments $width, $height, $pos_x and $pos_y are all smart coordinates. $width and $height are 
-		 * relative to the current image size, $pos_x and $pos_y are relative to the newly calculated
-		 * canvas size. This can be confusing, but it makes sense. See the example below.
-		 * 
-		 * The example below loads a 100x150 image and then resizes its canvas to 200% x 100%+20 
-		 * (which evaluates to 200x170). The image is placed at position [10, center+20], which evaluates to [10, 30].
-		 * <code>
-		 * $image = WideImage::load('someimage.jpg'); // 100x150
-		 * $white = $image->allocateColor(255, 255, 255);
-		 * $image->resizeCanvas('200%', '100% + 20', 10, 'center+20', $white);
-		 * </code>
-		 * 
-		 * The parameter $merge defines whether the original image should be merged onto the new canvas.
-		 * This means it blends transparent color and alpha colors into the background color. If set to false,
-		 * the original image is just copied over, preserving the transparency/alpha information.
-		 * 
-		 * You can set the $scale parameter to limit when to resize the canvas. For example, if you want 
-		 * to resize the canvas only if the image is smaller than the new size, but leave the image intact 
-		 * if it's larger, set it to 'up'. Likewise, if you want to shrink the canvas, but don't want to 
-		 * change images that are already smaller, set it to 'down'. 
-		 * 
-		 * @param mixed $width Width of the new canvas (smart coordinate, relative to current image width)
-		 * @param mixed $height Height of the new canvas (smart coordinate, relative to current image height)
-		 * @param mixed $pos_x x-position of the image (smart coordinate, relative to the new width)
-		 * @param mixed $pos_y y-position of the image (smart coordinate, relative to the new height)
-		 * @param int $bg_color Background color (created with allocateColor or allocateColorAlpha), defaults to null (tries to use a transparent color)
-		 * @param string $scale Possible values: 'up' (enlarge only), 'down' (downsize only), 'any' (resize precisely to $width x $height). Defaults to 'any'.
-		 * @param bool $merge Merge the original image (flatten alpha channel and transparency) or copy it over (preserve). Defaults to false.
-		 * @return WideImage_Image The resulting image with resized canvas
-		 */
-		function resizeCanvas($width, $height, $pos_x, $pos_y, $bg_color = null, $scale = 'any', $merge = false)
-		{
-			return $this->getOperation('ResizeCanvas')->execute($this, $width, $height, $pos_x, $pos_y, $bg_color, $scale, $merge);
-		}
-		
-		/**
-		 * Returns an image with round corners
-		 * 
-		 * You can either set the corners' color or set them transparent.
-		 * 
-		 * Note on $smoothness: 1 means jagged edges, 2 is much better, more than 4 doesn't noticeably improve the quality.
-		 * Rendering becomes increasingly slower if you increase smoothness.
-		 * 
-		 * Example:
-		 * <code>
-		 * $nice = $ugly->roundCorners(20, $ugly->allocateColor(255, 0, 0), 2);
-		 * </code>
-		 * 
-		 * Use $corners parameter to specify which corners to draw rounded. Possible values are
-		 * WideImage::SIDE_TOP_LEFT, WideImage::SIDE_TOP,
-		 * WideImage::SIDE_TOP_RIGHT, WideImage::SIDE_RIGHT,
-		 * WideImage::SIDE_BOTTOM_RIGHT, WideImage::SIDE_BOTTOM, 
-		 * WideImage::SIDE_BOTTOM_LEFT, WideImage::SIDE_LEFT, and WideImage::SIDE_ALL.
-		 * You can specify any combination of corners with a + operation, see example below.
-		 * 
-		 * Example:
-		 * <code>
-		 * $white = $image->allocateColor(255, 255, 255);
-		 * $diagonal_corners = $image->roundCorners(15, $white, 2, WideImage::SIDE_TOP_LEFT + WideImage::SIDE_BOTTOM_RIGHT);
-		 * $right_corners = $image->roundCorners(15, $white, 2, WideImage::SIDE_RIGHT);
-		 * </code>
-		 * 
-		 * @param int $radius Radius of the corners
-		 * @param int $color The color of corners. If null, corners are rendered transparent (slower than using a solid color).
-		 * @param int $smoothness Specify the level of smoothness. Suggested values from 1 to 4.
-		 * @param int $corners Specify which corners to draw (defaults to WideImage::SIDE_ALL = all corners)
-		 * @return WideImage_Image The resulting image with round corners
-		 */
-		function roundCorners($radius, $color = null, $smoothness = 2, $corners = 255)
-		{
-			return $this->getOperation('RoundCorners')->execute($this, $radius, $color, $smoothness, $corners);
-		}
-		
-		/**
-		 * Returns an image with applied mask
-		 * 
-		 * A mask is a grayscale image, where the shade determines the alpha channel. Black is fully transparent
-		 * and white is fully opaque.
-		 * 
-		 * @param WideImage_Image $mask The mask image, greyscale
-		 * @param mixed $left Left coordinate, smart coordinate
-		 * @param mixed $top Top coordinate, smart coordinate
-		 * @return WideImage_Image The resulting image
-		 **/
-		function applyMask($mask, $left = 0, $top = 0)
-		{
-			return $this->getOperation('ApplyMask')->execute($this, $mask, $left, $top);
-		}
-		
-		/**
-		 * Applies a filter
-		 *
-		 * @param int $filter One of the IMG_FILTER_* constants
-		 * @param int $arg1
-		 * @param int $arg2
-		 * @param int $arg3
-		 * @param int $arg4
-		 * @return WideImage_Image
-		 */
-		function applyFilter($filter, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null)
-		{
-			return $this->getOperation('ApplyFilter')->execute($this, $filter, $arg1, $arg2, $arg3, $arg4);
-		}
-		
-		/**
-		 * Applies convolution matrix with imageconvolution()
-		 *
-		 * @param array $matrix
-		 * @param float $div
-		 * @param float $offset
-		 * @return WideImage_Image
-		 */
-		function applyConvolution($matrix, $div, $offset)
-		{
-			return $this->getOperation('ApplyConvolution')->execute($this, $matrix, $div, $offset);
-		}
-		
-		/**
-		 * Returns a cropped rectangular portion of the image
-		 * 
-		 * If the rectangle specifies area that is out of bounds, it's limited to the current image bounds.
-		 * 
-		 * Examples:
-		 * <code>
-		 * $cropped = $img->crop(10, 10, 150, 200); // crops a 150x200 rect at (10, 10)
-		 * $cropped = $img->crop(-100, -50, 100, 50); // crops a 100x50 rect at the right-bottom of the image
-		 * $cropped = $img->crop('25%', '25%', '50%', '50%'); // crops a 50%x50% rect from the center of the image
-		 * </code>
-		 * 
-		 * This operation supports alignment notation in left/top coordinates.
-		 * Example:
-		 * <code>
-		 * $cropped = $img->crop("right", "bottom", 100, 200); // crops a 100x200 rect from right bottom
-		 * $cropped = $img->crop("center", "middle", 50, 30); // crops a 50x30 from the center of the image
-		 * </code>
-		 * 
-		 * @param mixed $left Left-coordinate of the crop rect, smart coordinate
-		 * @param mixed $top Top-coordinate of the crop rect, smart coordinate
-		 * @param mixed $width Width of the crop rect, smart coordinate
-		 * @param mixed $height Height of the crop rect, smart coordinate
-		 * @return WideImage_Image The cropped image
-		 **/
-		function crop($left = 0, $top = 0, $width = '100%', $height = '100%')
-		{
-			return $this->getOperation('Crop')->execute($this, $left, $top, $width, $height);
-		}
-		
-		/**
-		 * Performs an auto-crop on the image
-		 *
-		 * The image is auto-cropped from each of four sides. All sides are 
-		 * scanned for pixels that differ from $base_color for more than 
-		 * $rgb_threshold in absolute RGB difference. If more than $pixel_cutoff 
-		 * differentiating pixels are found, that line is considered to be the crop line for the side.
-		 * If the line isn't different enough, the algorithm procedes to the next line 
-		 * towards the other edge of the image.
-		 * 
-		 * When the crop rectangle is found, it's enlarged by the $margin value on each of the four sides.
-		 *
-		 * @param int $margin Margin for the crop rectangle, can be negative.
-		 * @param int $rgb_threshold RGB difference which still counts as "same color".
-		 * @param int $pixel_cutoff How many pixels need to be different to mark a cut line.
-		 * @param int $base_color The base color index. If none specified (or null given), left-top pixel is used.
-		 * @return WideImage_Image The cropped image
-		 */
-		function autoCrop($margin = 0, $rgb_threshold = 0, $pixel_cutoff = 1, $base_color = null)
-		{
-			return $this->getOperation('AutoCrop')->execute($this, $margin, $rgb_threshold, $pixel_cutoff, $base_color);
-		}
-		
-		/**
-		 * Returns a negative of the image
-		 *
-		 * This operation differs from calling WideImage_Image::applyFilter(IMG_FILTER_NEGATIVE), because it's 8-bit and transparency safe.
-		 * This means it will return an 8-bit image, if the source image is 8-bit. If that 8-bit image has a palette transparency,
-		 * the resulting image will keep transparency.
-		 *
-		 * @return WideImage_Image negative of the image
-		 */
-		function asNegative()
-		{
-			return $this->getOperation('AsNegative')->execute($this);
-		}
-		
-		/**
-		 * Returns a grayscale copy of the image
-		 * 
-		 * @return WideImage_Image grayscale copy
-		 **/
-		function asGrayscale()
-		{
-			return $this->getOperation('AsGrayscale')->execute($this);
-		}
-		
-		/**
-		 * Returns a mirrored copy of the image
-		 * 
-		 * @return WideImage_Image Mirrored copy
-		 **/
-		function mirror()
-		{
-			return $this->getOperation('Mirror')->execute($this);
-		}
-		
-		/**
-		 * Applies the unsharp filter
-		 * 
-		 * @param float $amount
-		 * @param float $radius
-		 * @param float $threshold
-		 * @return WideImage_Image Unsharpened copy of the image
-		 **/
-		function unsharp($amount, $radius, $threshold)
-		{
-			return $this->getOperation('Unsharp')->execute($this, $amount, $radius, $threshold);
-		}
-		
-		/**
-		 * Returns a flipped (mirrored over horizontal line) copy of the image
-		 * 
-		 * @return WideImage_Image Flipped copy
-		 **/
-		function flip()
-		{
-			return $this->getOperation('Flip')->execute($this);
-		}
-		
-		/**
-		 * Corrects gamma on the image
-		 * 
-		 * @param float $inputGamma
-		 * @param float $outputGamma
-		 * @return WideImage_Image Image with corrected gamma
-		 **/
-		function correctGamma($inputGamma, $outputGamma)
-		{
-			return $this->getOperation('CorrectGamma')->execute($this, $inputGamma, $outputGamma);
-		}
-		
-		/**
-		 * Adds noise to the image
-		 * 
-		 * @author Tomasz Kapusta
-		 * 
-		 * @param int $amount Number of noise pixels to add
-		 * @param string $type Type of noise 'salt&pepper', 'color' or 'mono'
-		 * @return WideImage_Image Image with noise added
-		 **/
-		function addNoise($amount, $type)
-		{
-			return $this->getOperation('AddNoise')->execute($this, $amount, $type);
-		}
-		
-		/**
-		 * Used internally to execute operations
-		 *
-		 * @param string $name
-		 * @param array $args
-		 * @return WideImage_Image
-		 */
-		function __call($name, $args)
-		{
-			$op = $this->getOperation($name);
-			array_unshift($args, $this);
-			return call_user_func_array(array($op, 'execute'), $args);
-		}
-		
-		/**
-		 * Returns an image in GIF or PNG format
-		 *
-		 * @return string
-		 */
-		function __toString()
-		{
-			if ($this->isTransparent())
-				return $this->asString('gif');
-			else
-				return $this->asString('png');
-		}
-		
-		/**
-		 * Returns a copy of the image object
-		 * 
-		 * @return WideImage_Image The copy
-		 **/
-		function copy()
-		{
-			$dest = $this->doCreate($this->getWidth(), $this->getHeight());
-			$dest->copyTransparencyFrom($this, true);
-			$this->copyTo($dest, 0, 0);
-			return $dest;
-		}
-		
-		/**
-		 * Copies this image onto another image
-		 * 
-		 * @param WideImage_Image $dest
-		 * @param int $left
-		 * @param int $top
-		 **/
-		function copyTo($dest, $left = 0, $top = 0)
-		{
-			if (!imagecopy($dest->getHandle(), $this->handle, $left, $top, 0, 0, $this->getWidth(), $this->getHeight()))
-				throw new WideImage_GDFunctionResultException("imagecopy() returned false");
-		}
-		
-		/**
-		 * Returns the canvas object
-		 * 
-		 * The Canvas object can be used to draw text and shapes on the image
-		 * 
-		 * Examples:
-		 * <code>
-		 * $img = WideImage::load('pic.jpg);
-		 * $canvas = $img->getCanvas();
-		 * $canvas->useFont('arial.ttf', 15, $img->allocateColor(200, 220, 255));
-		 * $canvas->writeText(10, 50, "Hello world!");
-		 * 
-		 * $canvas->filledRectangle(10, 10, 80, 40, $img->allocateColor(255, 127, 255));
-		 * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
-		 * $img->saveToFile('new.png');
-		 * </code>
-		 * 
-		 * @return WideImage_Canvas The Canvas object
-		 **/
-		function getCanvas()
-		{
-			if ($this->canvas == null)
-				$this->canvas = new WideImage_Canvas($this);
-			return $this->canvas;
-		}
-		
-		/**
-		 * Returns true if the image is true-color, false otherwise
-		 * 
-		 * @return bool
-		 **/
-		abstract function isTrueColor();
-		
-		/**
-		 * Returns a true-color copy of the image
-		 * 
-		 * @return WideImage_TrueColorImage
-		 **/
-		abstract function asTrueColor();
-		
-		/**
-		 * Returns a palette copy (8bit) of the image
-		 *
-		 * @param int $nColors Number of colors in the resulting image, more than 0, less or equal to 255
-		 * @param bool $dither Use dithering or not
-		 * @param bool $matchPalette Set to true to use imagecolormatch() to match the resulting palette more closely to the original image 
-		 * @return WideImage_Image
-		 **/
-		abstract function asPalette($nColors = 255, $dither = null, $matchPalette = true);
-		
-		/**
-		 * Retrieve an image with selected channels
-		 * 
-		 * Examples:
-		 * <code>
-		 * $channels = $img->getChannels('red', 'blue');
-		 * $channels = $img->getChannels('alpha', 'green');
-		 * $channels = $img->getChannels(array('green', 'blue'));
-		 * </code>
-		 * 
-		 * @return WideImage_Image
-		 **/
-		abstract function getChannels();
-		
-		/**
-		 * Returns an image without an alpha channel
-		 * 
-		 * @return WideImage_Image
-		 **/
-		abstract function copyNoAlpha();
-		
-		/**
-		 * Returns an array of serializable protected variables. Called automatically upon serialize().
-		 * 
-		 * @return array
-		 */
-		function __sleep()
-		{
-			$this->sdata = $this->asString('png');
-			return array('sdata', 'handleReleased');
-		}
-		
-		/**
-		 * Restores an image from serialization. Called automatically upon unserialize().
-		 */
-		function __wakeup()
-		{
-			$temp_image = WideImage::loadFromString($this->sdata);
-			$temp_image->releaseHandle();
-			$this->handle = $temp_image->handle;
-			$temp_image = null;
-			$this->sdata = null;
-		}
-	}
+    /**
+     * Thrown when an image can't be saved (returns false by the mapper).
+     */
+    class WideImage_UnknownErrorWhileMappingException extends WideImage_Exception
+    {
+    }
+
+    /**
+     * Base class for images.
+     */
+    abstract class WideImage_Image
+    {
+        /**
+         * Holds the image resource.
+         *
+         * @var resource
+         */
+        protected $handle = null;
+
+        /**
+         * Flag that determines if WideImage should call imagedestroy() upon object destruction.
+         *
+         * @var bool
+         */
+        protected $handleReleased = false;
+
+        /**
+         * Canvas object.
+         *
+         * @var WideImage_Canvas
+         */
+        protected $canvas = null;
+
+        /**
+         * @var string
+         */
+        protected $sdata = null;
+
+        /**
+         * The base class constructor.
+         *
+         * @param resource $handle Image handle (GD2 resource)
+         */
+        public function __construct($handle)
+        {
+            WideImage::assertValidImageHandle($handle);
+            $this->handle = $handle;
+        }
+
+        /**
+         * Cleanup.
+         * 
+         * Destroys the handle via WideImage_Image::destroy() when called by the GC.
+         */
+        public function __destruct()
+        {
+            $this->destroy();
+        }
+
+        /**
+         * This method destroy the image handle, and releases the image resource.
+         * 
+         * After this is called, the object doesn't hold a valid image any more.
+         * No operation should be called after that.
+         */
+        public function destroy()
+        {
+            if ($this->isValid() && !$this->handleReleased) {
+                imagedestroy($this->handle);
+            }
+
+            $this->handle = null;
+        }
+
+        /**
+         * Returns the GD image resource.
+         * 
+         * @return resource GD image resource
+         */
+        public function getHandle()
+        {
+            return $this->handle;
+        }
+
+        /**
+         * @return bool True, if the image object holds a valid GD image, false otherwise
+         */
+        public function isValid()
+        {
+            return WideImage::isValidImageHandle($this->handle);
+        }
+
+        /**
+         * Releases the handle.
+         */
+        public function releaseHandle()
+        {
+            $this->handleReleased = true;
+        }
+
+        /**
+         * Saves an image to a file.
+         * 
+         * The file type is recognized from the $uri. If you save to a GIF8, truecolor images
+         * are automatically converted to palette.
+         * 
+         * This method supports additional parameters: quality (for jpeg images) and 
+         * compression quality and filters (for png images). See http://www.php.net/imagejpeg and
+         * http://www.php.net/imagepng for details.
+         * 
+         * Examples:
+         * <code>
+         * // save to a GIF
+         * $image->saveToFile('image.gif');
+         * 
+         * // save to a PNG with compression=7 and no filters
+         * $image->saveToFile('image.png', 7, PNG_NO_FILTER);
+         * 
+         * // save to a JPEG with quality=80
+         * $image->saveToFile('image.jpg', 80);
+         * 
+         * // save to a JPEG with default quality=100
+         * $image->saveToFile('image.jpg');
+         * </code>
+         * 
+         * @param string $uri File location
+         */
+        public function saveToFile($uri)
+        {
+            $mapper = WideImage_MapperFactory::selectMapper($uri, null);
+            $args = func_get_args();
+            array_unshift($args, $this->getHandle());
+            $res = call_user_func_array([$mapper, 'save'], $args);
+            if (!$res) {
+                throw new WideImage_UnknownErrorWhileMappingException(get_class($mapper)." returned an invalid result while saving to $uri");
+            }
+        }
+
+        /**
+         * Returns binary string with image data in format specified by $format.
+         * 
+         * Additional parameters may be passed to the function. See WideImage_Image::saveToFile() for more details.
+         * 
+         * @param string $format The format of the image
+         *
+         * @return string The binary image data in specified format
+         */
+        public function asString($format)
+        {
+            ob_start();
+            $args = func_get_args();
+            $args[0] = null;
+            array_unshift($args, $this->getHandle());
+
+            $mapper = WideImage_MapperFactory::selectMapper(null, $format);
+            $res = call_user_func_array([$mapper, 'save'], $args);
+            if (!$res) {
+                throw new WideImage_UnknownErrorWhileMappingException(get_class($mapper).' returned an invalid result while writing the image data');
+            }
+
+            return ob_get_clean();
+        }
+
+        /**
+         * Output a header to browser.
+         * 
+         * @param $name Name of the header
+         * @param $data Data
+         */
+        protected function writeHeader($name, $data)
+        {
+            header($name.': '.$data);
+        }
+
+        /**
+         * Outputs the image to browser.
+         * 
+         * Sets headers Content-length and Content-type, and echoes the image in the specified format.
+         * All other headers (such as Content-disposition) must be added manually. 
+         * 
+         * Example:
+         * <code>
+         * WideImage::load('image1.png')->resize(100, 100)->output('gif');
+         * </code>
+         * 
+         * @param string $format Image format
+         */
+        public function output($format)
+        {
+            $args = func_get_args();
+            $data = call_user_func_array([$this, 'asString'], $args);
+
+            $this->writeHeader('Content-length', strlen($data));
+            $this->writeHeader('Content-type', WideImage_MapperFactory::mimeType($format));
+            echo $data;
+        }
+
+        /**
+         * @return int Image width
+         */
+        public function getWidth()
+        {
+            return imagesx($this->handle);
+        }
+
+        /**
+         * @return int Image height
+         */
+        public function getHeight()
+        {
+            return imagesy($this->handle);
+        }
+
+        /**
+         * Allocate a color by RGB values.
+         * 
+         * @param mixed $R Red-component value or an RGB array (with red, green, blue keys)
+         * @param int   $G If $R is int, this is the green component
+         * @param int   $B If $R is int, this is the blue component
+         *
+         * @return int Image color index
+         */
+        public function allocateColor($R, $G = null, $B = null)
+        {
+            if (is_array($R)) {
+                return imagecolorallocate($this->handle, $R['red'], $R['green'], $R['blue']);
+            } else {
+                return imagecolorallocate($this->handle, $R, $G, $B);
+            }
+        }
+
+        /**
+         * @return bool True if the image is transparent, false otherwise
+         */
+        public function isTransparent()
+        {
+            return $this->getTransparentColor() >= 0;
+        }
+
+        /**
+         * @return int Transparent color index
+         */
+        public function getTransparentColor()
+        {
+            return imagecolortransparent($this->handle);
+        }
+
+        /**
+         * Sets the current transparent color index. Only makes sense for palette images (8-bit).
+         * 
+         * @param int $color Transparent color index
+         */
+        public function setTransparentColor($color)
+        {
+            return imagecolortransparent($this->handle, $color);
+        }
+
+        /**
+         * Returns a RGB array of the transparent color or null if none.
+         * 
+         * @return mixed Transparent color RGBA array
+         */
+        public function getTransparentColorRGB()
+        {
+            $total = imagecolorstotal($this->handle);
+            $tc = $this->getTransparentColor();
+
+            if ($tc >= $total && $total > 0) {
+                return;
+            } else {
+                return $this->getColorRGB($tc);
+            }
+        }
+
+        /**
+         * Returns a RGBA array for pixel at $x, $y.
+         * 
+         * @param int $x
+         * @param int $y
+         *
+         * @return array RGB array 
+         */
+        public function getRGBAt($x, $y)
+        {
+            return $this->getColorRGB($this->getColorAt($x, $y));
+        }
+
+        /**
+         * Writes a pixel at the designated coordinates.
+         * 
+         * Takes an associative array of colours and uses getExactColor() to
+         * retrieve the exact index color to write to the image with.
+         *
+         * @param int   $x
+         * @param int   $y
+         * @param array $color
+         */
+        public function setRGBAt($x, $y, $color)
+        {
+            $this->setColorAt($x, $y, $this->getExactColor($color));
+        }
+
+        /**
+         * Returns a color's RGB.
+         * 
+         * @param int $colorIndex Color index
+         *
+         * @return mixed RGBA array for a color with index $colorIndex
+         */
+        public function getColorRGB($colorIndex)
+        {
+            return imagecolorsforindex($this->handle, $colorIndex);
+        }
+
+        /**
+         * Returns an index of the color at $x, $y.
+         * 
+         * @param int $x
+         * @param int $y
+         *
+         * @return int Color index for a pixel at $x, $y
+         */
+        public function getColorAt($x, $y)
+        {
+            return imagecolorat($this->handle, $x, $y);
+        }
+
+        /**
+         * Set the color index $color to a pixel at $x, $y.
+         * 
+         * @param int $x
+         * @param int $y
+         * @param int $color Color index
+         */
+        public function setColorAt($x, $y, $color)
+        {
+            return imagesetpixel($this->handle, $x, $y, $color);
+        }
+
+        /**
+         * Returns closest color index that matches the given RGB value. Uses
+         * PHP's imagecolorclosest().
+         * 
+         * @param mixed $R Red or RGBA array
+         * @param int   $G Green component (or null if $R is an RGB array)
+         * @param int   $B Blue component (or null if $R is an RGB array)
+         *
+         * @return int Color index
+         */
+        public function getClosestColor($R, $G = null, $B = null)
+        {
+            if (is_array($R)) {
+                return imagecolorclosest($this->handle, $R['red'], $R['green'], $R['blue']);
+            } else {
+                return imagecolorclosest($this->handle, $R, $G, $B);
+            }
+        }
+
+        /**
+         * Returns the color index that exactly matches the given RGB value. Uses
+         * PHP's imagecolorexact().
+         * 
+         * @param mixed $R Red or RGBA array
+         * @param int   $G Green component (or null if $R is an RGB array)
+         * @param int   $B Blue component (or null if $R is an RGB array)
+         *
+         * @return int Color index
+         */
+        public function getExactColor($R, $G = null, $B = null)
+        {
+            if (is_array($R)) {
+                return imagecolorexact($this->handle, $R['red'], $R['green'], $R['blue']);
+            } else {
+                return imagecolorexact($this->handle, $R, $G, $B);
+            }
+        }
+
+        /**
+         * Copies transparency information from $sourceImage. Optionally fills
+         * the image with the transparent color at (0, 0).
+         * 
+         * @param object $sourceImage
+         * @param bool   $fill        True if you want to fill the image with transparent color
+         */
+        public function copyTransparencyFrom($sourceImage, $fill = true)
+        {
+            if ($sourceImage->isTransparent()) {
+                $rgba = $sourceImage->getTransparentColorRGB();
+                if ($rgba === null) {
+                    return;
+                }
+
+                if ($this->isTrueColor()) {
+                    $rgba['alpha'] = 127;
+                    $color = $this->allocateColorAlpha($rgba);
+                } else {
+                    $color = $this->allocateColor($rgba);
+                }
+
+                $this->setTransparentColor($color);
+                if ($fill) {
+                    $this->fill(0, 0, $color);
+                }
+            }
+        }
+
+        /**
+         * Fill the image at ($x, $y) with color index $color.
+         * 
+         * @param int $x
+         * @param int $y
+         * @param int $color
+         */
+        public function fill($x, $y, $color)
+        {
+            return imagefill($this->handle, $x, $y, $color);
+        }
+
+        /**
+         * Used internally to create Operation objects.
+         *
+         * @param string $name
+         *
+         * @return object
+         */
+        protected function getOperation($name)
+        {
+            return WideImage_OperationFactory::get($name);
+        }
+
+        /**
+         * Returns the image's mask.
+         * 
+         * Mask is a greyscale image where the shade defines the alpha channel (black = transparent, white = opaque).
+         * 
+         * For opaque images (JPEG), the result will be white. For images with single-color transparency (GIF, 8-bit PNG), 
+         * the areas with the transparent color will be black. For images with alpha channel transparenct, 
+         * the result will be alpha channel.
+         * 
+         * @return WideImage_Image An image mask
+         **/
+        public function getMask()
+        {
+            return $this->getOperation('GetMask')->execute($this);
+        }
+
+        /**
+         * Resize the image to given dimensions.
+         * 
+         * $width and $height are both smart coordinates. This means that you can pass any of these values in:
+         *   - positive or negative integer (100, -20, ...)
+         *   - positive or negative percent string (30%, -15%, ...)
+         *   - complex coordinate (50% - 20, 15 + 30%, ...)
+         * 
+         * If $width is null, it's calculated proportionally from $height, and vice versa.
+         * 
+         * Example (resize to half-size):
+         * <code>
+         * $smaller = $image->resize('50%');
+         * 
+         * $smaller = $image->resize('100', '100', 'inside', 'down');
+         * is the same as
+         * $smaller = $image->resizeDown(100, 100, 'inside');
+         * </code>
+         * 
+         * @param mixed  $width  The new width (smart coordinate), or null.
+         * @param mixed  $height The new height (smart coordinate), or null.
+         * @param string $fit    'inside', 'outside', 'fill'
+         * @param string $scale  'down', 'up', 'any'
+         *
+         * @return WideImage_Image The resized image
+         */
+        public function resize($width = null, $height = null, $fit = 'inside', $scale = 'any')
+        {
+            return $this->getOperation('Resize')->execute($this, $width, $height, $fit, $scale);
+        }
+
+        /**
+         * Same as WideImage_Image::resize(), but the image is only applied if it is larger then the given dimensions.
+         * Otherwise, the resulting image retains the source's dimensions.
+         * 
+         * @param int    $width  New width, smart coordinate
+         * @param int    $height New height, smart coordinate
+         * @param string $fit    'inside', 'outside', 'fill'
+         *
+         * @return WideImage_Image resized image
+         */
+        public function resizeDown($width = null, $height = null, $fit = 'inside')
+        {
+            return $this->resize($width, $height, $fit, 'down');
+        }
+
+        /**
+         * Same as WideImage_Image::resize(), but the image is only applied if it is smaller then the given dimensions.
+         * Otherwise, the resulting image retains the source's dimensions.
+         * 
+         * @param int    $width  New width, smart coordinate
+         * @param int    $height New height, smart coordinate
+         * @param string $fit    'inside', 'outside', 'fill'
+         *
+         * @return WideImage_Image resized image
+         */
+        public function resizeUp($width = null, $height = null, $fit = 'inside')
+        {
+            return $this->resize($width, $height, $fit, 'up');
+        }
+
+        /**
+         * Rotate the image for angle $angle clockwise.
+         * 
+         * Preserves transparency. Has issues when saving to a BMP.
+         * 
+         * @param int  $angle             Angle in degrees, clock-wise
+         * @param int  $bgColor           color of the new background
+         * @param bool $ignoreTransparent
+         *
+         * @return WideImage_Image The rotated image
+         */
+        public function rotate($angle, $bgColor = null, $ignoreTransparent = true)
+        {
+            return $this->getOperation('Rotate')->execute($this, $angle, $bgColor, $ignoreTransparent);
+        }
+
+        /**
+         * This method lays the overlay (watermark) on the image.
+         * 
+         * Hint: if the overlay is a truecolor image with alpha channel, you should leave $pct at 100.
+         * 
+         * This operation supports alignment notation in coordinates:
+         * <code>
+         * $watermark = WideImage::load('logo.gif');
+         * $base = WideImage::load('picture.jpg');
+         * $result = $base->merge($watermark, "right - 10", "bottom - 10", 50);
+         * // applies a logo aligned to bottom-right corner with a 10 pixel margin
+         * </code>
+         * 
+         * @param WideImage_Image $overlay The overlay image
+         * @param mixed           $left    Left position of the overlay, smart coordinate
+         * @param mixed           $top     Top position of the overlay, smart coordinate
+         * @param int             $pct     The opacity of the overlay
+         *
+         * @return WideImage_Image The merged image
+         */
+        public function merge($overlay, $left = 0, $top = 0, $pct = 100)
+        {
+            return $this->getOperation('Merge')->execute($this, $overlay, $left, $top, $pct);
+        }
+
+        /**
+         * Resizes the canvas of the image, but doesn't scale the content of the image.
+         * 
+         * This operation creates an empty canvas with dimensions $width x $height, filled with 
+         * background color $bg_color and draws the original image onto it at position [$pos_x, $pos_y].
+         * 
+         * Arguments $width, $height, $pos_x and $pos_y are all smart coordinates. $width and $height are 
+         * relative to the current image size, $pos_x and $pos_y are relative to the newly calculated
+         * canvas size. This can be confusing, but it makes sense. See the example below.
+         * 
+         * The example below loads a 100x150 image and then resizes its canvas to 200% x 100%+20 
+         * (which evaluates to 200x170). The image is placed at position [10, center+20], which evaluates to [10, 30].
+         * <code>
+         * $image = WideImage::load('someimage.jpg'); // 100x150
+         * $white = $image->allocateColor(255, 255, 255);
+         * $image->resizeCanvas('200%', '100% + 20', 10, 'center+20', $white);
+         * </code>
+         * 
+         * The parameter $merge defines whether the original image should be merged onto the new canvas.
+         * This means it blends transparent color and alpha colors into the background color. If set to false,
+         * the original image is just copied over, preserving the transparency/alpha information.
+         * 
+         * You can set the $scale parameter to limit when to resize the canvas. For example, if you want 
+         * to resize the canvas only if the image is smaller than the new size, but leave the image intact 
+         * if it's larger, set it to 'up'. Likewise, if you want to shrink the canvas, but don't want to 
+         * change images that are already smaller, set it to 'down'. 
+         * 
+         * @param mixed  $width    Width of the new canvas (smart coordinate, relative to current image width)
+         * @param mixed  $height   Height of the new canvas (smart coordinate, relative to current image height)
+         * @param mixed  $pos_x    x-position of the image (smart coordinate, relative to the new width)
+         * @param mixed  $pos_y    y-position of the image (smart coordinate, relative to the new height)
+         * @param int    $bg_color Background color (created with allocateColor or allocateColorAlpha), defaults to null (tries to use a transparent color)
+         * @param string $scale    Possible values: 'up' (enlarge only), 'down' (downsize only), 'any' (resize precisely to $width x $height). Defaults to 'any'.
+         * @param bool   $merge    Merge the original image (flatten alpha channel and transparency) or copy it over (preserve). Defaults to false.
+         *
+         * @return WideImage_Image The resulting image with resized canvas
+         */
+        public function resizeCanvas($width, $height, $pos_x, $pos_y, $bg_color = null, $scale = 'any', $merge = false)
+        {
+            return $this->getOperation('ResizeCanvas')->execute($this, $width, $height, $pos_x, $pos_y, $bg_color, $scale, $merge);
+        }
+
+        /**
+         * Returns an image with round corners.
+         * 
+         * You can either set the corners' color or set them transparent.
+         * 
+         * Note on $smoothness: 1 means jagged edges, 2 is much better, more than 4 doesn't noticeably improve the quality.
+         * Rendering becomes increasingly slower if you increase smoothness.
+         * 
+         * Example:
+         * <code>
+         * $nice = $ugly->roundCorners(20, $ugly->allocateColor(255, 0, 0), 2);
+         * </code>
+         * 
+         * Use $corners parameter to specify which corners to draw rounded. Possible values are
+         * WideImage::SIDE_TOP_LEFT, WideImage::SIDE_TOP,
+         * WideImage::SIDE_TOP_RIGHT, WideImage::SIDE_RIGHT,
+         * WideImage::SIDE_BOTTOM_RIGHT, WideImage::SIDE_BOTTOM, 
+         * WideImage::SIDE_BOTTOM_LEFT, WideImage::SIDE_LEFT, and WideImage::SIDE_ALL.
+         * You can specify any combination of corners with a + operation, see example below.
+         * 
+         * Example:
+         * <code>
+         * $white = $image->allocateColor(255, 255, 255);
+         * $diagonal_corners = $image->roundCorners(15, $white, 2, WideImage::SIDE_TOP_LEFT + WideImage::SIDE_BOTTOM_RIGHT);
+         * $right_corners = $image->roundCorners(15, $white, 2, WideImage::SIDE_RIGHT);
+         * </code>
+         * 
+         * @param int $radius     Radius of the corners
+         * @param int $color      The color of corners. If null, corners are rendered transparent (slower than using a solid color).
+         * @param int $smoothness Specify the level of smoothness. Suggested values from 1 to 4.
+         * @param int $corners    Specify which corners to draw (defaults to WideImage::SIDE_ALL = all corners)
+         *
+         * @return WideImage_Image The resulting image with round corners
+         */
+        public function roundCorners($radius, $color = null, $smoothness = 2, $corners = 255)
+        {
+            return $this->getOperation('RoundCorners')->execute($this, $radius, $color, $smoothness, $corners);
+        }
+
+        /**
+         * Returns an image with applied mask.
+         * 
+         * A mask is a grayscale image, where the shade determines the alpha channel. Black is fully transparent
+         * and white is fully opaque.
+         * 
+         * @param WideImage_Image $mask The mask image, greyscale
+         * @param mixed           $left Left coordinate, smart coordinate
+         * @param mixed           $top  Top coordinate, smart coordinate
+         *
+         * @return WideImage_Image The resulting image
+         **/
+        public function applyMask($mask, $left = 0, $top = 0)
+        {
+            return $this->getOperation('ApplyMask')->execute($this, $mask, $left, $top);
+        }
+
+        /**
+         * Applies a filter.
+         *
+         * @param int $filter One of the IMG_FILTER_* constants
+         * @param int $arg1
+         * @param int $arg2
+         * @param int $arg3
+         * @param int $arg4
+         *
+         * @return WideImage_Image
+         */
+        public function applyFilter($filter, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null)
+        {
+            return $this->getOperation('ApplyFilter')->execute($this, $filter, $arg1, $arg2, $arg3, $arg4);
+        }
+
+        /**
+         * Applies convolution matrix with imageconvolution().
+         *
+         * @param array $matrix
+         * @param float $div
+         * @param float $offset
+         *
+         * @return WideImage_Image
+         */
+        public function applyConvolution($matrix, $div, $offset)
+        {
+            return $this->getOperation('ApplyConvolution')->execute($this, $matrix, $div, $offset);
+        }
+
+        /**
+         * Returns a cropped rectangular portion of the image.
+         * 
+         * If the rectangle specifies area that is out of bounds, it's limited to the current image bounds.
+         * 
+         * Examples:
+         * <code>
+         * $cropped = $img->crop(10, 10, 150, 200); // crops a 150x200 rect at (10, 10)
+         * $cropped = $img->crop(-100, -50, 100, 50); // crops a 100x50 rect at the right-bottom of the image
+         * $cropped = $img->crop('25%', '25%', '50%', '50%'); // crops a 50%x50% rect from the center of the image
+         * </code>
+         * 
+         * This operation supports alignment notation in left/top coordinates.
+         * Example:
+         * <code>
+         * $cropped = $img->crop("right", "bottom", 100, 200); // crops a 100x200 rect from right bottom
+         * $cropped = $img->crop("center", "middle", 50, 30); // crops a 50x30 from the center of the image
+         * </code>
+         * 
+         * @param mixed $left   Left-coordinate of the crop rect, smart coordinate
+         * @param mixed $top    Top-coordinate of the crop rect, smart coordinate
+         * @param mixed $width  Width of the crop rect, smart coordinate
+         * @param mixed $height Height of the crop rect, smart coordinate
+         *
+         * @return WideImage_Image The cropped image
+         **/
+        public function crop($left = 0, $top = 0, $width = '100%', $height = '100%')
+        {
+            return $this->getOperation('Crop')->execute($this, $left, $top, $width, $height);
+        }
+
+        /**
+         * Performs an auto-crop on the image.
+         *
+         * The image is auto-cropped from each of four sides. All sides are 
+         * scanned for pixels that differ from $base_color for more than 
+         * $rgb_threshold in absolute RGB difference. If more than $pixel_cutoff 
+         * differentiating pixels are found, that line is considered to be the crop line for the side.
+         * If the line isn't different enough, the algorithm procedes to the next line 
+         * towards the other edge of the image.
+         * 
+         * When the crop rectangle is found, it's enlarged by the $margin value on each of the four sides.
+         *
+         * @param int $margin        Margin for the crop rectangle, can be negative.
+         * @param int $rgb_threshold RGB difference which still counts as "same color".
+         * @param int $pixel_cutoff  How many pixels need to be different to mark a cut line.
+         * @param int $base_color    The base color index. If none specified (or null given), left-top pixel is used.
+         *
+         * @return WideImage_Image The cropped image
+         */
+        public function autoCrop($margin = 0, $rgb_threshold = 0, $pixel_cutoff = 1, $base_color = null)
+        {
+            return $this->getOperation('AutoCrop')->execute($this, $margin, $rgb_threshold, $pixel_cutoff, $base_color);
+        }
+
+        /**
+         * Returns a negative of the image.
+         *
+         * This operation differs from calling WideImage_Image::applyFilter(IMG_FILTER_NEGATIVE), because it's 8-bit and transparency safe.
+         * This means it will return an 8-bit image, if the source image is 8-bit. If that 8-bit image has a palette transparency,
+         * the resulting image will keep transparency.
+         *
+         * @return WideImage_Image negative of the image
+         */
+        public function asNegative()
+        {
+            return $this->getOperation('AsNegative')->execute($this);
+        }
+
+        /**
+         * Returns a grayscale copy of the image.
+         * 
+         * @return WideImage_Image grayscale copy
+         **/
+        public function asGrayscale()
+        {
+            return $this->getOperation('AsGrayscale')->execute($this);
+        }
+
+        /**
+         * Returns a mirrored copy of the image.
+         * 
+         * @return WideImage_Image Mirrored copy
+         **/
+        public function mirror()
+        {
+            return $this->getOperation('Mirror')->execute($this);
+        }
+
+        /**
+         * Applies the unsharp filter.
+         * 
+         * @param float $amount
+         * @param float $radius
+         * @param float $threshold
+         *
+         * @return WideImage_Image Unsharpened copy of the image
+         **/
+        public function unsharp($amount, $radius, $threshold)
+        {
+            return $this->getOperation('Unsharp')->execute($this, $amount, $radius, $threshold);
+        }
+
+        /**
+         * Returns a flipped (mirrored over horizontal line) copy of the image.
+         * 
+         * @return WideImage_Image Flipped copy
+         **/
+        public function flip()
+        {
+            return $this->getOperation('Flip')->execute($this);
+        }
+
+        /**
+         * Corrects gamma on the image.
+         * 
+         * @param float $inputGamma
+         * @param float $outputGamma
+         *
+         * @return WideImage_Image Image with corrected gamma
+         **/
+        public function correctGamma($inputGamma, $outputGamma)
+        {
+            return $this->getOperation('CorrectGamma')->execute($this, $inputGamma, $outputGamma);
+        }
+
+        /**
+         * Adds noise to the image.
+         * 
+         * @author Tomasz Kapusta
+         * 
+         * @param int    $amount Number of noise pixels to add
+         * @param string $type   Type of noise 'salt&pepper', 'color' or 'mono'
+         *
+         * @return WideImage_Image Image with noise added
+         **/
+        public function addNoise($amount, $type)
+        {
+            return $this->getOperation('AddNoise')->execute($this, $amount, $type);
+        }
+
+        /**
+         * Used internally to execute operations.
+         *
+         * @param string $name
+         * @param array  $args
+         *
+         * @return WideImage_Image
+         */
+        public function __call($name, $args)
+        {
+            $op = $this->getOperation($name);
+            array_unshift($args, $this);
+
+            return call_user_func_array([$op, 'execute'], $args);
+        }
+
+        /**
+         * Returns an image in GIF or PNG format.
+         *
+         * @return string
+         */
+        public function __toString()
+        {
+            if ($this->isTransparent()) {
+                return $this->asString('gif');
+            } else {
+                return $this->asString('png');
+            }
+        }
+
+        /**
+         * Returns a copy of the image object.
+         * 
+         * @return WideImage_Image The copy
+         **/
+        public function copy()
+        {
+            $dest = $this->doCreate($this->getWidth(), $this->getHeight());
+            $dest->copyTransparencyFrom($this, true);
+            $this->copyTo($dest, 0, 0);
+
+            return $dest;
+        }
+
+        /**
+         * Copies this image onto another image.
+         * 
+         * @param WideImage_Image $dest
+         * @param int             $left
+         * @param int             $top
+         **/
+        public function copyTo($dest, $left = 0, $top = 0)
+        {
+            if (!imagecopy($dest->getHandle(), $this->handle, $left, $top, 0, 0, $this->getWidth(), $this->getHeight())) {
+                throw new WideImage_GDFunctionResultException('imagecopy() returned false');
+            }
+        }
+
+        /**
+         * Returns the canvas object.
+         * 
+         * The Canvas object can be used to draw text and shapes on the image
+         * 
+         * Examples:
+         * <code>
+         * $img = WideImage::load('pic.jpg);
+         * $canvas = $img->getCanvas();
+         * $canvas->useFont('arial.ttf', 15, $img->allocateColor(200, 220, 255));
+         * $canvas->writeText(10, 50, "Hello world!");
+         * 
+         * $canvas->filledRectangle(10, 10, 80, 40, $img->allocateColor(255, 127, 255));
+         * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
+         * $img->saveToFile('new.png');
+         * </code>
+         * 
+         * @return WideImage_Canvas The Canvas object
+         **/
+        public function getCanvas()
+        {
+            if ($this->canvas == null) {
+                $this->canvas = new WideImage_Canvas($this);
+            }
+
+            return $this->canvas;
+        }
+
+        /**
+         * Returns true if the image is true-color, false otherwise.
+         * 
+         * @return bool
+         **/
+        abstract public function isTrueColor();
+
+        /**
+         * Returns a true-color copy of the image.
+         * 
+         * @return WideImage_TrueColorImage
+         **/
+        abstract public function asTrueColor();
+
+        /**
+         * Returns a palette copy (8bit) of the image.
+         *
+         * @param int  $nColors      Number of colors in the resulting image, more than 0, less or equal to 255
+         * @param bool $dither       Use dithering or not
+         * @param bool $matchPalette Set to true to use imagecolormatch() to match the resulting palette more closely to the original image 
+         *
+         * @return WideImage_Image
+         **/
+        abstract public function asPalette($nColors = 255, $dither = null, $matchPalette = true);
+
+        /**
+         * Retrieve an image with selected channels.
+         * 
+         * Examples:
+         * <code>
+         * $channels = $img->getChannels('red', 'blue');
+         * $channels = $img->getChannels('alpha', 'green');
+         * $channels = $img->getChannels(array('green', 'blue'));
+         * </code>
+         * 
+         * @return WideImage_Image
+         **/
+        abstract public function getChannels();
+
+        /**
+         * Returns an image without an alpha channel.
+         * 
+         * @return WideImage_Image
+         **/
+        abstract public function copyNoAlpha();
+
+        /**
+         * Returns an array of serializable protected variables. Called automatically upon serialize().
+         * 
+         * @return array
+         */
+        public function __sleep()
+        {
+            $this->sdata = $this->asString('png');
+
+            return ['sdata', 'handleReleased'];
+        }
+
+        /**
+         * Restores an image from serialization. Called automatically upon unserialize().
+         */
+        public function __wakeup()
+        {
+            $temp_image = WideImage::loadFromString($this->sdata);
+            $temp_image->releaseHandle();
+            $this->handle = $temp_image->handle;
+            $temp_image = null;
+            $this->sdata = null;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/BMP.php b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/BMP.php
index 0620f0590..baf0aa269 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/BMP.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/BMP.php
@@ -1,51 +1,31 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
+    include_once WideImage::path().'/vendor/de77/BMP.php';
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Mapper support for BMP.
+     */
+    class WideImage_Mapper_BMP
+    {
+        public function load($uri)
+        {
+            return WideImage_vendor_de77_BMP::imagecreatefrombmp($uri);
+        }
 
-    * @package Internal/Mappers
-  **/
-	
-	include_once WideImage::path() . '/vendor/de77/BMP.php';
-	
-	/**
-	 * Mapper support for BMP
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_BMP
-	{
-		function load($uri)
-		{
-			return WideImage_vendor_de77_BMP::imagecreatefrombmp($uri);
-		}
-		
-		function loadFromString($data)
-		{
-			return WideImage_vendor_de77_BMP::imagecreatefromstring($data);
-		}
-		
-		function save($handle, $uri = null)
-		{
-			if ($uri == null)
-				return WideImage_vendor_de77_BMP::imagebmp($handle);
-			else
-				return WideImage_vendor_de77_BMP::imagebmp($handle, $uri);
-		}
-	}
+        public function loadFromString($data)
+        {
+            return WideImage_vendor_de77_BMP::imagecreatefromstring($data);
+        }
+
+        public function save($handle, $uri = null)
+        {
+            if ($uri == null) {
+                return WideImage_vendor_de77_BMP::imagebmp($handle);
+            } else {
+                return WideImage_vendor_de77_BMP::imagebmp($handle, $uri);
+            }
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD.php b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD.php
index 03372ebd9..d92031ea8 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD.php
@@ -1,44 +1,25 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Mapper class for GD files.
+     */
+    class WideImage_Mapper_GD
+    {
+        public function load($uri)
+        {
+            return @imagecreatefromgd($uri);
+        }
 
-    * @package Internal/Mappers
-  **/
-	
-	/**
-	 * Mapper class for GD files
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_GD
-	{
-		function load($uri)
-		{
-			return @imagecreatefromgd($uri);
-		}
-		
-		function save($handle, $uri = null)
-		{
-			if ($uri == null)
-				return imagegd($handle);
-			else
-				return imagegd($handle, $uri);
-		}
-	}
+        public function save($handle, $uri = null)
+        {
+            if ($uri == null) {
+                return imagegd($handle);
+            } else {
+                return imagegd($handle, $uri);
+            }
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD2.php b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD2.php
index 7bbc5a60c..2ac43b1cd 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD2.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD2.php
@@ -1,41 +1,21 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Mapper class for GD2 files.
+     */
+    class WideImage_Mapper_GD2
+    {
+        public function load($uri)
+        {
+            return @imagecreatefromgd2($uri);
+        }
 
-    * @package Internal/Mappers
-  **/
-	
-	/**
-	 * Mapper class for GD2 files
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_GD2
-	{
-		function load($uri)
-		{
-			return @imagecreatefromgd2($uri);
-		}
-		
-		function save($handle, $uri = null, $chunk_size = null, $type = null)
-		{
-			return imagegd2($handle, $uri, $chunk_size, $type);
-		}
-	}
+        public function save($handle, $uri = null, $chunk_size = null, $type = null)
+        {
+            return imagegd2($handle, $uri, $chunk_size, $type);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GIF.php b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GIF.php
index f69ec6915..c9dd4a7e0 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GIF.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/GIF.php
@@ -1,50 +1,31 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Mapper class for GIF files.
+     */
+    class WideImage_Mapper_GIF
+    {
+        public function load($uri)
+        {
+            return @imagecreatefromgif($uri);
+        }
 
-    * @package Internal/Mappers
-  **/
-	
-	/**
-	 * Mapper class for GIF files
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_GIF
-	{
-		function load($uri)
-		{
-			return @imagecreatefromgif($uri);
-		}
-		
-		function save($handle, $uri = null)
-		{
-			// This is a workaround for a bug, for which PHP devs claim it's not 
-			// really a bug. Well, it IS.
-			// You can't pass null as the second parameter, because php is
-			// then trying to save an image to a '' location (which results in an
-			// error, of course). And the same thing works fine for imagepng() and 
-			// imagejpeg(). It's a bug! ;)
-			if ($uri)
-				return imagegif($handle, $uri);
-			else
-				return imagegif($handle);
-		}
-	}
+        public function save($handle, $uri = null)
+        {
+            // This is a workaround for a bug, for which PHP devs claim it's not
+            // really a bug. Well, it IS.
+            // You can't pass null as the second parameter, because php is
+            // then trying to save an image to a '' location (which results in an
+            // error, of course). And the same thing works fine for imagepng() and
+            // imagejpeg(). It's a bug! ;)
+            if ($uri) {
+                return imagegif($handle, $uri);
+            } else {
+                return imagegif($handle);
+            }
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/JPEG.php b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/JPEG.php
index a24a6cb25..3ae5b7d1a 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/JPEG.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/JPEG.php
@@ -1,41 +1,21 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Mapper class for JPEG files.
+     */
+    class WideImage_Mapper_JPEG
+    {
+        public function load($uri)
+        {
+            return @imagecreatefromjpeg($uri);
+        }
 
-    * @package Internal/Mappers
-  **/
-	
-	/**
-	 * Mapper class for JPEG files
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_JPEG
-	{
-		function load($uri)
-		{
-			return @imagecreatefromjpeg($uri);
-		}
-		
-		function save($handle, $uri = null, $quality = 100)
-		{
-			return imagejpeg($handle, $uri, $quality);
-		}
-	}
+        public function save($handle, $uri = null, $quality = 100)
+        {
+            return imagejpeg($handle, $uri, $quality);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/PNG.php b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/PNG.php
index 30b59d175..062259e27 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/PNG.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/PNG.php
@@ -1,41 +1,21 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Mapper class for PNG files.
+     */
+    class WideImage_Mapper_PNG
+    {
+        public function load($uri)
+        {
+            return @imagecreatefrompng($uri);
+        }
 
-    * @package Internal/Mappers
-  **/
-	
-	/**
-	 * Mapper class for PNG files
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_PNG
-	{
-		function load($uri)
-		{
-			return @imagecreatefrompng($uri);
-		}
-		
-		function save($handle, $uri = null, $compression = 9, $filters = PNG_ALL_FILTERS)
-		{
-			return imagepng($handle, $uri, $compression, $filters);
-		}
-	}
+        public function save($handle, $uri = null, $compression = 9, $filters = PNG_ALL_FILTERS)
+        {
+            return imagepng($handle, $uri, $compression, $filters);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/TGA.php b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/TGA.php
index a1027a575..3a650f6b2 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/TGA.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Mapper/TGA.php
@@ -1,48 +1,27 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
+    include_once WideImage::path().'/vendor/de77/TGA.php';
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Mapper support for TGA.
+     */
+    class WideImage_Mapper_TGA
+    {
+        public function load($uri)
+        {
+            return WideImage_vendor_de77_TGA::imagecreatefromtga($uri);
+        }
 
-    * @package Internal/Mappers
-  **/
-	
-	include_once WideImage::path() . '/vendor/de77/TGA.php';
-	
-	/**
-	 * Mapper support for TGA
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_TGA
-	{
-		function load($uri)
-		{
-			return WideImage_vendor_de77_TGA::imagecreatefromtga($uri);
-		}
-		
-		function loadFromString($data)
-		{
-			return WideImage_vendor_de77_TGA::imagecreatefromstring($data);
-		}
-		
-		function save($handle, $uri = null)
-		{
-			throw new WideImage_Exception("Saving to TGA isn't supported.");
-		}
-	}
+        public function loadFromString($data)
+        {
+            return WideImage_vendor_de77_TGA::imagecreatefromstring($data);
+        }
+
+        public function save($handle, $uri = null)
+        {
+            throw new WideImage_Exception("Saving to TGA isn't supported.");
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php b/public/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php
index 4f453df22..7080c8a97 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php
@@ -1,126 +1,111 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-	
-	/**
-	 * Thrown when image format isn't supported
-	 * 
-	 * @package Exceptions
-	 */
-	class WideImage_UnsupportedFormatException extends WideImage_Exception {}
-	
-	/**
-	 * Mapper factory
-	 * 
-	 * @package Internals
-	 **/
-	abstract class WideImage_MapperFactory
-	{
-		static protected $mappers = array();
-		static protected $customMappers = array();
-		
-		static protected $mimeTable = array(
-			'image/jpg' => 'JPEG', 
-			'image/jpeg' => 'JPEG', 
-			'image/pjpeg' => 'JPEG', 
-			'image/gif' => 'GIF', 
-			'image/png' => 'PNG'
-			);
-		
-		/**
-		 * Returns a mapper, based on the $uri and $format
-		 * 
-		 * @param string $uri File URI
-		 * @param string $format File format (extension or mime-type) or null
-		 * @return WideImage_Mapper
-		 **/
-		static function selectMapper($uri, $format = null)
-		{
-			$format = self::determineFormat($uri, $format);
-			
-			if (array_key_exists($format, self::$mappers))
-				return self::$mappers[$format];
-			
-			$mapperClassName = 'WideImage_Mapper_' . $format;
-			
-			if (!class_exists($mapperClassName, false))
-			{
-				$mapperFileName = WideImage::path() . 'Mapper/' . $format . '.php';
-				if (file_exists($mapperFileName))
-					require_once $mapperFileName;
-			}
-			
-			if (class_exists($mapperClassName))
-			{
-				self::$mappers[$format] = new $mapperClassName();
-				return self::$mappers[$format];
-			}
-			
-			throw new WideImage_UnsupportedFormatException("Format '{$format}' is not supported.");
-		}
-		
-		static function registerMapper($mapper_class_name, $mime_type, $extension)
-		{
-			self::$customMappers[$mime_type] = $mapper_class_name;
-			self::$mimeTable[$mime_type] = $extension;
-		}
-		
-		static function getCustomMappers()
-		{
-			return self::$customMappers;
-		}
-		
-		static function determineFormat($uri, $format = null)
-		{
-			if ($format == null)
-				$format = self::extractExtension($uri);
-			
-			// mime-type match
-			if (preg_match('~[a-z]*/[a-z-]*~i', $format))
-				if (isset(self::$mimeTable[strtolower($format)]))
-				{
-					return self::$mimeTable[strtolower($format)];
-				}
-			
-			// clean the string
-			$format = strtoupper(preg_replace('/[^a-z0-9_-]/i', '', $format));
-			if ($format == 'JPG')
-				$format = 'JPEG';
-			
-			return $format;
-		}
-		
-		static function mimeType($format)
-		{
-			return array_search(strtoupper($format), self::$mimeTable);
-		}
-		
-		static function extractExtension($uri)
-		{
-			$p = strrpos($uri, '.');
-			if ($p === false)
-				return '';
-			else
-				return substr($uri, $p + 1);
-		}
-	}
+    /**
+     * Thrown when image format isn't supported.
+     */
+    class WideImage_UnsupportedFormatException extends WideImage_Exception
+    {
+    }
+
+    /**
+     * Mapper factory.
+     **/
+    abstract class WideImage_MapperFactory
+    {
+        protected static $mappers = [];
+        protected static $customMappers = [];
+
+        protected static $mimeTable = [
+            'image/jpg'   => 'JPEG',
+            'image/jpeg'  => 'JPEG',
+            'image/pjpeg' => 'JPEG',
+            'image/gif'   => 'GIF',
+            'image/png'   => 'PNG',
+            ];
+
+        /**
+         * Returns a mapper, based on the $uri and $format.
+         * 
+         * @param string $uri    File URI
+         * @param string $format File format (extension or mime-type) or null
+         *
+         * @return WideImage_Mapper
+         **/
+        public static function selectMapper($uri, $format = null)
+        {
+            $format = self::determineFormat($uri, $format);
+
+            if (array_key_exists($format, self::$mappers)) {
+                return self::$mappers[$format];
+            }
+
+            $mapperClassName = 'WideImage_Mapper_'.$format;
+
+            if (!class_exists($mapperClassName, false)) {
+                $mapperFileName = WideImage::path().'Mapper/'.$format.'.php';
+                if (file_exists($mapperFileName)) {
+                    require_once $mapperFileName;
+                }
+            }
+
+            if (class_exists($mapperClassName)) {
+                self::$mappers[$format] = new $mapperClassName();
+
+                return self::$mappers[$format];
+            }
+
+            throw new WideImage_UnsupportedFormatException("Format '{$format}' is not supported.");
+        }
+
+        public static function registerMapper($mapper_class_name, $mime_type, $extension)
+        {
+            self::$customMappers[$mime_type] = $mapper_class_name;
+            self::$mimeTable[$mime_type] = $extension;
+        }
+
+        public static function getCustomMappers()
+        {
+            return self::$customMappers;
+        }
+
+        public static function determineFormat($uri, $format = null)
+        {
+            if ($format == null) {
+                $format = self::extractExtension($uri);
+            }
+
+            // mime-type match
+            if (preg_match('~[a-z]*/[a-z-]*~i', $format)) {
+                if (isset(self::$mimeTable[strtolower($format)])) {
+                    return self::$mimeTable[strtolower($format)];
+                }
+            }
+
+            // clean the string
+            $format = strtoupper(preg_replace('/[^a-z0-9_-]/i', '', $format));
+            if ($format == 'JPG') {
+                $format = 'JPEG';
+            }
+
+            return $format;
+        }
+
+        public static function mimeType($format)
+        {
+            return array_search(strtoupper($format), self::$mimeTable);
+        }
+
+        public static function extractExtension($uri)
+        {
+            $p = strrpos($uri, '.');
+            if ($p === false) {
+                return '';
+            } else {
+                return substr($uri, $p + 1);
+            }
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AddNoise.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AddNoise.php
index 5206c3ef3..617ac40ca 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AddNoise.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AddNoise.php
@@ -1,153 +1,145 @@
 <?php
-	/**
-	* @author Tomasz Kapusta
-	* @copyright 2010
-	
-	This file is part of WideImage.
-		
-		WideImage is free software; you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation; either version 2.1 of the License, or
-	(at your option) any later version.
-		
-	WideImage is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
-		
-	You should have received a copy of the GNU Lesser General Public License
-	along with WideImage; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	
-	* @package Internal/Operations
-	**/
-	
-	/**
-	 * Noise filter
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_AddNoise {
-		/**
-		 * Returns image with noise added
-		 *
-		 * @param WideImage_Image $image
-		 * @param float $amount
-		 * @param const $type
-		 * @param float $threshold
-		 * @return WideImage_Image
-		 */
-		 		 
-		function execute($image, $amount, $type) {
-			
-			switch ($type)
-			{
-				case 'salt&pepper'	:	$fun = 'saltPepperNoise_fun'; 
-										break;
-				case 'color'		:	$fun = 'colorNoise_fun';
-										break;	
-				default				:	$fun = 'monoNoise_fun';
-										break; 			
-			}
-			
-			return self::filter($image->asTrueColor(), $fun, $amount);			
-		}
-		
-		/**
-		 * Returns image with every pixel changed by specififed function
-		 *
-		 * @param WideImage_Image $image
-		 * @param str $function
-		 * @param int $value
-		 * @return WideImage_Image
-		 */
-		function filter($image, $function, $value)
-		{
-			for ($y = 0; $y < $image->getHeight(); $y++)
-			{
-		    	for ($x = 0; $x< $image->getWidth(); $x++)
-				{	     
-					$rgb = imagecolorat($image->getHandle(), $x, $y);				
-					
-					$a = ($rgb >> 24) & 0xFF;
-					$r = ($rgb >> 16) & 0xFF;
-					$g = ($rgb >> 8) & 0xFF;
-					$b = $rgb & 0xFF;
-					
-					
-					self::$function($r, $g, $b, $value);
-					
-					$color = imagecolorallocatealpha($image->getHandle(), $r, $g, $b, $a);				
-					imagesetpixel($image->getHandle(), $x, $y, $color); 
-		      	}
-		    }
-		    return $image;
-		}
-		/**
-		 * Adds color noise by altering given R,G,B values using specififed amount
-		 *
-		 * @param int $r
-		 * @param int $g
-		 * @param int $b
-		 * @param int $value		 
-		 * @return void
-		 */
-		function colorNoise_fun(&$r, &$g, &$b, $amount)
-		{				
-			$r = self::byte($r + mt_rand(0, $amount) - ($amount >> 1) );
-			$g = self::byte($g + mt_rand(0, $amount) - ($amount >> 1) );
-			$b = self::byte($b + mt_rand(0, $amount) - ($amount >> 1) );
-		}
-		/**
-		 * Adds mono noise by altering given R,G,B values using specififed amount
-		 *
-		 * @param int $r
-		 * @param int $g
-		 * @param int $b
-		 * @param int $value		 
-		 * @return void
-		 */
-		function monoNoise_fun(&$r, &$g, &$b, $amount)
-		{				
-			$rand = mt_rand(0, $amount) - ($amount >> 1);
-			
-			$r = self::byte($r + $rand);
-			$g = self::byte($g + $rand);
-			$b = self::byte($b + $rand);
-		}
-		/**
-		 * Adds salt&pepper noise by altering given R,G,B values using specififed amount
-		 *
-		 * @param int $r
-		 * @param int $g
-		 * @param int $b
-		 * @param int $value		 
-		 * @return void
-		 */
-		function saltPepperNoise_fun(&$r, &$g, &$b, $amount)
-		{
-			if (mt_rand(0, 255 - $amount) != 0) return;
-			
-			$rand = mt_rand(0, 1);
-			switch ($rand)
-			{
-				case 0 :	$r = $g = $b = 0;
-							break; 
-				case 1 :	$r = $g = $b = 255;
-							break; 
-			}
-		}
-		/**
-		 * Returns value within (0,255)
-		 *
-		 * @param int $b		 
-		 * @return int
-		 */		
-		function byte($b)
-		{
-			if ($b > 255) return 255;
-			if ($b < 0) return 0;
-			return (int) $b;
-		}
-		
-	}
+    /**
+     * @author Tomasz Kapusta
+     * @copyright 2010
+     **/
+
+    /**
+     * Noise filter.
+     */
+    class WideImage_Operation_AddNoise
+    {
+        /**
+         * Returns image with noise added.
+         *
+         * @param WideImage_Image $image
+         * @param float           $amount
+         * @param const           $type
+         * @param float           $threshold
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $amount, $type)
+        {
+            switch ($type) {
+                case 'salt&pepper':    $fun = 'saltPepperNoise_fun';
+                                        break;
+                case 'color':    $fun = 'colorNoise_fun';
+                                        break;
+                default:    $fun = 'monoNoise_fun';
+                                        break;
+            }
+
+            return self::filter($image->asTrueColor(), $fun, $amount);
+        }
+
+        /**
+         * Returns image with every pixel changed by specififed function.
+         *
+         * @param WideImage_Image $image
+         * @param str             $function
+         * @param int             $value
+         *
+         * @return WideImage_Image
+         */
+        public function filter($image, $function, $value)
+        {
+            for ($y = 0; $y < $image->getHeight(); $y++) {
+                for ($x = 0; $x < $image->getWidth(); $x++) {
+                    $rgb = imagecolorat($image->getHandle(), $x, $y);
+
+                    $a = ($rgb >> 24) & 0xFF;
+                    $r = ($rgb >> 16) & 0xFF;
+                    $g = ($rgb >> 8) & 0xFF;
+                    $b = $rgb & 0xFF;
+
+                    self::$function($r, $g, $b, $value);
+
+                    $color = imagecolorallocatealpha($image->getHandle(), $r, $g, $b, $a);
+                    imagesetpixel($image->getHandle(), $x, $y, $color);
+                }
+            }
+
+            return $image;
+        }
+
+        /**
+         * Adds color noise by altering given R,G,B values using specififed amount.
+         *
+         * @param int $r
+         * @param int $g
+         * @param int $b
+         * @param int $value
+         *
+         * @return void
+         */
+        public function colorNoise_fun(&$r, &$g, &$b, $amount)
+        {
+            $r = self::byte($r + mt_rand(0, $amount) - ($amount >> 1));
+            $g = self::byte($g + mt_rand(0, $amount) - ($amount >> 1));
+            $b = self::byte($b + mt_rand(0, $amount) - ($amount >> 1));
+        }
+
+        /**
+         * Adds mono noise by altering given R,G,B values using specififed amount.
+         *
+         * @param int $r
+         * @param int $g
+         * @param int $b
+         * @param int $value
+         *
+         * @return void
+         */
+        public function monoNoise_fun(&$r, &$g, &$b, $amount)
+        {
+            $rand = mt_rand(0, $amount) - ($amount >> 1);
+
+            $r = self::byte($r + $rand);
+            $g = self::byte($g + $rand);
+            $b = self::byte($b + $rand);
+        }
+
+        /**
+         * Adds salt&pepper noise by altering given R,G,B values using specififed amount.
+         *
+         * @param int $r
+         * @param int $g
+         * @param int $b
+         * @param int $value
+         *
+         * @return void
+         */
+        public function saltPepperNoise_fun(&$r, &$g, &$b, $amount)
+        {
+            if (mt_rand(0, 255 - $amount) != 0) {
+                return;
+            }
+
+            $rand = mt_rand(0, 1);
+            switch ($rand) {
+                case 0:    $r = $g = $b = 0;
+                            break;
+                case 1:    $r = $g = $b = 255;
+                            break;
+            }
+        }
+
+        /**
+         * Returns value within (0,255).
+         *
+         * @param int $b
+         *
+         * @return int
+         */
+        public function byte($b)
+        {
+            if ($b > 255) {
+                return 255;
+            }
+            if ($b < 0) {
+                return 0;
+            }
+
+            return (int) $b;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyConvolution.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyConvolution.php
index 9a1c5f74c..e5e4a9c84 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyConvolution.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyConvolution.php
@@ -1,48 +1,31 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * ApplyConvolution operation class.
+     */
+    class WideImage_Operation_ApplyConvolution
+    {
+        /**
+         * Executes imageconvolution() filter.
+         *
+         * @param WideImage_Image $image
+         * @param array           $matrix
+         * @param numeric         $div
+         * @param numeric         $offset
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $matrix, $div, $offset)
+        {
+            $new = $image->asTrueColor();
+            if (!imageconvolution($new->getHandle(), $matrix, $div, $offset)) {
+                throw new WideImage_GDFunctionResultException('imageconvolution() returned false');
+            }
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * ApplyConvolution operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_ApplyConvolution
-	{
-		/**
-		 * Executes imageconvolution() filter
-		 *
-		 * @param WideImage_Image $image
-		 * @param array $matrix
-		 * @param numeric $div
-		 * @param numeric $offset
-		 * @return WideImage_Image
-		 */
-		function execute($image, $matrix, $div, $offset)
-		{
-			$new = $image->asTrueColor();
-			if (!imageconvolution($new->getHandle(), $matrix, $div, $offset))
-				throw new WideImage_GDFunctionResultException("imageconvolution() returned false");
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyFilter.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyFilter.php
index ec6d210b2..81dcb9700 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyFilter.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyFilter.php
@@ -1,67 +1,50 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * ApplyFilter operation class.
+     */
+    class WideImage_Operation_ApplyFilter
+    {
+        /**
+         * A list of filters that only accept one arguments for imagefilter().
+         *
+         * @var array
+         */
+        protected static $one_arg_filters = [IMG_FILTER_SMOOTH, IMG_FILTER_CONTRAST, IMG_FILTER_BRIGHTNESS];
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * ApplyFilter operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_ApplyFilter
-	{
-		/**
-		 * A list of filters that only accept one arguments for imagefilter()
-		 *
-		 * @var array
-		 */
-		static protected $one_arg_filters = array(IMG_FILTER_SMOOTH, IMG_FILTER_CONTRAST, IMG_FILTER_BRIGHTNESS);
-		
-		/**
-		 * Executes imagefilter
-		 *
-		 * @param WideImage_Image $image
-		 * @param int $filter 
-		 * @param numeric $arg1
-		 * @param numeric $arg2
-		 * @param numeric $arg3
-		 * @return WideImage_TrueColorImage
-		 */
-		function execute($image, $filter, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null)
-		{
-			$new = $image->asTrueColor();
-			
-			if (in_array($filter, self::$one_arg_filters))
-				$res = imagefilter($new->getHandle(), $filter, $arg1);
-			elseif (defined('IMG_FILTER_PIXELATE') && $filter == IMG_FILTER_PIXELATE)
-				$res = imagefilter($new->getHandle(), $filter, $arg1, $arg2);
-			elseif ($filter == IMG_FILTER_COLORIZE)
-				$res = imagefilter($new->getHandle(), $filter, $arg1, $arg2, $arg3, $arg4);
-			else
-				$res = imagefilter($new->getHandle(), $filter);
-			
-			if (!$res)
-				throw new WideImage_GDFunctionResultException("imagefilter() returned false");
-			
-			return $new;
-		}
-	}
+        /**
+         * Executes imagefilter.
+         *
+         * @param WideImage_Image $image
+         * @param int             $filter
+         * @param numeric         $arg1
+         * @param numeric         $arg2
+         * @param numeric         $arg3
+         *
+         * @return WideImage_TrueColorImage
+         */
+        public function execute($image, $filter, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null)
+        {
+            $new = $image->asTrueColor();
+
+            if (in_array($filter, self::$one_arg_filters)) {
+                $res = imagefilter($new->getHandle(), $filter, $arg1);
+            } elseif (defined('IMG_FILTER_PIXELATE') && $filter == IMG_FILTER_PIXELATE) {
+                $res = imagefilter($new->getHandle(), $filter, $arg1, $arg2);
+            } elseif ($filter == IMG_FILTER_COLORIZE) {
+                $res = imagefilter($new->getHandle(), $filter, $arg1, $arg2, $arg3, $arg4);
+            } else {
+                $res = imagefilter($new->getHandle(), $filter);
+            }
+
+            if (!$res) {
+                throw new WideImage_GDFunctionResultException('imagefilter() returned false');
+            }
+
+            return $new;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyMask.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyMask.php
index 949213f0c..766d09f09 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyMask.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyMask.php
@@ -1,105 +1,82 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * ApplyMask operation class.
+     */
+    class WideImage_Operation_ApplyMask
+    {
+        /**
+         * Applies a mask on the copy of source image.
+         *
+         * @param WideImage_Image  $image
+         * @param WideImage_Image  $mask
+         * @param smart_coordinate $left
+         * @param smart_coordinate $top
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $mask, $left = 0, $top = 0)
+        {
+            $left = WideImage_Coordinate::fix($left, $image->getWidth(), $mask->getWidth());
+            $top = WideImage_Coordinate::fix($top, $image->getHeight(), $mask->getHeight());
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * ApplyMask operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_ApplyMask
-	{
-		/**
-		 * Applies a mask on the copy of source image
-		 *
-		 * @param WideImage_Image $image
-		 * @param WideImage_Image $mask
-		 * @param smart_coordinate $left
-		 * @param smart_coordinate $top
-		 * @return WideImage_Image
-		 */
-		function execute($image, $mask, $left = 0, $top = 0)
-		{
-			$left = WideImage_Coordinate::fix($left, $image->getWidth(), $mask->getWidth());
-			$top = WideImage_Coordinate::fix($top, $image->getHeight(), $mask->getHeight());
-			
-			$width = $image->getWidth();
-			$mask_width = $mask->getWidth();
-			
-			$height = $image->getHeight();
-			$mask_height = $mask->getHeight();
-			
-			$result = $image->asTrueColor();
-			
-			$result->alphaBlending(false);
-			$result->saveAlpha(true);
-			
-			$srcTransparentColor = $result->getTransparentColor();
-			if ($srcTransparentColor >= 0)
-			{
-				# this was here. works without.
-				#$trgb = $image->getColorRGB($srcTransparentColor);
-				#$trgb['alpha'] = 127;
-				#$destTransparentColor = $result->allocateColorAlpha($trgb);
-				#$result->setTransparentColor($destTransparentColor);
-				$destTransparentColor = $srcTransparentColor;
-			}
-			else
-			{
-				$destTransparentColor = $result->allocateColorAlpha(255, 255, 255, 127);
-			}
-			
-			for ($x = 0; $x < $width; $x++)
-				for ($y = 0; $y < $height; $y++)
-				{
-					$mx = $x - $left;
-					$my = $y - $top;
-					if ($mx >= 0 && $mx < $mask_width && $my >= 0 && $my < $mask_height)
-					{
-						$srcColor = $image->getColorAt($x, $y);
-						if ($srcColor == $srcTransparentColor)
-							$destColor = $destTransparentColor;
-						else
-						{
-							$maskRGB = $mask->getRGBAt($mx, $my);
-							if ($maskRGB['red'] == 0)
-								$destColor = $destTransparentColor;
-							elseif ($srcColor >= 0)
-							{
-								$imageRGB = $image->getRGBAt($x, $y);
-								$level = ($maskRGB['red'] / 255) * (1 - $imageRGB['alpha'] / 127);
-								$imageRGB['alpha'] = 127 - round($level * 127);
-								if ($imageRGB['alpha'] == 127)
-									$destColor = $destTransparentColor;
-								else
-									$destColor = $result->allocateColorAlpha($imageRGB);
-							}
-							else
-								$destColor = $destTransparentColor;
-						}
-						$result->setColorAt($x, $y, $destColor);
-					}
-				}
-			return $result;
-		}
-	}
+            $width = $image->getWidth();
+            $mask_width = $mask->getWidth();
+
+            $height = $image->getHeight();
+            $mask_height = $mask->getHeight();
+
+            $result = $image->asTrueColor();
+
+            $result->alphaBlending(false);
+            $result->saveAlpha(true);
+
+            $srcTransparentColor = $result->getTransparentColor();
+            if ($srcTransparentColor >= 0) {
+                // this was here. works without.
+                //$trgb = $image->getColorRGB($srcTransparentColor);
+                //$trgb['alpha'] = 127;
+                //$destTransparentColor = $result->allocateColorAlpha($trgb);
+                //$result->setTransparentColor($destTransparentColor);
+                $destTransparentColor = $srcTransparentColor;
+            } else {
+                $destTransparentColor = $result->allocateColorAlpha(255, 255, 255, 127);
+            }
+
+            for ($x = 0; $x < $width; $x++) {
+                for ($y = 0; $y < $height; $y++) {
+                    $mx = $x - $left;
+                    $my = $y - $top;
+                    if ($mx >= 0 && $mx < $mask_width && $my >= 0 && $my < $mask_height) {
+                        $srcColor = $image->getColorAt($x, $y);
+                        if ($srcColor == $srcTransparentColor) {
+                            $destColor = $destTransparentColor;
+                        } else {
+                            $maskRGB = $mask->getRGBAt($mx, $my);
+                            if ($maskRGB['red'] == 0) {
+                                $destColor = $destTransparentColor;
+                            } elseif ($srcColor >= 0) {
+                                $imageRGB = $image->getRGBAt($x, $y);
+                                $level = ($maskRGB['red'] / 255) * (1 - $imageRGB['alpha'] / 127);
+                                $imageRGB['alpha'] = 127 - round($level * 127);
+                                if ($imageRGB['alpha'] == 127) {
+                                    $destColor = $destTransparentColor;
+                                } else {
+                                    $destColor = $result->allocateColorAlpha($imageRGB);
+                                }
+                            } else {
+                                $destColor = $destTransparentColor;
+                            }
+                        }
+                        $result->setColorAt($x, $y, $destColor);
+                    }
+                }
+            }
+
+            return $result;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AsGrayscale.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AsGrayscale.php
index dc72f8554..3c787286c 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AsGrayscale.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AsGrayscale.php
@@ -1,49 +1,32 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * AsGrayscale operation class.
+     */
+    class WideImage_Operation_AsGrayscale
+    {
+        /**
+         * Returns a greyscale copy of an image.
+         *
+         * @param WideImage_Image $image
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image)
+        {
+            $new = $image->asTrueColor();
+            if (!imagefilter($new->getHandle(), IMG_FILTER_GRAYSCALE)) {
+                throw new WideImage_GDFunctionResultException('imagefilter() returned false');
+            }
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * AsGrayscale operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_AsGrayscale
-	{
-		/**
-		 * Returns a greyscale copy of an image
-		 *
-		 * @param WideImage_Image $image
-		 * @return WideImage_Image
-		 */
-		function execute($image)
-		{
-			$new = $image->asTrueColor();
-			if (!imagefilter($new->getHandle(), IMG_FILTER_GRAYSCALE))
-				throw new WideImage_GDFunctionResultException("imagefilter() returned false");
-			
-			if (!$image->isTrueColor())
-				$new = $new->asPalette();
-			
-			return $new;
-		}
-	}
+            if (!$image->isTrueColor()) {
+                $new = $new->asPalette();
+            }
+
+            return $new;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AsNegative.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AsNegative.php
index 9a13c4297..9b1fde622 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AsNegative.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AsNegative.php
@@ -1,63 +1,45 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * AsNegative operation class.
+     */
+    class WideImage_Operation_AsNegative
+    {
+        /**
+         * Returns a greyscale copy of an image.
+         *
+         * @param WideImage_Image $image
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image)
+        {
+            $palette = !$image->isTrueColor();
+            $transparent = $image->isTransparent();
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * AsNegative operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_AsNegative
-	{
-		/**
-		 * Returns a greyscale copy of an image
-		 *
-		 * @param WideImage_Image $image
-		 * @return WideImage_Image
-		 */
-		function execute($image)
-		{
-			$palette = !$image->isTrueColor();
-			$transparent = $image->isTransparent();
-			
-			if ($palette && $transparent)
-				$tcrgb = $image->getTransparentColorRGB();
-			
-			$new = $image->asTrueColor();
-			if (!imagefilter($new->getHandle(), IMG_FILTER_NEGATE))
-				throw new WideImage_GDFunctionResultException("imagefilter() returned false");
-			
-			if ($palette)
-			{
-				$new = $new->asPalette();
-				if ($transparent)
-				{
-					$irgb = array('red' => 255 - $tcrgb['red'], 'green' => 255 - $tcrgb['green'], 'blue' => 255 - $tcrgb['blue'], 'alpha' => 127);
-					// needs imagecolorexactalpha instead of imagecolorexact, otherwise doesn't work on some transparent GIF images
-					$new_tci = imagecolorexactalpha($new->getHandle(), $irgb['red'], $irgb['green'], $irgb['blue'], 127);
-					$new->setTransparentColor($new_tci);
-				}
-			}
-			return $new;
-		}
-	}
+            if ($palette && $transparent) {
+                $tcrgb = $image->getTransparentColorRGB();
+            }
+
+            $new = $image->asTrueColor();
+            if (!imagefilter($new->getHandle(), IMG_FILTER_NEGATE)) {
+                throw new WideImage_GDFunctionResultException('imagefilter() returned false');
+            }
+
+            if ($palette) {
+                $new = $new->asPalette();
+                if ($transparent) {
+                    $irgb = ['red' => 255 - $tcrgb['red'], 'green' => 255 - $tcrgb['green'], 'blue' => 255 - $tcrgb['blue'], 'alpha' => 127];
+                    // needs imagecolorexactalpha instead of imagecolorexact, otherwise doesn't work on some transparent GIF images
+                    $new_tci = imagecolorexactalpha($new->getHandle(), $irgb['red'], $irgb['green'], $irgb['blue'], 127);
+                    $new->setTransparentColor($new_tci);
+                }
+            }
+
+            return $new;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php
index 2fd0909e6..c53c65f42 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php
@@ -1,162 +1,133 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * AutoCrop operation.
+     */
+    class WideImage_Operation_AutoCrop
+    {
+        /**
+         * Executes the auto-crop operation on the $img.
+         * 
+         * @param WideImage_Image $img
+         * @param int             $rgb_threshold The difference in RGB from $base_color
+         * @param int             $pixel_cutoff  The number of pixels on each border that must be over $rgb_threshold
+         * @param int             $base_color    The color that will get cropped
+         *
+         * @return WideImage_Image resulting auto-cropped image
+         */
+        public function execute($img, $margin, $rgb_threshold, $pixel_cutoff, $base_color)
+        {
+            $margin = intval($margin);
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * AutoCrop operation
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_AutoCrop
-	{
-		/**
-		 * Executes the auto-crop operation on the $img
-		 * 
-		 * @param WideImage_Image $img 
-		 * @param int $rgb_threshold The difference in RGB from $base_color
-		 * @param int $pixel_cutoff The number of pixels on each border that must be over $rgb_threshold
-		 * @param int $base_color The color that will get cropped
-		 * @return WideImage_Image resulting auto-cropped image
-		 */
-		function execute($img, $margin, $rgb_threshold, $pixel_cutoff, $base_color)
-		{
-			$margin = intval($margin);
-			
-			$rgb_threshold = intval($rgb_threshold);
-			if ($rgb_threshold < 0)
-				$rgb_threshold = 0;
-			
-			$pixel_cutoff = intval($pixel_cutoff);
-			if ($pixel_cutoff <= 1)
-				$pixel_cutoff = 1;
-			
-			if ($base_color === null)
-				$rgb_base = $img->getRGBAt(0, 0);
-			else
-			{
-				if ($base_color < 0)
-					return $img->copy();
-				
-				$rgb_base = $img->getColorRGB($base_color);
-			}
-			
-			$cut_rect = array('left' => 0, 'top' => 0, 'right' => $img->getWidth() - 1, 'bottom' => $img->getHeight() - 1);
-			
-			for ($y = 0; $y <= $cut_rect['bottom']; $y++)
-			{
-				$count = 0;
-				for ($x = 0; $x <= $cut_rect['right']; $x++)
-				{
-					$rgb = $img->getRGBAt($x, $y);
-					$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
-					if ($diff > $rgb_threshold)
-					{
-						$count++;
-						if ($count >= $pixel_cutoff)
-						{
-							$cut_rect['top'] = $y;
-							break 2;
-						}
-					}
-				}
-			}
-			
-			for ($y = $img->getHeight() - 1; $y >= $cut_rect['top']; $y--)
-			{
-				$count = 0;
-				for ($x = 0; $x <= $cut_rect['right']; $x++)
-				{
-					$rgb = $img->getRGBAt($x, $y);
-					$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
-					if ($diff > $rgb_threshold)
-					{
-						$count++;
-						if ($count >= $pixel_cutoff)
-						{
-							$cut_rect['bottom'] = $y;
-							break 2;
-						}
-					}
-				}
-			}
-			
-			for ($x = 0; $x <= $cut_rect['right']; $x++)
-			{
-				$count = 0;
-				for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; $y++)
-				{
-					$rgb = $img->getRGBAt($x, $y);
-					$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
-					if ($diff > $rgb_threshold)
-					{
-						$count++;
-						if ($count >= $pixel_cutoff)
-						{
-							$cut_rect['left'] = $x;
-							break 2;
-						}
-					}
-				}
-			}
-			
-			for ($x = $cut_rect['right']; $x >= $cut_rect['left']; $x--)
-			{
-				$count = 0;
-				for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; $y++)
-				{
-					$rgb = $img->getRGBAt($x, $y);
-					$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
-					if ($diff > $rgb_threshold)
-					{
-						$count++;
-						if ($count >= $pixel_cutoff)
-						{
-							$cut_rect['right'] = $x;
-							break 2;
-						}
-					}
-				}
-			}
-			
-			$cut_rect = array(
-					'left' => $cut_rect['left'] - $margin,
-					'top' => $cut_rect['top'] - $margin,
-					'right' => $cut_rect['right'] + $margin,
-					'bottom' => $cut_rect['bottom'] + $margin
-				);
-			
-			if ($cut_rect['left'] < 0)
-				$cut_rect['left'] = 0;
-			
-			if ($cut_rect['top'] < 0)
-				$cut_rect['top'] = 0;
-			
-			if ($cut_rect['right'] >= $img->getWidth())
-				$cut_rect['right'] = $img->getWidth() - 1;
-			
-			if ($cut_rect['bottom'] >= $img->getHeight())
-				$cut_rect['bottom'] = $img->getHeight() - 1;
-			
-			return $img->crop($cut_rect['left'], $cut_rect['top'], $cut_rect['right'] - $cut_rect['left'] + 1, $cut_rect['bottom'] - $cut_rect['top'] + 1);
-		}
-	}
+            $rgb_threshold = intval($rgb_threshold);
+            if ($rgb_threshold < 0) {
+                $rgb_threshold = 0;
+            }
+
+            $pixel_cutoff = intval($pixel_cutoff);
+            if ($pixel_cutoff <= 1) {
+                $pixel_cutoff = 1;
+            }
+
+            if ($base_color === null) {
+                $rgb_base = $img->getRGBAt(0, 0);
+            } else {
+                if ($base_color < 0) {
+                    return $img->copy();
+                }
+
+                $rgb_base = $img->getColorRGB($base_color);
+            }
+
+            $cut_rect = ['left' => 0, 'top' => 0, 'right' => $img->getWidth() - 1, 'bottom' => $img->getHeight() - 1];
+
+            for ($y = 0; $y <= $cut_rect['bottom']; $y++) {
+                $count = 0;
+                for ($x = 0; $x <= $cut_rect['right']; $x++) {
+                    $rgb = $img->getRGBAt($x, $y);
+                    $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+                    if ($diff > $rgb_threshold) {
+                        $count++;
+                        if ($count >= $pixel_cutoff) {
+                            $cut_rect['top'] = $y;
+                            break 2;
+                        }
+                    }
+                }
+            }
+
+            for ($y = $img->getHeight() - 1; $y >= $cut_rect['top']; $y--) {
+                $count = 0;
+                for ($x = 0; $x <= $cut_rect['right']; $x++) {
+                    $rgb = $img->getRGBAt($x, $y);
+                    $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+                    if ($diff > $rgb_threshold) {
+                        $count++;
+                        if ($count >= $pixel_cutoff) {
+                            $cut_rect['bottom'] = $y;
+                            break 2;
+                        }
+                    }
+                }
+            }
+
+            for ($x = 0; $x <= $cut_rect['right']; $x++) {
+                $count = 0;
+                for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; $y++) {
+                    $rgb = $img->getRGBAt($x, $y);
+                    $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+                    if ($diff > $rgb_threshold) {
+                        $count++;
+                        if ($count >= $pixel_cutoff) {
+                            $cut_rect['left'] = $x;
+                            break 2;
+                        }
+                    }
+                }
+            }
+
+            for ($x = $cut_rect['right']; $x >= $cut_rect['left']; $x--) {
+                $count = 0;
+                for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; $y++) {
+                    $rgb = $img->getRGBAt($x, $y);
+                    $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+                    if ($diff > $rgb_threshold) {
+                        $count++;
+                        if ($count >= $pixel_cutoff) {
+                            $cut_rect['right'] = $x;
+                            break 2;
+                        }
+                    }
+                }
+            }
+
+            $cut_rect = [
+                    'left'   => $cut_rect['left'] - $margin,
+                    'top'    => $cut_rect['top'] - $margin,
+                    'right'  => $cut_rect['right'] + $margin,
+                    'bottom' => $cut_rect['bottom'] + $margin,
+                ];
+
+            if ($cut_rect['left'] < 0) {
+                $cut_rect['left'] = 0;
+            }
+
+            if ($cut_rect['top'] < 0) {
+                $cut_rect['top'] = 0;
+            }
+
+            if ($cut_rect['right'] >= $img->getWidth()) {
+                $cut_rect['right'] = $img->getWidth() - 1;
+            }
+
+            if ($cut_rect['bottom'] >= $img->getHeight()) {
+                $cut_rect['bottom'] = $img->getHeight() - 1;
+            }
+
+            return $img->crop($cut_rect['left'], $cut_rect['top'], $cut_rect['right'] - $cut_rect['left'] + 1, $cut_rect['bottom'] - $cut_rect['top'] + 1);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php
index 048975005..f94fb582d 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php
@@ -1,90 +1,71 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * CopyChannelsPalette operation class.
+     * 
+     * This operation is intended to be used on palette images
+     */
+    class WideImage_Operation_CopyChannelsPalette
+    {
+        /**
+         * Returns an image with only specified channels copied.
+         *
+         * @param WideImage_PaletteImage $img
+         * @param array                  $channels
+         *
+         * @return WideImage_PaletteImage
+         */
+        public function execute($img, $channels)
+        {
+            $blank = ['red' => 0, 'green' => 0, 'blue' => 0];
+            if (isset($channels['alpha'])) {
+                unset($channels['alpha']);
+            }
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * CopyChannelsPalette operation class
-	 * 
-	 * This operation is intended to be used on palette images
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_CopyChannelsPalette
-	{
-		/**
-		 * Returns an image with only specified channels copied
-		 *
-		 * @param WideImage_PaletteImage $img
-		 * @param array $channels
-		 * @return WideImage_PaletteImage
-		 */
-		function execute($img, $channels)
-		{
-			$blank = array('red' => 0, 'green' => 0, 'blue' => 0);
-			if (isset($channels['alpha']))
-				unset($channels['alpha']);
-			
-			$width = $img->getWidth();
-			$height = $img->getHeight();
-			$copy = WideImage_PaletteImage::create($width, $height);
-			
-			if ($img->isTransparent())
-			{
-				$otci = $img->getTransparentColor();
-				$TRGB = $img->getColorRGB($otci);
-				$tci = $copy->allocateColor($TRGB);
-			}
-			else
-			{
-				$otci = null;
-				$tci = null;
-			}
-			
-			for ($x = 0; $x < $width; $x++)
-				for ($y = 0; $y < $height; $y++)
-				{
-					$ci = $img->getColorAt($x, $y);
-					if ($ci === $otci)
-					{
-						$copy->setColorAt($x, $y, $tci);
-						continue;
-					}
-					$RGB = $img->getColorRGB($ci);
-					
-					$newRGB = $blank;
-					foreach ($channels as $channel)
-						$newRGB[$channel] = $RGB[$channel];
-					
-					$color = $copy->getExactColor($newRGB);
-					if ($color == -1)
-						$color = $copy->allocateColor($newRGB);
-					
-					$copy->setColorAt($x, $y, $color);
-				}
-			
-			if ($img->isTransparent())
-				$copy->setTransparentColor($tci);
-			
-			return $copy;
-		}
-	}
+            $width = $img->getWidth();
+            $height = $img->getHeight();
+            $copy = WideImage_PaletteImage::create($width, $height);
+
+            if ($img->isTransparent()) {
+                $otci = $img->getTransparentColor();
+                $TRGB = $img->getColorRGB($otci);
+                $tci = $copy->allocateColor($TRGB);
+            } else {
+                $otci = null;
+                $tci = null;
+            }
+
+            for ($x = 0; $x < $width; $x++) {
+                for ($y = 0; $y < $height; $y++) {
+                    $ci = $img->getColorAt($x, $y);
+                    if ($ci === $otci) {
+                        $copy->setColorAt($x, $y, $tci);
+                        continue;
+                    }
+                    $RGB = $img->getColorRGB($ci);
+
+                    $newRGB = $blank;
+                    foreach ($channels as $channel) {
+                        $newRGB[$channel] = $RGB[$channel];
+                    }
+
+                    $color = $copy->getExactColor($newRGB);
+                    if ($color == -1) {
+                        $color = $copy->allocateColor($newRGB);
+                    }
+
+                    $copy->setColorAt($x, $y, $color);
+                }
+            }
+
+            if ($img->isTransparent()) {
+                $copy->setTransparentColor($tci);
+            }
+
+            return $copy;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php
index bf39520cd..17a768854 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php
@@ -1,67 +1,51 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * CopyChannelsTrueColor operation class.
+     * 
+     * Used to perform CopyChannels operation on truecolor images
+     */
+    class WideImage_Operation_CopyChannelsTrueColor
+    {
+        /**
+         * Returns an image with only specified channels copied.
+         * 
+         * @param WideImage_Image $img
+         * @param array           $channels
+         *
+         * @return WideImage_Image
+         */
+        public function execute($img, $channels)
+        {
+            $blank = ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0];
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * CopyChannelsTrueColor operation class
-	 * 
-	 * Used to perform CopyChannels operation on truecolor images
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_CopyChannelsTrueColor
-	{
-		/**
-		 * Returns an image with only specified channels copied
-		 * 
-		 * @param WideImage_Image $img
-		 * @param array $channels
-		 * @return WideImage_Image
-		 */
-		function execute($img, $channels)
-		{
-			$blank = array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0);
-			
-			$width = $img->getWidth();
-			$height = $img->getHeight();
-			$copy = WideImage_TrueColorImage::create($width, $height);
-			
-			if (count($channels) > 0)
-				for ($x = 0; $x < $width; $x++)
-					for ($y = 0; $y < $height; $y++)
-					{
-						$RGBA = $img->getRGBAt($x, $y);
-						$newRGBA = $blank;
-						foreach ($channels as $channel)
-							$newRGBA[$channel] = $RGBA[$channel];
-						
-						$color = $copy->getExactColorAlpha($newRGBA);
-						if ($color == -1)
-							$color = $copy->allocateColorAlpha($newRGBA);
-						
-						$copy->setColorAt($x, $y, $color);
-					}
-			
-			return $copy;
-		}
-	}
+            $width = $img->getWidth();
+            $height = $img->getHeight();
+            $copy = WideImage_TrueColorImage::create($width, $height);
+
+            if (count($channels) > 0) {
+                for ($x = 0; $x < $width; $x++) {
+                    for ($y = 0; $y < $height; $y++) {
+                        $RGBA = $img->getRGBAt($x, $y);
+                        $newRGBA = $blank;
+                        foreach ($channels as $channel) {
+                            $newRGBA[$channel] = $RGBA[$channel];
+                        }
+
+                        $color = $copy->getExactColorAlpha($newRGBA);
+                        if ($color == -1) {
+                            $color = $copy->allocateColorAlpha($newRGBA);
+                        }
+
+                        $copy->setColorAt($x, $y, $color);
+                    }
+                }
+            }
+
+            return $copy;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CorrectGamma.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CorrectGamma.php
index 49562f1d3..4f373b42d 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CorrectGamma.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CorrectGamma.php
@@ -1,48 +1,30 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * CorrectGamma operation class.
+     */
+    class WideImage_Operation_CorrectGamma
+    {
+        /**
+         * Executes imagegammacorrect().
+         *
+         * @param WideImage_Image $image
+         * @param numeric         $input_gamma
+         * @param numeric         $output_gamma
+         *
+         * @return WideImage_TrueColorImage
+         */
+        public function execute($image, $input_gamma, $output_gamma)
+        {
+            $new = $image->copy();
+            if (!imagegammacorrect($new->getHandle(), $input_gamma, $output_gamma)) {
+                throw new WideImage_GDFunctionResultException('imagegammacorrect() returned false');
+            }
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * CorrectGamma operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_CorrectGamma
-	{
-		/**
-		 * Executes imagegammacorrect()
-		 *
-		 * @param WideImage_Image $image
-		 * @param numeric $input_gamma
-		 * @param numeric $output_gamma
-		 * @return WideImage_TrueColorImage
-		 */
-		function execute($image, $input_gamma, $output_gamma)
-		{
-			$new = $image->copy();
-			if (!imagegammacorrect($new->getHandle(), $input_gamma, $output_gamma))
-				throw new WideImage_GDFunctionResultException("imagegammacorrect() returned false");
-			
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Crop.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Crop.php
index 6a9d4f5b3..63926d5de 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Crop.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Crop.php
@@ -1,86 +1,68 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Crop operation class.
+     */
+    class WideImage_Operation_Crop
+    {
+        /**
+         * Returns a cropped image.
+         *
+         * @param WideImage_Image  $img
+         * @param smart_coordinate $left
+         * @param smart_coordinate $top
+         * @param smart_coordinate $width
+         * @param smart_coordinate $height
+         *
+         * @return WideImage_Image
+         */
+        public function execute($img, $left, $top, $width, $height)
+        {
+            $width = WideImage_Coordinate::fix($width, $img->getWidth(), $width);
+            $height = WideImage_Coordinate::fix($height, $img->getHeight(), $height);
+            $left = WideImage_Coordinate::fix($left, $img->getWidth(), $width);
+            $top = WideImage_Coordinate::fix($top, $img->getHeight(), $height);
+            if ($left < 0) {
+                $width = $left + $width;
+                $left = 0;
+            }
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Crop operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Crop
-	{
-		/**
-		 * Returns a cropped image
-		 *
-		 * @param WideImage_Image $img
-		 * @param smart_coordinate $left
-		 * @param smart_coordinate $top
-		 * @param smart_coordinate $width
-		 * @param smart_coordinate $height
-		 * @return WideImage_Image
-		 */
-		function execute($img, $left, $top, $width, $height)
-		{
-			$width = WideImage_Coordinate::fix($width, $img->getWidth(), $width);
-			$height = WideImage_Coordinate::fix($height, $img->getHeight(), $height);
-			$left = WideImage_Coordinate::fix($left, $img->getWidth(), $width);
-			$top = WideImage_Coordinate::fix($top, $img->getHeight(), $height);
-			if ($left < 0)
-			{
-				$width = $left + $width;
-				$left = 0;
-			}
-			
-			if ($width > $img->getWidth() - $left)
-				$width = $img->getWidth() - $left;
-			
-			if ($top < 0)
-			{
-				$height = $top + $height;
-				$top = 0;
-			}
-			
-			if ($height > $img->getHeight() - $top)
-				$height = $img->getHeight() - $top;
-			
-			if ($width <= 0 || $height <= 0)
-				throw new WideImage_Exception("Can't crop outside of an image.");
-			
-			$new = $img->doCreate($width, $height);
-			
-			if ($img->isTransparent() || $img instanceof WideImage_PaletteImage)
-			{
-				$new->copyTransparencyFrom($img);
-				if (!imagecopyresized($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height))
-					throw new WideImage_GDFunctionResultException("imagecopyresized() returned false");
-			}
-			else
-			{
-				$new->alphaBlending(false);
-				$new->saveAlpha(true);
-				if (!imagecopyresampled($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height))
-					throw new WideImage_GDFunctionResultException("imagecopyresampled() returned false");
-			}
-			return $new;
-		}
-	}
+            if ($width > $img->getWidth() - $left) {
+                $width = $img->getWidth() - $left;
+            }
+
+            if ($top < 0) {
+                $height = $top + $height;
+                $top = 0;
+            }
+
+            if ($height > $img->getHeight() - $top) {
+                $height = $img->getHeight() - $top;
+            }
+
+            if ($width <= 0 || $height <= 0) {
+                throw new WideImage_Exception("Can't crop outside of an image.");
+            }
+
+            $new = $img->doCreate($width, $height);
+
+            if ($img->isTransparent() || $img instanceof WideImage_PaletteImage) {
+                $new->copyTransparencyFrom($img);
+                if (!imagecopyresized($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height)) {
+                    throw new WideImage_GDFunctionResultException('imagecopyresized() returned false');
+                }
+            } else {
+                $new->alphaBlending(false);
+                $new->saveAlpha(true);
+                if (!imagecopyresampled($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height)) {
+                    throw new WideImage_GDFunctionResultException('imagecopyresampled() returned false');
+                }
+            }
+
+            return $new;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Flip.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Flip.php
index d2f189c7b..bded3841e 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Flip.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Flip.php
@@ -1,54 +1,38 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Flip operation class.
+     */
+    class WideImage_Operation_Flip
+    {
+        /**
+         * Returns a flipped image.
+         *
+         * @param WideImage_Image $image
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image)
+        {
+            $new = $image->copy();
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Flip operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Flip
-	{
-		/**
-		 * Returns a flipped image
-		 *
-		 * @param WideImage_Image $image
-		 * @return WideImage_Image
-		 */
-		function execute($image)
-		{
-			$new = $image->copy();
-			
-			$width = $image->getWidth();
-			$height = $image->getHeight();
-			
-			if ($new->isTransparent())
-				imagefilledrectangle($new->getHandle(), 0, 0, $width, $height, $new->getTransparentColor());
-			
-			for ($y = 0; $y < $height; $y++)
-				if (!imagecopy($new->getHandle(), $image->getHandle(), 0, $y, 0, $height - $y - 1, $width, 1))
-					throw new WideImage_GDFunctionResultException("imagecopy() returned false");
-			
-			return $new;
-		}
-	}
+            $width = $image->getWidth();
+            $height = $image->getHeight();
+
+            if ($new->isTransparent()) {
+                imagefilledrectangle($new->getHandle(), 0, 0, $width, $height, $new->getTransparentColor());
+            }
+
+            for ($y = 0; $y < $height; $y++) {
+                if (!imagecopy($new->getHandle(), $image->getHandle(), 0, $y, 0, $height - $y - 1, $width, 1)) {
+                    throw new WideImage_GDFunctionResultException('imagecopy() returned false');
+                }
+            }
+
+            return $new;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/GetMask.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/GetMask.php
index f203a91d6..1aa5790c9 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/GetMask.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/GetMask.php
@@ -1,67 +1,51 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	
-	* @package Internal/Operations
-  **/
-	
-	/**
-	 * GetMask operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_GetMask
-	{
-		/**
-		 * Returns a mask
-		 *
-		 * @param WideImage_Image $image
-		 * @return WideImage_Image
-		 */
-		function execute($image)
-		{
-			$width = $image->getWidth();
-			$height = $image->getHeight();
-			
-			$mask = WideImage_TrueColorImage::create($width, $height);
-			$mask->setTransparentColor(-1);
-			$mask->alphaBlending(false);
-			$mask->saveAlpha(false);
-			
-			for ($i = 0; $i <= 255; $i++)
-				$greyscale[$i] = ImageColorAllocate($mask->getHandle(), $i, $i, $i);
-			
-			imagefilledrectangle($mask->getHandle(), 0, 0, $width, $height, $greyscale[255]);
-			
-			$transparentColor = $image->getTransparentColor();
-			$alphaToGreyRatio = 255 / 127;
-			for ($x = 0; $x < $width; $x++)
-				for ($y = 0; $y < $height; $y++)
-				{
-					$color = $image->getColorAt($x, $y);
-					if ($color == $transparentColor)
-						$rgba['alpha'] = 127;
-					else
-						$rgba = $image->getColorRGB($color);
-					imagesetpixel($mask->getHandle(), $x, $y, $greyscale[255 - round($rgba['alpha'] * $alphaToGreyRatio)]);
-				}
-			return $mask;
-		}
-	}
+    /**
+     * GetMask operation class.
+     */
+    class WideImage_Operation_GetMask
+    {
+        /**
+         * Returns a mask.
+         *
+         * @param WideImage_Image $image
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image)
+        {
+            $width = $image->getWidth();
+            $height = $image->getHeight();
+
+            $mask = WideImage_TrueColorImage::create($width, $height);
+            $mask->setTransparentColor(-1);
+            $mask->alphaBlending(false);
+            $mask->saveAlpha(false);
+
+            for ($i = 0; $i <= 255; $i++) {
+                $greyscale[$i] = imagecolorallocate($mask->getHandle(), $i, $i, $i);
+            }
+
+            imagefilledrectangle($mask->getHandle(), 0, 0, $width, $height, $greyscale[255]);
+
+            $transparentColor = $image->getTransparentColor();
+            $alphaToGreyRatio = 255 / 127;
+            for ($x = 0; $x < $width; $x++) {
+                for ($y = 0; $y < $height; $y++) {
+                    $color = $image->getColorAt($x, $y);
+                    if ($color == $transparentColor) {
+                        $rgba['alpha'] = 127;
+                    } else {
+                        $rgba = $image->getColorRGB($color);
+                    }
+                    imagesetpixel($mask->getHandle(), $x, $y, $greyscale[255 - round($rgba['alpha'] * $alphaToGreyRatio)]);
+                }
+            }
+
+            return $mask;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Merge.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Merge.php
index ee897119b..88515b91e 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Merge.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Merge.php
@@ -1,78 +1,59 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Merge operation class.
+     */
+    class WideImage_Operation_Merge
+    {
+        /**
+         * Returns a merged image.
+         *
+         * @param WideImage_Image  $base
+         * @param WideImage_Image  $overlay
+         * @param smart_coordinate $left
+         * @param smart_coordinate $top
+         * @param numeric          $pct
+         *
+         * @return WideImage_Image
+         */
+        public function execute($base, $overlay, $left, $top, $pct)
+        {
+            $x = WideImage_Coordinate::fix($left, $base->getWidth(), $overlay->getWidth());
+            $y = WideImage_Coordinate::fix($top, $base->getHeight(), $overlay->getHeight());
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Merge operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Merge
-	{
-		/**
-		 * Returns a merged image
-		 *
-		 * @param WideImage_Image $base
-		 * @param WideImage_Image $overlay
-		 * @param smart_coordinate $left
-		 * @param smart_coordinate $top
-		 * @param numeric $pct
-		 * @return WideImage_Image
-		 */
-		function execute($base, $overlay, $left, $top, $pct)
-		{
-			$x = WideImage_Coordinate::fix($left, $base->getWidth(), $overlay->getWidth());
-			$y = WideImage_Coordinate::fix($top, $base->getHeight(), $overlay->getHeight());
-			
-			$result = $base->asTrueColor();
-			$result->alphaBlending(true);
-			$result->saveAlpha(true);
-			
-			if ($pct <= 0)
-				return $result;
-			
-			if ($pct < 100)
-			{
-				if (!imagecopymerge(
-					$result->getHandle(), 
-					$overlay->getHandle(), 
-					$x, $y, 0, 0, 
-					$overlay->getWidth(), 
-					$overlay->getHeight(), 
-					$pct))
-				throw new WideImage_GDFunctionResultException("imagecopymerge() returned false");
-			}
-			else
-			{
-				if (!imagecopy(
-					$result->getHandle(), 
-					$overlay->getHandle(), 
-					$x, $y, 0, 0, 
-					$overlay->getWidth(), 
-					$overlay->getHeight()))
-				throw new WideImage_GDFunctionResultException("imagecopy() returned false");
-			}
-			
-			return $result;
-		}
-	}
+            $result = $base->asTrueColor();
+            $result->alphaBlending(true);
+            $result->saveAlpha(true);
+
+            if ($pct <= 0) {
+                return $result;
+            }
+
+            if ($pct < 100) {
+                if (!imagecopymerge(
+                    $result->getHandle(),
+                    $overlay->getHandle(),
+                    $x, $y, 0, 0,
+                    $overlay->getWidth(),
+                    $overlay->getHeight(),
+                    $pct)) {
+                    throw new WideImage_GDFunctionResultException('imagecopymerge() returned false');
+                }
+            } else {
+                if (!imagecopy(
+                    $result->getHandle(),
+                    $overlay->getHandle(),
+                    $x, $y, 0, 0,
+                    $overlay->getWidth(),
+                    $overlay->getHeight())) {
+                    throw new WideImage_GDFunctionResultException('imagecopy() returned false');
+                }
+            }
+
+            return $result;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Mirror.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Mirror.php
index ebefbfc4f..c8f4c94c6 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Mirror.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Mirror.php
@@ -1,55 +1,38 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Mirror operation class.
+     */
+    class WideImage_Operation_Mirror
+    {
+        /**
+         * Returns a mirrored image.
+         *
+         * @param WideImage_Image $image
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image)
+        {
+            $new = $image->copy();
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Mirror operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Mirror
-	{
-		/**
-		 * Returns a mirrored image
-		 *
-		 * @param WideImage_Image $image
-		 * @return WideImage_Image
-		 */
-		function execute($image)
-		{
-			$new = $image->copy();
-			
-			$width = $image->getWidth();
-			$height = $image->getHeight();
-			
-			if ($new->isTransparent())
-				imagefilledrectangle($new->getHandle(), 0, 0, $width, $height, $new->getTransparentColor());
-			
-			for ($x = 0; $x < $width; $x++)
-			{
-				if (!imagecopy($new->getHandle(), $image->getHandle(), $x, 0, $width - $x - 1, 0, 1, $height)) 
-					throw new WideImage_GDFunctionResultException("imagecopy() returned false");
-			}
-			return $new;
-		}
-	}
+            $width = $image->getWidth();
+            $height = $image->getHeight();
+
+            if ($new->isTransparent()) {
+                imagefilledrectangle($new->getHandle(), 0, 0, $width, $height, $new->getTransparentColor());
+            }
+
+            for ($x = 0; $x < $width; $x++) {
+                if (!imagecopy($new->getHandle(), $image->getHandle(), $x, 0, $width - $x - 1, 0, 1, $height)) {
+                    throw new WideImage_GDFunctionResultException('imagecopy() returned false');
+                }
+            }
+
+            return $new;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Resize.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Resize.php
index c495b7cd3..364412bfe 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Resize.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Resize.php
@@ -1,157 +1,144 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * An Exception for when an invalid fit method is passed.
+     */
+    class WideImage_Operation_InvalidFitMethodException extends WideImage_Exception
+    {
+    }
+    /**
+     * An Exception for when an invalid resize dimensions are passed.
+     */
+    class WideImage_Operation_InvalidResizeDimensionException extends WideImage_Exception
+    {
+    }
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * An Exception for when an invalid fit method is passed
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_InvalidFitMethodException extends WideImage_Exception {}
-	/**
-	 * An Exception for when an invalid resize dimensions are passed
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_InvalidResizeDimensionException extends WideImage_Exception {}
-	
-	/**
-	 * Resize operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Resize
-	{
-		/**
-		 * Prepares and corrects smart coordinates
-		 *
-		 * @param WideImage_Image $img
-		 * @param smart_coordinate $width
-		 * @param smart_coordinate $height
-		 * @param string $fit
-		 * @return array
-		 */
-		protected function prepareDimensions($img, $width, $height, $fit)
-		{
-			if ($width === null && $height === null)
-			{
-				$width = $img->getWidth();
-				$height = $img->getHeight();
-			}
-			
-			if ($width !== null)
-				$width = WideImage_Coordinate::fix($width, $img->getWidth());
-			
-			if ($height !== null)
-				$height = WideImage_Coordinate::fix($height, $img->getHeight());
-			
-			if ($width === null)
-				$width = floor($img->getWidth() * $height / $img->getHeight());
-			
-			if ($height === null)
-				$height = floor($img->getHeight() * $width / $img->getWidth());
-			
-			if ($width === 0 || $height === 0)
-				return array('width' => 0, 'height' => 0);
-			
-			if ($fit == null)
-				$fit = 'inside';
-			
-			$dim = array();
-			if ($fit == 'fill')
-			{
-				$dim['width'] = $width;
-				$dim['height'] = $height;
-			}
-			elseif ($fit == 'inside' || $fit == 'outside')
-			{
-				$rx = $img->getWidth() / $width;
-				$ry = $img->getHeight() / $height;
-				
-				if ($fit == 'inside')
-					$ratio = ($rx > $ry) ? $rx : $ry;
-				else
-					$ratio = ($rx < $ry) ? $rx : $ry;
-				
-				$dim['width'] = round($img->getWidth() / $ratio);
-				$dim['height'] = round($img->getHeight() / $ratio);
-			}
-			else
-				throw new WideImage_Operation_InvalidFitMethodException("{$fit} is not a valid resize-fit method.");
-			
-			return $dim;
-		}
-		
-		/**
-		 * Returns a resized image
-		 *
-		 * @param WideImage_Image $img
-		 * @param smart_coordinate $width
-		 * @param smart_coordinate $height
-		 * @param string $fit
-		 * @param string $scale
-		 * @return WideImage_Image
-		 */
-		function execute($img, $width, $height, $fit, $scale)
-		{
-			$dim = $this->prepareDimensions($img, $width, $height, $fit);
-			if (($scale === 'down' && ($dim['width'] >= $img->getWidth() && $dim['height'] >= $img->getHeight())) ||
-				($scale === 'up' && ($dim['width'] <= $img->getWidth() && $dim['height'] <= $img->getHeight())))
-				$dim = array('width' => $img->getWidth(), 'height' => $img->getHeight());
-			
-			if ($dim['width'] <= 0 || $dim['height'] <= 0)
-				throw new WideImage_Operation_InvalidResizeDimensionException("Both dimensions must be larger than 0.");
-			
-			if ($img->isTransparent() || $img instanceof WideImage_PaletteImage)
-			{
-				$new = WideImage_PaletteImage::create($dim['width'], $dim['height']);
-				$new->copyTransparencyFrom($img);
-				if (!imagecopyresized(
-						$new->getHandle(), 
-						$img->getHandle(), 
-						0, 0, 0, 0, 
-						$new->getWidth(), 
-						$new->getHeight(), 
-						$img->getWidth(), 
-						$img->getHeight()))
-					throw new WideImage_GDFunctionResultException("imagecopyresized() returned false");
-			}
-			else
-			{
-				$new = WideImage_TrueColorImage::create($dim['width'], $dim['height']);
-				$new->alphaBlending(false);
-				$new->saveAlpha(true);
-				if (!imagecopyresampled(
-						$new->getHandle(), 
-						$img->getHandle(), 
-						0, 0, 0, 0, 
-						$new->getWidth(), 
-						$new->getHeight(), 
-						$img->getWidth(), 
-						$img->getHeight()))
-					throw new WideImage_GDFunctionResultException("imagecopyresampled() returned false");
-				$new->alphaBlending(true);
-			}
-			return $new;
-		}
-	}
+    /**
+     * Resize operation class.
+     */
+    class WideImage_Operation_Resize
+    {
+        /**
+         * Prepares and corrects smart coordinates.
+         *
+         * @param WideImage_Image  $img
+         * @param smart_coordinate $width
+         * @param smart_coordinate $height
+         * @param string           $fit
+         *
+         * @return array
+         */
+        protected function prepareDimensions($img, $width, $height, $fit)
+        {
+            if ($width === null && $height === null) {
+                $width = $img->getWidth();
+                $height = $img->getHeight();
+            }
+
+            if ($width !== null) {
+                $width = WideImage_Coordinate::fix($width, $img->getWidth());
+            }
+
+            if ($height !== null) {
+                $height = WideImage_Coordinate::fix($height, $img->getHeight());
+            }
+
+            if ($width === null) {
+                $width = floor($img->getWidth() * $height / $img->getHeight());
+            }
+
+            if ($height === null) {
+                $height = floor($img->getHeight() * $width / $img->getWidth());
+            }
+
+            if ($width === 0 || $height === 0) {
+                return ['width' => 0, 'height' => 0];
+            }
+
+            if ($fit == null) {
+                $fit = 'inside';
+            }
+
+            $dim = [];
+            if ($fit == 'fill') {
+                $dim['width'] = $width;
+                $dim['height'] = $height;
+            } elseif ($fit == 'inside' || $fit == 'outside') {
+                $rx = $img->getWidth() / $width;
+                $ry = $img->getHeight() / $height;
+
+                if ($fit == 'inside') {
+                    $ratio = ($rx > $ry) ? $rx : $ry;
+                } else {
+                    $ratio = ($rx < $ry) ? $rx : $ry;
+                }
+
+                $dim['width'] = round($img->getWidth() / $ratio);
+                $dim['height'] = round($img->getHeight() / $ratio);
+            } else {
+                throw new WideImage_Operation_InvalidFitMethodException("{$fit} is not a valid resize-fit method.");
+            }
+
+            return $dim;
+        }
+
+        /**
+         * Returns a resized image.
+         *
+         * @param WideImage_Image  $img
+         * @param smart_coordinate $width
+         * @param smart_coordinate $height
+         * @param string           $fit
+         * @param string           $scale
+         *
+         * @return WideImage_Image
+         */
+        public function execute($img, $width, $height, $fit, $scale)
+        {
+            $dim = $this->prepareDimensions($img, $width, $height, $fit);
+            if (($scale === 'down' && ($dim['width'] >= $img->getWidth() && $dim['height'] >= $img->getHeight())) ||
+                ($scale === 'up' && ($dim['width'] <= $img->getWidth() && $dim['height'] <= $img->getHeight()))) {
+                $dim = ['width' => $img->getWidth(), 'height' => $img->getHeight()];
+            }
+
+            if ($dim['width'] <= 0 || $dim['height'] <= 0) {
+                throw new WideImage_Operation_InvalidResizeDimensionException('Both dimensions must be larger than 0.');
+            }
+
+            if ($img->isTransparent() || $img instanceof WideImage_PaletteImage) {
+                $new = WideImage_PaletteImage::create($dim['width'], $dim['height']);
+                $new->copyTransparencyFrom($img);
+                if (!imagecopyresized(
+                        $new->getHandle(),
+                        $img->getHandle(),
+                        0, 0, 0, 0,
+                        $new->getWidth(),
+                        $new->getHeight(),
+                        $img->getWidth(),
+                        $img->getHeight())) {
+                    throw new WideImage_GDFunctionResultException('imagecopyresized() returned false');
+                }
+            } else {
+                $new = WideImage_TrueColorImage::create($dim['width'], $dim['height']);
+                $new->alphaBlending(false);
+                $new->saveAlpha(true);
+                if (!imagecopyresampled(
+                        $new->getHandle(),
+                        $img->getHandle(),
+                        0, 0, 0, 0,
+                        $new->getWidth(),
+                        $new->getHeight(),
+                        $img->getWidth(),
+                        $img->getHeight())) {
+                    throw new WideImage_GDFunctionResultException('imagecopyresampled() returned false');
+                }
+                $new->alphaBlending(true);
+            }
+
+            return $new;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php
index 8262b15ae..8dd0f7de8 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php
@@ -1,107 +1,84 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * ResizeCanvas operation class.
+     */
+    class WideImage_Operation_ResizeCanvas
+    {
+        /**
+         * Returns an image with a resized canvas.
+         * 
+         * The image is filled with $color. Use $scale to determine, when to resize.
+         *
+         * @param WideImage_Image  $img
+         * @param smart_coordinate $width
+         * @param smart_coordinate $height
+         * @param smart_coordinate $left
+         * @param smart_coordinate $top
+         * @param int              $color
+         * @param string           $scale  'up', 'down', 'any'
+         * @param bool             $merge
+         *
+         * @return WideImage_Image
+         */
+        public function execute($img, $width, $height, $left, $top, $color, $scale, $merge)
+        {
+            $new_width = WideImage_Coordinate::fix($width, $img->getWidth());
+            $new_height = WideImage_Coordinate::fix($height, $img->getHeight());
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * ResizeCanvas operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_ResizeCanvas
-	{
-		/**
-		 * Returns an image with a resized canvas
-		 * 
-		 * The image is filled with $color. Use $scale to determine, when to resize.
-		 *
-		 * @param WideImage_Image $img
-		 * @param smart_coordinate $width
-		 * @param smart_coordinate $height
-		 * @param smart_coordinate $left
-		 * @param smart_coordinate $top
-		 * @param int $color
-		 * @param string $scale 'up', 'down', 'any'
-		 * @param boolean $merge
-		 * @return WideImage_Image
-		 */
-		function execute($img, $width, $height, $left, $top, $color, $scale, $merge)
-		{
-			$new_width = WideImage_Coordinate::fix($width, $img->getWidth());
-			$new_height = WideImage_Coordinate::fix($height, $img->getHeight());
-			
-			if ($scale == 'down')
-			{
-				$new_width = min($new_width, $img->getWidth());
-				$new_height = min($new_height, $img->getHeight());
-			}
-			elseif ($scale == 'up')
-			{
-				$new_width = max($new_width, $img->getWidth());
-				$new_height = max($new_height, $img->getHeight());
-			}
-			
-			$new = WideImage::createTrueColorImage($new_width, $new_height);
-			if ($img->isTrueColor())
-			{
-				if ($color === null)
-					$color = $new->allocateColorAlpha(0, 0, 0, 127);
-			}
-			else
-			{
-				imagepalettecopy($new->getHandle(), $img->getHandle());
-				
-				if ($img->isTransparent())
-				{
-					$new->copyTransparencyFrom($img);
-					$tc_rgb = $img->getTransparentColorRGB();
-					$t_color = $new->allocateColorAlpha($tc_rgb);
-				}
-				
-				if ($color === null)
-				{
-					if ($img->isTransparent())
-						$color = $t_color;
-					else
-						$color = $new->allocateColorAlpha(255, 0, 127, 127);
-					
-					imagecolortransparent($new->getHandle(), $color);
-				}
-			}
-			$new->fill(0, 0, $color);
-			
-			
-			$x = WideImage_Coordinate::fix($left, $new->getWidth(), $img->getWidth());
-			$y = WideImage_Coordinate::fix($top, $new->getHeight(), $img->getHeight());
-			
-			// blending for truecolor images
-			if ($img->isTrueColor())
-				$new->alphaBlending($merge);
-			
-			// not-blending for palette images
-			if (!$merge && !$img->isTrueColor() && isset($t_color))
-				$new->getCanvas()->filledRectangle($x, $y, $x + $img->getWidth(), $y + $img->getHeight(), $t_color);
-			
-			$img->copyTo($new, $x, $y);
-			return $new;
-		}
-	}
+            if ($scale == 'down') {
+                $new_width = min($new_width, $img->getWidth());
+                $new_height = min($new_height, $img->getHeight());
+            } elseif ($scale == 'up') {
+                $new_width = max($new_width, $img->getWidth());
+                $new_height = max($new_height, $img->getHeight());
+            }
+
+            $new = WideImage::createTrueColorImage($new_width, $new_height);
+            if ($img->isTrueColor()) {
+                if ($color === null) {
+                    $color = $new->allocateColorAlpha(0, 0, 0, 127);
+                }
+            } else {
+                imagepalettecopy($new->getHandle(), $img->getHandle());
+
+                if ($img->isTransparent()) {
+                    $new->copyTransparencyFrom($img);
+                    $tc_rgb = $img->getTransparentColorRGB();
+                    $t_color = $new->allocateColorAlpha($tc_rgb);
+                }
+
+                if ($color === null) {
+                    if ($img->isTransparent()) {
+                        $color = $t_color;
+                    } else {
+                        $color = $new->allocateColorAlpha(255, 0, 127, 127);
+                    }
+
+                    imagecolortransparent($new->getHandle(), $color);
+                }
+            }
+            $new->fill(0, 0, $color);
+
+            $x = WideImage_Coordinate::fix($left, $new->getWidth(), $img->getWidth());
+            $y = WideImage_Coordinate::fix($top, $new->getHeight(), $img->getHeight());
+
+            // blending for truecolor images
+            if ($img->isTrueColor()) {
+                $new->alphaBlending($merge);
+            }
+
+            // not-blending for palette images
+            if (!$merge && !$img->isTrueColor() && isset($t_color)) {
+                $new->getCanvas()->filledRectangle($x, $y, $x + $img->getWidth(), $y + $img->getHeight(), $t_color);
+            }
+
+            $img->copyTo($new, $x, $y);
+
+            return $new;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Rotate.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Rotate.php
index 690b04f52..20bf8b6be 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Rotate.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Rotate.php
@@ -1,64 +1,46 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Rotate operation class.
+     */
+    class WideImage_Operation_Rotate
+    {
+        /**
+         * Returns rotated image.
+         *
+         * @param WideImage_Image $image
+         * @param numeric         $angle
+         * @param int             $bgColor
+         * @param bool            $ignoreTransparent
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $angle, $bgColor, $ignoreTransparent)
+        {
+            $angle = -floatval($angle);
+            if ($angle < 0) {
+                $angle = 360 + $angle;
+            }
+            $angle = $angle % 360;
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Rotate operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Rotate
-	{
-		/**
-		 * Returns rotated image
-		 *
-		 * @param WideImage_Image $image
-		 * @param numeric $angle
-		 * @param int $bgColor
-		 * @param bool $ignoreTransparent
-		 * @return WideImage_Image
-		 */
-		function execute($image, $angle, $bgColor, $ignoreTransparent)
-		{
-			$angle = -floatval($angle);
-			if ($angle < 0)
-				$angle = 360 + $angle;
-			$angle = $angle % 360;
-			
-			if ($angle == 0)
-				return $image->copy();
-			
-			$image = $image->asTrueColor();
-			
-			if ($bgColor === null)
-			{
-				$bgColor = $image->getTransparentColor();
-				if ($bgColor == -1)
-				{
-					$bgColor = $image->allocateColorAlpha(255, 255, 255, 127);
-					imagecolortransparent($image->getHandle(), $bgColor);
-				}
-			}
-			return new WideImage_TrueColorImage(imagerotate($image->getHandle(), $angle, $bgColor, $ignoreTransparent));
-		}
-	}
+            if ($angle == 0) {
+                return $image->copy();
+            }
+
+            $image = $image->asTrueColor();
+
+            if ($bgColor === null) {
+                $bgColor = $image->getTransparentColor();
+                if ($bgColor == -1) {
+                    $bgColor = $image->allocateColorAlpha(255, 255, 255, 127);
+                    imagecolortransparent($image->getHandle(), $bgColor);
+                }
+            }
+
+            return new WideImage_TrueColorImage(imagerotate($image->getHandle(), $angle, $bgColor, $ignoreTransparent));
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/RoundCorners.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/RoundCorners.php
index 22eb84991..a44e94ea7 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/RoundCorners.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/RoundCorners.php
@@ -1,114 +1,100 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * ApplyMask operation class.
+     */
+    class WideImage_Operation_RoundCorners
+    {
+        /**
+         * @param WideImage_Image $image
+         * @param int             $radius
+         * @param int             $color
+         * @param int             $smoothness
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $radius, $color, $smoothness, $corners)
+        {
+            if ($smoothness < 1) {
+                $sample_ratio = 1;
+            } elseif ($smoothness > 16) {
+                $sample_ratio = 16;
+            } else {
+                $sample_ratio = $smoothness;
+            }
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * ApplyMask operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_RoundCorners
-	{
-		/**
-		 * @param WideImage_Image $image
-		 * @param int $radius
-		 * @param int $color
-		 * @param int $smoothness
-		 * @return WideImage_Image
-		 */
-		function execute($image, $radius, $color, $smoothness, $corners)
-		{
-			if ($smoothness < 1)
-				$sample_ratio = 1;
-			elseif ($smoothness > 16)
-				$sample_ratio = 16;
-			else
-				$sample_ratio = $smoothness;
-			
-			$corner = WideImage::createTrueColorImage($radius * $sample_ratio, $radius * $sample_ratio);
-			if ($color === null)
-			{
-				imagepalettecopy($corner->getHandle(), $image->getHandle());
-				$bg_color = $corner->allocateColor(0, 0, 0);
-				
-				$corner->fill(0, 0, $bg_color);
-				$fg_color = $corner->allocateColor(255, 255, 255);
-				$corner->getCanvas()->filledEllipse($radius * $sample_ratio, $radius * $sample_ratio, $radius * 2 * $sample_ratio, $radius * 2 * $sample_ratio, $fg_color);
-				$corner = $corner->resize($radius, $radius);
-				
-				$result = $image->asTrueColor();
-				
-				$tc = $result->getTransparentColor();
-				if ($tc == -1)
-				{
-					$tc = $result->allocateColorAlpha(255, 255, 255, 127);
-					imagecolortransparent($result->getHandle(), $tc);
-					$result->setTransparentColor($tc);
-				}
-				
-				if ($corners & WideImage::SIDE_TOP_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_TOP)
-					$result = $result->applyMask($corner, -1, -1);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_TOP_RIGHT || $corners & WideImage::SIDE_TOP || $corners & WideImage::SIDE_RIGHT)
-					$result = $result->applyMask($corner, $result->getWidth() - $corner->getWidth() + 1, -1, 100);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_BOTTOM_RIGHT || $corners & WideImage::SIDE_RIGHT || $corners & WideImage::SIDE_BOTTOM)
-					$result = $result->applyMask($corner, $result->getWidth() - $corner->getWidth() + 1, $result->getHeight() - $corner->getHeight() + 1, 100);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_BOTTOM_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_BOTTOM)
-					$result = $result->applyMask($corner, -1, $result->getHeight() - $corner->getHeight() + 1, 100);
-				
-				return $result;
-			}
-			else
-			{
-				$bg_color = $color;
-				
-				$corner->fill(0, 0, $bg_color);
-				$fg_color = $corner->allocateColorAlpha(127, 127, 127, 127);
-				$corner->getCanvas()->filledEllipse($radius * $sample_ratio, $radius * $sample_ratio, $radius * 2 * $sample_ratio, $radius * 2 * $sample_ratio, $fg_color);
-				$corner = $corner->resize($radius, $radius);
-				
-				$result = $image->copy();
-				if ($corners & WideImage::SIDE_TOP_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_TOP)
-					$result = $result->merge($corner, -1, -1, 100);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_TOP_RIGHT || $corners & WideImage::SIDE_TOP || $corners & WideImage::SIDE_RIGHT)
-					$result = $result->merge($corner, $result->getWidth() - $corner->getWidth() + 1, -1, 100);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_BOTTOM_RIGHT || $corners & WideImage::SIDE_RIGHT || $corners & WideImage::SIDE_BOTTOM)
-					$result = $result->merge($corner, $result->getWidth() - $corner->getWidth() + 1, $result->getHeight() - $corner->getHeight() + 1, 100);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_BOTTOM_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_BOTTOM)
-					$result = $result->merge($corner, -1, $result->getHeight() - $corner->getHeight() + 1, 100);
-				
-				return $result;
-			}
-		}
-	}
+            $corner = WideImage::createTrueColorImage($radius * $sample_ratio, $radius * $sample_ratio);
+            if ($color === null) {
+                imagepalettecopy($corner->getHandle(), $image->getHandle());
+                $bg_color = $corner->allocateColor(0, 0, 0);
+
+                $corner->fill(0, 0, $bg_color);
+                $fg_color = $corner->allocateColor(255, 255, 255);
+                $corner->getCanvas()->filledEllipse($radius * $sample_ratio, $radius * $sample_ratio, $radius * 2 * $sample_ratio, $radius * 2 * $sample_ratio, $fg_color);
+                $corner = $corner->resize($radius, $radius);
+
+                $result = $image->asTrueColor();
+
+                $tc = $result->getTransparentColor();
+                if ($tc == -1) {
+                    $tc = $result->allocateColorAlpha(255, 255, 255, 127);
+                    imagecolortransparent($result->getHandle(), $tc);
+                    $result->setTransparentColor($tc);
+                }
+
+                if ($corners & WideImage::SIDE_TOP_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_TOP) {
+                    $result = $result->applyMask($corner, -1, -1);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_TOP_RIGHT || $corners & WideImage::SIDE_TOP || $corners & WideImage::SIDE_RIGHT) {
+                    $result = $result->applyMask($corner, $result->getWidth() - $corner->getWidth() + 1, -1, 100);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_BOTTOM_RIGHT || $corners & WideImage::SIDE_RIGHT || $corners & WideImage::SIDE_BOTTOM) {
+                    $result = $result->applyMask($corner, $result->getWidth() - $corner->getWidth() + 1, $result->getHeight() - $corner->getHeight() + 1, 100);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_BOTTOM_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_BOTTOM) {
+                    $result = $result->applyMask($corner, -1, $result->getHeight() - $corner->getHeight() + 1, 100);
+                }
+
+                return $result;
+            } else {
+                $bg_color = $color;
+
+                $corner->fill(0, 0, $bg_color);
+                $fg_color = $corner->allocateColorAlpha(127, 127, 127, 127);
+                $corner->getCanvas()->filledEllipse($radius * $sample_ratio, $radius * $sample_ratio, $radius * 2 * $sample_ratio, $radius * 2 * $sample_ratio, $fg_color);
+                $corner = $corner->resize($radius, $radius);
+
+                $result = $image->copy();
+                if ($corners & WideImage::SIDE_TOP_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_TOP) {
+                    $result = $result->merge($corner, -1, -1, 100);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_TOP_RIGHT || $corners & WideImage::SIDE_TOP || $corners & WideImage::SIDE_RIGHT) {
+                    $result = $result->merge($corner, $result->getWidth() - $corner->getWidth() + 1, -1, 100);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_BOTTOM_RIGHT || $corners & WideImage::SIDE_RIGHT || $corners & WideImage::SIDE_BOTTOM) {
+                    $result = $result->merge($corner, $result->getWidth() - $corner->getWidth() + 1, $result->getHeight() - $corner->getHeight() + 1, 100);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_BOTTOM_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_BOTTOM) {
+                    $result = $result->merge($corner, -1, $result->getHeight() - $corner->getHeight() + 1, 100);
+                }
+
+                return $result;
+            }
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php
index 4c5087e39..f1d212b97 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php
@@ -1,135 +1,132 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     * Unsharp filter.
+     * 
+     * This filter was taken from http://vikjavev.no/computing/ump.php,
+     * the original author Torstein Hønsi. Adapted to fit better within
+     * the Wideimage package.
+     */
+    class WideImage_Operation_Unsharp
+    {
+        /**
+         * Returns sharpened image.
+         *
+         * @param WideImage_Image $image
+         * @param float           $amount
+         * @param int             $radius
+         * @param float           $threshold
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $amount, $radius, $threshold)
+        {
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Unsharp filter
-	 * 
-	 * This filter was taken from http://vikjavev.no/computing/ump.php,
-	 * the original author Torstein Hønsi. Adapted to fit better within
-	 * the Wideimage package.
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Unsharp {
-		/**
-		 * Returns sharpened image
-		 *
-		 * @param WideImage_Image $image
-		 * @param float $amount
-		 * @param int $radius
-		 * @param float $threshold
-		 * @return WideImage_Image
-		 */
-		function execute($image, $amount, $radius, $threshold) {
-			
-			// Attempt to calibrate the parameters to Photoshop:
-			if ($amount > 500)    $amount = 500;
-			$amount = $amount * 0.016;
-			if ($radius > 50)    $radius = 50;
-			$radius = $radius * 2;
-			if ($threshold > 255)    $threshold = 255;
-			
-			$radius = abs(round($radius));     // Only integers make sense.
-			if ($radius == 0) {
-				return $image;
-			}
-					
-			// Gaussian blur matrix
-	
-			$matrix = array(
-				array(1, 2, 1),
-				array(2, 4, 2),
-				array(1, 2, 1)
-			);
-			
-			$blurred = $image->applyConvolution($matrix, 16, 0);
-			
-			if($threshold > 0) {
-				// Calculate the difference between the blurred pixels and the original
-				// and set the pixels
-				for ($x = 0; $x < $image->getWidth(); $x++) {
-					for ($y = 0; $y < $image->getHeight(); $y++) {
-						$rgbOrig = $image->getRGBAt($x, $y);
-						$rOrig = $rgbOrig["red"];
-						$gOrig = $rgbOrig["green"];
-						$bOrig = $rgbOrig["blue"];
-						 
-						$rgbBlur = $blurred->getRGBAt($x, $y);
-						$rBlur = $rgbBlur["red"];
-						$gBlur = $rgbBlur["green"];
-						$bBlur = $rgbBlur["blue"];
-						
-						// When the masked pixels differ less from the original
-						// than the threshold specifies, they are set to their original value.
-						$rNew = (abs($rOrig - $rBlur) >= $threshold)  
-							? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig))  
-							: $rOrig;
-						$gNew = (abs($gOrig - $gBlur) >= $threshold)  
-							? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig))  
-							: $gOrig;
-						$bNew = (abs($bOrig - $bBlur) >= $threshold)  
-							? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig))  
-							: $bOrig;
-						$rgbNew = array("red" => $rNew, "green" => $gNew, "blue" => $bNew, "alpha" => 0);
-							
-						if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
-							$image->setRGBAt($x, $y, $rgbNew);
-						}
-					}
-				}
-			}
-			else {
-				$w = $image->getWidth();
-				$h = $image->getHeight();
-				for ($x = 0; $x < $w; $x++) {
-					for ($y = 0; $y < $h; $y++) {
-						$rgbOrig = $image->getRGBAt($x, $y);
-						$rOrig = $rgbOrig["red"];
-						$gOrig = $rgbOrig["green"];
-						$bOrig = $rgbOrig["blue"];
-						
-						$rgbBlur = $blurred->getRGBAt($x, $y);
-						$rBlur = $rgbBlur["red"];
-						$gBlur = $rgbBlur["green"];
-						$bBlur = $rgbBlur["blue"];
-						
-						$rNew = ($amount * ($rOrig - $rBlur)) + $rOrig;
-							if($rNew>255){$rNew=255;}
-							elseif($rNew<0){$rNew=0;}
-						$gNew = ($amount * ($gOrig - $gBlur)) + $gOrig;
-							if($gNew>255){$gNew=255;}
-							elseif($gNew<0){$gNew=0;}
-						$bNew = ($amount * ($bOrig - $bBlur)) + $bOrig;
-							if($bNew>255){$bNew=255;}
-							elseif($bNew<0){$bNew=0;}
-						$rgbNew = array("red" => $rNew, "green" => $gNew, "blue" => $bNew, "alpha" => 0);
-						
-						$image->setRGBAt($x, $y, $rgbNew);
-					}
-				}
-			}
-			
-			return $image;
-		}
-	}
+            // Attempt to calibrate the parameters to Photoshop:
+            if ($amount > 500) {
+                $amount = 500;
+            }
+            $amount = $amount * 0.016;
+            if ($radius > 50) {
+                $radius = 50;
+            }
+            $radius = $radius * 2;
+            if ($threshold > 255) {
+                $threshold = 255;
+            }
+
+            $radius = abs(round($radius));     // Only integers make sense.
+            if ($radius == 0) {
+                return $image;
+            }
+
+            // Gaussian blur matrix
+
+            $matrix = [
+                [1, 2, 1],
+                [2, 4, 2],
+                [1, 2, 1],
+            ];
+
+            $blurred = $image->applyConvolution($matrix, 16, 0);
+
+            if ($threshold > 0) {
+                // Calculate the difference between the blurred pixels and the original
+                // and set the pixels
+                for ($x = 0; $x < $image->getWidth(); $x++) {
+                    for ($y = 0; $y < $image->getHeight(); $y++) {
+                        $rgbOrig = $image->getRGBAt($x, $y);
+                        $rOrig = $rgbOrig['red'];
+                        $gOrig = $rgbOrig['green'];
+                        $bOrig = $rgbOrig['blue'];
+
+                        $rgbBlur = $blurred->getRGBAt($x, $y);
+                        $rBlur = $rgbBlur['red'];
+                        $gBlur = $rgbBlur['green'];
+                        $bBlur = $rgbBlur['blue'];
+
+                        // When the masked pixels differ less from the original
+                        // than the threshold specifies, they are set to their original value.
+                        $rNew = (abs($rOrig - $rBlur) >= $threshold)
+                            ? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig))
+                            : $rOrig;
+                        $gNew = (abs($gOrig - $gBlur) >= $threshold)
+                            ? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig))
+                            : $gOrig;
+                        $bNew = (abs($bOrig - $bBlur) >= $threshold)
+                            ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig))
+                            : $bOrig;
+                        $rgbNew = ['red' => $rNew, 'green' => $gNew, 'blue' => $bNew, 'alpha' => 0];
+
+                        if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
+                            $image->setRGBAt($x, $y, $rgbNew);
+                        }
+                    }
+                }
+            } else {
+                $w = $image->getWidth();
+                $h = $image->getHeight();
+                for ($x = 0; $x < $w; $x++) {
+                    for ($y = 0; $y < $h; $y++) {
+                        $rgbOrig = $image->getRGBAt($x, $y);
+                        $rOrig = $rgbOrig['red'];
+                        $gOrig = $rgbOrig['green'];
+                        $bOrig = $rgbOrig['blue'];
+
+                        $rgbBlur = $blurred->getRGBAt($x, $y);
+                        $rBlur = $rgbBlur['red'];
+                        $gBlur = $rgbBlur['green'];
+                        $bBlur = $rgbBlur['blue'];
+
+                        $rNew = ($amount * ($rOrig - $rBlur)) + $rOrig;
+                        if ($rNew > 255) {
+                            $rNew = 255;
+                        } elseif ($rNew < 0) {
+                            $rNew = 0;
+                        }
+                        $gNew = ($amount * ($gOrig - $gBlur)) + $gOrig;
+                        if ($gNew > 255) {
+                            $gNew = 255;
+                        } elseif ($gNew < 0) {
+                            $gNew = 0;
+                        }
+                        $bNew = ($amount * ($bOrig - $bBlur)) + $bOrig;
+                        if ($bNew > 255) {
+                            $bNew = 255;
+                        } elseif ($bNew < 0) {
+                            $bNew = 0;
+                        }
+                        $rgbNew = ['red' => $rNew, 'green' => $gNew, 'blue' => $bNew, 'alpha' => 0];
+
+                        $image->setRGBAt($x, $y, $rgbNew);
+                    }
+                }
+            }
+
+            return $image;
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php b/public/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php
index 3a5f36c49..456e76058 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php
@@ -1,57 +1,38 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    /**
+     */
+    class WideImage_UnknownImageOperationException extends WideImage_Exception
+    {
+    }
 
-	* @package Internals
-  **/
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_UnknownImageOperationException extends WideImage_Exception {}
-	
-	/**
-	 * Operation factory
-	 * 
-	 * @package Internals
-	 **/
-	class WideImage_OperationFactory
-	{
-		static protected $cache = array();
-		
-		static function get($operationName)
-		{
-			$lcname = strtolower($operationName);
-			if (!isset(self::$cache[$lcname]))
-			{
-				$opClassName = "WideImage_Operation_" . ucfirst($operationName);
-				if (!class_exists($opClassName, false))
-				{
-					$fileName = WideImage::path() . 'Operation/' . ucfirst($operationName) . '.php';
-					if (file_exists($fileName))
-						require_once $fileName;
-					elseif (!class_exists($opClassName))
-						throw new WideImage_UnknownImageOperationException("Can't load '{$operationName}' operation.");
-				}
-				self::$cache[$lcname] = new $opClassName();
-			}
-			return self::$cache[$lcname];
-		}
-	}
+    /**
+     * Operation factory.
+     **/
+    class WideImage_OperationFactory
+    {
+        protected static $cache = [];
+
+        public static function get($operationName)
+        {
+            $lcname = strtolower($operationName);
+            if (!isset(self::$cache[$lcname])) {
+                $opClassName = 'WideImage_Operation_'.ucfirst($operationName);
+                if (!class_exists($opClassName, false)) {
+                    $fileName = WideImage::path().'Operation/'.ucfirst($operationName).'.php';
+                    if (file_exists($fileName)) {
+                        require_once $fileName;
+                    } elseif (!class_exists($opClassName)) {
+                        throw new WideImage_UnknownImageOperationException("Can't load '{$operationName}' operation.");
+                    }
+                }
+                self::$cache[$lcname] = new $opClassName();
+            }
+
+            return self::$cache[$lcname];
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php b/public/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php
index c1e287156..f39253d73 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php
@@ -1,136 +1,130 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-	
-	/**
-	 * @package WideImage
-	 */
-	class WideImage_PaletteImage extends WideImage_Image
-	{
-		/**
-		 * Create a palette image
-		 *
-		 * @param int $width
-		 * @param int $height
-		 * @return WideImage_PaletteImage
-		 */
-		static function create($width, $height)
-		{
-			if ($width * $height <= 0 || $width < 0)
-				throw new WideImage_InvalidImageDimensionException("Can't create an image with dimensions [$width, $height].");
-			
-			return new WideImage_PaletteImage(imagecreate($width, $height));
-		}
-		
-		function doCreate($width, $height)
-		{
-			return self::create($width, $height);
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#isTrueColor()
-		 */
-		function isTrueColor()
-		{
-			return false;
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#asPalette($nColors, $dither, $matchPalette)
-		 */
-		function asPalette($nColors = 255, $dither = null, $matchPalette = true)
-		{
-			return $this->copy();
-		}
-		
-		/**
-		 * Returns a copy of the image
-		 * 
-		 * @param $trueColor True if the new image should be truecolor
-		 * @return WideImage_Image
-		 */
-		protected function copyAsNew($trueColor = false)
-		{
-			$width = $this->getWidth();
-			$height = $this->getHeight();
-			
-			if ($trueColor)
-				$new = WideImage_TrueColorImage::create($width, $height);
-			else
-				$new = WideImage_PaletteImage::create($width, $height);
-			
-			// copy transparency of source to target
-			if ($this->isTransparent())
-			{
-				$rgb = $this->getTransparentColorRGB();
-				if (is_array($rgb))
-				{
-					$tci = $new->allocateColor($rgb['red'], $rgb['green'], $rgb['blue']);
-					$new->fill(0, 0, $tci);
-					$new->setTransparentColor($tci);
-				}
-			}
-			
-			imageCopy($new->getHandle(), $this->handle, 0, 0, 0, 0, $width, $height);
-			return $new;
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#asTrueColor()
-		 */
-		function asTrueColor()
-		{
-			$width = $this->getWidth();
-			$height = $this->getHeight();
-			$new = WideImage::createTrueColorImage($width, $height);
-			if ($this->isTransparent())
-				$new->copyTransparencyFrom($this);
-			if (!imageCopy($new->getHandle(), $this->handle, 0, 0, 0, 0, $width, $height))
-				throw new WideImage_GDFunctionResultException("imagecopy() returned false");
-			return $new;
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#getChannels()
-		 */
-		function getChannels()
-		{
-			$args = func_get_args();
-			if (count($args) == 1 && is_array($args[0]))
-				$args = $args[0];
-			return WideImage_OperationFactory::get('CopyChannelsPalette')->execute($this, $args);
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#copyNoAlpha()
-		 */
-		function copyNoAlpha()
-		{
-			return WideImage_Image::loadFromString($this->asString('png'));
-		}
-	}
+    /**
+     */
+    class WideImage_PaletteImage extends WideImage_Image
+    {
+        /**
+         * Create a palette image.
+         *
+         * @param int $width
+         * @param int $height
+         *
+         * @return WideImage_PaletteImage
+         */
+        public static function create($width, $height)
+        {
+            if ($width * $height <= 0 || $width < 0) {
+                throw new WideImage_InvalidImageDimensionException("Can't create an image with dimensions [$width, $height].");
+            }
+
+            return new self(imagecreate($width, $height));
+        }
+
+        public function doCreate($width, $height)
+        {
+            return self::create($width, $height);
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#isTrueColor()
+         */
+        public function isTrueColor()
+        {
+            return false;
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#asPalette($nColors, $dither, $matchPalette)
+         */
+        public function asPalette($nColors = 255, $dither = null, $matchPalette = true)
+        {
+            return $this->copy();
+        }
+
+        /**
+         * Returns a copy of the image.
+         * 
+         * @param $trueColor True if the new image should be truecolor
+         *
+         * @return WideImage_Image
+         */
+        protected function copyAsNew($trueColor = false)
+        {
+            $width = $this->getWidth();
+            $height = $this->getHeight();
+
+            if ($trueColor) {
+                $new = WideImage_TrueColorImage::create($width, $height);
+            } else {
+                $new = self::create($width, $height);
+            }
+
+            // copy transparency of source to target
+            if ($this->isTransparent()) {
+                $rgb = $this->getTransparentColorRGB();
+                if (is_array($rgb)) {
+                    $tci = $new->allocateColor($rgb['red'], $rgb['green'], $rgb['blue']);
+                    $new->fill(0, 0, $tci);
+                    $new->setTransparentColor($tci);
+                }
+            }
+
+            imagecopy($new->getHandle(), $this->handle, 0, 0, 0, 0, $width, $height);
+
+            return $new;
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#asTrueColor()
+         */
+        public function asTrueColor()
+        {
+            $width = $this->getWidth();
+            $height = $this->getHeight();
+            $new = WideImage::createTrueColorImage($width, $height);
+            if ($this->isTransparent()) {
+                $new->copyTransparencyFrom($this);
+            }
+            if (!imagecopy($new->getHandle(), $this->handle, 0, 0, 0, 0, $width, $height)) {
+                throw new WideImage_GDFunctionResultException('imagecopy() returned false');
+            }
+
+            return $new;
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#getChannels()
+         */
+        public function getChannels()
+        {
+            $args = func_get_args();
+            if (count($args) == 1 && is_array($args[0])) {
+                $args = $args[0];
+            }
+
+            return WideImage_OperationFactory::get('CopyChannelsPalette')->execute($this, $args);
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#copyNoAlpha()
+         */
+        public function copyNoAlpha()
+        {
+            return WideImage_Image::loadFromString($this->asString('png'));
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php b/public/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php
index a4addcdfa..00fbcc4da 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php
@@ -1,218 +1,218 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  **/
-	
-	/**
-	 * A class for truecolor image objects
-	 * 
-	 * @package WideImage
-	 */
-	class WideImage_TrueColorImage extends WideImage_Image
-	{
-		/**
-		 * Creates the object
-		 *
-		 * @param resource $handle
-		 */
-		function __construct($handle)
-		{
-			parent::__construct($handle);
-			$this->alphaBlending(false);
-			$this->saveAlpha(true);
-		}
-		
-		/**
-		 * Factory method that creates a true-color image object
-		 *
-		 * @param int $width
-		 * @param int $height
-		 * @return WideImage_TrueColorImage
-		 */
-		static function create($width, $height)
-		{
-			if ($width * $height <= 0 || $width < 0)
-				throw new WideImage_InvalidImageDimensionException("Can't create an image with dimensions [$width, $height].");
-			
-			return new WideImage_TrueColorImage(imagecreatetruecolor($width, $height));
-		}
-		
-		function doCreate($width, $height)
-		{
-			return self::create($width, $height);
-		}
-		
-		function isTrueColor()
-		{
-			return true;
-		}
-		
-		/**
-		 * Sets alpha blending mode via imagealphablending()
-		 *
-		 * @param bool $mode
-		 * @return bool
-		 */
-		function alphaBlending($mode)
-		{
-			return imagealphablending($this->handle, $mode);
-		}
-		
-		/**
-		 * Toggle if alpha channel should be saved with the image via imagesavealpha()
-		 *
-		 * @param bool $on
-		 * @return bool
-		 */
-		function saveAlpha($on)
-		{
-			return imagesavealpha($this->handle, $on);
-		}
-		
-		/**
-		 * Allocates a color and returns its index
-		 * 
-		 * This method accepts either each component as an integer value,
-		 * or an associative array that holds the color's components in keys
-		 * 'red', 'green', 'blue', 'alpha'.
-		 *
-		 * @param mixed $R
-		 * @param int $G
-		 * @param int $B
-		 * @param int $A
-		 * @return int
-		 */
-		function allocateColorAlpha($R, $G = null, $B = null, $A = null)
-		{
-			if (is_array($R))
-				return imageColorAllocateAlpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
-			else
-				return imageColorAllocateAlpha($this->handle, $R, $G, $B, $A);
-		}
-		
-		/**
-		 * @see WideImage_Image#asPalette($nColors, $dither, $matchPalette)
-		 */
-		function asPalette($nColors = 255, $dither = null, $matchPalette = true)
-		{
-			$nColors = intval($nColors);
-			if ($nColors < 1)
-				$nColors = 1;
-			elseif ($nColors > 255)
-				$nColors = 255;
-			
-			if ($dither === null)
-				$dither = $this->isTransparent();
-			
-			$temp = $this->copy();
-			imagetruecolortopalette($temp->handle, $dither, $nColors);
-			if ($matchPalette == true && function_exists('imagecolormatch'))
-				imagecolormatch($this->handle, $temp->handle);
-			
-			// The code below isn't working properly; it corrupts transparency on some palette->tc->palette conversions.
-			// Why is this code here?
-			/*
-			if ($this->isTransparent())
-			{
-				$trgb = $this->getTransparentColorRGB();
-				$tci = $temp->getClosestColor($trgb);
-				$temp->setTransparentColor($tci);
-			}
-			/**/
-			
-			$temp->releaseHandle();
-			return new WideImage_PaletteImage($temp->handle);
-		}
-		
-		/**
-		 * Returns the index of the color that best match the given color components
-		 *
-		 * This method accepts either each component as an integer value,
-		 * or an associative array that holds the color's components in keys
-		 * 'red', 'green', 'blue', 'alpha'.
-		 *
-		 * @param mixed $R Red component value or an associative array
-		 * @param int $G Green component
-		 * @param int $B Blue component
-		 * @param int $A Alpha component
-		 * @return int The color index
-		 */
-		function getClosestColorAlpha($R, $G = null, $B = null, $A = null)
-		{
-			if (is_array($R))
-				return imagecolorclosestalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
-			else
-				return imagecolorclosestalpha($this->handle, $R, $G, $B, $A);
-		}
-		
-		/**
-		 * Returns the index of the color that exactly match the given color components
-		 *
-		 * This method accepts either each component as an integer value,
-		 * or an associative array that holds the color's components in keys
-		 * 'red', 'green', 'blue', 'alpha'.
-		 *
-		 * @param mixed $R Red component value or an associative array
-		 * @param int $G Green component
-		 * @param int $B Blue component
-		 * @param int $A Alpha component
-		 * @return int The color index
-		 */
-		function getExactColorAlpha($R, $G = null, $B = null, $A = null)
-		{
-			if (is_array($R))
-				return imagecolorexactalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
-			else
-				return imagecolorexactalpha($this->handle, $R, $G, $B, $A);
-		}
-		
-		/**
-		 * @see WideImage_Image#getChannels()
-		 */
-		function getChannels()
-		{
-			$args = func_get_args();
-			if (count($args) == 1 && is_array($args[0]))
-				$args = $args[0];
-			return WideImage_OperationFactory::get('CopyChannelsTrueColor')->execute($this, $args);
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#copyNoAlpha()
-		 */
-		function copyNoAlpha()
-		{
-			$prev = $this->saveAlpha(false);
-			$result = WideImage_Image::loadFromString($this->asString('png'));
-			$this->saveAlpha($prev);
-			//$result->releaseHandle();
-			return $result;
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#asTrueColor()
-		 */
-		function asTrueColor()
-		{
-			return $this->copy();
-		}
-	}
+    /**
+     * A class for truecolor image objects.
+     */
+    class WideImage_TrueColorImage extends WideImage_Image
+    {
+        /**
+         * Creates the object.
+         *
+         * @param resource $handle
+         */
+        public function __construct($handle)
+        {
+            parent::__construct($handle);
+            $this->alphaBlending(false);
+            $this->saveAlpha(true);
+        }
+
+        /**
+         * Factory method that creates a true-color image object.
+         *
+         * @param int $width
+         * @param int $height
+         *
+         * @return WideImage_TrueColorImage
+         */
+        public static function create($width, $height)
+        {
+            if ($width * $height <= 0 || $width < 0) {
+                throw new WideImage_InvalidImageDimensionException("Can't create an image with dimensions [$width, $height].");
+            }
+
+            return new self(imagecreatetruecolor($width, $height));
+        }
+
+        public function doCreate($width, $height)
+        {
+            return self::create($width, $height);
+        }
+
+        public function isTrueColor()
+        {
+            return true;
+        }
+
+        /**
+         * Sets alpha blending mode via imagealphablending().
+         *
+         * @param bool $mode
+         *
+         * @return bool
+         */
+        public function alphaBlending($mode)
+        {
+            return imagealphablending($this->handle, $mode);
+        }
+
+        /**
+         * Toggle if alpha channel should be saved with the image via imagesavealpha().
+         *
+         * @param bool $on
+         *
+         * @return bool
+         */
+        public function saveAlpha($on)
+        {
+            return imagesavealpha($this->handle, $on);
+        }
+
+        /**
+         * Allocates a color and returns its index.
+         * 
+         * This method accepts either each component as an integer value,
+         * or an associative array that holds the color's components in keys
+         * 'red', 'green', 'blue', 'alpha'.
+         *
+         * @param mixed $R
+         * @param int   $G
+         * @param int   $B
+         * @param int   $A
+         *
+         * @return int
+         */
+        public function allocateColorAlpha($R, $G = null, $B = null, $A = null)
+        {
+            if (is_array($R)) {
+                return imagecolorallocatealpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
+            } else {
+                return imagecolorallocatealpha($this->handle, $R, $G, $B, $A);
+            }
+        }
+
+        /**
+         * @see WideImage_Image#asPalette($nColors, $dither, $matchPalette)
+         */
+        public function asPalette($nColors = 255, $dither = null, $matchPalette = true)
+        {
+            $nColors = intval($nColors);
+            if ($nColors < 1) {
+                $nColors = 1;
+            } elseif ($nColors > 255) {
+                $nColors = 255;
+            }
+
+            if ($dither === null) {
+                $dither = $this->isTransparent();
+            }
+
+            $temp = $this->copy();
+            imagetruecolortopalette($temp->handle, $dither, $nColors);
+            if ($matchPalette == true && function_exists('imagecolormatch')) {
+                imagecolormatch($this->handle, $temp->handle);
+            }
+
+            // The code below isn't working properly; it corrupts transparency on some palette->tc->palette conversions.
+            // Why is this code here?
+            /*
+            if ($this->isTransparent())
+            {
+                $trgb = $this->getTransparentColorRGB();
+                $tci = $temp->getClosestColor($trgb);
+                $temp->setTransparentColor($tci);
+            }
+            /**/
+
+            $temp->releaseHandle();
+
+            return new WideImage_PaletteImage($temp->handle);
+        }
+
+        /**
+         * Returns the index of the color that best match the given color components.
+         *
+         * This method accepts either each component as an integer value,
+         * or an associative array that holds the color's components in keys
+         * 'red', 'green', 'blue', 'alpha'.
+         *
+         * @param mixed $R Red component value or an associative array
+         * @param int   $G Green component
+         * @param int   $B Blue component
+         * @param int   $A Alpha component
+         *
+         * @return int The color index
+         */
+        public function getClosestColorAlpha($R, $G = null, $B = null, $A = null)
+        {
+            if (is_array($R)) {
+                return imagecolorclosestalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
+            } else {
+                return imagecolorclosestalpha($this->handle, $R, $G, $B, $A);
+            }
+        }
+
+        /**
+         * Returns the index of the color that exactly match the given color components.
+         *
+         * This method accepts either each component as an integer value,
+         * or an associative array that holds the color's components in keys
+         * 'red', 'green', 'blue', 'alpha'.
+         *
+         * @param mixed $R Red component value or an associative array
+         * @param int   $G Green component
+         * @param int   $B Blue component
+         * @param int   $A Alpha component
+         *
+         * @return int The color index
+         */
+        public function getExactColorAlpha($R, $G = null, $B = null, $A = null)
+        {
+            if (is_array($R)) {
+                return imagecolorexactalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
+            } else {
+                return imagecolorexactalpha($this->handle, $R, $G, $B, $A);
+            }
+        }
+
+        /**
+         * @see WideImage_Image#getChannels()
+         */
+        public function getChannels()
+        {
+            $args = func_get_args();
+            if (count($args) == 1 && is_array($args[0])) {
+                $args = $args[0];
+            }
+
+            return WideImage_OperationFactory::get('CopyChannelsTrueColor')->execute($this, $args);
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#copyNoAlpha()
+         */
+        public function copyNoAlpha()
+        {
+            $prev = $this->saveAlpha(false);
+            $result = WideImage_Image::loadFromString($this->asString('png'));
+            $this->saveAlpha($prev);
+            //$result->releaseHandle();
+            return $result;
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#asTrueColor()
+         */
+        public function asTrueColor()
+        {
+            return $this->copy();
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/WideImage.php b/public/filemanager/connectors/php/inc/wideimage/lib/WideImage.php
index fd5419f5d..1583b34ea 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/WideImage.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/WideImage.php
@@ -1,377 +1,376 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+     **/
+    require_once WideImage::path().'Exception.php';
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-	
-	require_once WideImage::path() . 'Exception.php';
-	
-	require_once WideImage::path() . 'Image.php';
-	require_once WideImage::path() . 'TrueColorImage.php';
-	require_once WideImage::path() . 'PaletteImage.php';
-	
-	require_once WideImage::path() . 'Coordinate.php';
-	require_once WideImage::path() . 'Canvas.php';
-	require_once WideImage::path() . 'MapperFactory.php';
-	require_once WideImage::path() . 'OperationFactory.php';
-	
-	require_once WideImage::path() . 'Font/TTF.php';
-	require_once WideImage::path() . 'Font/GDF.php';
-	require_once WideImage::path() . 'Font/PS.php';
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidImageHandleException extends WideImage_Exception {}
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidImageSourceException extends WideImage_Exception {}
-	
-	/**
-	 * @package Exceptions
-	 * 
-	 * Class for invalid GD function calls result (for example those that return bool)
-	 */
-	class WideImage_GDFunctionResultException extends WideImage_Exception {}
-	
-	/**
-	 * The gateway class for loading images and core library functions
-	 *
-	 * @package WideImage
-	 */
-	class WideImage
-	{
-		const SIDE_TOP_LEFT = 1;
-		const SIDE_TOP = 2;
-		const SIDE_TOP_RIGHT = 4;
-		const SIDE_RIGHT = 8;
-		const SIDE_BOTTOM_RIGHT = 16;
-		const SIDE_BOTTOM = 32;
-		const SIDE_BOTTOM_LEFT = 64;
-		const SIDE_LEFT = 128;
-		const SIDE_ALL = 255;
-		
-		/**
-		 * @var string Path to the library base directory
-		 */
-		protected static $path = null;
-		
-		/**
-		 * Returns the library version
-		 * @return string The library version
-		 */
-		static function version()
-		{
-			return '11.02.19';
-		}
-		
-		/**
-		 * Returns the path to the library
-		 * @return string
-		 */
-		static function path()
-		{
-			if (self::$path === null)
-				self::$path = dirname(__FILE__) . DIRECTORY_SEPARATOR;
-			return self::$path;
-		}
-		
-		/**
-		 * Checks whether the gd library is loaded, and throws an exception otherwise
-		 */
-		static function checkGD()
-		{
-			if (!extension_loaded('gd'))
-				throw new WideImage_Exception("WideImage requires the GD extension, but it's apparently not loaded.");
-		}
-		
-		/**
-		 * Registers a custom mapper for image loading and saving
-		 * 
-		 * Example:
-		 * <code>
-		 * 	WideImage::registerCustomMapper('WideImage_Mapper_TGA', 'image/tga', 'tga');
-		 * </code>
-		 * 
-		 * @param string $mapper_class_name
-		 * @param string $mime_type
-		 * @param string $extension
-		 */
-		static function registerCustomMapper($mapper_class_name, $mime_type, $extension)
-		{
-			WideImage_MapperFactory::registerMapper($mapper_class_name, $mime_type, strtoupper($extension));
-		}
-		
-		/**
-		 * Loads an image from a file, URL, HTML input file field, binary string, or a valid image handle.
-		 * The image format is auto-detected. 
-		 * 
-		 * Currently supported formats: PNG, GIF, JPG, BMP, TGA, GD, GD2.
-		 * 
-		 * This function analyzes the input and decides whether to use WideImage::loadFromHandle(),
-		 * WideImage::loadFromFile(), WideImage::loadFromUpload() or WideImage::loadFromString(),
-		 * all of which you can also call directly to spare WideImage some guessing.
-		 * 
-		 * Arrays are supported for upload fields; it returns an array of loaded images. 
-		 * To load only a single image from an array field, use WideImage::loadFromUpload('img', $i), 
-		 * where $i is the index of the image you want to load.
-		 * 
-		 * <code>
-		 * $img = WideImage::load('http://url/image.png'); // image URL
-		 * $img = WideImage::load('/path/to/image.png'); // local file path
-		 * $img = WideImage::load('img'); // upload field name
-		 * $img = WideImage::load(imagecreatetruecolor(10, 10)); // a GD resource
-		 * $img = WideImage::load($image_data); // binary string containing image data
-		 * </code>
-		 * 
-		 * @param mixed $source File name, url, HTML file input field name, binary string, or a GD image resource
-		 * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
-		 */
-		static function load($source)
-		{
-			$predictedSourceType = '';
-			
-			if ($source == '')
-				$predictedSourceType = 'String';
-			
-			// Creating image via a valid resource
-			if (!$predictedSourceType && self::isValidImageHandle($source))
-				$predictedSourceType = 'Handle';
-			
-			// Check for binary string
-			if (!$predictedSourceType)
-			{
-				// search first $binLength bytes (at a maximum) for ord<32 characters (binary image data)
-				$binLength = 64;
-				$sourceLength = strlen($source);
-				$maxlen = ($sourceLength > $binLength) ? $binLength : $sourceLength;
-				for ($i = 0; $i < $maxlen; $i++)
-					if (ord($source[$i]) < 32)
-					{
-						$predictedSourceType = 'String';
-						break;
-					}
-			}
-			
-			// Uploaded image (array uploads not supported)
-			if (isset($_FILES[$source]) && isset($_FILES[$source]['tmp_name']))
-				$predictedSourceType = 'Upload';
-			
-			// Otherwise, must be a file or an URL
-			if (!$predictedSourceType)
-				$predictedSourceType = 'File';
-			
-			return call_user_func(array('WideImage', 'loadFrom' . $predictedSourceType), $source);
-		}
-		
-		/**
-		 * Create and load an image from a file or URL. The image format is auto-detected.
-		 * 
-		 * @param string $uri File or url
-		 * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
-		 */
-		static function loadFromFile($uri)
-		{
-			$data = file_get_contents($uri);
-			$handle = @imagecreatefromstring($data);
-			if (!self::isValidImageHandle($handle))
-			{
-				try
-				{
-					// try to find a mapper first
-					$mapper = WideImage_MapperFactory::selectMapper($uri);
-					if ($mapper)
-						$handle = $mapper->load($uri);
-				}
-				catch (WideImage_UnsupportedFormatException $e)
-				{
-					// mapper not found
-				}
-				
-				// try all custom mappers
-				if (!self::isValidImageHandle($handle))
-				{
-					$custom_mappers = WideImage_MapperFactory::getCustomMappers();
-					foreach ($custom_mappers as $mime_type => $mapper_class)
-					{
-						$mapper = WideImage_MapperFactory::selectMapper(null, $mime_type);
-						$handle = $mapper->loadFromString($data);
-						if (self::isValidImageHandle($handle))
-							break;
-					}
-				}
-			}
-			
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageSourceException("File '{$uri}' appears to be an invalid image source.");
-			
-			return self::loadFromHandle($handle);
-		}
-		
-		/**
-		 * Create and load an image from a string. Format is auto-detected.
-		 * 
-		 * @param string $string Binary data, i.e. from BLOB field in the database
-		 * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
-		 */
-		static function loadFromString($string)
-		{
-			if (strlen($string) < 128)
-				throw new WideImage_InvalidImageSourceException("String doesn't contain image data.");
-			
-			$handle = @imagecreatefromstring($string);
-			if (!self::isValidImageHandle($handle))
-			{
-				$custom_mappers = WideImage_MapperFactory::getCustomMappers();
-				foreach ($custom_mappers as $mime_type => $mapper_class)
-				{
-					$mapper = WideImage_MapperFactory::selectMapper(null, $mime_type);
-					$handle = $mapper->loadFromString($string);
-					if (self::isValidImageHandle($handle))
-						break;
-				}
-			}
-			
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageSourceException("String doesn't contain valid image data.");
-			
-			return self::loadFromHandle($handle);
-		}
-		
-		/**
-		 * Create and load an image from an image handle.
-		 * 
-		 * <b>Note:</b> the resulting image object takes ownership of the passed 
-		 * handle. When the newly-created image object is destroyed, the handle is 
-		 * destroyed too, so it's not a valid image handle anymore. In order to 
-		 * preserve the handle for use after object destruction, you have to call 
-		 * WideImage_Image::releaseHandle() on the created image instance prior to its
-		 * destruction.
-		 * 
-		 * <code>
-		 * $handle = imagecreatefrompng('file.png');
-		 * $image = WideImage::loadFromHandle($handle);
-		 * </code>
-		 * 
-		 * @param resource $handle A valid GD image resource
-		 * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
-		 */
-		static function loadFromHandle($handle)
-		{
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageSourceException("Handle is not a valid GD image resource.");
-			
-			if (imageistruecolor($handle))
-				return new WideImage_TrueColorImage($handle);
-			else
-				return new WideImage_PaletteImage($handle);
-		}
-		
-		/**
-		 * This method loads a file from the $_FILES array. The image format is auto-detected.
-		 * 
-		 * You only have to pass the field name as the parameter. For array fields, this function will
-		 * return an array of image objects, unless you specify the $index parameter, which will
-		 * load the desired image.
-		 * 
-		 * @param $field_name Name of the key in $_FILES array
-		 * @param int $index The index of the file to load (if the input field is an array)
-		 * @return WideImage_Image The loaded image
-		 */
-		static function loadFromUpload($field_name, $index = null)
-		{
-			if (!array_key_exists($field_name, $_FILES))
-				throw new WideImage_InvalidImageSourceException("Upload field '{$field_name}' doesn't exist.");
-			
-			if (is_array($_FILES[$field_name]['tmp_name']))
-			{
-				if (isset($_FILES[$field_name]['tmp_name'][$index]))
-					$filename = $_FILES[$field_name]['tmp_name'][$index];
-				else
-				{
-					$result = array();
-					foreach ($_FILES[$field_name]['tmp_name'] as $idx => $tmp_name)
-						$result[$idx] = self::loadFromFile($tmp_name);
-					return $result;
-				}
-			}
-			else
-				$filename = $_FILES[$field_name]['tmp_name'];
-			
-			if (!file_exists($filename))
-				throw new WideImage_InvalidImageSourceException("Uploaded file doesn't exist.");
-			return self::loadFromFile($filename);
-		}
-		
-		/**
-		 * Factory method for creating a palette image
-		 * 
-		 * @param int $width
-		 * @param int $height
-		 * @return WideImage_PaletteImage
-		 */
-		static function createPaletteImage($width, $height)
-		{
-			return WideImage_PaletteImage::create($width, $height);
-		}
-		
-		/**
-		 * Factory method for creating a true-color image
-		 * 
-		 * @param int $width
-		 * @param int $height
-		 * @return WideImage_TrueColorImage
-		 */
-		static function createTrueColorImage($width, $height)
-		{
-			return WideImage_TrueColorImage::create($width, $height);
-		}
-		
-		/**
-		 * Check whether the given handle is a valid GD resource
-		 * 
-		 * @param mixed $handle The variable to check
-		 * @return bool
-		 */
-		static function isValidImageHandle($handle)
-		{
-			return (is_resource($handle) && get_resource_type($handle) == 'gd');
-		}
-		
-		/**
-		 * Throws exception if the handle isn't a valid GD resource
-		 * 
-		 * @param mixed $handle The variable to check
-		 */
-		static function assertValidImageHandle($handle)
-		{
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageHandleException("{$handle} is not a valid image handle.");
-		}
-	}
-	
-	WideImage::checkGD();
-	
-	WideImage::registerCustomMapper('WideImage_Mapper_BMP', 'image/bmp', 'bmp');
-	WideImage::registerCustomMapper('WideImage_Mapper_TGA', 'image/tga', 'tga');
-	
\ No newline at end of file
+    require_once WideImage::path().'Image.php';
+    require_once WideImage::path().'TrueColorImage.php';
+    require_once WideImage::path().'PaletteImage.php';
+
+    require_once WideImage::path().'Coordinate.php';
+    require_once WideImage::path().'Canvas.php';
+    require_once WideImage::path().'MapperFactory.php';
+    require_once WideImage::path().'OperationFactory.php';
+
+    require_once WideImage::path().'Font/TTF.php';
+    require_once WideImage::path().'Font/GDF.php';
+    require_once WideImage::path().'Font/PS.php';
+
+    /**
+     */
+    class WideImage_InvalidImageHandleException extends WideImage_Exception
+    {
+    }
+
+    /**
+     */
+    class WideImage_InvalidImageSourceException extends WideImage_Exception
+    {
+    }
+
+    /**
+     */
+    class WideImage_GDFunctionResultException extends WideImage_Exception
+    {
+    }
+
+    /**
+     * The gateway class for loading images and core library functions.
+     */
+    class WideImage
+    {
+        const SIDE_TOP_LEFT = 1;
+        const SIDE_TOP = 2;
+        const SIDE_TOP_RIGHT = 4;
+        const SIDE_RIGHT = 8;
+        const SIDE_BOTTOM_RIGHT = 16;
+        const SIDE_BOTTOM = 32;
+        const SIDE_BOTTOM_LEFT = 64;
+        const SIDE_LEFT = 128;
+        const SIDE_ALL = 255;
+
+        /**
+         * @var string Path to the library base directory
+         */
+        protected static $path = null;
+
+        /**
+         * Returns the library version.
+         *
+         * @return string The library version
+         */
+        public static function version()
+        {
+            return '11.02.19';
+        }
+
+        /**
+         * Returns the path to the library.
+         *
+         * @return string
+         */
+        public static function path()
+        {
+            if (self::$path === null) {
+                self::$path = dirname(__FILE__).DIRECTORY_SEPARATOR;
+            }
+
+            return self::$path;
+        }
+
+        /**
+         * Checks whether the gd library is loaded, and throws an exception otherwise.
+         */
+        public static function checkGD()
+        {
+            if (!extension_loaded('gd')) {
+                throw new WideImage_Exception("WideImage requires the GD extension, but it's apparently not loaded.");
+            }
+        }
+
+        /**
+         * Registers a custom mapper for image loading and saving.
+         * 
+         * Example:
+         * <code>
+         * 	WideImage::registerCustomMapper('WideImage_Mapper_TGA', 'image/tga', 'tga');
+         * </code>
+         * 
+         * @param string $mapper_class_name
+         * @param string $mime_type
+         * @param string $extension
+         */
+        public static function registerCustomMapper($mapper_class_name, $mime_type, $extension)
+        {
+            WideImage_MapperFactory::registerMapper($mapper_class_name, $mime_type, strtoupper($extension));
+        }
+
+        /**
+         * Loads an image from a file, URL, HTML input file field, binary string, or a valid image handle.
+         * The image format is auto-detected. 
+         * 
+         * Currently supported formats: PNG, GIF, JPG, BMP, TGA, GD, GD2.
+         * 
+         * This function analyzes the input and decides whether to use WideImage::loadFromHandle(),
+         * WideImage::loadFromFile(), WideImage::loadFromUpload() or WideImage::loadFromString(),
+         * all of which you can also call directly to spare WideImage some guessing.
+         * 
+         * Arrays are supported for upload fields; it returns an array of loaded images. 
+         * To load only a single image from an array field, use WideImage::loadFromUpload('img', $i), 
+         * where $i is the index of the image you want to load.
+         * 
+         * <code>
+         * $img = WideImage::load('http://url/image.png'); // image URL
+         * $img = WideImage::load('/path/to/image.png'); // local file path
+         * $img = WideImage::load('img'); // upload field name
+         * $img = WideImage::load(imagecreatetruecolor(10, 10)); // a GD resource
+         * $img = WideImage::load($image_data); // binary string containing image data
+         * </code>
+         * 
+         * @param mixed $source File name, url, HTML file input field name, binary string, or a GD image resource
+         *
+         * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
+         */
+        public static function load($source)
+        {
+            $predictedSourceType = '';
+
+            if ($source == '') {
+                $predictedSourceType = 'String';
+            }
+
+            // Creating image via a valid resource
+            if (!$predictedSourceType && self::isValidImageHandle($source)) {
+                $predictedSourceType = 'Handle';
+            }
+
+            // Check for binary string
+            if (!$predictedSourceType) {
+                // search first $binLength bytes (at a maximum) for ord<32 characters (binary image data)
+                $binLength = 64;
+                $sourceLength = strlen($source);
+                $maxlen = ($sourceLength > $binLength) ? $binLength : $sourceLength;
+                for ($i = 0; $i < $maxlen; $i++) {
+                    if (ord($source[$i]) < 32) {
+                        $predictedSourceType = 'String';
+                        break;
+                    }
+                }
+            }
+
+            // Uploaded image (array uploads not supported)
+            if (isset($_FILES[$source]) && isset($_FILES[$source]['tmp_name'])) {
+                $predictedSourceType = 'Upload';
+            }
+
+            // Otherwise, must be a file or an URL
+            if (!$predictedSourceType) {
+                $predictedSourceType = 'File';
+            }
+
+            return call_user_func(['WideImage', 'loadFrom'.$predictedSourceType], $source);
+        }
+
+        /**
+         * Create and load an image from a file or URL. The image format is auto-detected.
+         * 
+         * @param string $uri File or url
+         *
+         * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
+         */
+        public static function loadFromFile($uri)
+        {
+            $data = file_get_contents($uri);
+            $handle = @imagecreatefromstring($data);
+            if (!self::isValidImageHandle($handle)) {
+                try {
+                    // try to find a mapper first
+                    $mapper = WideImage_MapperFactory::selectMapper($uri);
+                    if ($mapper) {
+                        $handle = $mapper->load($uri);
+                    }
+                } catch (WideImage_UnsupportedFormatException $e) {
+                    // mapper not found
+                }
+
+                // try all custom mappers
+                if (!self::isValidImageHandle($handle)) {
+                    $custom_mappers = WideImage_MapperFactory::getCustomMappers();
+                    foreach ($custom_mappers as $mime_type => $mapper_class) {
+                        $mapper = WideImage_MapperFactory::selectMapper(null, $mime_type);
+                        $handle = $mapper->loadFromString($data);
+                        if (self::isValidImageHandle($handle)) {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (!self::isValidImageHandle($handle)) {
+                throw new WideImage_InvalidImageSourceException("File '{$uri}' appears to be an invalid image source.");
+            }
+
+            return self::loadFromHandle($handle);
+        }
+
+        /**
+         * Create and load an image from a string. Format is auto-detected.
+         * 
+         * @param string $string Binary data, i.e. from BLOB field in the database
+         *
+         * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
+         */
+        public static function loadFromString($string)
+        {
+            if (strlen($string) < 128) {
+                throw new WideImage_InvalidImageSourceException("String doesn't contain image data.");
+            }
+
+            $handle = @imagecreatefromstring($string);
+            if (!self::isValidImageHandle($handle)) {
+                $custom_mappers = WideImage_MapperFactory::getCustomMappers();
+                foreach ($custom_mappers as $mime_type => $mapper_class) {
+                    $mapper = WideImage_MapperFactory::selectMapper(null, $mime_type);
+                    $handle = $mapper->loadFromString($string);
+                    if (self::isValidImageHandle($handle)) {
+                        break;
+                    }
+                }
+            }
+
+            if (!self::isValidImageHandle($handle)) {
+                throw new WideImage_InvalidImageSourceException("String doesn't contain valid image data.");
+            }
+
+            return self::loadFromHandle($handle);
+        }
+
+        /**
+         * Create and load an image from an image handle.
+         * 
+         * <b>Note:</b> the resulting image object takes ownership of the passed 
+         * handle. When the newly-created image object is destroyed, the handle is 
+         * destroyed too, so it's not a valid image handle anymore. In order to 
+         * preserve the handle for use after object destruction, you have to call 
+         * WideImage_Image::releaseHandle() on the created image instance prior to its
+         * destruction.
+         * 
+         * <code>
+         * $handle = imagecreatefrompng('file.png');
+         * $image = WideImage::loadFromHandle($handle);
+         * </code>
+         * 
+         * @param resource $handle A valid GD image resource
+         *
+         * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
+         */
+        public static function loadFromHandle($handle)
+        {
+            if (!self::isValidImageHandle($handle)) {
+                throw new WideImage_InvalidImageSourceException('Handle is not a valid GD image resource.');
+            }
+
+            if (imageistruecolor($handle)) {
+                return new WideImage_TrueColorImage($handle);
+            } else {
+                return new WideImage_PaletteImage($handle);
+            }
+        }
+
+        /**
+         * This method loads a file from the $_FILES array. The image format is auto-detected.
+         * 
+         * You only have to pass the field name as the parameter. For array fields, this function will
+         * return an array of image objects, unless you specify the $index parameter, which will
+         * load the desired image.
+         * 
+         * @param $field_name Name of the key in $_FILES array
+         * @param int $index The index of the file to load (if the input field is an array)
+         *
+         * @return WideImage_Image The loaded image
+         */
+        public static function loadFromUpload($field_name, $index = null)
+        {
+            if (!array_key_exists($field_name, $_FILES)) {
+                throw new WideImage_InvalidImageSourceException("Upload field '{$field_name}' doesn't exist.");
+            }
+
+            if (is_array($_FILES[$field_name]['tmp_name'])) {
+                if (isset($_FILES[$field_name]['tmp_name'][$index])) {
+                    $filename = $_FILES[$field_name]['tmp_name'][$index];
+                } else {
+                    $result = [];
+                    foreach ($_FILES[$field_name]['tmp_name'] as $idx => $tmp_name) {
+                        $result[$idx] = self::loadFromFile($tmp_name);
+                    }
+
+                    return $result;
+                }
+            } else {
+                $filename = $_FILES[$field_name]['tmp_name'];
+            }
+
+            if (!file_exists($filename)) {
+                throw new WideImage_InvalidImageSourceException("Uploaded file doesn't exist.");
+            }
+
+            return self::loadFromFile($filename);
+        }
+
+        /**
+         * Factory method for creating a palette image.
+         * 
+         * @param int $width
+         * @param int $height
+         *
+         * @return WideImage_PaletteImage
+         */
+        public static function createPaletteImage($width, $height)
+        {
+            return WideImage_PaletteImage::create($width, $height);
+        }
+
+        /**
+         * Factory method for creating a true-color image.
+         * 
+         * @param int $width
+         * @param int $height
+         *
+         * @return WideImage_TrueColorImage
+         */
+        public static function createTrueColorImage($width, $height)
+        {
+            return WideImage_TrueColorImage::create($width, $height);
+        }
+
+        /**
+         * Check whether the given handle is a valid GD resource.
+         * 
+         * @param mixed $handle The variable to check
+         *
+         * @return bool
+         */
+        public static function isValidImageHandle($handle)
+        {
+            return is_resource($handle) && get_resource_type($handle) == 'gd';
+        }
+
+        /**
+         * Throws exception if the handle isn't a valid GD resource.
+         * 
+         * @param mixed $handle The variable to check
+         */
+        public static function assertValidImageHandle($handle)
+        {
+            if (!self::isValidImageHandle($handle)) {
+                throw new WideImage_InvalidImageHandleException("{$handle} is not a valid image handle.");
+            }
+        }
+    }
+
+    WideImage::checkGD();
+
+    WideImage::registerCustomMapper('WideImage_Mapper_BMP', 'image/bmp', 'bmp');
+    WideImage::registerCustomMapper('WideImage_Mapper_TGA', 'image/tga', 'tga');
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/test-init.php b/public/filemanager/connectors/php/inc/wideimage/test/test-init.php
index 102f40f15..1d4d972cd 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/test-init.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/test-init.php
@@ -1,80 +1,79 @@
 <?php
-	
-	require dirname(__FILE__) . '/../lib/WideImage.php';
-	
-	define('TEST_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
-	define('IMG_PATH', TEST_PATH . 'images' . DIRECTORY_SEPARATOR);
-	
-	abstract class WideImage_TestCase extends PHPUnit_Framework_TestCase
-	{
-		function load($file)
-		{
-			return WideImage::load(IMG_PATH . $file);
-		}
-		
-		function assertValidImage($image)
-		{
-			$this->assertInstanceOf("WideImage_Image", $image);
-			$this->assertTrue($image->isValid());
-		}
-		
-		function assertDimensions($image, $width, $height)
-		{
-			$this->assertEquals($width, $image->getWidth());
-			$this->assertEquals($height, $image->getHeight());
-		}
-		
-		function assertTransparentColorMatch($img1, $img2)
-		{
-			$tc1 = $img1->getTransparentColorRGB();
-			$tc2 = $img2->getTransparentColorRGB();
-			$this->assertEquals($tc1, $tc2);
-		}
-		
-		function assertTransparentColorAt($img, $x, $y)
-		{
-			$this->assertEquals($img->getTransparentColor(), $img->getColorAt($x, $y));
-		}
-		
-		function assertRGBWithinMargin($rec, $r, $g, $b, $a, $margin)
-		{
-			if (is_array($r))
-			{
-				$a = $r['alpha'];
-				$b = $r['blue'];
-				$g = $r['green'];
-				$r = $r['red'];
-			}
-			
-			$result = 
-				abs($rec['red'] - $r) <= $margin && 
-				abs($rec['green'] - $g) <= $margin && 
-				abs($rec['blue'] - $b) <= $margin;
-			
-			$result = $result && ($a === null || abs($rec['alpha'] - $a) <= $margin);
-			
-			$this->assertTrue($result, 
-				"RGBA [{$rec['red']}, {$rec['green']}, {$rec['blue']}, {$rec['alpha']}] " . 
-				"doesn't match RGBA [$r, $g, $b, $a] within margin [$margin].");
-		}
-		
-		function assertRGBAt($img, $x, $y, $rgba)
-		{
-			if (is_array($rgba))
-				$cmp = $img->getRGBAt($x, $y);
-			else
-				$cmp = $img->getColorAt($x, $y);
-			$this->assertSame($cmp, $rgba);
-		}
-		
-		function assertRGBNear($rec, $r, $g = null, $b = null, $a = null)
-		{
-			$this->assertRGBWithinMargin($rec, $r, $g, $b, $a, 2);
-		}
-		
-		function assertRGBEqual($rec, $r, $g = null, $b = null, $a = null)
-		{
-			$this->assertRGBWithinMargin($rec, $r, $g, $b, $a, 0);
-		}
-	}
-	
\ No newline at end of file
+
+    require dirname(__FILE__).'/../lib/WideImage.php';
+
+    define('TEST_PATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
+    define('IMG_PATH', TEST_PATH.'images'.DIRECTORY_SEPARATOR);
+
+    abstract class WideImage_TestCase extends PHPUnit_Framework_TestCase
+    {
+        public function load($file)
+        {
+            return WideImage::load(IMG_PATH.$file);
+        }
+
+        public function assertValidImage($image)
+        {
+            $this->assertInstanceOf('WideImage_Image', $image);
+            $this->assertTrue($image->isValid());
+        }
+
+        public function assertDimensions($image, $width, $height)
+        {
+            $this->assertEquals($width, $image->getWidth());
+            $this->assertEquals($height, $image->getHeight());
+        }
+
+        public function assertTransparentColorMatch($img1, $img2)
+        {
+            $tc1 = $img1->getTransparentColorRGB();
+            $tc2 = $img2->getTransparentColorRGB();
+            $this->assertEquals($tc1, $tc2);
+        }
+
+        public function assertTransparentColorAt($img, $x, $y)
+        {
+            $this->assertEquals($img->getTransparentColor(), $img->getColorAt($x, $y));
+        }
+
+        public function assertRGBWithinMargin($rec, $r, $g, $b, $a, $margin)
+        {
+            if (is_array($r)) {
+                $a = $r['alpha'];
+                $b = $r['blue'];
+                $g = $r['green'];
+                $r = $r['red'];
+            }
+
+            $result =
+                abs($rec['red'] - $r) <= $margin &&
+                abs($rec['green'] - $g) <= $margin &&
+                abs($rec['blue'] - $b) <= $margin;
+
+            $result = $result && ($a === null || abs($rec['alpha'] - $a) <= $margin);
+
+            $this->assertTrue($result,
+                "RGBA [{$rec['red']}, {$rec['green']}, {$rec['blue']}, {$rec['alpha']}] ".
+                "doesn't match RGBA [$r, $g, $b, $a] within margin [$margin].");
+        }
+
+        public function assertRGBAt($img, $x, $y, $rgba)
+        {
+            if (is_array($rgba)) {
+                $cmp = $img->getRGBAt($x, $y);
+            } else {
+                $cmp = $img->getColorAt($x, $y);
+            }
+            $this->assertSame($cmp, $rgba);
+        }
+
+        public function assertRGBNear($rec, $r, $g = null, $b = null, $a = null)
+        {
+            $this->assertRGBWithinMargin($rec, $r, $g, $b, $a, 2);
+        }
+
+        public function assertRGBEqual($rec, $r, $g = null, $b = null, $a = null)
+        {
+            $this->assertRGBWithinMargin($rec, $r, $g, $b, $a, 0);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/CanvasTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/CanvasTest.php
index da957df2c..1693c6a66 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/CanvasTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/CanvasTest.php
@@ -1,45 +1,28 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
+    /**
+     
+     **/
 
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Canvas_Test extends WideImage_TestCase
-	{
-		function testCreate()
-		{
-			$img = WideImage::createTrueColorImage(10, 10);
-			
-			$canvas1 = $img->getCanvas();
-			$this->assertInstanceOf('WideImage_Canvas', $canvas1);
-			
-			$canvas2 = $img->getCanvas();
-			$this->assertSame($canvas1, $canvas2);
-		}
-		
-		function testMagicCallDrawRectangle()
-		{
-			$img = WideImage::createTrueColorImage(10, 10);
-			$canvas = $img->getCanvas();
-			$canvas->filledRectangle(1, 1, 5, 5, $img->allocateColorAlpha(255, 0, 0, 64));
-			$this->assertRGBAt($img, 3, 3, array('red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 64));
-		}
-	}
+    /**
+     */
+    class WideImage_Canvas_Test extends WideImage_TestCase
+    {
+        public function testCreate()
+        {
+            $img = WideImage::createTrueColorImage(10, 10);
+
+            $canvas1 = $img->getCanvas();
+            $this->assertInstanceOf('WideImage_Canvas', $canvas1);
+
+            $canvas2 = $img->getCanvas();
+            $this->assertSame($canvas1, $canvas2);
+        }
+
+        public function testMagicCallDrawRectangle()
+        {
+            $img = WideImage::createTrueColorImage(10, 10);
+            $canvas = $img->getCanvas();
+            $canvas->filledRectangle(1, 1, 5, 5, $img->allocateColorAlpha(255, 0, 0, 64));
+            $this->assertRGBAt($img, 3, 3, ['red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 64]);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/CoordinateTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/CoordinateTest.php
index 905eaf182..ee76646b6 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/CoordinateTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/CoordinateTest.php
@@ -1,105 +1,90 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Coordinate_Test extends WideImage_TestCase
-	{
-		function testEvaluate()
-		{
-			$this->assertSame(400, WideImage_Coordinate::evaluate('+200%', 200));
-			$this->assertSame(-1, WideImage_Coordinate::evaluate('-1', 200));
-			$this->assertSame(10, WideImage_Coordinate::evaluate('+10', 200));
-			$this->assertSame(40, WideImage_Coordinate::evaluate('+20%', 200));
-			$this->assertSame(-11, WideImage_Coordinate::evaluate('-11.23', 200));
-			$this->assertSame(-30, WideImage_Coordinate::evaluate('-15%', 200));
-		}
-		
-		function testFix()
-		{
-			$this->assertSame(10, WideImage_Coordinate::fix('10%', 100));
-			$this->assertSame(10, WideImage_Coordinate::fix('10', 100));
-			
-			$this->assertSame(-10, WideImage_Coordinate::fix('-10%', 100));
-			$this->assertSame(-1, WideImage_Coordinate::fix('-1', 100));
-			$this->assertSame(-50, WideImage_Coordinate::fix('-50%', 100));
-			$this->assertSame(-100, WideImage_Coordinate::fix('-100%', 100));
-			$this->assertSame(-1, WideImage_Coordinate::fix('-5%', 20));
-			
-			$this->assertSame(300, WideImage_Coordinate::fix('150.12%', 200));
-			$this->assertSame(150, WideImage_Coordinate::fix('150', 200));
-			
-			$this->assertSame(100, WideImage_Coordinate::fix('100%-50%', 200));
-			$this->assertSame(200, WideImage_Coordinate::fix('100%', 200));
-			
-			$this->assertSame(130, WideImage_Coordinate::fix('50%     -20', 300));
-			$this->assertSame(12, WideImage_Coordinate::fix(' 12 - 0', 300));
-			
-			$this->assertSame(15, WideImage_Coordinate::fix('50%', 30));
-			$this->assertSame(15, WideImage_Coordinate::fix('50%-0', 30));
-			$this->assertSame(15, WideImage_Coordinate::fix('50%+0', 30));
-			$this->assertSame(0, WideImage_Coordinate::fix(' -  50%  +   50%', 30));
-			$this->assertSame(30, WideImage_Coordinate::fix(' 50%  + 49.6666%', 30));
-		}
-		
-		function testAlign()
-		{
-			$this->assertSame(0, WideImage_Coordinate::fix('left', 300, 120));
-			$this->assertSame(90, WideImage_Coordinate::fix('center', 300, 120));
-			$this->assertSame(180, WideImage_Coordinate::fix('right', 300, 120));
-			$this->assertSame(0, WideImage_Coordinate::fix('top', 300, 120));
-			$this->assertSame(90, WideImage_Coordinate::fix('middle', 300, 120));
-			$this->assertSame(180, WideImage_Coordinate::fix('bottom', 300, 120));
-			
-			$this->assertSame(200, WideImage_Coordinate::fix('bottom+20', 300, 120));
-			$this->assertSame(178, WideImage_Coordinate::fix('-2 + right', 300, 120));
-			$this->assertSame(90, WideImage_Coordinate::fix('right - center', 300, 120));
-		}
-		
-		function testAlignWithoutSecondaryCoordinate()
-		{
-			$this->assertSame(0, WideImage_Coordinate::fix('left', 300));
-			$this->assertSame(150, WideImage_Coordinate::fix('center', 300));
-			$this->assertSame(300, WideImage_Coordinate::fix('right', 300));
-			$this->assertSame(0, WideImage_Coordinate::fix('top', 300));
-			$this->assertSame(150, WideImage_Coordinate::fix('middle', 300));
-			$this->assertSame(300, WideImage_Coordinate::fix('bottom', 300));
-			
-			$this->assertSame(320, WideImage_Coordinate::fix('bottom+20', 300));
-			$this->assertSame(280, WideImage_Coordinate::fix('-20 + right', 300));
-			$this->assertSame(150, WideImage_Coordinate::fix('right - center', 300));
-		}
-				
-		function testMultipleOperands()
-		{
-			$this->assertSame(6, WideImage_Coordinate::fix('100%-100+1     + 5', 100));
-			$this->assertSame(1, WideImage_Coordinate::fix('right      +1-   100     - 50%', 200));
-			$this->assertSame(200, WideImage_Coordinate::fix('-right+right +100%', 200));
-			$this->assertSame(90, WideImage_Coordinate::fix('100--++++-10', 200));
-		}
-		
-		/**
-		 * @expectedException WideImage_InvalidCoordinateException
-		 */
-		function testInvalidSyntaxEndsWithOperator()
-		{
-			WideImage_Coordinate::fix('5+2+', 10);
-		}
-	}
+    /**
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
+
+    /**
+     */
+    class WideImage_Coordinate_Test extends WideImage_TestCase
+    {
+        public function testEvaluate()
+        {
+            $this->assertSame(400, WideImage_Coordinate::evaluate('+200%', 200));
+            $this->assertSame(-1, WideImage_Coordinate::evaluate('-1', 200));
+            $this->assertSame(10, WideImage_Coordinate::evaluate('+10', 200));
+            $this->assertSame(40, WideImage_Coordinate::evaluate('+20%', 200));
+            $this->assertSame(-11, WideImage_Coordinate::evaluate('-11.23', 200));
+            $this->assertSame(-30, WideImage_Coordinate::evaluate('-15%', 200));
+        }
+
+        public function testFix()
+        {
+            $this->assertSame(10, WideImage_Coordinate::fix('10%', 100));
+            $this->assertSame(10, WideImage_Coordinate::fix('10', 100));
+
+            $this->assertSame(-10, WideImage_Coordinate::fix('-10%', 100));
+            $this->assertSame(-1, WideImage_Coordinate::fix('-1', 100));
+            $this->assertSame(-50, WideImage_Coordinate::fix('-50%', 100));
+            $this->assertSame(-100, WideImage_Coordinate::fix('-100%', 100));
+            $this->assertSame(-1, WideImage_Coordinate::fix('-5%', 20));
+
+            $this->assertSame(300, WideImage_Coordinate::fix('150.12%', 200));
+            $this->assertSame(150, WideImage_Coordinate::fix('150', 200));
+
+            $this->assertSame(100, WideImage_Coordinate::fix('100%-50%', 200));
+            $this->assertSame(200, WideImage_Coordinate::fix('100%', 200));
+
+            $this->assertSame(130, WideImage_Coordinate::fix('50%     -20', 300));
+            $this->assertSame(12, WideImage_Coordinate::fix(' 12 - 0', 300));
+
+            $this->assertSame(15, WideImage_Coordinate::fix('50%', 30));
+            $this->assertSame(15, WideImage_Coordinate::fix('50%-0', 30));
+            $this->assertSame(15, WideImage_Coordinate::fix('50%+0', 30));
+            $this->assertSame(0, WideImage_Coordinate::fix(' -  50%  +   50%', 30));
+            $this->assertSame(30, WideImage_Coordinate::fix(' 50%  + 49.6666%', 30));
+        }
+
+        public function testAlign()
+        {
+            $this->assertSame(0, WideImage_Coordinate::fix('left', 300, 120));
+            $this->assertSame(90, WideImage_Coordinate::fix('center', 300, 120));
+            $this->assertSame(180, WideImage_Coordinate::fix('right', 300, 120));
+            $this->assertSame(0, WideImage_Coordinate::fix('top', 300, 120));
+            $this->assertSame(90, WideImage_Coordinate::fix('middle', 300, 120));
+            $this->assertSame(180, WideImage_Coordinate::fix('bottom', 300, 120));
+
+            $this->assertSame(200, WideImage_Coordinate::fix('bottom+20', 300, 120));
+            $this->assertSame(178, WideImage_Coordinate::fix('-2 + right', 300, 120));
+            $this->assertSame(90, WideImage_Coordinate::fix('right - center', 300, 120));
+        }
+
+        public function testAlignWithoutSecondaryCoordinate()
+        {
+            $this->assertSame(0, WideImage_Coordinate::fix('left', 300));
+            $this->assertSame(150, WideImage_Coordinate::fix('center', 300));
+            $this->assertSame(300, WideImage_Coordinate::fix('right', 300));
+            $this->assertSame(0, WideImage_Coordinate::fix('top', 300));
+            $this->assertSame(150, WideImage_Coordinate::fix('middle', 300));
+            $this->assertSame(300, WideImage_Coordinate::fix('bottom', 300));
+
+            $this->assertSame(320, WideImage_Coordinate::fix('bottom+20', 300));
+            $this->assertSame(280, WideImage_Coordinate::fix('-20 + right', 300));
+            $this->assertSame(150, WideImage_Coordinate::fix('right - center', 300));
+        }
+
+        public function testMultipleOperands()
+        {
+            $this->assertSame(6, WideImage_Coordinate::fix('100%-100+1     + 5', 100));
+            $this->assertSame(1, WideImage_Coordinate::fix('right      +1-   100     - 50%', 200));
+            $this->assertSame(200, WideImage_Coordinate::fix('-right+right +100%', 200));
+            $this->assertSame(90, WideImage_Coordinate::fix('100--++++-10', 200));
+        }
+
+        /**
+         * @expectedException WideImage_InvalidCoordinateException
+         */
+        public function testInvalidSyntaxEndsWithOperator()
+        {
+            WideImage_Coordinate::fix('5+2+', 10);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/ImageTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/ImageTest.php
index 32f08fcbb..06a158a14 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/ImageTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/ImageTest.php
@@ -1,190 +1,170 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_CustomOp
-	{
-		static public $args = null;
-		
-		function execute()
-		{
-			self::$args = func_get_args();
-			return self::$args[0]->copy();
-		}
-	}
-	
-	/**
-	 * @package Tests
-	 */
-	class ImageForOutput extends WideImage_TrueColorImage
-	{
-		public $headers = array();
-		
-		function writeHeader($name, $data)
-		{
-			$this->headers[$name] = $data;
-		}
-	}
-	
-	/**
-	 * @package Tests
-	 */
-	class TestableImage extends WideImage_TrueColorImage
-	{
-		public $headers = array();
-		
-		function __destruct()
-		{
-			
-		}
-		
-		function writeHeader($name, $data)
-		{
-			$this->headers[$name] = $data;
-		}
-	}
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Image_Test extends WideImage_TestCase
-	{
-		function testFactories()
-		{
-			$this->assertTrue(WideImage::createTrueColorImage(100, 100) instanceof WideImage_TrueColorImage);
-			$this->assertTrue(WideImage::createPaletteImage(100, 100) instanceof WideImage_PaletteImage);
-		}
-		
-		function testDestructorUponUnset()
-		{
-			$img = $this->getMock('WideImage_TrueColorImage', array(), array(imagecreatetruecolor(10, 10)));
-			$img->expectOnce('destroy');
-			unset($img);
-			$img = null;
-			
-			for ($i = 0; $i++; $i < 1000);
-		}
-		
-		function testDestructorUponNull()
-		{
-			$img = $this->getMock('WideImage_TrueColorImage', array(), array(imagecreatetruecolor(10, 10)));
-			$img->expectOnce('destroy');
-			$img = null;
-			
-			for ($i = 0; $i++; $i < 1000);
-		}
-		
-		function testAutoDestruct()
-		{
-			$img = WideImage_TrueColorImage::create(10, 10);
-			$handle = $img->getHandle();
-			
-			unset($img);
-			
-			$this->assertFalse(WideImage::isValidImageHandle($handle));
-		}
-		
-		function testAutoDestructWithRelease()
-		{
-			$img = WideImage_TrueColorImage::create(10, 10);
-			$handle = $img->getHandle();
-			
-			$img->releaseHandle();
-			unset($img);
-			
-			$this->assertTrue(WideImage::isValidImageHandle($handle));
-			imagedestroy($handle);
-		}
-		
-		function testCustomOpMagic()
-		{
-			$img = WideImage_TrueColorImage::create(10, 10);
-			$result = $img->customOp(123, 'abc');
-			$this->assertTrue($result instanceof WideImage_Image);
-			$this->assertSame(WideImage_Operation_CustomOp::$args[0], $img);
-			$this->assertSame(WideImage_Operation_CustomOp::$args[1], 123);
-			$this->assertSame(WideImage_Operation_CustomOp::$args[2], 'abc');
-		}
-		
-		function testCustomOpCaseInsensitive()
-		{
-			$img = WideImage_TrueColorImage::create(10, 10);
-			$result = $img->CUSTomOP(123, 'abc');
-			$this->assertTrue($result instanceof WideImage_Image);
-			$this->assertSame(WideImage_Operation_CustomOp::$args[0], $img);
-			$this->assertSame(WideImage_Operation_CustomOp::$args[1], 123);
-			$this->assertSame(WideImage_Operation_CustomOp::$args[2], 'abc');
-		}
-		
-		function testInternalOpCaseInsensitive()
-		{
-			$img = WideImage_TrueColorImage::create(10, 10);
-			$result = $img->AUTOcrop();
-			$this->assertTrue($result instanceof WideImage_Image);
-		}
-		
-		function testOutput()
-		{
-			$tmp = WideImage::load(IMG_PATH . 'fgnl.jpg');
-			$img = new ImageForOutput($tmp->getHandle());
-			
-			ob_start();
-			$img->output('png');
-			$data = ob_get_clean();
-			
-			$this->assertEquals(array('Content-length' => strlen($data), 'Content-type' => 'image/png'), $img->headers);
-		}
-		
-		function testCanvasInstance()
-		{
-			$img = WideImage::load(IMG_PATH . 'fgnl.jpg');
-			$canvas1 = $img->getCanvas();
-			$this->assertTrue($canvas1 instanceof WideImage_Canvas);
-			$canvas2 = $img->getCanvas();
-			$this->assertTrue($canvas1 === $canvas2);
-		}
-		
-		function testSerializeTrueColorImage()
-		{
-			$img = WideImage::load(IMG_PATH . 'fgnl.jpg');
-			$img2 = unserialize(serialize($img));
-			$this->assertEquals(get_class($img2), get_class($img));
-			$this->assertTrue($img2->isTrueColor());
-			$this->assertTrue($img2->isValid());
-			$this->assertFalse($img2->isTransparent());
-			$this->assertEquals($img->getWidth(), $img2->getWidth());
-			$this->assertEquals($img->getHeight(), $img2->getHeight());
-		}
-		
-		function testSerializePaletteImage()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$img2 = unserialize(serialize($img));
-			$this->assertEquals(get_class($img2), get_class($img));
-			$this->assertFalse($img2->isTrueColor());
-			$this->assertTrue($img2->isValid());
-			$this->assertTrue($img2->isTransparent());
-			$this->assertEquals($img->getWidth(), $img2->getWidth());
-			$this->assertEquals($img->getHeight(), $img2->getHeight());
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Operation_CustomOp
+    {
+        public static $args = null;
+
+        public function execute()
+        {
+            self::$args = func_get_args();
+
+            return self::$args[0]->copy();
+        }
+    }
+
+    /**
+     */
+    class ImageForOutput extends WideImage_TrueColorImage
+    {
+        public $headers = [];
+
+        public function writeHeader($name, $data)
+        {
+            $this->headers[$name] = $data;
+        }
+    }
+
+    /**
+     */
+    class TestableImage extends WideImage_TrueColorImage
+    {
+        public $headers = [];
+
+        public function __destruct()
+        {
+        }
+
+        public function writeHeader($name, $data)
+        {
+            $this->headers[$name] = $data;
+        }
+    }
+
+    /**
+     */
+    class WideImage_Image_Test extends WideImage_TestCase
+    {
+        public function testFactories()
+        {
+            $this->assertTrue(WideImage::createTrueColorImage(100, 100) instanceof WideImage_TrueColorImage);
+            $this->assertTrue(WideImage::createPaletteImage(100, 100) instanceof WideImage_PaletteImage);
+        }
+
+        public function testDestructorUponUnset()
+        {
+            $img = $this->getMock('WideImage_TrueColorImage', [], [imagecreatetruecolor(10, 10)]);
+            $img->expectOnce('destroy');
+            unset($img);
+            $img = null;
+
+            for ($i = 0; $i++; $i < 1000);
+        }
+
+        public function testDestructorUponNull()
+        {
+            $img = $this->getMock('WideImage_TrueColorImage', [], [imagecreatetruecolor(10, 10)]);
+            $img->expectOnce('destroy');
+            $img = null;
+
+            for ($i = 0; $i++; $i < 1000);
+        }
+
+        public function testAutoDestruct()
+        {
+            $img = WideImage_TrueColorImage::create(10, 10);
+            $handle = $img->getHandle();
+
+            unset($img);
+
+            $this->assertFalse(WideImage::isValidImageHandle($handle));
+        }
+
+        public function testAutoDestructWithRelease()
+        {
+            $img = WideImage_TrueColorImage::create(10, 10);
+            $handle = $img->getHandle();
+
+            $img->releaseHandle();
+            unset($img);
+
+            $this->assertTrue(WideImage::isValidImageHandle($handle));
+            imagedestroy($handle);
+        }
+
+        public function testCustomOpMagic()
+        {
+            $img = WideImage_TrueColorImage::create(10, 10);
+            $result = $img->customOp(123, 'abc');
+            $this->assertTrue($result instanceof WideImage_Image);
+            $this->assertSame(WideImage_Operation_CustomOp::$args[0], $img);
+            $this->assertSame(WideImage_Operation_CustomOp::$args[1], 123);
+            $this->assertSame(WideImage_Operation_CustomOp::$args[2], 'abc');
+        }
+
+        public function testCustomOpCaseInsensitive()
+        {
+            $img = WideImage_TrueColorImage::create(10, 10);
+            $result = $img->CUSTomOP(123, 'abc');
+            $this->assertTrue($result instanceof WideImage_Image);
+            $this->assertSame(WideImage_Operation_CustomOp::$args[0], $img);
+            $this->assertSame(WideImage_Operation_CustomOp::$args[1], 123);
+            $this->assertSame(WideImage_Operation_CustomOp::$args[2], 'abc');
+        }
+
+        public function testInternalOpCaseInsensitive()
+        {
+            $img = WideImage_TrueColorImage::create(10, 10);
+            $result = $img->AUTOcrop();
+            $this->assertTrue($result instanceof WideImage_Image);
+        }
+
+        public function testOutput()
+        {
+            $tmp = WideImage::load(IMG_PATH.'fgnl.jpg');
+            $img = new ImageForOutput($tmp->getHandle());
+
+            ob_start();
+            $img->output('png');
+            $data = ob_get_clean();
+
+            $this->assertEquals(['Content-length' => strlen($data), 'Content-type' => 'image/png'], $img->headers);
+        }
+
+        public function testCanvasInstance()
+        {
+            $img = WideImage::load(IMG_PATH.'fgnl.jpg');
+            $canvas1 = $img->getCanvas();
+            $this->assertTrue($canvas1 instanceof WideImage_Canvas);
+            $canvas2 = $img->getCanvas();
+            $this->assertTrue($canvas1 === $canvas2);
+        }
+
+        public function testSerializeTrueColorImage()
+        {
+            $img = WideImage::load(IMG_PATH.'fgnl.jpg');
+            $img2 = unserialize(serialize($img));
+            $this->assertEquals(get_class($img2), get_class($img));
+            $this->assertTrue($img2->isTrueColor());
+            $this->assertTrue($img2->isValid());
+            $this->assertFalse($img2->isTransparent());
+            $this->assertEquals($img->getWidth(), $img2->getWidth());
+            $this->assertEquals($img->getHeight(), $img2->getHeight());
+        }
+
+        public function testSerializePaletteImage()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $img2 = unserialize(serialize($img));
+            $this->assertEquals(get_class($img2), get_class($img));
+            $this->assertFalse($img2->isTrueColor());
+            $this->assertTrue($img2->isValid());
+            $this->assertTrue($img2->isTransparent());
+            $this->assertEquals($img->getWidth(), $img2->getWidth());
+            $this->assertEquals($img->getHeight(), $img2->getHeight());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/BMPTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/BMPTest.php
index 2bd9665be..571e5953d 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/BMPTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/BMPTest.php
@@ -1,80 +1,62 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	include WideImage::path() . 'Mapper/BMP.php';
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Mapper_BMP_Test extends WideImage_TestCase
-	{
-		/**
-		 * @var WideImage_Mapper_BMP
-		 */
-		protected $mapper;
-		
-		function setup()
-		{
-			$this->mapper = WideImage_MapperFactory::selectMapper(null, 'bmp');
-		}
-		
-		function teardown()
-		{
-			$this->mapper = null;
-		}
-		
-		function testLoad()
-		{
-			$handle = $this->mapper->load(IMG_PATH . 'fgnl.bmp');
-			$this->assertTrue(is_resource($handle));
-			$this->assertEquals(174, imagesx($handle));
-			$this->assertEquals(287, imagesy($handle));
-			imagedestroy($handle);
-		}
-		
-		function testSaveToString()
-		{
-			$handle = WideImage_vendor_de77_BMP::imagecreatefrombmp(IMG_PATH . 'fgnl.bmp');
-			ob_start();
-			$this->mapper->save($handle);
-			$string = ob_get_clean();
-			$this->assertTrue(strlen($string) > 0);
-			imagedestroy($handle);
-			
-			// string contains valid image data
-			$handle = $this->mapper->loadFromString($string);
-			$this->assertTrue(WideImage::isValidImageHandle($handle));
-			imagedestroy($handle);
-		}
-		
-		function testSaveToFile()
-		{
-			$handle = imagecreatefromgif(IMG_PATH . '100x100-color-hole.gif');
-			$this->mapper->save($handle, IMG_PATH . 'temp/test.bmp');
-			$this->assertTrue(filesize(IMG_PATH . 'temp/test.bmp') > 0);
-			imagedestroy($handle);
-			
-			// file is a valid image
-			$handle = $this->mapper->load(IMG_PATH . 'temp/test.bmp');
-			$this->assertTrue(WideImage::isValidImageHandle($handle));
-			imagedestroy($handle);
-		}
-	}
+    /**
+     
+     **/
+    include WideImage::path().'Mapper/BMP.php';
+
+    /**
+     */
+    class WideImage_Mapper_BMP_Test extends WideImage_TestCase
+    {
+        /**
+         * @var WideImage_Mapper_BMP
+         */
+        protected $mapper;
+
+        public function setup()
+        {
+            $this->mapper = WideImage_MapperFactory::selectMapper(null, 'bmp');
+        }
+
+        public function teardown()
+        {
+            $this->mapper = null;
+        }
+
+        public function testLoad()
+        {
+            $handle = $this->mapper->load(IMG_PATH.'fgnl.bmp');
+            $this->assertTrue(is_resource($handle));
+            $this->assertEquals(174, imagesx($handle));
+            $this->assertEquals(287, imagesy($handle));
+            imagedestroy($handle);
+        }
+
+        public function testSaveToString()
+        {
+            $handle = WideImage_vendor_de77_BMP::imagecreatefrombmp(IMG_PATH.'fgnl.bmp');
+            ob_start();
+            $this->mapper->save($handle);
+            $string = ob_get_clean();
+            $this->assertTrue(strlen($string) > 0);
+            imagedestroy($handle);
+
+            // string contains valid image data
+            $handle = $this->mapper->loadFromString($string);
+            $this->assertTrue(WideImage::isValidImageHandle($handle));
+            imagedestroy($handle);
+        }
+
+        public function testSaveToFile()
+        {
+            $handle = imagecreatefromgif(IMG_PATH.'100x100-color-hole.gif');
+            $this->mapper->save($handle, IMG_PATH.'temp/test.bmp');
+            $this->assertTrue(filesize(IMG_PATH.'temp/test.bmp') > 0);
+            imagedestroy($handle);
+
+            // file is a valid image
+            $handle = $this->mapper->load(IMG_PATH.'temp/test.bmp');
+            $this->assertTrue(WideImage::isValidImageHandle($handle));
+            imagedestroy($handle);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GD2Test.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GD2Test.php
index 20e69c7b5..6e6f27805 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GD2Test.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GD2Test.php
@@ -1,71 +1,54 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	include WideImage::path() . 'Mapper/GD2.php';
+    /**
+     
+     **/
+    include WideImage::path().'Mapper/GD2.php';
 
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Mapper_GD2_Test extends WideImage_TestCase
-	{
-		protected $mapper;
-		
-		function setup()
-		{
-			$this->mapper = WideImage_MapperFactory::selectMapper(null, 'gd2');
-		}
-		
-		function teardown()
-		{
-			$this->mapper = null;
-			
-			if (file_exists(IMG_PATH . 'temp/test.gd2'))
-				unlink(IMG_PATH . 'temp/test.gd2');
-		}
-		
-		function testSaveToString()
-		{
-			$handle = imagecreatefromgif(IMG_PATH . '100x100-color-hole.gif');
-			ob_start();
-			$this->mapper->save($handle);
-			$string = ob_get_clean();
-			$this->assertTrue(strlen($string) > 0);
-			imagedestroy($handle);
-			
-			// string contains valid image data
-			$handle = imagecreatefromstring($string);
-			$this->assertTrue(is_resource($handle));
-			imagedestroy($handle);
-		}
-		
-		function testSaveToFile()
-		{
-			$handle = imagecreatefromgif(IMG_PATH . '100x100-color-hole.gif');
-			$this->mapper->save($handle, IMG_PATH . 'temp/test.gd2');
-			$this->assertTrue(filesize(IMG_PATH . 'temp/test.gd2') > 0);
-			imagedestroy($handle);
-			
-			// file is a valid image
-			$handle = imagecreatefromgd2(IMG_PATH . 'temp/test.gd2');
-			$this->assertTrue(WideImage::isValidImageHandle($handle));
-			imagedestroy($handle);
-		}
-	}
+    /**
+     */
+    class WideImage_Mapper_GD2_Test extends WideImage_TestCase
+    {
+        protected $mapper;
+
+        public function setup()
+        {
+            $this->mapper = WideImage_MapperFactory::selectMapper(null, 'gd2');
+        }
+
+        public function teardown()
+        {
+            $this->mapper = null;
+
+            if (file_exists(IMG_PATH.'temp/test.gd2')) {
+                unlink(IMG_PATH.'temp/test.gd2');
+            }
+        }
+
+        public function testSaveToString()
+        {
+            $handle = imagecreatefromgif(IMG_PATH.'100x100-color-hole.gif');
+            ob_start();
+            $this->mapper->save($handle);
+            $string = ob_get_clean();
+            $this->assertTrue(strlen($string) > 0);
+            imagedestroy($handle);
+
+            // string contains valid image data
+            $handle = imagecreatefromstring($string);
+            $this->assertTrue(is_resource($handle));
+            imagedestroy($handle);
+        }
+
+        public function testSaveToFile()
+        {
+            $handle = imagecreatefromgif(IMG_PATH.'100x100-color-hole.gif');
+            $this->mapper->save($handle, IMG_PATH.'temp/test.gd2');
+            $this->assertTrue(filesize(IMG_PATH.'temp/test.gd2') > 0);
+            imagedestroy($handle);
+
+            // file is a valid image
+            $handle = imagecreatefromgd2(IMG_PATH.'temp/test.gd2');
+            $this->assertTrue(WideImage::isValidImageHandle($handle));
+            imagedestroy($handle);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GDTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GDTest.php
index f80ac2a4a..165990741 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GDTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GDTest.php
@@ -1,59 +1,42 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	include WideImage::path() . 'Mapper/GD.php';
+    /**
+     
+     **/
+    include WideImage::path().'Mapper/GD.php';
 
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Mapper_GD_Test extends WideImage_TestCase
-	{
-		/**
-		 * @var WideImage_Mapper_GD
-		 */
-		protected $mapper;
-		
-		function setup()
-		{
-			$this->mapper = WideImage_MapperFactory::selectMapper(null, 'gd');
-		}
-		
-		function teardown()
-		{
-			$this->mapper = null;
-			
-			if (file_exists(IMG_PATH . 'temp/test.gd'))
-				unlink(IMG_PATH . 'temp/test.gd');
-		}
-		
-		function testSaveAndLoad()
-		{
-			$handle = imagecreatefromgif(IMG_PATH . '100x100-color-hole.gif');
-			$this->mapper->save($handle, IMG_PATH . 'temp/test.gd');
-			$this->assertTrue(filesize(IMG_PATH . 'temp/test.gd') > 0);
-			imagedestroy($handle);
-			
-			// file is a valid image
-			$handle = $this->mapper->load(IMG_PATH . 'temp/test.gd');
-			$this->assertTrue(WideImage::isValidImageHandle($handle));
-			imagedestroy($handle);
-		}
-	}
+    /**
+     */
+    class WideImage_Mapper_GD_Test extends WideImage_TestCase
+    {
+        /**
+         * @var WideImage_Mapper_GD
+         */
+        protected $mapper;
+
+        public function setup()
+        {
+            $this->mapper = WideImage_MapperFactory::selectMapper(null, 'gd');
+        }
+
+        public function teardown()
+        {
+            $this->mapper = null;
+
+            if (file_exists(IMG_PATH.'temp/test.gd')) {
+                unlink(IMG_PATH.'temp/test.gd');
+            }
+        }
+
+        public function testSaveAndLoad()
+        {
+            $handle = imagecreatefromgif(IMG_PATH.'100x100-color-hole.gif');
+            $this->mapper->save($handle, IMG_PATH.'temp/test.gd');
+            $this->assertTrue(filesize(IMG_PATH.'temp/test.gd') > 0);
+            imagedestroy($handle);
+
+            // file is a valid image
+            $handle = $this->mapper->load(IMG_PATH.'temp/test.gd');
+            $this->assertTrue(WideImage::isValidImageHandle($handle));
+            imagedestroy($handle);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GIFTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GIFTest.php
index 8a5d920fd..1ada9ea0e 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GIFTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/GIFTest.php
@@ -1,83 +1,65 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	include WideImage::path() . 'Mapper/GIF.php';
+    /**
+     
+     **/
+    include WideImage::path().'Mapper/GIF.php';
 
-	/**
-	 * @package Tests
-	 *
-	 * @group Mapper
-	 * @group GIF
-	 */
-	class WideImage_Mapper_GIF_Test extends WideImage_TestCase
-	{
-		protected $mapper;
-		
-		function setup()
-		{
-			$this->mapper = WideImage_MapperFactory::selectMapper(null, 'gif');
-		}
-		
-		function teardown()
-		{
-			$this->mapper = null;
-			
-			if (file_exists(IMG_PATH . 'temp/test.gif'))
-				unlink(IMG_PATH . 'temp/test.gif');
-		}
-		
-		function testLoad()
-		{
-			$handle = $this->mapper->load(IMG_PATH . '100x100-color-hole.gif');
-			$this->assertTrue(is_resource($handle));
-			$this->assertEquals(100, imagesx($handle));
-			$this->assertEquals(100, imagesy($handle));
-			imagedestroy($handle);
-		}
-		
-		function testSaveToString()
-		{
-			$handle = imagecreatefromgif(IMG_PATH . '100x100-color-hole.gif');
-			ob_start();
-			$this->mapper->save($handle);
-			$string = ob_get_clean();
-			$this->assertTrue(strlen($string) > 0);
-			imagedestroy($handle);
-			
-			// string contains valid image data
-			$handle = imagecreatefromstring($string);
-			$this->assertTrue(is_resource($handle));
-			imagedestroy($handle);
-		}
-		
-		function testSaveToFile()
-		{
-			$handle = imagecreatefromgif(IMG_PATH . '100x100-color-hole.gif');
-			$this->mapper->save($handle, IMG_PATH . 'temp/test.gif');
-			$this->assertTrue(filesize(IMG_PATH . 'temp/test.gif') > 0);
-			imagedestroy($handle);
-			
-			// file is a valid image
-			$handle = imagecreatefromgif(IMG_PATH . 'temp/test.gif');
-			$this->assertTrue(is_resource($handle));
-			imagedestroy($handle);
-		}
-	}
+    /**
+     * @group Mapper
+     * @group GIF
+     */
+    class WideImage_Mapper_GIF_Test extends WideImage_TestCase
+    {
+        protected $mapper;
+
+        public function setup()
+        {
+            $this->mapper = WideImage_MapperFactory::selectMapper(null, 'gif');
+        }
+
+        public function teardown()
+        {
+            $this->mapper = null;
+
+            if (file_exists(IMG_PATH.'temp/test.gif')) {
+                unlink(IMG_PATH.'temp/test.gif');
+            }
+        }
+
+        public function testLoad()
+        {
+            $handle = $this->mapper->load(IMG_PATH.'100x100-color-hole.gif');
+            $this->assertTrue(is_resource($handle));
+            $this->assertEquals(100, imagesx($handle));
+            $this->assertEquals(100, imagesy($handle));
+            imagedestroy($handle);
+        }
+
+        public function testSaveToString()
+        {
+            $handle = imagecreatefromgif(IMG_PATH.'100x100-color-hole.gif');
+            ob_start();
+            $this->mapper->save($handle);
+            $string = ob_get_clean();
+            $this->assertTrue(strlen($string) > 0);
+            imagedestroy($handle);
+
+            // string contains valid image data
+            $handle = imagecreatefromstring($string);
+            $this->assertTrue(is_resource($handle));
+            imagedestroy($handle);
+        }
+
+        public function testSaveToFile()
+        {
+            $handle = imagecreatefromgif(IMG_PATH.'100x100-color-hole.gif');
+            $this->mapper->save($handle, IMG_PATH.'temp/test.gif');
+            $this->assertTrue(filesize(IMG_PATH.'temp/test.gif') > 0);
+            imagedestroy($handle);
+
+            // file is a valid image
+            $handle = imagecreatefromgif(IMG_PATH.'temp/test.gif');
+            $this->assertTrue(is_resource($handle));
+            imagedestroy($handle);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/JPEGTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/JPEGTest.php
index 53598f815..47a30aeb8 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/JPEGTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/JPEGTest.php
@@ -1,98 +1,81 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	include WideImage::path() . 'Mapper/JPEG.php';
+    /**
+     
+     **/
+    include WideImage::path().'Mapper/JPEG.php';
 
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Mapper_JPEG_Test extends WideImage_TestCase
-	{
-		protected $mapper;
-		
-		function setup()
-		{
-			$this->mapper = WideImage_MapperFactory::selectMapper(null, 'jpg');
-		}
-		
-		function teardown()
-		{
-			$this->mapper = null;
-			
-			if (file_exists(IMG_PATH . 'temp/test.jpg'))
-				unlink(IMG_PATH . 'temp/test.jpg');
-		}
-		
-		function testLoad()
-		{
-			$handle = $this->mapper->load(IMG_PATH . 'fgnl.jpg');
-			$this->assertTrue(is_resource($handle));
-			$this->assertEquals(174, imagesx($handle));
-			$this->assertEquals(287, imagesy($handle));
-			imagedestroy($handle);
-		}
-		
-		function testSaveToString()
-		{
-			$handle = imagecreatefromjpeg(IMG_PATH . 'fgnl.jpg');
-			ob_start();
-			$this->mapper->save($handle);
-			$string = ob_get_clean();
-			$this->assertTrue(strlen($string) > 0);
-			imagedestroy($handle);
-			
-			// string contains valid image data
-			$handle = imagecreatefromstring($string);
-			$this->assertTrue(is_resource($handle));
-			imagedestroy($handle);
-		}
-		
-		function testSaveToFile()
-		{
-			$handle = imagecreatefromjpeg(IMG_PATH . 'fgnl.jpg');
-			$this->mapper->save($handle, IMG_PATH . 'temp/test.jpg');
-			$this->assertTrue(filesize(IMG_PATH . 'temp/test.jpg') > 0);
-			imagedestroy($handle);
-			
-			// file is a valid image
-			$handle = imagecreatefromjpeg(IMG_PATH . 'temp/test.jpg');
-			$this->assertTrue(is_resource($handle));
-			imagedestroy($handle);
-		}
-		
-		function testQuality()
-		{
-			$handle = imagecreatefromjpeg(IMG_PATH . 'fgnl.jpg');
-			
-			ob_start();
-			$this->mapper->save($handle, null, 100);
-			$hq = ob_get_clean();
-			
-			ob_start();
-			$this->mapper->save($handle, null, 10);
-			$lq = ob_get_clean();
-			
-			$this->assertTrue(strlen($hq) > 0);
-			$this->assertTrue(strlen($lq) > 0);
-			$this->assertTrue(strlen($hq) > strlen($lq));
-			imagedestroy($handle);
-		}
-	}
+    /**
+     */
+    class WideImage_Mapper_JPEG_Test extends WideImage_TestCase
+    {
+        protected $mapper;
+
+        public function setup()
+        {
+            $this->mapper = WideImage_MapperFactory::selectMapper(null, 'jpg');
+        }
+
+        public function teardown()
+        {
+            $this->mapper = null;
+
+            if (file_exists(IMG_PATH.'temp/test.jpg')) {
+                unlink(IMG_PATH.'temp/test.jpg');
+            }
+        }
+
+        public function testLoad()
+        {
+            $handle = $this->mapper->load(IMG_PATH.'fgnl.jpg');
+            $this->assertTrue(is_resource($handle));
+            $this->assertEquals(174, imagesx($handle));
+            $this->assertEquals(287, imagesy($handle));
+            imagedestroy($handle);
+        }
+
+        public function testSaveToString()
+        {
+            $handle = imagecreatefromjpeg(IMG_PATH.'fgnl.jpg');
+            ob_start();
+            $this->mapper->save($handle);
+            $string = ob_get_clean();
+            $this->assertTrue(strlen($string) > 0);
+            imagedestroy($handle);
+
+            // string contains valid image data
+            $handle = imagecreatefromstring($string);
+            $this->assertTrue(is_resource($handle));
+            imagedestroy($handle);
+        }
+
+        public function testSaveToFile()
+        {
+            $handle = imagecreatefromjpeg(IMG_PATH.'fgnl.jpg');
+            $this->mapper->save($handle, IMG_PATH.'temp/test.jpg');
+            $this->assertTrue(filesize(IMG_PATH.'temp/test.jpg') > 0);
+            imagedestroy($handle);
+
+            // file is a valid image
+            $handle = imagecreatefromjpeg(IMG_PATH.'temp/test.jpg');
+            $this->assertTrue(is_resource($handle));
+            imagedestroy($handle);
+        }
+
+        public function testQuality()
+        {
+            $handle = imagecreatefromjpeg(IMG_PATH.'fgnl.jpg');
+
+            ob_start();
+            $this->mapper->save($handle, null, 100);
+            $hq = ob_get_clean();
+
+            ob_start();
+            $this->mapper->save($handle, null, 10);
+            $lq = ob_get_clean();
+
+            $this->assertTrue(strlen($hq) > 0);
+            $this->assertTrue(strlen($lq) > 0);
+            $this->assertTrue(strlen($hq) > strlen($lq));
+            imagedestroy($handle);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/PNGTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/PNGTest.php
index 18a883a14..b0d8baf22 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/PNGTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/PNGTest.php
@@ -1,93 +1,76 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	include WideImage::path() . 'Mapper/PNG.php';
+    /**
+     
+     **/
+    include WideImage::path().'Mapper/PNG.php';
 
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Mapper_PNG_Test extends WideImage_TestCase
-	{
-		protected $mapper;
-		
-		function setup()
-		{
-			$this->mapper = WideImage_MapperFactory::selectMapper(null, 'png');
-		}
-		
-		function teardown()
-		{
-			$this->mapper = null;
-			
-			if (file_exists(IMG_PATH . 'temp/test.png'))
-				unlink(IMG_PATH . 'temp/test.png');
-		}
-		
-		function testLoad()
-		{
-			$handle = $this->mapper->load(IMG_PATH . '100x100-color-hole.png');
-			$this->assertTrue(is_resource($handle));
-			$this->assertEquals(100, imagesx($handle));
-			$this->assertEquals(100, imagesy($handle));
-			imagedestroy($handle);
-		}
-		
-		function testSaveToString()
-		{
-			$handle = imagecreatefrompng(IMG_PATH . '100x100-color-hole.png');
-			ob_start();
-			$this->mapper->save($handle);
-			$string = ob_get_clean();
-			$this->assertTrue(strlen($string) > 0);
-			imagedestroy($handle);
-			
-			// string contains valid image data
-			$handle = imagecreatefromstring($string);
-			$this->assertTrue(is_resource($handle));
-			imagedestroy($handle);
-		}
-		
-		function testSaveToFile()
-		{
-			$handle = imagecreatefrompng(IMG_PATH . '100x100-color-hole.png');
-			$this->mapper->save($handle, IMG_PATH . 'temp/test.png');
-			$this->assertTrue(filesize(IMG_PATH . 'temp/test.png') > 0);
-			imagedestroy($handle);
-			
-			// file is a valid image
-			$handle = imagecreatefrompng(IMG_PATH . 'temp/test.png');
-			$this->assertTrue(is_resource($handle));
-			imagedestroy($handle);
-		}
-		
-		function testSaveCompression()
-		{
-			$handle = $this->mapper->load(IMG_PATH . '100x100-rainbow.png');
-			$file1 = IMG_PATH . 'temp/test-comp-0.png';
-			$file2 = IMG_PATH . 'temp/test-comp-9.png';
-			$this->mapper->save($handle, $file1, 0);
-			$this->mapper->save($handle, $file2, 9);
-			$this->assertTrue(filesize($file1) > filesize($file2));
-			
-			unlink($file1);
-			unlink($file2);
-		}
-	}
+    /**
+     */
+    class WideImage_Mapper_PNG_Test extends WideImage_TestCase
+    {
+        protected $mapper;
+
+        public function setup()
+        {
+            $this->mapper = WideImage_MapperFactory::selectMapper(null, 'png');
+        }
+
+        public function teardown()
+        {
+            $this->mapper = null;
+
+            if (file_exists(IMG_PATH.'temp/test.png')) {
+                unlink(IMG_PATH.'temp/test.png');
+            }
+        }
+
+        public function testLoad()
+        {
+            $handle = $this->mapper->load(IMG_PATH.'100x100-color-hole.png');
+            $this->assertTrue(is_resource($handle));
+            $this->assertEquals(100, imagesx($handle));
+            $this->assertEquals(100, imagesy($handle));
+            imagedestroy($handle);
+        }
+
+        public function testSaveToString()
+        {
+            $handle = imagecreatefrompng(IMG_PATH.'100x100-color-hole.png');
+            ob_start();
+            $this->mapper->save($handle);
+            $string = ob_get_clean();
+            $this->assertTrue(strlen($string) > 0);
+            imagedestroy($handle);
+
+            // string contains valid image data
+            $handle = imagecreatefromstring($string);
+            $this->assertTrue(is_resource($handle));
+            imagedestroy($handle);
+        }
+
+        public function testSaveToFile()
+        {
+            $handle = imagecreatefrompng(IMG_PATH.'100x100-color-hole.png');
+            $this->mapper->save($handle, IMG_PATH.'temp/test.png');
+            $this->assertTrue(filesize(IMG_PATH.'temp/test.png') > 0);
+            imagedestroy($handle);
+
+            // file is a valid image
+            $handle = imagecreatefrompng(IMG_PATH.'temp/test.png');
+            $this->assertTrue(is_resource($handle));
+            imagedestroy($handle);
+        }
+
+        public function testSaveCompression()
+        {
+            $handle = $this->mapper->load(IMG_PATH.'100x100-rainbow.png');
+            $file1 = IMG_PATH.'temp/test-comp-0.png';
+            $file2 = IMG_PATH.'temp/test-comp-9.png';
+            $this->mapper->save($handle, $file1, 0);
+            $this->mapper->save($handle, $file2, 9);
+            $this->assertTrue(filesize($file1) > filesize($file2));
+
+            unlink($file1);
+            unlink($file2);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/TGATest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/TGATest.php
index 27a43ff3c..0976ac00b 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/TGATest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Mapper/TGATest.php
@@ -1,71 +1,53 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	include WideImage::path() . 'Mapper/TGA.php';
-	
-	/**
-	 * @package Tests
-	 * @group mapper
-	 */
-	class WideImage_Mapper_TGA_Test extends WideImage_TestCase
-	{
-		/**
-		 * @var WideImage_Mapper_TGA
-		 */
-		protected $mapper;
-		
-		function setup()
-		{
-			$this->mapper = WideImage_MapperFactory::selectMapper(null, 'tga');
-		}
-		
-		function teardown()
-		{
-			$this->mapper = null;
-		}
-		
-		function testLoad()
-		{
-			$handle = $this->mapper->load(IMG_PATH . 'splat.tga');
-			$this->assertTrue(is_resource($handle));
-			$this->assertEquals(100, imagesx($handle));
-			$this->assertEquals(100, imagesy($handle));
-			imagedestroy($handle);
-		}
-		
-		/**
-		 * @expectedException WideImage_Exception
-		 */
-		function testSaveToStringNotSupported()
-		{
-			$handle = WideImage_vendor_de77_BMP::imagecreatefrombmp(IMG_PATH . 'splat.tga');
-			$this->mapper->save($handle);
-		}
-		
-		/**
-		 * @expectedException WideImage_Exception
-		 */
-		function testSaveToFileNotSupported()
-		{
-			$handle = imagecreatefromgif(IMG_PATH . '100x100-color-hole.gif');
-			$this->mapper->save($handle, IMG_PATH . 'temp/test.bmp');
-		}
-	}
+    /**
+     
+     **/
+    include WideImage::path().'Mapper/TGA.php';
+
+    /**
+     * @group mapper
+     */
+    class WideImage_Mapper_TGA_Test extends WideImage_TestCase
+    {
+        /**
+         * @var WideImage_Mapper_TGA
+         */
+        protected $mapper;
+
+        public function setup()
+        {
+            $this->mapper = WideImage_MapperFactory::selectMapper(null, 'tga');
+        }
+
+        public function teardown()
+        {
+            $this->mapper = null;
+        }
+
+        public function testLoad()
+        {
+            $handle = $this->mapper->load(IMG_PATH.'splat.tga');
+            $this->assertTrue(is_resource($handle));
+            $this->assertEquals(100, imagesx($handle));
+            $this->assertEquals(100, imagesy($handle));
+            imagedestroy($handle);
+        }
+
+        /**
+         * @expectedException WideImage_Exception
+         */
+        public function testSaveToStringNotSupported()
+        {
+            $handle = WideImage_vendor_de77_BMP::imagecreatefrombmp(IMG_PATH.'splat.tga');
+            $this->mapper->save($handle);
+        }
+
+        /**
+         * @expectedException WideImage_Exception
+         */
+        public function testSaveToFileNotSupported()
+        {
+            $handle = imagecreatefromgif(IMG_PATH.'100x100-color-hole.gif');
+            $this->mapper->save($handle, IMG_PATH.'temp/test.bmp');
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/MapperFactoryTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/MapperFactoryTest.php
index 04e771663..dfc87497c 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/MapperFactoryTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/MapperFactoryTest.php
@@ -1,50 +1,33 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_MapperFactory_Test extends WideImage_TestCase
-	{
-		function testMapperPNGByURI()
-		{
-			$mapper = WideImage_MapperFactory::selectMapper('uri.png');
-			$this->assertInstanceOf("WideImage_Mapper_PNG", $mapper);
-		}
-		
-		function testMapperGIFByURI()
-		{
-			$mapper = WideImage_MapperFactory::selectMapper('uri.gif');
-			$this->assertInstanceOf("WideImage_Mapper_GIF", $mapper);
-		}
-		
-		function testMapperJPGByURI()
-		{
-			$mapper = WideImage_MapperFactory::selectMapper('uri.jpg');
-			$this->assertInstanceOf("WideImage_Mapper_JPEG", $mapper);
-		}
-		
-		function testMapperBMPByURI()
-		{
-			$mapper = WideImage_MapperFactory::selectMapper('uri.bmp');
-			$this->assertInstanceOf("WideImage_Mapper_BMP", $mapper);
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_MapperFactory_Test extends WideImage_TestCase
+    {
+        public function testMapperPNGByURI()
+        {
+            $mapper = WideImage_MapperFactory::selectMapper('uri.png');
+            $this->assertInstanceOf('WideImage_Mapper_PNG', $mapper);
+        }
+
+        public function testMapperGIFByURI()
+        {
+            $mapper = WideImage_MapperFactory::selectMapper('uri.gif');
+            $this->assertInstanceOf('WideImage_Mapper_GIF', $mapper);
+        }
+
+        public function testMapperJPGByURI()
+        {
+            $mapper = WideImage_MapperFactory::selectMapper('uri.jpg');
+            $this->assertInstanceOf('WideImage_Mapper_JPEG', $mapper);
+        }
+
+        public function testMapperBMPByURI()
+        {
+            $mapper = WideImage_MapperFactory::selectMapper('uri.bmp');
+            $this->assertInstanceOf('WideImage_Mapper_BMP', $mapper);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyConvolutionTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyConvolutionTest.php
index 49f3130b0..d29722e7f 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyConvolutionTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyConvolutionTest.php
@@ -1,39 +1,22 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 * @group operation
-	 */
-	class WideImage_Operation_ApplyConvolution_Test extends WideImage_TestCase
-	{
-		function testApplyConvolution()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$result = $img->applyConvolution(array(array(2, 0, 0), array(0, -1, 0), array(0, 0, -1)), 1, 220);
-			
-			$this->assertTrue($result instanceof WideImage_TrueColorImage);
-			$this->assertTrue($result->isTransparent());
-			
-			$this->assertEquals(100, $result->getWidth());
-			$this->assertEquals(100, $result->getHeight());
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     * @group operation
+     */
+    class WideImage_Operation_ApplyConvolution_Test extends WideImage_TestCase
+    {
+        public function testApplyConvolution()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $result = $img->applyConvolution([[2, 0, 0], [0, -1, 0], [0, 0, -1]], 1, 220);
+
+            $this->assertTrue($result instanceof WideImage_TrueColorImage);
+            $this->assertTrue($result->isTransparent());
+
+            $this->assertEquals(100, $result->getWidth());
+            $this->assertEquals(100, $result->getHeight());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyFilterTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyFilterTest.php
index 3e561db48..094357f11 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyFilterTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyFilterTest.php
@@ -1,39 +1,22 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 * @group operation
-	 */
-	class WideImage_Operation_ApplyFilter_Test extends WideImage_TestCase
-	{
-		function testApplyFilter()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$result = $img->applyFilter(IMG_FILTER_EDGEDETECT);
-			
-			$this->assertTrue($result instanceof WideImage_TrueColorImage);
-			$this->assertTrue($result->isTransparent());
-			
-			$this->assertEquals(100, $result->getWidth());
-			$this->assertEquals(100, $result->getHeight());
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     * @group operation
+     */
+    class WideImage_Operation_ApplyFilter_Test extends WideImage_TestCase
+    {
+        public function testApplyFilter()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $result = $img->applyFilter(IMG_FILTER_EDGEDETECT);
+
+            $this->assertTrue($result instanceof WideImage_TrueColorImage);
+            $this->assertTrue($result->isTransparent());
+
+            $this->assertEquals(100, $result->getWidth());
+            $this->assertEquals(100, $result->getHeight());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyMaskTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyMaskTest.php
index 18f94491a..1ead835d6 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyMaskTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ApplyMaskTest.php
@@ -1,43 +1,26 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_ApplyMask_Test extends WideImage_TestCase
-	{
-		function testApplyMask()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$mask = WideImage::load(IMG_PATH . '75x25-gray.png');
-			
-			$result = $img->applyMask($mask);
-			$this->assertTrue($result instanceof WideImage_TrueColorImage);
-			$this->assertTrue($result->isTransparent());
-			
-			$this->assertEquals(100, $result->getWidth());
-			$this->assertEquals(100, $result->getHeight());
-			
-			$this->assertRGBNear($result->getRGBAt(10, 10), 255, 255, 255);
-			$this->assertRGBNear($result->getRGBAt(30, 10), 255, 255, 0, 64);
-			$this->assertRGBNear($result->getRGBAt(60, 10), 0, 0, 255, 0);
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Operation_ApplyMask_Test extends WideImage_TestCase
+    {
+        public function testApplyMask()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $mask = WideImage::load(IMG_PATH.'75x25-gray.png');
+
+            $result = $img->applyMask($mask);
+            $this->assertTrue($result instanceof WideImage_TrueColorImage);
+            $this->assertTrue($result->isTransparent());
+
+            $this->assertEquals(100, $result->getWidth());
+            $this->assertEquals(100, $result->getHeight());
+
+            $this->assertRGBNear($result->getRGBAt(10, 10), 255, 255, 255);
+            $this->assertRGBNear($result->getRGBAt(30, 10), 255, 255, 0, 64);
+            $this->assertRGBNear($result->getRGBAt(60, 10), 0, 0, 255, 0);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AsGrayscaleTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AsGrayscaleTest.php
index debb58dec..3d4cd160d 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AsGrayscaleTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AsGrayscaleTest.php
@@ -1,82 +1,65 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_AsGrayscale_Test extends WideImage_TestCase
-	{
-		function skip()
-		{
-			$this->skipUnless(function_exists('imagefilter'));
-		}
-		
-		function testTransparentGIF()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			
-			$gray = $img->asGrayscale();
-			$this->assertTrue($gray instanceof WideImage_PaletteImage);
-			
-			$this->assertEquals(100, $gray->getWidth());
-			$this->assertEquals(100, $gray->getHeight());
-			
-			$this->assertRGBNear($gray->getRGBAt(10, 10), 227, 227, 227);
-			$this->assertRGBNear($gray->getRGBAt(90, 10), 28, 28, 28);
-			$this->assertRGBNear($gray->getRGBAt(90, 90), 150, 150, 150);
-			$this->assertRGBNear($gray->getRGBAt(10, 90), 76, 76, 76);
-			
-			// preserves transparency
-			$this->assertTrue($gray->isTransparent());
-			$this->assertEquals($gray->getColorAt(50, 50), $gray->getTransparentColor());
-		}
-		
-		function testTransparentLogoGIF()
-		{
-			$img = $this->load('logo.gif');
-			$this->assertTransparentColorAt($img, 1, 1);
-			
-			$res = $img->asGrayscale();
-			$this->assertDimensions($res, 150, 23);
-			$this->assertInstanceOf("WideImage_PaletteImage", $res);
-			
-			// preserves transparency
-			$this->assertTrue($res->isTransparent());
-			$this->assertTransparentColorAt($res, 1, 1);
-		}
-		
-		function testPNGAlpha()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			
-			$gray = $img->asGrayscale();
-			$this->assertTrue($gray instanceof WideImage_TrueColorImage);
-			$this->assertEquals(100, $gray->getWidth());
-			$this->assertEquals(100, $gray->getHeight());
-			
-			$this->assertRGBNear($gray->getRGBAt(25, 25), 29, 29, 29, 32);
-			$this->assertRGBNear($gray->getRGBAt(75, 25), 29, 29, 29, 64);
-			$this->assertRGBNear($gray->getRGBAt(75, 75), 29, 29, 29, 96);
-			$this->assertRGBNear($gray->getRGBAt(25, 75), 0, 0, 0, 127);
-			
-			$this->assertFalse($gray->isTransparent());
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Operation_AsGrayscale_Test extends WideImage_TestCase
+    {
+        public function skip()
+        {
+            $this->skipUnless(function_exists('imagefilter'));
+        }
+
+        public function testTransparentGIF()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+
+            $gray = $img->asGrayscale();
+            $this->assertTrue($gray instanceof WideImage_PaletteImage);
+
+            $this->assertEquals(100, $gray->getWidth());
+            $this->assertEquals(100, $gray->getHeight());
+
+            $this->assertRGBNear($gray->getRGBAt(10, 10), 227, 227, 227);
+            $this->assertRGBNear($gray->getRGBAt(90, 10), 28, 28, 28);
+            $this->assertRGBNear($gray->getRGBAt(90, 90), 150, 150, 150);
+            $this->assertRGBNear($gray->getRGBAt(10, 90), 76, 76, 76);
+
+            // preserves transparency
+            $this->assertTrue($gray->isTransparent());
+            $this->assertEquals($gray->getColorAt(50, 50), $gray->getTransparentColor());
+        }
+
+        public function testTransparentLogoGIF()
+        {
+            $img = $this->load('logo.gif');
+            $this->assertTransparentColorAt($img, 1, 1);
+
+            $res = $img->asGrayscale();
+            $this->assertDimensions($res, 150, 23);
+            $this->assertInstanceOf('WideImage_PaletteImage', $res);
+
+            // preserves transparency
+            $this->assertTrue($res->isTransparent());
+            $this->assertTransparentColorAt($res, 1, 1);
+        }
+
+        public function testPNGAlpha()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+
+            $gray = $img->asGrayscale();
+            $this->assertTrue($gray instanceof WideImage_TrueColorImage);
+            $this->assertEquals(100, $gray->getWidth());
+            $this->assertEquals(100, $gray->getHeight());
+
+            $this->assertRGBNear($gray->getRGBAt(25, 25), 29, 29, 29, 32);
+            $this->assertRGBNear($gray->getRGBAt(75, 25), 29, 29, 29, 64);
+            $this->assertRGBNear($gray->getRGBAt(75, 75), 29, 29, 29, 96);
+            $this->assertRGBNear($gray->getRGBAt(25, 75), 0, 0, 0, 127);
+
+            $this->assertFalse($gray->isTransparent());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AsNegativeTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AsNegativeTest.php
index 2e9f26b6e..32ba2d1dc 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AsNegativeTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AsNegativeTest.php
@@ -1,81 +1,64 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_AsNegativeTest extends WideImage_TestCase
-	{
-		function skip()
-		{
-			$this->skipUnless(function_exists('imagefilter'));
-		}
-		
-		function testTransparentGIF()
-		{
-			$img = $this->load('100x100-color-hole.gif');
-			
-			$res = $img->asNegative();
-			
-			$this->assertDimensions($res, 100, 100);
-			$this->assertInstanceOf("WideImage_PaletteImage", $res);
-			
-			$this->assertRGBNear($res->getRGBAt(10, 10), 0, 0, 255);
-			$this->assertRGBNear($res->getRGBAt(90, 10), 255, 255, 0);
-			$this->assertRGBNear($res->getRGBAt(90, 90), 255, 0, 255);
-			$this->assertRGBNear($res->getRGBAt(10, 90), 0, 255, 255);
-			
-			// preserves transparency
-			$this->assertTrue($res->isTransparent());
-			$this->assertTransparentColorAt($res, 50, 50);
-		}
-		
-		function testTransparentLogoGIF()
-		{
-			$img = $this->load('logo.gif');
-			$this->assertTransparentColorAt($img, 1, 1);
-			
-			$res = $img->asNegative();
-			$this->assertDimensions($res, 150, 23);
-			$this->assertInstanceOf("WideImage_PaletteImage", $res);
-			
-			// preserves transparency
-			$this->assertTrue($res->isTransparent());
-			$this->assertTransparentColorAt($res, 1, 1);
-		}
-		
-		function testPNGAlpha()
-		{
-			$img = $this->load('100x100-blue-alpha.png');
-			
-			$res = $img->asNegative();
-			
-			$this->assertDimensions($res, 100, 100);
-			$this->assertInstanceOf("WideImage_TrueColorImage", $res);
-			
-			$this->assertRGBNear($res->getRGBAt(25, 25), 255, 255, 0, 32);
-			$this->assertRGBNear($res->getRGBAt(75, 25), 255, 255, 0, 64);
-			$this->assertRGBNear($res->getRGBAt(75, 75), 255, 255, 0, 96);
-			$this->assertRGBNear($res->getRGBAt(25, 75), 255, 255, 255, 127);
-			
-			$this->assertFalse($res->isTransparent());
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Operation_AsNegativeTest extends WideImage_TestCase
+    {
+        public function skip()
+        {
+            $this->skipUnless(function_exists('imagefilter'));
+        }
+
+        public function testTransparentGIF()
+        {
+            $img = $this->load('100x100-color-hole.gif');
+
+            $res = $img->asNegative();
+
+            $this->assertDimensions($res, 100, 100);
+            $this->assertInstanceOf('WideImage_PaletteImage', $res);
+
+            $this->assertRGBNear($res->getRGBAt(10, 10), 0, 0, 255);
+            $this->assertRGBNear($res->getRGBAt(90, 10), 255, 255, 0);
+            $this->assertRGBNear($res->getRGBAt(90, 90), 255, 0, 255);
+            $this->assertRGBNear($res->getRGBAt(10, 90), 0, 255, 255);
+
+            // preserves transparency
+            $this->assertTrue($res->isTransparent());
+            $this->assertTransparentColorAt($res, 50, 50);
+        }
+
+        public function testTransparentLogoGIF()
+        {
+            $img = $this->load('logo.gif');
+            $this->assertTransparentColorAt($img, 1, 1);
+
+            $res = $img->asNegative();
+            $this->assertDimensions($res, 150, 23);
+            $this->assertInstanceOf('WideImage_PaletteImage', $res);
+
+            // preserves transparency
+            $this->assertTrue($res->isTransparent());
+            $this->assertTransparentColorAt($res, 1, 1);
+        }
+
+        public function testPNGAlpha()
+        {
+            $img = $this->load('100x100-blue-alpha.png');
+
+            $res = $img->asNegative();
+
+            $this->assertDimensions($res, 100, 100);
+            $this->assertInstanceOf('WideImage_TrueColorImage', $res);
+
+            $this->assertRGBNear($res->getRGBAt(25, 25), 255, 255, 0, 32);
+            $this->assertRGBNear($res->getRGBAt(75, 25), 255, 255, 0, 64);
+            $this->assertRGBNear($res->getRGBAt(75, 75), 255, 255, 0, 96);
+            $this->assertRGBNear($res->getRGBAt(25, 75), 255, 255, 255, 127);
+
+            $this->assertFalse($res->isTransparent());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AutoCrop.test.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AutoCrop.test.php
index 5cf12737f..232f35591 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AutoCrop.test.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/AutoCrop.test.php
@@ -1,50 +1,33 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_Autocrop_Test extends WideImage_TestCase
-	{
-		function testAutocrop()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-red-spot.png');
-			
-			$cropped = $img->autocrop();
-			$this->assertTrue($cropped instanceof WideImage_TrueColorImage);
-			$this->assertEquals(71, $cropped->getWidth());
-			$this->assertEquals(70, $cropped->getHeight());
-			
-			$this->assertRGBNear($cropped->getRGBAt(10, 10), 255, 0, 0);
-		}
-		
-		function testAutocropHalfImageBug()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-red-spot-half-cut.png');
-			
-			$cropped = $img->autocrop();
-			$this->assertTrue($cropped instanceof WideImage_TrueColorImage);
-			$this->assertEquals(22, $cropped->getWidth());
-			$this->assertEquals(23, $cropped->getHeight());
-			
-			$this->assertRGBNear($cropped->getRGBAt(10, 10), 255, 0, 0);
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Operation_Autocrop_Test extends WideImage_TestCase
+    {
+        public function testAutocrop()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-red-spot.png');
+
+            $cropped = $img->autocrop();
+            $this->assertTrue($cropped instanceof WideImage_TrueColorImage);
+            $this->assertEquals(71, $cropped->getWidth());
+            $this->assertEquals(70, $cropped->getHeight());
+
+            $this->assertRGBNear($cropped->getRGBAt(10, 10), 255, 0, 0);
+        }
+
+        public function testAutocropHalfImageBug()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-red-spot-half-cut.png');
+
+            $cropped = $img->autocrop();
+            $this->assertTrue($cropped instanceof WideImage_TrueColorImage);
+            $this->assertEquals(22, $cropped->getWidth());
+            $this->assertEquals(23, $cropped->getHeight());
+
+            $this->assertRGBNear($cropped->getRGBAt(10, 10), 255, 0, 0);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/CorrectGammaTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/CorrectGammaTest.php
index c3c66193d..33c85b7d9 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/CorrectGammaTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/CorrectGammaTest.php
@@ -1,39 +1,22 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 * @group operation
-	 */
-	class WideImage_Operation_CorrectGamma_Test extends WideImage_TestCase
-	{
-		function test()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$result = $img->correctGamma(1, 2);
-			
-			$this->assertTrue($result instanceof WideImage_PaletteImage);
-			$this->assertTrue($result->isTransparent());
-			
-			$this->assertEquals(100, $result->getWidth());
-			$this->assertEquals(100, $result->getHeight());
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     * @group operation
+     */
+    class WideImage_Operation_CorrectGamma_Test extends WideImage_TestCase
+    {
+        public function test()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $result = $img->correctGamma(1, 2);
+
+            $this->assertTrue($result instanceof WideImage_PaletteImage);
+            $this->assertTrue($result->isTransparent());
+
+            $this->assertEquals(100, $result->getWidth());
+            $this->assertEquals(100, $result->getHeight());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/CropTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/CropTest.php
index 907ae615a..2159cee98 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/CropTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/CropTest.php
@@ -1,106 +1,89 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
+    /**
+     
+     **/
 
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_Crop_Test extends WideImage_TestCase
-	{
-		function testCropTransparentGif()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			
-			$cropped = $img->crop('10%', 15, 50, '40%');
-			
-			$this->assertTrue($cropped instanceof WideImage_PaletteImage);
-			$this->assertTrue($cropped->isTransparent());
-			$this->assertEquals(50, $cropped->getWidth());
-			$this->assertEquals(40, $cropped->getHeight());
-			
-			$this->assertRGBNear($cropped->getRGBAt(39, 9), 255, 255, 0);
-			$this->assertRGBNear($cropped->getRGBAt(40, 9), 0, 0, 255);
-			$this->assertRGBNear($cropped->getRGBAt(14, 35), 255, 0, 0);
-			$this->assertRGBNear($cropped->getRGBAt(16, 11), $cropped->getTransparentColorRGB());
-		}
-		
-		function testCropPNGAlpha()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			
-			$cropped = $img->crop(10, 10, 50, 50);
-			
-			$this->assertTrue($cropped instanceof WideImage_TrueColorImage);
-			$this->assertFalse($cropped->isTransparent());
-			$this->assertEquals(50, $cropped->getWidth());
-			$this->assertEquals(50, $cropped->getHeight());
-			
-			$this->assertRGBNear($cropped->getRGBAt(39, 39), 0, 0, 255, 32);
-			$this->assertRGBNear($cropped->getRGBAt(40, 40), 0, 0, 255, 96);
-		}
-		
-		function testCropHasCorrectSize()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			
-			$cropped = $img->crop(10, 10, 10, 10);
-			$this->assertEquals(10, $cropped->getWidth());
-			$this->assertEquals(10, $cropped->getHeight());
-			
-			$cropped = $img->crop(10, 20, 100, 200);
-			$this->assertEquals(90, $cropped->getWidth());
-			$this->assertEquals(80, $cropped->getHeight());
-		}
-		
-		function testCropIsNormalized()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			
-			$cropped = $img->crop(-10, -20, 100, 100);
-			$this->assertEquals(90, $cropped->getWidth());
-			$this->assertEquals(80, $cropped->getHeight());
-			
-			$cropped = $img->crop(10, 20, 140, 170);
-			$this->assertEquals(90, $cropped->getWidth());
-			$this->assertEquals(80, $cropped->getHeight());
-			
-			$cropped = $img->crop(-10, -20, 140, 170);
-			$this->assertEquals(100, $cropped->getWidth());
-			$this->assertEquals(100, $cropped->getHeight());
-		}
-		
-		/**
-		 * @expectedException WideImage_Exception
-		 */
-		function testCropCutsAreaOutsideBoundaries()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			$cropped = $img->crop(120, 100, 1, 2);
-		}
-		
-		/**
-		 * @expectedException WideImage_Exception
-		 */
-		function testCropCutsAreaNegativePosition()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			$cropped = $img->crop(-150, -200, 50, 50);
-		}
-	}
+    /**
+     */
+    class WideImage_Operation_Crop_Test extends WideImage_TestCase
+    {
+        public function testCropTransparentGif()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+
+            $cropped = $img->crop('10%', 15, 50, '40%');
+
+            $this->assertTrue($cropped instanceof WideImage_PaletteImage);
+            $this->assertTrue($cropped->isTransparent());
+            $this->assertEquals(50, $cropped->getWidth());
+            $this->assertEquals(40, $cropped->getHeight());
+
+            $this->assertRGBNear($cropped->getRGBAt(39, 9), 255, 255, 0);
+            $this->assertRGBNear($cropped->getRGBAt(40, 9), 0, 0, 255);
+            $this->assertRGBNear($cropped->getRGBAt(14, 35), 255, 0, 0);
+            $this->assertRGBNear($cropped->getRGBAt(16, 11), $cropped->getTransparentColorRGB());
+        }
+
+        public function testCropPNGAlpha()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+
+            $cropped = $img->crop(10, 10, 50, 50);
+
+            $this->assertTrue($cropped instanceof WideImage_TrueColorImage);
+            $this->assertFalse($cropped->isTransparent());
+            $this->assertEquals(50, $cropped->getWidth());
+            $this->assertEquals(50, $cropped->getHeight());
+
+            $this->assertRGBNear($cropped->getRGBAt(39, 39), 0, 0, 255, 32);
+            $this->assertRGBNear($cropped->getRGBAt(40, 40), 0, 0, 255, 96);
+        }
+
+        public function testCropHasCorrectSize()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+
+            $cropped = $img->crop(10, 10, 10, 10);
+            $this->assertEquals(10, $cropped->getWidth());
+            $this->assertEquals(10, $cropped->getHeight());
+
+            $cropped = $img->crop(10, 20, 100, 200);
+            $this->assertEquals(90, $cropped->getWidth());
+            $this->assertEquals(80, $cropped->getHeight());
+        }
+
+        public function testCropIsNormalized()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+
+            $cropped = $img->crop(-10, -20, 100, 100);
+            $this->assertEquals(90, $cropped->getWidth());
+            $this->assertEquals(80, $cropped->getHeight());
+
+            $cropped = $img->crop(10, 20, 140, 170);
+            $this->assertEquals(90, $cropped->getWidth());
+            $this->assertEquals(80, $cropped->getHeight());
+
+            $cropped = $img->crop(-10, -20, 140, 170);
+            $this->assertEquals(100, $cropped->getWidth());
+            $this->assertEquals(100, $cropped->getHeight());
+        }
+
+        /**
+         * @expectedException WideImage_Exception
+         */
+        public function testCropCutsAreaOutsideBoundaries()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+            $cropped = $img->crop(120, 100, 1, 2);
+        }
+
+        /**
+         * @expectedException WideImage_Exception
+         */
+        public function testCropCutsAreaNegativePosition()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+            $cropped = $img->crop(-150, -200, 50, 50);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/FlipTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/FlipTest.php
index 4c9b4c1f3..37a21ed50 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/FlipTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/FlipTest.php
@@ -1,52 +1,34 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class FlipTest extends WideImage_TestCase
-	{
-		function testFlip()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			
-			$this->assertRGBEqual($img->getRGBAt(5, 5), 255, 255, 0);
-			$this->assertRGBEqual($img->getRGBAt(95, 5), 0, 0, 255);
-			$this->assertRGBEqual($img->getRGBAt(95, 95), 0, 255, 0);
-			$this->assertRGBEqual($img->getRGBAt(5, 95), 255, 0, 0);
-			
-			$new = $img->flip();
-			
-			$this->assertTrue($new instanceof WideImage_PaletteImage);
-			
-			$this->assertEquals(100, $new->getWidth());
-			$this->assertEquals(100, $new->getHeight());
-			
-			$this->assertRGBEqual($new->getRGBAt(5, 95), 255, 255, 0);
-			$this->assertRGBEqual($new->getRGBAt(95, 95), 0, 0, 255);
-			$this->assertRGBEqual($new->getRGBAt(95, 5), 0, 255, 0);
-			$this->assertRGBEqual($new->getRGBAt(5, 5), 255, 0, 0);
-			
-			$this->assertTrue($new->isTransparent());
-			$this->assertRGBEqual($new->getRGBAt(50, 50), $img->getTransparentColorRGB());
-		}
-	}
-?>
\ No newline at end of file
+    /**
+     
+     **/
+
+    /**
+     */
+    class FlipTest extends WideImage_TestCase
+    {
+        public function testFlip()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+
+            $this->assertRGBEqual($img->getRGBAt(5, 5), 255, 255, 0);
+            $this->assertRGBEqual($img->getRGBAt(95, 5), 0, 0, 255);
+            $this->assertRGBEqual($img->getRGBAt(95, 95), 0, 255, 0);
+            $this->assertRGBEqual($img->getRGBAt(5, 95), 255, 0, 0);
+
+            $new = $img->flip();
+
+            $this->assertTrue($new instanceof WideImage_PaletteImage);
+
+            $this->assertEquals(100, $new->getWidth());
+            $this->assertEquals(100, $new->getHeight());
+
+            $this->assertRGBEqual($new->getRGBAt(5, 95), 255, 255, 0);
+            $this->assertRGBEqual($new->getRGBAt(95, 95), 0, 0, 255);
+            $this->assertRGBEqual($new->getRGBAt(95, 5), 0, 255, 0);
+            $this->assertRGBEqual($new->getRGBAt(5, 5), 255, 0, 0);
+
+            $this->assertTrue($new->isTransparent());
+            $this->assertRGBEqual($new->getRGBAt(50, 50), $img->getTransparentColorRGB());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetChannelsTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetChannelsTest.php
index 24219bd93..1a710e6cb 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetChannelsTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetChannelsTest.php
@@ -1,123 +1,106 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_GetChannels_Test extends WideImage_TestCase
-	{
-		function testCopyChannel8bit()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			
-			$copy = $img->getChannels('red', 'alpha');
-			$this->assertTrue($copy instanceof WideImage_PaletteImage);
-			$this->assertTrue($copy->isValid());
-			$this->assertFalse($copy->isTrueColor());
-			$this->assertTrue($copy->isTransparent());
-			
-			$this->assertRGBEqual($copy->getRGBAt(15, 15), 255, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(15, 85), 255, 0, 0);
-			$this->assertEquals($copy->getTransparentColor(), $copy->getColorAt(50, 50));
-			
-			$copy = $img->getChannels('red');
-			$this->assertTrue($copy instanceof WideImage_PaletteImage);
-			$this->assertTrue($copy->isValid());
-			$this->assertFalse($copy->isTrueColor());
-			$this->assertTrue($copy->isTransparent());
-			
-			$this->assertRGBEqual($copy->getRGBAt(15, 15), 255, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(15, 85), 255, 0, 0);
-			$this->assertEquals($copy->getTransparentColor(), $copy->getColorAt(50, 50));
-			
-			$copy = $img->getChannels('green');
-			$this->assertTrue($copy instanceof WideImage_PaletteImage);
-			$this->assertTrue($copy->isValid());
-			$this->assertFalse($copy->isTrueColor());
-			$this->assertTrue($copy->isTransparent());
-			
-			$this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 255, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 255, 0);
-			$this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 0, 0);
-			$this->assertEquals($copy->getTransparentColor(), $copy->getColorAt(50, 50));
-		}
-		
-		function testCopySingleChannel()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-rgbyg.png');
-			
-			$copy = $img->getChannels('red');
-			$this->assertFalse($img->getHandle() === $copy->getHandle());
-			$this->assertTrue($copy instanceof WideImage_TrueColorImage);
-			$this->assertTrue($copy->isValid());
-			$this->assertTrue($copy->isTrueColor());
-			$this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 15), 255, 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 85), 255, 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(50, 50), 127, 0, 0, 0);
-			/*
-			$copy = $img->copyChannels('green');
-			$this->assertFalse($img->getHandle() === $copy->getHandle());
-			$this->assertTrue($copy instanceof WideImage_TrueColorImage);
-			$this->assertTrue($copy->isValid());
-			$this->assertTrue($copy->isTrueColor());
-			$this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 255, 0);
-			$this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 255, 0);
-			$this->assertRGBEqual($copy->getRGBAt(50, 50), 0, 127, 0);
-			
-			$copy = $img->copyChannels('blue');
-			$this->assertFalse($img->getHandle() === $copy->getHandle());
-			$this->assertTrue($copy instanceof WideImage_TrueColorImage);
-			$this->assertTrue($copy->isValid());
-			$this->assertTrue($copy->isTrueColor());
-			$this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 0, 255);
-			$this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(50, 50), 0, 0, 127);
-			
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			$copy = $img->copyChannels('alpha');
-			$this->assertRGBNear($copy->getRGBAt(25, 25), 0, 0, 0, 0.25 * 127);
-			$this->assertRGBNear($copy->getRGBAt(75, 25), 0, 0, 0, 0.5 * 127);
-			$this->assertRGBNear($copy->getRGBAt(75, 75), 0, 0, 0, 0.75 * 127);
-			$this->assertRGBNear($copy->getRGBAt(25, 75), 0, 0, 0, 127);
-			*/
-		}
-		
-		function testCopyCombinedChannels()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			$copy = $img->getChannels('blue', 'alpha');
-			$this->assertRGBNear($copy->getRGBAt(25, 25), 0, 0, 255, 0.25 * 127);
-			$this->assertRGBNear($copy->getRGBAt(75, 25), 0, 0, 255, 0.5 * 127);
-			$this->assertRGBNear($copy->getRGBAt(75, 75), 0, 0, 255, 0.75 * 127);
-			$this->assertRGBNear($copy->getRGBAt(25, 75), 0, 0, 0, 127);
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Operation_GetChannels_Test extends WideImage_TestCase
+    {
+        public function testCopyChannel8bit()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+
+            $copy = $img->getChannels('red', 'alpha');
+            $this->assertTrue($copy instanceof WideImage_PaletteImage);
+            $this->assertTrue($copy->isValid());
+            $this->assertFalse($copy->isTrueColor());
+            $this->assertTrue($copy->isTransparent());
+
+            $this->assertRGBEqual($copy->getRGBAt(15, 15), 255, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(15, 85), 255, 0, 0);
+            $this->assertEquals($copy->getTransparentColor(), $copy->getColorAt(50, 50));
+
+            $copy = $img->getChannels('red');
+            $this->assertTrue($copy instanceof WideImage_PaletteImage);
+            $this->assertTrue($copy->isValid());
+            $this->assertFalse($copy->isTrueColor());
+            $this->assertTrue($copy->isTransparent());
+
+            $this->assertRGBEqual($copy->getRGBAt(15, 15), 255, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(15, 85), 255, 0, 0);
+            $this->assertEquals($copy->getTransparentColor(), $copy->getColorAt(50, 50));
+
+            $copy = $img->getChannels('green');
+            $this->assertTrue($copy instanceof WideImage_PaletteImage);
+            $this->assertTrue($copy->isValid());
+            $this->assertFalse($copy->isTrueColor());
+            $this->assertTrue($copy->isTransparent());
+
+            $this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 255, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 255, 0);
+            $this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 0, 0);
+            $this->assertEquals($copy->getTransparentColor(), $copy->getColorAt(50, 50));
+        }
+
+        public function testCopySingleChannel()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-rgbyg.png');
+
+            $copy = $img->getChannels('red');
+            $this->assertFalse($img->getHandle() === $copy->getHandle());
+            $this->assertTrue($copy instanceof WideImage_TrueColorImage);
+            $this->assertTrue($copy->isValid());
+            $this->assertTrue($copy->isTrueColor());
+            $this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 15), 255, 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 85), 255, 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(50, 50), 127, 0, 0, 0);
+            /*
+            $copy = $img->copyChannels('green');
+            $this->assertFalse($img->getHandle() === $copy->getHandle());
+            $this->assertTrue($copy instanceof WideImage_TrueColorImage);
+            $this->assertTrue($copy->isValid());
+            $this->assertTrue($copy->isTrueColor());
+            $this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 255, 0);
+            $this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 255, 0);
+            $this->assertRGBEqual($copy->getRGBAt(50, 50), 0, 127, 0);
+            
+            $copy = $img->copyChannels('blue');
+            $this->assertFalse($img->getHandle() === $copy->getHandle());
+            $this->assertTrue($copy instanceof WideImage_TrueColorImage);
+            $this->assertTrue($copy->isValid());
+            $this->assertTrue($copy->isTrueColor());
+            $this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 0, 255);
+            $this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(50, 50), 0, 0, 127);
+            
+            $img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
+            $copy = $img->copyChannels('alpha');
+            $this->assertRGBNear($copy->getRGBAt(25, 25), 0, 0, 0, 0.25 * 127);
+            $this->assertRGBNear($copy->getRGBAt(75, 25), 0, 0, 0, 0.5 * 127);
+            $this->assertRGBNear($copy->getRGBAt(75, 75), 0, 0, 0, 0.75 * 127);
+            $this->assertRGBNear($copy->getRGBAt(25, 75), 0, 0, 0, 127);
+            */
+        }
+
+        public function testCopyCombinedChannels()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+            $copy = $img->getChannels('blue', 'alpha');
+            $this->assertRGBNear($copy->getRGBAt(25, 25), 0, 0, 255, 0.25 * 127);
+            $this->assertRGBNear($copy->getRGBAt(75, 25), 0, 0, 255, 0.5 * 127);
+            $this->assertRGBNear($copy->getRGBAt(75, 75), 0, 0, 255, 0.75 * 127);
+            $this->assertRGBNear($copy->getRGBAt(25, 75), 0, 0, 0, 127);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetMaskTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetMaskTest.php
index f36f00193..73a3fe9b2 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetMaskTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetMaskTest.php
@@ -1,60 +1,42 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_GetMask_Test extends WideImage_TestCase
-	{
-		function testGetMaskTransparentGif()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			
-			$mask = $img->getMask();
-			$this->assertTrue($mask instanceof WideImage_TrueColorImage);
-			
-			$this->assertFalse($mask->isTransparent());
-			$this->assertEquals(100, $mask->getWidth());
-			$this->assertEquals(100, $mask->getHeight());
-			
-			$this->assertRGBNear($mask->getRGBAt(10, 10), 255, 255, 255);
-			$this->assertRGBNear($mask->getRGBAt(90, 90), 255, 255, 255);
-			$this->assertRGBNear($mask->getRGBAt(50, 50), 0, 0, 0);
-		}
-		
-		function testGetMaskPNGAlpha()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			
-			$mask = $img->getMask();
-			$this->assertTrue($mask instanceof WideImage_TrueColorImage);
-			
-			$this->assertFalse($mask->isTransparent());
-			$this->assertEquals(100, $mask->getWidth());
-			$this->assertEquals(100, $mask->getHeight());
-			
-			$this->assertRGBNear($mask->getRGBAt(25, 25), 192, 192, 192);
-			$this->assertRGBNear($mask->getRGBAt(75, 25), 128, 128, 128);
-			$this->assertRGBNear($mask->getRGBAt(75, 75), 64, 64, 64);
-			$this->assertRGBNear($mask->getRGBAt(25, 75), 0, 0, 0);
-		}
-	}
-?>
\ No newline at end of file
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Operation_GetMask_Test extends WideImage_TestCase
+    {
+        public function testGetMaskTransparentGif()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+
+            $mask = $img->getMask();
+            $this->assertTrue($mask instanceof WideImage_TrueColorImage);
+
+            $this->assertFalse($mask->isTransparent());
+            $this->assertEquals(100, $mask->getWidth());
+            $this->assertEquals(100, $mask->getHeight());
+
+            $this->assertRGBNear($mask->getRGBAt(10, 10), 255, 255, 255);
+            $this->assertRGBNear($mask->getRGBAt(90, 90), 255, 255, 255);
+            $this->assertRGBNear($mask->getRGBAt(50, 50), 0, 0, 0);
+        }
+
+        public function testGetMaskPNGAlpha()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+
+            $mask = $img->getMask();
+            $this->assertTrue($mask instanceof WideImage_TrueColorImage);
+
+            $this->assertFalse($mask->isTransparent());
+            $this->assertEquals(100, $mask->getWidth());
+            $this->assertEquals(100, $mask->getHeight());
+
+            $this->assertRGBNear($mask->getRGBAt(25, 25), 192, 192, 192);
+            $this->assertRGBNear($mask->getRGBAt(75, 25), 128, 128, 128);
+            $this->assertRGBNear($mask->getRGBAt(75, 75), 64, 64, 64);
+            $this->assertRGBNear($mask->getRGBAt(25, 75), 0, 0, 0);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/MergeTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/MergeTest.php
index 520b6d145..e28f24ba5 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/MergeTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/MergeTest.php
@@ -1,93 +1,76 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 * @group operation
-	 */
-	class WideImage_Operation_Merge_Test extends WideImage_TestCase
-	{
-		function testMergeOpacityZero()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.png');
-			$overlay = WideImage::load(IMG_PATH . '100x100-square-overlay.png');
-			
-			$res = $img->merge($overlay, 0, 0, 0);
-			
-			$this->assertEquals(100, $res->getWidth());
-			$this->assertEquals(100, $res->getHeight());
-			
-			$rgb = $res->getRGBAt(5, 5);
-			$this->assertRGBAt($res, 5, 5, array('red' => 255, 'green' => 255, 'blue' => 0, 'alpha' => 0));
-			$this->assertRGBAt($res, 40, 40, array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127));
-			$this->assertRGBAt($res, 95, 5, array('red' => 0, 'green' => 0, 'blue' => 255, 'alpha' => 0));
-			$this->assertRGBAt($res, 60, 40, array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127));
-			$this->assertRGBAt($res, 95, 95, array('red' => 0, 'green' => 255, 'blue' => 0, 'alpha' => 0));
-			$this->assertRGBAt($res, 60, 60, array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127));
-			$this->assertRGBAt($res, 5, 95, array('red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0));
-			$this->assertRGBAt($res, 40, 60, array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127));
-		}
-		
-		function testMergeOpacityHalf()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.png');
-			$overlay = WideImage::load(IMG_PATH . '100x100-square-overlay.png');
-			
-			$res = $img->merge($overlay, 0, 0, 50);
-			
-			$this->assertEquals(100, $res->getWidth());
-			$this->assertEquals(100, $res->getHeight());
-			
-			$rgb = $res->getRGBAt(5, 5);
-			$this->assertRGBAt($res, 5, 5, array('red' => 255, 'green' => 255, 'blue' => 127, 'alpha' => 0));
-			$this->assertRGBAt($res, 40, 40, array('red' => 127, 'green' => 127, 'blue' => 127, 'alpha' => 0));
-			$this->assertRGBAt($res, 95, 5, array('red' => 0, 'green' => 0, 'blue' => 255, 'alpha' => 0));
-			$this->assertRGBAt($res, 60, 40, array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127));
-			$this->assertRGBAt($res, 95, 95, array('red' => 0, 'green' => 127, 'blue' => 0, 'alpha' => 0));
-			
-			// these two should definitely pass ...
-			
-			#$this->assertRGBAt($res, 60, 60, array('red' => 127, 'green' => 127, 'blue' => 127, 'alpha' => 0));
-			$this->assertRGBAt($res, 5, 95, array('red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0));
-			#$this->assertRGBAt($res, 40, 60, array('red' => 255, 'green' => 127, 'blue' => 127, 'alpha' => 0));
-		}
-		
-		function testMergeOpacityFull()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.png');
-			$overlay = WideImage::load(IMG_PATH . '100x100-square-overlay.png');
-			
-			$res = $img->merge($overlay, 0, 0, 100);
-			
-			$this->assertEquals(100, $res->getWidth());
-			$this->assertEquals(100, $res->getHeight());
-			
-			$rgb = $res->getRGBAt(5, 5);
-			$this->assertRGBAt($res, 5, 5, array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0));
-			$this->assertRGBAt($res, 40, 40, array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0));
-			$this->assertRGBAt($res, 95, 5, array('red' => 0, 'green' => 0, 'blue' => 255, 'alpha' => 0));
-			$this->assertRGBAt($res, 60, 40, array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127));
-			$this->assertRGBAt($res, 95, 95, array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0));
-			$this->assertRGBAt($res, 60, 60, array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0));
-			$this->assertRGBAt($res, 5, 95, array('red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0));
-			$this->assertRGBAt($res, 40, 60, array('red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0));
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     * @group operation
+     */
+    class WideImage_Operation_Merge_Test extends WideImage_TestCase
+    {
+        public function testMergeOpacityZero()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.png');
+            $overlay = WideImage::load(IMG_PATH.'100x100-square-overlay.png');
+
+            $res = $img->merge($overlay, 0, 0, 0);
+
+            $this->assertEquals(100, $res->getWidth());
+            $this->assertEquals(100, $res->getHeight());
+
+            $rgb = $res->getRGBAt(5, 5);
+            $this->assertRGBAt($res, 5, 5, ['red' => 255, 'green' => 255, 'blue' => 0, 'alpha' => 0]);
+            $this->assertRGBAt($res, 40, 40, ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127]);
+            $this->assertRGBAt($res, 95, 5, ['red' => 0, 'green' => 0, 'blue' => 255, 'alpha' => 0]);
+            $this->assertRGBAt($res, 60, 40, ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127]);
+            $this->assertRGBAt($res, 95, 95, ['red' => 0, 'green' => 255, 'blue' => 0, 'alpha' => 0]);
+            $this->assertRGBAt($res, 60, 60, ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127]);
+            $this->assertRGBAt($res, 5, 95, ['red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0]);
+            $this->assertRGBAt($res, 40, 60, ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127]);
+        }
+
+        public function testMergeOpacityHalf()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.png');
+            $overlay = WideImage::load(IMG_PATH.'100x100-square-overlay.png');
+
+            $res = $img->merge($overlay, 0, 0, 50);
+
+            $this->assertEquals(100, $res->getWidth());
+            $this->assertEquals(100, $res->getHeight());
+
+            $rgb = $res->getRGBAt(5, 5);
+            $this->assertRGBAt($res, 5, 5, ['red' => 255, 'green' => 255, 'blue' => 127, 'alpha' => 0]);
+            $this->assertRGBAt($res, 40, 40, ['red' => 127, 'green' => 127, 'blue' => 127, 'alpha' => 0]);
+            $this->assertRGBAt($res, 95, 5, ['red' => 0, 'green' => 0, 'blue' => 255, 'alpha' => 0]);
+            $this->assertRGBAt($res, 60, 40, ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127]);
+            $this->assertRGBAt($res, 95, 95, ['red' => 0, 'green' => 127, 'blue' => 0, 'alpha' => 0]);
+
+            // these two should definitely pass ...
+
+            //$this->assertRGBAt($res, 60, 60, array('red' => 127, 'green' => 127, 'blue' => 127, 'alpha' => 0));
+            $this->assertRGBAt($res, 5, 95, ['red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0]);
+            //$this->assertRGBAt($res, 40, 60, array('red' => 255, 'green' => 127, 'blue' => 127, 'alpha' => 0));
+        }
+
+        public function testMergeOpacityFull()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.png');
+            $overlay = WideImage::load(IMG_PATH.'100x100-square-overlay.png');
+
+            $res = $img->merge($overlay, 0, 0, 100);
+
+            $this->assertEquals(100, $res->getWidth());
+            $this->assertEquals(100, $res->getHeight());
+
+            $rgb = $res->getRGBAt(5, 5);
+            $this->assertRGBAt($res, 5, 5, ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0]);
+            $this->assertRGBAt($res, 40, 40, ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0]);
+            $this->assertRGBAt($res, 95, 5, ['red' => 0, 'green' => 0, 'blue' => 255, 'alpha' => 0]);
+            $this->assertRGBAt($res, 60, 40, ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 127]);
+            $this->assertRGBAt($res, 95, 95, ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0]);
+            $this->assertRGBAt($res, 60, 60, ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0]);
+            $this->assertRGBAt($res, 5, 95, ['red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0]);
+            $this->assertRGBAt($res, 40, 60, ['red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0]);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/MirrorTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/MirrorTest.php
index 5b3ee22bb..96ab05099 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/MirrorTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/MirrorTest.php
@@ -1,52 +1,34 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_Mirror_Test extends WideImage_TestCase
-	{
-		function testMirror()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			
-			$this->assertRGBEqual($img->getRGBAt(5, 5), 255, 255, 0);
-			$this->assertRGBEqual($img->getRGBAt(95, 5), 0, 0, 255);
-			$this->assertRGBEqual($img->getRGBAt(95, 95), 0, 255, 0);
-			$this->assertRGBEqual($img->getRGBAt(5, 95), 255, 0, 0);
-			
-			$new = $img->mirror();
-			
-			$this->assertTrue($new instanceof WideImage_PaletteImage);
-			
-			$this->assertEquals(100, $new->getWidth());
-			$this->assertEquals(100, $new->getHeight());
-			
-			$this->assertRGBEqual($new->getRGBAt(95, 5), 255, 255, 0);
-			$this->assertRGBEqual($new->getRGBAt(5, 5), 0, 0, 255);
-			$this->assertRGBEqual($new->getRGBAt(5, 95), 0, 255, 0);
-			$this->assertRGBEqual($new->getRGBAt(95, 95), 255, 0, 0);
-			
-			$this->assertTrue($new->isTransparent());
-			$this->assertRGBEqual($new->getRGBAt(50, 50), $img->getTransparentColorRGB());
-		}
-	}
-?>
\ No newline at end of file
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Operation_Mirror_Test extends WideImage_TestCase
+    {
+        public function testMirror()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+
+            $this->assertRGBEqual($img->getRGBAt(5, 5), 255, 255, 0);
+            $this->assertRGBEqual($img->getRGBAt(95, 5), 0, 0, 255);
+            $this->assertRGBEqual($img->getRGBAt(95, 95), 0, 255, 0);
+            $this->assertRGBEqual($img->getRGBAt(5, 95), 255, 0, 0);
+
+            $new = $img->mirror();
+
+            $this->assertTrue($new instanceof WideImage_PaletteImage);
+
+            $this->assertEquals(100, $new->getWidth());
+            $this->assertEquals(100, $new->getHeight());
+
+            $this->assertRGBEqual($new->getRGBAt(95, 5), 255, 255, 0);
+            $this->assertRGBEqual($new->getRGBAt(5, 5), 0, 0, 255);
+            $this->assertRGBEqual($new->getRGBAt(5, 95), 0, 255, 0);
+            $this->assertRGBEqual($new->getRGBAt(95, 95), 255, 0, 0);
+
+            $this->assertTrue($new->isTransparent());
+            $this->assertRGBEqual($new->getRGBAt(50, 50), $img->getTransparentColorRGB());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ResizeCanvasTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ResizeCanvasTest.php
index 047aef35a..a27728bb8 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ResizeCanvasTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ResizeCanvasTest.php
@@ -1,71 +1,53 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	WideImage_OperationFactory::get('ResizeCanvas');
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_ResizeCanvas_Test extends WideImage_TestCase
-	{
-		function testResizeCanvasUp()
-		{
-			$img = WideImage::createTrueColorImage(160, 120);
-			$resized = $img->resizeCanvas(180, 180, 0, 0);
-			$this->assertDimensions($resized, 180, 180);
-		}
-		
-		function testResizeCanvasDown()
-		{
-			$img = WideImage::createTrueColorImage(160, 120);
-			$resized = $img->resizeCanvas(30, 100, 0, 0);
-			$this->assertDimensions($resized, 30, 100);
-		}
-		
-		function testResizeCanvasPositionsCenter()
-		{
-			$img = WideImage::createTrueColorImage(20, 20);
-			$black = $img->allocateColor(0, 0, 0);
-			$white = $img->allocateColor(255, 255, 255);
-			$img->fill(0, 0, $black);
-			
-			$res = $img->resizeCanvas(40, 40, 'center', 'center', $white);
-			$this->assertRGBAt($res, 5, 5, $white);
-			$this->assertRGBAt($res, 35, 35, $white);
-			$this->assertRGBAt($res, 5, 35, $white);
-			$this->assertRGBAt($res, 35, 5, $white);
-			$this->assertRGBAt($res, 20, 20, $black);
-		}
-		
-		function testResizeCanvasPositionsCorner()
-		{
-			$img = WideImage::createTrueColorImage(20, 20);
-			$black = $img->allocateColor(0, 0, 0);
-			$white = $img->allocateColor(255, 255, 255);
-			$img->fill(0, 0, $black);
-			
-			$res = $img->resizeCanvas(40, 40, 'bottom', 'right', $white);
-			$this->assertRGBAt($res, 5, 5, $white);
-			$this->assertRGBAt($res, 35, 35, $black);
-			$this->assertRGBAt($res, 5, 35, $white);
-			$this->assertRGBAt($res, 35, 5, $white);
-		}
-	}
+    /**
+     
+     **/
+    WideImage_OperationFactory::get('ResizeCanvas');
+
+    /**
+     */
+    class WideImage_Operation_ResizeCanvas_Test extends WideImage_TestCase
+    {
+        public function testResizeCanvasUp()
+        {
+            $img = WideImage::createTrueColorImage(160, 120);
+            $resized = $img->resizeCanvas(180, 180, 0, 0);
+            $this->assertDimensions($resized, 180, 180);
+        }
+
+        public function testResizeCanvasDown()
+        {
+            $img = WideImage::createTrueColorImage(160, 120);
+            $resized = $img->resizeCanvas(30, 100, 0, 0);
+            $this->assertDimensions($resized, 30, 100);
+        }
+
+        public function testResizeCanvasPositionsCenter()
+        {
+            $img = WideImage::createTrueColorImage(20, 20);
+            $black = $img->allocateColor(0, 0, 0);
+            $white = $img->allocateColor(255, 255, 255);
+            $img->fill(0, 0, $black);
+
+            $res = $img->resizeCanvas(40, 40, 'center', 'center', $white);
+            $this->assertRGBAt($res, 5, 5, $white);
+            $this->assertRGBAt($res, 35, 35, $white);
+            $this->assertRGBAt($res, 5, 35, $white);
+            $this->assertRGBAt($res, 35, 5, $white);
+            $this->assertRGBAt($res, 20, 20, $black);
+        }
+
+        public function testResizeCanvasPositionsCorner()
+        {
+            $img = WideImage::createTrueColorImage(20, 20);
+            $black = $img->allocateColor(0, 0, 0);
+            $white = $img->allocateColor(255, 255, 255);
+            $img->fill(0, 0, $black);
+
+            $res = $img->resizeCanvas(40, 40, 'bottom', 'right', $white);
+            $this->assertRGBAt($res, 5, 5, $white);
+            $this->assertRGBAt($res, 35, 35, $black);
+            $this->assertRGBAt($res, 5, 35, $white);
+            $this->assertRGBAt($res, 35, 5, $white);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ResizeTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ResizeTest.php
index f94179009..acf50c2e4 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ResizeTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/ResizeTest.php
@@ -1,265 +1,247 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	WideImage_OperationFactory::get('Resize');
-	
-	class WideImage_Operation_Resize_Testable extends WideImage_Operation_Resize
-	{
-		function prepareDimensions($img, $width, $height, $fit)
-		{
-			return parent::prepareDimensions($img, $width, $height, $fit);
-		}
-	}
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_Resize_Test extends WideImage_TestCase
-	{
-		function testProxyMethod()
-		{
-			$op = $this->getMock('WideImage_Operation_Resize', array('execute'));
-			$img = $this->getMock('WideImage_PaletteImage', array('getOperation'), array(imagecreate(10, 10)));
-			
-			$img->expects($this->exactly(2))->
-				method('getOperation')->with('Resize')->
-				will($this->returnValue($op));
-			
-			$op->expects($this->at(0))->
-				method('execute')->with($img, 'WIDTH', 'HEIGHT', 'FIT', 'SCALE');
-			
-			$op->expects($this->at(1))->
-				method('execute')->with($img, null, null, 'inside', 'any');
-			
-			$img->resize('WIDTH', 'HEIGHT', 'FIT', 'SCALE');
-			$img->resize();
-		}
-		
-		function testResultTypeIsSameAsInput()
-		{
-			$this->assertInstanceOf("WideImage_PaletteImage", WideImage::createPaletteImage(20, 20)->resize(10, 10));
-			$this->assertInstanceOf("WideImage_TrueColorImage", WideImage::createTrueColorImage(20, 20)->resize(10, 10));
-		}
-		
-		function testResizeWithoutParametersDoesNothing()
-		{
-			$img = WideImage::createTrueColorImage(70, 20);
-			$res = $img->resize();
-			$this->assertDimensions($res, $img->getWidth(), $img->getHeight());
-		}
-		
-		function testPreservesTransparency()
-		{
-			$img = $this->load('100x100-color-hole.gif');
-			$this->assertTrue($img->isTransparent());
-			$res = $img->resize(50, 50);
-			$this->assertTrue($res->isTransparent());
-			$this->assertTransparentColorMatch($img, $res);
-			$this->assertEquals($res->getColorAt(25, 25), $res->getTransparentColor());
-		}
-		
-		function testFitFill()
-		{
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'fill'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 30, 'fill'), 120, 30);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(20, 130, 'fill'), 20, 130);
-		}
-		
-		function testFitOutside()
-		{
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'outside'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 30, 'outside'), 120, 60);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(20, 30, 'outside'), 60, 30);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(20, 100, 'outside'), 200, 100);
-		}
-		
-		function testFitInside()
-		{
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'inside'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 30, 'inside'), 60, 30);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(20, 30, 'inside'), 20, 10);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(20, 100, 'inside'), 20, 10);
-		}
-		
-		function testScaleDown()
-		{
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'fill', 'down'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'fill', 'down'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'fill', 'down'), 120, 40);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'fill', 'down'), 90, 60);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'fill', 'down'), 90, 30);
-			
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'inside', 'down'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'inside', 'down'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'inside', 'down'), 80, 40);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'inside', 'down'), 90, 45);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'inside', 'down'), 60, 30);
-			
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'outside', 'down'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'outside', 'down'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'outside', 'down'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'outside', 'down'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'outside', 'down'), 90, 45);
-		}
-		
-		function testScaleUp()
-		{
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'fill', 'up'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'fill', 'up'), 120, 60);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'fill', 'up'), 120, 40);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'fill', 'up'), 90, 60);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'fill', 'up'), 100, 50);
-			
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'inside', 'up'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'inside', 'up'), 120, 60);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'inside', 'up'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'inside', 'up'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'inside', 'up'), 100, 50);
-			
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'outside', 'up'), 100, 50);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'outside', 'up'), 120, 60);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'outside', 'up'), 120, 60);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'outside', 'up'), 120, 60);
-			$this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'outside', 'up'), 100, 50);
-		}
-		
-		function testResizeFill()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$resized = $img->resize(50, 20, 'fill');
-			$this->assertTrue($resized instanceof WideImage_Image);
-			$this->assertTrue($resized->isTransparent());
-			$this->assertEquals(50, $resized->getWidth());
-			$this->assertEquals(20, $resized->getHeight());
-			$this->assertRGBEqual($resized->getRGBAt(5, 5), 255, 255, 0);
-			$this->assertRGBEqual($resized->getRGBAt(45, 5), 0, 0, 255);
-			$this->assertRGBEqual($resized->getRGBAt(45, 15), 0, 255, 0);
-			$this->assertRGBEqual($resized->getRGBAt(5, 15), 255, 0, 0);
-			
-			$this->assertRGBEqual($resized->getRGBAt(25, 10), 255, 255, 255);
-			$this->assertRGBEqual($img->getTransparentColorRGB(), 255, 255, 255);
-		}
-		
-		function testNullDimensionsAreCalculatedForFill()
-		{
-			$img = WideImage_TrueColorImage::create(100, 50);
-			$resized = $img->resize(30, null, 'fill');
-			$this->assertEquals(30, $resized->getWidth());
-			$this->assertEquals(15, $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(100, 50);
-			$resized = $img->resize(null, 30, 'fill');
-			$this->assertEquals(60, $resized->getWidth());
-			$this->assertEquals(30, $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(100, 50);
-			$resized = $img->resize(30, 30, 'fill');
-			$this->assertEquals(30, $resized->getWidth());
-			$this->assertEquals(30, $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(100, 50);
-			$resized = $img->resize(30, 40, 'fill');
-			$this->assertEquals(30, $resized->getWidth());
-			$this->assertEquals(40, $resized->getHeight());
-		}
-		
-		function testResizeInside()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$resized = $img->resize(50, 20, 'inside');
-			$this->assertTrue($resized instanceof WideImage_Image);
-			$this->assertTrue($resized->isTransparent());
-			$this->assertEquals(20, $resized->getWidth());
-			$this->assertEquals(20, $resized->getHeight());
-			/*
-			$this->assertRGBEqual($resized->getRGBAt(5, 5), 255, 255, 0);
-			$this->assertRGBEqual($resized->getRGBAt(45, 5), 0, 0, 255);
-			$this->assertRGBEqual($resized->getRGBAt(45, 15), 0, 255, 0);
-			$this->assertRGBEqual($resized->getRGBAt(5, 15), 255, 0, 0);
-			$this->assertRGBEqual($resized->getRGBAt(25, 10), 255, 255, 255);
-			$this->assertRGBEqual($img->getTransparentColorRGB(), 255, 255, 255);
-			*/
-		}
-		
-		function testResizeDown()
-		{
-			$img = WideImage_TrueColorImage::create(100, 100);
-			$resized = $img->resizeDown(30);
-			$this->assertEquals(30, $resized->getWidth());
-			$this->assertEquals(30, $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(200, 100);
-			$resized = $img->resizeDown(100);
-			$this->assertEquals(100, $resized->getWidth());
-			$this->assertEquals(50, $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(200, 100);
-			$resized = $img->resizeDown(null, 30);
-			$this->assertEquals(60, $resized->getWidth());
-			$this->assertEquals(30, $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(200, 100);
-			$resized = $img->resizeDown(201);
-			$this->assertEquals($img->getWidth(), $resized->getWidth());
-			$this->assertEquals($img->getHeight(), $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(200, 100);
-			$resized = $img->resizeDown(null, 300);
-			$this->assertEquals($img->getWidth(), $resized->getWidth());
-			$this->assertEquals($img->getHeight(), $resized->getHeight());
-		}
-		
-		function testResizeUp()
-		{
-			$img = WideImage_TrueColorImage::create(100, 100);
-			$resized = $img->resizeUp(300);
-			$this->assertEquals(300, $resized->getWidth());
-			$this->assertEquals(300, $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(200, 100);
-			$resized = $img->resizeUp(300);
-			$this->assertEquals(300, $resized->getWidth());
-			$this->assertEquals(150, $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(20, 10);
-			$resized = $img->resizeUp(null, 30);
-			$this->assertEquals(60, $resized->getWidth());
-			$this->assertEquals(30, $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(200, 100);
-			$resized = $img->resizeUp(199);
-			$this->assertEquals($img->getWidth(), $resized->getWidth());
-			$this->assertEquals($img->getHeight(), $resized->getHeight());
-			
-			$img = WideImage_TrueColorImage::create(200, 100);
-			$resized = $img->resizeUp(null, 10);
-			$this->assertEquals($img->getWidth(), $resized->getWidth());
-			$this->assertEquals($img->getHeight(), $resized->getHeight());
-		}
-		
-		function testResizeBug214()
-		{
-			$img = WideImage_TrueColorImage::create(1600, 1200);
-			$resized = $img->resize(214, null, 'outside');
-			$this->assertEquals(214, $resized->getWidth());
-			$this->assertEquals(161, $resized->getHeight());
-		}
-	}
+    /**
+     
+     **/
+    WideImage_OperationFactory::get('Resize');
+
+    class WideImage_Operation_Resize_Testable extends WideImage_Operation_Resize
+    {
+        public function prepareDimensions($img, $width, $height, $fit)
+        {
+            return parent::prepareDimensions($img, $width, $height, $fit);
+        }
+    }
+
+    /**
+     */
+    class WideImage_Operation_Resize_Test extends WideImage_TestCase
+    {
+        public function testProxyMethod()
+        {
+            $op = $this->getMock('WideImage_Operation_Resize', ['execute']);
+            $img = $this->getMock('WideImage_PaletteImage', ['getOperation'], [imagecreate(10, 10)]);
+
+            $img->expects($this->exactly(2))->
+                method('getOperation')->with('Resize')->
+                will($this->returnValue($op));
+
+            $op->expects($this->at(0))->
+                method('execute')->with($img, 'WIDTH', 'HEIGHT', 'FIT', 'SCALE');
+
+            $op->expects($this->at(1))->
+                method('execute')->with($img, null, null, 'inside', 'any');
+
+            $img->resize('WIDTH', 'HEIGHT', 'FIT', 'SCALE');
+            $img->resize();
+        }
+
+        public function testResultTypeIsSameAsInput()
+        {
+            $this->assertInstanceOf('WideImage_PaletteImage', WideImage::createPaletteImage(20, 20)->resize(10, 10));
+            $this->assertInstanceOf('WideImage_TrueColorImage', WideImage::createTrueColorImage(20, 20)->resize(10, 10));
+        }
+
+        public function testResizeWithoutParametersDoesNothing()
+        {
+            $img = WideImage::createTrueColorImage(70, 20);
+            $res = $img->resize();
+            $this->assertDimensions($res, $img->getWidth(), $img->getHeight());
+        }
+
+        public function testPreservesTransparency()
+        {
+            $img = $this->load('100x100-color-hole.gif');
+            $this->assertTrue($img->isTransparent());
+            $res = $img->resize(50, 50);
+            $this->assertTrue($res->isTransparent());
+            $this->assertTransparentColorMatch($img, $res);
+            $this->assertEquals($res->getColorAt(25, 25), $res->getTransparentColor());
+        }
+
+        public function testFitFill()
+        {
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'fill'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 30, 'fill'), 120, 30);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(20, 130, 'fill'), 20, 130);
+        }
+
+        public function testFitOutside()
+        {
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'outside'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 30, 'outside'), 120, 60);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(20, 30, 'outside'), 60, 30);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(20, 100, 'outside'), 200, 100);
+        }
+
+        public function testFitInside()
+        {
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'inside'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 30, 'inside'), 60, 30);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(20, 30, 'inside'), 20, 10);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(20, 100, 'inside'), 20, 10);
+        }
+
+        public function testScaleDown()
+        {
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'fill', 'down'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'fill', 'down'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'fill', 'down'), 120, 40);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'fill', 'down'), 90, 60);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'fill', 'down'), 90, 30);
+
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'inside', 'down'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'inside', 'down'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'inside', 'down'), 80, 40);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'inside', 'down'), 90, 45);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'inside', 'down'), 60, 30);
+
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'outside', 'down'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'outside', 'down'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'outside', 'down'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'outside', 'down'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'outside', 'down'), 90, 45);
+        }
+
+        public function testScaleUp()
+        {
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'fill', 'up'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'fill', 'up'), 120, 60);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'fill', 'up'), 120, 40);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'fill', 'up'), 90, 60);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'fill', 'up'), 100, 50);
+
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'inside', 'up'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'inside', 'up'), 120, 60);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'inside', 'up'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'inside', 'up'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'inside', 'up'), 100, 50);
+
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(100, 50, 'outside', 'up'), 100, 50);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 60, 'outside', 'up'), 120, 60);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(120, 40, 'outside', 'up'), 120, 60);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 60, 'outside', 'up'), 120, 60);
+            $this->assertDimensions(WideImage::createPaletteImage(100, 50)->resize(90, 30, 'outside', 'up'), 100, 50);
+        }
+
+        public function testResizeFill()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $resized = $img->resize(50, 20, 'fill');
+            $this->assertTrue($resized instanceof WideImage_Image);
+            $this->assertTrue($resized->isTransparent());
+            $this->assertEquals(50, $resized->getWidth());
+            $this->assertEquals(20, $resized->getHeight());
+            $this->assertRGBEqual($resized->getRGBAt(5, 5), 255, 255, 0);
+            $this->assertRGBEqual($resized->getRGBAt(45, 5), 0, 0, 255);
+            $this->assertRGBEqual($resized->getRGBAt(45, 15), 0, 255, 0);
+            $this->assertRGBEqual($resized->getRGBAt(5, 15), 255, 0, 0);
+
+            $this->assertRGBEqual($resized->getRGBAt(25, 10), 255, 255, 255);
+            $this->assertRGBEqual($img->getTransparentColorRGB(), 255, 255, 255);
+        }
+
+        public function testNullDimensionsAreCalculatedForFill()
+        {
+            $img = WideImage_TrueColorImage::create(100, 50);
+            $resized = $img->resize(30, null, 'fill');
+            $this->assertEquals(30, $resized->getWidth());
+            $this->assertEquals(15, $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(100, 50);
+            $resized = $img->resize(null, 30, 'fill');
+            $this->assertEquals(60, $resized->getWidth());
+            $this->assertEquals(30, $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(100, 50);
+            $resized = $img->resize(30, 30, 'fill');
+            $this->assertEquals(30, $resized->getWidth());
+            $this->assertEquals(30, $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(100, 50);
+            $resized = $img->resize(30, 40, 'fill');
+            $this->assertEquals(30, $resized->getWidth());
+            $this->assertEquals(40, $resized->getHeight());
+        }
+
+        public function testResizeInside()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $resized = $img->resize(50, 20, 'inside');
+            $this->assertTrue($resized instanceof WideImage_Image);
+            $this->assertTrue($resized->isTransparent());
+            $this->assertEquals(20, $resized->getWidth());
+            $this->assertEquals(20, $resized->getHeight());
+            /*
+            $this->assertRGBEqual($resized->getRGBAt(5, 5), 255, 255, 0);
+            $this->assertRGBEqual($resized->getRGBAt(45, 5), 0, 0, 255);
+            $this->assertRGBEqual($resized->getRGBAt(45, 15), 0, 255, 0);
+            $this->assertRGBEqual($resized->getRGBAt(5, 15), 255, 0, 0);
+            $this->assertRGBEqual($resized->getRGBAt(25, 10), 255, 255, 255);
+            $this->assertRGBEqual($img->getTransparentColorRGB(), 255, 255, 255);
+            */
+        }
+
+        public function testResizeDown()
+        {
+            $img = WideImage_TrueColorImage::create(100, 100);
+            $resized = $img->resizeDown(30);
+            $this->assertEquals(30, $resized->getWidth());
+            $this->assertEquals(30, $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(200, 100);
+            $resized = $img->resizeDown(100);
+            $this->assertEquals(100, $resized->getWidth());
+            $this->assertEquals(50, $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(200, 100);
+            $resized = $img->resizeDown(null, 30);
+            $this->assertEquals(60, $resized->getWidth());
+            $this->assertEquals(30, $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(200, 100);
+            $resized = $img->resizeDown(201);
+            $this->assertEquals($img->getWidth(), $resized->getWidth());
+            $this->assertEquals($img->getHeight(), $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(200, 100);
+            $resized = $img->resizeDown(null, 300);
+            $this->assertEquals($img->getWidth(), $resized->getWidth());
+            $this->assertEquals($img->getHeight(), $resized->getHeight());
+        }
+
+        public function testResizeUp()
+        {
+            $img = WideImage_TrueColorImage::create(100, 100);
+            $resized = $img->resizeUp(300);
+            $this->assertEquals(300, $resized->getWidth());
+            $this->assertEquals(300, $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(200, 100);
+            $resized = $img->resizeUp(300);
+            $this->assertEquals(300, $resized->getWidth());
+            $this->assertEquals(150, $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(20, 10);
+            $resized = $img->resizeUp(null, 30);
+            $this->assertEquals(60, $resized->getWidth());
+            $this->assertEquals(30, $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(200, 100);
+            $resized = $img->resizeUp(199);
+            $this->assertEquals($img->getWidth(), $resized->getWidth());
+            $this->assertEquals($img->getHeight(), $resized->getHeight());
+
+            $img = WideImage_TrueColorImage::create(200, 100);
+            $resized = $img->resizeUp(null, 10);
+            $this->assertEquals($img->getWidth(), $resized->getWidth());
+            $this->assertEquals($img->getHeight(), $resized->getHeight());
+        }
+
+        public function testResizeBug214()
+        {
+            $img = WideImage_TrueColorImage::create(1600, 1200);
+            $resized = $img->resize(214, null, 'outside');
+            $this->assertEquals(214, $resized->getWidth());
+            $this->assertEquals(161, $resized->getHeight());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/RotateTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/RotateTest.php
index 4a56e0f66..39c5bc781 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/RotateTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/RotateTest.php
@@ -1,59 +1,42 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_Rotate_Test extends WideImage_TestCase
-	{
-		function skip()
-		{
-			$this->skipUnless(function_exists('imagerotate'));
-		}
-		
-		function testRotateAlphaSafe()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			$this->assertRGBEqual($img->getRGBAt(25, 25), 0, 0, 255, round(128 / 4));
-			$this->assertRGBEqual($img->getRGBAt(75, 25), 0, 0, 255, round(2 * 128 / 4));
-			$this->assertRGBEqual($img->getRGBAt(75, 75), 0, 0, 255, round(3 * 128 / 4));
-			$this->assertRGBEqual($img->getRGBAt(25, 75), 0, 0, 0, 127);
-			$new = $img->rotate(90, null);
-			$this->assertEquals(100, $new->getWidth());
-			$this->assertEquals(100, $new->getHeight());
-		}
-		
-		function testRotateCounterClockwise90()
-		{
-			$img = WideImage::load(IMG_PATH . 'fgnl.jpg');
-			$new = $img->rotate(-90);
-			$this->assertEquals(287, $new->getWidth());
-			$this->assertEquals(174, $new->getHeight());
-		}
-		
-		function testRotate45()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-rainbow.png');
-			$new = $img->rotate(45);
-			$this->assertEquals(142, $new->getWidth());
-			$this->assertEquals(142, $new->getHeight());
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Operation_Rotate_Test extends WideImage_TestCase
+    {
+        public function skip()
+        {
+            $this->skipUnless(function_exists('imagerotate'));
+        }
+
+        public function testRotateAlphaSafe()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+            $this->assertRGBEqual($img->getRGBAt(25, 25), 0, 0, 255, round(128 / 4));
+            $this->assertRGBEqual($img->getRGBAt(75, 25), 0, 0, 255, round(2 * 128 / 4));
+            $this->assertRGBEqual($img->getRGBAt(75, 75), 0, 0, 255, round(3 * 128 / 4));
+            $this->assertRGBEqual($img->getRGBAt(25, 75), 0, 0, 0, 127);
+            $new = $img->rotate(90, null);
+            $this->assertEquals(100, $new->getWidth());
+            $this->assertEquals(100, $new->getHeight());
+        }
+
+        public function testRotateCounterClockwise90()
+        {
+            $img = WideImage::load(IMG_PATH.'fgnl.jpg');
+            $new = $img->rotate(-90);
+            $this->assertEquals(287, $new->getWidth());
+            $this->assertEquals(174, $new->getHeight());
+        }
+
+        public function testRotate45()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-rainbow.png');
+            $new = $img->rotate(45);
+            $this->assertEquals(142, $new->getWidth());
+            $this->assertEquals(142, $new->getHeight());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/RoundCornersTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/RoundCornersTest.php
index 1024d8eb5..9f4c91762 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/RoundCornersTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/RoundCornersTest.php
@@ -1,55 +1,38 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 * @group operation
-	 */
-	class WideImage_Operation_RoundCorners_Test extends WideImage_TestCase
-	{
-		function testWhiteCorner()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.png');
-			$res = $img->roundCorners(30, $img->allocateColor(255, 255, 255), WideImage::SIDE_ALL);
-			
-			$this->assertEquals(100, $res->getWidth());
-			$this->assertEquals(100, $res->getHeight());
-			
-			$this->assertRGBAt($res, 5, 5, array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0));
-			$this->assertRGBAt($res, 95, 5, array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0));
-			$this->assertRGBAt($res, 95, 95, array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0));
-			$this->assertRGBAt($res, 5, 95, array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0));
-		}
-		
-		function testTransparentCorner()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			$res = $img->roundCorners(30, null, WideImage::SIDE_ALL);
-			
-			$this->assertEquals(100, $res->getWidth());
-			$this->assertEquals(100, $res->getHeight());
-			
-			$this->assertRGBAt($res, 5, 5, array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127));
-			$this->assertRGBAt($res, 95, 5, array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127));
-			$this->assertRGBAt($res, 95, 95, array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127));
-			$this->assertRGBAt($res, 5, 95, array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127));
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     * @group operation
+     */
+    class WideImage_Operation_RoundCorners_Test extends WideImage_TestCase
+    {
+        public function testWhiteCorner()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.png');
+            $res = $img->roundCorners(30, $img->allocateColor(255, 255, 255), WideImage::SIDE_ALL);
+
+            $this->assertEquals(100, $res->getWidth());
+            $this->assertEquals(100, $res->getHeight());
+
+            $this->assertRGBAt($res, 5, 5, ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0]);
+            $this->assertRGBAt($res, 95, 5, ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0]);
+            $this->assertRGBAt($res, 95, 95, ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0]);
+            $this->assertRGBAt($res, 5, 95, ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 0]);
+        }
+
+        public function testTransparentCorner()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+            $res = $img->roundCorners(30, null, WideImage::SIDE_ALL);
+
+            $this->assertEquals(100, $res->getWidth());
+            $this->assertEquals(100, $res->getHeight());
+
+            $this->assertRGBAt($res, 5, 5, ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127]);
+            $this->assertRGBAt($res, 95, 5, ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127]);
+            $this->assertRGBAt($res, 95, 95, ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127]);
+            $this->assertRGBAt($res, 5, 95, ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127]);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/UnsharpTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/UnsharpTest.php
index 65da177a2..664ddf0b2 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/UnsharpTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/UnsharpTest.php
@@ -1,39 +1,22 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 * @group operation
-	 */
-	class WideImage_Operation_Unsharp_Test extends WideImage_TestCase
-	{
-		function test()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$result = $img->unsharp(10, 5, 1);
-			
-			$this->assertTrue($result instanceof WideImage_PaletteImage);
-			$this->assertTrue($result->isTransparent());
-			
-			$this->assertEquals(100, $result->getWidth());
-			$this->assertEquals(100, $result->getHeight());
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     * @group operation
+     */
+    class WideImage_Operation_Unsharp_Test extends WideImage_TestCase
+    {
+        public function test()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $result = $img->unsharp(10, 5, 1);
+
+            $this->assertTrue($result instanceof WideImage_PaletteImage);
+            $this->assertTrue($result->isTransparent());
+
+            $this->assertEquals(100, $result->getWidth());
+            $this->assertEquals(100, $result->getHeight());
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/OperationFactoryTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/OperationFactoryTest.php
index bee3a059e..61bbb020e 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/OperationFactoryTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/OperationFactoryTest.php
@@ -1,54 +1,36 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Operation_MyOperation
-	{
-	}
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_OperationFactory_Test extends WideImage_TestCase
-	{
-		function testFactoryReturnsCached()
-		{
-			$op1 = WideImage_OperationFactory::get('Mirror');
-			$op2 = WideImage_OperationFactory::get('Mirror');
-			$this->assertSame($op1, $op2);
-		}
-		
-		/**
-		 * @expectedException WideImage_UnknownImageOperationException
-		 */
-		function testNoOperation()
-		{
-			$op = WideImage_OperationFactory::get('NoSuchOp');
-		}
-		
-		function testUserDefinedOp()
-		{
-			$op = WideImage_OperationFactory::get('MyOperation');
-			$this->assertTrue($op instanceof WideImage_Operation_MyOperation);
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Operation_MyOperation
+    {
+    }
+
+    /**
+     */
+    class WideImage_OperationFactory_Test extends WideImage_TestCase
+    {
+        public function testFactoryReturnsCached()
+        {
+            $op1 = WideImage_OperationFactory::get('Mirror');
+            $op2 = WideImage_OperationFactory::get('Mirror');
+            $this->assertSame($op1, $op2);
+        }
+
+        /**
+         * @expectedException WideImage_UnknownImageOperationException
+         */
+        public function testNoOperation()
+        {
+            $op = WideImage_OperationFactory::get('NoSuchOp');
+        }
+
+        public function testUserDefinedOp()
+        {
+            $op = WideImage_OperationFactory::get('MyOperation');
+            $this->assertTrue($op instanceof WideImage_Operation_MyOperation);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/PaletteImageTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/PaletteImageTest.php
index 700a1d652..6031f2290 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/PaletteImageTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/PaletteImageTest.php
@@ -1,86 +1,69 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
+    /**
+     
+     **/
 
-	/**
-	 * @package Tests
-	 */
-	class WideImage_PaletteImage_Test extends WideImage_TestCase
-	{
-		function testCreate()
-		{
-			$img = WideImage_PaletteImage::create(10, 10);
-			$this->assertTrue($img instanceof WideImage_PaletteImage);
-			$this->assertTrue($img->isValid());
-			$this->assertFalse($img->isTrueColor());
-		}
-		
-		function testCopy()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$this->assertTrue($img instanceof WideImage_PaletteImage);
-			$this->assertTrue($img->isValid());
-			$this->assertFalse($img->isTrueColor());
-			$this->assertTrue($img->isTransparent());
-			$this->assertRGBEqual($img->getRGBAt(15, 15), 255, 255, 0);
-			$this->assertRGBEqual($img->getRGBAt(85, 15), 0, 0, 255);
-			$this->assertRGBEqual($img->getRGBAt(85, 85), 0, 255, 0);
-			$this->assertRGBEqual($img->getRGBAt(15, 85), 255, 0, 0);
-			$this->assertTrue($img->getTransparentColor() === $img->getColorAt(50, 50));
-			
-			$copy = $img->copy();
-			$this->assertFalse($img->getHandle() === $copy->getHandle());
-			
-			$this->assertTrue($copy instanceof WideImage_PaletteImage);
-			$this->assertTrue($copy->isValid());
-			$this->assertFalse($copy->isTrueColor());
-			$this->assertTrue($copy->isTransparent());
-			$this->assertRGBEqual($copy->getRGBAt(15, 15), 255, 255, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 255);
-			$this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 255, 0);
-			$this->assertRGBEqual($copy->getRGBAt(15, 85), 255, 0, 0);
-			$this->assertTrue($copy->getTransparentColor() === $copy->getColorAt(50, 50));
-			
-			$this->assertSame($img->getTransparentColorRGB(), $copy->getTransparentColorRGB());
-		}
-		
-		function testAsTrueColor()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$this->assertTrue($img instanceof WideImage_PaletteImage);
-			$this->assertTrue($img->isValid());
-			
-			$copy = $img->asTrueColor();
-			$this->assertFalse($img->getHandle() === $copy->getHandle());
-			
-			$this->assertTrue($copy instanceof WideImage_TrueColorImage);
-			$this->assertTrue($copy->isValid());
-			$this->assertTrue($copy->isTrueColor());
-			$this->assertTrue($copy->isTransparent());
-			$this->assertRGBEqual($copy->getRGBAt(15, 15), 255, 255, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 255);
-			$this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 255, 0);
-			$this->assertRGBEqual($copy->getRGBAt(15, 85), 255, 0, 0);
-			
-			$this->assertEquals($copy->getRGBAt(50, 50), $copy->getTransparentColorRGB());
-			$rgb = $copy->getTransparentColorRGB();
-			$this->assertRGBEqual($img->getTransparentColorRGB(), $rgb['red'], $rgb['green'], $rgb['blue']);
-		}
-	}
+    /**
+     */
+    class WideImage_PaletteImage_Test extends WideImage_TestCase
+    {
+        public function testCreate()
+        {
+            $img = WideImage_PaletteImage::create(10, 10);
+            $this->assertTrue($img instanceof WideImage_PaletteImage);
+            $this->assertTrue($img->isValid());
+            $this->assertFalse($img->isTrueColor());
+        }
+
+        public function testCopy()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $this->assertTrue($img instanceof WideImage_PaletteImage);
+            $this->assertTrue($img->isValid());
+            $this->assertFalse($img->isTrueColor());
+            $this->assertTrue($img->isTransparent());
+            $this->assertRGBEqual($img->getRGBAt(15, 15), 255, 255, 0);
+            $this->assertRGBEqual($img->getRGBAt(85, 15), 0, 0, 255);
+            $this->assertRGBEqual($img->getRGBAt(85, 85), 0, 255, 0);
+            $this->assertRGBEqual($img->getRGBAt(15, 85), 255, 0, 0);
+            $this->assertTrue($img->getTransparentColor() === $img->getColorAt(50, 50));
+
+            $copy = $img->copy();
+            $this->assertFalse($img->getHandle() === $copy->getHandle());
+
+            $this->assertTrue($copy instanceof WideImage_PaletteImage);
+            $this->assertTrue($copy->isValid());
+            $this->assertFalse($copy->isTrueColor());
+            $this->assertTrue($copy->isTransparent());
+            $this->assertRGBEqual($copy->getRGBAt(15, 15), 255, 255, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 255);
+            $this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 255, 0);
+            $this->assertRGBEqual($copy->getRGBAt(15, 85), 255, 0, 0);
+            $this->assertTrue($copy->getTransparentColor() === $copy->getColorAt(50, 50));
+
+            $this->assertSame($img->getTransparentColorRGB(), $copy->getTransparentColorRGB());
+        }
+
+        public function testAsTrueColor()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $this->assertTrue($img instanceof WideImage_PaletteImage);
+            $this->assertTrue($img->isValid());
+
+            $copy = $img->asTrueColor();
+            $this->assertFalse($img->getHandle() === $copy->getHandle());
+
+            $this->assertTrue($copy instanceof WideImage_TrueColorImage);
+            $this->assertTrue($copy->isValid());
+            $this->assertTrue($copy->isTrueColor());
+            $this->assertTrue($copy->isTransparent());
+            $this->assertRGBEqual($copy->getRGBAt(15, 15), 255, 255, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 15), 0, 0, 255);
+            $this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 255, 0);
+            $this->assertRGBEqual($copy->getRGBAt(15, 85), 255, 0, 0);
+
+            $this->assertEquals($copy->getRGBAt(50, 50), $copy->getTransparentColorRGB());
+            $rgb = $copy->getTransparentColorRGB();
+            $this->assertRGBEqual($img->getTransparentColorRGB(), $rgb['red'], $rgb['green'], $rgb['blue']);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/TrueColorImageTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/TrueColorImageTest.php
index ab164b6cf..6e61601fe 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/TrueColorImageTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/TrueColorImageTest.php
@@ -1,120 +1,102 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_TrueColorImage_Test extends WideImage_TestCase
-	{
-		function testCreate()
-		{
-			$img = WideImage_TrueColorImage::create(10, 10);
-			$this->assertTrue($img instanceof WideImage_TrueColorImage);
-			$this->assertTrue($img->isValid());
-			$this->assertTrue($img->isTrueColor());
-		}
-		
-		function testCopy()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-rgbyg.png');
-			$this->assertTrue($img instanceof WideImage_TrueColorImage);
-			$this->assertTrue($img->isValid());
-			$this->assertTrue($img->isTrueColor());
-			$this->assertRGBEqual($img->getRGBAt(15, 15), 0, 0, 255);
-			$this->assertRGBEqual($img->getRGBAt(85, 15), 255, 0, 0);
-			$this->assertRGBEqual($img->getRGBAt(85, 85), 255, 255, 0);
-			$this->assertRGBEqual($img->getRGBAt(15, 85), 0, 255, 0);
-			$this->assertRGBEqual($img->getRGBAt(50, 50), 127, 127, 127);
-			
-			$copy = $img->copy();
-			$this->assertFalse($img->getHandle() === $copy->getHandle());
-			
-			$this->assertTrue($copy instanceof WideImage_TrueColorImage);
-			$this->assertTrue($copy->isValid());
-			$this->assertTrue($copy->isTrueColor());
-			$this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 0, 255);
-			$this->assertRGBEqual($copy->getRGBAt(85, 15), 255, 0, 0);
-			$this->assertRGBEqual($copy->getRGBAt(85, 85), 255, 255, 0);
-			$this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 255, 0);
-			$this->assertRGBEqual($copy->getRGBAt(50, 50), 127, 127, 127);
-		}
-		
-		function testCopyAlphaGetsCopied()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
-			$this->assertTrue($img instanceof WideImage_TrueColorImage);
-			$this->assertTrue($img->isValid());
-			$this->assertTrue($img->isTrueColor());
-			$this->assertRGBNear($img->getRGBAt(25, 25), 0, 0, 255, 0.25 * 127);
-			$this->assertRGBNear($img->getRGBAt(75, 25), 0, 0, 255, 0.5 * 127);
-			$this->assertRGBNear($img->getRGBAt(75, 75), 0, 0, 255, 0.75 * 127);
-			$this->assertRGBNear($img->getRGBAt(25, 75), 0, 0, 0, 127);
-			
-			$copy = $img->copy();
-			$this->assertFalse($img->getHandle() === $copy->getHandle());
-			
-			$this->assertTrue($copy instanceof WideImage_TrueColorImage);
-			$this->assertTrue($copy->isValid());
-			$this->assertTrue($copy->isTrueColor());
-			$this->assertRGBNear($copy->getRGBAt(25, 25), 0, 0, 255, 0.25 * 127);
-			$this->assertRGBNear($copy->getRGBAt(75, 25), 0, 0, 255, 0.5 * 127);
-			$this->assertRGBNear($copy->getRGBAt(75, 75), 0, 0, 255, 0.75 * 127);
-			$this->assertRGBNear($copy->getRGBAt(25, 75), 0, 0, 0, 127);
-		}
-		
-		function testAsPalette()
-		{
-			if (function_exists('imagecolormatch'))
-			{
-				$img = WideImage::load(IMG_PATH . '100x100-rgbyg.png');
-				$this->assertTrue($img instanceof WideImage_TrueColorImage);
-				$this->assertTrue($img->isValid());
-				$this->assertTrue($img->isTrueColor());
-				
-				$copy = $img->asPalette();
-				$this->assertFalse($img->getHandle() === $copy->getHandle());
-				
-				$this->assertTrue($copy instanceof WideImage_PaletteImage);
-				$this->assertTrue($copy->isValid());
-				$this->assertFalse($copy->isTrueColor());
-				$this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 0, 255);
-				$this->assertRGBEqual($copy->getRGBAt(85, 15), 255, 0, 0);
-				$this->assertRGBEqual($copy->getRGBAt(85, 85), 255, 255, 0);
-				$this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 255, 0);
-				$this->assertRGBEqual($copy->getRGBAt(50, 50), 127, 127, 127);
-			}
-		}
-		
-		function testPreserveTransparency()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-color-hole.gif');
-			$this->assertTrue($img->isTransparent());
-			$this->assertRGBEqual($img->getTransparentColorRGB(), 255, 255, 255);
-			
-			$tc = $img->asTrueColor();
-			$this->assertTrue($tc->isTransparent());
-			$this->assertRGBEqual($tc->getTransparentColorRGB(), 255, 255, 255);
-			
-			$img = $tc->asPalette();
-			$this->assertTrue($img->isTransparent());
-			$this->assertRGBEqual($img->getTransparentColorRGB(), 255, 255, 255);
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_TrueColorImage_Test extends WideImage_TestCase
+    {
+        public function testCreate()
+        {
+            $img = WideImage_TrueColorImage::create(10, 10);
+            $this->assertTrue($img instanceof WideImage_TrueColorImage);
+            $this->assertTrue($img->isValid());
+            $this->assertTrue($img->isTrueColor());
+        }
+
+        public function testCopy()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-rgbyg.png');
+            $this->assertTrue($img instanceof WideImage_TrueColorImage);
+            $this->assertTrue($img->isValid());
+            $this->assertTrue($img->isTrueColor());
+            $this->assertRGBEqual($img->getRGBAt(15, 15), 0, 0, 255);
+            $this->assertRGBEqual($img->getRGBAt(85, 15), 255, 0, 0);
+            $this->assertRGBEqual($img->getRGBAt(85, 85), 255, 255, 0);
+            $this->assertRGBEqual($img->getRGBAt(15, 85), 0, 255, 0);
+            $this->assertRGBEqual($img->getRGBAt(50, 50), 127, 127, 127);
+
+            $copy = $img->copy();
+            $this->assertFalse($img->getHandle() === $copy->getHandle());
+
+            $this->assertTrue($copy instanceof WideImage_TrueColorImage);
+            $this->assertTrue($copy->isValid());
+            $this->assertTrue($copy->isTrueColor());
+            $this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 0, 255);
+            $this->assertRGBEqual($copy->getRGBAt(85, 15), 255, 0, 0);
+            $this->assertRGBEqual($copy->getRGBAt(85, 85), 255, 255, 0);
+            $this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 255, 0);
+            $this->assertRGBEqual($copy->getRGBAt(50, 50), 127, 127, 127);
+        }
+
+        public function testCopyAlphaGetsCopied()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-blue-alpha.png');
+            $this->assertTrue($img instanceof WideImage_TrueColorImage);
+            $this->assertTrue($img->isValid());
+            $this->assertTrue($img->isTrueColor());
+            $this->assertRGBNear($img->getRGBAt(25, 25), 0, 0, 255, 0.25 * 127);
+            $this->assertRGBNear($img->getRGBAt(75, 25), 0, 0, 255, 0.5 * 127);
+            $this->assertRGBNear($img->getRGBAt(75, 75), 0, 0, 255, 0.75 * 127);
+            $this->assertRGBNear($img->getRGBAt(25, 75), 0, 0, 0, 127);
+
+            $copy = $img->copy();
+            $this->assertFalse($img->getHandle() === $copy->getHandle());
+
+            $this->assertTrue($copy instanceof WideImage_TrueColorImage);
+            $this->assertTrue($copy->isValid());
+            $this->assertTrue($copy->isTrueColor());
+            $this->assertRGBNear($copy->getRGBAt(25, 25), 0, 0, 255, 0.25 * 127);
+            $this->assertRGBNear($copy->getRGBAt(75, 25), 0, 0, 255, 0.5 * 127);
+            $this->assertRGBNear($copy->getRGBAt(75, 75), 0, 0, 255, 0.75 * 127);
+            $this->assertRGBNear($copy->getRGBAt(25, 75), 0, 0, 0, 127);
+        }
+
+        public function testAsPalette()
+        {
+            if (function_exists('imagecolormatch')) {
+                $img = WideImage::load(IMG_PATH.'100x100-rgbyg.png');
+                $this->assertTrue($img instanceof WideImage_TrueColorImage);
+                $this->assertTrue($img->isValid());
+                $this->assertTrue($img->isTrueColor());
+
+                $copy = $img->asPalette();
+                $this->assertFalse($img->getHandle() === $copy->getHandle());
+
+                $this->assertTrue($copy instanceof WideImage_PaletteImage);
+                $this->assertTrue($copy->isValid());
+                $this->assertFalse($copy->isTrueColor());
+                $this->assertRGBEqual($copy->getRGBAt(15, 15), 0, 0, 255);
+                $this->assertRGBEqual($copy->getRGBAt(85, 15), 255, 0, 0);
+                $this->assertRGBEqual($copy->getRGBAt(85, 85), 255, 255, 0);
+                $this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 255, 0);
+                $this->assertRGBEqual($copy->getRGBAt(50, 50), 127, 127, 127);
+            }
+        }
+
+        public function testPreserveTransparency()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-color-hole.gif');
+            $this->assertTrue($img->isTransparent());
+            $this->assertRGBEqual($img->getTransparentColorRGB(), 255, 255, 255);
+
+            $tc = $img->asTrueColor();
+            $this->assertTrue($tc->isTransparent());
+            $this->assertRGBEqual($tc->getTransparentColorRGB(), 255, 255, 255);
+
+            $img = $tc->asPalette();
+            $this->assertTrue($img->isTransparent());
+            $this->assertRGBEqual($img->getTransparentColorRGB(), 255, 255, 255);
+        }
+    }
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/WideImageTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/WideImageTest.php
index 3818340ff..544b44ecf 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/WideImageTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/WideImageTest.php
@@ -1,354 +1,345 @@
 <?php
-	/**
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package Tests
-  **/
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Mapper_FOO
-	{
-		public static $calls = array();
-		public static $handle = null;
-		
-		static function reset()
-		{
-			self::$calls = array();
-			self::$handle = null;
-		}
-		
-		function load()
-		{
-			self::$calls['load'] = func_get_args();
-			return self::$handle;
-		}
-		
-		function loadFromString($data)
-		{
-			self::$calls['loadFromString'] = func_get_args();
-			return self::$handle;
-		}
-		
-		function save($image, $uri = null)
-		{
-			self::$calls['save'] = func_get_args();
-			if ($uri == null)
-				echo 'out';
-			return true;
-		}
-	}
-	
-	class WideImage_Mapper_FOO2
-	{
-		public static $calls = array();
-		
-		static function reset()
-		{
-			self::$calls = array();
-		}
-		
-		function load()
-		{
-			self::$calls['load'] = func_get_args();
-			return false;
-		}
-		
-		function loadFromString($data)
-		{
-			self::$calls['loadFromString'] = func_get_args();
-		}
-		
-		function save($image, $uri = null)
-		{
-			self::$calls['save'] = func_get_args();
-			if ($uri == null)
-				echo 'out';
-		}
-	}
-	
-	/**
-	 * @package Tests
-	 */
-	class WideImage_Test extends WideImage_TestCase
-	{
-		protected $_FILES;
-		function setup()
-		{
-			$this->_FILES = $_FILES;
-			$_FILES = array();
-		}
-		
-		function teardown()
-		{
-			$_FILES = $this->_FILES;
-			
-			if (PHP_OS == 'WINNT')
-			{
-				chdir(IMG_PATH . "temp");
-				
-				foreach (new DirectoryIterator(IMG_PATH . "temp") as $file)
-					if (!$file->isDot())
-						if ($file->isDir())
-							exec("rd /S /Q {$file->getFilename()}\n");
-						else
-							unlink($file->getFilename());
-			}
-			else
-				exec("rm -rf " . IMG_PATH . 'temp/*');
-		}
-		
-		function testLoadFromFile()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-red-transparent.gif');
-			$this->assertTrue($img instanceof WideImage_PaletteImage);
-			$this->assertValidImage($img);
-			$this->assertFalse($img->isTrueColor());
-			$this->assertEquals(100, $img->getWidth());
-			$this->assertEquals(100, $img->getHeight());
-			
-			$img = WideImage::load(IMG_PATH . '100x100-rainbow.png');
-			$this->assertTrue($img instanceof WideImage_TrueColorImage);
-			$this->assertValidImage($img);
-			$this->assertTrue($img->isTrueColor());
-			$this->assertEquals(100, $img->getWidth());
-			$this->assertEquals(100, $img->getHeight());
-		}
-		
-		function testLoadFromString()
-		{
-			$img = WideImage::load(file_get_contents(IMG_PATH . '100x100-rainbow.png'));
-			$this->assertTrue($img instanceof WideImage_TrueColorImage);
-			$this->assertValidImage($img);
-			$this->assertTrue($img->isTrueColor());
-			$this->assertEquals(100, $img->getWidth());
-			$this->assertEquals(100, $img->getHeight());
-		}
-		
-		function testLoadFromHandle()
-		{
-			$handle = imagecreatefrompng(IMG_PATH . '100x100-rainbow.png');
-			$img = WideImage::loadFromHandle($handle);
-			$this->assertValidImage($img);
-			$this->assertTrue($img->isTrueColor());
-			$this->assertSame($handle, $img->getHandle());
-			$this->assertEquals(100, $img->getWidth());
-			$this->assertEquals(100, $img->getHeight());
-			unset($img);
-			$this->assertFalse(WideImage::isValidImageHandle($handle));
-		}
-		
-		function testLoadFromUpload()
-		{
-			copy(IMG_PATH . '100x100-rainbow.png', IMG_PATH . 'temp' . DIRECTORY_SEPARATOR . 'upltmpimg');
-			$_FILES = array(
-				'testupl' => array(
-					'name' => '100x100-rainbow.png',
-					'type' => 'image/png',
-					'size' => strlen(file_get_contents(IMG_PATH . '100x100-rainbow.png')),
-					'tmp_name' => IMG_PATH . 'temp' . DIRECTORY_SEPARATOR . 'upltmpimg',
-					'error' => false,
-				)
-			);
-			
-			$img = WideImage::loadFromUpload('testupl');
-			$this->assertValidImage($img);
-		}
-		
-		function testLoadFromMultipleUploads()
-		{
-			copy(IMG_PATH . '100x100-rainbow.png', IMG_PATH . 'temp' . DIRECTORY_SEPARATOR . 'upltmpimg1');
-			copy(IMG_PATH . 'splat.tga', IMG_PATH . 'temp' . DIRECTORY_SEPARATOR . 'upltmpimg2');
-			$_FILES = array(
-				'testupl' => array(
-					'name' => array('100x100-rainbow.png', 'splat.tga'),
-					'type' => array('image/png', 'image/tga'),
-					'size' => array(
-							strlen(file_get_contents(IMG_PATH . '100x100-rainbow.png')), 
-							strlen(file_get_contents(IMG_PATH . 'splat.tga'))
-						),
-					'tmp_name' => array(
-							IMG_PATH . 'temp' . DIRECTORY_SEPARATOR . 'upltmpimg1',
-							IMG_PATH . 'temp' . DIRECTORY_SEPARATOR . 'upltmpimg2'
-						),
-					'error' => array(false, false),
-				)
-			);
-			
-			$images = WideImage::loadFromUpload('testupl');
-			$this->assertInternalType("array", $images);
-			$this->assertValidImage($images[0]);
-			$this->assertValidImage($images[1]);
-			
-			$img = WideImage::loadFromUpload('testupl', 1);
-			$this->assertValidImage($img);
-		}
-		
-		function testLoadMagicalFromHandle()
-		{
-			$img = WideImage::load(imagecreatefrompng(IMG_PATH . '100x100-rainbow.png'));
-			$this->assertValidImage($img);
-		}
-		
-		
-		function testLoadMagicalFromBinaryString()
-		{
-			$img = WideImage::load(file_get_contents(IMG_PATH . '100x100-rainbow.png'));
-			$this->assertValidImage($img);
-		}
-		
-		function testLoadMagicalFromFile()
-		{
-			$img = WideImage::load(IMG_PATH . '100x100-rainbow.png');
-			$this->assertValidImage($img);
-			copy(IMG_PATH . '100x100-rainbow.png', IMG_PATH . 'temp' . DIRECTORY_SEPARATOR . 'upltmpimg');
-			$_FILES = array(
-				'testupl' => array(
-					'name' => 'fgnl.bmp',
-					'type' => 'image/bmp',
-					'size' => strlen(file_get_contents(IMG_PATH . 'fgnl.bmp')),
-					'tmp_name' => IMG_PATH . 'temp' . DIRECTORY_SEPARATOR . 'upltmpimg',
-					'error' => false,
-				)
-			);
-			$img = WideImage::load('testupl');
-			$this->assertValidImage($img);
-		}
-		
-		function testLoadFromStringWithCustomMapper()
-		{
-			$img = WideImage::loadFromString(file_get_contents(IMG_PATH . 'splat.tga'));
-			$this->assertValidImage($img);
-		}
-		
-		function testLoadFromFileWithInvalidExtension()
-		{
-			$img = WideImage::load(IMG_PATH . 'actually-a-png.jpg');
-			$this->assertValidImage($img);
-		}
-		
-		function testLoadFromFileWithInvalidExtensionWithCustomMapper()
-		{
-			if (PHP_OS == 'WINNT')
-				$this->markTestSkipped("For some reason, this test kills PHP my 32-bit Vista + PHP 5.3.1.");
-			
-			$img = WideImage::loadFromFile(IMG_PATH . 'fgnl-bmp.jpg');
-			$this->assertValidImage($img);
-		}
-		
-		/**
-		 * @expectedException WideImage_InvalidImageSourceException
-		 */
-		function testLoadFromStringEmpty()
-		{
-			WideImage::loadFromString('');
-		}
-		
-		function testLoadBMPMagicalFromUpload()
-		{
-			copy(IMG_PATH . 'fgnl.bmp', IMG_PATH . 'temp' . DIRECTORY_SEPARATOR . 'upltmpimg');
-			$_FILES = array(
-				'testupl' => array(
-					'name' => 'fgnl.bmp',
-					'type' => 'image/bmp',
-					'size' => strlen(file_get_contents(IMG_PATH . 'fgnl.bmp')),
-					'tmp_name' => IMG_PATH . 'temp' . DIRECTORY_SEPARATOR . 'upltmpimg',
-					'error' => false,
-				)
-			);
-			$img = WideImage::load('testupl');
-			$this->assertValidImage($img);
-		}
-		
-		function testMapperLoad()
-		{
-			WideImage_Mapper_FOO::$handle = imagecreate(10, 10);
-			$filename = IMG_PATH . '/image.foo';
-			WideImage::registerCustomMapper('WideImage_Mapper_FOO', 'image/foo', 'foo');
-			$img = WideImage::load($filename);
-			$this->assertEquals(WideImage_Mapper_FOO::$calls['load'], array($filename));
-			imagedestroy(WideImage_Mapper_FOO::$handle);
-		}
-		
-		function testLoadFromFileFallbackToLoadFromString()
-		{
-			WideImage_Mapper_FOO::$handle = imagecreate(10, 10);
-			$filename = IMG_PATH . '/image-actually-foo.foo2';
-			WideImage::registerCustomMapper('WideImage_Mapper_FOO', 'image/foo', 'foo');
-			WideImage::registerCustomMapper('WideImage_Mapper_FOO2', 'image/foo2', 'foo2');
-			$img = WideImage::load($filename);
-			$this->assertEquals(WideImage_Mapper_FOO2::$calls['load'], array($filename));
-			$this->assertEquals(WideImage_Mapper_FOO::$calls['loadFromString'], array(file_get_contents($filename)));
-			imagedestroy(WideImage_Mapper_FOO::$handle);
-		}
-		
-		function testMapperSaveToFile()
-		{
-			$img = WideImage::load(IMG_PATH . 'fgnl.jpg');
-			$img->saveToFile('test.foo', '123', 789);
-			$this->assertEquals(WideImage_Mapper_FOO::$calls['save'], array($img->getHandle(), 'test.foo', '123', 789));
-		}
-		
-		function testMapperAsString()
-		{
-			$img = WideImage::load(IMG_PATH . 'fgnl.jpg');
-			$str = $img->asString('foo', '123', 789);
-			$this->assertEquals(WideImage_Mapper_FOO::$calls['save'], array($img->getHandle(), null, '123', 789));
-			$this->assertEquals('out', $str);
-		}
-		
-		/**
-		 * @expectedException WideImage_InvalidImageSourceException
-		 */
-		function testInvalidImageFile()
-		{
-			WideImage::loadFromFile(IMG_PATH . 'fakeimage.png');
-		}
-		
-		/**
-		 * @expectedException WideImage_InvalidImageSourceException
-		 */
-		function testEmptyString()
-		{
-			WideImage::load('');
-		}
-		
-		/**
-		 * @expectedException WideImage_InvalidImageSourceException
-		 */
-		function testInvalidImageStringData()
-		{
-			WideImage::loadFromString('asdf');
-		}
-		
-		/**
-		 * @expectedException WideImage_InvalidImageSourceException
-		 */
-		function testInvalidImageHandle()
-		{
-			WideImage::loadFromHandle(0);
-		}
-		
-		/**
-		 * @expectedException WideImage_InvalidImageSourceException
-		 */
-		function testInvalidImageUploadField()
-		{
-			WideImage::loadFromUpload('xyz');
-		}
-	}
+    /**
+     
+     **/
+
+    /**
+     */
+    class WideImage_Mapper_FOO
+    {
+        public static $calls = [];
+        public static $handle = null;
+
+        public static function reset()
+        {
+            self::$calls = [];
+            self::$handle = null;
+        }
+
+        public function load()
+        {
+            self::$calls['load'] = func_get_args();
+
+            return self::$handle;
+        }
+
+        public function loadFromString($data)
+        {
+            self::$calls['loadFromString'] = func_get_args();
+
+            return self::$handle;
+        }
+
+        public function save($image, $uri = null)
+        {
+            self::$calls['save'] = func_get_args();
+            if ($uri == null) {
+                echo 'out';
+            }
+
+            return true;
+        }
+    }
+
+    class WideImage_Mapper_FOO2
+    {
+        public static $calls = [];
+
+        public static function reset()
+        {
+            self::$calls = [];
+        }
+
+        public function load()
+        {
+            self::$calls['load'] = func_get_args();
+
+            return false;
+        }
+
+        public function loadFromString($data)
+        {
+            self::$calls['loadFromString'] = func_get_args();
+        }
+
+        public function save($image, $uri = null)
+        {
+            self::$calls['save'] = func_get_args();
+            if ($uri == null) {
+                echo 'out';
+            }
+        }
+    }
+
+    /**
+     */
+    class WideImage_Test extends WideImage_TestCase
+    {
+        protected $_FILES;
+
+        public function setup()
+        {
+            $this->_FILES = $_FILES;
+            $_FILES = [];
+        }
+
+        public function teardown()
+        {
+            $_FILES = $this->_FILES;
+
+            if (PHP_OS == 'WINNT') {
+                chdir(IMG_PATH.'temp');
+
+                foreach (new DirectoryIterator(IMG_PATH.'temp') as $file) {
+                    if (!$file->isDot()) {
+                        if ($file->isDir()) {
+                            exec("rd /S /Q {$file->getFilename()}\n");
+                        } else {
+                            unlink($file->getFilename());
+                        }
+                    }
+                }
+            } else {
+                exec('rm -rf '.IMG_PATH.'temp/*');
+            }
+        }
+
+        public function testLoadFromFile()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-red-transparent.gif');
+            $this->assertTrue($img instanceof WideImage_PaletteImage);
+            $this->assertValidImage($img);
+            $this->assertFalse($img->isTrueColor());
+            $this->assertEquals(100, $img->getWidth());
+            $this->assertEquals(100, $img->getHeight());
+
+            $img = WideImage::load(IMG_PATH.'100x100-rainbow.png');
+            $this->assertTrue($img instanceof WideImage_TrueColorImage);
+            $this->assertValidImage($img);
+            $this->assertTrue($img->isTrueColor());
+            $this->assertEquals(100, $img->getWidth());
+            $this->assertEquals(100, $img->getHeight());
+        }
+
+        public function testLoadFromString()
+        {
+            $img = WideImage::load(file_get_contents(IMG_PATH.'100x100-rainbow.png'));
+            $this->assertTrue($img instanceof WideImage_TrueColorImage);
+            $this->assertValidImage($img);
+            $this->assertTrue($img->isTrueColor());
+            $this->assertEquals(100, $img->getWidth());
+            $this->assertEquals(100, $img->getHeight());
+        }
+
+        public function testLoadFromHandle()
+        {
+            $handle = imagecreatefrompng(IMG_PATH.'100x100-rainbow.png');
+            $img = WideImage::loadFromHandle($handle);
+            $this->assertValidImage($img);
+            $this->assertTrue($img->isTrueColor());
+            $this->assertSame($handle, $img->getHandle());
+            $this->assertEquals(100, $img->getWidth());
+            $this->assertEquals(100, $img->getHeight());
+            unset($img);
+            $this->assertFalse(WideImage::isValidImageHandle($handle));
+        }
+
+        public function testLoadFromUpload()
+        {
+            copy(IMG_PATH.'100x100-rainbow.png', IMG_PATH.'temp'.DIRECTORY_SEPARATOR.'upltmpimg');
+            $_FILES = [
+                'testupl' => [
+                    'name'     => '100x100-rainbow.png',
+                    'type'     => 'image/png',
+                    'size'     => strlen(file_get_contents(IMG_PATH.'100x100-rainbow.png')),
+                    'tmp_name' => IMG_PATH.'temp'.DIRECTORY_SEPARATOR.'upltmpimg',
+                    'error'    => false,
+                ],
+            ];
+
+            $img = WideImage::loadFromUpload('testupl');
+            $this->assertValidImage($img);
+        }
+
+        public function testLoadFromMultipleUploads()
+        {
+            copy(IMG_PATH.'100x100-rainbow.png', IMG_PATH.'temp'.DIRECTORY_SEPARATOR.'upltmpimg1');
+            copy(IMG_PATH.'splat.tga', IMG_PATH.'temp'.DIRECTORY_SEPARATOR.'upltmpimg2');
+            $_FILES = [
+                'testupl' => [
+                    'name' => ['100x100-rainbow.png', 'splat.tga'],
+                    'type' => ['image/png', 'image/tga'],
+                    'size' => [
+                            strlen(file_get_contents(IMG_PATH.'100x100-rainbow.png')),
+                            strlen(file_get_contents(IMG_PATH.'splat.tga')),
+                        ],
+                    'tmp_name' => [
+                            IMG_PATH.'temp'.DIRECTORY_SEPARATOR.'upltmpimg1',
+                            IMG_PATH.'temp'.DIRECTORY_SEPARATOR.'upltmpimg2',
+                        ],
+                    'error' => [false, false],
+                ],
+            ];
+
+            $images = WideImage::loadFromUpload('testupl');
+            $this->assertInternalType('array', $images);
+            $this->assertValidImage($images[0]);
+            $this->assertValidImage($images[1]);
+
+            $img = WideImage::loadFromUpload('testupl', 1);
+            $this->assertValidImage($img);
+        }
+
+        public function testLoadMagicalFromHandle()
+        {
+            $img = WideImage::load(imagecreatefrompng(IMG_PATH.'100x100-rainbow.png'));
+            $this->assertValidImage($img);
+        }
+
+        public function testLoadMagicalFromBinaryString()
+        {
+            $img = WideImage::load(file_get_contents(IMG_PATH.'100x100-rainbow.png'));
+            $this->assertValidImage($img);
+        }
+
+        public function testLoadMagicalFromFile()
+        {
+            $img = WideImage::load(IMG_PATH.'100x100-rainbow.png');
+            $this->assertValidImage($img);
+            copy(IMG_PATH.'100x100-rainbow.png', IMG_PATH.'temp'.DIRECTORY_SEPARATOR.'upltmpimg');
+            $_FILES = [
+                'testupl' => [
+                    'name'     => 'fgnl.bmp',
+                    'type'     => 'image/bmp',
+                    'size'     => strlen(file_get_contents(IMG_PATH.'fgnl.bmp')),
+                    'tmp_name' => IMG_PATH.'temp'.DIRECTORY_SEPARATOR.'upltmpimg',
+                    'error'    => false,
+                ],
+            ];
+            $img = WideImage::load('testupl');
+            $this->assertValidImage($img);
+        }
+
+        public function testLoadFromStringWithCustomMapper()
+        {
+            $img = WideImage::loadFromString(file_get_contents(IMG_PATH.'splat.tga'));
+            $this->assertValidImage($img);
+        }
+
+        public function testLoadFromFileWithInvalidExtension()
+        {
+            $img = WideImage::load(IMG_PATH.'actually-a-png.jpg');
+            $this->assertValidImage($img);
+        }
+
+        public function testLoadFromFileWithInvalidExtensionWithCustomMapper()
+        {
+            if (PHP_OS == 'WINNT') {
+                $this->markTestSkipped('For some reason, this test kills PHP my 32-bit Vista + PHP 5.3.1.');
+            }
+
+            $img = WideImage::loadFromFile(IMG_PATH.'fgnl-bmp.jpg');
+            $this->assertValidImage($img);
+        }
+
+        /**
+         * @expectedException WideImage_InvalidImageSourceException
+         */
+        public function testLoadFromStringEmpty()
+        {
+            WideImage::loadFromString('');
+        }
+
+        public function testLoadBMPMagicalFromUpload()
+        {
+            copy(IMG_PATH.'fgnl.bmp', IMG_PATH.'temp'.DIRECTORY_SEPARATOR.'upltmpimg');
+            $_FILES = [
+                'testupl' => [
+                    'name'     => 'fgnl.bmp',
+                    'type'     => 'image/bmp',
+                    'size'     => strlen(file_get_contents(IMG_PATH.'fgnl.bmp')),
+                    'tmp_name' => IMG_PATH.'temp'.DIRECTORY_SEPARATOR.'upltmpimg',
+                    'error'    => false,
+                ],
+            ];
+            $img = WideImage::load('testupl');
+            $this->assertValidImage($img);
+        }
+
+        public function testMapperLoad()
+        {
+            WideImage_Mapper_FOO::$handle = imagecreate(10, 10);
+            $filename = IMG_PATH.'/image.foo';
+            WideImage::registerCustomMapper('WideImage_Mapper_FOO', 'image/foo', 'foo');
+            $img = WideImage::load($filename);
+            $this->assertEquals(WideImage_Mapper_FOO::$calls['load'], [$filename]);
+            imagedestroy(WideImage_Mapper_FOO::$handle);
+        }
+
+        public function testLoadFromFileFallbackToLoadFromString()
+        {
+            WideImage_Mapper_FOO::$handle = imagecreate(10, 10);
+            $filename = IMG_PATH.'/image-actually-foo.foo2';
+            WideImage::registerCustomMapper('WideImage_Mapper_FOO', 'image/foo', 'foo');
+            WideImage::registerCustomMapper('WideImage_Mapper_FOO2', 'image/foo2', 'foo2');
+            $img = WideImage::load($filename);
+            $this->assertEquals(WideImage_Mapper_FOO2::$calls['load'], [$filename]);
+            $this->assertEquals(WideImage_Mapper_FOO::$calls['loadFromString'], [file_get_contents($filename)]);
+            imagedestroy(WideImage_Mapper_FOO::$handle);
+        }
+
+        public function testMapperSaveToFile()
+        {
+            $img = WideImage::load(IMG_PATH.'fgnl.jpg');
+            $img->saveToFile('test.foo', '123', 789);
+            $this->assertEquals(WideImage_Mapper_FOO::$calls['save'], [$img->getHandle(), 'test.foo', '123', 789]);
+        }
+
+        public function testMapperAsString()
+        {
+            $img = WideImage::load(IMG_PATH.'fgnl.jpg');
+            $str = $img->asString('foo', '123', 789);
+            $this->assertEquals(WideImage_Mapper_FOO::$calls['save'], [$img->getHandle(), null, '123', 789]);
+            $this->assertEquals('out', $str);
+        }
+
+        /**
+         * @expectedException WideImage_InvalidImageSourceException
+         */
+        public function testInvalidImageFile()
+        {
+            WideImage::loadFromFile(IMG_PATH.'fakeimage.png');
+        }
+
+        /**
+         * @expectedException WideImage_InvalidImageSourceException
+         */
+        public function testEmptyString()
+        {
+            WideImage::load('');
+        }
+
+        /**
+         * @expectedException WideImage_InvalidImageSourceException
+         */
+        public function testInvalidImageStringData()
+        {
+            WideImage::loadFromString('asdf');
+        }
+
+        /**
+         * @expectedException WideImage_InvalidImageSourceException
+         */
+        public function testInvalidImageHandle()
+        {
+            WideImage::loadFromHandle(0);
+        }
+
+        /**
+         * @expectedException WideImage_InvalidImageSourceException
+         */
+        public function testInvalidImageUploadField()
+        {
+            WideImage::loadFromUpload('xyz');
+        }
+    }
diff --git a/public/filemanager/connectors/php/plugins/rsc/cloudfiles.php b/public/filemanager/connectors/php/plugins/rsc/cloudfiles.php
index 6b2db1457..563d5bf6c 100644
--- a/public/filemanager/connectors/php/plugins/rsc/cloudfiles.php
+++ b/public/filemanager/connectors/php/plugins/rsc/cloudfiles.php
@@ -66,19 +66,18 @@
  *
  * @author Eric "EJ" Johnson <ej@racklabs.com>
  * @copyright Copyright (c) 2008, Rackspace US, Inc.
- * @package php-cloudfiles
  */
 
 /**
  */
-require_once("cloudfiles_exceptions.php");
-require("cloudfiles_http.php");
-define("DEFAULT_CF_API_VERSION", 1);
-define("MAX_CONTAINER_NAME_LEN", 256);
-define("MAX_OBJECT_NAME_LEN", 1024);
-define("MAX_OBJECT_SIZE", 5*1024*1024*1024+1);
-define("US_AUTHURL", "https://auth.api.rackspacecloud.com");
-define("UK_AUTHURL", "https://lon.auth.api.rackspacecloud.com");
+require_once 'cloudfiles_exceptions.php';
+require 'cloudfiles_http.php';
+define('DEFAULT_CF_API_VERSION', 1);
+define('MAX_CONTAINER_NAME_LEN', 256);
+define('MAX_OBJECT_NAME_LEN', 1024);
+define('MAX_OBJECT_SIZE', 5 * 1024 * 1024 * 1024 + 1);
+define('US_AUTHURL', 'https://auth.api.rackspacecloud.com');
+define('UK_AUTHURL', 'https://lon.auth.api.rackspacecloud.com');
 /**
  * Class for handling Cloud Files Authentication, call it's {@link authenticate()}
  * method to obtain authorized service urls and an authentication token.
@@ -108,8 +107,6 @@ define("UK_AUTHURL", "https://lon.auth.api.rackspacecloud.com");
  * #
  * $auth->authenticate();
  * </code>
- *
- * @package php-cloudfiles
  */
 class CF_Authentication
 {
@@ -120,38 +117,37 @@ class CF_Authentication
     public $account;
 
     /**
-     * Instance variables that are set after successful authentication
+     * Instance variables that are set after successful authentication.
      */
     public $storage_url;
     public $cdnm_url;
     public $auth_token;
 
     /**
-     * Class constructor (PHP 5 syntax)
+     * Class constructor (PHP 5 syntax).
      *
-     * @param string $username Mosso username
-     * @param string $api_key Mosso API Access Key
-     * @param string $account  <i>Account name</i>
-     * @param string $auth_host  <i>Authentication service URI</i>
+     * @param string $username  Mosso username
+     * @param string $api_key   Mosso API Access Key
+     * @param string $account   <i>Account name</i>
+     * @param string $auth_host <i>Authentication service URI</i>
      */
-    function __construct($username=NULL, $api_key=NULL, $account=NULL, $auth_host=US_AUTHURL)
+    public function __construct($username = null, $api_key = null, $account = null, $auth_host = US_AUTHURL)
     {
-
-        $this->dbug = False;
+        $this->dbug = false;
         $this->username = $username;
         $this->api_key = $api_key;
         $this->account_name = $account;
         $this->auth_host = $auth_host;
 
-        $this->storage_url = NULL;
-        $this->cdnm_url = NULL;
-        $this->auth_token = NULL;
+        $this->storage_url = null;
+        $this->cdnm_url = null;
+        $this->auth_token = null;
 
         $this->cfs_http = new CF_Http(DEFAULT_CF_API_VERSION);
     }
 
     /**
-     * Use the Certificate Authority bundle included with this API
+     * Use the Certificate Authority bundle included with this API.
      *
      * Most versions of PHP with cURL support include an outdated Certificate
      * Authority (CA) bundle (the file that lists all valid certificate
@@ -171,13 +167,13 @@ class CF_Authentication
      *
      * @param string $path Specify path to CA bundle (default to included)
      */
-    function ssl_use_cabundle($path=NULL)
+    public function ssl_use_cabundle($path = null)
     {
         $this->cfs_http->ssl_use_cabundle($path);
     }
 
     /**
-     * Attempt to validate Username/API Access Key
+     * Attempt to validate Username/API Access Key.
      *
      * Attempts to validate credentials with the authentication service.  It
      * either returns <kbd>True</kbd> or throws an Exception.  Accepts a single
@@ -195,110 +191,116 @@ class CF_Authentication
      * </code>
      *
      * @param string $version API version for Auth service (optional)
-     * @return boolean <kbd>True</kbd> if successfully authenticated
-     * @throws AuthenticationException invalid credentials
+     *
+     * @throws AuthenticationException  invalid credentials
      * @throws InvalidResponseException invalid response
+     *
+     * @return bool <kbd>True</kbd> if successfully authenticated
      */
-    function authenticate($version=DEFAULT_CF_API_VERSION)
+    public function authenticate($version = DEFAULT_CF_API_VERSION)
     {
-        list($status,$reason,$surl,$curl,$atoken) = 
+        list($status, $reason, $surl, $curl, $atoken) =
                 $this->cfs_http->authenticate($this->username, $this->api_key,
                 $this->account_name, $this->auth_host);
 
         if ($status == 401) {
-            throw new AuthenticationException("Invalid username or access key.");
+            throw new AuthenticationException('Invalid username or access key.');
         }
         if ($status != 204) {
             throw new InvalidResponseException(
-                "Unexpected response (".$status."): ".$reason);
+                'Unexpected response ('.$status.'): '.$reason);
         }
 
         if (!($surl || $curl) || !$atoken) {
             throw new InvalidResponseException(
-                "Expected headers missing from auth service.");
+                'Expected headers missing from auth service.');
         }
         $this->storage_url = $surl;
         $this->cdnm_url = $curl;
         $this->auth_token = $atoken;
-        return True;
+
+        return true;
     }
-	/**
-	 * Use Cached Token and Storage URL's rather then grabbing from the Auth System
-         *
-         * Example:
- 	 * <code>
-         * #Create an Auth instance
-         * $auth = new CF_Authentication();
-         * #Pass Cached URL's and Token as Args
-	 * $auth->load_cached_credentials("auth_token", "storage_url", "cdn_management_url");
-         * </code>
-	 * 
-	 * @param string $auth_token A Cloud Files Auth Token (Required)
-         * @param string $storage_url The Cloud Files Storage URL (Required)
-         * @param string $cdnm_url CDN Management URL (Required)
-         * @return boolean <kbd>True</kbd> if successful 
-	 * @throws SyntaxException If any of the Required Arguments are missing
-         */
-	function load_cached_credentials($auth_token, $storage_url, $cdnm_url)
+
+    /**
+     * Use Cached Token and Storage URL's rather then grabbing from the Auth System.
+     *
+     * Example:
+     * <code>
+     * #Create an Auth instance
+     * $auth = new CF_Authentication();
+     * #Pass Cached URL's and Token as Args
+     * $auth->load_cached_credentials("auth_token", "storage_url", "cdn_management_url");
+     * </code>
+     * 
+     * @param string $auth_token  A Cloud Files Auth Token (Required)
+     * @param string $storage_url The Cloud Files Storage URL (Required)
+     * @param string $cdnm_url    CDN Management URL (Required)
+     *
+     * @throws SyntaxException If any of the Required Arguments are missing
+     *
+     * @return bool <kbd>True</kbd> if successful 
+     */
+    public function load_cached_credentials($auth_token, $storage_url, $cdnm_url)
     {
-        if(!$storage_url || !$cdnm_url)
-        {
-                throw new SyntaxException("Missing Required Interface URL's!");
+        if (!$storage_url || !$cdnm_url) {
+            throw new SyntaxException("Missing Required Interface URL's!");
         }
-        if(!$auth_token)
-        {
-                throw new SyntaxException("Missing Auth Token!");
+        if (!$auth_token) {
+            throw new SyntaxException('Missing Auth Token!');
         }
 
         $this->storage_url = $storage_url;
-        $this->cdnm_url    = $cdnm_url;
-        $this->auth_token  = $auth_token;
-        return True;
+        $this->cdnm_url = $cdnm_url;
+        $this->auth_token = $auth_token;
+
+        return true;
     }
-	/**
-         * Grab Cloud Files info to be Cached for later use with the load_cached_credentials method.
-         *
-	 * Example:
-         * <code>
-         * #Create an Auth instance
-         * $auth = new CF_Authentication("UserName","API_Key");
-         * $auth->authenticate();
-         * $array = $auth->export_credentials();
-         * </code>
-         * 
-	 * @return array of url's and an auth token.
-         */
-    function export_credentials()
+
+    /**
+     * Grab Cloud Files info to be Cached for later use with the load_cached_credentials method.
+     *
+     * Example:
+     * <code>
+     * #Create an Auth instance
+     * $auth = new CF_Authentication("UserName","API_Key");
+     * $auth->authenticate();
+     * $array = $auth->export_credentials();
+     * </code>
+     * 
+     * @return array of url's and an auth token.
+     */
+    public function export_credentials()
     {
-        $arr = array();
+        $arr = [];
         $arr['storage_url'] = $this->storage_url;
-        $arr['cdnm_url']    = $this->cdnm_url;
-        $arr['auth_token']  = $this->auth_token;
+        $arr['cdnm_url'] = $this->cdnm_url;
+        $arr['auth_token'] = $this->auth_token;
 
         return $arr;
     }
 
-
     /**
      * Make sure the CF_Authentication instance has authenticated.
      *
      * Ensures that the instance variables necessary to communicate with
      * Cloud Files have been set from a previous authenticate() call.
      *
-     * @return boolean <kbd>True</kbd> if successfully authenticated
+     * @return bool <kbd>True</kbd> if successfully authenticated
      */
-    function authenticated()
+    public function authenticated()
     {
         if (!($this->storage_url || $this->cdnm_url) || !$this->auth_token) {
-            return False;
+            return false;
         }
-        return True;
+
+        return true;
     }
 
     /**
-     * Toggle debugging - set cURL verbose flag
+     * Toggle debugging - set cURL verbose flag.
      */
-    function setDebug($bool)
+    public function setDebug($bool)
     {
         $this->dbug = $bool;
         $this->cfs_http->setDebug($bool);
@@ -333,8 +335,6 @@ class CF_Authentication
  * #
  * # $conn->ssl_use_cabundle(); # bypass cURL's old CA bundle
  * </code>
- *
- * @package php-cloudfiles
  */
 class CF_Connection
 {
@@ -371,38 +371,40 @@ class CF_Connection
      * If the environement variable RACKSPACE_SERVICENET is defined it will
      * force to connect via the servicenet.
      *
-     * @param obj $cfs_auth previously authenticated CF_Authentication instance
-     * @param boolean $servicenet enable/disable access via Rackspace servicenet.
+     * @param obj  $cfs_auth   previously authenticated CF_Authentication instance
+     * @param bool $servicenet enable/disable access via Rackspace servicenet.
+     *
      * @throws AuthenticationException not authenticated
      */
-    function __construct($cfs_auth, $servicenet=False)
+    public function __construct($cfs_auth, $servicenet = false)
     {
-        if (isset($_ENV['RACKSPACE_SERVICENET']))
-            $servicenet=True;
+        if (isset($_ENV['RACKSPACE_SERVICENET'])) {
+            $servicenet = true;
+        }
         $this->cfs_http = new CF_Http(DEFAULT_CF_API_VERSION);
         $this->cfs_auth = $cfs_auth;
         if (!$this->cfs_auth->authenticated()) {
-            $e = "Need to pass in a previously authenticated ";
-            $e .= "CF_Authentication instance.";
+            $e = 'Need to pass in a previously authenticated ';
+            $e .= 'CF_Authentication instance.';
             throw new AuthenticationException($e);
         }
-        $this->cfs_http->setCFAuth($this->cfs_auth, $servicenet=$servicenet);
-        $this->dbug = False;
+        $this->cfs_http->setCFAuth($this->cfs_auth, $servicenet = $servicenet);
+        $this->dbug = false;
     }
 
     /**
-     * Toggle debugging of instance and back-end HTTP module
+     * Toggle debugging of instance and back-end HTTP module.
      *
-     * @param boolean $bool enable/disable cURL debugging
+     * @param bool $bool enable/disable cURL debugging
      */
-    function setDebug($bool)
+    public function setDebug($bool)
     {
-        $this->dbug = (boolean) $bool;
+        $this->dbug = (bool) $bool;
         $this->cfs_http->setDebug($this->dbug);
     }
 
     /**
-     * Close a connection
+     * Close a connection.
      *
      * Example:
      * <code>
@@ -412,15 +414,14 @@ class CF_Connection
      * </code>
      *
      * Will close all current cUrl active connections.
-     * 
      */
     public function close()
     {
         $this->cfs_http->close();
     }
-    
+
     /**
-     * Cloud Files account information
+     * Cloud Files account information.
      *
      * Return an array of two floats (since PHP only supports 32-bit integers);
      * number of containers on the account and total bytes used for the account.
@@ -436,25 +437,27 @@ class CF_Connection
      * print "Bytes stored in container: " . $bytes . "\n";
      * </code>
      *
-     * @return array (number of containers, total bytes stored)
      * @throws InvalidResponseException unexpected response
+     *
+     * @return array (number of containers, total bytes stored)
      */
-    function get_info()
+    public function get_info()
     {
         list($status, $reason, $container_count, $total_bytes) =
                 $this->cfs_http->head_account();
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->get_info();
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->get_info();
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
-        return array($container_count, $total_bytes);
+
+        return [$container_count, $total_bytes];
     }
 
     /**
-     * Create a Container
+     * Create a Container.
      *
      * Given a Container name, return a Container instance, creating a new
      * remote Container if it does not exit.
@@ -469,47 +472,52 @@ class CF_Connection
      * </code>
      *
      * @param string $container_name container name
-     * @return CF_Container
-     * @throws SyntaxException invalid name
+     *
+     * @throws SyntaxException          invalid name
      * @throws InvalidResponseException unexpected response
+     *
+     * @return CF_Container
      */
-    function create_container($container_name=NULL)
+    public function create_container($container_name = null)
     {
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
-        
-        if (!isset($container_name) or $container_name == "") 
-            throw new SyntaxException("Container name not set.");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if (strpos($container_name, "/") !== False) {
+        if (!isset($container_name) or $container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
+
+        if (strpos($container_name, '/') !== false) {
             $r = "Container name '".$container_name;
             $r .= "' cannot contain a '/' character.";
             throw new SyntaxException($r);
         }
         if (strlen($container_name) > MAX_CONTAINER_NAME_LEN) {
             throw new SyntaxException(sprintf(
-                "Container name exeeds %d bytes.",
+                'Container name exeeds %d bytes.',
                 MAX_CONTAINER_NAME_LEN));
         }
 
         $return_code = $this->cfs_http->create_container($container_name);
         if (!$return_code) {
-            throw new InvalidResponseException("Invalid response ("
-                . $return_code. "): " . $this->cfs_http->get_error());
+            throw new InvalidResponseException('Invalid response ('
+                .$return_code.'): '.$this->cfs_http->get_error());
         }
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->create_container($container_name);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->create_container($container_name);
+        //}
         if ($return_code != 201 && $return_code != 202) {
             throw new InvalidResponseException(
-                "Invalid response (".$return_code."): "
-                    . $this->cfs_http->get_error());
+                'Invalid response ('.$return_code.'): '
+                    .$this->cfs_http->get_error());
         }
+
         return new CF_Container($this->cfs_auth, $this->cfs_http, $container_name);
     }
 
     /**
-     * Delete a Container
+     * Delete a Container.
      *
      * Given either a Container instance or name, remove the remote Container.
      * The Container must be empty prior to removing it.
@@ -524,18 +532,20 @@ class CF_Connection
      * </code>
      *
      * @param string|obj $container container name or instance
-     * @return boolean <kbd>True</kbd> if successfully deleted
-     * @throws SyntaxException missing proper argument
-     * @throws InvalidResponseException invalid response
+     *
+     * @throws SyntaxException            missing proper argument
+     * @throws InvalidResponseException   invalid response
      * @throws NonEmptyContainerException container not empty
-     * @throws NoSuchContainerException remote container does not exist
+     * @throws NoSuchContainerException   remote container does not exist
+     *
+     * @return bool <kbd>True</kbd> if successfully deleted
      */
-    function delete_container($container=NULL)
+    public function delete_container($container = null)
     {
-        $container_name = NULL;
-        
+        $container_name = null;
+
         if (is_object($container)) {
-            if (get_class($container) == "CF_Container") {
+            if (get_class($container) == 'CF_Container') {
                 $container_name = $container->name;
             }
         }
@@ -543,35 +553,37 @@ class CF_Connection
             $container_name = $container;
         }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Must specify container object or name.");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Must specify container object or name.');
+        }
 
         $return_code = $this->cfs_http->delete_container($container_name);
 
         if (!$return_code) {
-            throw new InvalidResponseException("Failed to obtain http response");
+            throw new InvalidResponseException('Failed to obtain http response');
         }
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->delete_container($container);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->delete_container($container);
+        //}
         if ($return_code == 409) {
             throw new NonEmptyContainerException(
-                "Container must be empty prior to removing it.");
+                'Container must be empty prior to removing it.');
         }
         if ($return_code == 404) {
             throw new NoSuchContainerException(
-                "Specified container did not exist to delete.");
+                'Specified container did not exist to delete.');
         }
         if ($return_code != 204) {
             throw new InvalidResponseException(
-                "Invalid response (".$return_code."): "
-                . $this->cfs_http->get_error());
+                'Invalid response ('.$return_code.'): '
+                .$this->cfs_http->get_error());
         }
-        return True;
+
+        return true;
     }
 
     /**
-     * Return a Container instance
+     * Return a Container instance.
      *
      * For the given name, return a Container instance if the remote Container
      * exists, otherwise throw a Not Found exception.
@@ -588,30 +600,33 @@ class CF_Connection
      * </code>
      *
      * @param string $container_name name of the remote Container
-     * @return container CF_Container instance
+     *
      * @throws NoSuchContainerException thrown if no remote Container
      * @throws InvalidResponseException unexpected response
+     *
+     * @return container CF_Container instance
      */
-    function get_container($container_name=NULL)
+    public function get_container($container_name = null)
     {
         list($status, $reason, $count, $bytes) =
                 $this->cfs_http->head_container($container_name);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->get_container($container_name);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->get_container($container_name);
+        //}
         if ($status == 404) {
-            throw new NoSuchContainerException("Container not found.");
+            throw new NoSuchContainerException('Container not found.');
         }
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response: ".$this->cfs_http->get_error());
+                'Invalid response: '.$this->cfs_http->get_error());
         }
+
         return new CF_Container($this->cfs_auth, $this->cfs_http,
             $container_name, $count, $bytes);
     }
 
     /**
-     * Return array of Container instances
+     * Return array of Container instances.
      *
      * Return an array of CF_Container instances on the account.  The instances
      * will be fully populated with Container attributes (bytes stored and
@@ -631,30 +646,32 @@ class CF_Connection
      * }
      * </code>
      *
-     * @return array An array of CF_Container instances
      * @throws InvalidResponseException unexpected response
+     *
+     * @return array An array of CF_Container instances
      */
-    function get_containers($limit=0, $marker=NULL)
+    public function get_containers($limit = 0, $marker = null)
     {
         list($status, $reason, $container_info) =
                 $this->cfs_http->list_containers_info($limit, $marker);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->get_containers();
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->get_containers();
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response: ".$this->cfs_http->get_error());
+                'Invalid response: '.$this->cfs_http->get_error());
         }
-        $containers = array();
+        $containers = [];
         foreach ($container_info as $name => $info) {
             $containers[] = new CF_Container($this->cfs_auth, $this->cfs_http,
-                $info['name'], $info["count"], $info["bytes"], False);
+                $info['name'], $info['count'], $info['bytes'], false);
         }
+
         return $containers;
     }
 
     /**
-     * Return list of remote Containers
+     * Return list of remote Containers.
      *
      * Return an array of strings containing the names of all remote Containers.
      *
@@ -673,27 +690,30 @@ class CF_Connection
      * )
      * </code>
      *
-     * @param integer $limit restrict results to $limit Containers
+     * @param int    $limit  restrict results to $limit Containers
      * @param string $marker return results greater than $marker
-     * @return array list of remote Containers
+     *
      * @throws InvalidResponseException unexpected response
+     *
+     * @return array list of remote Containers
      */
-    function list_containers($limit=0, $marker=NULL)
+    public function list_containers($limit = 0, $marker = null)
     {
         list($status, $reason, $containers) =
             $this->cfs_http->list_containers($limit, $marker);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->list_containers($limit, $marker);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->list_containers($limit, $marker);
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
+
         return $containers;
     }
 
     /**
-     * Return array of information about remote Containers
+     * Return array of information about remote Containers.
      *
      * Return a nested array structure of Container info.
      *
@@ -721,22 +741,25 @@ class CF_Connection
      * )
      * </code>
      *
-     * @param integer $limit restrict results to $limit Containers
+     * @param int    $limit  restrict results to $limit Containers
      * @param string $marker return results greater than $marker
-     * @return array nested array structure of Container info
+     *
      * @throws InvalidResponseException unexpected response
+     *
+     * @return array nested array structure of Container info
      */
-    function list_containers_info($limit=0, $marker=NULL)
+    public function list_containers_info($limit = 0, $marker = null)
     {
-        list($status, $reason, $container_info) = 
+        list($status, $reason, $container_info) =
                 $this->cfs_http->list_containers_info($limit, $marker);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->list_containers_info($limit, $marker);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->list_containers_info($limit, $marker);
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
+
         return $container_info;
     }
 
@@ -765,25 +788,28 @@ class CF_Connection
      * </code>
      *
      * @param bool $enabled_only Will list all containers ever CDN enabled if     * set to false or only currently enabled CDN containers if set to true.      * Defaults to false.
-     * @return array list of published Container names
+     *
      * @throws InvalidResponseException unexpected response
+     *
+     * @return array list of published Container names
      */
-    function list_public_containers($enabled_only=False)
+    public function list_public_containers($enabled_only = false)
     {
         list($status, $reason, $containers) =
                 $this->cfs_http->list_cdn_containers($enabled_only);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->list_public_containers();
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->list_public_containers();
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
+
         return $containers;
     }
 
     /**
-     * Set a user-supplied callback function to report download progress
+     * Set a user-supplied callback function to report download progress.
      *
      * The callback function is used to report incremental progress of a data
      * download functions (e.g. $container->list_objects(), $obj->read(), etc).
@@ -818,13 +844,13 @@ class CF_Connection
      *
      * @param string $func_name the name of the user callback function
      */
-    function set_read_progress_function($func_name)
+    public function set_read_progress_function($func_name)
     {
         $this->cfs_http->setReadProgressFunc($func_name);
     }
 
     /**
-     * Set a user-supplied callback function to report upload progress
+     * Set a user-supplied callback function to report upload progress.
      *
      * The callback function is used to report incremental progress of a data
      * upload functions (e.g. $obj->write() call).  The specified function will
@@ -854,13 +880,13 @@ class CF_Connection
      *
      * @param string $func_name the name of the user callback function
      */
-    function set_write_progress_function($func_name)
+    public function set_write_progress_function($func_name)
     {
         $this->cfs_http->setWriteProgressFunc($func_name);
     }
 
     /**
-     * Use the Certificate Authority bundle included with this API
+     * Use the Certificate Authority bundle included with this API.
      *
      * Most versions of PHP with cURL support include an outdated Certificate
      * Authority (CA) bundle (the file that lists all valid certificate
@@ -880,27 +906,27 @@ class CF_Connection
      *
      * @param string $path Specify path to CA bundle (default to included)
      */
-    function ssl_use_cabundle($path=NULL)
+    public function ssl_use_cabundle($path = null)
     {
         $this->cfs_http->ssl_use_cabundle($path);
     }
 
-    #private function _re_auth()
-    #{
-    #    $new_auth = new CF_Authentication(
-    #        $this->cfs_auth->username,
-    #        $this->cfs_auth->api_key,
-    #        $this->cfs_auth->auth_host,
-    #        $this->cfs_auth->account);
-    #    $new_auth->authenticate();
-    #    $this->cfs_auth = $new_auth;
-    #    $this->cfs_http->setCFAuth($this->cfs_auth);
-    #    return True;
-    #}
+    //private function _re_auth()
+    //{
+    //    $new_auth = new CF_Authentication(
+    //        $this->cfs_auth->username,
+    //        $this->cfs_auth->api_key,
+    //        $this->cfs_auth->auth_host,
+    //        $this->cfs_auth->account);
+    //    $new_auth->authenticate();
+    //    $this->cfs_auth = $new_auth;
+    //    $this->cfs_http->setCFAuth($this->cfs_auth);
+    //    return True;
+    //}
 }
 
 /**
- * Container operations
+ * Container operations.
  *
  * Containers are storage compartments where you put your data (objects).
  * A container is similar to a directory or folder on a conventional filesystem
@@ -909,8 +935,6 @@ class CF_Connection
  *
  * You also have the option of marking a Container as "public" so that the
  * Objects stored in the Container are publicly available via the CDN.
- *
- * @package php-cloudfiles
  */
 class CF_Container
 {
@@ -928,25 +952,26 @@ class CF_Container
     public $cdn_acl_referrer;
 
     /**
-     * Class constructor
+     * Class constructor.
      *
      * Constructor for Container
      *
-     * @param obj $cfs_auth CF_Authentication instance
-     * @param obj $cfs_http HTTP connection manager
-     * @param string $name name of Container
-     * @param int $count number of Objects stored in this Container
-     * @param int $bytes number of bytes stored in this Container
+     * @param obj    $cfs_auth CF_Authentication instance
+     * @param obj    $cfs_http HTTP connection manager
+     * @param string $name     name of Container
+     * @param int    $count    number of Objects stored in this Container
+     * @param int    $bytes    number of bytes stored in this Container
+     *
      * @throws SyntaxException invalid Container name
      */
-    function __construct(&$cfs_auth, &$cfs_http, $name, $count=0,
-        $bytes=0, $docdn=True)
+    public function __construct(&$cfs_auth, &$cfs_http, $name, $count = 0,
+        $bytes = 0, $docdn = true)
     {
         if (strlen($name) > MAX_CONTAINER_NAME_LEN) {
-            throw new SyntaxException("Container name exceeds "
-                . "maximum allowed length.");
+            throw new SyntaxException('Container name exceeds '
+                .'maximum allowed length.');
         }
-        if (strpos($name, "/") !== False) {
+        if (strpos($name, '/') !== false) {
             throw new SyntaxException(
                 "Container names cannot contain a '/' character.");
         }
@@ -955,50 +980,49 @@ class CF_Container
         $this->name = $name;
         $this->object_count = $count;
         $this->bytes_used = $bytes;
-        $this->cdn_enabled = NULL;
-        $this->cdn_uri = NULL;
-        $this->cdn_ttl = NULL;
-        $this->cdn_log_retention = NULL;
-        $this->cdn_acl_user_agent = NULL;
-        $this->cdn_acl_referrer = NULL;
-        if ($this->cfs_http->getCDNMUrl() != NULL && $docdn) {
+        $this->cdn_enabled = null;
+        $this->cdn_uri = null;
+        $this->cdn_ttl = null;
+        $this->cdn_log_retention = null;
+        $this->cdn_acl_user_agent = null;
+        $this->cdn_acl_referrer = null;
+        if ($this->cfs_http->getCDNMUrl() != null && $docdn) {
             $this->_cdn_initialize();
         }
     }
 
     /**
-     * String representation of Container
+     * String representation of Container.
      *
      * Pretty print the Container instance.
      *
      * @return string Container details
      */
-    function __toString()
+    public function __toString()
     {
-        $me = sprintf("name: %s, count: %.0f, bytes: %.0f",
+        $me = sprintf('name: %s, count: %.0f, bytes: %.0f',
             $this->name, $this->object_count, $this->bytes_used);
-        if ($this->cfs_http->getCDNMUrl() != NULL) {
-            $me .= sprintf(", cdn: %s, cdn uri: %s, cdn ttl: %.0f, logs retention: %s",
-                $this->is_public() ? "Yes" : "No",
+        if ($this->cfs_http->getCDNMUrl() != null) {
+            $me .= sprintf(', cdn: %s, cdn uri: %s, cdn ttl: %.0f, logs retention: %s',
+                $this->is_public() ? 'Yes' : 'No',
                 $this->cdn_uri, $this->cdn_ttl,
-                $this->cdn_log_retention ? "Yes" : "No"
+                $this->cdn_log_retention ? 'Yes' : 'No'
                 );
 
-            if ($this->cdn_acl_user_agent != NULL) {
-                $me .= ", cdn acl user agent: " . $this->cdn_acl_user_agent;
+            if ($this->cdn_acl_user_agent != null) {
+                $me .= ', cdn acl user agent: '.$this->cdn_acl_user_agent;
             }
 
-            if ($this->cdn_acl_referrer != NULL) {
-                $me .= ", cdn acl referrer: " . $this->cdn_acl_referrer;
+            if ($this->cdn_acl_referrer != null) {
+                $me .= ', cdn acl referrer: '.$this->cdn_acl_referrer;
             }
-            
-            
         }
+
         return $me;
     }
 
     /**
-     * Enable Container content to be served via CDN or modify CDN attributes
+     * Enable Container content to be served via CDN or modify CDN attributes.
      *
      * Either enable this Container's content to be served via CDN or
      * adjust its CDN attributes.  This Container will always return the
@@ -1019,53 +1043,55 @@ class CF_Container
      *
      * @param int $ttl the time in seconds content will be cached in the CDN
      * @returns string the CDN enabled Container's URI
-     * @throws CDNNotEnabledException CDN functionality not returned during auth
-     * @throws AuthenticationException if auth token is not valid/expired
+     *
+     * @throws CDNNotEnabledException   CDN functionality not returned during auth
+     * @throws AuthenticationException  if auth token is not valid/expired
      * @throws InvalidResponseException unexpected response
      */
-    function make_public($ttl=86400)
+    public function make_public($ttl = 86400)
     {
-        if ($this->cfs_http->getCDNMUrl() == NULL) {
+        if ($this->cfs_http->getCDNMUrl() == null) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        if ($this->cdn_uri != NULL) {
-            # previously published, assume we're setting new attributes
+        if ($this->cdn_uri != null) {
+            // previously published, assume we're setting new attributes
             list($status, $reason, $cdn_uri) =
-                $this->cfs_http->update_cdn_container($this->name,$ttl,
+                $this->cfs_http->update_cdn_container($this->name, $ttl,
                                                       $this->cdn_log_retention,
                                                       $this->cdn_acl_user_agent,
                                                       $this->cdn_acl_referrer);
-            #if ($status == 401 && $this->_re_auth()) {
-            #    return $this->make_public($ttl);
-            #}
+            //if ($status == 401 && $this->_re_auth()) {
+            //    return $this->make_public($ttl);
+            //}
             if ($status == 404) {
-                # this instance _thinks_ the container was published, but the
-                # cdn management system thinks otherwise - try again with a PUT
+                // this instance _thinks_ the container was published, but the
+                // cdn management system thinks otherwise - try again with a PUT
                 list($status, $reason, $cdn_uri) =
-                    $this->cfs_http->add_cdn_container($this->name,$ttl);
-
+                    $this->cfs_http->add_cdn_container($this->name, $ttl);
             }
         } else {
-            # publish it for first time
+            // publish it for first time
             list($status, $reason, $cdn_uri) =
-                $this->cfs_http->add_cdn_container($this->name,$ttl);
+                $this->cfs_http->add_cdn_container($this->name, $ttl);
         }
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->make_public($ttl);
-        #}
-        if (!in_array($status, array(201,202))) {
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->make_public($ttl);
+        //}
+        if (!in_array($status, [201, 202])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
-        $this->cdn_enabled = True;
+        $this->cdn_enabled = true;
         $this->cdn_ttl = $ttl;
         $this->cdn_uri = $cdn_uri;
-        $this->cdn_log_retention = False;
-        $this->cdn_acl_user_agent = "";
-        $this->cdn_acl_referrer = "";
+        $this->cdn_log_retention = false;
+        $this->cdn_acl_user_agent = '';
+        $this->cdn_acl_referrer = '';
+
         return $this->cdn_uri;
     }
+
     /**
      * Purge Containers objects from CDN Cache.
      * Example:
@@ -1078,25 +1104,28 @@ class CF_Container
      * # or
      * $container->purge_from_cdn();
      * # or 
-     * $container->purge_from_cdn("user1@domain.com,user2@domain.com");
+     * $container->purge_from_cdn("user1@domain.com,user2@domain.com");.
+     *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException if CDN Is not enabled on this connection
+     *
+     * @throws CDNNotEnabledException   if CDN Is not enabled on this connection
      * @throws InvalidResponseException if the response expected is not returned
      */
-    function purge_from_cdn($email=null)
+    public function purge_from_cdn($email = null)
     {
-        if (!$this->cfs_http->getCDNMUrl()) 
-        {
+        if (!$this->cfs_http->getCDNMUrl()) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
         $status = $this->cfs_http->purge_from_cdn($this->name, $email);
         if ($status < 199 or $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
-        } 
-        return True;
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
+        }
+
+        return true;
     }
+
     /**
      * Enable ACL restriction by User Agent for this container.
      *
@@ -1113,28 +1142,31 @@ class CF_Container
      * </code>
      *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException CDN functionality not returned during auth
-     * @throws AuthenticationException if auth token is not valid/expired
+     *
+     * @throws CDNNotEnabledException   CDN functionality not returned during auth
+     * @throws AuthenticationException  if auth token is not valid/expired
      * @throws InvalidResponseException unexpected response
      */
-    function acl_user_agent($cdn_acl_user_agent="") {
-        if ($this->cfs_http->getCDNMUrl() == NULL) {
+    public function acl_user_agent($cdn_acl_user_agent = '')
+    {
+        if ($this->cfs_http->getCDNMUrl() == null) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        list($status,$reason) =
+        list($status, $reason) =
             $this->cfs_http->update_cdn_container($this->name,
                                                   $this->cdn_ttl,
                                                   $this->cdn_log_retention,
                                                   $cdn_acl_user_agent,
                                                   $this->cdn_acl_referrer
                 );
-        if (!in_array($status, array(202,404))) {
+        if (!in_array($status, [202, 404])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
         $this->cdn_acl_user_agent = $cdn_acl_user_agent;
-        return True;
+
+        return true;
     }
 
     /**
@@ -1153,30 +1185,33 @@ class CF_Container
      * </code>
      *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException CDN functionality not returned during auth
-     * @throws AuthenticationException if auth token is not valid/expired
+     *
+     * @throws CDNNotEnabledException   CDN functionality not returned during auth
+     * @throws AuthenticationException  if auth token is not valid/expired
      * @throws InvalidResponseException unexpected response
      */
-    function acl_referrer($cdn_acl_referrer="") {
-        if ($this->cfs_http->getCDNMUrl() == NULL) {
+    public function acl_referrer($cdn_acl_referrer = '')
+    {
+        if ($this->cfs_http->getCDNMUrl() == null) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        list($status,$reason) =
+        list($status, $reason) =
             $this->cfs_http->update_cdn_container($this->name,
                                                   $this->cdn_ttl,
                                                   $this->cdn_log_retention,
                                                   $this->cdn_acl_user_agent,
                                                   $cdn_acl_referrer
                 );
-        if (!in_array($status, array(202,404))) {
+        if (!in_array($status, [202, 404])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
         $this->cdn_acl_referrer = $cdn_acl_referrer;
-        return True;
+
+        return true;
     }
-    
+
     /**
      * Enable log retention for this CDN container.
      *
@@ -1199,32 +1234,35 @@ class CF_Container
      * </code>
      *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException CDN functionality not returned during auth
-     * @throws AuthenticationException if auth token is not valid/expired
+     *
+     * @throws CDNNotEnabledException   CDN functionality not returned during auth
+     * @throws AuthenticationException  if auth token is not valid/expired
      * @throws InvalidResponseException unexpected response
      */
-    function log_retention($cdn_log_retention=False) {
-        if ($this->cfs_http->getCDNMUrl() == NULL) {
+    public function log_retention($cdn_log_retention = false)
+    {
+        if ($this->cfs_http->getCDNMUrl() == null) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        list($status,$reason) =
+        list($status, $reason) =
             $this->cfs_http->update_cdn_container($this->name,
                                                   $this->cdn_ttl,
                                                   $cdn_log_retention,
                                                   $this->cdn_acl_user_agent,
                                                   $this->cdn_acl_referrer
                 );
-        if (!in_array($status, array(202,404))) {
+        if (!in_array($status, [202, 404])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
         $this->cdn_log_retention = $cdn_log_retention;
-        return True;
+
+        return true;
     }
-    
+
     /**
-     * Disable the CDN sharing for this container
+     * Disable the CDN sharing for this container.
      *
      * Use this method to disallow distribution into the CDN of this Container's
      * content.
@@ -1249,35 +1287,37 @@ class CF_Container
      * </code>
      *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException CDN functionality not returned during auth
-     * @throws AuthenticationException if auth token is not valid/expired
+     *
+     * @throws CDNNotEnabledException   CDN functionality not returned during auth
+     * @throws AuthenticationException  if auth token is not valid/expired
      * @throws InvalidResponseException unexpected response
      */
-    function make_private()
+    public function make_private()
     {
-        if ($this->cfs_http->getCDNMUrl() == NULL) {
+        if ($this->cfs_http->getCDNMUrl() == null) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        list($status,$reason) = $this->cfs_http->remove_cdn_container($this->name);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->make_private();
-        #}
-        if (!in_array($status, array(202,404))) {
+        list($status, $reason) = $this->cfs_http->remove_cdn_container($this->name);
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->make_private();
+        //}
+        if (!in_array($status, [202, 404])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
-        $this->cdn_enabled = False;
-        $this->cdn_ttl = NULL;
-        $this->cdn_uri = NULL;
-        $this->cdn_log_retention = NULL;
-        $this->cdn_acl_user_agent = NULL;
-        $this->cdn_acl_referrer = NULL;
-        return True;
+        $this->cdn_enabled = false;
+        $this->cdn_ttl = null;
+        $this->cdn_uri = null;
+        $this->cdn_log_retention = null;
+        $this->cdn_acl_user_agent = null;
+        $this->cdn_acl_referrer = null;
+
+        return true;
     }
 
     /**
-     * Check if this Container is being publicly served via CDN
+     * Check if this Container is being publicly served via CDN.
      *
      * Use this method to determine if the Container's content is currently
      * available through the CDN.
@@ -1297,13 +1337,13 @@ class CF_Container
      *
      * @returns boolean True if enabled, False otherwise
      */
-    function is_public()
+    public function is_public()
     {
-        return $this->cdn_enabled == True ? True : False;
+        return $this->cdn_enabled == true ? true : false;
     }
 
     /**
-     * Create a new remote storage Object
+     * Create a new remote storage Object.
      *
      * Return a new Object instance.  If the remote storage Object exists,
      * the instance's attributes are populated.
@@ -1323,15 +1363,16 @@ class CF_Container
      * </code>
      *
      * @param string $obj_name name of storage Object
+     *
      * @return obj CF_Object instance
      */
-    function create_object($obj_name=NULL)
+    public function create_object($obj_name = null)
     {
         return new CF_Object($this, $obj_name);
     }
 
     /**
-     * Return an Object instance for the remote storage Object
+     * Return an Object instance for the remote storage Object.
      *
      * Given a name, return a Object instance representing the
      * remote storage object.
@@ -1352,15 +1393,16 @@ class CF_Container
      * </code>
      *
      * @param string $obj_name name of storage Object
+     *
      * @return obj CF_Object instance
      */
-    function get_object($obj_name=NULL)
+    public function get_object($obj_name = null)
     {
-        return new CF_Object($this, $obj_name, True);
+        return new CF_Object($this, $obj_name, true);
     }
 
     /**
-     * Return a list of Objects
+     * Return a list of Objects.
      *
      * Return an array of strings listing the Object names in this Container.
      *
@@ -1396,30 +1438,33 @@ class CF_Container
      * $dogs = $images->list_objects(0,NULL,NULL,"pictures/animals/dogs");
      * </code>
      *
-     * @param int $limit <i>optional</i> only return $limit names
-     * @param int $marker <i>optional</i> subset of names starting at $marker
+     * @param int    $limit  <i>optional</i> only return $limit names
+     * @param int    $marker <i>optional</i> subset of names starting at $marker
      * @param string $prefix <i>optional</i> Objects whose names begin with $prefix
-     * @param string $path <i>optional</i> only return results under "pathname"
-     * @return array array of strings
+     * @param string $path   <i>optional</i> only return results under "pathname"
+     *
      * @throws InvalidResponseException unexpected response
+     *
+     * @return array array of strings
      */
-    function list_objects($limit=0, $marker=NULL, $prefix=NULL, $path=NULL)
+    public function list_objects($limit = 0, $marker = null, $prefix = null, $path = null)
     {
         list($status, $reason, $obj_list) =
             $this->cfs_http->list_objects($this->name, $limit,
                 $marker, $prefix, $path);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->list_objects($limit, $marker, $prefix, $path);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->list_objects($limit, $marker, $prefix, $path);
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
+
         return $obj_list;
     }
 
     /**
-     * Return an array of Objects
+     * Return an array of Objects.
      *
      * Return an array of Object instances in this Container.
      *
@@ -1455,39 +1500,42 @@ class CF_Container
      * $dogs = $images->get_objects(0,NULL,NULL,"pictures/animals/dogs");
      * </code>
      *
-     * @param int $limit <i>optional</i> only return $limit names
-     * @param int $marker <i>optional</i> subset of names starting at $marker
+     * @param int    $limit  <i>optional</i> only return $limit names
+     * @param int    $marker <i>optional</i> subset of names starting at $marker
      * @param string $prefix <i>optional</i> Objects whose names begin with $prefix
-     * @param string $path <i>optional</i> only return results under "pathname"
-     * @return array array of strings
+     * @param string $path   <i>optional</i> only return results under "pathname"
+     *
      * @throws InvalidResponseException unexpected response
+     *
+     * @return array array of strings
      */
-    function get_objects($limit=0, $marker=NULL, $prefix=NULL, $path=NULL)
+    public function get_objects($limit = 0, $marker = null, $prefix = null, $path = null)
     {
         list($status, $reason, $obj_array) =
             $this->cfs_http->get_objects($this->name, $limit,
                 $marker, $prefix, $path);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->get_objects($limit, $marker, $prefix, $path);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->get_objects($limit, $marker, $prefix, $path);
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
-        $objects = array();
+        $objects = [];
         foreach ($obj_array as $obj) {
-            $tmp = new CF_Object($this, $obj["name"], False, False);
-            $tmp->content_type = $obj["content_type"];
-            $tmp->content_length = (float) $obj["bytes"];
-            $tmp->set_etag($obj["hash"]);
-            $tmp->last_modified = $obj["last_modified"];
+            $tmp = new CF_Object($this, $obj['name'], false, false);
+            $tmp->content_type = $obj['content_type'];
+            $tmp->content_length = (float) $obj['bytes'];
+            $tmp->set_etag($obj['hash']);
+            $tmp->last_modified = $obj['last_modified'];
             $objects[] = $tmp;
         }
+
         return $objects;
     }
 
     /**
-     * Delete a remote storage Object
+     * Delete a remote storage Object.
      *
      * Given an Object instance or name, permanently remove the remote Object
      * and all associated metadata.
@@ -1506,16 +1554,18 @@ class CF_Container
      * </code>
      *
      * @param obj $obj name or instance of Object to delete
-     * @return boolean <kbd>True</kbd> if successfully removed
-     * @throws SyntaxException invalid Object name
-     * @throws NoSuchObjectException remote Object does not exist
+     *
+     * @throws SyntaxException          invalid Object name
+     * @throws NoSuchObjectException    remote Object does not exist
      * @throws InvalidResponseException unexpected response
+     *
+     * @return bool <kbd>True</kbd> if successfully removed
      */
-    function delete_object($obj)
+    public function delete_object($obj)
     {
-        $obj_name = NULL;
+        $obj_name = null;
         if (is_object($obj)) {
-            if (get_class($obj) == "CF_Object") {
+            if (get_class($obj) == 'CF_Object') {
                 $obj_name = $obj->name;
             }
         }
@@ -1523,26 +1573,27 @@ class CF_Container
             $obj_name = $obj;
         }
         if (!$obj_name) {
-            throw new SyntaxException("Object name not set.");
+            throw new SyntaxException('Object name not set.');
         }
         $status = $this->cfs_http->delete_object($this->name, $obj_name);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->delete_object($obj);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->delete_object($obj);
+        //}
         if ($status == 404) {
-            $m = "Specified object '".$this->name."/".$obj_name;
-            $m.= "' did not exist to delete.";
+            $m = "Specified object '".$this->name.'/'.$obj_name;
+            $m .= "' did not exist to delete.";
             throw new NoSuchObjectException($m);
         }
         if ($status != 204) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
-        return True;
+
+        return true;
     }
 
     /**
-     * Helper function to create "path" elements for a given Object name
+     * Helper function to create "path" elements for a given Object name.
      *
      * Given an Object whos name contains '/' path separators, this function
      * will create the "directory marker" Objects of one byte with the
@@ -1551,27 +1602,27 @@ class CF_Container
      * It assumes the last element of the full path is the "real" Object
      * and does NOT create a remote storage Object for that last element.
      */
-    function create_paths($path_name)
+    public function create_paths($path_name)
     {
         if ($path_name[0] == '/') {
             $path_name = mb_substr($path_name, 0, 1);
         }
         $elements = explode('/', $path_name, -1);
-        $build_path = "";
+        $build_path = '';
         foreach ($elements as $idx => $val) {
             if (!$build_path) {
                 $build_path = $val;
             } else {
-                $build_path .= "/" . $val;
+                $build_path .= '/'.$val;
             }
             $obj = new CF_Object($this, $build_path);
-            $obj->content_type = "application/directory";
-            $obj->write(".", 1);
+            $obj->content_type = 'application/directory';
+            $obj->write('.', 1);
         }
     }
 
     /**
-     * Internal method to grab CDN/Container info if appropriate to do so
+     * Internal method to grab CDN/Container info if appropriate to do so.
      *
      * @throws InvalidResponseException unexpected response
      */
@@ -1580,12 +1631,12 @@ class CF_Container
         list($status, $reason, $cdn_enabled, $cdn_uri, $cdn_ttl,
              $cdn_log_retention, $cdn_acl_user_agent, $cdn_acl_referrer) =
             $this->cfs_http->head_cdn_container($this->name);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->_cdn_initialize();
-        #}
-        if (!in_array($status, array(204,404))) {
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->_cdn_initialize();
+        //}
+        if (!in_array($status, [204, 404])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
         $this->cdn_enabled = $cdn_enabled;
         $this->cdn_uri = $cdn_uri;
@@ -1595,29 +1646,26 @@ class CF_Container
         $this->cdn_acl_referrer = $cdn_acl_referrer;
     }
 
-    #private function _re_auth()
-    #{
-    #    $new_auth = new CF_Authentication(
-    #        $this->cfs_auth->username,
-    #        $this->cfs_auth->api_key,
-    #        $this->cfs_auth->auth_host,
-    #        $this->cfs_auth->account);
-    #    $new_auth->authenticate();
-    #    $this->cfs_auth = $new_auth;
-    #    $this->cfs_http->setCFAuth($this->cfs_auth);
-    #    return True;
-    #}
+    //private function _re_auth()
+    //{
+    //    $new_auth = new CF_Authentication(
+    //        $this->cfs_auth->username,
+    //        $this->cfs_auth->api_key,
+    //        $this->cfs_auth->auth_host,
+    //        $this->cfs_auth->account);
+    //    $new_auth->authenticate();
+    //    $this->cfs_auth = $new_auth;
+    //    $this->cfs_http->setCFAuth($this->cfs_auth);
+    //    return True;
+    //}
 }
 
-
 /**
- * Object operations
+ * Object operations.
  *
  * An Object is analogous to a file on a conventional filesystem. You can
  * read data from, or write data to your Objects. You can also associate 
  * arbitrary metadata with them.
- *
- * @package php-cloudfiles
  */
 class CF_Object
 {
@@ -1630,31 +1678,31 @@ class CF_Object
     private $etag;
 
     /**
-     * Class constructor
+     * Class constructor.
      *
-     * @param obj $container CF_Container instance
-     * @param string $name name of Object
-     * @param boolean $force_exists if set, throw an error if Object doesn't exist
+     * @param obj    $container    CF_Container instance
+     * @param string $name         name of Object
+     * @param bool   $force_exists if set, throw an error if Object doesn't exist
      */
-    function __construct(&$container, $name, $force_exists=False, $dohead=True)
+    public function __construct(&$container, $name, $force_exists = false, $dohead = true)
     {
-        if ($name[0] == "/") {
+        if ($name[0] == '/') {
             $r = "Object name '".$name;
             $r .= "' cannot contain begin with a '/' character.";
             throw new SyntaxException($r);
         }
         if (strlen($name) > MAX_OBJECT_NAME_LEN) {
-            throw new SyntaxException("Object name exceeds "
-                . "maximum allowed length.");
+            throw new SyntaxException('Object name exceeds '
+                .'maximum allowed length.');
         }
         $this->container = $container;
         $this->name = $name;
-        $this->etag = NULL;
-        $this->_etag_override = False;
-        $this->last_modified = NULL;
-        $this->content_type = NULL;
+        $this->etag = null;
+        $this->_etag_override = false;
+        $this->last_modified = null;
+        $this->content_type = null;
         $this->content_length = 0;
-        $this->metadata = array();
+        $this->metadata = [];
         if ($dohead) {
             if (!$this->_initialize() && $force_exists) {
                 throw new NoSuchObjectException("No such object '".$name."'");
@@ -1663,15 +1711,15 @@ class CF_Object
     }
 
     /**
-     * String representation of Object
+     * String representation of Object.
      *
      * Pretty print the Object's location and name
      *
      * @return string Object information
      */
-    function __toString()
+    public function __toString()
     {
-        return $this->container->name . "/" . $this->name;
+        return $this->container->name.'/'.$this->name;
     }
 
     /**
@@ -1693,55 +1741,63 @@ class CF_Object
      * mime_content_type function.
      * 
      * @param string $handle name of file or buffer to guess the type from
-     * @return boolean <kbd>True</kbd> if successful
+     *
      * @throws BadContentTypeException
+     *
+     * @return bool <kbd>True</kbd> if successful
      */
-    function _guess_content_type($handle) {
-        if ($this->content_type)
+    public function _guess_content_type($handle)
+    {
+        if ($this->content_type) {
             return true;
-            
-        if (function_exists("finfo_open")) {
-            $local_magic = dirname(__FILE__) . "/share/magic";
+        }
+
+        if (function_exists('finfo_open')) {
+            $local_magic = dirname(__FILE__).'/share/magic';
             $finfo = @finfo_open(FILEINFO_MIME, $local_magic);
 
-            if (!$finfo) 
+            if (!$finfo) {
                 $finfo = @finfo_open(FILEINFO_MIME);
-                
-            if ($finfo) {
+            }
 
-                if (is_file((string)$handle))
+            if ($finfo) {
+                if (is_file((string) $handle)) {
                     $ct = @finfo_file($finfo, $handle);
-                else 
+                } else {
                     $ct = @finfo_buffer($finfo, $handle);
+                }
 
                 /* PHP 5.3 fileinfo display extra information like
                    charset so we remove everything after the ; since
                    we are not into that stuff */
                 if ($ct) {
-                    $extra_content_type_info = strpos($ct, "; ");
-                    if ($extra_content_type_info)
+                    $extra_content_type_info = strpos($ct, '; ');
+                    if ($extra_content_type_info) {
                         $ct = substr($ct, 0, $extra_content_type_info);
+                    }
                 }
 
-                if ($ct && $ct != 'application/octet-stream')
+                if ($ct && $ct != 'application/octet-stream') {
                     $this->content_type = $ct;
+                }
 
                 @finfo_close($finfo);
             }
         }
 
-        if (!$this->content_type && (string)is_file($handle) && function_exists("mime_content_type")) {
+        if (!$this->content_type && (string) is_file($handle) && function_exists('mime_content_type')) {
             $this->content_type = @mime_content_type($handle);
         }
 
         if (!$this->content_type) {
-            throw new BadContentTypeException("Required Content-Type not set");
+            throw new BadContentTypeException('Required Content-Type not set');
         }
-        return True;
+
+        return true;
     }
-    
+
     /**
-     * String representation of the Object's public URI
+     * String representation of the Object's public URI.
      *
      * A string representing the Object's public URI assuming that it's
      * parent Container is CDN-enabled.
@@ -1758,16 +1814,17 @@ class CF_Object
      *
      * @return string Object's public URI or NULL
      */
-    function public_uri()
+    public function public_uri()
     {
         if ($this->container->cdn_enabled) {
-            return $this->container->cdn_uri . "/" . $this->name;
+            return $this->container->cdn_uri.'/'.$this->name;
         }
-        return NULL;
+
+        return;
     }
 
     /**
-     * Read the remote Object's data
+     * Read the remote Object's data.
      *
      * Returns the Object's data.  This is useful for smaller Objects such
      * as images or office documents.  Object's with larger content should use
@@ -1791,26 +1848,29 @@ class CF_Object
      * </code>
      *
      * @param array $hdrs user-defined headers (Range, If-Match, etc.)
-     * @return string Object's data
+     *
      * @throws InvalidResponseException unexpected response
+     *
+     * @return string Object's data
      */
-    function read($hdrs=array())
+    public function read($hdrs = [])
     {
         list($status, $reason, $data) =
             $this->container->cfs_http->get_object_to_string($this, $hdrs);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->read($hdrs);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->read($hdrs);
+        //}
         if (($status < 200) || ($status > 299
                 && $status != 412 && $status != 304)) {
-            throw new InvalidResponseException("Invalid response (".$status."): "
-                . $this->container->cfs_http->get_error());
+            throw new InvalidResponseException('Invalid response ('.$status.'): '
+                .$this->container->cfs_http->get_error());
         }
+
         return $data;
     }
 
     /**
-     * Streaming read of Object's data
+     * Streaming read of Object's data.
      *
      * Given an open PHP resource (see PHP's fopen() method), fetch the Object's
      * data and write it to the open resource handle.  This is useful for
@@ -1846,28 +1906,31 @@ class CF_Object
      * #
      * </code>
      *
-     * @param resource $fp open resource for writing data to
-     * @param array $hdrs user-defined headers (Range, If-Match, etc.)
-     * @return string Object's data
+     * @param resource $fp   open resource for writing data to
+     * @param array    $hdrs user-defined headers (Range, If-Match, etc.)
+     *
      * @throws InvalidResponseException unexpected response
+     *
+     * @return string Object's data
      */
-    function stream(&$fp, $hdrs=array())
+    public function stream(&$fp, $hdrs = [])
     {
-        list($status, $reason) = 
-                $this->container->cfs_http->get_object_to_stream($this,$fp,$hdrs);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->stream($fp, $hdrs);
-        #}
+        list($status, $reason) =
+                $this->container->cfs_http->get_object_to_stream($this, $fp, $hdrs);
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->stream($fp, $hdrs);
+        //}
         if (($status < 200) || ($status > 299
                 && $status != 412 && $status != 304)) {
-            throw new InvalidResponseException("Invalid response (".$status."): "
+            throw new InvalidResponseException('Invalid response ('.$status.'): '
                 .$reason);
         }
-        return True;
+
+        return true;
     }
 
     /**
-     * Store new Object metadata
+     * Store new Object metadata.
      *
      * Write's an Object's metadata to the remote Object.  This will overwrite
      * an prior Object metadata.
@@ -1893,27 +1956,30 @@ class CF_Object
      * $doc->sync_metadata();
      * </code>
      *
-     * @return boolean <kbd>True</kbd> if successful, <kbd>False</kbd> otherwise
      * @throws InvalidResponseException unexpected response
+     *
+     * @return bool <kbd>True</kbd> if successful, <kbd>False</kbd> otherwise
      */
-    function sync_metadata()
+    public function sync_metadata()
     {
         if (!empty($this->metadata)) {
             $status = $this->container->cfs_http->update_object($this);
-            #if ($status == 401 && $this->_re_auth()) {
-            #    return $this->sync_metadata();
-            #}
+            //if ($status == 401 && $this->_re_auth()) {
+            //    return $this->sync_metadata();
+            //}
             if ($status != 202) {
-                throw new InvalidResponseException("Invalid response ("
-                    .$status."): ".$this->container->cfs_http->get_error());
+                throw new InvalidResponseException('Invalid response ('
+                    .$status.'): '.$this->container->cfs_http->get_error());
             }
-            return True;
+
+            return true;
         }
-        return False;
+
+        return false;
     }
 
     /**
-     * Upload Object's data to Cloud Files
+     * Upload Object's data to Cloud Files.
      *
      * Write data to the remote Object.  The $data argument can either be a
      * PHP resource open for reading (see PHP's fopen() method) or an in-memory
@@ -1933,45 +1999,47 @@ class CF_Object
      * $doc->write("This is just placeholder text for now...");
      * </code>
      *
-     * @param string|resource $data string or open resource
-     * @param float $bytes amount of data to upload (required for resources)
-     * @param boolean $verify generate, send, and compare MD5 checksums
-     * @return boolean <kbd>True</kbd> when data uploaded successfully
-     * @throws SyntaxException missing required parameters
-     * @throws BadContentTypeException if no Content-Type was/could be set
+     * @param string|resource $data   string or open resource
+     * @param float           $bytes  amount of data to upload (required for resources)
+     * @param bool            $verify generate, send, and compare MD5 checksums
+     *
+     * @throws SyntaxException             missing required parameters
+     * @throws BadContentTypeException     if no Content-Type was/could be set
      * @throws MisMatchedChecksumException $verify is set and checksums unequal
-     * @throws InvalidResponseException unexpected response
+     * @throws InvalidResponseException    unexpected response
+     *
+     * @return bool <kbd>True</kbd> when data uploaded successfully
      */
-    function write($data=NULL, $bytes=0, $verify=True)
+    public function write($data = null, $bytes = 0, $verify = true)
     {
         if (!$data) {
-            throw new SyntaxException("Missing data source.");
+            throw new SyntaxException('Missing data source.');
         }
         if ($bytes > MAX_OBJECT_SIZE) {
-            throw new SyntaxException("Bytes exceeds maximum object size.");
+            throw new SyntaxException('Bytes exceeds maximum object size.');
         }
         if ($verify) {
             if (!$this->_etag_override) {
                 $this->etag = $this->compute_md5sum($data);
             }
         } else {
-            $this->etag = NULL;
+            $this->etag = null;
         }
 
-        $close_fh = False;
+        $close_fh = false;
         if (!is_resource($data)) {
-            # A hack to treat string data as a file handle.  php://memory feels
-            # like a better option, but it seems to break on Windows so use
-            # a temporary file instead.
-            #
-            $fp = fopen("php://temp", "wb+");
-            #$fp = fopen("php://memory", "wb+");
+            // A hack to treat string data as a file handle.  php://memory feels
+            // like a better option, but it seems to break on Windows so use
+            // a temporary file instead.
+            //
+            $fp = fopen('php://temp', 'wb+');
+            //$fp = fopen("php://memory", "wb+");
             fwrite($fp, $data, strlen($data));
             rewind($fp);
-            $close_fh = True;
+            $close_fh = true;
             $this->content_length = (float) strlen($data);
             if ($this->content_length > MAX_OBJECT_SIZE) {
-                throw new SyntaxException("Data exceeds maximum object size");
+                throw new SyntaxException('Data exceeds maximum object size');
             }
             $ct_data = substr($data, 0, 64);
         } else {
@@ -1985,32 +2053,41 @@ class CF_Object
 
         list($status, $reason, $etag) =
                 $this->container->cfs_http->put_object($this, $fp);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->write($data, $bytes, $verify);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->write($data, $bytes, $verify);
+        //}
         if ($status == 412) {
-            if ($close_fh) { fclose($fp); }
-            throw new SyntaxException("Missing Content-Type header");
+            if ($close_fh) {
+                fclose($fp);
+            }
+            throw new SyntaxException('Missing Content-Type header');
         }
         if ($status == 422) {
-            if ($close_fh) { fclose($fp); }
+            if ($close_fh) {
+                fclose($fp);
+            }
             throw new MisMatchedChecksumException(
-                "Supplied and computed checksums do not match.");
+                'Supplied and computed checksums do not match.');
         }
         if ($status != 201) {
-            if ($close_fh) { fclose($fp); }
-            throw new InvalidResponseException("Invalid response (".$status."): "
-                . $this->container->cfs_http->get_error());
+            if ($close_fh) {
+                fclose($fp);
+            }
+            throw new InvalidResponseException('Invalid response ('.$status.'): '
+                .$this->container->cfs_http->get_error());
         }
         if (!$verify) {
             $this->etag = $etag;
         }
-        if ($close_fh) { fclose($fp); }
-        return True;
+        if ($close_fh) {
+            fclose($fp);
+        }
+
+        return true;
     }
 
     /**
-     * Upload Object data from local filename
+     * Upload Object data from local filename.
      *
      * This is a convenience function to upload the data from a local file.  A
      * True value for $verify will cause the method to compute the Object's MD5
@@ -2030,37 +2107,40 @@ class CF_Object
      * </code>
      *
      * @param string $filename full path to local file
-     * @param boolean $verify enable local/remote MD5 checksum validation
-     * @return boolean <kbd>True</kbd> if data uploaded successfully
-     * @throws SyntaxException missing required parameters
-     * @throws BadContentTypeException if no Content-Type was/could be set
+     * @param bool   $verify   enable local/remote MD5 checksum validation
+     *
+     * @throws SyntaxException             missing required parameters
+     * @throws BadContentTypeException     if no Content-Type was/could be set
      * @throws MisMatchedChecksumException $verify is set and checksums unequal
-     * @throws InvalidResponseException unexpected response
-     * @throws IOException error opening file
+     * @throws InvalidResponseException    unexpected response
+     * @throws IOException                 error opening file
+     *
+     * @return bool <kbd>True</kbd> if data uploaded successfully
      */
-    function load_from_filename($filename, $verify=True)
+    public function load_from_filename($filename, $verify = true)
     {
-        $fp = @fopen($filename, "r");
+        $fp = @fopen($filename, 'r');
         if (!$fp) {
-            throw new IOException("Could not open file for reading: ".$filename);
+            throw new IOException('Could not open file for reading: '.$filename);
         }
 
         clearstatcache();
-        
-        $size = (float) sprintf("%u", filesize($filename));
+
+        $size = (float) sprintf('%u', filesize($filename));
         if ($size > MAX_OBJECT_SIZE) {
-            throw new SyntaxException("File size exceeds maximum object size.");
+            throw new SyntaxException('File size exceeds maximum object size.');
         }
 
         $this->_guess_content_type($filename);
-        
+
         $this->write($fp, $size, $verify);
         fclose($fp);
-        return True;
+
+        return true;
     }
 
     /**
-     * Save Object's data to local filename
+     * Save Object's data to local filename.
      *
      * Given a local filename, the Object's data will be written to the newly
      * created file.
@@ -2079,21 +2159,25 @@ class CF_Object
      * </code>
      *
      * @param string $filename name of local file to write data to
-     * @return boolean <kbd>True</kbd> if successful
-     * @throws IOException error opening file
+     *
+     * @throws IOException              error opening file
      * @throws InvalidResponseException unexpected response
+     *
+     * @return bool <kbd>True</kbd> if successful
      */
-    function save_to_filename($filename)
+    public function save_to_filename($filename)
     {
-        $fp = @fopen($filename, "wb");
+        $fp = @fopen($filename, 'wb');
         if (!$fp) {
-            throw new IOException("Could not open file for writing: ".$filename);
+            throw new IOException('Could not open file for writing: '.$filename);
         }
         $result = $this->stream($fp);
         fclose($fp);
+
         return $result;
     }
-       /**
+
+    /**
      * Purge this Object from CDN Cache.
      * Example:
      * <code>
@@ -2106,28 +2190,30 @@ class CF_Object
      * # or
      * $obj->purge_from_cdn();
      * # or 
-     * $obj->purge_from_cdn("user1@domain.com,user2@domain.com");
+     * $obj->purge_from_cdn("user1@domain.com,user2@domain.com");.
+     *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException if CDN Is not enabled on this connection
+     *
+     * @throws CDNNotEnabledException   if CDN Is not enabled on this connection
      * @throws InvalidResponseException if the response expected is not returned
      */
-    function purge_from_cdn($email=null)
+    public function purge_from_cdn($email = null)
     {
-        if (!$this->container->cfs_http->getCDNMUrl())
-        {
+        if (!$this->container->cfs_http->getCDNMUrl()) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        $status = $this->container->cfs_http->purge_from_cdn($this->container->name . "/" . $this->name, $email);
+        $status = $this->container->cfs_http->purge_from_cdn($this->container->name.'/'.$this->name, $email);
         if ($status < 199 or $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->container->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->container->cfs_http->get_error());
         }
-        return True;
+
+        return true;
     }
 
     /**
-     * Set Object's MD5 checksum
+     * Set Object's MD5 checksum.
      *
      * Manually set the Object's ETag.  Including the ETag is mandatory for
      * Cloud Files to perform end-to-end verification.  Omitting the ETag forces
@@ -2135,26 +2221,26 @@ class CF_Object
      *
      * @param string $etag MD5 checksum hexidecimal string
      */
-    function set_etag($etag)
+    public function set_etag($etag)
     {
         $this->etag = $etag;
-        $this->_etag_override = True;
+        $this->_etag_override = true;
     }
 
     /**
-     * Object's MD5 checksum
+     * Object's MD5 checksum.
      *
      * Accessor method for reading Object's private ETag attribute.
      *
      * @return string MD5 checksum hexidecimal string
      */
-    function getETag()
+    public function getETag()
     {
         return $this->etag;
     }
 
     /**
-     * Compute the MD5 checksum
+     * Compute the MD5 checksum.
      *
      * Calculate the MD5 checksum on either a PHP resource or data.  The argument
      * may either be a local filename, open resource for reading, or a string.
@@ -2165,12 +2251,12 @@ class CF_Object
      * compute yourself the md5 before if you have it.
      *
      * @param filename|obj|string $data filename, open resource, or string
+     *
      * @return string MD5 checksum hexidecimal string
      */
-    function compute_md5sum(&$data)
+    public function compute_md5sum(&$data)
     {
-
-        if (function_exists("hash_init") && is_resource($data)) {
+        if (function_exists('hash_init') && is_resource($data)) {
             $ctx = hash_init('md5');
             while (!feof($data)) {
                 $buffer = fgets($data, 65536);
@@ -2178,52 +2264,54 @@ class CF_Object
             }
             $md5 = hash_final($ctx, false);
             rewind($data);
-        } elseif ((string)is_file($data)) {
+        } elseif ((string) is_file($data)) {
             $md5 = md5_file($data);
         } else {
             $md5 = md5($data);
         }
+
         return $md5;
     }
 
     /**
-     * PRIVATE: fetch information about the remote Object if it exists
+     * PRIVATE: fetch information about the remote Object if it exists.
      */
     private function _initialize()
     {
         list($status, $reason, $etag, $last_modified, $content_type,
             $content_length, $metadata) =
                 $this->container->cfs_http->head_object($this);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->_initialize();
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->_initialize();
+        //}
         if ($status == 404) {
-            return False;
+            return false;
         }
         if ($status < 200 || $status > 299) {
-            throw new InvalidResponseException("Invalid response (".$status."): "
-                . $this->container->cfs_http->get_error());
+            throw new InvalidResponseException('Invalid response ('.$status.'): '
+                .$this->container->cfs_http->get_error());
         }
         $this->etag = $etag;
         $this->last_modified = $last_modified;
         $this->content_type = $content_type;
         $this->content_length = $content_length;
         $this->metadata = $metadata;
-        return True;
+
+        return true;
     }
 
-    #private function _re_auth()
-    #{
-    #    $new_auth = new CF_Authentication(
-    #        $this->cfs_auth->username,
-    #        $this->cfs_auth->api_key,
-    #        $this->cfs_auth->auth_host,
-    #        $this->cfs_auth->account);
-    #    $new_auth->authenticate();
-    #    $this->container->cfs_auth = $new_auth;
-    #    $this->container->cfs_http->setCFAuth($this->cfs_auth);
-    #    return True;
-    #}
+    //private function _re_auth()
+    //{
+    //    $new_auth = new CF_Authentication(
+    //        $this->cfs_auth->username,
+    //        $this->cfs_auth->api_key,
+    //        $this->cfs_auth->auth_host,
+    //        $this->cfs_auth->account);
+    //    $new_auth->authenticate();
+    //    $this->container->cfs_auth = $new_auth;
+    //    $this->container->cfs_http->setCFAuth($this->cfs_auth);
+    //    return True;
+    //}
 }
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
@@ -2234,5 +2322,4 @@ class CF_Object
  * c-basic-offset: 4
  * c-hanging-comment-ender-p: nil
  * End:
- */
-?>
+ */;
diff --git a/public/filemanager/connectors/php/plugins/rsc/cloudfiles_exceptions.php b/public/filemanager/connectors/php/plugins/rsc/cloudfiles_exceptions.php
index 5624d6b86..0f234b731 100644
--- a/public/filemanager/connectors/php/plugins/rsc/cloudfiles_exceptions.php
+++ b/public/filemanager/connectors/php/plugins/rsc/cloudfiles_exceptions.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Custom Exceptions for the CloudFiles API
+ * Custom Exceptions for the CloudFiles API.
  *
  * Requres PHP 5.x (for Exceptions and OO syntax)
  *
@@ -8,26 +8,50 @@
  *
  * @author Eric "EJ" Johnson <ej@racklabs.com>
  * @copyright Copyright (c) 2008, Rackspace US, Inc.
- * @package php-cloudfiles-exceptions
  */
 
 /**
- * Custom Exceptions for the CloudFiles API
- * @package php-cloudfiles-exceptions
+ * Custom Exceptions for the CloudFiles API.
  */
-class SyntaxException extends Exception { }
-class AuthenticationException extends Exception { }
-class InvalidResponseException extends Exception { }
-class NonEmptyContainerException extends Exception { }
-class NoSuchObjectException extends Exception { }
-class NoSuchContainerException extends Exception { }
-class NoSuchAccountException extends Exception { }
-class MisMatchedChecksumException extends Exception { }
-class IOException extends Exception { }
-class CDNNotEnabledException extends Exception { }
-class BadContentTypeException extends Exception { }
-class InvalidUTF8Exception extends Exception { }
-class ConnectionNotOpenException extends Exception { }
+class SyntaxException extends Exception
+{
+}
+class AuthenticationException extends Exception
+{
+}
+class InvalidResponseException extends Exception
+{
+}
+class NonEmptyContainerException extends Exception
+{
+}
+class NoSuchObjectException extends Exception
+{
+}
+class NoSuchContainerException extends Exception
+{
+}
+class NoSuchAccountException extends Exception
+{
+}
+class MisMatchedChecksumException extends Exception
+{
+}
+class IOException extends Exception
+{
+}
+class CDNNotEnabledException extends Exception
+{
+}
+class BadContentTypeException extends Exception
+{
+}
+class InvalidUTF8Exception extends Exception
+{
+}
+class ConnectionNotOpenException extends Exception
+{
+}
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
@@ -37,5 +61,4 @@ class ConnectionNotOpenException extends Exception { }
  * c-basic-offset: 4
  * c-hanging-comment-ender-p: nil
  * End:
- */
-?>
+ */;
diff --git a/public/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php b/public/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php
index 24896f146..0c8222173 100644
--- a/public/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php
+++ b/public/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php
@@ -22,42 +22,39 @@
  *
  * @author Eric "EJ" Johnson <ej@racklabs.com>
  * @copyright Copyright (c) 2008, Rackspace US, Inc.
- * @package php-cloudfiles-http
  */
 
 /**
  */
-require_once("cloudfiles_exceptions.php");
+require_once 'cloudfiles_exceptions.php';
 
-define("PHP_CF_VERSION", "1.7.7");
-define("USER_AGENT", sprintf("PHP-CloudFiles/%s", PHP_CF_VERSION));
-define("ACCOUNT_CONTAINER_COUNT", "X-Account-Container-Count");
-define("ACCOUNT_BYTES_USED", "X-Account-Bytes-Used");
-define("CONTAINER_OBJ_COUNT", "X-Container-Object-Count");
-define("CONTAINER_BYTES_USED", "X-Container-Bytes-Used");
-define("METADATA_HEADER", "X-Object-Meta-");
-define("CDN_URI", "X-CDN-URI");
-define("CDN_ENABLED", "X-CDN-Enabled");
-define("CDN_LOG_RETENTION", "X-Log-Retention");
-define("CDN_ACL_USER_AGENT", "X-User-Agent-ACL");
-define("CDN_ACL_REFERRER", "X-Referrer-ACL");
-define("CDN_TTL", "X-TTL");
-define("CDNM_URL", "X-CDN-Management-Url");
-define("STORAGE_URL", "X-Storage-Url");
-define("AUTH_TOKEN", "X-Auth-Token");
-define("AUTH_USER_HEADER", "X-Auth-User");
-define("AUTH_KEY_HEADER", "X-Auth-Key");
-define("AUTH_USER_HEADER_LEGACY", "X-Storage-User");
-define("AUTH_KEY_HEADER_LEGACY", "X-Storage-Pass");
-define("AUTH_TOKEN_LEGACY", "X-Storage-Token");
-define("CDN_EMAIL", "X-Purge-Email");
+define('PHP_CF_VERSION', '1.7.7');
+define('USER_AGENT', sprintf('PHP-CloudFiles/%s', PHP_CF_VERSION));
+define('ACCOUNT_CONTAINER_COUNT', 'X-Account-Container-Count');
+define('ACCOUNT_BYTES_USED', 'X-Account-Bytes-Used');
+define('CONTAINER_OBJ_COUNT', 'X-Container-Object-Count');
+define('CONTAINER_BYTES_USED', 'X-Container-Bytes-Used');
+define('METADATA_HEADER', 'X-Object-Meta-');
+define('CDN_URI', 'X-CDN-URI');
+define('CDN_ENABLED', 'X-CDN-Enabled');
+define('CDN_LOG_RETENTION', 'X-Log-Retention');
+define('CDN_ACL_USER_AGENT', 'X-User-Agent-ACL');
+define('CDN_ACL_REFERRER', 'X-Referrer-ACL');
+define('CDN_TTL', 'X-TTL');
+define('CDNM_URL', 'X-CDN-Management-Url');
+define('STORAGE_URL', 'X-Storage-Url');
+define('AUTH_TOKEN', 'X-Auth-Token');
+define('AUTH_USER_HEADER', 'X-Auth-User');
+define('AUTH_KEY_HEADER', 'X-Auth-Key');
+define('AUTH_USER_HEADER_LEGACY', 'X-Storage-User');
+define('AUTH_KEY_HEADER_LEGACY', 'X-Storage-Pass');
+define('AUTH_TOKEN_LEGACY', 'X-Storage-Token');
+define('CDN_EMAIL', 'X-Purge-Email');
 /**
- * HTTP/cURL wrapper for Cloud Files
+ * HTTP/cURL wrapper for Cloud Files.
  *
  * This class should not be used directly.  It's only purpose is to abstract
  * out the HTTP communication from the main API.
- *
- * @package php-cloudfiles-http
  */
 class CF_Http
 {
@@ -66,20 +63,20 @@ class CF_Http
     private $cabundle_path;
     private $api_version;
 
-    # Authentication instance variables
-    #
+    // Authentication instance variables
+    //
     private $storage_url;
     private $cdnm_url;
     private $auth_token;
 
-    # Request/response variables
-    #
+    // Request/response variables
+    //
     private $response_status;
     private $response_reason;
     private $connections;
 
-    # Variables used for content/header callbacks
-    #
+    // Variables used for content/header callbacks
+    //
     private $_user_read_progress_callback_func;
     private $_user_write_progress_callback_func;
     private $_write_callback_type;
@@ -102,108 +99,109 @@ class CF_Http
     private $_cdn_acl_user_agent;
     private $_cdn_acl_referrer;
 
-    function __construct($api_version)
+    public function __construct($api_version)
     {
-        $this->dbug = False;
-        $this->cabundle_path = NULL;
+        $this->dbug = false;
+        $this->cabundle_path = null;
         $this->api_version = $api_version;
-        $this->error_str = NULL;
+        $this->error_str = null;
 
-        $this->storage_url = NULL;
-        $this->cdnm_url = NULL;
-        $this->auth_token = NULL;
+        $this->storage_url = null;
+        $this->cdnm_url = null;
+        $this->auth_token = null;
 
-        $this->response_status = NULL;
-        $this->response_reason = NULL;
+        $this->response_status = null;
+        $this->response_reason = null;
 
-        # Curl connections array - since there is no way to "re-set" the
-        # connection paramaters for a cURL handle, we keep an array of
-        # the unique use-cases and funnel all of those same type
-        # requests through the appropriate curl connection.
-        #
-        $this->connections = array(
-            "GET_CALL"  => NULL, # GET objects/containers/lists
-            "PUT_OBJ"   => NULL, # PUT object
-            "HEAD"      => NULL, # HEAD requests
-            "PUT_CONT"  => NULL, # PUT container
-            "DEL_POST"  => NULL, # DELETE containers/objects, POST objects
-        );
+        // Curl connections array - since there is no way to "re-set" the
+        // connection paramaters for a cURL handle, we keep an array of
+        // the unique use-cases and funnel all of those same type
+        // requests through the appropriate curl connection.
+        //
+        $this->connections = [
+            'GET_CALL'  => null, // GET objects/containers/lists
+            'PUT_OBJ'   => null, // PUT object
+            'HEAD'      => null, // HEAD requests
+            'PUT_CONT'  => null, // PUT container
+            'DEL_POST'  => null, // DELETE containers/objects, POST objects
+        ];
 
-        $this->_user_read_progress_callback_func = NULL;
-        $this->_user_write_progress_callback_func = NULL;
-        $this->_write_callback_type = NULL;
-        $this->_text_list = array();
-	$this->_return_list = NULL;
+        $this->_user_read_progress_callback_func = null;
+        $this->_user_write_progress_callback_func = null;
+        $this->_write_callback_type = null;
+        $this->_text_list = [];
+        $this->_return_list = null;
         $this->_account_container_count = 0;
         $this->_account_bytes_used = 0;
         $this->_container_object_count = 0;
         $this->_container_bytes_used = 0;
-        $this->_obj_write_resource = NULL;
-        $this->_obj_write_string = "";
-        $this->_obj_etag = NULL;
-        $this->_obj_last_modified = NULL;
-        $this->_obj_content_type = NULL;
-        $this->_obj_content_length = NULL;
-        $this->_obj_metadata = array();
-        $this->_cdn_enabled = NULL;
-        $this->_cdn_uri = NULL;
-        $this->_cdn_ttl = NULL;
-        $this->_cdn_log_retention = NULL;
-        $this->_cdn_acl_user_agent = NULL;
-        $this->_cdn_acl_referrer = NULL;
+        $this->_obj_write_resource = null;
+        $this->_obj_write_string = '';
+        $this->_obj_etag = null;
+        $this->_obj_last_modified = null;
+        $this->_obj_content_type = null;
+        $this->_obj_content_length = null;
+        $this->_obj_metadata = [];
+        $this->_cdn_enabled = null;
+        $this->_cdn_uri = null;
+        $this->_cdn_ttl = null;
+        $this->_cdn_log_retention = null;
+        $this->_cdn_acl_user_agent = null;
+        $this->_cdn_acl_referrer = null;
 
-        # The OS list with a PHP without an updated CA File for CURL to
-        # connect to SSL Websites. It is the first 3 letters of the PHP_OS
-        # variable.
-        $OS_CAFILE_NONUPDATED=array(
-            "win","dar"
-        ); 
+        // The OS list with a PHP without an updated CA File for CURL to
+        // connect to SSL Websites. It is the first 3 letters of the PHP_OS
+        // variable.
+        $OS_CAFILE_NONUPDATED = [
+            'win', 'dar',
+        ];
 
-        if (in_array((strtolower (substr(PHP_OS, 0,3))), $OS_CAFILE_NONUPDATED))
+        if (in_array((strtolower(substr(PHP_OS, 0, 3))), $OS_CAFILE_NONUPDATED)) {
             $this->ssl_use_cabundle();
-        
+        }
     }
 
-    function ssl_use_cabundle($path=NULL)
+    public function ssl_use_cabundle($path = null)
     {
         if ($path) {
             $this->cabundle_path = $path;
         } else {
-            $this->cabundle_path = dirname(__FILE__) . "/share/cacert.pem";
+            $this->cabundle_path = dirname(__FILE__).'/share/cacert.pem';
         }
         if (!file_exists($this->cabundle_path)) {
-            throw new IOException("Could not use CA bundle: "
-                . $this->cabundle_path);
+            throw new IOException('Could not use CA bundle: '
+                .$this->cabundle_path);
         }
+
         return;
     }
 
-    # Uses separate cURL connection to authenticate
-    #
-    function authenticate($user, $pass, $acct=NULL, $host=NULL)
+    // Uses separate cURL connection to authenticate
+    //
+    public function authenticate($user, $pass, $acct = null, $host = null)
     {
-        $path = array();
-        if (isset($acct)){
-            $headers = array(
-                sprintf("%s: %s", AUTH_USER_HEADER_LEGACY, $user),
-                sprintf("%s: %s", AUTH_KEY_HEADER_LEGACY, $pass),
-                );
+        $path = [];
+        if (isset($acct)) {
+            $headers = [
+                sprintf('%s: %s', AUTH_USER_HEADER_LEGACY, $user),
+                sprintf('%s: %s', AUTH_KEY_HEADER_LEGACY, $pass),
+                ];
             $path[] = $host;
-            $path[] = rawurlencode(sprintf("v%d",$this->api_version));
+            $path[] = rawurlencode(sprintf('v%d', $this->api_version));
             $path[] = rawurlencode($acct);
         } else {
-            $headers = array(
-                sprintf("%s: %s", AUTH_USER_HEADER, $user),
-                sprintf("%s: %s", AUTH_KEY_HEADER, $pass),
-                );
-	    $path[] = $host;
+            $headers = [
+                sprintf('%s: %s', AUTH_USER_HEADER, $user),
+                sprintf('%s: %s', AUTH_KEY_HEADER, $pass),
+                ];
+            $path[] = $host;
         }
-	$path[] = "v1.0";
-        $url = implode("/", $path);
+        $path[] = 'v1.0';
+        $url = implode('/', $path);
 
         $curl_ch = curl_init();
         if (!is_null($this->cabundle_path)) {
-            curl_setopt($curl_ch, CURLOPT_SSL_VERIFYPEER, True);
+            curl_setopt($curl_ch, CURLOPT_SSL_VERIFYPEER, true);
             curl_setopt($curl_ch, CURLOPT_CAINFO, $this->cabundle_path);
         }
         curl_setopt($curl_ch, CURLOPT_VERBOSE, $this->dbug);
@@ -212,736 +210,808 @@ class CF_Http
         curl_setopt($curl_ch, CURLOPT_HEADER, 0);
         curl_setopt($curl_ch, CURLOPT_HTTPHEADER, $headers);
         curl_setopt($curl_ch, CURLOPT_USERAGENT, USER_AGENT);
-        curl_setopt($curl_ch, CURLOPT_RETURNTRANSFER, TRUE);
-        curl_setopt($curl_ch, CURLOPT_HEADERFUNCTION,array(&$this,'_auth_hdr_cb'));
+        curl_setopt($curl_ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($curl_ch, CURLOPT_HEADERFUNCTION, [&$this, '_auth_hdr_cb']);
         curl_setopt($curl_ch, CURLOPT_CONNECTTIMEOUT, 10);
         curl_setopt($curl_ch, CURLOPT_URL, $url);
         curl_exec($curl_ch);
         curl_close($curl_ch);
 
-        return array($this->response_status, $this->response_reason,
-            $this->storage_url, $this->cdnm_url, $this->auth_token);
+        return [$this->response_status, $this->response_reason,
+            $this->storage_url, $this->cdnm_url, $this->auth_token, ];
     }
 
-    # (CDN) GET /v1/Account
-    #
-    function list_cdn_containers($enabled_only)
+    // (CDN) GET /v1/Account
+    //
+    public function list_cdn_containers($enabled_only)
     {
-        $conn_type = "GET_CALL";
-        $url_path = $this->_make_path("CDN");
+        $conn_type = 'GET_CALL';
+        $url_path = $this->_make_path('CDN');
 
-        $this->_write_callback_type = "TEXT_LIST";
-        if ($enabled_only)
-        {
-            $return_code = $this->_send_request($conn_type, $url_path . 
+        $this->_write_callback_type = 'TEXT_LIST';
+        if ($enabled_only) {
+            $return_code = $this->_send_request($conn_type, $url_path.
             '/?enabled_only=true');
-        }
-        else
-        {
+        } else {
             $return_code = $this->_send_request($conn_type, $url_path);
         }
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            array(0,$this->error_str,array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+            [0, $this->error_str, []];
         }
         if ($return_code == 401) {
-            return array($return_code,"Unauthorized",array());
+            return [$return_code, 'Unauthorized', []];
         }
         if ($return_code == 404) {
-            return array($return_code,"Account not found.",array());
+            return [$return_code, 'Account not found.', []];
         }
         if ($return_code == 204) {
-            return array($return_code,"Account has no CDN enabled Containers.",
-                array());
+            return [$return_code, 'Account has no CDN enabled Containers.',
+                [], ];
         }
         if ($return_code == 200) {
-	    $this->create_array();
-            return array($return_code,$this->response_reason,$this->_text_list);
+            $this->create_array();
+
+            return [$return_code, $this->response_reason, $this->_text_list];
         }
-        $this->error_str = "Unexpected HTTP response: ".$this->response_reason;
-        return array($return_code,$this->error_str,array());
+        $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+        return [$return_code, $this->error_str, []];
     }
 
-    # (CDN) DELETE /v1/Account/Container or /v1/Account/Container/Object
-    #
-    function purge_from_cdn($path, $email=null)
+    // (CDN) DELETE /v1/Account/Container or /v1/Account/Container/Object
+    //
+    public function purge_from_cdn($path, $email = null)
     {
-        if(!$path)
-            throw new SyntaxException("Path not set");
-        $url_path = $this->_make_path("CDN", NULL, $path);
-        if($email)
-        {
-            $hdrs = array(CDN_EMAIL => $email);
-            $return_code = $this->_send_request("DEL_POST",$url_path,$hdrs,"DELETE");
+        if (!$path) {
+            throw new SyntaxException('Path not set');
         }
-        else
-            $return_code = $this->_send_request("DEL_POST",$url_path,null,"DELETE");
+        $url_path = $this->_make_path('CDN', null, $path);
+        if ($email) {
+            $hdrs = [CDN_EMAIL => $email];
+            $return_code = $this->_send_request('DEL_POST', $url_path, $hdrs, 'DELETE');
+        } else {
+            $return_code = $this->_send_request('DEL_POST', $url_path, null, 'DELETE');
+        }
+
         return $return_code;
     }
 
-    # (CDN) POST /v1/Account/Container
-    function update_cdn_container($container_name, $ttl=86400, $cdn_log_retention=False,
-                                  $cdn_acl_user_agent="", $cdn_acl_referrer)
+    // (CDN) POST /v1/Account/Container
+    public function update_cdn_container($container_name, $ttl, $cdn_log_retention,
+                                  $cdn_acl_user_agent, $cdn_acl_referrer)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        $url_path = $this->_make_path("CDN", $container_name);
-        $hdrs = array(
-            CDN_ENABLED => "True",
-            CDN_TTL => $ttl,
-            CDN_LOG_RETENTION => $cdn_log_retention ?  "True" : "False",
+        $url_path = $this->_make_path('CDN', $container_name);
+        $hdrs = [
+            CDN_ENABLED        => 'True',
+            CDN_TTL            => $ttl,
+            CDN_LOG_RETENTION  => $cdn_log_retention ?  'True' : 'False',
             CDN_ACL_USER_AGENT => $cdn_acl_user_agent,
-            CDN_ACL_REFERRER => $cdn_acl_referrer,
-            );
-        $return_code = $this->_send_request("DEL_POST",$url_path,$hdrs,"POST");
+            CDN_ACL_REFERRER   => $cdn_acl_referrer,
+            ];
+        $return_code = $this->_send_request('DEL_POST', $url_path, $hdrs, 'POST');
         if ($return_code == 401) {
-            $this->error_str = "Unauthorized";
-            return array($return_code, $this->error_str, NULL);
+            $this->error_str = 'Unauthorized';
+
+            return [$return_code, $this->error_str, null];
         }
         if ($return_code == 404) {
-            $this->error_str = "Container not found.";
-            return array($return_code, $this->error_str, NULL);
+            $this->error_str = 'Container not found.';
+
+            return [$return_code, $this->error_str, null];
         }
         if ($return_code != 202) {
-            $this->error_str="Unexpected HTTP response: ".$this->response_reason;
-            return array($return_code, $this->error_str, NULL);
-        }
-        return array($return_code, "Accepted", $this->_cdn_uri);
+            $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
 
+            return [$return_code, $this->error_str, null];
+        }
+
+        return [$return_code, 'Accepted', $this->_cdn_uri];
     }
 
-    # (CDN) PUT /v1/Account/Container
-    #
-    function add_cdn_container($container_name, $ttl=86400)
+    // (CDN) PUT /v1/Account/Container
+    //
+    public function add_cdn_container($container_name, $ttl = 86400)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
-        
-        $url_path = $this->_make_path("CDN", $container_name);
-        $hdrs = array(
-            CDN_ENABLED => "True",
-            CDN_TTL => $ttl,
-            );
-        $return_code = $this->_send_request("PUT_CONT", $url_path, $hdrs);
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
+
+        $url_path = $this->_make_path('CDN', $container_name);
+        $hdrs = [
+            CDN_ENABLED => 'True',
+            CDN_TTL     => $ttl,
+            ];
+        $return_code = $this->_send_request('PUT_CONT', $url_path, $hdrs);
         if ($return_code == 401) {
-            $this->error_str = "Unauthorized";
-            return array($return_code,$this->response_reason,False);
+            $this->error_str = 'Unauthorized';
+
+            return [$return_code, $this->response_reason, false];
         }
-        if (!in_array($return_code, array(201,202))) {
-            $this->error_str="Unexpected HTTP response: ".$this->response_reason;
-            return array($return_code,$this->response_reason,False);
+        if (!in_array($return_code, [201, 202])) {
+            $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+            return [$return_code, $this->response_reason, false];
         }
-        return array($return_code,$this->response_reason,$this->_cdn_uri);
+
+        return [$return_code, $this->response_reason, $this->_cdn_uri];
     }
 
-    # (CDN) POST /v1/Account/Container
-    #
-    function remove_cdn_container($container_name)
+    // (CDN) POST /v1/Account/Container
+    //
+    public function remove_cdn_container($container_name)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
-        
-        $url_path = $this->_make_path("CDN", $container_name);
-        $hdrs = array(CDN_ENABLED => "False");
-        $return_code = $this->_send_request("DEL_POST",$url_path,$hdrs,"POST");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
+
+        $url_path = $this->_make_path('CDN', $container_name);
+        $hdrs = [CDN_ENABLED => 'False'];
+        $return_code = $this->_send_request('DEL_POST', $url_path, $hdrs, 'POST');
         if ($return_code == 401) {
-            $this->error_str = "Unauthorized";
-            return array($return_code, $this->error_str);
+            $this->error_str = 'Unauthorized';
+
+            return [$return_code, $this->error_str];
         }
         if ($return_code == 404) {
-            $this->error_str = "Container not found.";
-            return array($return_code, $this->error_str);
+            $this->error_str = 'Container not found.';
+
+            return [$return_code, $this->error_str];
         }
         if ($return_code != 202) {
-            $this->error_str="Unexpected HTTP response: ".$this->response_reason;
-            return array($return_code, $this->error_str);
+            $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+            return [$return_code, $this->error_str];
         }
-        return array($return_code, "Accepted");
+
+        return [$return_code, 'Accepted'];
     }
 
-    # (CDN) HEAD /v1/Account
-    #
-    function head_cdn_container($container_name)
+    // (CDN) HEAD /v1/Account
+    //
+    public function head_cdn_container($container_name)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
-        
-        $conn_type = "HEAD";
-        $url_path = $this->_make_path("CDN", $container_name);
-        $return_code = $this->_send_request($conn_type, $url_path, NULL, "GET", True);
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
+
+        $conn_type = 'HEAD';
+        $url_path = $this->_make_path('CDN', $container_name);
+        $return_code = $this->_send_request($conn_type, $url_path, null, 'GET', true);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,NULL,NULL,NULL,NULL,NULL,NULL);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, null, null, null, null, null, null];
         }
         if ($return_code == 401) {
-            return array($return_code,"Unauthorized",NULL,NULL,NULL,NULL,NULL,NULL);
+            return [$return_code, 'Unauthorized', null, null, null, null, null, null];
         }
         if ($return_code == 404) {
-            return array($return_code,"Account not found.",NULL,NULL,NULL,NULL,NULL,NULL);
+            return [$return_code, 'Account not found.', null, null, null, null, null, null];
         }
         if ($return_code == 204) {
-            return array($return_code,$this->response_reason,
+            return [$return_code, $this->response_reason,
                 $this->_cdn_enabled, $this->_cdn_uri, $this->_cdn_ttl,
                 $this->_cdn_log_retention,
                 $this->_cdn_acl_user_agent,
-                $this->_cdn_acl_referrer
-                );
+                $this->_cdn_acl_referrer,
+                ];
         }
-        return array($return_code,$this->response_reason,
-                     NULL,NULL,NULL,
+
+        return [$return_code, $this->response_reason,
+                     null, null, null,
                      $this->_cdn_log_retention,
                      $this->_cdn_acl_user_agent,
-                     $this->_cdn_acl_referrer
-            );
+                     $this->_cdn_acl_referrer,
+            ];
     }
 
-    # GET /v1/Account
-    #
-    function list_containers($limit=0, $marker=NULL)
+    // GET /v1/Account
+    //
+    public function list_containers($limit = 0, $marker = null)
     {
-        $conn_type = "GET_CALL";
+        $conn_type = 'GET_CALL';
         $url_path = $this->_make_path();
 
         $limit = intval($limit);
-        $params = array();
+        $params = [];
         if ($limit > 0) {
             $params[] = "limit=$limit";
         }
         if ($marker) {
-            $params[] = "marker=".rawurlencode($marker);
+            $params[] = 'marker='.rawurlencode($marker);
         }
         if (!empty($params)) {
-            $url_path .= "?" . implode("&", $params);
+            $url_path .= '?'.implode('&', $params);
         }
 
-        $this->_write_callback_type = "TEXT_LIST";
+        $this->_write_callback_type = 'TEXT_LIST';
         $return_code = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, []];
         }
         if ($return_code == 204) {
-            return array($return_code, "Account has no containers.", array());
+            return [$return_code, 'Account has no containers.', []];
         }
         if ($return_code == 404) {
-            $this->error_str = "Invalid account name for authentication token.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Invalid account name for authentication token.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 200) {
-	    $this->create_array();
-            return array($return_code, $this->response_reason, $this->_text_list);
+            $this->create_array();
+
+            return [$return_code, $this->response_reason, $this->_text_list];
         }
-        $this->error_str = "Unexpected HTTP response: ".$this->response_reason;
-        return array($return_code,$this->error_str,array());
+        $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+        return [$return_code, $this->error_str, []];
     }
 
-    # GET /v1/Account?format=json
-    #
-    function list_containers_info($limit=0, $marker=NULL)
+    // GET /v1/Account?format=json
+    //
+    public function list_containers_info($limit = 0, $marker = null)
     {
-        $conn_type = "GET_CALL";
-        $url_path = $this->_make_path() . "?format=json";
+        $conn_type = 'GET_CALL';
+        $url_path = $this->_make_path().'?format=json';
 
         $limit = intval($limit);
-        $params = array();
+        $params = [];
         if ($limit > 0) {
             $params[] = "limit=$limit";
         }
         if ($marker) {
-            $params[] = "marker=".rawurlencode($marker);
+            $params[] = 'marker='.rawurlencode($marker);
         }
         if (!empty($params)) {
-            $url_path .= "&" . implode("&", $params);
+            $url_path .= '&'.implode('&', $params);
         }
 
-        $this->_write_callback_type = "OBJECT_STRING";
+        $this->_write_callback_type = 'OBJECT_STRING';
         $return_code = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, []];
         }
         if ($return_code == 204) {
-            return array($return_code, "Account has no containers.", array());
+            return [$return_code, 'Account has no containers.', []];
         }
         if ($return_code == 404) {
-            $this->error_str = "Invalid account name for authentication token.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Invalid account name for authentication token.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 200) {
-            $json_body = json_decode($this->_obj_write_string, True);
-            return array($return_code, $this->response_reason, $json_body);
+            $json_body = json_decode($this->_obj_write_string, true);
+
+            return [$return_code, $this->response_reason, $json_body];
         }
-        $this->error_str = "Unexpected HTTP response: ".$this->response_reason;
-        return array($return_code,$this->error_str,array());
+        $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+        return [$return_code, $this->error_str, []];
     }
 
-    # HEAD /v1/Account
-    #
-    function head_account()
+    // HEAD /v1/Account
+    //
+    public function head_account()
     {
-        $conn_type = "HEAD";
+        $conn_type = 'HEAD';
 
         $url_path = $this->_make_path();
-        $return_code = $this->_send_request($conn_type,$url_path);
+        $return_code = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            array(0,$this->error_str,0,0);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+            [0, $this->error_str, 0, 0];
         }
         if ($return_code == 404) {
-            return array($return_code,"Account not found.",0,0);
+            return [$return_code, 'Account not found.', 0, 0];
         }
         if ($return_code == 204) {
-            return array($return_code,$this->response_reason,
-                $this->_account_container_count, $this->_account_bytes_used);
+            return [$return_code, $this->response_reason,
+                $this->_account_container_count, $this->_account_bytes_used, ];
         }
-        return array($return_code,$this->response_reason,0,0);
+
+        return [$return_code, $this->response_reason, 0, 0];
     }
 
-    # PUT /v1/Account/Container
-    #
-    function create_container($container_name)
+    // PUT /v1/Account/Container
+    //
+    public function create_container($container_name)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        $url_path = $this->_make_path("STORAGE", $container_name);
-        $return_code = $this->_send_request("PUT_CONT",$url_path);
+        $url_path = $this->_make_path('STORAGE', $container_name);
+        $return_code = $this->_send_request('PUT_CONT', $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return False;
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return false;
         }
+
         return $return_code;
     }
 
-    # DELETE /v1/Account/Container
-    #
-    function delete_container($container_name)
+    // DELETE /v1/Account/Container
+    //
+    public function delete_container($container_name)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        $url_path = $this->_make_path("STORAGE", $container_name);
-        $return_code = $this->_send_request("DEL_POST",$url_path,array(),"DELETE");
+        $url_path = $this->_make_path('STORAGE', $container_name);
+        $return_code = $this->_send_request('DEL_POST', $url_path, [], 'DELETE');
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
         }
         if ($return_code == 409) {
-            $this->error_str = "Container must be empty prior to removing it.";
+            $this->error_str = 'Container must be empty prior to removing it.';
         }
         if ($return_code == 404) {
-            $this->error_str = "Specified container did not exist to delete.";
+            $this->error_str = 'Specified container did not exist to delete.';
         }
         if ($return_code != 204) {
             $this->error_str = "Unexpected HTTP return code: $return_code.";
         }
+
         return $return_code;
     }
 
-    # GET /v1/Account/Container
-    #
-    function list_objects($cname,$limit=0,$marker=NULL,$prefix=NULL,$path=NULL)
+    // GET /v1/Account/Container
+    //
+    public function list_objects($cname, $limit = 0, $marker = null, $prefix = null, $path = null)
     {
         if (!$cname) {
-            $this->error_str = "Container name not set.";
-            return array(0, $this->error_str, array());
+            $this->error_str = 'Container name not set.';
+
+            return [0, $this->error_str, []];
         }
 
-        $url_path = $this->_make_path("STORAGE", $cname);
+        $url_path = $this->_make_path('STORAGE', $cname);
 
         $limit = intval($limit);
-        $params = array();
+        $params = [];
         if ($limit > 0) {
             $params[] = "limit=$limit";
         }
         if ($marker) {
-            $params[] = "marker=".rawurlencode($marker);
+            $params[] = 'marker='.rawurlencode($marker);
         }
         if ($prefix) {
-            $params[] = "prefix=".rawurlencode($prefix);
+            $params[] = 'prefix='.rawurlencode($prefix);
         }
         if ($path) {
-            $params[] = "path=".rawurlencode($path);
+            $params[] = 'path='.rawurlencode($path);
         }
         if (!empty($params)) {
-            $url_path .= "?" . implode("&", $params);
+            $url_path .= '?'.implode('&', $params);
         }
- 
-        $conn_type = "GET_CALL";
-        $this->_write_callback_type = "TEXT_LIST";
-        $return_code = $this->_send_request($conn_type,$url_path);
+
+        $conn_type = 'GET_CALL';
+        $this->_write_callback_type = 'TEXT_LIST';
+        $return_code = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, []];
         }
         if ($return_code == 204) {
-            $this->error_str = "Container has no Objects.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Container has no Objects.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 404) {
-            $this->error_str = "Container has no Objects.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Container has no Objects.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 200) {
-	    $this->create_array();	
-            return array($return_code,$this->response_reason, $this->_text_list);
+            $this->create_array();
+
+            return [$return_code, $this->response_reason, $this->_text_list];
         }
         $this->error_str = "Unexpected HTTP response code: $return_code";
-        return array(0,$this->error_str,array());
+
+        return [0, $this->error_str, []];
     }
 
-    # GET /v1/Account/Container?format=json
-    #
-    function get_objects($cname,$limit=0,$marker=NULL,$prefix=NULL,$path=NULL)
+    // GET /v1/Account/Container?format=json
+    //
+    public function get_objects($cname, $limit = 0, $marker = null, $prefix = null, $path = null)
     {
         if (!$cname) {
-            $this->error_str = "Container name not set.";
-            return array(0, $this->error_str, array());
+            $this->error_str = 'Container name not set.';
+
+            return [0, $this->error_str, []];
         }
 
-        $url_path = $this->_make_path("STORAGE", $cname);
+        $url_path = $this->_make_path('STORAGE', $cname);
 
         $limit = intval($limit);
-        $params = array();
-        $params[] = "format=json";
+        $params = [];
+        $params[] = 'format=json';
         if ($limit > 0) {
             $params[] = "limit=$limit";
         }
         if ($marker) {
-            $params[] = "marker=".rawurlencode($marker);
+            $params[] = 'marker='.rawurlencode($marker);
         }
         if ($prefix) {
-            $params[] = "prefix=".rawurlencode($prefix);
+            $params[] = 'prefix='.rawurlencode($prefix);
         }
         if ($path) {
-            $params[] = "path=".rawurlencode($path);
+            $params[] = 'path='.rawurlencode($path);
         }
         if (!empty($params)) {
-            $url_path .= "?" . implode("&", $params);
+            $url_path .= '?'.implode('&', $params);
         }
- 
-        $conn_type = "GET_CALL";
-        $this->_write_callback_type = "OBJECT_STRING";
-        $return_code = $this->_send_request($conn_type,$url_path);
+
+        $conn_type = 'GET_CALL';
+        $this->_write_callback_type = 'OBJECT_STRING';
+        $return_code = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, []];
         }
         if ($return_code == 204) {
-            $this->error_str = "Container has no Objects.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Container has no Objects.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 404) {
-            $this->error_str = "Container has no Objects.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Container has no Objects.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 200) {
-            $json_body = json_decode($this->_obj_write_string, True);
-            return array($return_code,$this->response_reason, $json_body);
+            $json_body = json_decode($this->_obj_write_string, true);
+
+            return [$return_code, $this->response_reason, $json_body];
         }
         $this->error_str = "Unexpected HTTP response code: $return_code";
-        return array(0,$this->error_str,array());
+
+        return [0, $this->error_str, []];
     }
 
-
-    # HEAD /v1/Account/Container
-    #
-    function head_container($container_name)
+    // HEAD /v1/Account/Container
+    //
+    public function head_container($container_name)
     {
+        if ($container_name == '') {
+            $this->error_str = 'Container name not set.';
 
-        if ($container_name == "") {
-            $this->error_str = "Container name not set.";
-            return False;
+            return false;
         }
-        
-        if ($container_name != "0" and !isset($container_name)) {
-            $this->error_str = "Container name not set.";
-            return False;
-        }
-    
-        $conn_type = "HEAD";
 
-        $url_path = $this->_make_path("STORAGE", $container_name);
-        $return_code = $this->_send_request($conn_type,$url_path);
+        if ($container_name != '0' and !isset($container_name)) {
+            $this->error_str = 'Container name not set.';
+
+            return false;
+        }
+
+        $conn_type = 'HEAD';
+
+        $url_path = $this->_make_path('STORAGE', $container_name);
+        $return_code = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            array(0,$this->error_str,0,0);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+            [0, $this->error_str, 0, 0];
         }
         if ($return_code == 404) {
-            return array($return_code,"Container not found.",0,0);
+            return [$return_code, 'Container not found.', 0, 0];
         }
         if ($return_code == 204 || $return_code == 200) {
-            return array($return_code,$this->response_reason,
-                $this->_container_object_count, $this->_container_bytes_used);
+            return [$return_code, $this->response_reason,
+                $this->_container_object_count, $this->_container_bytes_used, ];
         }
-        return array($return_code,$this->response_reason,0,0);
+
+        return [$return_code, $this->response_reason, 0, 0];
     }
 
-    # GET /v1/Account/Container/Object
-    #
-    function get_object_to_string(&$obj, $hdrs=array())
+    // GET /v1/Account/Container/Object
+    //
+    public function get_object_to_string(&$obj, $hdrs = [])
     {
-        if (!is_object($obj) || get_class($obj) != "CF_Object") {
+        if (!is_object($obj) || get_class($obj) != 'CF_Object') {
             throw new SyntaxException(
-                "Method argument is not a valid CF_Object.");
+                'Method argument is not a valid CF_Object.');
         }
 
-        $conn_type = "GET_CALL";
+        $conn_type = 'GET_CALL';
 
-        $url_path = $this->_make_path("STORAGE", $obj->container->name,$obj->name);
-        $this->_write_callback_type = "OBJECT_STRING";
-        $return_code = $this->_send_request($conn_type,$url_path,$hdrs);
+        $url_path = $this->_make_path('STORAGE', $obj->container->name, $obj->name);
+        $this->_write_callback_type = 'OBJECT_STRING';
+        $return_code = $this->_send_request($conn_type, $url_path, $hdrs);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array($return_code0,$this->error_str,NULL);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [$return_code0, $this->error_str, null];
         }
         if ($return_code == 404) {
-            $this->error_str = "Object not found.";
-            return array($return_code0,$this->error_str,NULL);
+            $this->error_str = 'Object not found.';
+
+            return [$return_code0, $this->error_str, null];
         }
         if (($return_code < 200) || ($return_code > 299
                 && $return_code != 412 && $return_code != 304)) {
             $this->error_str = "Unexpected HTTP return code: $return_code";
-            return array($return_code,$this->error_str,NULL);
+
+            return [$return_code, $this->error_str, null];
         }
-        return array($return_code,$this->response_reason, $this->_obj_write_string);
+
+        return [$return_code, $this->response_reason, $this->_obj_write_string];
     }
 
-    # GET /v1/Account/Container/Object
-    #
-    function get_object_to_stream(&$obj, &$resource=NULL, $hdrs=array())
+    // GET /v1/Account/Container/Object
+    //
+    public function get_object_to_stream(&$obj, &$resource = null, $hdrs = [])
     {
-        if (!is_object($obj) || get_class($obj) != "CF_Object") {
+        if (!is_object($obj) || get_class($obj) != 'CF_Object') {
             throw new SyntaxException(
-                "Method argument is not a valid CF_Object.");
+                'Method argument is not a valid CF_Object.');
         }
         if (!is_resource($resource)) {
             throw new SyntaxException(
-                "Resource argument not a valid PHP resource.");
+                'Resource argument not a valid PHP resource.');
         }
 
-        $conn_type = "GET_CALL";
+        $conn_type = 'GET_CALL';
 
-        $url_path = $this->_make_path("STORAGE", $obj->container->name,$obj->name);
+        $url_path = $this->_make_path('STORAGE', $obj->container->name, $obj->name);
         $this->_obj_write_resource = $resource;
-        $this->_write_callback_type = "OBJECT_STREAM";
-        $return_code = $this->_send_request($conn_type,$url_path,$hdrs);
+        $this->_write_callback_type = 'OBJECT_STREAM';
+        $return_code = $this->_send_request($conn_type, $url_path, $hdrs);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array($return_code,$this->error_str);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [$return_code, $this->error_str];
         }
         if ($return_code == 404) {
-            $this->error_str = "Object not found.";
-            return array($return_code,$this->error_str);
+            $this->error_str = 'Object not found.';
+
+            return [$return_code, $this->error_str];
         }
         if (($return_code < 200) || ($return_code > 299
                 && $return_code != 412 && $return_code != 304)) {
             $this->error_str = "Unexpected HTTP return code: $return_code";
-            return array($return_code,$this->error_str);
+
+            return [$return_code, $this->error_str];
         }
-        return array($return_code,$this->response_reason);
+
+        return [$return_code, $this->response_reason];
     }
 
-    # PUT /v1/Account/Container/Object
-    #
-    function put_object(&$obj, &$fp)
+    // PUT /v1/Account/Container/Object
+    //
+    public function put_object(&$obj, &$fp)
     {
-        if (!is_object($obj) || get_class($obj) != "CF_Object") {
+        if (!is_object($obj) || get_class($obj) != 'CF_Object') {
             throw new SyntaxException(
-                "Method argument is not a valid CF_Object.");
+                'Method argument is not a valid CF_Object.');
         }
         if (!is_resource($fp)) {
             throw new SyntaxException(
-                "File pointer argument is not a valid resource.");
+                'File pointer argument is not a valid resource.');
         }
 
-        $conn_type = "PUT_OBJ";
-        $url_path = $this->_make_path("STORAGE", $obj->container->name,$obj->name);
+        $conn_type = 'PUT_OBJ';
+        $url_path = $this->_make_path('STORAGE', $obj->container->name, $obj->name);
 
         $hdrs = $this->_metadata_headers($obj);
 
         $etag = $obj->getETag();
         if (isset($etag)) {
-            $hdrs[] = "ETag: " . $etag;
+            $hdrs[] = 'ETag: '.$etag;
         }
         if (!$obj->content_type) {
-            $hdrs[] = "Content-Type: application/octet-stream";
+            $hdrs[] = 'Content-Type: application/octet-stream';
         } else {
-            $hdrs[] = "Content-Type: " . $obj->content_type;
+            $hdrs[] = 'Content-Type: '.$obj->content_type;
         }
 
         $this->_init($conn_type);
         curl_setopt($this->connections[$conn_type],
                 CURLOPT_INFILE, $fp);
         if (!$obj->content_length) {
-            # We don''t know the Content-Length, so assumed "chunked" PUT
-            #
-            curl_setopt($this->connections[$conn_type], CURLOPT_UPLOAD, True);
+            // We don''t know the Content-Length, so assumed "chunked" PUT
+            //
+            curl_setopt($this->connections[$conn_type], CURLOPT_UPLOAD, true);
             $hdrs[] = 'Transfer-Encoding: chunked';
         } else {
-            # We know the Content-Length, so use regular transfer
-            #
+            // We know the Content-Length, so use regular transfer
+            //
             curl_setopt($this->connections[$conn_type],
                     CURLOPT_INFILESIZE, $obj->content_length);
         }
-        $return_code = $this->_send_request($conn_type,$url_path,$hdrs);
+        $return_code = $this->_send_request($conn_type, $url_path, $hdrs);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,NULL);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, null];
         }
         if ($return_code == 412) {
-            $this->error_str = "Missing Content-Type header";
-            return array($return_code,$this->error_str,NULL);
+            $this->error_str = 'Missing Content-Type header';
+
+            return [$return_code, $this->error_str, null];
         }
         if ($return_code == 422) {
-            $this->error_str = "Derived and computed checksums do not match.";
-            return array($return_code,$this->error_str,NULL);
+            $this->error_str = 'Derived and computed checksums do not match.';
+
+            return [$return_code, $this->error_str, null];
         }
         if ($return_code != 201) {
             $this->error_str = "Unexpected HTTP return code: $return_code";
-            return array($return_code,$this->error_str,NULL);
+
+            return [$return_code, $this->error_str, null];
         }
-        return array($return_code,$this->response_reason,$this->_obj_etag);
+
+        return [$return_code, $this->response_reason, $this->_obj_etag];
     }
 
-    # POST /v1/Account/Container/Object
-    #
-    function update_object(&$obj)
+    // POST /v1/Account/Container/Object
+    //
+    public function update_object(&$obj)
     {
-        if (!is_object($obj) || get_class($obj) != "CF_Object") {
+        if (!is_object($obj) || get_class($obj) != 'CF_Object') {
             throw new SyntaxException(
-                "Method argument is not a valid CF_Object.");
+                'Method argument is not a valid CF_Object.');
         }
 
         if (!is_array($obj->metadata) || empty($obj->metadata)) {
-            $this->error_str = "Metadata array is empty.";
+            $this->error_str = 'Metadata array is empty.';
+
             return 0;
         }
 
-        $url_path = $this->_make_path("STORAGE", $obj->container->name,$obj->name);
+        $url_path = $this->_make_path('STORAGE', $obj->container->name, $obj->name);
 
         $hdrs = $this->_metadata_headers($obj);
-        $return_code = $this->_send_request("DEL_POST",$url_path,$hdrs,"POST");
+        $return_code = $this->_send_request('DEL_POST', $url_path, $hdrs, 'POST');
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
             return 0;
         }
         if ($return_code == 404) {
-            $this->error_str = "Account, Container, or Object not found.";
+            $this->error_str = 'Account, Container, or Object not found.';
         }
         if ($return_code != 202) {
             $this->error_str = "Unexpected HTTP return code: $return_code";
         }
+
         return $return_code;
     }
 
-    # HEAD /v1/Account/Container/Object
-    #
-    function head_object(&$obj)
+    // HEAD /v1/Account/Container/Object
+    //
+    public function head_object(&$obj)
     {
-        if (!is_object($obj) || get_class($obj) != "CF_Object") {
+        if (!is_object($obj) || get_class($obj) != 'CF_Object') {
             throw new SyntaxException(
-                "Method argument is not a valid CF_Object.");
+                'Method argument is not a valid CF_Object.');
         }
 
-        $conn_type = "HEAD";
+        $conn_type = 'HEAD';
 
-        $url_path = $this->_make_path("STORAGE", $obj->container->name,$obj->name);
-        $return_code = $this->_send_request($conn_type,$url_path);
+        $url_path = $this->_make_path('STORAGE', $obj->container->name, $obj->name);
+        $return_code = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0, $this->error_str." ".$this->response_reason,
-                NULL, NULL, NULL, NULL, array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str.' '.$this->response_reason,
+                null, null, null, null, [], ];
         }
 
         if ($return_code == 404) {
-            return array($return_code, $this->response_reason,
-                NULL, NULL, NULL, NULL, array());
+            return [$return_code, $this->response_reason,
+                null, null, null, null, [], ];
         }
         if ($return_code == 204 || $return_code == 200) {
-            return array($return_code,$this->response_reason,
+            return [$return_code, $this->response_reason,
                 $this->_obj_etag,
                 $this->_obj_last_modified,
                 $this->_obj_content_type,
                 $this->_obj_content_length,
-                $this->_obj_metadata);
+                $this->_obj_metadata, ];
         }
         $this->error_str = "Unexpected HTTP return code: $return_code";
-        return array($return_code, $this->error_str." ".$this->response_reason,
-                NULL, NULL, NULL, NULL, array());
+
+        return [$return_code, $this->error_str.' '.$this->response_reason,
+                null, null, null, null, [], ];
     }
 
-    # DELETE /v1/Account/Container/Object
-    #
-    function delete_object($container_name, $object_name)
+    // DELETE /v1/Account/Container/Object
+    //
+    public function delete_object($container_name, $object_name)
     {
-        if ($container_name == "") {
-            $this->error_str = "Container name not set.";
-            return 0;
-        }
-        
-        if ($container_name != "0" and !isset($container_name)) {
-            $this->error_str = "Container name not set.";
-            return 0;
-        }
-        
-        if (!$object_name) {
-            $this->error_str = "Object name not set.";
+        if ($container_name == '') {
+            $this->error_str = 'Container name not set.';
+
             return 0;
         }
 
-        $url_path = $this->_make_path("STORAGE", $container_name,$object_name);
-        $return_code = $this->_send_request("DEL_POST",$url_path,NULL,"DELETE");
+        if ($container_name != '0' and !isset($container_name)) {
+            $this->error_str = 'Container name not set.';
+
+            return 0;
+        }
+
+        if (!$object_name) {
+            $this->error_str = 'Object name not set.';
+
+            return 0;
+        }
+
+        $url_path = $this->_make_path('STORAGE', $container_name, $object_name);
+        $return_code = $this->_send_request('DEL_POST', $url_path, null, 'DELETE');
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
             return 0;
         }
         if ($return_code == 404) {
-            $this->error_str = "Specified container did not exist to delete.";
+            $this->error_str = 'Specified container did not exist to delete.';
         }
         if ($return_code != 204) {
             $this->error_str = "Unexpected HTTP return code: $return_code.";
         }
+
         return $return_code;
     }
 
-    function get_error()
+    public function get_error()
     {
         return $this->error_str;
     }
 
-    function setDebug($bool)
+    public function setDebug($bool)
     {
         $this->dbug = $bool;
         foreach ($this->connections as $k => $v) {
@@ -951,25 +1021,25 @@ class CF_Http
         }
     }
 
-    function getCDNMUrl()
+    public function getCDNMUrl()
     {
         return $this->cdnm_url;
     }
 
-    function getStorageUrl()
+    public function getStorageUrl()
     {
         return $this->storage_url;
     }
 
-    function getAuthToken()
+    public function getAuthToken()
     {
         return $this->auth_token;
     }
 
-    function setCFAuth($cfs_auth, $servicenet=False)
+    public function setCFAuth($cfs_auth, $servicenet = false)
     {
         if ($servicenet) {
-            $this->storage_url = "https://snet-" . substr($cfs_auth->storage_url, 8);
+            $this->storage_url = 'https://snet-'.substr($cfs_auth->storage_url, 8);
         } else {
             $this->storage_url = $cfs_auth->storage_url;
         }
@@ -977,12 +1047,12 @@ class CF_Http
         $this->cdnm_url = $cfs_auth->cdnm_url;
     }
 
-    function setReadProgressFunc($func_name)
+    public function setReadProgressFunc($func_name)
     {
         $this->_user_read_progress_callback_func = $func_name;
     }
 
-    function setWriteProgressFunc($func_name)
+    public function setWriteProgressFunc($func_name)
     {
         $this->_user_write_progress_callback_func = $func_name;
     }
@@ -997,95 +1067,111 @@ class CF_Http
             $this->response_reason = $matches[2];
         }
         if (stripos($header, CDN_ENABLED) === 0) {
-            $val = trim(substr($header, strlen(CDN_ENABLED)+1));
-            if (strtolower($val) == "true") {
-                $this->_cdn_enabled = True;
-            } elseif (strtolower($val) == "false") {
-                $this->_cdn_enabled = False;
+            $val = trim(substr($header, strlen(CDN_ENABLED) + 1));
+            if (strtolower($val) == 'true') {
+                $this->_cdn_enabled = true;
+            } elseif (strtolower($val) == 'false') {
+                $this->_cdn_enabled = false;
             } else {
-                $this->_cdn_enabled = NULL;
+                $this->_cdn_enabled = null;
             }
+
             return strlen($header);
         }
         if (stripos($header, CDN_URI) === 0) {
-            $this->_cdn_uri = trim(substr($header, strlen(CDN_URI)+1));
+            $this->_cdn_uri = trim(substr($header, strlen(CDN_URI) + 1));
+
             return strlen($header);
         }
         if (stripos($header, CDN_TTL) === 0) {
-            $this->_cdn_ttl = trim(substr($header, strlen(CDN_TTL)+1))+0;
+            $this->_cdn_ttl = trim(substr($header, strlen(CDN_TTL) + 1)) + 0;
+
             return strlen($header);
         }
         if (stripos($header, CDN_LOG_RETENTION) === 0) {
             $this->_cdn_log_retention =
-                trim(substr($header, strlen(CDN_LOG_RETENTION)+1)) == "True" ? True : False;
+                trim(substr($header, strlen(CDN_LOG_RETENTION) + 1)) == 'True' ? true : false;
+
             return strlen($header);
         }
 
         if (stripos($header, CDN_ACL_USER_AGENT) === 0) {
             $this->_cdn_acl_user_agent =
-                trim(substr($header, strlen(CDN_ACL_USER_AGENT)+1));
+                trim(substr($header, strlen(CDN_ACL_USER_AGENT) + 1));
+
             return strlen($header);
         }
 
         if (stripos($header, CDN_ACL_REFERRER) === 0) {
             $this->_cdn_acl_referrer =
-                trim(substr($header, strlen(CDN_ACL_REFERRER)+1));
+                trim(substr($header, strlen(CDN_ACL_REFERRER) + 1));
+
             return strlen($header);
         }
-        
+
         if (stripos($header, ACCOUNT_CONTAINER_COUNT) === 0) {
             $this->_account_container_count = (float) trim(substr($header,
-                    strlen(ACCOUNT_CONTAINER_COUNT)+1))+0;
+                    strlen(ACCOUNT_CONTAINER_COUNT) + 1)) + 0;
+
             return strlen($header);
         }
         if (stripos($header, ACCOUNT_BYTES_USED) === 0) {
             $this->_account_bytes_used = (float) trim(substr($header,
-                    strlen(ACCOUNT_BYTES_USED)+1))+0;
+                    strlen(ACCOUNT_BYTES_USED) + 1)) + 0;
+
             return strlen($header);
         }
         if (stripos($header, CONTAINER_OBJ_COUNT) === 0) {
             $this->_container_object_count = (float) trim(substr($header,
-                    strlen(CONTAINER_OBJ_COUNT)+1))+0;
+                    strlen(CONTAINER_OBJ_COUNT) + 1)) + 0;
+
             return strlen($header);
         }
         if (stripos($header, CONTAINER_BYTES_USED) === 0) {
             $this->_container_bytes_used = (float) trim(substr($header,
-                    strlen(CONTAINER_BYTES_USED)+1))+0;
+                    strlen(CONTAINER_BYTES_USED) + 1)) + 0;
+
             return strlen($header);
         }
         if (stripos($header, METADATA_HEADER) === 0) {
-            # $header => X-Object-Meta-Foo: bar baz
+            // $header => X-Object-Meta-Foo: bar baz
             $temp = substr($header, strlen(METADATA_HEADER));
-            # $temp => Foo: bar baz
-            $parts = explode(":", $temp);
-            # $parts[0] => Foo
-            $val = substr(strstr($temp, ":"), 1);
-            # $val => bar baz
+            // $temp => Foo: bar baz
+            $parts = explode(':', $temp);
+            // $parts[0] => Foo
+            $val = substr(strstr($temp, ':'), 1);
+            // $val => bar baz
             $this->_obj_metadata[$parts[0]] = trim($val);
+
             return strlen($header);
         }
-        if (stripos($header, "ETag:") === 0) {
-            # $header => ETag: abc123def456...
-            $val = substr(strstr($header, ":"), 1);
-            # $val => abc123def456...
+        if (stripos($header, 'ETag:') === 0) {
+            // $header => ETag: abc123def456...
+            $val = substr(strstr($header, ':'), 1);
+            // $val => abc123def456...
             $this->_obj_etag = trim($val);
+
             return strlen($header);
         }
-        if (stripos($header, "Last-Modified:") === 0) {
-            $val = substr(strstr($header, ":"), 1);
+        if (stripos($header, 'Last-Modified:') === 0) {
+            $val = substr(strstr($header, ':'), 1);
             $this->_obj_last_modified = trim($val);
+
             return strlen($header);
         }
-        if (stripos($header, "Content-Type:") === 0) {
-            $val = substr(strstr($header, ":"), 1);
+        if (stripos($header, 'Content-Type:') === 0) {
+            $val = substr(strstr($header, ':'), 1);
             $this->_obj_content_type = trim($val);
+
             return strlen($header);
         }
-        if (stripos($header, "Content-Length:") === 0) {
-            $val = substr(strstr($header, ":"), 1);
-            $this->_obj_content_length = (float) trim($val)+0;
+        if (stripos($header, 'Content-Length:') === 0) {
+            $val = substr(strstr($header, ':'), 1);
+            $this->_obj_content_length = (float) trim($val) + 0;
+
             return strlen($header);
         }
+
         return strlen($header);
     }
 
@@ -1096,6 +1182,7 @@ class CF_Http
         if (isset($this->_user_write_progress_callback_func)) {
             call_user_func($this->_user_write_progress_callback_func, $len);
         }
+
         return $data;
     }
 
@@ -1103,21 +1190,22 @@ class CF_Http
     {
         $dlen = strlen($data);
         switch ($this->_write_callback_type) {
-        case "TEXT_LIST":
-	     $this->_return_list = $this->_return_list . $data;
-	     //= explode("\n",$data); # keep tab,space
-	     //his->_text_list[] = rtrim($data,"\n\r\x0B"); # keep tab,space
+        case 'TEXT_LIST':
+         $this->_return_list = $this->_return_list.$data;
+         //= explode("\n",$data); # keep tab,space
+         //his->_text_list[] = rtrim($data,"\n\r\x0B"); # keep tab,space
             break;
-        case "OBJECT_STREAM":
+        case 'OBJECT_STREAM':
             fwrite($this->_obj_write_resource, $data, $dlen);
             break;
-        case "OBJECT_STRING":
+        case 'OBJECT_STRING':
             $this->_obj_write_string .= $data;
             break;
         }
         if (isset($this->_user_read_progress_callback_func)) {
             call_user_func($this->_user_read_progress_callback_func, $dlen);
         }
+
         return $dlen;
     }
 
@@ -1131,59 +1219,62 @@ class CF_Http
             $this->response_reason = $matches[2];
         }
         if (stripos($header, STORAGE_URL) === 0) {
-            $this->storage_url = trim(substr($header, strlen(STORAGE_URL)+1));
+            $this->storage_url = trim(substr($header, strlen(STORAGE_URL) + 1));
         }
         if (stripos($header, CDNM_URL) === 0) {
-            $this->cdnm_url = trim(substr($header, strlen(CDNM_URL)+1));
+            $this->cdnm_url = trim(substr($header, strlen(CDNM_URL) + 1));
         }
         if (stripos($header, AUTH_TOKEN) === 0) {
-            $this->auth_token = trim(substr($header, strlen(AUTH_TOKEN)+1));
+            $this->auth_token = trim(substr($header, strlen(AUTH_TOKEN) + 1));
         }
         if (stripos($header, AUTH_TOKEN_LEGACY) === 0) {
-            $this->auth_token = trim(substr($header,strlen(AUTH_TOKEN_LEGACY)+1));
+            $this->auth_token = trim(substr($header, strlen(AUTH_TOKEN_LEGACY) + 1));
         }
+
         return strlen($header);
     }
 
-    private function _make_headers($hdrs=NULL)
+    private function _make_headers($hdrs = null)
     {
-        $new_headers = array();
-        $has_stoken = False;
-        $has_uagent = False;
+        $new_headers = [];
+        $has_stoken = false;
+        $has_uagent = false;
         if (is_array($hdrs)) {
             foreach ($hdrs as $h => $v) {
                 if (is_int($h)) {
-                    $parts = explode(":", $v);
+                    $parts = explode(':', $v);
                     $header = $parts[0];
-                    $value = trim(substr(strstr($v, ":"), 1));
+                    $value = trim(substr(strstr($v, ':'), 1));
                 } else {
                     $header = $h;
                     $value = trim($v);
                 }
 
                 if (stripos($header, AUTH_TOKEN) === 0) {
-                    $has_stoken = True;
+                    $has_stoken = true;
                 }
-                if (stripos($header, "user-agent") === 0) {
-                    $has_uagent = True;
+                if (stripos($header, 'user-agent') === 0) {
+                    $has_uagent = true;
                 }
-                $new_headers[] = $header . ": " . $value;
+                $new_headers[] = $header.': '.$value;
             }
         }
         if (!$has_stoken) {
-            $new_headers[] = AUTH_TOKEN . ": " . $this->auth_token;
+            $new_headers[] = AUTH_TOKEN.': '.$this->auth_token;
         }
         if (!$has_uagent) {
-            $new_headers[] = "User-Agent: " . USER_AGENT;
+            $new_headers[] = 'User-Agent: '.USER_AGENT;
         }
+
         return $new_headers;
     }
 
-    private function _init($conn_type, $force_new=False)
+    private function _init($conn_type, $force_new = false)
     {
         if (!array_key_exists($conn_type, $this->connections)) {
-            $this->error_str = "Invalid CURL_XXX connection type";
-            return False;
+            $this->error_str = 'Invalid CURL_XXX connection type';
+
+            return false;
         }
 
         if (is_null($this->connections[$conn_type]) || $force_new) {
@@ -1192,132 +1283,140 @@ class CF_Http
             return;
         }
 
-        if ($this->dbug) { curl_setopt($ch, CURLOPT_VERBOSE, 1); }
+        if ($this->dbug) {
+            curl_setopt($ch, CURLOPT_VERBOSE, 1);
+        }
 
         if (!is_null($this->cabundle_path)) {
-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, True);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
             curl_setopt($ch, CURLOPT_CAINFO, $this->cabundle_path);
         }
-	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, True);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
         curl_setopt($ch, CURLOPT_MAXREDIRS, 4);
         curl_setopt($ch, CURLOPT_HEADER, 0);
-        curl_setopt($ch, CURLOPT_HEADERFUNCTION, array(&$this, '_header_cb'));
+        curl_setopt($ch, CURLOPT_HEADERFUNCTION, [&$this, '_header_cb']);
 
-        if ($conn_type == "GET_CALL") {
-            curl_setopt($ch, CURLOPT_WRITEFUNCTION, array(&$this, '_write_cb'));
+        if ($conn_type == 'GET_CALL') {
+            curl_setopt($ch, CURLOPT_WRITEFUNCTION, [&$this, '_write_cb']);
         }
 
-        if ($conn_type == "PUT_OBJ") {
+        if ($conn_type == 'PUT_OBJ') {
             curl_setopt($ch, CURLOPT_PUT, 1);
-            curl_setopt($ch, CURLOPT_READFUNCTION, array(&$this, '_read_cb'));
-	    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($ch, CURLOPT_READFUNCTION, [&$this, '_read_cb']);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         }
-        if ($conn_type == "HEAD") {
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "HEAD");
+        if ($conn_type == 'HEAD') {
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD');
             curl_setopt($ch, CURLOPT_NOBODY, 1);
         }
-        if ($conn_type == "PUT_CONT") {
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+        if ($conn_type == 'PUT_CONT') {
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
             curl_setopt($ch, CURLOPT_INFILESIZE, 0);
-	    curl_setopt($ch, CURLOPT_NOBODY, 1);
+            curl_setopt($ch, CURLOPT_NOBODY, 1);
+        }
+        if ($conn_type == 'DEL_POST') {
+            curl_setopt($ch, CURLOPT_NOBODY, 1);
         }
-        if ($conn_type == "DEL_POST") {
-        	curl_setopt($ch, CURLOPT_NOBODY, 1);
-	}
         $this->connections[$conn_type] = $ch;
+
         return;
     }
 
     private function _reset_callback_vars()
     {
-        $this->_text_list = array();
-	$this->_return_list = NULL;
+        $this->_text_list = [];
+        $this->_return_list = null;
         $this->_account_container_count = 0;
         $this->_account_bytes_used = 0;
         $this->_container_object_count = 0;
         $this->_container_bytes_used = 0;
-        $this->_obj_etag = NULL;
-        $this->_obj_last_modified = NULL;
-        $this->_obj_content_type = NULL;
-        $this->_obj_content_length = NULL;
-        $this->_obj_metadata = array();
-        $this->_obj_write_string = "";
-        $this->_cdn_enabled = NULL;
-        $this->_cdn_uri = NULL;
-        $this->_cdn_ttl = NULL;
+        $this->_obj_etag = null;
+        $this->_obj_last_modified = null;
+        $this->_obj_content_type = null;
+        $this->_obj_content_length = null;
+        $this->_obj_metadata = [];
+        $this->_obj_write_string = '';
+        $this->_cdn_enabled = null;
+        $this->_cdn_uri = null;
+        $this->_cdn_ttl = null;
         $this->response_status = 0;
-        $this->response_reason = "";
+        $this->response_reason = '';
     }
 
-    private function _make_path($t="STORAGE",$c=NULL,$o=NULL)
+    private function _make_path($t = 'STORAGE', $c = null, $o = null)
     {
-        $path = array();
+        $path = [];
         switch ($t) {
-        case "STORAGE":
+        case 'STORAGE':
             $path[] = $this->storage_url; break;
-        case "CDN":
+        case 'CDN':
             $path[] = $this->cdnm_url; break;
         }
-        if ($c == "0")
+        if ($c == '0') {
             $path[] = rawurlencode($c);
+        }
 
         if ($c) {
             $path[] = rawurlencode($c);
         }
         if ($o) {
-            # mimic Python''s urllib.quote() feature of a "safe" '/' character
-            #
-            $path[] = str_replace("%2F","/",rawurlencode($o));
+            // mimic Python''s urllib.quote() feature of a "safe" '/' character
+            //
+            $path[] = str_replace('%2F', '/', rawurlencode($o));
         }
-        return implode("/",$path);
+
+        return implode('/', $path);
     }
 
     private function _metadata_headers(&$obj)
     {
-        $hdrs = array();
+        $hdrs = [];
         foreach ($obj->metadata as $k => $v) {
-            if (strpos($k,":") !== False) {
+            if (strpos($k, ':') !== false) {
                 throw new SyntaxException(
                     "Metadata keys cannot contain a ':' character.");
             }
             $k = trim($k);
-            $key = sprintf("%s%s", METADATA_HEADER, $k);
+            $key = sprintf('%s%s', METADATA_HEADER, $k);
             if (!array_key_exists($key, $hdrs)) {
                 if (strlen($k) > 128 || strlen($v) > 256) {
-                    $this->error_str = "Metadata key or value exceeds ";
+                    $this->error_str = 'Metadata key or value exceeds ';
                     $this->error_str .= "maximum length: ($k: $v)";
+
                     return 0;
                 }
-                $hdrs[] = sprintf("%s%s: %s", METADATA_HEADER, $k, trim($v));
+                $hdrs[] = sprintf('%s%s: %s', METADATA_HEADER, $k, trim($v));
             }
         }
+
         return $hdrs;
     }
 
-    private function _send_request($conn_type, $url_path, $hdrs=NULL, $method="GET", $force_new=False)
+    private function _send_request($conn_type, $url_path, $hdrs = null, $method = 'GET', $force_new = false)
     {
         $this->_init($conn_type, $force_new);
         $this->_reset_callback_vars();
         $headers = $this->_make_headers($hdrs);
 
-        if (gettype($this->connections[$conn_type]) == "unknown type")
-            throw new ConnectionNotOpenException (
-                "Connection is not open."
+        if (gettype($this->connections[$conn_type]) == 'unknown type') {
+            throw new ConnectionNotOpenException(
+                'Connection is not open.'
                 );
-        
+        }
+
         switch ($method) {
-        case "DELETE":
+        case 'DELETE':
             curl_setopt($this->connections[$conn_type],
-                CURLOPT_CUSTOMREQUEST, "DELETE");
+                CURLOPT_CUSTOMREQUEST, 'DELETE');
             break;
-        case "POST":
+        case 'POST':
             curl_setopt($this->connections[$conn_type],
-                CURLOPT_CUSTOMREQUEST, "POST");
+                CURLOPT_CUSTOMREQUEST, 'POST');
         default:
             break;
-        }        
+        }
 
         curl_setopt($this->connections[$conn_type],
                     CURLOPT_HTTPHEADER, $headers);
@@ -1326,29 +1425,32 @@ class CF_Http
             CURLOPT_URL, $url_path);
 
         if (!curl_exec($this->connections[$conn_type]) && curl_errno($this->connections[$conn_type]) !== 0) {
-            $this->error_str = "(curl error: "
-                . curl_errno($this->connections[$conn_type]) . ") ";
+            $this->error_str = '(curl error: '
+                .curl_errno($this->connections[$conn_type]).') ';
             $this->error_str .= curl_error($this->connections[$conn_type]);
-            return False;
+
+            return false;
         }
+
         return curl_getinfo($this->connections[$conn_type], CURLINFO_HTTP_CODE);
     }
-    
-    function close()
+
+    public function close()
     {
         foreach ($this->connections as $cnx) {
             if (isset($cnx)) {
                 curl_close($cnx);
-                $this->connections[$cnx] = NULL;
+                $this->connections[$cnx] = null;
             }
         }
     }
+
     private function create_array()
     {
-	$this->_text_list = explode("\n",rtrim($this->_return_list,"\n\x0B"));
-	return True;
-    }
+        $this->_text_list = explode("\n", rtrim($this->_return_list, "\n\x0B"));
 
+        return true;
+    }
 }
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
@@ -1359,5 +1461,4 @@ class CF_Http
  * c-basic-offset: 4
  * c-hanging-comment-ender-p: nil
  * End:
- */
-?>
+ */;
diff --git a/public/filemanager/connectors/php/plugins/rsc/filemanager.rsc.class.php b/public/filemanager/connectors/php/plugins/rsc/filemanager.rsc.class.php
index c942360d8..1d10a2c50 100644
--- a/public/filemanager/connectors/php/plugins/rsc/filemanager.rsc.class.php
+++ b/public/filemanager/connectors/php/plugins/rsc/filemanager.rsc.class.php
@@ -1,6 +1,6 @@
 <?php
 /**
-*	Filemanager PHP RSC plugin class
+*	Filemanager PHP RSC plugin class.
 *
 *	filemanager.rsc.class.php
 *	class for the filemanager.php connector which utilizes the Rackspace Cloud Files API
@@ -12,373 +12,400 @@
 *	@author		Simon Georget <simon (at) linea21 (dot) com>
 *	@copyright	Authors
 */
+class FilemanagerRSC extends Filemanager
+{
+    public function __construct($config)
+    {
+        $return = parent::__construct($config);
+        require_once 'cloudfiles.php';
+        $auth = new CF_Authentication($this->config['rsc-username'], $this->config['rsc-apikey']);
+        $auth->authenticate();
+        $this->conn = new CF_Connection($auth);
+        if ($this->config['rsc-ssl_use_cabundle']) {
+            $this->conn->ssl_use_cabundle();
+        }
 
-class FilemanagerRSC extends Filemanager {
-	
-	public function __construct($config) {
-		$return = parent::__construct($config);
-		require_once('cloudfiles.php');
-		$auth = new CF_Authentication($this->config['rsc-username'], $this->config['rsc-apikey']);
-		$auth->authenticate();
-		$this->conn = new CF_Connection($auth);
-		if ($this->config['rsc-ssl_use_cabundle']) {
-			$this->conn->ssl_use_cabundle();
-		}
-		return $return;
-	}
-	
-	public function getinfo() {
-		$object = $this->get_object();
-		if (isset($object->name)) {
-			$object = $this->get_file_info($object);
-			return array(
-				'Path' => $object->path,
-				'Filename' => $object->name,
-				'File Type' => $object->filetype,
-				'Preview' => $object->preview,
-				'Properties'=> $object->properties,
-				'Error' => "",
-				'Code' => 0
-				);
-		}
-		
-		$container = $this->get_container();
-		if (isset($container->name)) {
-			return array(
-				'Path' => $container->path,
-				'Filename' => $container->name,
-				'File Type' => 'dir',
-				'Preview' => $this->config['icons']['path'] . $this->config['icons']['directory'],
-				'Properties'=>array(
-					'Date Created'=>null,
-					'Date Modified'=>null,
-					'Height'=>null,
-					'Width'=>null,
-					'Size'=>null
-					),
-				'Error' => "",
-				'Code' => 0
-				);
-		}
-		return array();
-	}
-	
-	public function getfolder() {
-		$container = trim($this->get['path'], '/ ');
-		$containerParts = explode('/', $container);
-		if ($containerParts[0]=='containers') {
-			array_shift($containerParts);
-		}
-		$array = array();
-		if (empty($containerParts) || trim($this->get['path'], '/ ')=='containers') {
-			$containers = $this->conn->list_containers();
-			$containers = array_diff($containers, $this->config['unallowed_dirs']);
-			foreach ( $containers as $container ) {
-				$array['/containers/' . $container . '/'] = array(
-					'Path'=> '/containers/' . $container .'/',
-					'Filename'=> $container,
-					'File Type'=>'dir',
-					'Preview'=> $this->config['icons']['path'] . $this->config['icons']['directory'],
-					'Properties'=>array(
-						'Date Created'=>null,
-						'Date Modified'=>null,
-						'Height'=>null,
-						'Width'=>null,
-						'Size'=>null
-						),
-					'Error'=>"",
-					'Code'=>0
-					);
-			}
-		} else {
-			$container = array_shift($containerParts);
-			$limit = 0;
-			$marker = null; // last record returned from a dataset
-			$prefix = null; // search term (starts with)
-			$path = null; // pseudo-hierarchical containers
-			if (!empty($containerParts)) {
-				$path = implode('/', $containerParts);
-			}
-			$container = $this->conn->get_container($container);
-			//$list = $container->list_objects($limit, $marker,  $prefix, $path);
-			$objects = $container->get_objects($limit, $marker,  $prefix, $path);
-			foreach ( $objects as $object ) {
-				if(!isset($this->params['type']) || (isset($this->params['type']) && strtolower($this->params['type'])=='images' && in_array(strtolower($object->content_type),$this->config['images']))) {
-					if($this->config['upload']['imagesonly']== false || ($this->config['upload']['imagesonly']== true && in_array(strtolower($object->content_type),$this->config['images']))) {
-						$object = $this->get_file_info($object);
-						$array[$object->url] = array(
-							'Path'=> $object->path,
-							'Filename' => $object->name,
-							'File Type' => $object->filetype,
-							'Mime Type' => $object->content_type,
-							'Preview' => $object->preview,
-							'Properties' => $object->properties,
-							'Error' => "",
-							'Code' => 0
-							);
-					}
-				}
-			}
-		}
-		return $array;
-	}
-	
-	public function rename() {
-		// keep old filename, if missing from new
-		$newNameParts = explode('.', $this->get['new']);
-		$newNameExt = $newNameParts[(count($newNameParts)-1)];
-		if (strlen($newNameExt) > 5 || count($newNameParts)==1) {
-			$this->get['new'].='.'.array_pop(explode('.', $this->get['old']));
-		}
-		// get old
-		$object = $this->get_object($this->get['old']);
-		if (!isset($object->container)) {
-			$this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'),$path));
-		}
-		if (in_array($this->get['new'], $object->container->list_objects())) {
-			$this->error(sprintf($this->lang('FILE_ALREADY_EXISTS'),$this->get['new']));
-			return false;
-		}
-		// create to new
-		$new = $object->container->create_object($this->get['new']);
-		$new->content_type = $object->content_type;
-		$data = $object->read();
-		$new->write($data);
-		if (!empty($object->metadata)) {
-			$new->metadata = $object->metadata;
-			$object->sync_metadata(); // save back to RSC
-		}
-		$object->container->delete_object($object->name);
-		$array = array(
-			'Error'=>"",
-			'Code'=>0,
-			'Old Path'=>$object->path,
-			'Old Name'=>$object->name,
-			'New Path'=>$new->path,
-			'New Name'=>$new->name
-			);
-		return $array;
-	}
-	
-	public function delete() {
-		$object = $this->get_object();
-		if (isset($object->name)) {
-			$object->container->delete_object($object->name);
-			return array(
-				'Error'=>"",
-				'Code'=>0,
-				'Path'=>$this->get['path']
-				);
-		}
-		$container = $this->get_container();
-		if (isset($container->name)) {
-			$list = $container->list_objects(5);
-			if (!empty($list)) {
-				$this->error("Unable to Delete Container, it is not empty.");
-				return false;
-			}
-			$this->conn->delete_container($container->name);
-			return array(
-				'Error'=>"",
-				'Code'=>0,
-				'Path'=>$this->get['path']
-				);
-		}
-		$this->error(sprintf($this->lang('INVALID_DIRECTORY_OR_FILE')));
-	}
-	
-	public function add() {
-		$this->setParams();
-		if(!isset($_FILES['newfile']) || !is_uploaded_file($_FILES['newfile']['tmp_name'])) {
-			$this->error(sprintf($this->lang('INVALID_FILE_UPLOAD')),true);
-		}
-		if(($this->config['upload']['size']!=false && is_numeric($this->config['upload']['size'])) && ($_FILES['newfile']['size'] > ($this->config['upload']['size'] * 1024 * 1024))) {
-			$this->error(sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'),$this->config['upload']['size'] . 'Mb'),true);
-		}
-		
-		$size = @getimagesize($_FILES['newfile']['tmp_name']);
-		if($this->config['upload']['imagesonly'] || (isset($this->params['type']) && strtolower($this->params['type'])=='images')) {
-			if(empty($size) || !is_array($size)) {
-				$this->error(sprintf($this->lang('UPLOAD_IMAGES_ONLY')),true);
-			}
-			if(!in_array($size[2], array(1, 2, 3, 7, 8))) {
-				$this->error(sprintf($this->lang('UPLOAD_IMAGES_TYPE_JPEG_GIF_PNG')),true);
-			}
-		}
-		$_FILES['newfile']['name'] = $this->cleanString($_FILES['newfile']['name'],array('.','-'));
-		
-		$container = $this->get_container($this->post['currentpath']);
-		
-		if(!$this->config['upload']['overwrite']) {
-			$list = $container->list_objects();
-			$i = 0;
-			while (in_array($_FILES['newfile']['name'], $list)) {
-				$i++;
-				$parts = explode('.', $_FILES['newfile']['name']);
-				$ext = array_pop($parts);
-				$parts = array_diff($parts, array("copy{$i}", "copy".($i-1)));
-				$parts[] = "copy{$i}";
-				$parts[] = $ext;
-				$_FILES['newfile']['name'] = implode('.', $parts);
-			}
-		}
-		
-		$object = $container->create_object($_FILES['newfile']['name']);
-		$object->load_from_filename($_FILES['newfile']['tmp_name']);
-		// set image details
-		if (is_array($size) && count($size) > 1) {
-			$object->metadata->height = $object->height = $size[1];
-			$object->metadata->width = $object->width = $size[0];
-			$object->sync_metadata(); // save back to RSC
-		}
-		unlink($_FILES['newfile']['tmp_name']);
-		
-		$response = array(
-			'Path'=>$this->post['currentpath'],
-			'Name'=>$_FILES['newfile']['name'],
-			'Error'=>"",
-			'Code'=>0
-			);
-		echo '<textarea>' . json_encode($response) . '</textarea>';
-		die();
-	}
-	
-	public function addfolder() {
-		$container = trim($this->get['path'], '/ ');
-		$containerParts = explode('/', $container);
-		if ($containerParts[0]=='containers') {
-			array_shift($containerParts);
-		}
-		if (!empty($containerParts)) {
-			$this->error(sprintf($this->lang('UNABLE_TO_CREATE_DIRECTORY'),$newdir));
-		}
-		$newdir = $this->cleanString($this->get['name']);
-		$container = $this->conn->create_container($newdir);
-		$container->make_public(86400/2);
-		return array(
-			'Parent' => "/containers/{$container->name}",
-			'Name' => $container->name,
-			'Error'=>"",
-			'Code'=>0
-			);
-	}
-	
-	public function download() {
-		$object = $this->get_object();
-		if (isset($object->name)) {
-			header("Content-type: application/force-download");
-			header('Content-Disposition: inline; filename="' . $object->name . '"');
-			header("Content-Type: " . $doc->content_type);
-			$output = fopen("php://output", "w");
-			$object->stream($output); # stream object content to PHP's output buffer
-			fclose($output);
-			return true;
-		}
-		$this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'),$this->get['path']));
-	}
-	
-	public function preview() {
-		
-		if(isset($this->get['path']) && file_exists($this->doc_root . $this->get['path'])) {
-			header("Content-type: image/" .$ext = pathinfo($this->get['path'], PATHINFO_EXTENSION));
-			header("Content-Transfer-Encoding: Binary");
-			header("Content-length: ".filesize($this->doc_root . $this->get['path']));
-			header('Content-Disposition: inline; filename="' . basename($this->get['path']) . '"');
-			readfile($this->doc_root . $this->get['path']);
-		} else {
-			$this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'),$this->get['path']));
-		}
-	}
-	
-	private function get_container($path=null, $showError=false) {
-		if (empty($path)) {
-			$path = $this->get['path'];
-		}
-		$container = trim($path, '/ ');
-		$containerParts = explode('/', $container);
-		if ($containerParts[0]=='containers') {
-			array_shift($containerParts);
-		}
-		$array = array();
-		if (count($containerParts) > 0) {
-			$container = $this->conn->get_container(array_shift($containerParts));
-			if (isset($container->name)) {
-				$container->path = '/containers/'.$container->name;
-				return $container;
-			}
-		}
-		if ($showError) {
-			$this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'),$path));
-		}
-		return false;
-	}
-	private function get_object($path=null, $showError=false) {
-		if (empty($path)) {
-			$path = $this->get['path'];
-		}
-		$container = trim($path, '/ ');
-		$containerParts = explode('/', $container);
-		if ($containerParts[0]=='containers') {
-			array_shift($containerParts);
-		}
-		$array = array();
-		if (count($containerParts) > 1) {
-			$container = $this->conn->get_container(array_shift($containerParts));
-			$object = $container->get_object(array_shift($containerParts));
-			if (isset($object->name) && isset($object->container->name)) {
-				$object->path = '/containers/'.$object->container->name.'/'.$object->name;
-				return $object;
-			}
-		}
-		if ($showError) {
-			$this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'),$path));
-		}
-		return false;
-	}
-	private function get_file_info($object=null) {
-		if (empty($object) || !is_object($object)) {
-			return null;
-		}
-		// parse into file extension types
-		//$object->filetype = array_pop(explode('/', $object->content_type));
-		$object->filetype = array_pop(explode('.', $object->name));
-		// setup values
-		$object->height = null;
-		$object->width = null;
-		if (isset($object->metadata->height)) {
-			$object->height = $object->metadata->height;
-		}
-		if (isset($object->metadata->width)) {
-			$object->width = $object->metadata->width;
-		}
-		$preview = $this->config['icons']['path'] . $this->config['icons']['default'];
-		if(file_exists($this->root . $this->config['icons']['path'] . strtolower($object->filetype) . '.png')) {
-			$preview = $this->config['icons']['path'] . strtolower($object->filetype) . '.png';
-		}
-		if (in_array(strtolower($object->filetype), $this->config['images'])) {
-			$preview = $object->container->cdn_uri . '/' . $object->name;
-			if (empty($object->height) && empty($object->width) && isset($this->config['rsc-getsize']) && !empty($get['rsc-getsize'])) {
-				list($width, $height, $type, $attr) = getimagesize($this->doc_root . $path);
-				$object->metadata->height = $object->height = $height;
-				$object->metadata->width = $object->width = $width;
-				$object->sync_metadata(); // save back to RSC
-			}
-		}
-		$object->filename = $object->name;
-		$object->path = '/containers/'.$object->container->name.'/'.$object->name;
-		$object->url = $object->container->cdn_uri . '/' . $object->name;
-		$object->mimetype = $object->content_type;
-		$object->filemtime = $object->last_modified;
-		$object->preview = $preview;
-		$object->size = $object->content_length;
-		$object->date = date($this->config['date'], strtotime($object->last_modified));
-		$object->properties = array(
-			'Date Modified' => $object->date,
-			'Size' => $object->size,
-			'Height' => $object->height,
-			'Width' => $object->width,
-			);
-		return $object;
-	}
+        return $return;
+    }
+
+    public function getinfo()
+    {
+        $object = $this->get_object();
+        if (isset($object->name)) {
+            $object = $this->get_file_info($object);
+
+            return [
+                'Path'       => $object->path,
+                'Filename'   => $object->name,
+                'File Type'  => $object->filetype,
+                'Preview'    => $object->preview,
+                'Properties' => $object->properties,
+                'Error'      => '',
+                'Code'       => 0,
+                ];
+        }
+
+        $container = $this->get_container();
+        if (isset($container->name)) {
+            return [
+                'Path'       => $container->path,
+                'Filename'   => $container->name,
+                'File Type'  => 'dir',
+                'Preview'    => $this->config['icons']['path'].$this->config['icons']['directory'],
+                'Properties' => [
+                    'Date Created'  => null,
+                    'Date Modified' => null,
+                    'Height'        => null,
+                    'Width'         => null,
+                    'Size'          => null,
+                    ],
+                'Error' => '',
+                'Code'  => 0,
+                ];
+        }
+
+        return [];
+    }
+
+    public function getfolder()
+    {
+        $container = trim($this->get['path'], '/ ');
+        $containerParts = explode('/', $container);
+        if ($containerParts[0] == 'containers') {
+            array_shift($containerParts);
+        }
+        $array = [];
+        if (empty($containerParts) || trim($this->get['path'], '/ ') == 'containers') {
+            $containers = $this->conn->list_containers();
+            $containers = array_diff($containers, $this->config['unallowed_dirs']);
+            foreach ($containers as $container) {
+                $array['/containers/'.$container.'/'] = [
+                    'Path'       => '/containers/'.$container.'/',
+                    'Filename'   => $container,
+                    'File Type'  => 'dir',
+                    'Preview'    => $this->config['icons']['path'].$this->config['icons']['directory'],
+                    'Properties' => [
+                        'Date Created'  => null,
+                        'Date Modified' => null,
+                        'Height'        => null,
+                        'Width'         => null,
+                        'Size'          => null,
+                        ],
+                    'Error' => '',
+                    'Code'  => 0,
+                    ];
+            }
+        } else {
+            $container = array_shift($containerParts);
+            $limit = 0;
+            $marker = null; // last record returned from a dataset
+            $prefix = null; // search term (starts with)
+            $path = null; // pseudo-hierarchical containers
+            if (!empty($containerParts)) {
+                $path = implode('/', $containerParts);
+            }
+            $container = $this->conn->get_container($container);
+            //$list = $container->list_objects($limit, $marker,  $prefix, $path);
+            $objects = $container->get_objects($limit, $marker, $prefix, $path);
+            foreach ($objects as $object) {
+                if (!isset($this->params['type']) || (isset($this->params['type']) && strtolower($this->params['type']) == 'images' && in_array(strtolower($object->content_type), $this->config['images']))) {
+                    if ($this->config['upload']['imagesonly'] == false || ($this->config['upload']['imagesonly'] == true && in_array(strtolower($object->content_type), $this->config['images']))) {
+                        $object = $this->get_file_info($object);
+                        $array[$object->url] = [
+                            'Path'       => $object->path,
+                            'Filename'   => $object->name,
+                            'File Type'  => $object->filetype,
+                            'Mime Type'  => $object->content_type,
+                            'Preview'    => $object->preview,
+                            'Properties' => $object->properties,
+                            'Error'      => '',
+                            'Code'       => 0,
+                            ];
+                    }
+                }
+            }
+        }
+
+        return $array;
+    }
+
+    public function rename()
+    {
+        // keep old filename, if missing from new
+        $newNameParts = explode('.', $this->get['new']);
+        $newNameExt = $newNameParts[(count($newNameParts) - 1)];
+        if (strlen($newNameExt) > 5 || count($newNameParts) == 1) {
+            $this->get['new'] .= '.'.array_pop(explode('.', $this->get['old']));
+        }
+        // get old
+        $object = $this->get_object($this->get['old']);
+        if (!isset($object->container)) {
+            $this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'), $path));
+        }
+        if (in_array($this->get['new'], $object->container->list_objects())) {
+            $this->error(sprintf($this->lang('FILE_ALREADY_EXISTS'), $this->get['new']));
+
+            return false;
+        }
+        // create to new
+        $new = $object->container->create_object($this->get['new']);
+        $new->content_type = $object->content_type;
+        $data = $object->read();
+        $new->write($data);
+        if (!empty($object->metadata)) {
+            $new->metadata = $object->metadata;
+            $object->sync_metadata(); // save back to RSC
+        }
+        $object->container->delete_object($object->name);
+        $array = [
+            'Error'    => '',
+            'Code'     => 0,
+            'Old Path' => $object->path,
+            'Old Name' => $object->name,
+            'New Path' => $new->path,
+            'New Name' => $new->name,
+            ];
+
+        return $array;
+    }
+
+    public function delete()
+    {
+        $object = $this->get_object();
+        if (isset($object->name)) {
+            $object->container->delete_object($object->name);
+
+            return [
+                'Error' => '',
+                'Code'  => 0,
+                'Path'  => $this->get['path'],
+                ];
+        }
+        $container = $this->get_container();
+        if (isset($container->name)) {
+            $list = $container->list_objects(5);
+            if (!empty($list)) {
+                $this->error('Unable to Delete Container, it is not empty.');
+
+                return false;
+            }
+            $this->conn->delete_container($container->name);
+
+            return [
+                'Error' => '',
+                'Code'  => 0,
+                'Path'  => $this->get['path'],
+                ];
+        }
+        $this->error(sprintf($this->lang('INVALID_DIRECTORY_OR_FILE')));
+    }
+
+    public function add()
+    {
+        $this->setParams();
+        if (!isset($_FILES['newfile']) || !is_uploaded_file($_FILES['newfile']['tmp_name'])) {
+            $this->error(sprintf($this->lang('INVALID_FILE_UPLOAD')), true);
+        }
+        if (($this->config['upload']['size'] != false && is_numeric($this->config['upload']['size'])) && ($_FILES['newfile']['size'] > ($this->config['upload']['size'] * 1024 * 1024))) {
+            $this->error(sprintf($this->lang('UPLOAD_FILES_SMALLER_THAN'), $this->config['upload']['size'].'Mb'), true);
+        }
+
+        $size = @getimagesize($_FILES['newfile']['tmp_name']);
+        if ($this->config['upload']['imagesonly'] || (isset($this->params['type']) && strtolower($this->params['type']) == 'images')) {
+            if (empty($size) || !is_array($size)) {
+                $this->error(sprintf($this->lang('UPLOAD_IMAGES_ONLY')), true);
+            }
+            if (!in_array($size[2], [1, 2, 3, 7, 8])) {
+                $this->error(sprintf($this->lang('UPLOAD_IMAGES_TYPE_JPEG_GIF_PNG')), true);
+            }
+        }
+        $_FILES['newfile']['name'] = $this->cleanString($_FILES['newfile']['name'], ['.', '-']);
+
+        $container = $this->get_container($this->post['currentpath']);
+
+        if (!$this->config['upload']['overwrite']) {
+            $list = $container->list_objects();
+            $i = 0;
+            while (in_array($_FILES['newfile']['name'], $list)) {
+                $i++;
+                $parts = explode('.', $_FILES['newfile']['name']);
+                $ext = array_pop($parts);
+                $parts = array_diff($parts, ["copy{$i}", 'copy'.($i - 1)]);
+                $parts[] = "copy{$i}";
+                $parts[] = $ext;
+                $_FILES['newfile']['name'] = implode('.', $parts);
+            }
+        }
+
+        $object = $container->create_object($_FILES['newfile']['name']);
+        $object->load_from_filename($_FILES['newfile']['tmp_name']);
+        // set image details
+        if (is_array($size) && count($size) > 1) {
+            $object->metadata->height = $object->height = $size[1];
+            $object->metadata->width = $object->width = $size[0];
+            $object->sync_metadata(); // save back to RSC
+        }
+        unlink($_FILES['newfile']['tmp_name']);
+
+        $response = [
+            'Path'  => $this->post['currentpath'],
+            'Name'  => $_FILES['newfile']['name'],
+            'Error' => '',
+            'Code'  => 0,
+            ];
+        echo '<textarea>'.json_encode($response).'</textarea>';
+        die();
+    }
+
+    public function addfolder()
+    {
+        $container = trim($this->get['path'], '/ ');
+        $containerParts = explode('/', $container);
+        if ($containerParts[0] == 'containers') {
+            array_shift($containerParts);
+        }
+        if (!empty($containerParts)) {
+            $this->error(sprintf($this->lang('UNABLE_TO_CREATE_DIRECTORY'), $newdir));
+        }
+        $newdir = $this->cleanString($this->get['name']);
+        $container = $this->conn->create_container($newdir);
+        $container->make_public(86400 / 2);
+
+        return [
+            'Parent' => "/containers/{$container->name}",
+            'Name'   => $container->name,
+            'Error'  => '',
+            'Code'   => 0,
+            ];
+    }
+
+    public function download()
+    {
+        $object = $this->get_object();
+        if (isset($object->name)) {
+            header('Content-type: application/force-download');
+            header('Content-Disposition: inline; filename="'.$object->name.'"');
+            header('Content-Type: '.$doc->content_type);
+            $output = fopen('php://output', 'w');
+            $object->stream($output); // stream object content to PHP's output buffer
+            fclose($output);
+
+            return true;
+        }
+        $this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'), $this->get['path']));
+    }
+
+    public function preview()
+    {
+        if (isset($this->get['path']) && file_exists($this->doc_root.$this->get['path'])) {
+            header('Content-type: image/'.$ext = pathinfo($this->get['path'], PATHINFO_EXTENSION));
+            header('Content-Transfer-Encoding: Binary');
+            header('Content-length: '.filesize($this->doc_root.$this->get['path']));
+            header('Content-Disposition: inline; filename="'.basename($this->get['path']).'"');
+            readfile($this->doc_root.$this->get['path']);
+        } else {
+            $this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'), $this->get['path']));
+        }
+    }
+
+    private function get_container($path = null, $showError = false)
+    {
+        if (empty($path)) {
+            $path = $this->get['path'];
+        }
+        $container = trim($path, '/ ');
+        $containerParts = explode('/', $container);
+        if ($containerParts[0] == 'containers') {
+            array_shift($containerParts);
+        }
+        $array = [];
+        if (count($containerParts) > 0) {
+            $container = $this->conn->get_container(array_shift($containerParts));
+            if (isset($container->name)) {
+                $container->path = '/containers/'.$container->name;
+
+                return $container;
+            }
+        }
+        if ($showError) {
+            $this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'), $path));
+        }
+
+        return false;
+    }
+
+    private function get_object($path = null, $showError = false)
+    {
+        if (empty($path)) {
+            $path = $this->get['path'];
+        }
+        $container = trim($path, '/ ');
+        $containerParts = explode('/', $container);
+        if ($containerParts[0] == 'containers') {
+            array_shift($containerParts);
+        }
+        $array = [];
+        if (count($containerParts) > 1) {
+            $container = $this->conn->get_container(array_shift($containerParts));
+            $object = $container->get_object(array_shift($containerParts));
+            if (isset($object->name) && isset($object->container->name)) {
+                $object->path = '/containers/'.$object->container->name.'/'.$object->name;
+
+                return $object;
+            }
+        }
+        if ($showError) {
+            $this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'), $path));
+        }
+
+        return false;
+    }
+
+    private function get_file_info($object = null)
+    {
+        if (empty($object) || !is_object($object)) {
+            return;
+        }
+        // parse into file extension types
+        //$object->filetype = array_pop(explode('/', $object->content_type));
+        $object->filetype = array_pop(explode('.', $object->name));
+        // setup values
+        $object->height = null;
+        $object->width = null;
+        if (isset($object->metadata->height)) {
+            $object->height = $object->metadata->height;
+        }
+        if (isset($object->metadata->width)) {
+            $object->width = $object->metadata->width;
+        }
+        $preview = $this->config['icons']['path'].$this->config['icons']['default'];
+        if (file_exists($this->root.$this->config['icons']['path'].strtolower($object->filetype).'.png')) {
+            $preview = $this->config['icons']['path'].strtolower($object->filetype).'.png';
+        }
+        if (in_array(strtolower($object->filetype), $this->config['images'])) {
+            $preview = $object->container->cdn_uri.'/'.$object->name;
+            if (empty($object->height) && empty($object->width) && isset($this->config['rsc-getsize']) && !empty($get['rsc-getsize'])) {
+                list($width, $height, $type, $attr) = getimagesize($this->doc_root.$path);
+                $object->metadata->height = $object->height = $height;
+                $object->metadata->width = $object->width = $width;
+                $object->sync_metadata(); // save back to RSC
+            }
+        }
+        $object->filename = $object->name;
+        $object->path = '/containers/'.$object->container->name.'/'.$object->name;
+        $object->url = $object->container->cdn_uri.'/'.$object->name;
+        $object->mimetype = $object->content_type;
+        $object->filemtime = $object->last_modified;
+        $object->preview = $preview;
+        $object->size = $object->content_length;
+        $object->date = date($this->config['date'], strtotime($object->last_modified));
+        $object->properties = [
+            'Date Modified' => $object->date,
+            'Size'          => $object->size,
+            'Height'        => $object->height,
+            'Width'         => $object->width,
+            ];
+
+        return $object;
+    }
 }
-?>
\ No newline at end of file
diff --git a/public/filemanager/connectors/php/plugins/rsc/filemanager.rsc.config.php b/public/filemanager/connectors/php/plugins/rsc/filemanager.rsc.config.php
index 22a290f36..c513b896e 100644
--- a/public/filemanager/connectors/php/plugins/rsc/filemanager.rsc.config.php
+++ b/public/filemanager/connectors/php/plugins/rsc/filemanager.rsc.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
-*	Filemanager PHP RSC plugin configuration
+*	Filemanager PHP RSC plugin configuration.
 *
 *	filemanager.rsc.class.php
 *	This is a separate config file for the parameters needed for the RSC plugin
@@ -9,48 +9,45 @@
 *	@license	MIT License
 *	@author		Alan Blount <alan (at) zeroasterisk (dot) com>
 *	@copyright	Authors
-*/	
+*/
 
 /**
- *	Language settings
+ *	Language settings.
  */
 $config['rsc-verbose'] = false;
 
-/**
+/*
  *	Language settings
  */
 $config['rsc-username'] = 'your_username';
 
-/**
+/*
  *	Language settings
  */
 $config['rsc-apikey'] = 'your_api_key_hash';
 
-/**
+/*
  *	RSC Account (optional)
  */
 $config['rsc-account'] = null;
 
-/**
+/*
  *	RSC Account (optionally limit container to this, better accomplished by limiting the base path)
  */
 $config['rsc-container'] = null;
 
-/**
+/*
  *	Language settings
  */
 $config['rsc-ssl_use_cabundle'] = true;
 
-/**
+/*
  *	Language settings
  */
 $config['rsc-getsize'] = true;
 
-/**
+/*
  *	Extension of the unallowed Dirs
  */
 $config['unallowed_dirs'][] = '.CDN_ACCESS_LOGS';
 $config['unallowed_dirs'][] = 'cloudservers';
-
-
-?>
diff --git a/public/index.php b/public/index.php
index 37f19c23a..59cd05fb5 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Laravel - A PHP Framework For Web Artisans
+ * Laravel - A PHP Framework For Web Artisans.
  *
- * @package  Laravel
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  */
 
@@ -49,7 +48,7 @@ $app = require_once __DIR__.'/../bootstrap/app.php';
 $kernel = $app->make('Illuminate\Contracts\Http\Kernel');
 
 $response = $kernel->handle(
-	$request = Illuminate\Http\Request::capture()
+    $request = Illuminate\Http\Request::capture()
 );
 
 $response->send();
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index cb01277f4..8e5a3ef89 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -1,7 +1,7 @@
 
 <?php
 
-return array(
+return [
     /*
       |----------------------------------------------------------------------------------------
       | Authentication Pages [English(en)]
@@ -19,41 +19,41 @@ return array(
       |--------------------------------------
      */
     'success' => 'Success',
-    'fails' => 'Fails',
-    'alert' => 'Alert',
+    'fails'   => 'Fails',
+    'alert'   => 'Alert',
     /*
       |--------------------------------------
       |   Login Page
       |--------------------------------------
      */
     'Login_to_start_your_session' => 'Login to start your session',
-    'login' => 'Login',
-    'remember' => 'Remember Me',
-    'signmein' => 'Sign me In',
-    'iforgot' => 'I forgot my Password',
-    'email_address' => 'E-Mail Address',
-    'password' => 'Password',
-    'woops' => 'Whoops!',
-    'theirisproblem' => 'There were some problems with your input.',
-    'login' => 'Login',
-    'e-mail' => 'E-mail',
-    'reg_new_member' => 'Register a new membership',
+    'login'                       => 'Login',
+    'remember'                    => 'Remember Me',
+    'signmein'                    => 'Sign me In',
+    'iforgot'                     => 'I forgot my Password',
+    'email_address'               => 'E-Mail Address',
+    'password'                    => 'Password',
+    'woops'                       => 'Whoops!',
+    'theirisproblem'              => 'There were some problems with your input.',
+    'login'                       => 'Login',
+    'e-mail'                      => 'E-mail',
+    'reg_new_member'              => 'Register a new membership',
     /*
       |--------------------------------------
       |   Register Page
       |--------------------------------------
      */
-    'registration' => 'Registration',
-    'full_name' => 'Full name',
-    'firstname' => 'First Name',
-    'lastname' => 'Last Name',
-    'profilepicture' => 'Profile Picture',
-    'oldpassword' => 'Old Password',
-    'newpassword' => 'New Password',
-    'retype_password' => 'Retype Password',
-    'i_agree_to_the' => 'I agree to the',
-    'terms' => 'terms',
-    'register' => 'Register',
+    'registration'                => 'Registration',
+    'full_name'                   => 'Full name',
+    'firstname'                   => 'First Name',
+    'lastname'                    => 'Last Name',
+    'profilepicture'              => 'Profile Picture',
+    'oldpassword'                 => 'Old Password',
+    'newpassword'                 => 'New Password',
+    'retype_password'             => 'Retype Password',
+    'i_agree_to_the'              => 'I agree to the',
+    'terms'                       => 'terms',
+    'register'                    => 'Register',
     'i_already_have_a_membership' => 'I already have a membership',
     /*
       |--------------------------------------
@@ -66,11 +66,11 @@ return array(
       |   Forgot Password Page
       |--------------------------------------
      */
-    'i_know_my_password' => 'I know my password',
-    'recover_passord' => 'Recover Password',
-    'send_password_reset_link' => 'Send pasword Reset Link',
+    'i_know_my_password'            => 'I know my password',
+    'recover_passord'               => 'Recover Password',
+    'send_password_reset_link'      => 'Send pasword Reset Link',
     'enter_email_to_reset_password' => 'Enter E-mail to reset password',
-    'link' => 'Link',
+    'link'                          => 'Link',
     /*
       |----------------------------------------------------------------------------------------
       | Emails Pages [English(en)]
@@ -87,74 +87,74 @@ return array(
       |  Emails Create Page
       |--------------------------------------
      */
-    'emails' => 'Emails',
-    'incoming_emails' => 'Incoming Emails',
-    'reuired_authentication' => 'Reuired Authentication',
+    'emails'                  => 'Emails',
+    'incoming_emails'         => 'Incoming Emails',
+    'reuired_authentication'  => 'Reuired Authentication',
     'fetching_email_via_imap' => 'Fetching Email via IMAP',
-    'create_email' => 'Create Email',
-    'email_address' => 'Email Address',
-    'email_name' => 'Email Name',
-    'help_topic' => 'Help Topic',
-    'auto_response' => 'Auto Response',
-    'host_name' => 'Host Name',
-    'port_number' => 'Port Number',
-    'mail_box_protocol' => 'Mail Box Protocol',
+    'create_email'            => 'Create Email',
+    'email_address'           => 'Email Address',
+    'email_name'              => 'Email Name',
+    'help_topic'              => 'Help Topic',
+    'auto_response'           => 'Auto Response',
+    'host_name'               => 'Host Name',
+    'port_number'             => 'Port Number',
+    'mail_box_protocol'       => 'Mail Box Protocol',
     'authentication_required' => 'Authentication Required',
-    'yes' => 'Yes',
-    'no' => 'No',
-    'header_spoofing' => 'Header Spoofing',
-    'allow_for_this_email' => 'Allow For This Email',
-    'imap_config' => 'IMAP Configuration',
+    'yes'                     => 'Yes',
+    'no'                      => 'No',
+    'header_spoofing'         => 'Header Spoofing',
+    'allow_for_this_email'    => 'Allow For This Email',
+    'imap_config'             => 'IMAP Configuration',
     /*
       |--------------------------------------
       |  Ban Emails Create Page
       |--------------------------------------
      */
-    'ban_lists' => 'Ban Lists',
-    'ban_email' => 'Ban Email',
-    'banlists' => 'Ban lists',
+    'ban_lists'  => 'Ban Lists',
+    'ban_email'  => 'Ban Email',
+    'banlists'   => 'Ban lists',
     'ban_status' => 'Ban Status',
     /*
       |--------------------------------------
       |  Templates Index Page
       |--------------------------------------
      */
-    'templates' => 'Templates',
-    'template_set' => 'Template Sets',
+    'templates'       => 'Templates',
+    'template_set'    => 'Template Sets',
     'create_template' => 'Create Template',
-    'edit_template' => 'Edit Template',
-    'in_use' => 'In Use',
+    'edit_template'   => 'Edit Template',
+    'in_use'          => 'In Use',
     //Template Description
-    'Create ticket agent' => 'Notification email that is sent to Agent & Admin when ticket is created',
-    'Assign ticket' => 'Ticket assigned to an agent',
-    'Create ticket' => 'Mail sent to client for ticket creation successful message',
-    'Check ticket' => 'if a client wants to check ticket via customer portal then a link will be sent to client. this link is for the client to view ticket details with ticket no, without logging in to system',
-    'Ticket reply agent' => 'A notification is sent to agent email once client replies to the ticket',
+    'Create ticket agent'       => 'Notification email that is sent to Agent & Admin when ticket is created',
+    'Assign ticket'             => 'Ticket assigned to an agent',
+    'Create ticket'             => 'Mail sent to client for ticket creation successful message',
+    'Check ticket'              => 'if a client wants to check ticket via customer portal then a link will be sent to client. this link is for the client to view ticket details with ticket no, without logging in to system',
+    'Ticket reply agent'        => 'A notification is sent to agent email once client replies to the ticket',
     'Registration notification' => 'Password and username is sent on email on first registration',
-    'Reset password' => 'Email with Password reset link',
-    'Error report' => 'Error report',
-    'Ticket creation' => 'First notification sent by the system about the ticket creation to the client',
-    'Ticket reply' => 'A reply made by the agent on a ticket, email notification is sent  to client and collaborators',
-    'Close ticket' => 'Mail sent to client on closing a ticket',
-    'Create ticket by agent' => 'An agent creates a ticket for the client in the name of client',
+    'Reset password'            => 'Email with Password reset link',
+    'Error report'              => 'Error report',
+    'Ticket creation'           => 'First notification sent by the system about the ticket creation to the client',
+    'Ticket reply'              => 'A reply made by the agent on a ticket, email notification is sent  to client and collaborators',
+    'Close ticket'              => 'Mail sent to client on closing a ticket',
+    'Create ticket by agent'    => 'An agent creates a ticket for the client in the name of client',
     /*
       |--------------------------------------
       |  Templates Create Page
       |--------------------------------------
      */
     'template_set_to_clone' => 'Template set to clone',
-    'language' => 'Language',
+    'language'              => 'Language',
     /*
       |--------------------------------------
       |  Diagnostics Page
       |--------------------------------------
      */
     'diagnostics' => 'Diagnostics',
-    'from' => 'From',
-    'to' => 'To',
-    'subject' => 'Subject',
-    'message' => 'Message',
-    'send' => 'Send',
+    'from'        => 'From',
+    'to'          => 'To',
+    'subject'     => 'Subject',
+    'message'     => 'Message',
+    'send'        => 'Send',
     /*
       |----------------------------------------------------------------------------------------
       | Settings Pages [English(en)]
@@ -173,167 +173,167 @@ return array(
      */
     'company' => 'Company',
     'website' => 'Website',
-    'phone' => 'Phone',
+    'phone'   => 'Phone',
     'address' => 'Address',
     'landing' => 'Landing Page',
     'offline' => 'Offline Page',
-    'thank' => 'Thank Page',
-    'logo' => 'Logo',
-    'save' => 'Save',
+    'thank'   => 'Thank Page',
+    'logo'    => 'Logo',
+    'save'    => 'Save',
     /*
       |--------------------------------------
       |   System Settings Page
       |--------------------------------------
      */
-    'system' => 'System',
-    'online' => 'Online',
-    'offline' => 'Offline',
-    'name/title' => 'Name/Title',
-    'pagesize' => 'Page Size',
-    'url' => 'URL',
-    'default_department' => 'Default Department',
-    'loglevel' => 'Log Level',
-    'purglog' => 'Purge Logs',
-    'nameformat' => 'Name Formatting',
-    'timeformat' => 'Time Format',
-    'date' => 'Date',
-    'dateformat' => 'Date Format',
-    'date_time' => 'Date And Time Format',
-    'day_date_time' => 'Day,Date And Time Format',
-    'timezone' => 'Default Time Zone',
-    'api' =>  'Api',
-    'api_key'  =>  'Api Key',
-    'api_configurations'    =>    'Api Configurations',
-    'generate_key'      =>      'Generate key',
+    'system'                => 'System',
+    'online'                => 'Online',
+    'offline'               => 'Offline',
+    'name/title'            => 'Name/Title',
+    'pagesize'              => 'Page Size',
+    'url'                   => 'URL',
+    'default_department'    => 'Default Department',
+    'loglevel'              => 'Log Level',
+    'purglog'               => 'Purge Logs',
+    'nameformat'            => 'Name Formatting',
+    'timeformat'            => 'Time Format',
+    'date'                  => 'Date',
+    'dateformat'            => 'Date Format',
+    'date_time'             => 'Date And Time Format',
+    'day_date_time'         => 'Day,Date And Time Format',
+    'timezone'              => 'Default Time Zone',
+    'api'                   => 'Api',
+    'api_key'               => 'Api Key',
+    'api_configurations'    => 'Api Configurations',
+    'generate_key'          => 'Generate key',
     /*
       |--------------------------------------
       |   Email Settings Page
       |--------------------------------------
      */
-    'email' => 'Email',
-    'default_template' => 'Default Template Set:',
-    'default_system_email' => 'Default System Email:',
-    'default_alert_email' => 'Default Alert Email:',
-    'admin_email' => 'Admins Email Address:',
-    'email_fetch' => 'Email Fetching:',
-    'enable' => 'Enable',
-    'default_MTA' => 'Default MTA',
-    'fetch_auto-corn' => 'Fetch on auto-cron',
-    'strip_quoted_reply' => 'Strip Quoted Reply',
-    'reply_separator' => 'Reply Separator Tag',
-    'accept_all_email' => 'Accept All Emails',
-    'accept_email_unknown' => 'Accept email from unknown Users',
-    'accept_email_collab' => 'Accept Email Collaborators',
+    'email'                               => 'Email',
+    'default_template'                    => 'Default Template Set:',
+    'default_system_email'                => 'Default System Email:',
+    'default_alert_email'                 => 'Default Alert Email:',
+    'admin_email'                         => 'Admins Email Address:',
+    'email_fetch'                         => 'Email Fetching:',
+    'enable'                              => 'Enable',
+    'default_MTA'                         => 'Default MTA',
+    'fetch_auto-corn'                     => 'Fetch on auto-cron',
+    'strip_quoted_reply'                  => 'Strip Quoted Reply',
+    'reply_separator'                     => 'Reply Separator Tag',
+    'accept_all_email'                    => 'Accept All Emails',
+    'accept_email_unknown'                => 'Accept email from unknown Users',
+    'accept_email_collab'                 => 'Accept Email Collaborators',
     'automatically_and_collab_from_email' => 'Automatically add collaborators from email fields',
-    'default_alert_email' => 'Default Alert Email',
-    'attachments' => 'Attachments',
-    'email_attahment_user' => 'Email attachments to the user',
-    'cron_notification' => 'Enable Notification cron',
+    'default_alert_email'                 => 'Default Alert Email',
+    'attachments'                         => 'Attachments',
+    'email_attahment_user'                => 'Email attachments to the user',
+    'cron_notification'                   => 'Enable Notification cron',
     /*
       |--------------------------------------
       |   Ticket Settings Page
       |--------------------------------------
      */
-    'ticket' => 'Ticket',
-    'default_ticket_number_format' => 'Default Ticket Number Format',
-    'default_ticket_number_sequence' => 'Default Ticket Number Sequence',
-    'default_status' => 'Default Status',
-    'default_priority' => 'Default Priority',
-    'default_sla' => 'Default SLA',
-    'default_help_topic' => 'Default Help Topic',
-    'maximum_open_tickets' => 'Maximum Open Tickets',
+    'ticket'                             => 'Ticket',
+    'default_ticket_number_format'       => 'Default Ticket Number Format',
+    'default_ticket_number_sequence'     => 'Default Ticket Number Sequence',
+    'default_status'                     => 'Default Status',
+    'default_priority'                   => 'Default Priority',
+    'default_sla'                        => 'Default SLA',
+    'default_help_topic'                 => 'Default Help Topic',
+    'maximum_open_tickets'               => 'Maximum Open Tickets',
     'agent_collision_avoidance_duration' => 'Agent Collision Avoidance Duration',
-    'human_verification' => 'Human Verification',
-    'claim_on_response' => 'Claim on Response',
-    'assigned_tickets' => 'Assigned Tickets',
-    'answered_tickets' => 'Answered Tickets',
-    'agent_identity_masking' => 'Agent Identity Masking',
-    'enable_HTML_ticket_thread' => 'Enable HTML Ticket Thread',
-    'allow_client_updates' => 'Allow Client Updates',
+    'human_verification'                 => 'Human Verification',
+    'claim_on_response'                  => 'Claim on Response',
+    'assigned_tickets'                   => 'Assigned Tickets',
+    'answered_tickets'                   => 'Answered Tickets',
+    'agent_identity_masking'             => 'Agent Identity Masking',
+    'enable_HTML_ticket_thread'          => 'Enable HTML Ticket Thread',
+    'allow_client_updates'               => 'Allow Client Updates',
     /*
       |--------------------------------------
       |   Access Settings Page
       |--------------------------------------
      */
-    'access' => 'Access',
-    'expiration_policy' => 'Password Expiration Policy',
-    'allow_password_resets' => 'Allow Password Resets',
-    'reset_token_expiration' => 'Reset Token Expiration',
-    'agent_session_timeout' => 'Agent Session Timeout',
-    'bind_agent_session_IP' => 'Bind Agent Session to IP',
-    'registration_required' => 'Registration Required',
+    'access'                                           => 'Access',
+    'expiration_policy'                                => 'Password Expiration Policy',
+    'allow_password_resets'                            => 'Allow Password Resets',
+    'reset_token_expiration'                           => 'Reset Token Expiration',
+    'agent_session_timeout'                            => 'Agent Session Timeout',
+    'bind_agent_session_IP'                            => 'Bind Agent Session to IP',
+    'registration_required'                            => 'Registration Required',
     'require_registration_and_login_to_create_tickets' => 'Require registration and login to create tickets',
-    'registration_method' => 'Registration Method',
-    'user_session_timeout' => 'User Session Timeout',
-    'client_quick_access' => 'Client Quick Access',
+    'registration_method'                              => 'Registration Method',
+    'user_session_timeout'                             => 'User Session Timeout',
+    'client_quick_access'                              => 'Client Quick Access',
     /*
       |--------------------------------------
       |   Auto-Response Settings Page
       |--------------------------------------
      */
-    'auto_responce' => 'Auto Response',
-    'new_ticket' => 'New Ticket',
-    'new_ticket_by_agent' => 'New Ticket by Agent',
-    'new_message' => 'New Message',
-    'submitter' => 'Submitter : ',
-    'send_receipt_confirmation' => 'Send Receipt Confirmation',
-    'participants' => 'Participants : ',
-    'send_new_activity_notice' => 'Send new activity notice',
-    'overlimit_notice' => 'Overlimit Notice',
+    'auto_responce'                 => 'Auto Response',
+    'new_ticket'                    => 'New Ticket',
+    'new_ticket_by_agent'           => 'New Ticket by Agent',
+    'new_message'                   => 'New Message',
+    'submitter'                     => 'Submitter : ',
+    'send_receipt_confirmation'     => 'Send Receipt Confirmation',
+    'participants'                  => 'Participants : ',
+    'send_new_activity_notice'      => 'Send new activity notice',
+    'overlimit_notice'              => 'Overlimit Notice',
     'email_attachments_to_the_user' => 'Email attachments to the user',
     /*
       |--------------------------------------
       |   Alert & Notice Settings Page
       |--------------------------------------
      */
-    'disable' => 'Disable',
-    'admin_email_2' => 'Admin Email',
-    'alert_notices' => 'Alert & Notices',
-    'new_ticket_alert' => 'New Ticket Alert',
-    'department_manager' => 'Department Manager',
-    'department_members' => 'Department Members',
-    'organization_account_manager' => 'Organization Account Manager',
-    'new_message_alert' => 'New Message Alert',
-    'last_respondent' => 'Last Respondent',
-    'assigned_agent_team' => 'Assigned Agent / Team',
-    'new_internal_note_alert' => 'New Internal Note Alert',
-    'ticket_assignment_alert' => 'Ticket Assignment Alert',
-    'team_lead' => 'Team Lead',
-    'team_members' => 'Team Members',
-    'ticket_transfer_alert' => 'Ticket Transfer Alert',
-    'overdue_ticket_alert' => 'Overdue Ticket Alert ',
-    'system_alerts' => 'System Alerts',
-    'system_errors' => 'System Errors',
-    'SQL_errors' => 'SQL errors',
-    'excessive_failed_login_attempts' => 'Excessive failed login attempts',
-    'system_error_reports' => 'System error Reports',
+    'disable'                                               => 'Disable',
+    'admin_email_2'                                         => 'Admin Email',
+    'alert_notices'                                         => 'Alert & Notices',
+    'new_ticket_alert'                                      => 'New Ticket Alert',
+    'department_manager'                                    => 'Department Manager',
+    'department_members'                                    => 'Department Members',
+    'organization_account_manager'                          => 'Organization Account Manager',
+    'new_message_alert'                                     => 'New Message Alert',
+    'last_respondent'                                       => 'Last Respondent',
+    'assigned_agent_team'                                   => 'Assigned Agent / Team',
+    'new_internal_note_alert'                               => 'New Internal Note Alert',
+    'ticket_assignment_alert'                               => 'Ticket Assignment Alert',
+    'team_lead'                                             => 'Team Lead',
+    'team_members'                                          => 'Team Members',
+    'ticket_transfer_alert'                                 => 'Ticket Transfer Alert',
+    'overdue_ticket_alert'                                  => 'Overdue Ticket Alert ',
+    'system_alerts'                                         => 'System Alerts',
+    'system_errors'                                         => 'System Errors',
+    'SQL_errors'                                            => 'SQL errors',
+    'excessive_failed_login_attempts'                       => 'Excessive failed login attempts',
+    'system_error_reports'                                  => 'System error Reports',
     'Send_app_crash_reports_to_help_Ladybird_improve_Faveo' => 'Send app crash reports to help Ladybird improve Faveo',
     /*
       |------------------------------------------------
       |Language page
       |------------------------------------------------
      */
-    'iso-code' => 'ISO-CODE',
-    'download' => 'Downlaod',
-    'upload_file' => 'Upload File',
-    'enter_iso-code' => "Enter ISO-CODE",
-    'eg.' => 'Example',
-    'for' => 'for',
-    'english' => 'English',
-    'language-name' => 'Language name',
-    'file' => 'File',
-    'read-more' => 'Read more.',
-    'enable_lang' => 'Enable it.',
-    'add-lang-package' => 'Add new language package',
-    'package_exist' => "Package already exists.",
-    'iso-code-error' => "Error in iso-code. enter correct iso-code.",
-    'zipp-error' => 'Error in zip file. Zip must contian language php files only.',
-    'upload-success' => "Uploaded successfully.",
-    "file-error" => 'Error in file or invalid file.',
-    'delete-success' => 'Language package deleted successfully.',
+    'iso-code'           => 'ISO-CODE',
+    'download'           => 'Downlaod',
+    'upload_file'        => 'Upload File',
+    'enter_iso-code'     => 'Enter ISO-CODE',
+    'eg.'                => 'Example',
+    'for'                => 'for',
+    'english'            => 'English',
+    'language-name'      => 'Language name',
+    'file'               => 'File',
+    'read-more'          => 'Read more.',
+    'enable_lang'        => 'Enable it.',
+    'add-lang-package'   => 'Add new language package',
+    'package_exist'      => 'Package already exists.',
+    'iso-code-error'     => 'Error in iso-code. enter correct iso-code.',
+    'zipp-error'         => 'Error in zip file. Zip must contian language php files only.',
+    'upload-success'     => 'Uploaded successfully.',
+    'file-error'         => 'Error in file or invalid file.',
+    'delete-success'     => 'Language package deleted successfully.',
     'lang-doesnot-exist' => 'Language package does not exist.',
-    'active-lang-error' => 'Language package can not be deleted when it is active.',
-    "language-error" => 'Language package not found in your lang directroy.',
+    'active-lang-error'  => 'Language package can not be deleted when it is active.',
+    'language-error'     => 'Language package not found in your lang directroy.',
     /*
       |----------------------------------------------------------------------------------------
       | Manage Pages [English(en)]
@@ -350,78 +350,78 @@ return array(
       |  Help Topic index Page
       |--------------------------------------
      */
-    'help_topics' => 'Help Topics',
-    'topic' => 'Topic',
-    'type' => 'Type',
-    'priority' => 'Priority',
-    'last_updated' => 'Last Updated',
+    'help_topics'       => 'Help Topics',
+    'topic'             => 'Topic',
+    'type'              => 'Type',
+    'priority'          => 'Priority',
+    'last_updated'      => 'Last Updated',
     'create_help_topic' => 'Create Help topic',
-    'action' => 'Action',
+    'action'            => 'Action',
     /*
       |--------------------------------------
       |  Help Topic Create Page
       |--------------------------------------
      */
-    'active' => 'Active',
-    'disabled' => 'Disabled',
-    'public' => 'Public',
-    'private' => 'Private',
-    'parent_topic' => 'Parent Topic',
-    'Custom_form' => 'Custom Form',
-    'SLA_plan' => 'SLA Plan',
-    'auto_assign' => 'Auto assign',
-    'auto_respons' => 'Auto Respons',
+    'active'               => 'Active',
+    'disabled'             => 'Disabled',
+    'public'               => 'Public',
+    'private'              => 'Private',
+    'parent_topic'         => 'Parent Topic',
+    'Custom_form'          => 'Custom Form',
+    'SLA_plan'             => 'SLA Plan',
+    'auto_assign'          => 'Auto assign',
+    'auto_respons'         => 'Auto Respons',
     'ticket_number_format' => 'Ticket Number Format',
-    'system_default' => 'System Default',
-    'custom' => 'Custom',
-    'internal_notes' => 'Internal Notes',
+    'system_default'       => 'System Default',
+    'custom'               => 'Custom',
+    'internal_notes'       => 'Internal Notes',
     /*
       |--------------------------------------
       |  SLA plan Index Page
       |--------------------------------------
      */
-    'sla_plans' => 'SLA Plans',
-    'create_SLA' => 'Create a SLA',
+    'sla_plans'    => 'SLA Plans',
+    'create_SLA'   => 'Create a SLA',
     'grace_period' => 'Grace Period',
-    'added_date' => 'Added Date',
+    'added_date'   => 'Added Date',
     /*
       |--------------------------------------
       |  SLA plan Create Page
       |--------------------------------------
      */
-    'transient' => 'Transient',
+    'transient'            => 'Transient',
     'ticket_overdue_alert' => 'Ticket Overdue Alerts',
     /*
       |--------------------------------------
       |  Form Create Page
       |--------------------------------------
      */
-    'title' => 'Title',
-    'instruction' => 'Instruction',
-    'label' => 'Label',
-    'visibility' => 'Visibility',
-    'variable' => 'Variable',
-    'create_form' => 'Create Form',
-    'forms' => 'Forms',
-    'form_name' => 'Form Name',
-    'view_this_form' => 'View This Form',
-    'delete_from' => 'Delete Form',
-    'are_you_sure_you_want_to_delete' => 'Are you sure you want to Delete',
-    'close' => 'Close',
-    'instructions' => 'Instructions',
-    "instructions_on_creating_form" => "Select field type you want to add to the form below and click on 'Type' dropdown. Don't forget to set field options if type is select,checkbox or radio..Separate each option by a coma. After you finish creating the form, you can save the form by clicking Save Form button",
-    'form_properties' => 'Form Properties',
-    'adding_fields' => 'Adding Fields',
-    "click_add_fields_button_to_add_fields" => "Click <b>'Add Fields'</b> button to add Fields",
-    'add_fields' => 'Add Fields',
-    'save_form' => 'Save Form',
-    'label' => 'Label',
-    'name' => 'Name',
-    'type' => 'Type',
-    'values(selected_fields)' => 'Values(Selected Fields)',
-    'required' => 'Required',
-    'Action' => 'Action',
-    'remove' => 'Remove',
+    'title'                                 => 'Title',
+    'instruction'                           => 'Instruction',
+    'label'                                 => 'Label',
+    'visibility'                            => 'Visibility',
+    'variable'                              => 'Variable',
+    'create_form'                           => 'Create Form',
+    'forms'                                 => 'Forms',
+    'form_name'                             => 'Form Name',
+    'view_this_form'                        => 'View This Form',
+    'delete_from'                           => 'Delete Form',
+    'are_you_sure_you_want_to_delete'       => 'Are you sure you want to Delete',
+    'close'                                 => 'Close',
+    'instructions'                          => 'Instructions',
+    'instructions_on_creating_form'         => "Select field type you want to add to the form below and click on 'Type' dropdown. Don't forget to set field options if type is select,checkbox or radio..Separate each option by a coma. After you finish creating the form, you can save the form by clicking Save Form button",
+    'form_properties'                       => 'Form Properties',
+    'adding_fields'                         => 'Adding Fields',
+    'click_add_fields_button_to_add_fields' => "Click <b>'Add Fields'</b> button to add Fields",
+    'add_fields'                            => 'Add Fields',
+    'save_form'                             => 'Save Form',
+    'label'                                 => 'Label',
+    'name'                                  => 'Name',
+    'type'                                  => 'Type',
+    'values(selected_fields)'               => 'Values(Selected Fields)',
+    'required'                              => 'Required',
+    'Action'                                => 'Action',
+    'remove'                                => 'Remove',
     /*
       |----------------------------------------------------------------------------------------
       | Theme Pages [English(en)]
@@ -438,7 +438,7 @@ return array(
       |  Footer Pages
       |--------------------------------------
      */
-    'footer' => 'Footer',
+    'footer'  => 'Footer',
     'footer1' => 'Footer1',
     'footer2' => 'Footer2',
     'footer3' => 'Footer3',
@@ -454,104 +454,104 @@ return array(
       |
      */
     'are_you_sure' => 'Are you sure',
-    'staffs' => 'Staffs',
-    'name' => 'Name',
-    'user_name' => 'User Name',
-    'status' => 'Status',
-    'group' => 'Group',
-    'department' => 'Department',
-    'created' => 'Created',
-    'lastlogin' => 'Last Login',
-    'createagent' => 'Create An Agent',
-    'delete' => 'Delete',
-    'agents' => 'Agents',
-    'create' => 'Create',
-    'edit' => 'Edit',
-    'departments' => 'Departments',
-    'groups' => 'Groups',
+    'staffs'       => 'Staffs',
+    'name'         => 'Name',
+    'user_name'    => 'User Name',
+    'status'       => 'Status',
+    'group'        => 'Group',
+    'department'   => 'Department',
+    'created'      => 'Created',
+    'lastlogin'    => 'Last Login',
+    'createagent'  => 'Create An Agent',
+    'delete'       => 'Delete',
+    'agents'       => 'Agents',
+    'create'       => 'Create',
+    'edit'         => 'Edit',
+    'departments'  => 'Departments',
+    'groups'       => 'Groups',
     /*
       |--------------------------------------
       |  Staff Create Page
       |--------------------------------------
      */
-    'create_agent' => 'Create Agent',
-    'first_name' => 'First Name',
-    'last_name' => 'Last Name',
-    'mobile_number' => 'Mobile Number',
-    'agent_signature' => 'Agent Signature',
+    'create_agent'           => 'Create Agent',
+    'first_name'             => 'First Name',
+    'last_name'              => 'Last Name',
+    'mobile_number'          => 'Mobile Number',
+    'agent_signature'        => 'Agent Signature',
     'account_status_setting' => 'Account Status & Setting',
-    'account_type' => 'Account Type',
-    'admin' => 'Admin',
-    'agent' => 'Agent',
-    'account_status' => 'Account Status',
-    'locked' => 'Locked',
-    'assigned_group' => 'Assigned Group',
-    'primary_department' => 'Primary Department',
-    'agent_time_zone' => 'Agent Time Zone',
-    'day_light_saving' => 'Day Light Saving',
-    'limit_access' => 'Limit Access',
-    'directory_listing' => 'Directory Listing',
-    'vocation_mode' => 'Vocation Mode',
-    'assigned_team' => 'Assigned Team',
+    'account_type'           => 'Account Type',
+    'admin'                  => 'Admin',
+    'agent'                  => 'Agent',
+    'account_status'         => 'Account Status',
+    'locked'                 => 'Locked',
+    'assigned_group'         => 'Assigned Group',
+    'primary_department'     => 'Primary Department',
+    'agent_time_zone'        => 'Agent Time Zone',
+    'day_light_saving'       => 'Day Light Saving',
+    'limit_access'           => 'Limit Access',
+    'directory_listing'      => 'Directory Listing',
+    'vocation_mode'          => 'Vocation Mode',
+    'assigned_team'          => 'Assigned Team',
     /*
       |--------------------------------------
       |  Department Create Page
       |--------------------------------------
      */
-    'create_department' => 'Create Department',
-    'manager' => 'Manager',
-    'ticket_assignment' => 'Ticket Assignment ',
+    'create_department'                                => 'Create Department',
+    'manager'                                          => 'Manager',
+    'ticket_assignment'                                => 'Ticket Assignment ',
     'restrict_ticket_assignment_to_department_members' => 'Restrict ticket assignment to department members',
-    'outgoing_emails' => 'Outgoing Emails',
-    'outgoing_email' => 'Outgoing Email',
-    'template_set' => 'Template Set',
-    'auto_responding_settings' => 'Auto-Responding Settigs',
-    'disable_for_this_department' => 'Disable for this department',
-    'auto_response_email' => 'Auto-Response Email',
-    'recipient' => 'Recipient',
-    'group_access' => 'Group Access',
-    'department_signature' => 'Department Signature',
+    'outgoing_emails'                                  => 'Outgoing Emails',
+    'outgoing_email'                                   => 'Outgoing Email',
+    'template_set'                                     => 'Template Set',
+    'auto_responding_settings'                         => 'Auto-Responding Settigs',
+    'disable_for_this_department'                      => 'Disable for this department',
+    'auto_response_email'                              => 'Auto-Response Email',
+    'recipient'                                        => 'Recipient',
+    'group_access'                                     => 'Group Access',
+    'department_signature'                             => 'Department Signature',
     /*
       |--------------------------------------
       |  Team Create Page
       |--------------------------------------
      */
-    'create_team' => 'Create Team',
-    'team_lead' => 'Team Lead',
-    'assignment_alert' => 'Assignment Alert',
+    'create_team'           => 'Create Team',
+    'team_lead'             => 'Team Lead',
+    'assignment_alert'      => 'Assignment Alert',
     'disable_for_this_team' => 'Disable for this team',
-    'teams' => 'Teams',
+    'teams'                 => 'Teams',
     /*
       |--------------------------------------
       |  Group Create Page
       |--------------------------------------
      */
-    'create_group' => 'Create Group',
-    'goups' => 'Goups',
-    'can_create_ticket' => 'Can create ticket',
-    'can_edit_ticket' => 'Can edit ticket',
-    'can_post_ticket' => 'Can post Ticket',
-    'can_close_ticket' => 'Can close ticket ',
-    'can_assign_ticket' => 'Can assign ticket',
-    'can_transfer_ticket' => 'Can transfer ticket',
-    'can_delete_ticket' => 'Can delete ticket',
-    'can_ban_emails' => 'Can ban emails',
-    'can_manage_premade' => 'Can Manage premade',
-    'can_manage_FAQ' => 'Can manage FAQ',
+    'create_group'         => 'Create Group',
+    'goups'                => 'Goups',
+    'can_create_ticket'    => 'Can create ticket',
+    'can_edit_ticket'      => 'Can edit ticket',
+    'can_post_ticket'      => 'Can post Ticket',
+    'can_close_ticket'     => 'Can close ticket ',
+    'can_assign_ticket'    => 'Can assign ticket',
+    'can_transfer_ticket'  => 'Can transfer ticket',
+    'can_delete_ticket'    => 'Can delete ticket',
+    'can_ban_emails'       => 'Can ban emails',
+    'can_manage_premade'   => 'Can Manage premade',
+    'can_manage_FAQ'       => 'Can manage FAQ',
     'can_view_agent_stats' => 'Can view agent stats',
-    'department_access' => 'Department Access ',
-    'admin_notes' => 'Admin Notes',
-    'group_members' => 'Group Members',
-    'group_name' => 'Group Name',
+    'department_access'    => 'Department Access ',
+    'admin_notes'          => 'Admin Notes',
+    'group_members'        => 'Group Members',
+    'group_name'           => 'Group Name',
     /*
       |--------------------------------------
       |  SMTP Page
       |--------------------------------------
      */
-    'driver' => 'Driver',
-    'smtp' => 'SMTP',
-    'host' => 'Host',
-    'port' => 'Port',
+    'driver'     => 'Driver',
+    'smtp'       => 'SMTP',
+    'host'       => 'Host',
+    'port'       => 'Port',
     'encryption' => 'Encryption',
     /*
       |----------------------------------------------------------------------------------------
@@ -563,250 +563,250 @@ return array(
       | customize your views to better match your application.
       |
      */
-    'agent_panel' => 'Agent Panel',
-    'profile' => 'Profile',
-    'change_password' => 'Change Password',
-    'sign_out' => 'Sign Out',
-    'Tickets' => 'TICKETS',
-    'inbox' => 'Inbox',
-    'my_tickets' => 'My Tickets',
-    'unassigned' => 'Unassigned',
-    'trash' => 'Trash',
-    'Updates' => 'UPDATES',
-    'no_new_updates' => 'No new Updates',
+    'agent_panel'       => 'Agent Panel',
+    'profile'           => 'Profile',
+    'change_password'   => 'Change Password',
+    'sign_out'          => 'Sign Out',
+    'Tickets'           => 'TICKETS',
+    'inbox'             => 'Inbox',
+    'my_tickets'        => 'My Tickets',
+    'unassigned'        => 'Unassigned',
+    'trash'             => 'Trash',
+    'Updates'           => 'UPDATES',
+    'no_new_updates'    => 'No new Updates',
     'check_for_updates' => 'Check for Updates',
-    'open' => 'Open',
-    'inprogress' => 'Inprogress',
-    'closed' => 'Closed',
-    'Departments' => 'DEPARTMENTS',
-    'tools' => 'Tools',
-    'canned' => 'Canned',
-    'knowledge_base' => 'Knowledge Base',
-    'loading' => 'Loading',
-    'ratings' => 'Ratings',
-    'please_rate' => 'Please rate:',
-    'ticket_ratings' => 'TICKET RATING',
+    'open'              => 'Open',
+    'inprogress'        => 'Inprogress',
+    'closed'            => 'Closed',
+    'Departments'       => 'DEPARTMENTS',
+    'tools'             => 'Tools',
+    'canned'            => 'Canned',
+    'knowledge_base'    => 'Knowledge Base',
+    'loading'           => 'Loading',
+    'ratings'           => 'Ratings',
+    'please_rate'       => 'Please rate:',
+    'ticket_ratings'    => 'TICKET RATING',
     /*
       |-----------------------------------------------
       |  Profile
       |-----------------------------------------------
      */
-    'user_information' => 'User Information',
-    'time_zone' => 'Time-zone',
-    'phone_number' => 'Phone Number',
+    'user_information'    => 'User Information',
+    'time_zone'           => 'Time-zone',
+    'phone_number'        => 'Phone Number',
     'contact_information' => 'Contact Information',
     /*
       |-----------------------------------------------
       |  Dashboard
       |-----------------------------------------------
      */
-    'dashboard' => 'Dashboard',
+    'dashboard'  => 'Dashboard',
     'line_chart' => 'Line Chart',
     'statistics' => 'Statistics',
-    'opened' => 'Opened',
-    'resolved' => 'Resolved',
-    'closed' => 'Closed',
-    'deleted' => 'Deleted',
+    'opened'     => 'Opened',
+    'resolved'   => 'Resolved',
+    'closed'     => 'Closed',
+    'deleted'    => 'Deleted',
     /*
       |------------------------------------------------
       |User Page
       |------------------------------------------------
      */
-    'user_directory' => 'User Directory',
-    'ban' => 'Ban',
-    'user' => 'User',
-    'users' => 'Users',
-    'create_user' => 'Create User',
-    'full_name' => 'Full Name',
-    'mobile' => 'Mobile',
-    'last_login' => 'Last Login',
-    'user_profile' => 'User Profile',
-    'assign' => 'Assign',
-    'open_tickets' => 'Open Tickets',
-    'closed_tickets' => 'Closed Tickets',
+    'user_directory'  => 'User Directory',
+    'ban'             => 'Ban',
+    'user'            => 'User',
+    'users'           => 'Users',
+    'create_user'     => 'Create User',
+    'full_name'       => 'Full Name',
+    'mobile'          => 'Mobile',
+    'last_login'      => 'Last Login',
+    'user_profile'    => 'User Profile',
+    'assign'          => 'Assign',
+    'open_tickets'    => 'Open Tickets',
+    'closed_tickets'  => 'Closed Tickets',
     'deleted_tickets' => 'Deleted Tickets',
     /*
       |------------------------------------------------
       |Organization Page
       |------------------------------------------------
      */
-    'organizations' => 'Organizations',
-    'organization' => 'Organization',
-    'create_organization' => 'Create Organization',
-    'account_manager' => 'Account Manager',
-    'update' => 'update',
+    'organizations'                 => 'Organizations',
+    'organization'                  => 'Organization',
+    'create_organization'           => 'Create Organization',
+    'account_manager'               => 'Account Manager',
+    'update'                        => 'update',
     'please_select_an_organization' => 'Please select an Organization',
-    'please_select_an_user' => 'Please select an user',
-    'organization_profile' => 'Organization Profile',
-    'organization-s_head' => "Organization's Head",
-    'select_department_manager' => 'Select Department Manager',
-    'users_of' => 'Users of',
+    'please_select_an_user'         => 'Please select an user',
+    'organization_profile'          => 'Organization Profile',
+    'organization-s_head'           => "Organization's Head",
+    'select_department_manager'     => 'Select Department Manager',
+    'users_of'                      => 'Users of',
     /*
       |----------------------------------------------
       |  Ticket page
       |----------------------------------------------
      */
-    'subject' => 'Subject',
-    'ticket_id' => 'Ticket ID',
-    'priority' => 'Priority',
-    'from' => 'From',
-    'last_replier' => 'Last Replier',
-    'assigned_to' => 'Assigned To',
-    'last_activity' => 'Last Activity',
-    'answered' => 'Answered',
-    'assigned' => 'Assigned',
-    'create_ticket' => 'Create Ticket',
-    'tickets' => 'Tickets',
-    'open' => 'Open',
-    'Ticket_Information' => 'TICKET INFORMATION',
-    'Ticket_Id' => 'TICKET ID',
-    'User' => 'USER',
-    'Unassigned' => 'UNASSIGNED',
-    'generate_pdf' => 'Generate PDF',
-    'change_status' => 'Change Status',
-    'more' => 'More',
-    'delete_ticket' => 'Delete Ticket',
-    'emergency' => 'Emergency',
-    'high' => 'High',
-    'medium' => 'Medium',
-    'low' => 'Low',
-    'sla_plan' => 'SLA Plan',
-    'created_date' => 'Created Date',
-    'due_date' => 'Due Date',
-    'last_response' => 'Last Response',
-    'source' => 'Source',
-    'last_message' => 'Last Message',
-    'reply' => 'Reply',
-    'response' => 'Response',
-    'reply_content' => 'Reply Content',
-    'attachment' => 'Attachment',
-    'internal_note' => 'Internal Note',
-    'this_ticket_is_under_banned_user' => 'This ticket is under banned user',
-    'ticket_source' => 'Ticket Source',
-    'are_you_sure_to_ban' => 'Are you sure to ban',
-    'whome_do_you_want_to_assign_ticket' => 'Whome do you want to assign ticket',
+    'subject'                                        => 'Subject',
+    'ticket_id'                                      => 'Ticket ID',
+    'priority'                                       => 'Priority',
+    'from'                                           => 'From',
+    'last_replier'                                   => 'Last Replier',
+    'assigned_to'                                    => 'Assigned To',
+    'last_activity'                                  => 'Last Activity',
+    'answered'                                       => 'Answered',
+    'assigned'                                       => 'Assigned',
+    'create_ticket'                                  => 'Create Ticket',
+    'tickets'                                        => 'Tickets',
+    'open'                                           => 'Open',
+    'Ticket_Information'                             => 'TICKET INFORMATION',
+    'Ticket_Id'                                      => 'TICKET ID',
+    'User'                                           => 'USER',
+    'Unassigned'                                     => 'UNASSIGNED',
+    'generate_pdf'                                   => 'Generate PDF',
+    'change_status'                                  => 'Change Status',
+    'more'                                           => 'More',
+    'delete_ticket'                                  => 'Delete Ticket',
+    'emergency'                                      => 'Emergency',
+    'high'                                           => 'High',
+    'medium'                                         => 'Medium',
+    'low'                                            => 'Low',
+    'sla_plan'                                       => 'SLA Plan',
+    'created_date'                                   => 'Created Date',
+    'due_date'                                       => 'Due Date',
+    'last_response'                                  => 'Last Response',
+    'source'                                         => 'Source',
+    'last_message'                                   => 'Last Message',
+    'reply'                                          => 'Reply',
+    'response'                                       => 'Response',
+    'reply_content'                                  => 'Reply Content',
+    'attachment'                                     => 'Attachment',
+    'internal_note'                                  => 'Internal Note',
+    'this_ticket_is_under_banned_user'               => 'This ticket is under banned user',
+    'ticket_source'                                  => 'Ticket Source',
+    'are_you_sure_to_ban'                            => 'Are you sure to ban',
+    'whome_do_you_want_to_assign_ticket'             => 'Whome do you want to assign ticket',
     'are_you_sure_you_want_to_surrender_this_ticket' => 'Are you sure you want to surrender this Ticket',
-    'add_collaborator' => 'Add Collaborator',
-    'search_existing_users' => 'Search existing Users',
-    'add_new_user' => 'Add new User',
-    'search_existing_users_or_add_new_users' => 'Search existing users or add new users',
-    'search_by_email' => 'Search by Email',
-    'list_of_collaborators_of_this_ticket' => 'List of Collaborators of this Ticket',
-    'submit' => 'Submit',
-    'max' => 'Max',
-    'add_cc' => 'Add CC',
-    'recepients' => 'Recepients',
-    'select_a_canned_response' => 'Select a Canned Response',
-    'assign_to' => 'Assign to',
-    'detail' => 'Detail',
-    'user_details' => 'User Details',
-    'ticket_option' => 'Ticket Option',
-    'ticket_detail' => 'Ticket Detail',
-    'Assigned_To' => 'ASSIGNED TO',
-    'locked-ticket' => 'Alert! This ticket has been locked by another user and currently in process for response.',
-    'access-ticket' => 'Alert! This ticket has been locked by you for next ',
-    'minutes' => ' minutes',
-    'in_minutes'  =>  'In minutes',
-    'add_another_owner' =>  'Add another owner',
-    'search_user'   =>  'Search user',
+    'add_collaborator'                               => 'Add Collaborator',
+    'search_existing_users'                          => 'Search existing Users',
+    'add_new_user'                                   => 'Add new User',
+    'search_existing_users_or_add_new_users'         => 'Search existing users or add new users',
+    'search_by_email'                                => 'Search by Email',
+    'list_of_collaborators_of_this_ticket'           => 'List of Collaborators of this Ticket',
+    'submit'                                         => 'Submit',
+    'max'                                            => 'Max',
+    'add_cc'                                         => 'Add CC',
+    'recepients'                                     => 'Recepients',
+    'select_a_canned_response'                       => 'Select a Canned Response',
+    'assign_to'                                      => 'Assign to',
+    'detail'                                         => 'Detail',
+    'user_details'                                   => 'User Details',
+    'ticket_option'                                  => 'Ticket Option',
+    'ticket_detail'                                  => 'Ticket Detail',
+    'Assigned_To'                                    => 'ASSIGNED TO',
+    'locked-ticket'                                  => 'Alert! This ticket has been locked by another user and currently in process for response.',
+    'access-ticket'                                  => 'Alert! This ticket has been locked by you for next ',
+    'minutes'                                        => ' minutes',
+    'in_minutes'                                     => 'In minutes',
+    'add_another_owner'                              => 'Add another owner',
+    'search_user'                                    => 'Search user',
     /*
       |------------------------------------------------
       |Tools Page
       |------------------------------------------------
      */
-    'canned_response' => 'Canned Response',
+    'canned_response'        => 'Canned Response',
     'create_canned_response' => 'Create Canned Response',
-    'surrender' => 'Surrender',
-    'view' => 'View',
+    'surrender'              => 'Surrender',
+    'view'                   => 'View',
     /*
       |-----------------------------------------------
       | Main text
       |-----------------------------------------------
      */
-    'copyright' => 'Copyright',
+    'copyright'           => 'Copyright',
     'all_rights_reserved' => 'All right Reserved',
-    'powered_by' => 'Powered by',
+    'powered_by'          => 'Powered by',
     /*
       |------------------------------------------------
       |Guest-User Page
       |------------------------------------------------
      */
-    'issue_summary' => 'Issue Summary',
-    'issue_details' => 'Issue Details',
+    'issue_summary'        => 'Issue Summary',
+    'issue_details'        => 'Issue Details',
     'contact_informations' => 'Contact Informations',
-    'contact_details' => 'Contact Details',
-    'role' => 'Role',
-    'ext' => 'EXT',
-    'profile_pic' => 'Profile Picture',
-    'agent_sign' => 'Agent Signature',
-    'inactive' => 'Inactive',
-    'male' => 'Male',
-    'female' => 'Female',
-    'old_password' => 'Old Password',
-    'new_password' => 'New Password',
-    'confirm_password' => 'Confirm Password',
-    'gender' => 'Gender',
-    'ticket_number' => 'Ticket Number',
-    'content' => 'Content',
+    'contact_details'      => 'Contact Details',
+    'role'                 => 'Role',
+    'ext'                  => 'EXT',
+    'profile_pic'          => 'Profile Picture',
+    'agent_sign'           => 'Agent Signature',
+    'inactive'             => 'Inactive',
+    'male'                 => 'Male',
+    'female'               => 'Female',
+    'old_password'         => 'Old Password',
+    'new_password'         => 'New Password',
+    'confirm_password'     => 'Confirm Password',
+    'gender'               => 'Gender',
+    'ticket_number'        => 'Ticket Number',
+    'content'              => 'Content',
     /*
       |------------------------------------------------
       |   Error Pages
       |------------------------------------------------
      */
-    'not_found' => 'Not Found',
-    'oops_page_not_found' => 'Oops! Page not found',
+    'not_found'                                       => 'Not Found',
+    'oops_page_not_found'                             => 'Oops! Page not found',
     'we_could_not_find_the_page_you_were_looking_for' => 'We could not find the page you were looking for',
-    'internal_server_error' => 'Internal server Error',
-    'be_right_back' => 'Be right back',
-    'sorry' => 'Sorry',
-    'we_are_working_on_it' => 'We are working on it',
-    'category' => 'Category',
-    'addcategory' => 'Add Category',
-    'allcategory' => 'All Category',
-    'article' => 'Article',
-    'articles' => 'Articles',
-    'addarticle' => 'Add Article',
-    'allarticle' => 'All Article',
-    'pages' => 'Pages',
-    'addpages' => 'Add Pages',
-    'allpages' => 'All Pages',
-    'widgets' => 'Widgets',
-    'footer1' => 'Footer 1',
-    'footer2' => 'Footer 2',
-    'footer3' => 'Footer 3',
-    'footer4' => 'Footer 4',
-    'sidewidget1' => 'Side Widget 1',
-    'sidewidget2' => 'Side Widget 2',
-    'comments' => 'Comments',
-    'settings' => 'Settings',
-    'parent' => 'Parent',
-    'description' => 'Description',
-    'enter_the_description' => 'Enter the Description',
-    'publish' => 'Publish',
-    'published' => 'Published',
-    'draft' => 'Draft',
-    'create_a_category' => 'Create a Category',
-    'add' => 'add',
-    'social' => 'Social',
-    'comment' => 'Comment',
-    'not_published' => 'Not Published',
-    'numberofelementstodisplay' => 'Number of elements to display',
+    'internal_server_error'                           => 'Internal server Error',
+    'be_right_back'                                   => 'Be right back',
+    'sorry'                                           => 'Sorry',
+    'we_are_working_on_it'                            => 'We are working on it',
+    'category'                                        => 'Category',
+    'addcategory'                                     => 'Add Category',
+    'allcategory'                                     => 'All Category',
+    'article'                                         => 'Article',
+    'articles'                                        => 'Articles',
+    'addarticle'                                      => 'Add Article',
+    'allarticle'                                      => 'All Article',
+    'pages'                                           => 'Pages',
+    'addpages'                                        => 'Add Pages',
+    'allpages'                                        => 'All Pages',
+    'widgets'                                         => 'Widgets',
+    'footer1'                                         => 'Footer 1',
+    'footer2'                                         => 'Footer 2',
+    'footer3'                                         => 'Footer 3',
+    'footer4'                                         => 'Footer 4',
+    'sidewidget1'                                     => 'Side Widget 1',
+    'sidewidget2'                                     => 'Side Widget 2',
+    'comments'                                        => 'Comments',
+    'settings'                                        => 'Settings',
+    'parent'                                          => 'Parent',
+    'description'                                     => 'Description',
+    'enter_the_description'                           => 'Enter the Description',
+    'publish'                                         => 'Publish',
+    'published'                                       => 'Published',
+    'draft'                                           => 'Draft',
+    'create_a_category'                               => 'Create a Category',
+    'add'                                             => 'add',
+    'social'                                          => 'Social',
+    'comment'                                         => 'Comment',
+    'not_published'                                   => 'Not Published',
+    'numberofelementstodisplay'                       => 'Number of elements to display',
     //======================================
-    'language' => 'Language',
-    'save' => 'Save',
-    'create' => 'Create',
-    'dateformat' => 'Date Format',
-    'slug' => 'Slug',
-    'read_more' => 'Read more',
-    'view_all' => 'View All',
-    'categories' => 'Categories',
-    'need_more_support' => 'Need more support',
+    'language'                                                                 => 'Language',
+    'save'                                                                     => 'Save',
+    'create'                                                                   => 'Create',
+    'dateformat'                                                               => 'Date Format',
+    'slug'                                                                     => 'Slug',
+    'read_more'                                                                => 'Read more',
+    'view_all'                                                                 => 'View All',
+    'categories'                                                               => 'Categories',
+    'need_more_support'                                                        => 'Need more support',
     'if_you_did_not_find_an_answer_please_raise_a_ticket_describing_the_issue' => 'If you did not find an answer, please raise a ticket describing the issue',
-    'have_a_question?_type_your_search_term_here' => 'Have a question? Type your search term here...',
-    'search' => 'Search',
-    'frequently_asked_questions' => 'Frequently Asked Questions',
-    'leave_a_reply' => 'Leave a Reply',
-    'post_message' => 'Post Message',
+    'have_a_question?_type_your_search_term_here'                              => 'Have a question? Type your search term here...',
+    'search'                                                                   => 'Search',
+    'frequently_asked_questions'                                               => 'Frequently Asked Questions',
+    'leave_a_reply'                                                            => 'Leave a Reply',
+    'post_message'                                                             => 'Post Message',
     /*
       |--------------------------------------------------------------------------------------
       |  Client Panel [English(en)]
@@ -816,17 +816,17 @@ return array(
       | customize your views to better match your application.
       |
      */
-    'home' => 'Home',
-    'submit_a_ticket' => 'Submit A Ticket',
-    'my_profile' => 'My Profile',
-    'log_out' => 'Logout',
-    'forgot_password' => 'Forgot Password',
-    'create_account' => 'Create Account',
-    'you_are_here' => 'You are here',
-    'have_a_ticket' => 'Have a Ticket',
+    'home'                => 'Home',
+    'submit_a_ticket'     => 'Submit A Ticket',
+    'my_profile'          => 'My Profile',
+    'log_out'             => 'Logout',
+    'forgot_password'     => 'Forgot Password',
+    'create_account'      => 'Create Account',
+    'you_are_here'        => 'You are here',
+    'have_a_ticket'       => 'Have a Ticket',
     'check_ticket_status' => 'Check Ticket status',
     'choose_a_help_topic' => 'Choose a Help Topic',
-    'ticket_status' => 'Ticket Status',
-    'post_comment' => 'Post Comment',
-    'plugin' => 'Plugin',
-);
+    'ticket_status'       => 'Ticket Status',
+    'post_comment'        => 'Post Comment',
+    'plugin'              => 'Plugin',
+];
diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php
index 902a2c7e5..b42254185 100644
--- a/resources/lang/en/pagination.php
+++ b/resources/lang/en/pagination.php
@@ -14,5 +14,5 @@ return [
      */
 
     'previous' => '&laquo; Previous',
-    'next' => 'Next &raquo;',
+    'next'     => 'Next &raquo;',
 ];
diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
index 39d6700d3..854a0f6e1 100644
--- a/resources/lang/en/passwords.php
+++ b/resources/lang/en/passwords.php
@@ -13,9 +13,9 @@ return [
       |
      */
 
-    "password" => "Passwords must be at least six characters and match the confirmation.",
-    "user" => "We can't find a user with that e-mail address.",
-    "token" => "This password reset token is invalid.",
-    "sent" => "We have e-mailed your password reset link!",
-    "reset" => "Your password has been reset!",
+    'password' => 'Passwords must be at least six characters and match the confirmation.',
+    'user'     => "We can't find a user with that e-mail address.",
+    'token'    => 'This password reset token is invalid.',
+    'sent'     => 'We have e-mailed your password reset link!',
+    'reset'    => 'Your password has been reset!',
 ];
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index 83fdf5c73..b9f8609d2 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -13,66 +13,66 @@ return [
       |
      */
 
-    "accepted" => "The :attribute must be accepted.",
-    "active_url" => "The :attribute is not a valid URL.",
-    "after" => "The :attribute must be a date after :date.",
-    "alpha" => "The :attribute may only contain letters.",
-    "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
-    "alpha_num" => "The :attribute may only contain letters and numbers.",
-    "array" => "The :attribute must be an array.",
-    "before" => "The :attribute must be a date before :date.",
-    "between" => [
-        "numeric" => "The :attribute must be between :min and :max.",
-        "file" => "The :attribute must be between :min and :max kilobytes.",
-        "string" => "The :attribute must be between :min and :max characters.",
-        "array" => "The :attribute must have between :min and :max items.",
+    'accepted'   => 'The :attribute must be accepted.',
+    'active_url' => 'The :attribute is not a valid URL.',
+    'after'      => 'The :attribute must be a date after :date.',
+    'alpha'      => 'The :attribute may only contain letters.',
+    'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_num'  => 'The :attribute may only contain letters and numbers.',
+    'array'      => 'The :attribute must be an array.',
+    'before'     => 'The :attribute must be a date before :date.',
+    'between'    => [
+        'numeric' => 'The :attribute must be between :min and :max.',
+        'file'    => 'The :attribute must be between :min and :max kilobytes.',
+        'string'  => 'The :attribute must be between :min and :max characters.',
+        'array'   => 'The :attribute must have between :min and :max items.',
     ],
-    "boolean" => "The :attribute field must be true or false.",
-    "confirmed" => "The :attribute confirmation does not match.",
-    "date" => "The :attribute is not a valid date.",
-    "date_format" => "The :attribute does not match the format :format.",
-    "different" => "The :attribute and :other must be different.",
-    "digits" => "The :attribute must be :digits digits.",
-    "digits_between" => "The :attribute must be between :min and :max digits.",
-    "email" => "The :attribute must be a valid email address.",
-    "filled" => "The :attribute field is required.",
-    "exists" => "The selected :attribute is invalid.",
-    "image" => "The :attribute must be an image.",
-    "in" => "The selected :attribute is invalid.",
-    "integer" => "The :attribute must be an integer.",
-    "ip" => "The :attribute must be a valid IP address.",
-    "max" => [
-        "numeric" => "The :attribute may not be greater than :max.",
-        "file" => "The :attribute may not be greater than :max kilobytes.",
-        "string" => "The :attribute may not be greater than :max characters.",
-        "array" => "The :attribute may not have more than :max items.",
+    'boolean'        => 'The :attribute field must be true or false.',
+    'confirmed'      => 'The :attribute confirmation does not match.',
+    'date'           => 'The :attribute is not a valid date.',
+    'date_format'    => 'The :attribute does not match the format :format.',
+    'different'      => 'The :attribute and :other must be different.',
+    'digits'         => 'The :attribute must be :digits digits.',
+    'digits_between' => 'The :attribute must be between :min and :max digits.',
+    'email'          => 'The :attribute must be a valid email address.',
+    'filled'         => 'The :attribute field is required.',
+    'exists'         => 'The selected :attribute is invalid.',
+    'image'          => 'The :attribute must be an image.',
+    'in'             => 'The selected :attribute is invalid.',
+    'integer'        => 'The :attribute must be an integer.',
+    'ip'             => 'The :attribute must be a valid IP address.',
+    'max'            => [
+        'numeric' => 'The :attribute may not be greater than :max.',
+        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'string'  => 'The :attribute may not be greater than :max characters.',
+        'array'   => 'The :attribute may not have more than :max items.',
     ],
-    "mimes" => "The :attribute must be a file of type: :values.",
-    "min" => [
-        "numeric" => "The :attribute must be at least :min.",
-        "file" => "The :attribute must be at least :min kilobytes.",
-        "string" => "The :attribute must be at least :min characters.",
-        "array" => "The :attribute must have at least :min items.",
+    'mimes' => 'The :attribute must be a file of type: :values.',
+    'min'   => [
+        'numeric' => 'The :attribute must be at least :min.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min characters.',
+        'array'   => 'The :attribute must have at least :min items.',
     ],
-    "not_in" => "The selected :attribute is invalid.",
-    "numeric" => "The :attribute must be a number.",
-    "regex" => "The :attribute format is invalid.",
-    "required" => "The :attribute field is required.",
-    "required_if" => "The :attribute field is required when :other is :value.",
-    "required_with" => "The :attribute field is required when :values is present.",
-    "required_with_all" => "The :attribute field is required when :values is present.",
-    "required_without" => "The :attribute field is required when :values is not present.",
-    "required_without_all" => "The :attribute field is required when none of :values are present.",
-    "same" => "The :attribute and :other must match.",
-    "size" => [
-        "numeric" => "The :attribute must be :size.",
-        "file" => "The :attribute must be :size kilobytes.",
-        "string" => "The :attribute must be :size characters.",
-        "array" => "The :attribute must contain :size items.",
+    'not_in'               => 'The selected :attribute is invalid.',
+    'numeric'              => 'The :attribute must be a number.',
+    'regex'                => 'The :attribute format is invalid.',
+    'required'             => 'The :attribute field is required.',
+    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same'                 => 'The :attribute and :other must match.',
+    'size'                 => [
+        'numeric' => 'The :attribute must be :size.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must contain :size items.',
     ],
-    "unique" => "The :attribute has already been taken.",
-    "url" => "The :attribute format is invalid.",
-    "timezone" => "The :attribute must be a valid zone.",
+    'unique'   => 'The :attribute has already been taken.',
+    'url'      => 'The :attribute format is invalid.',
+    'timezone' => 'The :attribute must be a valid zone.',
     /*
       |--------------------------------------------------------------------------
       | Custom Validation Language Lines
diff --git a/resources/views/themes/default1/admin/helpdesk/setting.php b/resources/views/themes/default1/admin/helpdesk/setting.php
index 3ac00faa6..b5b8ad46d 100644
--- a/resources/views/themes/default1/admin/helpdesk/setting.php
+++ b/resources/views/themes/default1/admin/helpdesk/setting.php
@@ -5,4 +5,3 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-
diff --git a/resources/views/themes/default1/admin/kb/article/image.php b/resources/views/themes/default1/admin/kb/article/image.php
index 46b9d6c07..7c9d5471b 100644
--- a/resources/views/themes/default1/admin/kb/article/image.php
+++ b/resources/views/themes/default1/admin/kb/article/image.php
@@ -1,24 +1,24 @@
 <?php
+
 //Check if we are getting the image
 if (isset($_FILES['image'])) {
-	//Get the image array of details
-	$img = $_FILES['image'];
-	//The new path of the uploaded image, rand is just used for the sake of it
-	$path = "upload/" . rand() . $img["name"];
-	//Move the file to our new path
-	move_uploaded_file($img['tmp_name'], $path);
-	//Get image info, reuiqred to biuld the JSON object
-	$data = getimagesize($path);
-	//The direct link to the uploaded image, this might varyu depending on your script location
-	$link = "http://$_SERVER[HTTP_HOST]" . "/codex/" . $path;
-	//Here we are constructing the JSON Object
-	$res = array("upload" => array(
-		"links" => array("original" => $link),
-		"image" => array("width" => $data[0],
-			"height" => $data[1],
-		),
-	));
-	//echo out the response :)
-	echo json_encode($res);
+    //Get the image array of details
+    $img = $_FILES['image'];
+    //The new path of the uploaded image, rand is just used for the sake of it
+    $path = 'upload/'.rand().$img['name'];
+    //Move the file to our new path
+    move_uploaded_file($img['tmp_name'], $path);
+    //Get image info, reuiqred to biuld the JSON object
+    $data = getimagesize($path);
+    //The direct link to the uploaded image, this might varyu depending on your script location
+    $link = "http://$_SERVER[HTTP_HOST]".'/codex/'.$path;
+    //Here we are constructing the JSON Object
+    $res = ['upload' => [
+        'links' => ['original' => $link],
+        'image' => ['width' => $data[0],
+            'height'        => $data[1],
+        ],
+    ]];
+    //echo out the response :)
+    echo json_encode($res);
 }
-?>
\ No newline at end of file
diff --git a/resources/views/themes/default1/agent/kb/article/image.php b/resources/views/themes/default1/agent/kb/article/image.php
index 46b9d6c07..7c9d5471b 100644
--- a/resources/views/themes/default1/agent/kb/article/image.php
+++ b/resources/views/themes/default1/agent/kb/article/image.php
@@ -1,24 +1,24 @@
 <?php
+
 //Check if we are getting the image
 if (isset($_FILES['image'])) {
-	//Get the image array of details
-	$img = $_FILES['image'];
-	//The new path of the uploaded image, rand is just used for the sake of it
-	$path = "upload/" . rand() . $img["name"];
-	//Move the file to our new path
-	move_uploaded_file($img['tmp_name'], $path);
-	//Get image info, reuiqred to biuld the JSON object
-	$data = getimagesize($path);
-	//The direct link to the uploaded image, this might varyu depending on your script location
-	$link = "http://$_SERVER[HTTP_HOST]" . "/codex/" . $path;
-	//Here we are constructing the JSON Object
-	$res = array("upload" => array(
-		"links" => array("original" => $link),
-		"image" => array("width" => $data[0],
-			"height" => $data[1],
-		),
-	));
-	//echo out the response :)
-	echo json_encode($res);
+    //Get the image array of details
+    $img = $_FILES['image'];
+    //The new path of the uploaded image, rand is just used for the sake of it
+    $path = 'upload/'.rand().$img['name'];
+    //Move the file to our new path
+    move_uploaded_file($img['tmp_name'], $path);
+    //Get image info, reuiqred to biuld the JSON object
+    $data = getimagesize($path);
+    //The direct link to the uploaded image, this might varyu depending on your script location
+    $link = "http://$_SERVER[HTTP_HOST]".'/codex/'.$path;
+    //Here we are constructing the JSON Object
+    $res = ['upload' => [
+        'links' => ['original' => $link],
+        'image' => ['width' => $data[0],
+            'height'        => $data[1],
+        ],
+    ]];
+    //echo out the response :)
+    echo json_encode($res);
 }
-?>
\ No newline at end of file
diff --git a/server.php b/server.php
index c7e378dff..1be7747e0 100644
--- a/server.php
+++ b/server.php
@@ -1,21 +1,18 @@
 <?php
 /**
- * Laravel - A PHP Framework For Web Artisans
+ * Laravel - A PHP Framework For Web Artisans.
  *
- * @package  Laravel
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  */
-
 $uri = urldecode(
-	parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
+    parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
 );
 
 // This file allows us to emulate Apache's "mod_rewrite" functionality from the
 // built-in PHP web server. This provides a convenient way to test a Laravel
 // application without having installed a "real" web server software here.
-if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri))
-{
-	return false;
+if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
+    return false;
 }
 
 require_once __DIR__.'/public/index.php';
diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php
index d6ee1031c..258e5ff21 100644
--- a/tests/ExampleTest.php
+++ b/tests/ExampleTest.php
@@ -1,17 +1,16 @@
 <?php
 
-class ExampleTest extends TestCase {
-
-	/**
-	 * A basic functional test example.
-	 *
-	 * @return void
-	 */
-	public function testBasicExample()
-	{
-		// $response = $this->call('GET', '/');
-
-		// $this->assertEquals(200, $response->getStatusCode());
-	}
+class ExampleTest extends TestCase
+{
+    /**
+     * A basic functional test example.
+     *
+     * @return void
+     */
+    public function testBasicExample()
+    {
+        // $response = $this->call('GET', '/');
 
+        // $this->assertEquals(200, $response->getStatusCode());
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 69726c3b3..069f0b84b 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,19 +1,18 @@
 <?php
 
-class TestCase extends Illuminate\Foundation\Testing\TestCase {
+class TestCase extends Illuminate\Foundation\Testing\TestCase
+{
+    /**
+     * Creates the application.
+     *
+     * @return \Illuminate\Foundation\Application
+     */
+    public function createApplication()
+    {
+        $app = require __DIR__.'/../bootstrap/app.php';
 
-	/**
-	 * Creates the application.
-	 *
-	 * @return \Illuminate\Foundation\Application
-	 */
-	public function createApplication()
-	{
-		$app = require __DIR__.'/../bootstrap/app.php';
-
-		$app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
-
-		return $app;
-	}
+        $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
 
+        return $app;
+    }
 }