← All changes | class/class-mainwp-format.php +200 -197 5.1 → 4.2 View file →

		@@ -11,196 +11,198 @@
11	11	* Class MainWP_Format
12	12	*
13	13	* @package MainWP\Dashboard
14	14	*/
15		-class MainWP_Format { // phpcs:ignore Generic.Classes.OpeningBraceSameLine.ContentAfterBrace -- NOSONAR.
	15	+class MainWP_Format {
16	16
17		- /**
18		- * Method get_class_name()
19		- *
20		- * Get Class Name.
21		- *
22		- * @return object
23		- */
24		- public static function get_class_name() {
25		- return __CLASS__;
26		- }
	17	+ /**
	18	+ * Method get_class_name()
	19	+ *
	20	+ * Get Class Name.
	21	+ *
	22	+ * @return object
	23	+ */
	24	+ public static function get_class_name() {
	25	+ return __CLASS__;
	26	+ }
27	27
28		- /**
29		- * Method get_update_plugins_items().
30		- *
31		- * Get plugins update.
32		- *
33		- * @return array $update_items Plugins update items.
34		- *
35		- * @uses \MainWP\Dashboard\MainWP_Utility::array_merge()
36		- */
37		- public static function get_update_plugins_items() {
	28	+ /**
	29	+ * Method get_update_plugins_items().
	30	+ *
	31	+ * Get plugins update.
	32	+ *
	33	+ * @return array $update_items Plugins update items.
	34	+ *
	35	+ * @uses \MainWP\Dashboard\MainWP_Utility::array_merge()
	36	+ */
	37	+ public static function get_update_plugins_items() {
38	38
39		- $pluginsNewUpdate = get_option( 'mainwp_updatescheck_mail_update_plugins_new' );
40		- if ( ! is_array( $pluginsNewUpdate ) ) {
41		- $pluginsNewUpdate = array();
42		- }
43		- $pluginsToUpdate = get_option( 'mainwp_updatescheck_mail_update_plugins' );
44		- if ( ! is_array( $pluginsToUpdate ) ) {
45		- $pluginsToUpdate = array();
46		- }
47		- $notTrustedPluginsNewUpdate = get_option( 'mainwp_updatescheck_mail_ignore_plugins_new' );
48		- if ( ! is_array( $notTrustedPluginsNewUpdate ) ) {
49		- $notTrustedPluginsNewUpdate = array();
50		- }
51		- $notTrustedPluginsToUpdate = get_option( 'mainwp_updatescheck_mail_ignore_plugins' );
52		- if ( ! is_array( $notTrustedPluginsToUpdate ) ) {
53		- $notTrustedPluginsToUpdate = array();
54		- }
	39	+ $pluginsNewUpdate = get_option( 'mainwp_updatescheck_mail_update_plugins_new' );
	40	+ if ( ! is_array( $pluginsNewUpdate ) ) {
	41	+ $pluginsNewUpdate = array();
	42	+ }
	43	+ $pluginsToUpdate = get_option( 'mainwp_updatescheck_mail_update_plugins' );
	44	+ if ( ! is_array( $pluginsToUpdate ) ) {
	45	+ $pluginsToUpdate = array();
	46	+ }
	47	+ $notTrustedPluginsNewUpdate = get_option( 'mainwp_updatescheck_mail_ignore_plugins_new' );
	48	+ if ( ! is_array( $notTrustedPluginsNewUpdate ) ) {
	49	+ $notTrustedPluginsNewUpdate = array();
	50	+ }
	51	+ $notTrustedPluginsToUpdate = get_option( 'mainwp_updatescheck_mail_ignore_plugins' );
	52	+ if ( ! is_array( $notTrustedPluginsToUpdate ) ) {
	53	+ $notTrustedPluginsToUpdate = array();
	54	+ }
55	55
56		- $update_items = array();
57		- $update_items = MainWP_Utility::array_merge( $pluginsNewUpdate, $pluginsToUpdate );
58		- $update_items = MainWP_Utility::array_merge( $update_items, $notTrustedPluginsNewUpdate );
59		- $update_items = MainWP_Utility::array_merge( $update_items, $notTrustedPluginsToUpdate );
	56	+ $update_items = array();
	57	+ $update_items = MainWP_Utility::array_merge( $pluginsNewUpdate, $pluginsToUpdate );
	58	+ $update_items = MainWP_Utility::array_merge( $update_items, $notTrustedPluginsNewUpdate );
	59	+ $update_items = MainWP_Utility::array_merge( $update_items, $notTrustedPluginsToUpdate );
60	60
61		- return $update_items;
62		- }
	61	+ return $update_items;
	62	+ }
63	63
64		- /**
65		- * Method get_update_themes_items().
66		- *
67		- * Get themes update items to email.
68		- *
69		- * @return array $update_items Update themes.
70		- *
71		- * @uses \MainWP\Dashboard\MainWP_Utility::array_merge()
72		- */
73		- public static function get_update_themes_items() {
	64	+ /**
	65	+ * Method get_update_themes_items().
	66	+ *
	67	+ * Get themes update items to email.
	68	+ *
	69	+ * @return array $update_items Update themes.
	70	+ *
	71	+ * @uses \MainWP\Dashboard\MainWP_Utility::array_merge()
	72	+ */
	73	+ public static function get_update_themes_items() {
74	74
75		- $themesNewUpdate = get_option( 'mainwp_updatescheck_mail_update_themes_new' );
76		- if ( ! is_array( $themesNewUpdate ) ) {
77		- $themesNewUpdate = array();
78		- }
79		- $themesToUpdate = get_option( 'mainwp_updatescheck_mail_update_themes' );
80		- if ( ! is_array( $themesToUpdate ) ) {
81		- $themesToUpdate = array();
82		- }
83		- $notTrustedThemesNewUpdate = get_option( 'mainwp_updatescheck_mail_ignore_themes_new' );
84		- if ( ! is_array( $notTrustedThemesNewUpdate ) ) {
85		- $notTrustedThemesNewUpdate = array();
86		- }
87		- $notTrustedThemesToUpdate = get_option( 'mainwp_updatescheck_mail_ignore_themes' );
88		- if ( ! is_array( $notTrustedThemesToUpdate ) ) {
89		- $notTrustedThemesToUpdate = array();
90		- }
	75	+ $themesNewUpdate = get_option( 'mainwp_updatescheck_mail_update_themes_new' );
	76	+ if ( ! is_array( $themesNewUpdate ) ) {
	77	+ $themesNewUpdate = array();
	78	+ }
	79	+ $themesToUpdate = get_option( 'mainwp_updatescheck_mail_update_themes' );
	80	+ if ( ! is_array( $themesToUpdate ) ) {
	81	+ $themesToUpdate = array();
	82	+ }
	83	+ $notTrustedThemesNewUpdate = get_option( 'mainwp_updatescheck_mail_ignore_themes_new' );
	84	+ if ( ! is_array( $notTrustedThemesNewUpdate ) ) {
	85	+ $notTrustedThemesNewUpdate = array();
	86	+ }
	87	+ $notTrustedThemesToUpdate = get_option( 'mainwp_updatescheck_mail_ignore_themes' );
	88	+ if ( ! is_array( $notTrustedThemesToUpdate ) ) {
	89	+ $notTrustedThemesToUpdate = array();
	90	+ }
91	91
92		- $update_items = array();
	92	+ $update_items = array();
93	93
94		- $update_items = MainWP_Utility::array_merge( $themesNewUpdate, $themesToUpdate );
95		- $update_items = MainWP_Utility::array_merge( $update_items, $notTrustedThemesNewUpdate );
96		- $update_items = MainWP_Utility::array_merge( $update_items, $notTrustedThemesToUpdate );
	94	+ $update_items = MainWP_Utility::array_merge( $themesNewUpdate, $themesToUpdate );
	95	+ $update_items = MainWP_Utility::array_merge( $update_items, $notTrustedThemesNewUpdate );
	96	+ $update_items = MainWP_Utility::array_merge( $update_items, $notTrustedThemesToUpdate );
97	97
98		- return $update_items;
99		- }
	98	+ return $update_items;
	99	+ }
100	100
101		- /**
102		- * Method get_update_wp_items().
103		- *
104		- * Get WP update to email.
105		- *
106		- * @return array $update_items WP update items.
107		- *
108		- * @uses \MainWP\Dashboard\MainWP_Utility::array_merge()
109		- */
110		- public static function get_update_wp_items() {
	101	+ /**
	102	+ * Method get_update_wp_items().
	103	+ *
	104	+ * Get WP update to email.
	105	+ *
	106	+ * @return array $update_items WP update items.
	107	+ *
	108	+ * @uses \MainWP\Dashboard\MainWP_Utility::array_merge()
	109	+ */
	110	+ public static function get_update_wp_items() {
111	111
112		- $coreNewUpdate = get_option( 'mainwp_updatescheck_mail_update_core_new' );
113		- if ( ! is_array( $coreNewUpdate ) ) {
114		- $coreNewUpdate = array();
115		- }
116		- $coreToUpdate = get_option( 'mainwp_updatescheck_mail_update_core' );
117		- if ( ! is_array( $coreToUpdate ) ) {
118		- $coreToUpdate = array();
119		- }
120		- $ignoredCoreNewUpdate = get_option( 'mainwp_updatescheck_mail_ignore_core_new' );
121		- if ( ! is_array( $ignoredCoreNewUpdate ) ) {
122		- $ignoredCoreNewUpdate = array();
123		- }
124		- $ignoredCoreToUpdate = get_option( 'mainwp_updatescheck_mail_ignore_core' );
125		- if ( ! is_array( $ignoredCoreToUpdate ) ) {
126		- $ignoredCoreToUpdate = array();
127		- }
	112	+ $coreNewUpdate = get_option( 'mainwp_updatescheck_mail_update_core_new' );
	113	+ if ( ! is_array( $coreNewUpdate ) ) {
	114	+ $coreNewUpdate = array();
	115	+ }
	116	+ $coreToUpdate = get_option( 'mainwp_updatescheck_mail_update_core' );
	117	+ if ( ! is_array( $coreToUpdate ) ) {
	118	+ $coreToUpdate = array();
	119	+ }
	120	+ $ignoredCoreNewUpdate = get_option( 'mainwp_updatescheck_mail_ignore_core_new' );
	121	+ if ( ! is_array( $ignoredCoreNewUpdate ) ) {
	122	+ $ignoredCoreNewUpdate = array();
	123	+ }
	124	+ $ignoredCoreToUpdate = get_option( 'mainwp_updatescheck_mail_ignore_core' );
	125	+ if ( ! is_array( $ignoredCoreToUpdate ) ) {
	126	+ $ignoredCoreToUpdate = array();
	127	+ }
128	128
129		- $update_items = array();
	129	+ $update_items = array();
130	130
131		- $update_items = MainWP_Utility::array_merge( $coreNewUpdate, $coreToUpdate );
132		- $update_items = MainWP_Utility::array_merge( $update_items, $ignoredCoreNewUpdate );
133		- $update_items = MainWP_Utility::array_merge( $update_items, $ignoredCoreToUpdate );
	131	+ $update_items = MainWP_Utility::array_merge( $coreNewUpdate, $coreToUpdate );
	132	+ $update_items = MainWP_Utility::array_merge( $update_items, $ignoredCoreNewUpdate );
	133	+ $update_items = MainWP_Utility::array_merge( $update_items, $ignoredCoreToUpdate );
134	134
135		- return $update_items;
136		- }
	135	+ return $update_items;
	136	+ }
137	137
138		- /**
139		- * Method get_site_updates_items().
140		- *
141		- * Get Updates items of websites.
142		- *
143		- * @param string $what values: plugin, theme, wpcore.
144		- * @param array $sites_ids Websites ids filter (option).
145		- *
146		- * @return array $update_items WP update items.
147		- */
148		- public static function get_site_updates_items( $what, $sites_ids = false ) {
	138	+ /**
	139	+ * Method get_site_updates_items().
	140	+ *
	141	+ * Get Updates items of websites.
	142	+ *
	143	+ * @param string $what values: plugin, theme, wpcore.
	144	+ * @param array $sites_ids Websites ids filter (option).
	145	+ *
	146	+ * @return array $update_items WP update items.
	147	+ */
	148	+ public static function get_site_updates_items( $what, $sites_ids = false ) {
149	149
150		- $items = array();
151		- if ( 'plugin' === $what ) {
152		- $items = static::get_update_plugins_items();
153		- } elseif ( 'theme' === $what ) {
154		- $items = static::get_update_themes_items();
155		- } elseif ( 'wpcore' === $what ) {
156		- $items = static::get_update_wp_items();
157		- }
	150	+ $items = array();
	151	+ if ( 'plugin' == $what ) {
	152	+ $items = self::get_update_plugins_items();
	153	+ } elseif ( 'theme' == $what ) {
	154	+ $items = self::get_update_themes_items();
	155	+ } elseif ( 'wpcore' == $what ) {
	156	+ $items = self::get_update_wp_items();
	157	+ }
158	158
159		- $filters = array();
160		- foreach ( $items as $item ) {
161		- if ( isset( $item['id'] ) ) { // to valid and compatible data.
162		- if ( ! empty( $sites_ids ) && ! in_array( $item['id'], $sites_ids ) ) {
163		- continue;
164		- }
165		- $filters[] = $item;
166		- }
167		- }
168		- return $filters;
169		- }
	159	+ $filters = array();
	160	+ foreach ( $items as $item ) {
	161	+ if ( isset( $item['id'] ) ) { // to valid and compatible data.
	162	+ if ( ! empty( $sites_ids ) ) { // if filter by sites ids.
	163	+ if ( ! in_array( $item['id'], $sites_ids ) ) {
	164	+ continue;
	165	+ }
	166	+ }
	167	+ $filters[] = $item;
	168	+ }
	169	+ }
	170	+ return $filters;
	171	+ }
170	172
171		- /**
172		- * Method format_email()
173		- *
174		- * Format email.
175		- *
176		- * @param string $to_email Send to emails.
177		- * @param string $body Email's body.
178		- * @param string $title Email's title.
179		- * @param bool $plain_text text format.
180		- *
181		- * @return string Formatted content
182		- */
183		- public static function format_email( $to_email = null, $body = '', $title = '', $plain_text = false ) { //phpcs:ignore -- NOSONAR - long function.
184		- unset( $to_email );
185		- $current_year = gmdate( 'Y' );
186		- if ( $plain_text ) {
187		- $mail_send['header'] = '';
188		- $mail_send['body'] = 'Hi,' . "\r\n\r\n" .
189		- ( ( ! empty( $title ) ) ? $title . "\r\n\r\n" : '' ) .
190		- $body . "\r\n\r\n";
191		- $mail_send['footer'] = 'MainWP: https://mainwp.com' . "\r\n" .
192		- 'Extensions: https://mainwp.com/mainwp-extensions/' . "\r\n" .
193		- 'Documentation: https://kb.mainwp.com/' . "\r\n" .
194		- 'Blog: https://mainwp.com/mainwp-blog/' . "\r\n" .
195		- 'Codex: https://mainwp.dev/' . "\r\n" .
196		- 'Support: https://mainwp.com/support/' . "\r\n\r\n" .
197		- 'Follow us on Twitter: https://twitter.com/mymainwp' . "\r\n" .
198		- 'Friend us on Facebook: https://www.facebook.com/mainwp' . "\r\n\r\n" .
199		- "Copyright {$current_year} MainWP, All rights reserved.";
200		- } else {
201		- $mail_send['header'] = <<<EOT
202		- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	173	+ /**
	174	+ * Method format_email()
	175	+ *
	176	+ * Format email.
	177	+ *
	178	+ * @param string $to_email Send to emails.
	179	+ * @param string $body Email's body.
	180	+ * @param string $title Email's title.
	181	+ * @param bool $plain_text text format.
	182	+ *
	183	+ * @return string Formatted content
	184	+ */
	185	+ public static function format_email( $to_email = null, $body = '', $title = '', $plain_text = false ) {
	186	+
	187	+ $current_year = gmdate( 'Y' );
	188	+ if ( $plain_text ) {
	189	+ $mail_send['header'] = '';
	190	+ $mail_send['body'] = 'Hi,' . "\r\n\r\n" .
	191	+ ( ( ! empty( $title ) ) ? $title . "\r\n\r\n" : '' ) .
	192	+ $body . "\r\n\r\n";
	193	+ $mail_send['footer'] = 'MainWP: https://mainwp.com' . "\r\n" .
	194	+ 'Extensions: https://mainwp.com/mainwp-extensions/' . "\r\n" .
	195	+ 'Documentation: https://kb.mainwp.com/' . "\r\n" .
	196	+ 'Blog: https://mainwp.com/mainwp-blog/' . "\r\n" .
	197	+ 'Codex: https://mainwp.dev/' . "\r\n" .
	198	+ 'Support: https://mainwp.com/support/' . "\r\n\r\n" .
	199	+ 'Follow us on Twitter: https://twitter.com/mymainwp' . "\r\n" .
	200	+ 'Friend us on Facebook: https://www.facebook.com/mainwp' . "\r\n\r\n" .
	201	+ "Copyright {$current_year} MainWP, All rights reserved.";
	202	+ } else {
	203	+ $mail_send['header'] = <<<EOT
	204	+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
203	205	<html>
204	206	<head>
205	207	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
206	208	<title> {$title} </title>
		@@ -383,28 +385,28 @@
383	385	max-width:190px;
384	386	}
385	387	</style>
386	388	</head>
387		- <body offset="0" style="-webkit-text-size-adjust: none;margin: 0;padding: 0;background-color: #FAFAFA;width: 100% !important;">
	389	+ <body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0" style="-webkit-text-size-adjust: none;margin: 0;padding: 0;background-color: #FAFAFA;width: 100% !important;">
388	390	<center>
389		- <table id="backgroundTable" style="margin 0;border-spacing:0;width:100%;height:100%;padding:0;background-color: #FAFAFA;height: 100% !important;width: 100% !important;">
	391	+ <table border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="backgroundTable" style="margin: 0;padding:0;background-color: #FAFAFA;height: 100% !important;width: 100% !important;">
390	392	<tr>
391		- <td style="text-align:center;border-collapse: collapse;vertical-align:top;">
	393	+ <td align="center" valign="top" style="border-collapse: collapse;">
392	394
393	395	<!-- // Begin: Template Pre-header \\ -->
394	396
395		- <table id="templatePreheader" style="padding:10px;border-spacing:0;width:600px;background-color: #FAFAFA;">
	397	+ <table border="0" cellpadding="10" cellspacing="0" width="600" id="templatePreheader" style="background-color: #FAFAFA;">
396	398	<tr>
397		- <td class="preheaderContent" style="border-collapse: collapse;vertical-align:top;">
	399	+ <td valign="top" class="preheaderContent" style="border-collapse: collapse;">
398	400
399	401	<!-- // Begin: Standard Preheader \ -->
400	402
401		- <table style="border:0;padding:10px;border-spacing:0;width:100%">
	403	+ <table border="0" cellpadding="10" cellspacing="0" width="100%">
402	404	<tr>
403		- <td style="border-collapse: collapse;vertical-align:top;">
	405	+ <td valign="top" style="border-collapse: collapse;">
404	406	<div style="color: #505050;font-family: Arial;font-size: 10px;line-height: 100%;text-align: left;"></div>
405	407	</td>
406		- <td style="border-collapse: collapse;vertical-align:top;width:190px;">
	408	+ <td valign="top" width="190" style="border-collapse: collapse;">
407	409	<div style="color: #505050;font-family: Arial;font-size: 10px;line-height: 100%;text-align: left;"></div>
408	410	</td>
409	411	</tr>
410	412	</table>
		@@ -416,15 +418,15 @@
416	418	</table>
417	419
418	420	<!-- // End: Template Preheader \\ -->
419	421
420		- <table id="templateContainer" style="width:600px;padding:0;border-spacing:0;border: 1px solid #DDDDDD;background-color: #FFFFFF;">
	422	+ <table border="0" cellpadding="0" cellspacing="0" width="600" id="templateContainer" style="border: 1px solid #DDDDDD;background-color: #FFFFFF;">
421	423	<tr>
422		- <td style="text-align:center;vertical-align:top;border-collapse: collapse;">
	424	+ <td align="center" valign="top" style="border-collapse: collapse;">
423	425
424	426	<!-- // Begin: Template Header \\ -->
425	427
426		- <table id="templateHeader" style="width:600px;padding:0;border-spacing:0;background-color: #FFFFFF;border-bottom: 0;">
	428	+ <table border="0" cellpadding="0" cellspacing="0" width="600" id="templateHeader" style="background-color: #FFFFFF;border-bottom: 0;">
427	429	<tr>
428	430	<td class="headerContent" style="border-collapse: collapse;color: #202020;font-family: Arial;font-size: 34px;font-weight: bold;line-height: 100%;padding: 0;text-align: center;vertical-align: middle;">
429	431
430	432	<!-- // Begin: Standard Header Image \\ -->
		@@ -441,25 +443,25 @@
441	443
442	444	</td>
443	445	</tr>
444	446	<tr>
445		- <td style="align:center;vertical-align:top;border-collapse: collapse;">
	447	+ <td align="center" valign="top" style="border-collapse: collapse;">
446	448
447	449	<!-- // Begin: Template Body \\ -->
448	450
449		- <tableid="templateBody" style="border:0;padding:0;border-spacing:0;width:600px;">
	451	+ <table border="0" cellpadding="0" cellspacing="0" width="600" id="templateBody">
450	452	<tr>
451		- <td class="bodyContent" style="vertical-align:top;border-collapse: collapse;background-color: #FFFFFF;">
	453	+ <td valign="top" class="bodyContent" style="border-collapse: collapse;background-color: #FFFFFF;">
452	454
453	455	<!-- // Begin: Standard Content \\ -->
454	456	EOT;
455	457
456		- $title_content = ! empty( $title ) ? '<b style="color: rgb(127, 177, 0); font-family: Helvetica, Sans; font-size: medium; line-height: normal;"> ' . $title . ' </b><br>' : '';
	458	+ $title_content = ! empty( $title ) ? '<b style="color: rgb(127, 177, 0); font-family: Helvetica, Sans; font-size: medium; line-height: normal;"> ' . $title . ' </b><br>' : '';
457	459
458		- $mail_send['body'] = <<<EOT
459		- <table style="vertical-align:top;border:0;padding:20px;border-spacing:0;width:100%;">
	460	+ $mail_send['body'] = <<<EOT
	461	+ <table border="0" cellpadding="20" cellspacing="0" width="100%">
460	462	<tr>
461		- <td style="vertical-align:top;border-collapse: collapse;">
	463	+ <td valign="top" style="border-collapse: collapse;">
462	464	<div style="color: #505050;font-family: Arial;font-size: 14px;line-height: 150%;text-align: left;"> Hi, <br><br>
463	465	{$title_content}
464	466	<br>{$body}<br>
465	467	</div>
		@@ -467,9 +469,9 @@
467	469	</tr>
468	470	</table>
469	471	EOT;
470	472
471		- $mail_send['footer'] = <<<EOT
	473	+ $mail_send['footer'] = <<<EOT
472	474	<!-- // End: Standard Content \\ -->
473	475
474	476	</td>
475	477	</tr>
		@@ -479,19 +481,19 @@
479	481
480	482	</td>
481	483	</tr>
482	484	<tr>
483		- <td style="text-align:center;vertical-align:top;border-collapse: collapse;">
	485	+ <td align="center" valign="top" style="border-collapse: collapse;">
484	486
485	487	<!-- // Begin: Template Footer \\ -->
486	488
487		- <table id="templateFooter" style="padding:10px;border-spacing:0;width:600px;background-color: #1d1b1c;border-top: 4px solid #7fb100;">
	489	+ <table border="0" cellpadding="10" cellspacing="0" width="600" id="templateFooter" style="background-color: #1d1b1c;border-top: 4px solid #7fb100;">
488	490	<tr>
489		- <td class="footerContent" style="vertical-align:top;border-collapse: collapse;">
	491	+ <td valign="top" class="footerContent" style="border-collapse: collapse;">
490	492
491	493	<!-- // Begin: Standard Footer \\ -->
492	494
493		- <table width="100%" style="border:0;padding:10px;border-spacing:0;width:100%;">
	495	+ <table border="0" cellpadding="10" cellspacing="0" width="100%">
494	496	<tr>
495	497	<td valign="middle" id="social" style="border-collapse: collapse;background-color: #1d1b1c;border: 0;">
496	498	<div style="color: #b8b8b8;font-family: Arial;font-size: 12px;line-height: 125%;text-align: center;">
497	499	<style type="text/css">
		@@ -508,9 +510,9 @@
508	510	<a href="https://twitter.com/mymainwp" target="_blank" style="color: #336699;font-weight: normal;text-decoration: underline;">Follow us on Twitter</a> | <a href="https://www.facebook.com/mainwp" style="color:#336699;font-weight: normal;text-decoration: underline;">Friend us on Facebook</a>
509	511	</td>
510	512	</tr>
511	513	<tr>
512		- <td style="vertical-align:top;border-collapse: collapse;">
	514	+ <td valign="top" style="border-collapse: collapse;">
513	515	<div style="color: #b8b8b8;font-family: Arial;font-size: 12px;line-height: 125%;text-align: center;"><div style="text-align: left;color: #b8b8b8;font-family: Arial;font-size: 12px;line-height: 125%;"><em>Copyright &copy; {$current_year} MainWP, All rights reserved.</em><br></div></div>
514	516	</td>
515	517	</tr>
516	518	</table>
		@@ -533,9 +535,10 @@
533	535	</center>
534	536	</body>
535	537	</html>
536	538	EOT;
537		- }
538		- $mail_send = apply_filters( 'mainwp_format_email', $mail_send );
539		- return $mail_send['header'] . $mail_send['body'] . $mail_send['footer'];
540		- }
	539	+ }
	540	+ $mail_send = apply_filters( 'mainwp_format_email', $mail_send );
	541	+ return $mail_send['header'] . $mail_send['body'] . $mail_send['footer'];
	542	+ }
	543	+
541	544	}