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

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Manish Verma
2016-12-05 04:20:56 +00:00
committed by StyleCI Bot
parent ea4314a339
commit b2a1b7ec55
30 changed files with 207 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/FaveoLog/LaravelLogViewerServiceProvider.php
View File

@@ -24,7 +24,6 @@ class LaravelLogViewerServiceProvider extends ServiceProvider
$this->package('rap2hpoutre/laravel-log-viewer', 'laravel-log-viewer', __DIR__.'/../../');
}
$view_path = app_path().DIRECTORY_SEPARATOR.'FaveoLog'.DIRECTORY_SEPARATOR.'views';
$this->loadViewsFrom($view_path, 'log');

1
app/Http/Controllers/Admin/helpdesk/AgentController.php
View File

@@ -276,7 +276,6 @@ class AgentController extends Controller
$user->id;
$user->delete();
throw new \Exception($error);
return redirect('agents')->with('success', Lang::get('lang.agent_deleted_sucessfully'));
} catch (\Exception $e) {
return redirect('agents')->with('fails', $error);

4
app/Http/Controllers/Admin/helpdesk/EmailsController.php
View File

@@ -639,7 +639,8 @@ class EmailsController extends Controller
$controller->fetch($email);
}
public function checkMail($request) {
public function checkMail($request)
{
$mailservice_id = $request->input('sending_protocol');
$driver = $this->getDriver($mailservice_id);
$username = $request->input('email_address');
@@ -657,6 +658,7 @@ class EmailsController extends Controller
$transport->setPassword($password);
$mailer = \Swift_Mailer::newInstance($transport);
$mailer->getTransport()->start();
return 1;
}
}

1
app/Http/Controllers/Admin/helpdesk/SettingsController.php
View File

@@ -997,7 +997,6 @@ class SettingsController extends Controller
$number .= '0';
}
if ($array_format[$i] !== '$' && $array_format[$i] !== '#') {
$number .= $array_format[$i];
}

2
app/Http/Controllers/Admin/helpdesk/TeamController.php
View File

@@ -153,7 +153,6 @@ $users = DB::table('team_assign_agent')->select('team_assign_agent.id', 'team_as
return $full_name;
})
->addColumn('active', function ($model) {
if ($model->active == '1') {
$role = "<a class='btn btn-success btn-xs'>".'Active'.'</a>';
@@ -164,7 +163,6 @@ $users = DB::table('team_assign_agent')->select('team_assign_agent.id', 'team_as
return $role;
})
->addColumn('assign_group', function ($model) {
$group = Groups::whereId($model->assign_group)->first();

1
app/Http/Controllers/Agent/helpdesk/ReportController.php
View File

@@ -88,7 +88,6 @@ class ReportController extends Controller
// $help_topic = Help_topic::where('status', '=', '1')->min('id');
}
$return = '';
$last = '';
$j = 0;

3
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -516,7 +516,6 @@ class TicketController extends Controller
}
$ticket_id = $request->input('ticket_ID');
$tickets = Tickets::where('id', '=', $ticket_id)->first();
$tickets->isanswered = '1';
$tickets->save();
@@ -598,7 +597,6 @@ class TicketController extends Controller
// sending attachments via php mail function
$message = '';
$collaborators = Ticket_Collaborator::where('ticket_id', '=', $ticket_id)->get();
$emails = Emails::where('department', '=', $tickets->dept_id)->first();
@@ -2145,7 +2143,6 @@ class TicketController extends Controller
}
}
return redirect()->back()->with('Success', 'Thank you for your rating!');
}

