Apply fixes from StyleCI

2017-05-23 10:18:08 +00:00
parent 4ec6000d69
commit 7b8ee415be
8 changed files with 91 additions and 68 deletions
--- a/app/FaveoStorage/Controllers/StorageController.php
+++ b/app/FaveoStorage/Controllers/StorageController.php
@@ -9,8 +9,8 @@ use App\Model\helpdesk\Ticket\Ticket_Thread;
 use Config;
 use Storage;

-class StorageController extends Controller {
-
+class StorageController extends Controller
+{
    protected $default;
    protected $driver;
    protected $root;
@@ -25,7 +25,8 @@ class StorageController extends Controller {
    protected $rackspace_endpoint;
    protected $rackspace_url_type;

-    public function __construct() {
+    public function __construct()
+    {
        $this->default = $this->defaults();
        $this->driver = $this->driver();
        $this->root = $this->root();
@@ -40,7 +41,8 @@ class StorageController extends Controller {
        $this->rackspace_username = $this->rackspaceUsername();
    }

-    protected function settings($option) {
+    protected function settings($option)
+    {
        $settings = new CommonSettings();
        $setting = $settings->getOptionValue('storage', $option);
        $value = '';
@@ -51,7 +53,8 @@ class StorageController extends Controller {
        return $value;
    }

-    public function defaults() {
+    public function defaults()
+    {
        $default = 'local';
        if ($this->settings('default')) {
            $default = $this->settings('default');
@@ -60,11 +63,13 @@ class StorageController extends Controller {
        return $default;
    }

-    public function driver() {
+    public function driver()
+    {
        return $this->settings('default');
    }

-    public function root() {
+    public function root()
+    {
        $root = storage_path('app');
        if ($this->settings('root')) {
            $root = $this->settings('root');
@@ -73,47 +78,58 @@ class StorageController extends Controller {
        return $root;
    }

-    public function s3Key() {
+    public function s3Key()
+    {
        return $this->settings('s3_key');
    }

-    public function s3Region() {
+    public function s3Region()
+    {
        return $this->settings('s3_region');
    }

-    public function s3Secret() {
+    public function s3Secret()
+    {
        return $this->settings('s3_secret');
    }

-    public function s3Bucket() {
+    public function s3Bucket()
+    {
        return $this->settings('s3_bucket');
    }

-    public function rackspaceKey() {
+    public function rackspaceKey()
+    {
        return $this->settings('root');
    }

-    public function rackspaceRegion() {
+    public function rackspaceRegion()
+    {
        return $this->settings('rackspace_region');
    }

-    public function rackspaceUsername() {
+    public function rackspaceUsername()
+    {
        return $this->settings('rackspace_username');
    }

-    public function rackspaceContainer() {
+    public function rackspaceContainer()
+    {
        return $this->settings('rackspace_container');
    }

-    public function rackspaceEndpoint() {
+    public function rackspaceEndpoint()
+    {
        return $this->settings('rackspace_endpoint');
    }

-    public function rackspaceUrlType() {
+    public function rackspaceUrlType()
+    {
        return $this->settings('rackspace_url_type');
    }

-    protected function setFileSystem() {
+    protected function setFileSystem()
+    {
        $config = $this->config();
        //dd($config);
        foreach ($config as $key => $con) {
@@ -128,7 +144,8 @@ class StorageController extends Controller {
        return Config::get('filesystem');
    }

-    protected function config() {
+    protected function config()
+    {
        return [
            'default' => $this->default,
            'cloud'   => 's3',
@@ -136,7 +153,8 @@ class StorageController extends Controller {
        ];
    }

-    protected function disks() {
+    protected function disks()
+    {
        return [
            'local' => [
                'driver' => 'local',
@@ -161,7 +179,8 @@ class StorageController extends Controller {
        ];
    }

-    public function upload($data, $filename, $type, $size, $disposition, $thread_id) {
+    public function upload($data, $filename, $type, $size, $disposition, $thread_id)
+    {
        $upload = new Ticket_attachments();
        $upload->thread_id = $thread_id;
        $upload->name = $filename;
@@ -185,23 +204,23 @@ class StorageController extends Controller {
        }
    }

-    public function saveAttachments($thread_id, $attachments = []) {
+    public function saveAttachments($thread_id, $attachments = [])
+    {
        $disposition = 'ATTACHMENT';
        $thread = '';
        foreach ($attachments as $attachment) {
            if (is_object($attachment)) {
                if (method_exists($attachment, 'getStructure')) {
-
                    $structure = $attachment->getStructure();
                    if (isset($structure->disposition)) {
                        $disposition = $structure->disposition;
                    }
-                    $filename = rand(1111, 9999) . "_" . $attachment->getFileName();
+                    $filename = rand(1111, 9999).'_'.$attachment->getFileName();
                    $type = $attachment->getMimeType();
                    $size = $attachment->getSize();
                    $data = $attachment->getData();
                } else {
-                    $filename = rand(1111, 9999) . "_" . $attachment->getClientOriginalName();
+                    $filename = rand(1111, 9999).'_'.$attachment->getClientOriginalName();
                    $type = $attachment->getMimeType();
                    $size = $attachment->getSize();
                    $data = file_get_contents($attachment->getRealPath());
@@ -210,10 +229,12 @@ class StorageController extends Controller {
                $thread = $this->updateBody($attachment, $thread_id, $filename);
            }
        }
+
        return $thread;
    }

-    public function updateBody($attachment, $thread_id, $filename) {
+    public function updateBody($attachment, $thread_id, $filename)
+    {
        $threads = new Ticket_Thread();
        $thread = $threads->find($thread_id);
        $disposition = 'ATTACHMENT';
@@ -235,17 +256,19 @@ class StorageController extends Controller {
            $thread->body = $body;
            $thread->save();
        }
+
        return $thread;
    }

-    public function getFile($drive, $name, $root) {
-        if ($drive != "database") {
+    public function getFile($drive, $name, $root)
+    {
+        if ($drive != 'database') {
            $root = $root.DIRECTORY_SEPARATOR.$name;
            if (\File::exists($root)) {
                chmod($root, 0755);
+
                return \File::get($root);
            }
        }
    }
-
 }
--- a/app/Http/Controllers/Agent/helpdesk/TicketController.php
+++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php
@@ -37,10 +37,11 @@ use App\Model\helpdesk\Utility\Date_time_format;
 use App\Model\helpdesk\Utility\Timezones;
 use App\User;
 use Auth;
+use Crypt;
 use DB;
 use Exception;
-use GeoIP;
 // classes
+use GeoIP;
 use Hash;
 use Illuminate\Http\Request;
 use Illuminate\support\Collection;
@@ -49,7 +50,6 @@ use Lang;
 use Mail;
 use PDF;
 use UTC;
-use Crypt;

 /**
 * TicketController.
@@ -543,7 +543,7 @@ class TicketController extends Controller
                            'ticket_number' => $ticket_number,
                            'user'          => $username,
                            'agent_sign'    => $agentsign,
-                            'system_link'=>$link
+                            'system_link'   => $link,
                        ]
                );
            }
--- a/app/Http/Controllers/Agent/helpdesk/UserController.php
+++ b/app/Http/Controllers/Agent/helpdesk/UserController.php
@@ -769,7 +769,7 @@ class UserController extends Controller
            // fetching upload destination path
                $destinationPath = 'uploads/profilepic';
            // adding a random value to profile picture filename
-                $fileName = rand(0000, 9999).'.'.str_replace(" ", "_", $name);
+                $fileName = rand(0000, 9999).'.'.str_replace(' ', '_', $name);
            // moving the picture to a destination folder
                Input::file('profile_pic')->move($destinationPath, $fileName);
            // saving filename to database
--- a/app/Http/Controllers/Client/helpdesk/FormController.php
+++ b/app/Http/Controllers/Client/helpdesk/FormController.php
@@ -249,6 +249,7 @@ class FormController extends Controller
            }
        } catch (\Exception $ex) {
            dd($ex);
+
            return redirect()->back()->with('fails', $ex->getMessage());
        }
 //        dd($result);
--- a/app/Http/Controllers/Client/helpdesk/GuestController.php
+++ b/app/Http/Controllers/Client/helpdesk/GuestController.php
@@ -101,7 +101,7 @@ class GuestController extends Controller
            // fetching upload destination path
                $destinationPath = 'uploads/profilepic';
            // adding a random value to profile picture filename
-                $fileName = rand(0000, 9999).'.'.str_replace(" ", "_", $name);
+                $fileName = rand(0000, 9999).'.'.str_replace(' ', '_', $name);
            // moving the picture to a destination folder
                Input::file('profile_pic')->move($destinationPath, $fileName);
            // saving filename to database
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -4,11 +4,9 @@ namespace App\Http\Middleware;

 use Closure;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
-use Lang;

 class VerifyCsrfToken extends BaseVerifier
 {
-    
    /**
     * The URIs that should be excluded from CSRF verification.
     *
@@ -16,7 +14,7 @@ class VerifyCsrfToken extends BaseVerifier
     */
    protected $except = [
        'CheckSerial',
-        'api/v1/*'
+        'api/v1/*',
    ];

    /**
--- a/app/Model/helpdesk/Ticket/Ticket_attachments.php
+++ b/app/Model/helpdesk/Ticket/Ticket_attachments.php
@@ -35,7 +35,7 @@ class Ticket_attachments extends Model
            if ($content) {
                $value = base64_encode($content);
                if (mime($this->type) != 'image') {
-                    $root = $root . "/" . $name;
+                    $root = $root.'/'.$name;
                    chmod($root, 1204);
                }
            }
--- a/app/User.php
+++ b/app/User.php
@@ -45,7 +45,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
            $pic = $this->checkArray('avatar', $info);
        }
        if (!$pic && $value) {
-            $pic = "";
+            $pic = '';
            $file = asset('uploads/profilepic/'.$value);
            if ($file) {
                $type = pathinfo($file, PATHINFO_EXTENSION);
@@ -56,6 +56,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
        if (!$value) {
            $pic = \Gravatar::src($this->attributes['email']);
        }
+
        return $pic;
    }