Merge pull request #51 from ladybirdweb/analysis-zOM950

Applied fixes from StyleCI
This commit is contained in:
Manish Verma
2016-05-05 12:51:21 +05:30

View File

@@ -369,27 +369,26 @@ class EmailsController extends Controller
$emails = Emails::whereId($id)->first(); $emails = Emails::whereId($id)->first();
// insert all the requested parameters with except // insert all the requested parameters with except
$emails->fill($request->except('password', 'department', 'priority', 'help_topic', 'fetching_status', 'fetching_encryption', 'sending_status', 'auto_response'))->save(); $emails->fill($request->except('password', 'department', 'priority', 'help_topic', 'fetching_status', 'fetching_encryption', 'sending_status', 'auto_response'))->save();
if ($request->fetching_status == 'on') { if ($request->fetching_status == 'on') {
$emails->fetching_status = 1; $emails->fetching_status = 1;
} else { } else {
$emails->fetching_status = 0; $emails->fetching_status = 0;
} }
if ($request->sending_status == 'on') { if ($request->sending_status == 'on') {
$emails->sending_status = 1; $emails->sending_status = 1;
} else { } else {
$emails->sending_status = 0; $emails->sending_status = 0;
} }
if ($request->auto_response == 'on') { if ($request->auto_response == 'on') {
$emails->auto_response = 1; $emails->auto_response = 1;
} else { } else {
$emails->auto_response = 0; $emails->auto_response = 0;
} }
if ($imap_check !== null) { if ($imap_check !== null) {
$emails->fetching_encryption = $imap_check; $emails->fetching_encryption = $imap_check;
} else {
} else { $emails->fetching_encryption = $request->fetching_encryption;
$emails->fetching_encryption = $request->fetching_encryption; }
}
// dd($email->fetching_encryption); // dd($email->fetching_encryption);
// fetching department value // fetching department value
$emails->department = $this->departmentValue($request->input('department')); $emails->department = $this->departmentValue($request->input('department'));
@@ -399,7 +398,7 @@ class EmailsController extends Controller
$emails->help_topic = $this->helpTopicValue($request->input('help_topic')); $emails->help_topic = $this->helpTopicValue($request->input('help_topic'));
// inserting the encrypted value of password // inserting the encrypted value of password
$emails->password = Crypt::encrypt($request->input('password')); $emails->password = Crypt::encrypt($request->input('password'));
$emails->save(); $emails->save();
// returns success message for successful email update // returns success message for successful email update
$return = 1; $return = 1;
// } catch (Exception $e) { // } catch (Exception $e) {