cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed testcases run condition

Browse Source 
Fixed issue with running testcases
Added file permission check in Probe.php for storage and bootstrap directories.
Named route bugs fixed reported on bugsnag
This commit is contained in:
Manish Verma
2018-09-07 17:40:22 +05:30
committed by Manish Verma
parent fab082a5cc
commit 767ab8e8b7
4 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Kernel.php
View File

@@ -33,7 +33,7 @@ class Kernel extends ConsoleKernel
*/ */
protected function schedule(Schedule $schedule) protected function schedule(Schedule $schedule)
{ {
if (env('DB_INSTALL') == 1) { if (isInstall()) {
$this->execute($schedule, 'fetching'); $this->execute($schedule, 'fetching');
$this->execute($schedule, 'notification'); $this->execute($schedule, 'notification');
$this->execute($schedule, 'work'); $this->execute($schedule, 'work');

2
app/Http/Controllers/Agent/helpdesk/OrganizationController.php
View File

@@ -310,7 +310,7 @@ class OrganizationController extends Controller
for ($i = $date1; $i <= $date2; $i = $i + 86400) { for ($i = $date1; $i <= $date2; $i = $i + 86400) {
$thisDate = date('Y-m-d', $i); $thisDate = date('Y-m-d', $i);
$user_orga_relation_id = ''; $user_orga_relation_id = [];
$user_orga_relations = User_org::where('org_id', '=', $id)->get(); $user_orga_relations = User_org::where('org_id', '=', $id)->get();
foreach ($user_orga_relations as $user_orga_relation) { foreach ($user_orga_relations as $user_orga_relation) {
$user_orga_relation_id[] = $user_orga_relation->user_id; $user_orga_relation_id[] = $user_orga_relation->user_id;

73
public/probe.php
View File

@@ -52,9 +52,58 @@ $extensions = [
<body> <body>
<div style="height: auto; width: 500; margin: auto;"> <div style="height: auto; width: 500; margin: auto;">
<h1 style="text-align: center; color: #9DD1DE">FAVEO PROBE</h1> <h1 style="text-align: center; color: #9DD1DE">FAVEO PROBE</h1>
<?php
$basePath = str_replace('public', '', __DIR__);
$storagePermission = substr(sprintf("%o",fileperms($basePath.DIRECTORY_SEPARATOR."storage")),-3);
$bootstrapPermission = substr(sprintf("%o",fileperms($basePath.DIRECTORY_SEPARATOR."bootstrap")),-3);
?>
<table class="t01"> <table class="t01">
<tr> <tr>
<th>Requirements</th> <th>Directory permissions</th>
<th></th>
</tr>
<tr>
<td>storage</td>
<?php if ($storagePermission >= 755) { ?>
<td style='color:green'><?= $storagePermission; ?></td>
<?php } else { ?>
<td style='color:red'><?= $storagePermission; ?>&nbsp; (Directory should be writable by your web server or Faveo will not run. Give preferred permissions as 755 for directory and 644 for files.)</td>
<?php } ?>
</tr>
<tr>
<td>bootstrap/cache</td>
<?php if ($bootstrapPermission >= 755) { ?>
<td style='color:green'><?= $bootstrapPermission; ?></td>
<?php } else { ?>
<td style='color:red'><?= $bootstrapPermission; ?>&nbsp; (Directory should be writable by your web server or Faveo will not run. Give preferred permissions as 755 for directory and 644 for files.)</td>
<?php } ?>
</tr>
</table>
<br/>
<table class="t01">
<tr>
<th>PHP Extensions</th>
<th>Status</th>
</tr>
<?php
foreach ($extensions as $extension) {
echo '<tr>';
if (!extension_loaded($extension)) {
echo '<td>'.$extension."</td> <td style='color:red'>Not Enabled"
."<p>To enable this, please open '".php_ini_loaded_file()."' and add 'extension = ".$extension."'</p>"
.'</td>';
} else {
echo '<td>'.$extension."</td> <td style='color:green'>Enabled</td>";
}
echo '</tr>';
}
?>
</table>
<br/>
<table class="t01">
<tr>
<th>Server Requirements</th>
<th>Status</th> <th>Status</th>
</tr> </tr>
<?php <?php
@@ -83,27 +132,9 @@ $extensions = [
echo '</tr>'; echo '</tr>';
?> ?>
</table> </table>
<br/>
<table class="t01">
<tr>
<th>PHP Extensions</th>
<th>Status</th>
</tr>
<?php
foreach ($extensions as $extension) {
echo '<tr>';
if (!extension_loaded($extension)) {
echo '<td>'.$extension."</td> <td style='color:red'>Not Enabled"
."<p>To enable this, please open '".php_ini_loaded_file()."' and add 'extension = ".$extension."'</p>"
.'</td>';
} else {
echo '<td>'.$extension."</td> <td style='color:green'>Enabled</td>";
}
echo '</tr>';
}
?>
</table>
<p style='color:red;'>NOTE: Please delete the file 'probe.php' once you have fixed all the issues.</p> <p style='color:red;'>NOTE: Please delete the file 'probe.php' once you have fixed all the issues.</p>
</div> </div>
<?php echo whoami(); ?>
asdsnad,msan,mndda,mnd
</body> </body>
</html> </html>

4
routes/web.php
View File

@@ -311,7 +311,7 @@ Route::group(['middleware' => ['web']], function () {
Route::get('org-list', ['as' => 'org.list', 'uses' => 'Agent\helpdesk\OrganizationController@org_list']); Route::get('org-list', ['as' => 'org.list', 'uses' => 'Agent\helpdesk\OrganizationController@org_list']);
Route::get('organization-autofill', ['as' => 'post.organization.autofill', 'uses' => 'Agent\helpdesk\OrganizationController@organizationAutofill']); //auto fill organization name Route::get('organization-autofill', ['as' => 'post.organization.autofill', 'uses' => 'Agent\helpdesk\OrganizationController@organizationAutofill']); //auto fill organization name
Route::get('org/delete/{id}', ['as' => 'org.delete', 'uses' => 'Agent\helpdesk\OrganizationController@destroy']); Route::get('org/delete/{id}', ['as' => 'org.delete', 'uses' => 'Agent\helpdesk\OrganizationController@destroy']);
Route::get('org-chart/{id}', 'Agent\helpdesk\OrganizationController@orgChartData'); Route::get('org-chart/{id}', 'Agent\helpdesk\OrganizationController@orgChartData')->name('org-chart-data');
// Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']); // Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']);
Route::post('org-chart-range/{id}/{date1}/{date2}', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']); Route::post('org-chart-range/{id}/{date1}/{date2}', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']);
Route::get('profile', ['as' => 'profile', 'uses' => 'Agent\helpdesk\UserController@getProfile']); /* User profile get */ Route::get('profile', ['as' => 'profile', 'uses' => 'Agent\helpdesk\UserController@getProfile']); /* User profile get */
@@ -512,7 +512,7 @@ Route::group(['middleware' => ['web']], function () {
Route::post('postedform', ['as'=>'client.form.post', 'uses'=>'Client\helpdesk\FormController@postedForm']); /* post the form to store the value */ Route::post('postedform', ['as'=>'client.form.post', 'uses'=>'Client\helpdesk\FormController@postedForm']); /* post the form to store the value */
//Route::get('check', 'CheckController@getcheck'); //testing checkbox auto-populate //Route::get('check', 'CheckController@getcheck'); //testing checkbox auto-populate
//Route::post('postcheck/{id}', 'CheckController@postcheck'); //Route::post('postcheck/{id}', 'CheckController@postcheck');
Route::get('get-helptopic-form', 'Client\helpdesk\FormController@getCustomForm'); Route::get('get-helptopic-form', 'Client\helpdesk\FormController@getCustomForm')->name('get-helptopic-form');
Route::get('home', ['as' => 'home', 'uses' => 'Client\helpdesk\WelcomepageController@index']); //guest layout Route::get('home', ['as' => 'home', 'uses' => 'Client\helpdesk\WelcomepageController@index']); //guest layout