@@ -272,6 +272,9 @@ |
||
272 | 272 | return $this->belongsTo($related, 'organization'); |
273 | 273 | } |
274 | 274 | |
275 | + /** |
|
276 | + * @return string |
|
277 | + */ |
|
275 | 278 | public function getOrganization() { |
276 | 279 | $name = ""; |
277 | 280 | if ($this->getOrganizationRelation()) { |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | if ($attr) { |
85 | 85 | $attrs = $this->locationRelation()->first(); |
86 | 86 | if ($attrs) { |
87 | - $value = "<a href=" . url('service-desk/location-types/' . $attr . '/show') . ">$attrs->title</a>"; |
|
87 | + $value = "<a href=".url('service-desk/location-types/'.$attr.'/show').">$attrs->title</a>"; |
|
88 | 88 | } |
89 | 89 | } |
90 | 90 | return ucfirst($value); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | if ($attr) { |
109 | 109 | $attrs = $this->usedBy()->first(); |
110 | 110 | if ($attrs) { |
111 | - $value = ucfirst($attrs->first_name) . " " . ucfirst($attrs->last_name); |
|
111 | + $value = ucfirst($attrs->first_name)." ".ucfirst($attrs->last_name); |
|
112 | 112 | if ($value == " ") { |
113 | 113 | $value = $attrs->user_name; |
114 | 114 | } |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | if ($attr) { |
124 | 124 | $attrs = $this->managedBy()->first(); |
125 | 125 | if ($attrs) { |
126 | - $value = ucfirst($attrs->first_name) . " " . ucfirst($attrs->last_name); |
|
126 | + $value = ucfirst($attrs->first_name)." ".ucfirst($attrs->last_name); |
|
127 | 127 | if ($value == " ") { |
128 | 128 | $value = $attrs->user_name; |
129 | 129 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | if ($attr) { |
139 | 139 | $attrs = $this->product()->first(); |
140 | 140 | if ($attrs) { |
141 | - $value = "<a href=" . url('service-desk/products/' . $attr . '/show') . ">$attrs->name</a>"; |
|
141 | + $value = "<a href=".url('service-desk/products/'.$attr.'/show').">$attrs->name</a>"; |
|
142 | 142 | } |
143 | 143 | } |
144 | 144 | return $value; |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | $relations = $relation->lists('asset_ids', 'id')->toArray(); |
226 | 226 | $array = array_dot($relations); |
227 | 227 | $id = $this->attributes['id']; |
228 | - $array1 = array_where($array, function ($key, $value) use($id) { |
|
228 | + $array1 = array_where($array, function($key, $value) use($id) { |
|
229 | 229 | if ($value == $id) { |
230 | 230 | return $value; |
231 | 231 | } |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | $orgs = $this->getOrganizationRelation()->first(); |
291 | 291 | if ($orgs) { |
292 | 292 | $id = $orgs->id; |
293 | - $name = "<a href=" . url('organizations/' . $id) . ">" . ucfirst($org) . "</a>"; |
|
293 | + $name = "<a href=".url('organizations/'.$id).">".ucfirst($org)."</a>"; |
|
294 | 294 | } |
295 | 295 | } |
296 | 296 | return $name; |
@@ -76,6 +76,9 @@ discard block |
||
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
79 | + /** |
|
80 | + * @return string |
|
81 | + */ |
|
79 | 82 | public function getOrganization() |
80 | 83 | { |
81 | 84 | $name = ''; |
@@ -124,6 +127,9 @@ discard block |
||
124 | 127 | return $infos; |
125 | 128 | } |
126 | 129 | |
130 | + /** |
|
131 | + * @param string $key |
|
132 | + */ |
|
127 | 133 | public function checkArray($key, $array) |
128 | 134 | { |
129 | 135 | $value = ''; |
@@ -29,6 +29,9 @@ discard block |
||
29 | 29 | var $message; |
30 | 30 | var $status; |
31 | 31 | |
32 | + /** |
|
33 | + * @param string $status |
|
34 | + */ |
|
32 | 35 | function __construct($message, $status = STATUS_OK) { |
33 | 36 | $this->message = $message; |
34 | 37 | $this->status = $status; |
@@ -117,7 +120,7 @@ discard block |
||
117 | 120 | /** |
118 | 121 | * Validate memory limit |
119 | 122 | * |
120 | - * @param array $result |
|
123 | + * @param array $results |
|
121 | 124 | */ |
122 | 125 | function validate_memory_limit(&$results) { |
123 | 126 | $memory_limit = php_config_value_to_bytes(ini_get('memory_limit')); |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | @endif |
22 | 22 | <?php |
23 | 23 | define('PROBE_VERSION', '1.0'); |
24 | -define('PROBE_FOR', 'Faveo HELPDESK '. Config::get('app.version').' and Newer'); |
|
24 | +define('PROBE_FOR', 'Faveo HELPDESK '.Config::get('app.version').' and Newer'); |
|
25 | 25 | define('STATUS_OK', 'Ok'); |
26 | 26 | define('STATUS_WARNING', 'Warning'); |
27 | 27 | define('STATUS_ERROR', 'Error'); |
@@ -54,10 +54,10 @@ discard block |
||
54 | 54 | |
55 | 55 | function validate_php(&$results) { |
56 | 56 | if (version_compare(PHP_VERSION, '5.5') == -1) { |
57 | - $results[] = new TestResult('Minimum PHP version required in order to run Faveo HELPDESK is PHP 5.5. Your PHP version: ' . PHP_VERSION, STATUS_ERROR); |
|
57 | + $results[] = new TestResult('Minimum PHP version required in order to run Faveo HELPDESK is PHP 5.5. Your PHP version: '.PHP_VERSION, STATUS_ERROR); |
|
58 | 58 | return false; |
59 | 59 | } else { |
60 | - $results[] = new TestResult('Your PHP version is ' . PHP_VERSION, STATUS_OK); |
|
60 | + $results[] = new TestResult('Your PHP version is '.PHP_VERSION, STATUS_OK); |
|
61 | 61 | return true; |
62 | 62 | } // if |
63 | 63 | } // validate_php |
@@ -94,18 +94,18 @@ discard block |
||
94 | 94 | function checkFilePermission(&$results) |
95 | 95 | { |
96 | 96 | $path2 = base_path().DIRECTORY_SEPARATOR.'storage'; |
97 | - $f2 = substr(sprintf("%o",fileperms($path2)),-3); |
|
98 | - if (file_exists(base_path() . DIRECTORY_SEPARATOR . "example.env")) { |
|
97 | + $f2 = substr(sprintf("%o", fileperms($path2)), -3); |
|
98 | + if (file_exists(base_path().DIRECTORY_SEPARATOR."example.env")) { |
|
99 | 99 | $path1 = base_path().DIRECTORY_SEPARATOR.'example.env'; |
100 | - $f1 = substr(sprintf("%o",fileperms($path1)),-3); |
|
100 | + $f1 = substr(sprintf("%o", fileperms($path1)), -3); |
|
101 | 101 | } else { |
102 | 102 | $f1 = '644'; |
103 | 103 | } |
104 | - if( $f1 >= '644' && $f2 >= '755') { |
|
104 | + if ($f1 >= '644' && $f2 >= '755') { |
|
105 | 105 | $results[] = new TestResult('File permission looks fine', STATUS_OK); |
106 | 106 | return true; |
107 | 107 | } else { |
108 | - if(isset($path1)){ |
|
108 | + if (isset($path1)) { |
|
109 | 109 | $results[] = new TestResult('File permissions needed.<ul><b>Change file permission for following files</b><li>'.$path1.'%nbsp: \'644\'</li><li>'.$path2.'%nbsp: \'755\'</li></ul></br>Change the permission manually on your server or <a href="change-file-permission">click here.</a>', STATUS_ERROR); |
110 | 110 | } else { |
111 | 111 | $results[] = new TestResult('File permissions needed.<ul><b>Change file permission to "755" for following files</b><li>'.$path2.'</li></ul></br>Change the permission manually on your server or <a href="change-file-permission">click here.</a>', STATUS_ERROR); |
@@ -125,10 +125,10 @@ discard block |
||
125 | 125 | $formatted_memory_limit = $memory_limit === -1 ? 'unlimited' : format_file_size($memory_limit); |
126 | 126 | |
127 | 127 | if ($memory_limit === -1 || $memory_limit >= 67108864) { |
128 | - $results[] = new TestResult('Your memory limit is: ' . $formatted_memory_limit, STATUS_OK); |
|
128 | + $results[] = new TestResult('Your memory limit is: '.$formatted_memory_limit, STATUS_OK); |
|
129 | 129 | return true; |
130 | 130 | } else { |
131 | - $results[] = new TestResult('Your memory is too low to complete the installation. Minimal value is 64MB, and you have it set to ' . $formatted_memory_limit, STATUS_ERROR); |
|
131 | + $results[] = new TestResult('Your memory is too low to complete the installation. Minimal value is 64MB, and you have it set to '.$formatted_memory_limit, STATUS_ERROR); |
|
132 | 132 | return false; |
133 | 133 | } // if |
134 | 134 | } // validate_memory_limit |
@@ -153,11 +153,11 @@ discard block |
||
153 | 153 | foreach ($data as $unit => $bytes) { |
154 | 154 | $in_unit = $value / $bytes; |
155 | 155 | if ($in_unit > 0.9) { |
156 | - return trim(trim(number_format($in_unit, 2), '0'), '.') . $unit; |
|
156 | + return trim(trim(number_format($in_unit, 2), '0'), '.').$unit; |
|
157 | 157 | } // if |
158 | 158 | } // foreach |
159 | 159 | |
160 | - return $value . 'b'; |
|
160 | + return $value.'b'; |
|
161 | 161 | } // format_file_size |
162 | 162 | |
163 | 163 | function validate_zend_compatibility_mode(&$results) { |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | foreach ($sets as $key) { |
235 | 235 | $key = trim($key); |
236 | 236 | foreach ($required_functions as $value) { |
237 | - if($key == $value) { |
|
237 | + if ($key == $value) { |
|
238 | 238 | if (strpos(ini_get('disable_functions'), $key) !== false) { |
239 | 239 | $results[] = new TestResult("Function '$value' is required in order to run Faveo Helpdesk. Please check php.ini to enable this function or contact your server administrator", STATUS_ERROR); |
240 | 240 | $ok = false; |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | function checkMaxExecutiontime(&$results) |
251 | 251 | { |
252 | 252 | $ok = true; |
253 | - if ((int)ini_get('max_execution_time') >= 120) { |
|
253 | + if ((int) ini_get('max_execution_time') >= 120) { |
|
254 | 254 | $results[] = new TestResult("Maximum execution time is as per requirement.", STATUS_OK); |
255 | 255 | } else { |
256 | 256 | $results[] = new TestResult("Maximum execution time is too low. Recommneded execution time is 120 seconds ", STATUS_WARNING); |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | <p class="setup-actions step"> |
274 | 274 | <?php |
275 | 275 | foreach ($results as $result) { |
276 | - print '<span class="' . strtolower($result->status) . '">' . $result->status . '</span> — ' . $result->message . '<br/>'; |
|
276 | + print '<span class="'.strtolower($result->status).'">'.$result->status.'</span> — '.$result->message.'<br/>'; |
|
277 | 277 | } // foreach |
278 | 278 | ?> |
279 | 279 | </p> |
@@ -43,6 +43,10 @@ |
||
43 | 43 | class TestResult { |
44 | 44 | var $message; |
45 | 45 | var $status; |
46 | + |
|
47 | + /** |
|
48 | + * @param string $status |
|
49 | + */ |
|
46 | 50 | function __construct($message, $status = STATUS_OK) { |
47 | 51 | $this->message = $message; |
48 | 52 | $this->status = $status; |
@@ -55,14 +55,14 @@ discard block |
||
55 | 55 | $results = array(); |
56 | 56 | // error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE); |
57 | 57 | error_reporting(0); |
58 | - if($default == 'mysql') { |
|
58 | + if ($default == 'mysql') { |
|
59 | 59 | if ($connection = mysqli_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME)) { |
60 | - $results[] = new TestResult('Connected to database as ' . DB_USER . '@' . DB_HOST . DB_PORT, STATUS_OK); |
|
60 | + $results[] = new TestResult('Connected to database as '.DB_USER.'@'.DB_HOST.DB_PORT, STATUS_OK); |
|
61 | 61 | if (mysqli_select_db($connection, DB_NAME)) { |
62 | - $results[] = new TestResult('Database "' . DB_NAME . '" selected', STATUS_OK); |
|
62 | + $results[] = new TestResult('Database "'.DB_NAME.'" selected', STATUS_OK); |
|
63 | 63 | $mysqli_version = mysqli_get_server_info($connection); |
64 | 64 | if (version_compare($mysqli_version, '5') >= 0) { |
65 | - $results[] = new TestResult('MySQL version is ' . $mysqli_version, STATUS_OK); |
|
65 | + $results[] = new TestResult('MySQL version is '.$mysqli_version, STATUS_OK); |
|
66 | 66 | // $have_inno = check_have_inno($connection); |
67 | 67 | $sql = "SHOW TABLES FROM ".DB_NAME; |
68 | 68 | $res = mysqli_query($connection, $sql); |
@@ -74,15 +74,15 @@ discard block |
||
74 | 74 | $mysqli_ok = false; |
75 | 75 | } |
76 | 76 | } else { |
77 | - $results[] = new TestResult('Your MySQL version is ' . $mysqli_version . '. We recommend upgrading to at least MySQL5!', STATUS_ERROR); |
|
77 | + $results[] = new TestResult('Your MySQL version is '.$mysqli_version.'. We recommend upgrading to at least MySQL5!', STATUS_ERROR); |
|
78 | 78 | $mysqli_ok = false; |
79 | 79 | } // if |
80 | 80 | } else { |
81 | - $results[] = new TestResult('Failed to select database. ' . mysqli_error(), STATUS_ERROR); |
|
81 | + $results[] = new TestResult('Failed to select database. '.mysqli_error(), STATUS_ERROR); |
|
82 | 82 | $mysqli_ok = false; |
83 | 83 | } // if |
84 | 84 | } else { |
85 | - $results[] = new TestResult('Failed to connect to database. ' . mysqli_error(), STATUS_ERROR); |
|
85 | + $results[] = new TestResult('Failed to connect to database. '.mysqli_error(), STATUS_ERROR); |
|
86 | 86 | $mysqli_ok = false; |
87 | 87 | } // if |
88 | 88 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | // dd($results); |
103 | 103 | ?><p class="setup-actions step"><?php |
104 | 104 | foreach ($results as $result) { |
105 | - print '<br><span class="' . strtolower($result->status) . '">' . $result->status . '</span> — ' . $result->message . ''; |
|
105 | + print '<br><span class="'.strtolower($result->status).'">'.$result->status.'</span> — '.$result->message.''; |
|
106 | 106 | } // foreach |
107 | 107 | ?> </p> |
108 | 108 | <!-- </ul> --> |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | <li>DB_NAME — Name of the database you are connecting to</li> |
116 | 116 | </ul> |
117 | 117 | <p>Once these settings are set, probe.php will check if your database meets the system requirements.</p> |
118 | -<?php $mysqli_ok = null;?> |
|
118 | +<?php $mysqli_ok = null; ?> |
|
119 | 119 | <?php } ?> |
120 | 120 | |
121 | 121 | <?php if ($mysqli_ok !== null) {?> |
@@ -175,7 +175,7 @@ |
||
175 | 175 | 'Chumper\Datatable\DatatableServiceProvider', |
176 | 176 | 'Chumper\Zipper\ZipperServiceProvider', |
177 | 177 | 'Tymon\JWTAuth\Providers\JWTAuthServiceProvider', |
178 | - \Torann\GeoIP\GeoIPServiceProvider::class, |
|
178 | + \Torann\GeoIP\GeoIPServiceProvider::class, |
|
179 | 179 | Unisharp\Laravelfilemanager\LaravelFilemanagerServiceProvider::class, |
180 | 180 | Intervention\Image\ImageServiceProvider::class, |
181 | 181 | Unisharp\Ckeditor\ServiceProvider::class, |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | 'enabled' => true, |
31 | 31 | 'driver' => 'file', // redis, file, pdo, custom |
32 | 32 | 'path' => storage_path('debugbar'), // For file driver |
33 | - 'connection' => null, // Leave null for default connection (Redis/PDO) |
|
33 | + 'connection' => null, // Leave null for default connection (Redis/PDO) |
|
34 | 34 | 'provider' => '', // Instance of StorageInterface for custom driver |
35 | 35 | ], |
36 | 36 | |
@@ -83,26 +83,26 @@ discard block |
||
83 | 83 | */ |
84 | 84 | |
85 | 85 | 'collectors' => [ |
86 | - 'phpinfo' => true, // Php version |
|
87 | - 'messages' => true, // Messages |
|
88 | - 'time' => true, // Time Datalogger |
|
89 | - 'memory' => true, // Memory usage |
|
90 | - 'exceptions' => true, // Exception displayer |
|
91 | - 'log' => true, // Logs from Monolog (merged in messages if enabled) |
|
92 | - 'db' => true, // Show database (PDO) queries and bindings |
|
93 | - 'views' => true, // Views with their data |
|
94 | - 'route' => true, // Current route information |
|
86 | + 'phpinfo' => true, // Php version |
|
87 | + 'messages' => true, // Messages |
|
88 | + 'time' => true, // Time Datalogger |
|
89 | + 'memory' => true, // Memory usage |
|
90 | + 'exceptions' => true, // Exception displayer |
|
91 | + 'log' => true, // Logs from Monolog (merged in messages if enabled) |
|
92 | + 'db' => true, // Show database (PDO) queries and bindings |
|
93 | + 'views' => true, // Views with their data |
|
94 | + 'route' => true, // Current route information |
|
95 | 95 | 'laravel' => false, // Laravel version and environment |
96 | 96 | 'events' => false, // All events fired |
97 | 97 | 'default_request' => false, // Regular or special Symfony request logger |
98 | - 'symfony_request' => true, // Only one can be enabled.. |
|
99 | - 'mail' => true, // Catch mail messages |
|
98 | + 'symfony_request' => true, // Only one can be enabled.. |
|
99 | + 'mail' => true, // Catch mail messages |
|
100 | 100 | 'logs' => false, // Add the latest log messages |
101 | 101 | 'files' => false, // Show the included files |
102 | 102 | 'config' => false, // Display config settings |
103 | 103 | 'auth' => false, // Display Laravel authentication status |
104 | 104 | 'gate' => false, // Display Laravel Gate checks |
105 | - 'session' => true, // Display session data |
|
105 | + 'session' => true, // Display session data |
|
106 | 106 | ], |
107 | 107 | |
108 | 108 | /* |
@@ -116,26 +116,26 @@ discard block |
||
116 | 116 | |
117 | 117 | 'options' => [ |
118 | 118 | 'auth' => [ |
119 | - 'show_name' => false, // Also show the users name/email in the debugbar |
|
119 | + 'show_name' => false, // Also show the users name/email in the debugbar |
|
120 | 120 | ], |
121 | 121 | 'db' => [ |
122 | - 'with_params' => true, // Render SQL with the parameters substituted |
|
123 | - 'timeline' => false, // Add the queries to the timeline |
|
124 | - 'backtrace' => false, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files. |
|
125 | - 'explain' => [ // EXPERIMENTAL: Show EXPLAIN output on queries |
|
122 | + 'with_params' => true, // Render SQL with the parameters substituted |
|
123 | + 'timeline' => false, // Add the queries to the timeline |
|
124 | + 'backtrace' => false, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files. |
|
125 | + 'explain' => [// EXPERIMENTAL: Show EXPLAIN output on queries |
|
126 | 126 | 'enabled' => false, |
127 | 127 | 'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ |
128 | 128 | ], |
129 | - 'hints' => true, // Show hints for common mistakes |
|
129 | + 'hints' => true, // Show hints for common mistakes |
|
130 | 130 | ], |
131 | 131 | 'mail' => [ |
132 | 132 | 'full_log' => false, |
133 | 133 | ], |
134 | 134 | 'views' => [ |
135 | - 'data' => false, //Note: Can slow down the application, because the data can be quite large.. |
|
135 | + 'data' => false, //Note: Can slow down the application, because the data can be quite large.. |
|
136 | 136 | ], |
137 | 137 | 'route' => [ |
138 | - 'label' => true, // show complete route on bar |
|
138 | + 'label' => true, // show complete route on bar |
|
139 | 139 | ], |
140 | 140 | 'logs' => [ |
141 | 141 | 'file' => null, |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | | Specify the provider that is used to authenticate users. |
127 | 127 | | |
128 | 128 | */ |
129 | - 'auth' => function ($app) { |
|
129 | + 'auth' => function($app) { |
|
130 | 130 | return new Tymon\JWTAuth\Providers\Auth\IlluminateAuthAdapter($app['auth']); |
131 | 131 | }, |
132 | 132 | /* |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | | Specify the provider that is used to store tokens in the blacklist |
138 | 138 | | |
139 | 139 | */ |
140 | - 'storage' => function ($app) { |
|
140 | + 'storage' => function($app) { |
|
141 | 141 | return new Tymon\JWTAuth\Providers\Storage\IlluminateCacheAdapter($app['cache']); |
142 | 142 | }, |
143 | 143 | ], |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('help_topic', function (Blueprint $table) { |
|
15 | + Schema::create('help_topic', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('topic'); |
18 | 18 | $table->string('parent_topic'); |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('group_assign_department', function (Blueprint $table) { |
|
15 | + Schema::create('group_assign_department', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->integer('group_id')->unsigned()->index('group_id'); |
18 | 18 | $table->integer('department_id')->unsigned()->index('department_id'); |