1
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -459,7 +459,6 @@ class UserController extends Controller
}
}
if ($users->role == 'agent') {
if ($delete_all == null) {
$UserEmail = Input::get('assign_to');

21
app/Http/Controllers/Auth/AuthController.php
View File

@@ -150,7 +150,7 @@ class AuthController extends Controller
*/
public function postRegister(User $user, RegisterRequest $request)
{
try{
try {
$request_array = $request->input();
$password = Hash::make($request->input('password'));
$user->password = $password;
@@ -162,7 +162,7 @@ class AuthController extends Controller
$user->email = $request->input('email');
}
if ($request_array['mobile'] == '') {
$user->mobile = null;
$user->mobile = null;
} else {
$user->mobile = $request->input('mobile');
}
@@ -188,19 +188,20 @@ class AuthController extends Controller
if ($request_array['email'] != '') {
$var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/'.$code)]);
}
if ($settings->status == 1 || $settings->status == '1') {
if (count($sms) > 0) {
if ($sms->status == 1 || $sms->status == '1') {
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_and_moble');
} else {
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup');
}
if ($settings->status == 1 || $settings->status == '1') {
if (count($sms) > 0) {
if ($sms->status == 1 || $sms->status == '1') {
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_and_moble');
} else {
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup');
}
} else {
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup');
}
} else {
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
}
return redirect('home')->with('success', $message12);
} catch (\Exception $e) {
return redirect()->back()->with('fails', $e->getMessage());

5
app/Http/Controllers/Common/PhpMailController.php
View File

@@ -11,8 +11,8 @@ use App\Model\helpdesk\Settings\Email;
use App\User;
use Auth;
use Exception;
use Mail;
use Lang;
use Mail;
class PhpMailController extends Controller
{
@@ -121,7 +121,6 @@ class PhpMailController extends Controller
$email_address = $this->checkElement('email_address', $template_variables);
$user = $this->checkElement('user', $template_variables);
$status = \DB::table('settings_email')->first();
$template = TemplateType::where('name', '=', $template_type)->first();
@@ -148,7 +147,6 @@ class PhpMailController extends Controller
$subject = null;
}
$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!!}', '{!!$ticket_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, $ticket_link];
@@ -158,7 +156,6 @@ class PhpMailController extends Controller
$contents = $messagebody;
}
if ($template_type == 'ticket-reply-agent') {
$line = '---Reply above this line--- <br/><br/>';
$content = $line.$messagebody;

2
app/Http/Controllers/Update/UpgradeController.php
View File

@@ -137,7 +137,6 @@ class UpgradeController extends Controller
continue;
}
//Make the directory if we need to...
if (!is_dir($update.'/'.$thisFileDir.'/')) {
\File::makeDirectory($update.'/'.$thisFileDir, 0775, true, true);
@@ -252,7 +251,6 @@ class UpgradeController extends Controller
return redirect('dashboard')->with('fails', 'Could not find latest realeases from repository.');
// else {
// return redirect()->back();
// }

1
app/Http/Requests/helpdesk/Mail/MailRequest.php
View File

@@ -29,7 +29,6 @@ class MailRequest extends Request
$email_address_rule = 'required|email|unique:emails,id,'.$id;
}
$rules = [
'email_address' => $email_address_rule,
'email_name' => 'required',

4
app/Http/Requests/helpdesk/PriorityRequest.php
View File

@@ -30,7 +30,6 @@ class PriorityRequest extends Request
{
return [
'priority' => 'required|max:10',
'status' => 'required',
'priority_desc' => 'required|max:255',
@@ -39,9 +38,6 @@ class PriorityRequest extends Request
'priority_successfully_updated' => 'priority successfully updated',
'priority_successfully_created!!!' => 'priority successfully created',
];
}
}

43
app/Http/routes.php
View File

@@ -28,34 +28,29 @@ Route::group(['middleware' => ['web']], function () {
| Here is defining entire routes for the Admin Panel
|
*/
Route::get('password/email/{one?}/{two?}/{three?}/{four?}/{five?}',['as' => 'password.email', 'uses' => 'Auth\PasswordController@getEmail']);
Breadcrumbs::register('password.email', function ($breadcrumbs) {
$breadcrumbs->parent('/');
$breadcrumbs->push('Login', url('auth/login'));
$breadcrumbs->push('Forgot Password', url('password/email'));
});
Route::get('password/email/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'password.email', 'uses' => 'Auth\PasswordController@getEmail']);
Breadcrumbs::register('password.email', function ($breadcrumbs) {
$breadcrumbs->parent('/');
$breadcrumbs->push('Login', url('auth/login'));
$breadcrumbs->push('Forgot Password', url('password/email'));
});
// register page
Route::get('auth/register/{one?}/{two?}/{three?}/{four?}/{five?}',['as' => 'auth.register', 'uses' => 'Auth\AuthController@getRegister']);
Breadcrumbs::register('auth.register', function ($breadcrumbs) {
$breadcrumbs->parent('/');
$breadcrumbs->push('Login', url('auth/login'));
$breadcrumbs->push('Create Account', url('auth/register'));
});
Route::get('auth/register/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'auth.register', 'uses' => 'Auth\AuthController@getRegister']);
Breadcrumbs::register('auth.register', function ($breadcrumbs) {
$breadcrumbs->parent('/');
$breadcrumbs->push('Login', url('auth/login'));
$breadcrumbs->push('Create Account', url('auth/register'));
});
// Auth login
Route::get('auth/login/{one?}/{two?}/{three?}/{four?}/{five?}',['as' => 'auth.login', 'uses' => 'Auth\AuthController@getLogin']);
Breadcrumbs::register('auth.login', function ($breadcrumbs) {
$breadcrumbs->parent('/');
$breadcrumbs->push('Create Account', url('auth/register'));
$breadcrumbs->push('Login', url('auth/login'));
});
Route::get('auth/login/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'auth.login', 'uses' => 'Auth\AuthController@getLogin']);
Breadcrumbs::register('auth.login', function ($breadcrumbs) {
$breadcrumbs->parent('/');
$breadcrumbs->push('Create Account', url('auth/register'));
$breadcrumbs->push('Login', url('auth/login'));
});
Route::get('account/activate/{token}', ['as' => 'account.activate', 'uses' => 'Auth\AuthController@accountActivate']);
Route::get('getmail/{token}', 'Auth\AuthController@getMail');
Route::get('verify-otp', ['as' => 'otp-verification', 'uses' => 'Auth\AuthController@getVerifyOTP']);
@@ -1194,8 +1189,6 @@ Route::group(['middleware' => ['web']], function () {
$api_control->ticketDetailEvent($details);
});
Route::get('test', ['as' => 'test', 'uses' => 'Common\PushNotificationController@response']);
Route::get('mail/config/service', ['as' => 'mail.config.service', 'uses' => 'Job\MailController@serviceForm']);

3
app/Jobs/SendEmail.php
View File

@@ -8,11 +8,10 @@ use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
class SendEmail extends Job implements SelfHandling,ShouldQueue
class SendEmail extends Job implements SelfHandling, ShouldQueue
{
use InteractsWithQueue,SerializesModels;
protected $from;
protected $to;
protected $message;

8
app/Model/MailJob/QueueService.php
View File

@@ -40,9 +40,9 @@ class QueueService extends Model
public function getStatus()
{
$status = $this->attributes['status'];
$html = "<span style='color:red'>".Lang::get('lang.inactive')."</span>";
$html = "<span style='color:red'>".Lang::get('lang.inactive').'</span>';
if ($status == 1) {
$html = "<span style='color:green'>".Lang::get('lang.active')."</span>";
$html = "<span style='color:green'>".Lang::get('lang.active').'</span>';
}
return $html;
@@ -52,9 +52,9 @@ class QueueService extends Model
{
$id = $this->attributes['id'];
$status = $this->attributes['status'];
$html = '<a href='.url('queue/'.$id.'/activate')." class='btn btn-primary'>".Lang::get('lang.activate')."</a>";
$html = '<a href='.url('queue/'.$id.'/activate')." class='btn btn-primary'>".Lang::get('lang.activate').'</a>';
if ($status == 1) {
$html = "<a href='#' class='btn btn-primary' disabled>".Lang::get('lang.activate')."</a>";
$html = "<a href='#' class='btn btn-primary' disabled>".Lang::get('lang.activate').'</a>';
}
return $html;