From 050086df097e840a92c52ff9ae0f26b8b2a54825 Mon Sep 17 00:00:00 2001 From: Sujit Prasad Date: Tue, 14 Jun 2016 14:45:24 +0530 Subject: [PATCH] update v1.0.7.5 --- DB/Read Me.txt | 41 + .../Updatedatabase.sql | 576 ++++++++++ app/Exceptions/Handler.php | 68 +- .../Admin/helpdesk/DepartmentController.php | 3 +- .../Admin/helpdesk/EmailsController.php | 86 +- .../helpdesk/ErrorAndDebuggingController.php | 121 +-- .../Admin/helpdesk/HelptopicController.php | 2 +- .../Admin/helpdesk/SettingsController.php | 2 +- .../Admin/helpdesk/SlaController.php | 4 +- .../Admin/helpdesk/TemplateController.php | 95 +- .../Admin/helpdesk/WorkflowController.php | 2 +- .../Agent/helpdesk/MailController.php | 58 +- .../Agent/helpdesk/TicketController.php | 16 +- .../Agent/helpdesk/UserController.php | 1 - .../Agent/kb/ArticleController.php | 55 +- .../Agent/kb/CategoryController.php | 50 +- .../Controllers/Agent/kb/PageController.php | 37 +- app/Http/Controllers/Auth/AuthController.php | 59 +- .../helpdesk/ClientTicketController.php | 2 +- .../Client/helpdesk/FormController.php | 50 +- .../Client/helpdesk/WelcomepageController.php | 16 +- .../Controllers/Common/PhpMailController.php | 27 +- .../Controllers/Common/SettingsController.php | 226 ++-- app/Http/Kernel.php | 2 +- app/Http/Middleware/CheckBoard.php | 23 +- app/Http/Middleware/CheckUpdate.php | 5 +- app/Http/routes.php | 16 +- app/Model/helpdesk/Ticket/Ticket_Thread.php | 11 +- config/app.php | 96 +- config/bugsnag.php | 138 +-- config/compile.php | 2 + config/database.php | 2 +- database/seeds/DatabaseSeeder.php | 20 +- release-notes.txt | 89 ++ resources/lang/de/lang.php | 76 +- resources/lang/de/pagination.php | 2 +- resources/lang/de/passwords.php | 4 +- resources/lang/de/validation.php | 2 +- resources/lang/en/lang.php | 77 +- resources/lang/it/passwords.php | 2 +- resources/lang/ru/lang.php | 994 +++++++++--------- resources/lang/ru/pagination.php | 24 +- resources/lang/ru/passwords.php | 30 +- resources/lang/ru/table.php | 40 +- resources/lang/ru/validation.php | 192 ++-- .../helpdesk/settings/checkupdate.blade.php | 2 +- 46 files changed, 2009 insertions(+), 1437 deletions(-) create mode 100644 DB/Read Me.txt create mode 100644 DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql diff --git a/DB/Read Me.txt b/DB/Read Me.txt new file mode 100644 index 000000000..2afd66b65 --- /dev/null +++ b/DB/Read Me.txt @@ -0,0 +1,41 @@ +|====================================== +|Updating from 1.0.7.4 to 1.0.7.5 +|====================================== + +|------------------------ +|Database Update +|------------------------ + +To update copy Updatedatabase.sql from Github Project folder /DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql + +Please take a backup of your database before following this step. Import this file to your existing Faveo database. + + +|====================================== +|Updating from 1.0.6.10 to 1.0.7 +|====================================== + +|------------------------ +|Database Update +|------------------------ + +To update copy Updatedatabase.sql from Github Project folder /DB/update from 1.0.6.10 to 1.0.7/Updatedatabase.sql + +Please take a backup of your database before following this step. Import this file to your existing Faveo database. + + +|======================================= +|General Update Instructions +|======================================= + +File System update + +Please take a backup of your existing Faveo files before following this step. Download latest release files from Github and replace into existing Faveo folder. + +Don’t replace these files/folder: + +.env file in the root directory. +config/database.php file. +config/lfm.php file. +public/lb-faveo/media. +public/photos. \ No newline at end of file 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 new file mode 100644 index 000000000..9fbc4b57c --- /dev/null +++ b/DB/update from 1.0.7.4 to 1.0.7.5/Updatedatabase.sql @@ -0,0 +1,576 @@ +-- +-- Table structure for table `api_settings` +-- + +CREATE TABLE IF NOT EXISTS `api_settings` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `key` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `value` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `created_at` timestamp NULL DEFAULT NULL, + `updated_at` timestamp NULL DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ; + +-- +-- Dumping data for table `api_settings` +-- + +INSERT INTO `api_settings` (`id`, `key`, `value`, `created_at`, `updated_at`) VALUES +(1, 'ticket_detail', '', '2016-05-26 06:48:39', '2016-05-26 06:48:39'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `bar_notifications` +-- + +CREATE TABLE IF NOT EXISTS `bar_notifications` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `key` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `value` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `created_at` timestamp NULL DEFAULT NULL, + `updated_at` timestamp NULL DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=24 ; + +-- +-- Dumping data for table `bar_notifications` +-- + +INSERT INTO `bar_notifications` (`id`, `key`, `value`, `created_at`, `updated_at`) VALUES +(23, 'new-version', '', '2016-06-12 23:13:46', '2016-06-12 23:13:46'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `common_settings` +-- + +CREATE TABLE IF NOT EXISTS `common_settings` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `option_name` varchar(255) NOT NULL, + `option_value` varchar(500) NOT NULL, + `status` varchar(255) NOT NULL, + `optional_field` varchar(500) NOT NULL, + `created_at` timestamp NOT NULL, + `updated_at` timestamp NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; + +-- +-- Dumping data for table `common_settings` +-- + +INSERT INTO `common_settings` (`id`, `option_name`, `option_value`, `status`, `optional_field`, `created_at`, `updated_at`) VALUES +(1, 'ticket_token_time_duration', '1', '', '', '2016-06-01 14:26:36', '2016-06-01 14:26:36'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `country_code` +-- + +CREATE TABLE IF NOT EXISTS `country_code` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `iso` char(2) COLLATE utf8_unicode_ci NOT NULL, + `name` varchar(100) COLLATE utf8_unicode_ci NOT NULL, + `nicename` varchar(100) COLLATE utf8_unicode_ci NOT NULL, + `iso3` char(3) COLLATE utf8_unicode_ci NOT NULL, + `numcode` smallint(6) NOT NULL, + `phonecode` int(11) NOT NULL, + `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=240 ; + +-- +-- Dumping data for table `country_code` +-- + +INSERT INTO `country_code` (`id`, `iso`, `name`, `nicename`, `iso3`, `numcode`, `phonecode`, `created_at`, `updated_at`) VALUES +(1, 'AF', 'AFGHANISTAN', 'Afghanistan', 'AFG', 4, 93, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(2, 'AL', 'ALBANIA', 'Albania', 'ALB', 8, 355, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(3, 'DZ', 'ALGERIA', 'Algeria', 'DZA', 12, 213, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(4, 'AS', 'AMERICAN SAMOA', 'American Samoa', 'ASM', 16, 1684, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(5, 'AD', 'ANDORRA', 'Andorra', 'AND', 20, 376, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(6, 'AO', 'ANGOLA', 'Angola', 'AGO', 24, 244, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(7, 'AI', 'ANGUILLA', 'Anguilla', 'AIA', 660, 1264, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(8, 'AQ', 'ANTARCTICA', 'Antarctica', 'NUL', 0, 0, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(9, 'AG', 'ANTIGUA AND BARBUDA', 'Antigua and Barbuda', 'ATG', 28, 1268, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(10, 'AR', 'ARGENTINA', 'Argentina', 'ARG', 32, 54, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(11, 'AM', 'ARMENIA', 'Armenia', 'ARM', 51, 374, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(12, 'AW', 'ARUBA', 'Aruba', 'ABW', 533, 297, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(13, 'AU', 'AUSTRALIA', 'Australia', 'AUS', 36, 61, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(14, 'AT', 'AUSTRIA', 'Austria', 'AUT', 40, 43, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(15, 'AZ', 'AZERBAIJAN', 'Azerbaijan', 'AZE', 31, 994, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(16, 'BS', 'BAHAMAS', 'Bahamas', 'BHS', 44, 1242, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(17, 'BH', 'BAHRAIN', 'Bahrain', 'BHR', 48, 973, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(18, 'BD', 'BANGLADESH', 'Bangladesh', 'BGD', 50, 880, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(19, 'BB', 'BARBADOS', 'Barbados', 'BRB', 52, 1246, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(20, 'BY', 'BELARUS', 'Belarus', 'BLR', 112, 375, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(21, 'BE', 'BELGIUM', 'Belgium', 'BEL', 56, 32, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(22, 'BZ', 'BELIZE', 'Belize', 'BLZ', 84, 501, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(23, 'BJ', 'BENIN', 'Benin', 'BEN', 204, 229, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(24, 'BM', 'BERMUDA', 'Bermuda', 'BMU', 60, 1441, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(25, 'BT', 'BHUTAN', 'Bhutan', 'BTN', 64, 975, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(26, 'BO', 'BOLIVIA', 'Bolivia', 'BOL', 68, 591, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(27, 'BA', 'BOSNIA AND HERZEGOVINA', 'Bosnia and Herzegovina', 'BIH', 70, 387, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(28, 'BW', 'BOTSWANA', 'Botswana', 'BWA', 72, 267, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(29, 'BV', 'BOUVET ISLAND', 'Bouvet Island', 'NUL', 0, 0, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(30, 'BR', 'BRAZIL', 'Brazil', 'BRA', 76, 55, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(31, 'IO', 'BRITISH INDIAN OCEAN TERRITORY', 'British Indian Ocean Territory', 'NUL', 0, 246, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(32, 'BN', 'BRUNEI DARUSSALAM', 'Brunei Darussalam', 'BRN', 96, 673, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(33, 'BG', 'BULGARIA', 'Bulgaria', 'BGR', 100, 359, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(34, 'BF', 'BURKINA FASO', 'Burkina Faso', 'BFA', 854, 226, '2016-05-11 07:08:05', '2016-05-11 07:08:05'), +(35, 'BI', 'BURUNDI', 'Burundi', 'BDI', 108, 257, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(36, 'KH', 'CAMBODIA', 'Cambodia', 'KHM', 116, 855, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(37, 'CM', 'CAMEROON', 'Cameroon', 'CMR', 120, 237, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(38, 'CA', 'CANADA', 'Canada', 'CAN', 124, 1, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(39, 'CV', 'CAPE VERDE', 'Cape Verde', 'CPV', 132, 238, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(40, 'KY', 'CAYMAN ISLANDS', 'Cayman Islands', 'CYM', 136, 1345, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(41, 'CF', 'CENTRAL AFRICAN REPUBLIC', 'Central African Republic', 'CAF', 140, 236, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(42, 'TD', 'CHAD', 'Chad', 'TCD', 148, 235, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(43, 'CL', 'CHILE', 'Chile', 'CHL', 152, 56, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(44, 'CN', 'CHINA', 'China', 'CHN', 156, 86, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(45, 'CX', 'CHRISTMAS ISLAND', 'Christmas Island', 'NUL', 0, 61, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(46, 'CC', 'COCOS (KEELING) ISLANDS', 'Cocos (Keeling) Islands', 'NUL', 0, 672, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(47, 'CO', 'COLOMBIA', 'Colombia', 'COL', 170, 57, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(48, 'KM', 'COMOROS', 'Comoros', 'COM', 174, 269, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(49, 'CG', 'CONGO', 'Congo', 'COG', 178, 242, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(50, 'CD', 'CONGO, THE DEMOCRATIC REPUBLIC OF THE', 'Congo, the Democratic Republic of the', 'COD', 180, 242, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(51, 'CK', 'COOK ISLANDS', 'Cook Islands', 'COK', 184, 682, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(52, 'CR', 'COSTA RICA', 'Costa Rica', 'CRI', 188, 506, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(53, 'CI', 'COTE DIVOIRE', 'Cote DIvoire', 'CIV', 384, 225, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(54, 'HR', 'CROATIA', 'Croatia', 'HRV', 191, 385, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(55, 'CU', 'CUBA', 'Cuba', 'CUB', 192, 53, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(56, 'CY', 'CYPRUS', 'Cyprus', 'CYP', 196, 357, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(57, 'CZ', 'CZECH REPUBLIC', 'Czech Republic', 'CZE', 203, 420, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(58, 'DK', 'DENMARK', 'Denmark', 'DNK', 208, 45, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(59, 'DJ', 'DJIBOUTI', 'Djibouti', 'DJI', 262, 253, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(60, 'DM', 'DOMINICA', 'Dominica', 'DMA', 212, 1767, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(61, 'DO', 'DOMINICAN REPUBLIC', 'Dominican Republic', 'DOM', 214, 1809, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(62, 'EC', 'ECUADOR', 'Ecuador', 'ECU', 218, 593, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(63, 'EG', 'EGYPT', 'Egypt', 'EGY', 818, 20, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(64, 'SV', 'EL SALVADOR', 'El Salvador', 'SLV', 222, 503, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(65, 'GQ', 'EQUATORIAL GUINEA', 'Equatorial Guinea', 'GNQ', 226, 240, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(66, 'ER', 'ERITREA', 'Eritrea', 'ERI', 232, 291, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(67, 'EE', 'ESTONIA', 'Estonia', 'EST', 233, 372, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(68, 'ET', 'ETHIOPIA', 'Ethiopia', 'ETH', 231, 251, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(69, 'FK', 'FALKLAND ISLANDS (MALVINAS)', 'Falkland Islands (Malvinas)', 'FLK', 238, 500, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(70, 'FO', 'FAROE ISLANDS', 'Faroe Islands', 'FRO', 234, 298, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(71, 'FJ', 'FIJI', 'Fiji', 'FJI', 242, 679, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(72, 'FI', 'FINLAND', 'Finland', 'FIN', 246, 358, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(73, 'FR', 'FRANCE', 'France', 'FRA', 250, 33, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(74, 'GF', 'FRENCH GUIANA', 'French Guiana', 'GUF', 254, 594, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(75, 'PF', 'FRENCH POLYNESIA', 'French Polynesia', 'PYF', 258, 689, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(76, 'TF', 'FRENCH SOUTHERN TERRITORIES', 'French Southern Territories', 'NUL', 0, 0, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(77, 'GA', 'GABON', 'Gabon', 'GAB', 266, 241, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(78, 'GM', 'GAMBIA', 'Gambia', 'GMB', 270, 220, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(79, 'GE', 'GEORGIA', 'Georgia', 'GEO', 268, 995, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(80, 'DE', 'GERMANY', 'Germany', 'DEU', 276, 49, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(81, 'GH', 'GHANA', 'Ghana', 'GHA', 288, 233, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(82, 'GI', 'GIBRALTAR', 'Gibraltar', 'GIB', 292, 350, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(83, 'GR', 'GREECE', 'Greece', 'GRC', 300, 30, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(84, 'GL', 'GREENLAND', 'Greenland', 'GRL', 304, 299, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(85, 'GD', 'GRENADA', 'Grenada', 'GRD', 308, 1473, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(86, 'GP', 'GUADELOUPE', 'Guadeloupe', 'GLP', 312, 590, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(87, 'GU', 'GUAM', 'Guam', 'GUM', 316, 1671, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(88, 'GT', 'GUATEMALA', 'Guatemala', 'GTM', 320, 502, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(89, 'GN', 'GUINEA', 'Guinea', 'GIN', 324, 224, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(90, 'GW', 'GUINEA-BISSAU', 'Guinea-Bissau', 'GNB', 624, 245, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(91, 'GY', 'GUYANA', 'Guyana', 'GUY', 328, 592, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(92, 'HT', 'HAITI', 'Haiti', 'HTI', 332, 509, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(93, 'HM', 'HEARD ISLAND AND MCDONALD ISLANDS', 'Heard Island and Mcdonald Islands', 'NUL', 0, 0, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(94, 'VA', 'HOLY SEE (VATICAN CITY STATE)', 'Holy See (Vatican City State)', 'VAT', 336, 39, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(95, 'HN', 'HONDURAS', 'Honduras', 'HND', 340, 504, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(96, 'HK', 'HONG KONG', 'Hong Kong', 'HKG', 344, 852, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(97, 'HU', 'HUNGARY', 'Hungary', 'HUN', 348, 36, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(98, 'IS', 'ICELAND', 'Iceland', 'ISL', 352, 354, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(99, 'IN', 'INDIA', 'India', 'IND', 356, 91, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(100, 'ID', 'INDONESIA', 'Indonesia', 'IDN', 360, 62, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(101, 'IR', 'IRAN, ISLAMIC REPUBLIC OF', 'Iran, Islamic Republic of', 'IRN', 364, 98, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(102, 'IQ', 'IRAQ', 'Iraq', 'IRQ', 368, 964, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(103, 'IE', 'IRELAND', 'Ireland', 'IRL', 372, 353, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(104, 'IL', 'ISRAEL', 'Israel', 'ISR', 376, 972, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(105, 'IT', 'ITALY', 'Italy', 'ITA', 380, 39, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(106, 'JM', 'JAMAICA', 'Jamaica', 'JAM', 388, 1876, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(107, 'JP', 'JAPAN', 'Japan', 'JPN', 392, 81, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(108, 'JO', 'JORDAN', 'Jordan', 'JOR', 400, 962, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(109, 'KZ', 'KAZAKHSTAN', 'Kazakhstan', 'KAZ', 398, 7, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(110, 'KE', 'KENYA', 'Kenya', 'KEN', 404, 254, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(111, 'KI', 'KIRIBATI', 'Kiribati', 'KIR', 296, 686, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(112, 'KP', 'KOREA, DEMOCRATIC PEOPLES REPUBLIC OF', 'Korea, Democratic Peoples Republic of', 'PRK', 408, 850, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(113, 'KR', 'KOREA, REPUBLIC OF', 'Korea, Republic of', 'KOR', 410, 82, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(114, 'KW', 'KUWAIT', 'Kuwait', 'KWT', 414, 965, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(115, 'KG', 'KYRGYZSTAN', 'Kyrgyzstan', 'KGZ', 417, 996, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(116, 'LA', 'LAO PEOPLES DEMOCRATIC REPUBLIC', 'Lao Peoples Democratic Republic', 'LAO', 418, 856, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(117, 'LV', 'LATVIA', 'Latvia', 'LVA', 428, 371, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(118, 'LB', 'LEBANON', 'Lebanon', 'LBN', 422, 961, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(119, 'LS', 'LESOTHO', 'Lesotho', 'LSO', 426, 266, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(120, 'LR', 'LIBERIA', 'Liberia', 'LBR', 430, 231, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(121, 'LY', 'LIBYAN ARAB JAMAHIRIYA', 'Libyan Arab Jamahiriya', 'LBY', 434, 218, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(122, 'LI', 'LIECHTENSTEIN', 'Liechtenstein', 'LIE', 438, 423, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(123, 'LT', 'LITHUANIA', 'Lithuania', 'LTU', 440, 370, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(124, 'LU', 'LUXEMBOURG', 'Luxembourg', 'LUX', 442, 352, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(125, 'MO', 'MACAO', 'Macao', 'MAC', 446, 853, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(126, 'MK', 'MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF', 'Macedonia, the Former Yugoslav Republic of', 'MKD', 807, 389, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(127, 'MG', 'MADAGASCAR', 'Madagascar', 'MDG', 450, 261, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(128, 'MW', 'MALAWI', 'Malawi', 'MWI', 454, 265, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(129, 'MY', 'MALAYSIA', 'Malaysia', 'MYS', 458, 60, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(130, 'MV', 'MALDIVES', 'Maldives', 'MDV', 462, 960, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(131, 'ML', 'MALI', 'Mali', 'MLI', 466, 223, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(132, 'MT', 'MALTA', 'Malta', 'MLT', 470, 356, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(133, 'MH', 'MARSHALL ISLANDS', 'Marshall Islands', 'MHL', 584, 692, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(134, 'MQ', 'MARTINIQUE', 'Martinique', 'MTQ', 474, 596, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(135, 'MR', 'MAURITANIA', 'Mauritania', 'MRT', 478, 222, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(136, 'MU', 'MAURITIUS', 'Mauritius', 'MUS', 480, 230, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(137, 'YT', 'MAYOTTE', 'Mayotte', 'NUL', 0, 269, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(138, 'MX', 'MEXICO', 'Mexico', 'MEX', 484, 52, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(139, 'FM', 'MICRONESIA, FEDERATED STATES OF', 'Micronesia, Federated States of', 'FSM', 583, 691, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(140, 'MD', 'MOLDOVA, REPUBLIC OF', 'Moldova, Republic of', 'MDA', 498, 373, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(141, 'MC', 'MONACO', 'Monaco', 'MCO', 492, 377, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(142, 'MN', 'MONGOLIA', 'Mongolia', 'MNG', 496, 976, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(143, 'MS', 'MONTSERRAT', 'Montserrat', 'MSR', 500, 1664, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(144, 'MA', 'MOROCCO', 'Morocco', 'MAR', 504, 212, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(145, 'MZ', 'MOZAMBIQUE', 'Mozambique', 'MOZ', 508, 258, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(146, 'MM', 'MYANMAR', 'Myanmar', 'MMR', 104, 95, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(147, 'NA', 'NAMIBIA', 'Namibia', 'NAM', 516, 264, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(148, 'NR', 'NAURU', 'Nauru', 'NRU', 520, 674, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(149, 'NP', 'NEPAL', 'Nepal', 'NPL', 524, 977, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(150, 'NL', 'NETHERLANDS', 'Netherlands', 'NLD', 528, 31, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(151, 'AN', 'NETHERLANDS ANTILLES', 'Netherlands Antilles', 'ANT', 530, 599, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(152, 'NC', 'NEW CALEDONIA', 'New Caledonia', 'NCL', 540, 687, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(153, 'NZ', 'NEW ZEALAND', 'New Zealand', 'NZL', 554, 64, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(154, 'NI', 'NICARAGUA', 'Nicaragua', 'NIC', 558, 505, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(155, 'NE', 'NIGER', 'Niger', 'NER', 562, 227, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(156, 'NG', 'NIGERIA', 'Nigeria', 'NGA', 566, 234, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(157, 'NU', 'NIUE', 'Niue', 'NIU', 570, 683, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(158, 'NF', 'NORFOLK ISLAND', 'Norfolk Island', 'NFK', 574, 672, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(159, 'MP', 'NORTHERN MARIANA ISLANDS', 'Northern Mariana Islands', 'MNP', 580, 1670, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(160, 'NO', 'NORWAY', 'Norway', 'NOR', 578, 47, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(161, 'OM', 'OMAN', 'Oman', 'OMN', 512, 968, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(162, 'PK', 'PAKISTAN', 'Pakistan', 'PAK', 586, 92, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(163, 'PW', 'PALAU', 'Palau', 'PLW', 585, 680, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(164, 'PS', 'PALESTINIAN TERRITORY, OCCUPIED', 'Palestinian Territory, Occupied', 'NUL', 0, 970, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(165, 'PA', 'PANAMA', 'Panama', 'PAN', 591, 507, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(166, 'PG', 'PAPUA NEW GUINEA', 'Papua New Guinea', 'PNG', 598, 675, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(167, 'PY', 'PARAGUAY', 'Paraguay', 'PRY', 600, 595, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(168, 'PE', 'PERU', 'Peru', 'PER', 604, 51, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(169, 'PH', 'PHILIPPINES', 'Philippines', 'PHL', 608, 63, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(170, 'PN', 'PITCAIRN', 'Pitcairn', 'PCN', 612, 0, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(171, 'PL', 'POLAND', 'Poland', 'POL', 616, 48, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(172, 'PT', 'PORTUGAL', 'Portugal', 'PRT', 620, 351, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(173, 'PR', 'PUERTO RICO', 'Puerto Rico', 'PRI', 630, 1787, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(174, 'QA', 'QATAR', 'Qatar', 'QAT', 634, 974, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(175, 'RE', 'REUNION', 'Reunion', 'REU', 638, 262, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(176, 'RO', 'ROMANIA', 'Romania', 'ROM', 642, 40, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(177, 'RU', 'RUSSIAN FEDERATION', 'Russian Federation', 'RUS', 643, 70, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(178, 'RW', 'RWANDA', 'Rwanda', 'RWA', 646, 250, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(179, 'SH', 'SAINT HELENA', 'Saint Helena', 'SHN', 654, 290, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(180, 'KN', 'SAINT KITTS AND NEVIS', 'Saint Kitts and Nevis', 'KNA', 659, 1869, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(181, 'LC', 'SAINT LUCIA', 'Saint Lucia', 'LCA', 662, 1758, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(182, 'PM', 'SAINT PIERRE AND MIQUELON', 'Saint Pierre and Miquelon', 'SPM', 666, 508, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(183, 'VC', 'SAINT VINCENT AND THE GRENADINES', 'Saint Vincent and the Grenadines', 'VCT', 670, 1784, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(184, 'WS', 'SAMOA', 'Samoa', 'WSM', 882, 684, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(185, 'SM', 'SAN MARINO', 'San Marino', 'SMR', 674, 378, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(186, 'ST', 'SAO TOME AND PRINCIPE', 'Sao Tome and Principe', 'STP', 678, 239, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(187, 'SA', 'SAUDI ARABIA', 'Saudi Arabia', 'SAU', 682, 966, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(188, 'SN', 'SENEGAL', 'Senegal', 'SEN', 686, 221, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(189, 'CS', 'SERBIA AND MONTENEGRO', 'Serbia and Montenegro', 'NUL', 0, 381, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(190, 'SC', 'SEYCHELLES', 'Seychelles', 'SYC', 690, 248, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(191, 'SL', 'SIERRA LEONE', 'Sierra Leone', 'SLE', 694, 232, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(192, 'SG', 'SINGAPORE', 'Singapore', 'SGP', 702, 65, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(193, 'SK', 'SLOVAKIA', 'Slovakia', 'SVK', 703, 421, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(194, 'SI', 'SLOVENIA', 'Slovenia', 'SVN', 705, 386, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(195, 'SB', 'SOLOMON ISLANDS', 'Solomon Islands', 'SLB', 90, 677, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(196, 'SO', 'SOMALIA', 'Somalia', 'SOM', 706, 252, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(197, 'ZA', 'SOUTH AFRICA', 'South Africa', 'ZAF', 710, 27, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(198, 'GS', 'SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS', 'South Georgia and the South Sandwich Islands', 'NUL', 0, 0, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(199, 'ES', 'SPAIN', 'Spain', 'ESP', 724, 34, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(200, 'LK', 'SRI LANKA', 'Sri Lanka', 'LKA', 144, 94, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(201, 'SD', 'SUDAN', 'Sudan', 'SDN', 736, 249, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(202, 'SR', 'SURINAME', 'Suriname', 'SUR', 740, 597, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(203, 'SJ', 'SVALBARD AND JAN MAYEN', 'Svalbard and Jan Mayen', 'SJM', 744, 47, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(204, 'SZ', 'SWAZILAND', 'Swaziland', 'SWZ', 748, 268, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(205, 'SE', 'SWEDEN', 'Sweden', 'SWE', 752, 46, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(206, 'CH', 'SWITZERLAND', 'Switzerland', 'CHE', 756, 41, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(207, 'SY', 'SYRIAN ARAB REPUBLIC', 'Syrian Arab Republic', 'SYR', 760, 963, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(208, 'TW', 'TAIWAN, PROVINCE OF CHINA', 'Taiwan, Province of China', 'TWN', 158, 886, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(209, 'TJ', 'TAJIKISTAN', 'Tajikistan', 'TJK', 762, 992, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(210, 'TZ', 'TANZANIA, UNITED REPUBLIC OF', 'Tanzania, United Republic of', 'TZA', 834, 255, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(211, 'TH', 'THAILAND', 'Thailand', 'THA', 764, 66, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(212, 'TL', 'TIMOR-LESTE', 'Timor-Leste', 'NUL', 0, 670, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(213, 'TG', 'TOGO', 'Togo', 'TGO', 768, 228, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(214, 'TK', 'TOKELAU', 'Tokelau', 'TKL', 772, 690, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(215, 'TO', 'TONGA', 'Tonga', 'TON', 776, 676, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(216, 'TT', 'TRINIDAD AND TOBAGO', 'Trinidad and Tobago', 'TTO', 780, 1868, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(217, 'TN', 'TUNISIA', 'Tunisia', 'TUN', 788, 216, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(218, 'TR', 'TURKEY', 'Turkey', 'TUR', 792, 90, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(219, 'TM', 'TURKMENISTAN', 'Turkmenistan', 'TKM', 795, 7370, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(220, 'TC', 'TURKS AND CAICOS ISLANDS', 'Turks and Caicos Islands', 'TCA', 796, 1649, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(221, 'TV', 'TUVALU', 'Tuvalu', 'TUV', 798, 688, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(222, 'UG', 'UGANDA', 'Uganda', 'UGA', 800, 256, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(223, 'UA', 'UKRAINE', 'Ukraine', 'UKR', 804, 380, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(224, 'AE', 'UNITED ARAB EMIRATES', 'United Arab Emirates', 'ARE', 784, 971, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(225, 'GB', 'UNITED KINGDOM', 'United Kingdom', 'GBR', 826, 44, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(226, 'US', 'UNITED STATES', 'United States', 'USA', 840, 1, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(227, 'UM', 'UNITED STATES MINOR OUTLYING ISLANDS', 'United States Minor Outlying Islands', 'NUL', 0, 1, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(228, 'UY', 'URUGUAY', 'Uruguay', 'URY', 858, 598, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(229, 'UZ', 'UZBEKISTAN', 'Uzbekistan', 'UZB', 860, 998, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(230, 'VU', 'VANUATU', 'Vanuatu', 'VUT', 548, 678, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(231, 'VE', 'VENEZUELA', 'Venezuela', 'VEN', 862, 58, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(232, 'VN', 'VIET NAM', 'Viet Nam', 'VNM', 704, 84, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(233, 'VG', 'VIRGIN ISLANDS, BRITISH', 'Virgin Islands, British', 'VGB', 92, 1284, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(234, 'VI', 'VIRGIN ISLANDS, U.S.', 'Virgin Islands, U.s.', 'VIR', 850, 1340, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(235, 'WF', 'WALLIS AND FUTUNA', 'Wallis and Futuna', 'WLF', 876, 681, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(236, 'EH', 'WESTERN SAHARA', 'Western Sahara', 'ESH', 732, 212, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(237, 'YE', 'YEMEN', 'Yemen', 'YEM', 887, 967, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(238, 'ZM', 'ZAMBIA', 'Zambia', 'ZMB', 894, 260, '2016-05-11 07:08:06', '2016-05-11 07:08:06'), +(239, 'ZW', 'ZIMBABWE', 'Zimbabwe', 'ZWE', 716, 263, '2016-05-11 07:08:06', '2016-05-11 07:08:06'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `emails` +-- + +ALTER TABLE `emails` + ADD `smtp_validate` varchar(222) NOT NULL AFTER `sending_encryption`, + ADD `smtp_authentication` varchar(222) NOT NULL AFTER `smtp_validate`; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `login_attempts` +-- + +CREATE TABLE IF NOT EXISTS `login_attempts` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `User` varchar(255) NOT NULL, + `IP` varchar(20) NOT NULL, + `Attempts` int(11) NOT NULL, + `LastLogin` datetime NOT NULL, + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=9 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `ratings` +-- + +CREATE TABLE IF NOT EXISTS `ratings` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `display_order` int(11) NOT NULL, + `allow_modification` int(11) NOT NULL, + `rating_scale` int(11) NOT NULL, + `rating_area` varchar(255) NOT NULL, + `restrict` varchar(255) NOT NULL, + `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=17 ; + +-- +-- Dumping data for table `ratings` +-- + +INSERT INTO `ratings` (`id`, `name`, `display_order`, `allow_modification`, `rating_scale`, `rating_area`, `restrict`, `created_at`, `updated_at`) VALUES +(15, 'OverAll Satisfaction', 1, 1, 5, 'Helpdesk Area', 'General', '2016-06-01 06:42:57', '2016-06-01 06:42:57'), +(16, 'Reply Rating', 1, 1, 5, 'Comment Area', 'General', '2016-06-01 06:44:09', '2016-06-01 06:45:21'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `rating_ref` +-- + +CREATE TABLE IF NOT EXISTS `rating_ref` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `rating_id` int(11) NOT NULL, + `ticket_id` int(11) NOT NULL, + `thread_id` int(11) NOT NULL, + `rating_value` int(11) NOT NULL, + `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=53 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `settings_security` +-- + +CREATE TABLE IF NOT EXISTS `settings_security` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `lockout_message` varchar(255) NOT NULL, + `backlist_offender` int(11) NOT NULL, + `backlist_threshold` int(11) NOT NULL, + `lockout_period` int(11) NOT NULL, + `days_to_keep_logs` int(11) NOT NULL, + `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; + +-- +-- Dumping data for table `settings_security` +-- + +INSERT INTO `settings_security` (`id`, `lockout_message`, `backlist_offender`, `backlist_threshold`, `lockout_period`, `days_to_keep_logs`, `updated_at`, `created_at`) VALUES +(1, 'You have been locked out of application due to too many failed login attempts.', 0, 344, 15, 0, '2016-06-02 04:44:50', '2016-04-22 07:56:09'); + +-- ----------------------------------------------------- + +-- +-- Table structure for table `template_sets` +-- + +CREATE TABLE IF NOT EXISTS `template_sets` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `active` int(11) NOT NULL, + `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; + +-- +-- Dumping data for table `template_sets` +-- + +INSERT INTO `template_sets` (`id`, `name`, `active`, `created_at`, `updated_at`) VALUES +(1, 'default', 1, '2016-05-11 03:40:19', '2016-05-11 05:43:32'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `template_types` +-- + +CREATE TABLE IF NOT EXISTS `template_types` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `updated_at` timestamp NULL DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=13 ; + +-- +-- Dumping data for table `template_types` +-- + +INSERT INTO `template_types` (`id`, `name`, `created_at`, `updated_at`) VALUES +(1, 'assign-ticket', NULL, NULL), +(2, 'check-ticket', NULL, NULL), +(3, 'close-ticket', NULL, NULL), +(4, 'create-ticket', NULL, NULL), +(5, 'create-ticket-agent', NULL, NULL), +(6, 'create-ticket-by-agent', NULL, NULL), +(7, 'error-report', NULL, NULL), +(8, 'registration-notification', NULL, NULL), +(9, 'reset-password', NULL, NULL), +(10, 'ticket-reply', NULL, NULL), +(11, 'ticket-reply-agent', NULL, NULL), +(12, 'registration', NULL, NULL); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `templates` +-- + +CREATE TABLE IF NOT EXISTS `templates` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `variable` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `type` int(10) unsigned NOT NULL, + `subject` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `message` mediumtext COLLATE utf8_unicode_ci NOT NULL, + `description` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `updated_at` timestamp NULL DEFAULT NULL, + `set_id` int(11) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `templates_type_foreign` (`type`), + KEY `set_id` (`set_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=79 ; + +-- +-- Dumping data for table `templates` +-- + +INSERT INTO `templates` (`id`, `name`, `variable`, `type`, `subject`, `message`, `description`, `created_at`, `updated_at`, `set_id`) VALUES +(1, 'assign-ticket', '', 1, '', '
Hello {!!$ticket_agent_name!!},

Ticket No: {!!$ticket_number!!}
Has been assigned to you by {!!$ticket_assigner!!} 

Thank You
Kind Regards,
{!!$system_from!!}
', '', NULL, NULL, 1), +(2, 'check-ticket', '', 2, '', '
Hello {!!$user!!},

Click the link below to view your Requested ticket
{!!$ticket_link_with_number!!}

Kind Regards,
{!!$system_from!!}
', '', NULL, NULL, 1), +(3, 'close-ticket', '', 3, '', '
Hello,

This message is regarding your ticket ID {!!$ticket_number!!}. We are changing the status of this ticket to ''Closed'' as the issue appears to be resolved.

Thank you
Kind regards,
{!!$system_from!!}

', '', NULL, NULL, 1), +(4, 'create-ticket', '', 4, '', '
Hello {!!$user!!}

Thank you for contacting us. This is an automated response confirming the receipt of your ticket. Our team will get back to you as soon as possible. When replying, please make sure that the ticket ID is kept in the subject so that we can track your replies.

Ticket ID: {!!$ticket_number!!} 
{!!$department_sign!!}
You can check the status of or update this ticket online at: {!!$system_link!!}
', '', NULL, NULL, 1), +(5, 'create-ticket-agent', '', 5, 'create-ticket-agent', '
Hello {!!$ticket_agent_name!!},       

New ticket {!!$ticket_number!!} created 
From
Name :- {!!$ticket_client_name!!}    
E-mail :- {!!$ticket_client_email!!}   

{!!$content!!}     

Kind Regards,
{!!$system_from!!}

', '', NULL, '2016-05-17 05:38:37', 1), +(6, 'create-ticket-by-agent', '', 6, '', '
{!!$content!!}

{!!$agent_sign!!}

You can check the status of or update this ticket online at: {!!$system_link!!}
', '', NULL, NULL, 1), +(7, 'error-report', '', 7, '', '  {!!$system_error!!}  ', '', NULL, NULL, 1), +(8, 'registration-notification', '', 8, '', '

Hello {!!$user!!} , 

This email is confirmation that you are now registered at our helpdesk.

Registered Email: {!!$email_address!!}

Password: {!!$user_password!!}

You can visit the helpdesk to browse articles and contact us at any time: {!!$system_link!!}

Thank You.

Kind Regards,

{!!$system_from!!} 

', '', NULL, NULL, 1), +(9, 'reset-password', '', 9, '', 'Hello {!!$user!!}

You asked to reset your password. To do so, please click this link:

{!!$password_reset_link!!}


This will let you change your password to something new. If you didn''t ask for this, don''t worry, we''ll keep your password safe.

Thank You.

Kind Regards,

{!!$system_from!!}', '', NULL, NULL, 1), +(10, 'ticket-reply', '', 10, '', '

{!!$content!!}   

{!!$agent_sign!!} 

Ticket Details

Ticket ID: {!!$ticket_number!!}     




', '', NULL, NULL, 1), +(11, 'ticket-reply-agent', '', 11, '', '
Hello {!!$ticket_agent_name!!},
A reply been made to ticket {!!$ticket_number!!}
From
Name: {!!$ticket_client_name!!}
E-mail: {!!$ticket_client_email!!}
{!!$content!!}
Kind Regards,
{!!$system_from!!}
', '', NULL, NULL, 1), +(78, 'registration', '', 12, '', '

Hello {!!$user!!} , 

This email is confirmation that you are now registered at our helpdesk.

Registered Email: {!!$email_address!!}

Please click on the below link to activate your account and Login to the system {!!$password_reset_link!!}

Thank You.

Kind Regards,

{!!$system_from!!} 

', '', NULL, NULL, 1); + +-- -------------------------------------------------------- + +-- +-- Table alter for table `ticket_status` +-- + +ALTER TABLE `ticket_status` + ADD `email_user` int(11) NOT NULL AFTER `sort`, + ADD `icon_class` varchar(222) NOT NULL AFTER `email_user`; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `ticket_token` +-- + +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',, + `updated_at` timestamp NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `users` +-- + +ALTER TABLE `users` + ADD `country_code` int(11) NOT NULL AFTER `profile_pic`; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `workflow_close` +-- + +CREATE TABLE IF NOT EXISTS `workflow_close` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `days` int(11) NOT NULL, + `condition` int(11) NOT NULL, + `send_email` int(11) NOT NULL, + `status` int(11) NOT NULL, + `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; + +-- +-- Dumping data for table `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 diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 197d2b548..0496485b6 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -3,19 +3,20 @@ namespace App\Exceptions; // controller -use Bugsnag; -//use Illuminate\Validation\ValidationException; -use Bugsnag\BugsnagLaravel\BugsnagExceptionHandler as ExceptionHandler; use Exception; +//use Illuminate\Validation\ValidationException; +use Illuminate\Foundation\Validation\ValidationException; use Illuminate\Auth\Access\AuthorizationException; +use Illuminate\Database\Eloquent\ModelNotFoundException; // use Symfony\Component\HttpKernel\Exception\HttpException; // use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; -use Illuminate\Database\Eloquent\ModelNotFoundException; -use Illuminate\Foundation\Validation\ValidationException; +use Bugsnag\BugsnagLaravel\BugsnagExceptionHandler as ExceptionHandler; +use Bugsnag; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -class Handler extends ExceptionHandler -{ +class Handler extends ExceptionHandler { + /** * A list of the exception types that should not be reported. * @@ -52,8 +53,7 @@ class Handler extends ExceptionHandler * * @return void */ - public function report(Exception $e) - { + public function report(Exception $e) { $debug = \Config::get('app.bugsnag_reporting'); $debug = ($debug) ? 'true' : 'false'; if ($debug == 'false') { @@ -61,7 +61,6 @@ class Handler extends ExceptionHandler return false; }); } - return parent::report($e); } @@ -89,7 +88,7 @@ class Handler extends ExceptionHandler // if (\Config::get('database.install') == 1) { // // checking if the error log send to Ladybirdweb is enabled or not // if (\Config::get('app.ErrorLog') == '1') { -// +// // } // } // return response()->view('errors.500', []); @@ -129,79 +128,66 @@ class Handler extends ExceptionHandler /** * Render an exception into an HTTP response. - * - * @param type $request + * @param type $request * @param Exception $e - * * @return type mixed */ - public function render($request, Exception $e) - { + public function render($request, Exception $e) { + switch ($e) { - case $e instanceof \Illuminate\Http\Exception\HttpResponseException: + case $e instanceof \Illuminate\Http\Exception\HttpResponseException : return parent::render($request, $e); - case $e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException: + case $e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException : return response()->json(['message' => $e->getMessage(), 'code' => $e->getStatusCode()]); - case $e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException: + case $e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException : return response()->json(['message' => $e->getMessage(), 'code' => $e->getStatusCode()]); - default: + default : return $this->common($request, $e); } } /** - * Function to render 500 error page. - * + * Function to render 500 error page * @param type $request * @param type $e - * * @return type mixed */ - public function render500($request, $e) - { + public function render500($request, $e) { if (config('app.debug') == true) { return parent::render($request, $e); } - return redirect()->route('error500', []); } /** - * Function to render 404 error page. - * + * Function to render 404 error page * @param type $request * @param type $e - * * @return type mixed */ - public function render404($request, $e) - { + public function render404($request, $e) { if (config('app.debug') == true) { return parent::render($request, $e); } - return redirect()->route('error404', []); } /** - * Common finction to render both types of codes. - * + * Common finction to render both types of codes * @param type $request * @param type $e - * * @return type mixed */ - public function common($request, $e) - { + public function common($request, $e) { switch ($e) { - case $e instanceof HttpException: + case $e instanceof HttpException : return $this->render404($request, $e); - case $e instanceof NotFoundHttpException: + case $e instanceof NotFoundHttpException : return $this->render404($request, $e); - default: + default : return $this->render500($request, $e); } - return parent::render($request, $e); } + } diff --git a/app/Http/Controllers/Admin/helpdesk/DepartmentController.php b/app/Http/Controllers/Admin/helpdesk/DepartmentController.php index 07aba16d5..95dadf0a4 100644 --- a/app/Http/Controllers/Admin/helpdesk/DepartmentController.php +++ b/app/Http/Controllers/Admin/helpdesk/DepartmentController.php @@ -143,7 +143,7 @@ class DepartmentController extends Controller public function edit($id, User $user, Group_assign_department $group_assign_department, Template $template, Teams $team, Department $department, Sla_plan $sla, Emails $email, Groups $group) { try { - $sys_department = \DB::table('settings_system') + $sys_department = \DB::table('settings_system') ->select('department') ->where('id', '=', 1) ->first(); @@ -175,6 +175,7 @@ class DepartmentController extends Controller { // dd($id); try { + $table = $group_assign_department->where('department_id', $id); $table->delete(); $requests = $request->input('group_id'); diff --git a/app/Http/Controllers/Admin/helpdesk/EmailsController.php b/app/Http/Controllers/Admin/helpdesk/EmailsController.php index fdec69f00..e4b767aef 100644 --- a/app/Http/Controllers/Admin/helpdesk/EmailsController.php +++ b/app/Http/Controllers/Admin/helpdesk/EmailsController.php @@ -28,15 +28,14 @@ use Lang; * * @author Ladybird */ -class EmailsController extends Controller -{ +class EmailsController extends Controller { + /** * Defining constructor variables. * * @return type */ - public function __construct() - { + public function __construct() { $this->middleware('auth'); $this->middleware('roles'); } @@ -48,8 +47,7 @@ class EmailsController extends Controller * * @return type view */ - public function index(Emails $email) - { + public function index(Emails $email) { try { // fetch all the emails from emails table $emails = $email->get(); @@ -70,8 +68,7 @@ class EmailsController extends Controller * * @return type Response */ - public function create(Department $department, Help_topic $help, Ticket_Priority $ticket_priority, MailboxProtocol $mailbox_protocol) - { + public function create(Department $department, Help_topic $help, Ticket_Priority $ticket_priority, MailboxProtocol $mailbox_protocol) { try { // fetch all the departments from the department table $departments = $department->get(); @@ -96,17 +93,16 @@ class EmailsController extends Controller * * @return int */ - public function validatingEmailSettings(Request $request) - { + public function validatingEmailSettings(Request $request) { $validator = \Validator::make( [ 'email_address' => $request->input('email_address'), - 'email_name' => $request->input('email_name'), - 'password' => $request->input('password'), + 'email_name' => $request->input('email_name'), + 'password' => $request->input('password'), ], [ 'email_address' => 'required|email|unique:emails', - 'email_name' => 'required', - 'password' => 'required', + 'email_name' => 'required', + 'password' => 'required', ] ); if ($validator->fails()) { @@ -177,8 +173,7 @@ class EmailsController extends Controller * * @return type Redirect */ - public function store($request, $imap_check) - { + public function store($request, $imap_check) { $email = new Emails(); try { // saving all the fields to the database @@ -260,8 +255,7 @@ class EmailsController extends Controller * * @return type Response */ - public function edit($id, Department $department, Help_topic $help, Emails $email, Ticket_Priority $ticket_priority, MailboxProtocol $mailbox_protocol) - { + public function edit($id, Department $department, Help_topic $help, Emails $email, Ticket_Priority $ticket_priority, MailboxProtocol $mailbox_protocol) { try { $sys_email = \DB::table('settings_email')->select('sys_email')->where('id', '=', 1)->first(); // dd($sys_email); @@ -292,17 +286,16 @@ class EmailsController extends Controller * * @return int */ - public function validatingEmailSettingsUpdate($id, Request $request) - { + public function validatingEmailSettingsUpdate($id, Request $request) { $validator = \Validator::make( [ 'email_address' => $request->input('email_address'), - 'email_name' => $request->input('email_name'), - 'password' => $request->input('password'), + 'email_name' => $request->input('email_name'), + 'password' => $request->input('password'), ], [ 'email_address' => 'email', - 'email_name' => 'required', - 'password' => 'required', + 'email_name' => 'required', + 'password' => 'required', ] ); if ($validator->fails()) { @@ -375,8 +368,7 @@ class EmailsController extends Controller * * @return type Response */ - public function update($id, $request, $imap_check) - { + public function update($id, $request, $imap_check) { try { // fetch the selected emails $emails = Emails::whereId($id)->first(); @@ -426,12 +418,12 @@ class EmailsController extends Controller // $emails->password = Crypt::encrypt($request->input('password')); $emails->save(); //dd($request->sys_email); - if ($request->sys_email == 'on') { + if($request->sys_email == 'on') { $system = \DB::table('settings_email') ->where('id', '=', 1) ->update(['sys_email' => $id]); } elseif ($request->input('count') <= 1 && $request->sys_email == null) { - $system = \DB::table('settings_email') + $system = \DB::table('settings_email') ->where('id', '=', 1) ->update(['sys_email' => null]); } @@ -453,8 +445,7 @@ class EmailsController extends Controller * * @return type Redirect */ - public function destroy($id, Emails $email) - { + public function destroy($id, Emails $email) { // fetching the details on the basis of the $id passed to the function $default_system_email = Email::where('id', '=', '1')->first(); if ($default_system_email->sys_email) { @@ -485,26 +476,25 @@ class EmailsController extends Controller * * @return type int */ - public function getImapStream($request, $validate) - { + public function getImapStream($request, $validate) { $fetching_status = $request->input('fetching_status'); $username = $request->input('email_address'); $password = $request->input('password'); $protocol_id = $request->input('mailbox_protocol'); - $fetching_protocol = '/'.$request->input('fetching_protocol'); - $fetching_encryption = '/'.$request->input('fetching_encryption'); + $fetching_protocol = '/' . $request->input('fetching_protocol'); + $fetching_encryption = '/' . $request->input('fetching_encryption'); if ($fetching_encryption == '/none') { $fetching_encryption2 = '/novalidate-cert'; $mailbox_protocol = $fetching_encryption2; $host = $request->input('fetching_host'); $port = $request->input('fetching_port'); - $mailbox = '{'.$host.':'.$port.$mailbox_protocol.'}INBOX'; + $mailbox = '{' . $host . ':' . $port . $mailbox_protocol . '}INBOX'; } else { - $mailbox_protocol = $fetching_protocol.$fetching_encryption; + $mailbox_protocol = $fetching_protocol . $fetching_encryption; $host = $request->input('fetching_host'); $port = $request->input('fetching_port'); - $mailbox = '{'.$host.':'.$port.$mailbox_protocol.$validate.'}INBOX'; - $mailbox_protocol = $fetching_encryption.$validate; + $mailbox = '{' . $host . ':' . $port . $mailbox_protocol . $validate . '}INBOX'; + $mailbox_protocol = $fetching_encryption . $validate; } try { $imap_stream = imap_open($mailbox, $username, $password); @@ -528,8 +518,7 @@ class EmailsController extends Controller * * @return type int */ - public function checkImapStream($imap_stream) - { + public function checkImapStream($imap_stream) { $check_imap_stream = imap_check($imap_stream); if ($check_imap_stream) { $imap_stream = 1; @@ -547,8 +536,7 @@ class EmailsController extends Controller * * @return int */ - public function getSmtp($request) - { + public function getSmtp($request) { $sending_status = $request->input('sending_status'); // cheking for the sending protocol if ($request->input('sending_protocol') == 'smtp') { @@ -564,8 +552,8 @@ class EmailsController extends Controller $mail->SMTPAuth = true; // Enable SMTP authentication $mail->SMTPOptions = [ 'ssl' => [ - 'verify_peer' => false, - 'verify_peer_name' => false, + 'verify_peer' => false, + 'verify_peer_name' => false, 'allow_self_signed' => true, ], ]; @@ -597,8 +585,7 @@ class EmailsController extends Controller * * @return type string or null */ - public function departmentValue($dept) - { + public function departmentValue($dept) { if ($dept) { $email_department = $dept; } else { @@ -615,8 +602,7 @@ class EmailsController extends Controller * * @return type string or null */ - public function priorityValue($priority) - { + public function priorityValue($priority) { if ($priority) { $email_priority = $priority; } else { @@ -633,8 +619,7 @@ class EmailsController extends Controller * * @return type string or null */ - public function helpTopicValue($help_topic) - { + public function helpTopicValue($help_topic) { if ($help_topic) { $email_help_topic = $help_topic; } else { @@ -643,4 +628,5 @@ class EmailsController extends Controller return $email_help_topic; } + } diff --git a/app/Http/Controllers/Admin/helpdesk/ErrorAndDebuggingController.php b/app/Http/Controllers/Admin/helpdesk/ErrorAndDebuggingController.php index 1900369be..d826cf07c 100644 --- a/app/Http/Controllers/Admin/helpdesk/ErrorAndDebuggingController.php +++ b/app/Http/Controllers/Admin/helpdesk/ErrorAndDebuggingController.php @@ -3,21 +3,22 @@ namespace App\Http\Controllers\Admin\helpdesk; // controller +use App\Http\Controllers\Common\PhpMailController; use App\Http\Controllers\Controller; // request use Exception; -use File; use Lang; +use File; /** - * ErrorAndDebuggingController. + * ErrorAndDebuggingController * * @author Ladybird */ class ErrorAndDebuggingController extends Controller { - /** + /** * Create a new controller instance. * * @return void @@ -30,76 +31,68 @@ class ErrorAndDebuggingController extends Controller } /** - * function to show error and debugging setting page. - * + * function to show error and debugging setting page * @param void - * - * @return response + * @return response */ - public function showSettings() - { - $debug = \Config::get('app.debug'); - $bugsnag = \Config::get('app.bugsnag_reporting'); + public function showSettings() + { + $debug = \Config::get('app.debug'); + $bugsnag = \Config::get('app.bugsnag_reporting'); + return view('themes.default1.admin.helpdesk.settings.error-and-logs.error-debug')->with(['debug'=> $debug, 'bugsnag' => $bugsnag]); + } - return view('themes.default1.admin.helpdesk.settings.error-and-logs.error-debug')->with(['debug' => $debug, 'bugsnag' => $bugsnag]); - } - - /** - * funtion to update error and debugging settings. - * - * @param void - * - * @return - */ - public function postSettings() - { - try { - $debug = \Config::get('app.debug'); - $debug = ($debug) ? 'true' : 'false'; - $bugsnag_debug = \Config::get('app.bugsnag_reporting'); - $bugsnag_debug = ($bugsnag_debug) ? 'true' : 'false'; - if ($debug != \Input::get('debug') || $bugsnag_debug != \Input::get('bugsnag')) { - // dd($request->input()); - $debug_new = base_path() - .DIRECTORY_SEPARATOR. - 'config' - .DIRECTORY_SEPARATOR. - 'app.php'; - $datacontent = File::get($debug_new); - $datacontent = str_replace("'debug' => ".$debug, - "'debug' => ".\Input::get('debug'), - $datacontent); - File::put($debug_new, $datacontent); - - // dd($request->input()); - $bugsnag_debug_new = base_path() - .DIRECTORY_SEPARATOR. - 'config' - .DIRECTORY_SEPARATOR. - 'app.php'; - $datacontent2 = File::get($bugsnag_debug_new); - $datacontent2 = str_replace("'bugsnag_reporting' => ".$bugsnag_debug, - "'bugsnag_reporting' => ".\Input::get('bugsnag'), - $datacontent2); - File::put($bugsnag_debug_new, $datacontent2); - - return redirect()->back()->with('success', - Lang::get('lang.error-debug-settings-saved-message')); - } else { - return redirect()->back()->with('fails', - Lang::get('lang.error-debug-settings-error-message')); - } + /** + * funtion to update error and debugging settings + * @param void + * @return + */ + public function postSettings() + { + try{ + $debug = \Config::get('app.debug'); + $debug = ($debug) ? 'true' : 'false'; + $bugsnag_debug = \Config::get('app.bugsnag_reporting'); + $bugsnag_debug = ($bugsnag_debug) ? 'true' : 'false'; + if ($debug != \Input::get('debug') || $bugsnag_debug != \Input::get('bugsnag')) { + // dd($request->input()); + $debug_new = base_path() + .DIRECTORY_SEPARATOR. + 'config' + .DIRECTORY_SEPARATOR. + 'app.php'; + $datacontent = File::get($debug_new); + $datacontent = str_replace("'debug' => ".$debug, + "'debug' => ".\Input::get('debug'), + $datacontent); + File::put($debug_new, $datacontent); + + // dd($request->input()); + $bugsnag_debug_new = base_path() + .DIRECTORY_SEPARATOR. + 'config' + .DIRECTORY_SEPARATOR. + 'app.php'; + $datacontent2 = File::get($bugsnag_debug_new); + $datacontent2 = str_replace("'bugsnag_reporting' => ".$bugsnag_debug, + "'bugsnag_reporting' => ".\Input::get('bugsnag'), + $datacontent2); + File::put($bugsnag_debug_new, $datacontent2); + return redirect()->back()->with('success', + Lang::get('lang.error-debug-settings-saved-message')); + } else { + return redirect()->back()->with('fails', + Lang::get('lang.error-debug-settings-error-message')); + } } catch (Exception $e) { /* redirect to Index page with Fails Message */ return redirect()->back()->with('fails', $e->getMessage()); - } - } + } + } /** - * function to show error log table page. - * + * function to show error log table page * @param void - * * @return response view */ public function showErrorLogs() diff --git a/app/Http/Controllers/Admin/helpdesk/HelptopicController.php b/app/Http/Controllers/Admin/helpdesk/HelptopicController.php index 4d48ddf8e..f96afb703 100644 --- a/app/Http/Controllers/Admin/helpdesk/HelptopicController.php +++ b/app/Http/Controllers/Admin/helpdesk/HelptopicController.php @@ -152,7 +152,7 @@ class HelptopicController extends Controller $sys_help_topic = \DB::table('settings_ticket') ->select('help_topic') ->where('id', '=', 1)->first(); - + return view('themes.default1.admin.helpdesk.manage.helptopic.edit', compact('priority', 'departments', 'topics', 'forms', 'agents', 'slas', 'sys_help_topic')); } catch (Exception $e) { return redirect('helptopic')->with('fails', '
  • '.$e->getMessage().'
    • '); diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index c7d601b94..1b8d66e41 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -182,7 +182,7 @@ class SettingsController extends Controller /* Check whether function success or not */ $systems->fill($request->input())->save(); /* redirect to Index page with Success Message */ - + // dd($datacontent); //\Config::set('app.debug', $request->input('debug')); return redirect('getsystem')->with('success', Lang::get('lang.system_updated_successfully')); diff --git a/app/Http/Controllers/Admin/helpdesk/SlaController.php b/app/Http/Controllers/Admin/helpdesk/SlaController.php index 65e3fe7c8..8ddab22da 100644 --- a/app/Http/Controllers/Admin/helpdesk/SlaController.php +++ b/app/Http/Controllers/Admin/helpdesk/SlaController.php @@ -104,8 +104,7 @@ class SlaController extends Controller $slas = Sla_plan::whereId($id)->first(); $slas->get(); $sla = \DB::table('settings_ticket')->select('sla')->where('id', '=', 1)->first(); - - return view('themes.default1.admin.helpdesk.manage.sla.edit', compact('slas', 'sla')); + return view('themes.default1.admin.helpdesk.manage.sla.edit', compact('slas','sla')); } catch (Exception $e) { return redirect()->back()->with('fails', $e->getMessage()); } @@ -138,7 +137,6 @@ class SlaController extends Controller ->where('id', '=', 1) ->update(['sla' => $id]); } - return redirect('sla')->with('success', Lang::get('lang.sla_plan_updated_successfully')); } catch (Exception $e) { /* redirect to Index page with Fails Message */ diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php index 6cb0f522e..6b7600cd1 100644 --- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php +++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php @@ -24,15 +24,14 @@ use Lang; * * @author Ladybird */ -class TemplateController extends Controller -{ +class TemplateController extends Controller { + /** * Create a new controller instance. * * @return type void */ - public function __construct(PhpMailController $PhpMailController) - { + public function __construct(PhpMailController $PhpMailController) { $this->PhpMailController = $PhpMailController; $this->middleware('auth'); $this->middleware('roles'); @@ -45,8 +44,7 @@ class TemplateController extends Controller * * @return type Response */ - public function index(Template $template) - { + public function index(Template $template) { try { $templates = $template->get(); @@ -64,8 +62,7 @@ class TemplateController extends Controller * * @return type Response */ - public function create(Languages $language, Template $template) - { + public function create(Languages $language, Template $template) { try { $templates = $template->get(); $languages = $language->get(); @@ -84,8 +81,7 @@ class TemplateController extends Controller * * @return type Response */ - public function store(Template $template, TemplateRequest $request) - { + public function store(Template $template, TemplateRequest $request) { try { /* Check whether function success or not */ if ($template->fill($request->input())->save() == true) { @@ -108,8 +104,7 @@ class TemplateController extends Controller * * @return Response */ - public function show($id) - { + public function show($id) { // } @@ -122,41 +117,37 @@ class TemplateController extends Controller * * @return type Response */ - public function listdirectories() - { - $path = \Config::get('view.paths')[0].'/emails/'; + public function listdirectories() { + $path = \Config::get('view.paths')[0] . '/emails/'; $directories = scandir($path); $directory = str_replace('/', '-', $path); return view('themes.default1.admin.helpdesk.emails.template.listdirectories', compact('directories', 'directory')); } - public function listtemplates($template, $path) - { + public function listtemplates($template, $path) { $paths = str_replace('-', '/', $path); - $directory2 = $paths.$template; + $directory2 = $paths . $template; $templates = scandir($directory2); - $directory = str_replace('/', '-', $directory2.'/'); + $directory = str_replace('/', '-', $directory2 . '/'); return view('themes.default1.admin.helpdesk.emails.template.listtemplates', compact('templates', 'directory')); } - public function readtemplate($template, $path) - { + public function readtemplate($template, $path) { $directory = str_replace('-', '/', $path); - $handle = fopen($directory.$template, 'r'); - $contents = fread($handle, filesize($directory.$template)); + $handle = fopen($directory . $template, 'r'); + $contents = fread($handle, filesize($directory . $template)); fclose($handle); return view('themes.default1.admin.helpdesk.emails.template.readtemplates', compact('contents', 'template', 'path')); } - public function createtemplate() - { + public function createtemplate() { $directory = '../resources/views/emails/'; $fname = Input::get('folder_name'); - $filename = $directory.$fname; + $filename = $directory . $fname; // images folder creation using php // $mydir = dirname( __FILE__ )."/html/images"; @@ -168,7 +159,7 @@ class TemplateController extends Controller if (!file_exists($filename)) { mkdir($filename, 0777); } - $files = array_filter(scandir($directory.'default')); + $files = array_filter(scandir($directory . 'default')); foreach ($files as $file) { if ($file === '.' or $file === '..') { @@ -176,29 +167,27 @@ class TemplateController extends Controller } if (!is_dir($file)) { // $file_to_go = str_replace("code/resources/views/emails/",'code/resources/views/emails/'.$fname,$file); - $destination = $directory.$fname.'/'; + $destination = $directory . $fname . '/'; - copy($directory.'default/'.$file, $destination.$file); + copy($directory . 'default/' . $file, $destination . $file); } } return \Redirect::back()->with('success', 'Successfully copied'); } - public function writetemplate($template, $path) - { + public function writetemplate($template, $path) { $directory = str_replace('-', '/', $path); $b = Input::get('templatedata'); - file_put_contents($directory.$template, print_r($b, true)); + file_put_contents($directory . $template, print_r($b, true)); return \Redirect::back()->with('success', 'Successfully updated'); } - public function deletetemplate($template, $path) - { + public function deletetemplate($template, $path) { $directory = str_replace('-', '/', $path); - $dir = $directory.$template; + $dir = $directory . $template; $status = \DB::table('settings_email')->first(); if ($template == 'default' or $template == $status->template) { return \Redirect::back()->with('fails', 'You cannot delete a default or active directory!'); @@ -207,7 +196,7 @@ class TemplateController extends Controller $objects = scandir($dir); foreach ($objects as $object) { if ($object != '.' && $object != '..') { - unlink($dir.'/'.$object); + unlink($dir . '/' . $object); } } rmdir($dir); @@ -218,15 +207,13 @@ class TemplateController extends Controller return \Redirect::back()->with('success', 'Successfully Deleted'); } - public function activateset($setname) - { + public function activateset($setname) { \DB::table('settings_email')->update(['template' => $setname]); return \Redirect::back()->with('success', 'You have Successfully Activated this Set'); } - public function edit($id, Template $template, Languages $language) - { + public function edit($id, Template $template, Languages $language) { try { $templates = $template->whereId($id)->first(); $languages = $language->get(); @@ -246,8 +233,7 @@ class TemplateController extends Controller * * @return type Response */ - public function update($id, Template $template, TemplateUdate $request) - { + public function update($id, Template $template, TemplateUdate $request) { try { //TODO validation $templates = $template->whereId($id)->first(); @@ -273,8 +259,7 @@ class TemplateController extends Controller * * @return type Response */ - public function destroy($id, Template $template) - { + public function destroy($id, Template $template) { try { $templates = $template->whereId($id)->first(); /* Check whether function success or not */ @@ -298,8 +283,7 @@ class TemplateController extends Controller * * @return type Response */ - public function formDiagno(Emails $email) - { + public function formDiagno(Emails $email) { try { $emails = $email->get(); @@ -316,8 +300,7 @@ class TemplateController extends Controller * * @return type */ - public function postDiagno(DiagnosRequest $request) - { + public function postDiagno(DiagnosRequest $request) { try { $email_details = Emails::where('id', '=', $request->from)->first(); if ($email_details->sending_protocol == 'mail') { @@ -325,12 +308,12 @@ class TemplateController extends Controller $mail->IsSendmail(); // telling the class to use SendMail transport $mail->SetFrom($email_details->email_address, $email_details->email_name); // sender details $address = $request->to; // receiver email - $mail->AddAddress($address); + $mail->AddAddress($address); $mail->Subject = $request->subject; // subject of the email $body = $request->message; // body of the email - $mail->MsgHTML($body); - if (!$mail->Send()) { - $return = Lang::get('lang.mailer_error').': '.$mail->ErrorInfo; + $mail->MsgHTML($body); + if (!$mail->Send()) { + $return = Lang::get('lang.mailer_error') . ': ' . $mail->ErrorInfo; } else { $return = Lang::get('lang.message_has_been_sent'); } @@ -340,8 +323,8 @@ class TemplateController extends Controller if ($email_details->smtp_validate == '1') { $mail->SMTPOptions = [ 'ssl' => [ - 'verify_peer' => false, - 'verify_peer_name' => false, + 'verify_peer' => false, + 'verify_peer_name' => false, 'allow_self_signed' => true, ], ]; @@ -358,15 +341,15 @@ class TemplateController extends Controller $mail->Subject = $request->subject; $mail->Body = utf8_decode($request->message); if (!$mail->send()) { - $return = Lang::get('lang.mailer_error').': '.$mail->ErrorInfo; + $return = Lang::get('lang.mailer_error') . ': ' . $mail->ErrorInfo; } else { $return = Lang::get('lang.message_has_been_sent'); } } - return redirect()->back()->with('success', $return); } catch (Exception $e) { return redirect()->back()->with('fails', $e->getMessage()); } } + } diff --git a/app/Http/Controllers/Admin/helpdesk/WorkflowController.php b/app/Http/Controllers/Admin/helpdesk/WorkflowController.php index b5a8a233a..7583525b4 100644 --- a/app/Http/Controllers/Admin/helpdesk/WorkflowController.php +++ b/app/Http/Controllers/Admin/helpdesk/WorkflowController.php @@ -166,7 +166,7 @@ class WorkflowController extends Controller { try { // store a new workflow credentials in to the system - $workflow_name = new WorkflowName(); + $workflow_name = new WorkflowName; $workflow_name->name = $request->name; $workflow_name->status = $request->status; $workflow_name->order = $request->execution_order; diff --git a/app/Http/Controllers/Agent/helpdesk/MailController.php b/app/Http/Controllers/Agent/helpdesk/MailController.php index deb04c4a4..1095246ac 100644 --- a/app/Http/Controllers/Agent/helpdesk/MailController.php +++ b/app/Http/Controllers/Agent/helpdesk/MailController.php @@ -27,16 +27,15 @@ use PhpImap\Mailbox as ImapMailbox; * * @author Ladybird */ -class MailController extends Controller -{ +class MailController extends Controller { + /** * constructor * Create a new controller instance. * * @param type TicketController $TicketController */ - public function __construct(TicketWorkflowController $TicketWorkflowController) - { + public function __construct(TicketWorkflowController $TicketWorkflowController) { $this->middleware('board'); $this->TicketWorkflowController = $TicketWorkflowController; } @@ -46,8 +45,7 @@ class MailController extends Controller * * @return type */ - public function readmails(Emails $emails, Email $settings_email, System $system, Ticket $ticket) - { + public function readmails(Emails $emails, Email $settings_email, System $system, Ticket $ticket) { // $path_url = $system->first()->url; if ($settings_email->first()->email_fetching == 1) { if ($settings_email->first()->all_emails == 1) { @@ -82,7 +80,7 @@ class MailController extends Controller $protocol = $fetching_encryption2; } else { if ($e_mail->fetching_protocol) { - $fetching_protocol = '/'.$e_mail->fetching_protocol; + $fetching_protocol = '/' . $e_mail->fetching_protocol; } else { $fetching_protocol = ''; } @@ -91,13 +89,13 @@ class MailController extends Controller } else { $fetching_encryption = ''; } - $protocol = $fetching_protocol.$fetching_encryption; + $protocol = $fetching_protocol . $fetching_encryption; } - $imap_config = '{'.$host.':'.$port.$protocol.'}INBOX'; + $imap_config = '{' . $host . ':' . $port . $protocol . '}INBOX'; $password = Crypt::decrypt($e_mail->password); $mailbox = new ImapMailbox($imap_config, $e_mail->email_address, $password, __DIR__); $mails = []; - $mailsIds = $mailbox->searchMailBox('SINCE '.date('d-M-Y', strtotime('-1 day'))); + $mailsIds = $mailbox->searchMailBox('SINCE ' . date('d-M-Y', strtotime('-1 day'))); if (!$mailsIds) { die('Mailbox is empty'); } @@ -137,7 +135,7 @@ class MailController extends Controller $date = $mail->date; $datetime = $overview[0]->date; $date_time = explode(' ', $datetime); - $date = $date_time[1].'-'.$date_time[2].'-'.$date_time[3].' '.$date_time[4]; + $date = $date_time[1] . '-' . $date_time[2] . '-' . $date_time[3] . ' ' . $date_time[4]; $date = date('Y-m-d H:i:s', strtotime($date)); if (isset($mail->subject)) { $subject = $mail->subject; @@ -172,7 +170,7 @@ class MailController extends Controller // var_dump($attachment->filePath); // dd($filepath); // $path = $dir_img_path[0]."/code/public/".$filepath[1]; - $path = public_path().$filepath[1]; + $path = public_path() . $filepath[1]; // dd($path); $filesize = filesize($path); $file_data = file_get_contents($path); @@ -181,7 +179,7 @@ class MailController extends Controller $string = str_replace('-', '', $attachment->name); $filename = explode('src', $attachment->filePath); $filename = str_replace('\\', '', $filename); - $body = str_replace('cid:'.$imageid, $filepath[1], $body); + $body = str_replace('cid:' . $imageid, $filepath[1], $body); $pos = strpos($body, $filepath[1]); if ($pos == false) { if ($settings_email->first()->attachment == 1) { @@ -226,8 +224,7 @@ class MailController extends Controller * * @return type string */ - public function separate_reply($body) - { + public function separate_reply($body) { $body2 = explode('---Reply above this line---', $body); $body3 = $body2[0]; @@ -241,8 +238,7 @@ class MailController extends Controller * * @return type string */ - public function decode_imap_text($str) - { + public function decode_imap_text($str) { $result = ''; $decode_header = imap_mime_header_decode($str); foreach ($decode_header as $obj) { @@ -257,8 +253,7 @@ class MailController extends Controller * * @return type */ - public function fetch_attachments() - { + public function fetch_attachments() { $uploads = Upload::all(); foreach ($uploads as $attachment) { $image = @imagecreatefromstring($attachment->file); @@ -266,8 +261,8 @@ class MailController extends Controller imagejpeg($image, null, 80); $data = ob_get_contents(); ob_end_clean(); - $var = ''; - echo '
    '.$var.''; + $var = ''; + echo '
    ' . $var . ''; } } @@ -278,19 +273,17 @@ class MailController extends Controller * * @return type file */ - public function get_data($id) - { + public function get_data($id) { $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('id', '=', $id)->get(); foreach ($attachments as $attachment) { - header('Content-type: application/'.$attachment->type.''); - header('Content-Disposition: inline; filename='.$attachment->name.''); + header('Content-type: application/' . $attachment->type . ''); + header('Content-Disposition: inline; filename=' . $attachment->name . ''); header('Content-Transfer-Encoding: binary'); echo $attachment->file; } } - public static function trimTableTag($html) - { + public static function trimTableTag($html) { if (strpos('', $html) != false) { $first_pos = strpos($html, ''); - return $final_str; } - return $html; } - public static function trim3D($html) - { + public static function trim3D($html) { $body = str_replace('=3D', '', $html); - return $body; } - public static function trimInjections($html, $tags = ['', '', '']) - { + public static function trimInjections($html, $tags = ['', '', '']) { $replace = []; foreach ($tags as $key => $tag) { $replace[$key] = htmlspecialchars($tag); } $body = str_replace($tags, $replace, $html); - return $body; } + } diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index a6a19d201..e9157f900 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -31,6 +31,8 @@ use App\Model\helpdesk\Ticket\Tickets; use App\Model\helpdesk\Utility\CountryCode; use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Timezones; +use App\Model\helpdesk\Notification\Notification; +use App\Model\helpdesk\Notification\UserNotification; use App\User; use Auth; use DB; @@ -1533,6 +1535,14 @@ class TicketController extends Controller $ticket->closed_at = null; $ticket->save(); } elseif ($value == 'Delete forever') { + $notification = Notification::select('id')->where('model_id', '=', $ticket->id)->get(); + foreach ($notification as $id) { + $user_notification = UserNotification::where( + 'notification_id', '=', $id->id); + $user_notification->delete(); + } + $notification = Notification::select('id')->where('model_id', '=', $ticket->id); + $notification->delete(); $thread = Ticket_Thread::where('ticket_id', '=', $ticket->id)->get(); foreach ($thread as $th_id) { // echo $th_id->id." "; @@ -1562,11 +1572,11 @@ class TicketController extends Controller } } if ($value == 'Delete') { - return redirect()->back()->with('success', 'Moved to trash'); + return redirect()->back()->with('success', lang::get('lang.moved_to_trash')); } elseif ($value == 'Close') { - return redirect()->back()->with('success', 'Tickets has been Closed'); + return redirect()->back()->with('success', Lang::get('lang.tickets_have_been_closed')); } elseif ($value == 'Open') { - return redirect()->back()->with('success', 'Ticket has been Opened'); + return redirect()->back()->with('success', Lang::get('lang.tickets_have_been_opened')); } else { return redirect()->back()->with('success', Lang::get('lang.hard-delete-success-message')); } diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 8beebfb11..46e9b5d18 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -91,7 +91,6 @@ class UserController extends Controller } else { $stringCut = $model->user_name; } - return $stringCut; }) /* column email */ diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php index 12155b093..c890f8899 100644 --- a/app/Http/Controllers/Agent/kb/ArticleController.php +++ b/app/Http/Controllers/Agent/kb/ArticleController.php @@ -29,8 +29,8 @@ use Redirect; * * @author Ladybird */ -class ArticleController extends Controller -{ +class ArticleController extends Controller { + /** * Create a new controller instance. * constructor to check @@ -40,8 +40,7 @@ class ArticleController extends Controller * * @return void */ - public function __construct() - { + public function __construct() { // checking authentication $this->middleware('auth'); // checking roles @@ -49,8 +48,7 @@ class ArticleController extends Controller SettingsController::language(); } - public function test() - { + public function test() { //$table = $this->setDatatable(); return view('themes.default1.agent.kb.article.test'); } @@ -60,8 +58,7 @@ class ArticleController extends Controller * * @return type void */ - public function getData() - { + public function getData() { $article = new Article(); // returns chumper datatable return Datatable::query($article) @@ -71,6 +68,7 @@ class ArticleController extends Controller ->orderColumns('name', 'description') /* add column name */ ->addColumn('name', function ($model) { + $string = strip_tags($model->name); if (strlen($string) > 40) { // truncate string @@ -78,8 +76,7 @@ class ArticleController extends Controller } else { $stringCut = $model->name; } - - return $stringCut.'...'; + return $stringCut . '...'; }) /* add column Created */ ->addColumn('publish_time', function ($model) { @@ -90,8 +87,8 @@ class ArticleController extends Controller /* add column action */ ->addColumn('Actions', function ($model) { /* here are all the action buttons and modal popup to delete articles with confirmations */ - return ' id.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').' slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').' -