Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
559af1f
laravel 10
sandesh556 Dec 20, 2023
a0673c7
Apply fixes from StyleCI
StyleCIBot Dec 20, 2023
d8aec4d
upgraded
sandesh556 Dec 20, 2023
6751269
support 8.1 also
sandesh556 Jan 29, 2024
bbaf92b
packages_removal_laraHtml_pushNotification_Breadscrum_adding_alternat…
Perumal408 Feb 18, 2026
e6fab48
Apply fixes from StyleCI
StyleCIBot Feb 18, 2026
0a1059d
Merge pull request #8313 from faveosuite/analysis-l7RdMO
bhanu2217 Feb 18, 2026
662f57a
laravel_12_php_8.4_update
Perumal408 Feb 19, 2026
1229911
saptie_html_changes
Perumal408 Feb 24, 2026
baa7d92
Apply fixes from StyleCI
StyleCIBot Feb 24, 2026
b8bcca6
Merge pull request #8314 from faveosuite/analysis-wyv6l2
bhanu2217 Feb 24, 2026
6d791a7
Datatable_image_changes
Perumal408 Feb 26, 2026
b3555d7
Apply fixes from StyleCI
StyleCIBot Feb 26, 2026
f03526f
Merge pull request #8316 from faveosuite/analysis-jDj0Ry
bhanu2217 Feb 26, 2026
b493651
front-end-changes-admintlte4-agent-part-1
Perumal408 Mar 9, 2026
8f1dfc2
Apply fixes from StyleCI
StyleCIBot Mar 9, 2026
6360d66
Merge pull request #8319 from faveosuite/analysis-DDWBG9
bhanu2217 Mar 9, 2026
a160588
frontend-fixing-admin-part-2
Perumal408 Mar 11, 2026
3788199
Apply fixes from StyleCI
StyleCIBot Mar 11, 2026
7842697
Merge pull request #8320 from faveosuite/analysis-42beZw
bhanu2217 Mar 11, 2026
53e557f
Fixing_rtl_css
Perumal408 Mar 11, 2026
68ca174
Apply fixes from StyleCI
StyleCIBot Mar 11, 2026
b01cbd5
Merge pull request #8321 from faveosuite/analysis-5GPa4r
bhanu2217 Mar 11, 2026
28d9764
rtl_minor_fixes_admin_agent
Perumal408 Mar 12, 2026
fcf4a05
bs-5-checkmarx-disable
Perumal408 Mar 16, 2026
1ea6b78
Pagination_8301_Pr
Perumal408 Mar 17, 2026
54cf6a8
Breadscrum_issue_pr_8297
Perumal408 Mar 18, 2026
178a562
Apply fixes from StyleCI
StyleCIBot Mar 18, 2026
6c5b1f0
Merge pull request #8323 from faveosuite/analysis-5GP5kj
bhanu2217 Mar 18, 2026
78074fe
breadcrums_issue_composer_fix
Perumal408 Mar 18, 2026
f28691d
Apply fixes from StyleCI
StyleCIBot Mar 18, 2026
35401e3
Merge pull request #8324 from faveosuite/analysis-yWpxnD
bhanu2217 Mar 18, 2026
7f6fb23
due_date_change_8283_pr_login_email_page_fixes_included
Perumal408 Mar 19, 2026
7e75c5b
Apply fixes from StyleCI
StyleCIBot Mar 19, 2026
e173460
Merge pull request #8325 from faveosuite/analysis-Gg3Wel
bhanu2217 Mar 19, 2026
8c56531
Validation_fixes_client
Perumal408 Mar 21, 2026
4508e1d
.htaccess_security_fixes_1
Perumal408 Mar 26, 2026
848b105
Apply fixes from StyleCI
StyleCIBot Mar 26, 2026
049f744
Merge pull request #8327 from faveosuite/analysis-l7m91O
bhanu2217 Mar 26, 2026
f00f684
cross_department_security_fixes_2
Perumal408 Mar 27, 2026
8c0ceb4
installation_issue_fixes
Perumal408 Apr 1, 2026
0c3c9e5
Apply fixes from StyleCI
StyleCIBot Apr 1, 2026
6bd43a5
Merge pull request #8329 from faveosuite/analysis-OLrObl
bhanu2217 Apr 1, 2026
b73cc95
auto-update-1
Perumal408 Apr 2, 2026
813e2b5
Apply fixes from StyleCI
StyleCIBot Apr 2, 2026
fd0ec76
Merge pull request #8330 from faveosuite/analysis-g0RwlE
bhanu2217 Apr 2, 2026
9bad57b
auto-update-2
Perumal408 Apr 2, 2026
c1f11cb
Apply fixes from StyleCI
StyleCIBot Apr 2, 2026
c5621f7
Merge pull request #8331 from faveosuite/analysis-Kgr4nD
bhanu2217 Apr 2, 2026
8756440
autoupdate-3
Perumal408 Apr 2, 2026
b11ddeb
autoupdate-4
Perumal408 Apr 2, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 1 addition & 2 deletions .github/workflows/checkmarx-one.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ name: Checkmarx Scan
# Controls when the workflow will run
on:
pull_request:
types: [opened, reopened, synchronize]
branches: [ "master", development ]
branches: [] # This prevents it from running

