diff --git a/DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql b/DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql index 9fbc4b57c..fa4792f4b 100644 --- a/DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql +++ b/DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql @@ -537,7 +537,7 @@ CREATE TABLE IF NOT EXISTS `ticket_token` ( `id` int(11) NOT NULL AUTO_INCREMENT, `ticket_id` int(11) NOT NULL, `token` varchar(255) NOT NULL, - `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',, + `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `updated_at` timestamp NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ; @@ -549,7 +549,7 @@ CREATE TABLE IF NOT EXISTS `ticket_token` ( -- ALTER TABLE `users` - ADD `country_code` int(11) NOT NULL AFTER `profile_pic`; + ADD `country_code` int(11) NOT NULL AFTER `profile_pic`; -- -------------------------------------------------------- @@ -573,4 +573,25 @@ CREATE TABLE IF NOT EXISTS `workflow_close` ( -- INSERT INTO `workflow_close` (`id`, `days`, `condition`, `send_email`, `status`, `created_at`, `updated_at`) VALUES -(1, 3, 1, 1, 3, '2016-05-25 07:52:22', '2016-05-25 02:22:22'); \ No newline at end of file +(1, 3, 1, 1, 3, '2016-05-25 07:52:22', '2016-05-25 02:22:22'); + +-- ---------------------------------------------------------- + +-- +-- Alter Table structure for table `system_settings` +-- +ALTER TABLE `settings_system` + ADD `version` varchar(222) NOT NULL AFTER `time_zone`; + +-- +-- Dumping data for table `system_settings` +-- + +UPDATE `settings_system` SET `version`='1.0.7.5' WHERE 1 + + +ALTER TABLE `settings_ticket` + ADD `lock_ticket_frequency` varchar(222) NOT NULL AFTER `max_file_size`; + + +UPDATE `settings_ticket` SET `lock_ticket_frequency`='0' WHERE 1 diff --git a/app/Http/Controllers/Admin/helpdesk/WorkflowController.php b/app/Http/Controllers/Admin/helpdesk/WorkflowController.php index 7583525b4..7e1b576a7 100644 --- a/app/Http/Controllers/Admin/helpdesk/WorkflowController.php +++ b/app/Http/Controllers/Admin/helpdesk/WorkflowController.php @@ -144,6 +144,7 @@ class WorkflowController extends Controller */ public function create(Emails $emails) { + $email_data = ""; foreach ($emails->lists('email_address', 'id') as $key => $email) { $email_data["E-$key"] = $email; } diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index aac98be8d..bf4377d1e 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -96,10 +96,13 @@ class AuthController extends Controller { $code = str_random(60); $user->remember_token = $code; $user->save(); - - $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'Activate your Account', 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]); - - return redirect('home')->with('success', 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'); + try { + $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'Activate your Account', 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]); + } catch (Exception $e) { + $message12 = Lang::get('lang.failed_to_send_email_contact_administrator'); + } + return redirect('home')->with('success', $message12); } /** diff --git a/app/Http/Controllers/Common/SettingsController.php b/app/Http/Controllers/Common/SettingsController.php index 7ae400462..93a2e5204 100644 --- a/app/Http/Controllers/Common/SettingsController.php +++ b/app/Http/Controllers/Common/SettingsController.php @@ -395,10 +395,9 @@ class SettingsController extends Controller { */ public function version_check() { $response_url = \URL::route('post-version-check'); - echo "
"; + echo ""; echo ""; - echo ""; - echo ""; + echo ""; echo ""; echo '
'; echo ""; @@ -410,7 +409,10 @@ class SettingsController extends Controller { * @return type */ public function post_version_check(Request $request) { +// dd($request); $current_version = \Config::get('app.version'); + $current_version = explode(' ',$current_version); + $current_version = $current_version[1]; $new_version = $request->value; if ($current_version == $new_version) { return redirect()->route('checkupdate')->with('info', ' No, new Updates'); diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 790fd9eff..cd5ad6f0e 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1313,6 +1313,7 @@ return [ 'sorry_you_are_not_allowed_token_expired' => 'Sorry you are not allowed. Token Expired!', 'thank_you_for_your_rating' => 'Thank you for your rating!', 'your_ticket_has_been' => 'Your ticket has been', + 'failed_to_send_email_contact_administrator' => 'Email sending faied. Please contact system Administrator', /* * |--------------------------------------------------------------------------------------- |Api settings @@ -1341,4 +1342,5 @@ return [ 'error-debug-settings-saved-message' => 'Your error and debugging settings have been saved successfully', 'error-debug-settings-error-message' => 'You have not made any change in the settings.', 'error-logs' => 'Error logs', + ]; diff --git a/resources/views/themes/default1/admin/layout/admin.blade.php b/resources/views/themes/default1/admin/layout/admin.blade.php index b239448f0..fec612d3f 100644 --- a/resources/views/themes/default1/admin/layout/admin.blade.php +++ b/resources/views/themes/default1/admin/layout/admin.blade.php @@ -173,7 +173,7 @@
  • - {!! Lang::get('lang.profile') !!} + {!! Lang::get('lang.profile') !!}
    {!! Lang::get('lang.sign_out') !!}