Applied fixes from StyleCI
This commit is contained in:

committed by
StyleCI Bot

parent
ec61ab6c7a
commit
00d9c1b82a
@@ -411,8 +411,8 @@ class UserController extends Controller
|
||||
$users = User::where('id', '=', $id)->first();
|
||||
if ($users->role == 'user') {
|
||||
if ($delete_all == null || $delete_all == 1) {
|
||||
$tickets = Tickets::where('user_id', '=' ,$id)->get();
|
||||
if(count($tickets) > 0) {
|
||||
$tickets = Tickets::where('user_id', '=', $id)->get();
|
||||
if (count($tickets) > 0) {
|
||||
foreach ($tickets as $ticket) {
|
||||
$notification = Notification::select('id')->where('model_id', '=', $ticket->id)->get();
|
||||
foreach ($notification as $id) {
|
||||
@@ -428,7 +428,7 @@ class UserController extends Controller
|
||||
$attachment = Ticket_attachments::where('thread_id', '=', $th_id->id)->get();
|
||||
if (count($attachment)) {
|
||||
foreach ($attachment as $a_id) {
|
||||
Ticket_attachments::where('id','=', $a_id->id)
|
||||
Ticket_attachments::where('id', '=', $a_id->id)
|
||||
->delete();
|
||||
}
|
||||
// echo "<br>";
|
||||
@@ -454,7 +454,6 @@ class UserController extends Controller
|
||||
->delete();
|
||||
|
||||
return redirect('user')->with('success', Lang::get('lang.user_delete_successfully'));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -179,12 +179,12 @@ class PhpMailController extends Controller
|
||||
$port = $from_address->sending_port;
|
||||
$protocol = $from_address->sending_protocol;
|
||||
$this->setServices($from_address->id, $protocol);
|
||||
if($protocol=='mail'){
|
||||
$username = "";
|
||||
$fromname="";
|
||||
$host="";
|
||||
$smtpsecure ="";
|
||||
$port="";
|
||||
if ($protocol == 'mail') {
|
||||
$username = '';
|
||||
$fromname = '';
|
||||
$host = '';
|
||||
$smtpsecure = '';
|
||||
$port = '';
|
||||
}
|
||||
$configs = [
|
||||
'username' => $username,
|
||||
|
11
app/User.php
11
app/User.php
@@ -51,7 +51,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
|
||||
if ($this->endsWith($pic, 'profilepic')) {
|
||||
$pic = \Gravatar::src($this->attributes['email']);
|
||||
}
|
||||
|
||||
|
||||
return $pic;
|
||||
}
|
||||
|
||||
@@ -156,18 +156,21 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
|
||||
|
||||
return $this->user_name;
|
||||
}
|
||||
|
||||
/**
|
||||
* @category function to check profile pic source srting ends with profilepic or not
|
||||
*
|
||||
* @param string $haystack, $needle
|
||||
* @return boolean true/false
|
||||
*
|
||||
* @return bool true/false
|
||||
*/
|
||||
function endsWith($haystack, $needle)
|
||||
public function endsWith($haystack, $needle)
|
||||
{
|
||||
$length = strlen($needle);
|
||||
if ($length == 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return (substr($haystack, -$length) === $needle);
|
||||
return substr($haystack, -$length) === $needle;
|
||||
}
|
||||
}
|
||||
|
@@ -1518,7 +1518,7 @@ return [
|
||||
'password_generator' => 'Password Generator',
|
||||
'depertment' => 'Depertment',
|
||||
'duetoday' => 'Due Today',
|
||||
'today-due_tickets' => 'Today\'s due ticekts',
|
||||
'today-due_tickets' => 'Today\'s due ticekts',
|
||||
'password_change_successfully' => 'Password Change Successfully',
|
||||
'role_change_successfully' => 'Role Change Successfully',
|
||||
'user_delete_successfully' => 'User Delete Successfully',
|
||||
|
Reference in New Issue
Block a user