permissions:
contents: read
Expand Down
3 changes: 1 addition & 2 deletions .idea/community.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 53 additions & 3 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/Api/v1/TokenAuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ public function forgotPassword(Request $request)
$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]);
// $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]);
} else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
}
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/DropTables.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function handle()
{
$colname = 'Tables_in_'.env('DB_DATABASE');

$droplist = \Schema::getConnection()->getDoctrineSchemaManager()->listTableNames();
$droplist = \Schema::getTableListing(\DB::connection()->getDatabaseName(), false);
$droplist = implode(',', $droplist);

DB::beginTransaction();
Expand Down
3 changes: 2 additions & 1 deletion app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Exceptions;

use Bugsnag\BugsnagLaravel\Facades\Bugsnag;
use Diglactic\Breadcrumbs\Breadcrumbs;
use Exception;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
Expand All @@ -28,7 +29,7 @@ class Handler extends ExceptionHandler
ModelNotFoundException::class,
\Symfony\Component\HttpKernel\Exception\HttpException::class,
ValidationException::class,
\DaveJamesMiller\Breadcrumbs\BreadcrumbsException::class,
Breadcrumbs::class,
];

/**
Expand Down
9 changes: 5 additions & 4 deletions app/FaveoLog/routes.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?php

use DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs;
use Diglactic\Breadcrumbs\Breadcrumbs;
use Diglactic\Breadcrumbs\Generator as BreadcrumbTrail;
use Illuminate\Support\Facades\Route;

Breadcrumbs::register('logs', function ($breadcrumbs) {
$breadcrumbs->parent('setting');
$breadcrumbs->push('System Logs', route('logs'));
Breadcrumbs::for('logs', function (BreadcrumbTrail $trail) {
$trail->parent('setting');
$trail->push('System Logs', route('logs'));
});
Route::middleware('web', 'auth', 'roles')->group(function () {
Route::get('logs', [\App\FaveoLog\controllers\LogViewerController::class, 'index'])->name('logs');
Expand Down
9 changes: 5 additions & 4 deletions app/FaveoStorage/breadcrumbs.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php

use DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs;
use Diglactic\Breadcrumbs\Breadcrumbs;
use Diglactic\Breadcrumbs\Generator as BreadcrumbTrail;

Breadcrumbs::register('storage', function ($breadcrumbs) {
$breadcrumbs->parent('setting');
$breadcrumbs->push('Storage', route('storage'));
Breadcrumbs::for('storage', function (BreadcrumbTrail $trail) {
$trail->parent('setting');
$trail->push('Storage', route('storage'));
});
46 changes: 23 additions & 23 deletions app/FaveoStorage/views/settings.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,56 +56,56 @@ class="nav-link active"
<div class="card-header">
<h3 class="card-title"> {{Lang::get('storage::lang.storage')}} </h3>

{!! Form::open(['url'=>'storage','method'=>'post']) !!}
{!! html()->form('POST', url('storage'))->open() !!}
</div><!-- /.box-header -->
<!-- /.box-header -->
<div class="card-body">
<div class="row">
<div class="form-group col-md-8 {{ $errors->has('default') ? 'has-error' : '' }}">
{!! Form::label('default',Lang::get('storage::lang.default')) !!}
{!! Form::select('default',['database'=>'Database','local'=>'Local'],$default,['class'=>'form-control']) !!}
{!! html()->label(Lang::get('storage::lang.default'), 'default') !!}
{!! html()->select('default', ['database'=>'Database','local'=>'Local'], $default)->class('form-control') !!}
</div>

<div class="form-group col-md-6 {{ $errors->has('root') ? 'has-error' : '' }}" id="root" style="display: none;">
{!! Form::label('root',Lang::get('storage::lang.root')) !!}
{!! Form::select('root',$directories,$root,['class'=>'form-control']) !!}
{!! html()->label(Lang::get('storage::lang.root'), 'root') !!}
{!! html()->select('root', $directories, $root)->class('form-control') !!}
</div>
<div id="common" style="display: none;">
<div class="form-group col-md-6 {{ $errors->has('key') ? 'has-error' : '' }}">
{!! Form::label('key',Lang::get('storage::lang.key')) !!}
{!! Form::text('key',null,['class'=>'form-control']) !!}
{!! html()->label(Lang::get('storage::lang.key'), 'key') !!}
{!! html()->text('key', null)->class('form-control') !!}
</div>
<div class="form-group col-md-6 {{ $errors->has('region') ? 'has-error' : '' }}">
{!! Form::label('region',Lang::get('storage::lang.region')) !!}
{!! Form::text('region',null,['class'=>'form-control']) !!}
{!! html()->label(Lang::get('storage::lang.region'), 'region') !!}
{!! html()->text('region', null)->class('form-control') !!}
</div>
</div>
<div id="s3" style="display: none;">
<div class="form-group col-md-6 {{ $errors->has('secret') ? 'has-error' : '' }}">
{!! Form::label('secret',Lang::get('storage::lang.secret')) !!}
{!! Form::text('secret',null,['class'=>'form-control']) !!}
{!! html()->label(Lang::get('storage::lang.secret'), 'secret') !!}
{!! html()->text('secret', null)->class('form-control') !!}
</div>
<div class="form-group col-md-6 {{ $errors->has('bucket') ? 'has-error' : '' }}">
{!! Form::label('bucket',Lang::get('storage::lang.bucket')) !!}
{!! Form::text('bucket',null,['class'=>'form-control']) !!}
{!! html()->label(Lang::get('storage::lang.bucket'), 'bucket') !!}
{!! html()->text('bucket', null)->class('form-control') !!}
</div>
</div>
<div id="rackspace" style="display: none;">
<div class="form-group col-md-6 {{ $errors->has('username') ? 'has-error' : '' }}">
{!! Form::label('username',Lang::get('storage::lang.username')) !!}
{!! Form::text('username',null,['class'=>'form-control']) !!}
{!! html()->label(Lang::get('storage::lang.username'), 'username') !!}
{!! html()->text('username', null)->class('form-control') !!}
</div>
<div class="form-group col-md-6 {{ $errors->has('container') ? 'has-error' : '' }}">
{!! Form::label('container',Lang::get('storage::lang.container')) !!}
{!! Form::text('container',null,['class'=>'form-control']) !!}
{!! html()->label(Lang::get('storage::lang.container'), 'container') !!}
{!! html()->text('container', null)->class('form-control') !!}
</div>
<div class="form-group col-md-6 {{ $errors->has('endpoint') ? 'has-error' : '' }}">
{!! Form::label('endpoint',Lang::get('storage::lang.endpoint')) !!}
{!! Form::text('endpoint',null,['class'=>'form-control']) !!}
{!! html()->label(Lang::get('storage::lang.endpoint'), 'endpoint') !!}
{!! html()->text('endpoint', null)->class('form-control') !!}
</div>
<div class="form-group col-md-6 {{ $errors->has('url_type') ? 'has-error' : '' }}">
{!! Form::label('url_type',Lang::get('storage::lang.url_type')) !!}
{!! Form::text('url_type',null,['class'=>'form-control']) !!}
{!! html()->label(Lang::get('storage::lang.url_type'), 'url_type') !!}
{!! html()->text('url_type', null)->class('form-control') !!}
</div>
</div>

Expand All @@ -114,8 +114,8 @@ class="nav-link active"
<!-- /.box-body -->
</div>
<div class="card-footer">
{!! Form::submit(Lang::get('storage::lang.save'),['class'=>'btn btn-success']) !!}
{!! Form::close() !!}
{!! html()->submit(Lang::get('storage::lang.save'))->class('btn btn-success') !!}
{!! html()->closeModelForm() !!}
</div>
<!-- /.box -->
</div>
Expand Down
35 changes: 32 additions & 3 deletions app/Http/Controllers/Admin/helpdesk/BanlistController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
//classes
use Exception;
use Lang;
use Yajra\DataTables\Facades\DataTables;

/**
* BanlistController
Expand Down Expand Up @@ -46,14 +47,42 @@ public function __construct()
public function index()
{
try {
$bans = User::where('ban', '=', 1)->get();

return view('themes.default1.admin.helpdesk.emails.banlist.index', compact('bans'));
return view('themes.default1.admin.helpdesk.emails.banlist.index');
} catch (Exception $e) {
return redirect()->back()->with('fails', $e->getMessage());
}
}

/**
* Return banned users list as DataTables JSON for the index AJAX endpoint.
*
* @return \Illuminate\Http\JsonResponse
*/
public function getBanList()
{
try {
$bans = User::where('ban', '=', 1)->select('id', 'email', 'updated_at')->get();

return DataTables::of($bans)
->addColumn('email', function ($model) {
return '<a href="'.route('banlist.edit', $model->id).'">'.e($model->email).'</a>';
})
->addColumn('updated_at', function ($model) {
return \UTC::usertimezone($model->updated_at);
})
->addColumn('action', function ($model) {
$edit = '<a href="'.route('banlist.edit', $model->id).'" class="btn btn-primary btn-xs"><i class="fa-solid fa-edit"></i> '.Lang::get('lang.edit').'</a> ';
$delete = '<a href="'.route('banlist.delete', $model->id).'" class="btn btn-danger btn-xs"><i class="fa-solid fa-trash"></i> '.Lang::get('lang.delete').'</a>';

return $edit.$delete;
})
->rawColumns(['email', 'updated_at', 'action'])
->make(true);
} catch (Exception $e) {
return response()->json(['error' => $e->getMessage()], 500);
}
}

/**
* Show the form for creating a banned user.
*
Expand Down
Loading