From 9f3f37f3a1f80882ce49a64188e0f306f3829517 Mon Sep 17 00:00:00 2001 From: Tijn Kuyper Date: Sat, 22 Dec 2012 11:42:02 +0100 Subject: [PATCH] GUI and backwards compatibility fixes --- e107_admin/users.php | 24 +++---- .../calendar_menu/calendar_template.php | 12 ++-- e107_plugins/calendar_menu/event.php | 4 +- e107_plugins/calendar_menu/subscribe.php | 4 +- .../download/templates/download_template.php | 8 +-- e107_plugins/faqs/faqs_template.php | 6 +- e107_plugins/list_new/list_template.php | 2 +- e107_plugins/log/stats.php | 62 ++++++++++++++----- .../newsfeed/templates/newsfeed_template.php | 4 +- e107_themes/core/theme.php | 2 +- 10 files changed, 80 insertions(+), 48 deletions(-) diff --git a/e107_admin/users.php b/e107_admin/users.php index 23b7d49a8..0da5453d9 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -1731,8 +1731,8 @@ class users_admin_ui extends e_admin_ui $tot = $obj->getTotalMails(); $found = false; $DEL = ($pref['mail_bounce_delete']) ? true : false; - $text = "
- \n"; + $text = "
#e107-idemailSubjectBounce
+ \n"; for ($i = 1; $i <= $tot; $i++) { $head = $obj->getHeaders($i); @@ -1783,7 +1783,7 @@ class users_admin_ui extends e_admin_ui $wmails[$i] = "'".$result[0]."'"; } } - $text .= "\n"; } if ($del_count) @@ -1794,10 +1794,10 @@ class users_admin_ui extends e_admin_ui { // Option to delete emails - only if there are some in the list $text .= "
#e107-idemailSubjectBounce
".$i."".$id[$i]."".(isset ($emails[$i]) ? $emails[$i] : $wmails[$i])."".$head['subject']."".($head['bounce'] ? ADMIN_TRUE_ICON : ADMIN_FALSE_ICON); + $text .= "
".$i."".$id[$i]."".(isset ($emails[$i]) ? $emails[$i] : $wmails[$i])."".$head['subject']."".($head['bounce'] ? ADMIN_TRUE_ICON : ADMIN_FALSE_ICON); $text .= "
- \n - \n - \n - \n + \n + \n + \n + \n "; } $text .= "
"; @@ -1931,27 +1931,27 @@ class users_admin_form_ui extends e_admin_form_ui $text = ""; if ($row['user_perms'] == "0") { - $text .= "
".LAN_MAINADMIN."
"; + $text .= "
".LAN_MAINADMIN."
"; } else if ($row['user_admin']) { - $text .= "
".LAN_ADMIN."
"; + $text .= "
".LAN_ADMIN."
"; } else if ($row['user_ban'] == 1) { - $text .= "
".LAN_BANNED."
"; + $text .= "
".LAN_BANNED."
"; } else if ($row['user_ban'] == 2) { - $text .= "
".LAN_NOTVERIFIED."
"; + $text .= "
".LAN_NOTVERIFIED."
"; } else if ($row['user_ban'] == 3) { - $text .= "
".LAN_BOUNCED."
"; + $text .= "
".LAN_BOUNCED."
"; } else { diff --git a/e107_plugins/calendar_menu/calendar_template.php b/e107_plugins/calendar_menu/calendar_template.php index 8fbd5a881..2b389ce48 100644 --- a/e107_plugins/calendar_menu/calendar_template.php +++ b/e107_plugins/calendar_menu/calendar_template.php @@ -63,7 +63,7 @@ $sc_style['EC_NEXT_YEAR']['post'] = ''; $CALENDAR_TIME_TABLE = " - +
@@ -101,7 +101,7 @@ $CALENDAR_NAVIGATION_TABLE = " $sc_style['EC_EVENTLIST_CAPTION']['pre'] = "\n"; -$EVENT_EVENTLIST_TABLE_START = "
{EC_PREV_MONTH} {EC_CURRENT_MONTH}
"; $sc_style['EC_EVENTLIST_CAPTION']['post'] = ":

{EC_EVENTLIST_CAPTION}"; +$EVENT_EVENTLIST_TABLE_START = "
{EC_EVENTLIST_CAPTION}"; $EVENT_EVENTLIST_TABLE_END = "
"; @@ -110,7 +110,7 @@ $EVENT_EVENTLIST_TABLE_END = ""; $sc_style['EC_EVENTARCHIVE_CAPTION']['pre'] = ""; $sc_style['EC_EVENTARCHIVE_CAPTION']['post'] = "\n"; -$EVENT_ARCHIVE_TABLE_START = "
{EC_EVENTARCHIVE_CAPTION}"; +$EVENT_ARCHIVE_TABLE_START = "
{EC_EVENTARCHIVE_CAPTION}"; $EVENT_ARCHIVE_TABLE = " @@ -123,7 +123,7 @@ $EVENT_ARCHIVE_TABLE_END = "
{EC_EVENT_RECENT_ICON}{EC_EVENTARCHIVE_DATE}
"; // EVENT SHOW EVENT ------------------------------------------------------------ -$EVENT_EVENT_TABLE_START = ""; +$EVENT_EVENT_TABLE_START = "
"; $EVENT_EVENT_TABLE_END = "
"; $sc_style['EC_EVENT_HEADING_DATE']['pre'] = ""; @@ -199,7 +199,7 @@ $EVENT_EVENT_TABLE = " //------------------------------------------ $CALENDAR_CALENDAR_START = "
- +
@@ -252,7 +252,7 @@ $CALENDAR_SHOWEVENT = "
1) { // Need to handle writing of multiple events - display confirmation form $message = str_replace('-NUM-', count($mult_count), EC_LAN_88); $text = " -
+
"; if ($ev_allday) @@ -555,7 +555,7 @@ if ($action == 'ne' || $action == 'ed') $text .= " -
".$message."
".EC_LAN_89."
"; +
"; $text .= "
".EC_LAN_72." ".EC_LAN_67." "; diff --git a/e107_plugins/calendar_menu/subscribe.php b/e107_plugins/calendar_menu/subscribe.php index 523254d78..93f67412f 100644 --- a/e107_plugins/calendar_menu/subscribe.php +++ b/e107_plugins/calendar_menu/subscribe.php @@ -63,7 +63,7 @@ if ((USER) && (isset($ecal_class->pref['eventpost_asubs']) && ($ecal_class->pref } // print $cal_row . $cal_subs[$cal_row] . "
"; } - $caltext = " + $caltext = "
" . EC_LAN_130 . "
" . EC_LAN_131 . "
 
"; @@ -71,7 +71,7 @@ if ((USER) && (isset($ecal_class->pref['eventpost_asubs']) && ($ecal_class->pref else { $caltext = " - +
"; diff --git a/e107_plugins/download/templates/download_template.php b/e107_plugins/download/templates/download_template.php index d92344e50..f3a110806 100644 --- a/e107_plugins/download/templates/download_template.php +++ b/e107_plugins/download/templates/download_template.php @@ -30,7 +30,7 @@ if(!isset($DOWNLOAD_CAT_TABLE_START)) { $DOWNLOAD_CAT_TABLE_START = "
-
" . EC_LAN_125 . "
" . EC_LAN_126 . "" . EC_LAN_127 . "" . EC_LAN_136 . "
\n +
\n @@ -139,7 +139,7 @@ if(!isset($DOWNLOAD_LIST_TABLE_START)) $DOWNLOAD_LIST_TABLE_START = "
-
\n +
\n @@ -266,7 +266,7 @@ if(!isset($DOWNLOAD_VIEW_TABLE)) { $DOWNLOAD_VIEW_TABLE = "
-
+
@@ -321,7 +321,7 @@ if(!isset($DOWNLOAD_MIRROR_START)) { $DOWNLOAD_MIRROR_START = "
-
+
diff --git a/e107_plugins/faqs/faqs_template.php b/e107_plugins/faqs/faqs_template.php index 7c8af3323..9fca7f897 100644 --- a/e107_plugins/faqs/faqs_template.php +++ b/e107_plugins/faqs/faqs_template.php @@ -36,7 +36,7 @@ if(!defined("USER_WIDTH")) // FAQ - PARENT LIST --------------------------------------------------------- $FAQ_CAT_START = " -
+
@@ -66,7 +66,7 @@ if(!defined("USER_WIDTH")) // FAQ - LIST --------------------------------------------------------- $FAQ_LIST_START = " -
".FAQLAN_41." ".FAQLAN_42."
"; +
"; $FAQ_LIST_LOOP .= " @@ -82,7 +82,7 @@ if(!defined("USER_WIDTH")) $FAQ_VIEW_TEMPLATE = " -
+
diff --git a/e107_plugins/list_new/list_template.php b/e107_plugins/list_new/list_template.php index f4ae043be..40ad144eb 100644 --- a/e107_plugins/list_new/list_template.php +++ b/e107_plugins/list_new/list_template.php @@ -93,7 +93,7 @@ $TEMPLATE_LIST_NEW['PAGE_NEW_END'] = " //MULTI COLOMNS LAYOUT MASTER ----------------------------------------------------------- $TEMPLATE_LIST_NEW['COL_START'] = "
- +
"; $TEMPLATE_LIST_NEW['COL_WELCOME'] = ""; $TEMPLATE_LIST_NEW['COL_ROWSWITCH'] = ""; diff --git a/e107_plugins/log/stats.php b/e107_plugins/log/stats.php index d9f2eeb3d..4f5c226db 100644 --- a/e107_plugins/log/stats.php +++ b/e107_plugins/log/stats.php @@ -1045,7 +1045,9 @@ class siteStats $totalu += $info['unq']; } + $text = " $text = "
{LIST_COL_WELCOMETEXT}

\n\n\n\n\n\n"; $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; foreach($totalArray as $key => $info) { if($info['ttl']) @@ -1104,7 +1106,9 @@ class siteStats $totalArray = $this -> arraySort($totalArray, "ttlv"); - $text .= "
".ADSTAT_L19."".ADSTAT_L20."%
\n + $text .= " $text = "
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n @@ -1146,7 +1150,9 @@ class siteStats } $uniqueArray = $this -> arraySort($uniqueArray, "unqv"); - $text .= "
\n\n\n\n\n\n"; + $text .= "
$text = "
Page".ADSTAT_L24."%
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; foreach($uniqueArray as $key => $info) { if ($info['ttlv']) @@ -1253,7 +1259,9 @@ class siteStats $total = array_sum($browserArray); - $text .= "
Page".ADSTAT_L24."%
\n + $text .= " $text = "
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n \n
".$this->browser_headings[$act].$pars['hdg_extra']."
".ADSTAT_L26." @@ -1384,7 +1392,9 @@ class siteStats } $total = array_sum($osArray); - $text .= "\n + $text .= " $text = "
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n \n \n\n @@ -1479,7 +1489,9 @@ class siteStats } $total = array_sum($domArray); - $text .= "
".$this->browser_headings[$act].$pars['hdg_extra']."
".ADSTAT_L27."
\n + $text .= " $text = "
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n \n \n\n @@ -1578,7 +1590,9 @@ class siteStats } $total = array_sum($screenArray); - $text .= "
".$this->browser_headings[$act].$pars['hdg_extra']."
".ADSTAT_L28."
\n + $text .= " $text = "
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n \n \n\n\n\n\n"; @@ -1657,7 +1671,9 @@ class siteStats $total += $info['ttl']; } - $text .= "
".$this->browser_headings[$act].$pars['hdg_extra']."
".ADSTAT_L29."".ADSTAT_L21."%
\n + $text .= " $text = "
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n \n \n\n\n\n\n"; $count = 0; @@ -1739,7 +1755,9 @@ class siteStats $queryArray = $this -> arraySort($statQuery, 0); $total = array_sum($queryArray); - $text .= "
".$this->browser_headings[$act].$pars['hdg_extra']."
".ADSTAT_L30."".ADSTAT_L21."%
\n + $text .= " $text = "
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n \n \n\n\n\n\n"; $count = 1; @@ -1787,7 +1805,9 @@ class siteStats $gen = new convert; $recentArray = array_reverse($this -> fileRecent, TRUE); - $text = "
".$this->browser_headings[$act].$pars['hdg_extra']."
".ADSTAT_L31."".ADSTAT_L21."%
\n\n\n\n\n"; + $text = " $text = "
".ADSTAT_L18."Information
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n"; foreach($recentArray as $key => $info) { @@ -1905,7 +1925,9 @@ class siteStats // print_a($dayarray);; - $text = "
".ADSTAT_L18."Information
\n\n\n\n\n"; + $text = " $text = "
".ADSTAT_L33." ".($amount+1)." ".ADSTAT_L40."".ADSTAT_L34."
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n"; foreach($dayarray as $date => $total) { @@ -1920,7 +1942,9 @@ class siteStats } $text .= "
".ADSTAT_L33." ".($amount+1)." ".ADSTAT_L40."".ADSTAT_L34."
"; - $text .= "
\n\n\n\n\n"; + $text .= "
$text = "
".ADSTAT_L35." ".($amount+1)." ".ADSTAT_L40."".ADSTAT_L34."
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n"; if (!isset($total['dayunique'])) $total['dayunique'] = 0; @@ -1939,7 +1963,9 @@ class siteStats } $text .= "
".ADSTAT_L35." ".($amount+1)." ".ADSTAT_L40."".ADSTAT_L34."
"; - $text .= "
\n\n\n\n\n"; + $text .= "
$text = "
".ADSTAT_L33." ".($amount+1)." ".ADSTAT_L36."".ADSTAT_L34."
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n"; $newArray = $this -> arraySort($pagearray, "total"); foreach($newArray as $key => $total) @@ -1952,7 +1978,9 @@ class siteStats } $text .= "
".ADSTAT_L33." ".($amount+1)." ".ADSTAT_L36."".ADSTAT_L34."
"; - $text .= "
\n\n\n\n\n"; + $text .= "
$text = "
".ADSTAT_L35." ".($amount+1)." ".ADSTAT_L36."".ADSTAT_L34."
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n"; $newArray = $this -> arraySort($pagearray, "unique"); foreach($newArray as $key => $total) { @@ -2016,7 +2044,9 @@ class siteStats $tmpArray = $this -> arraySort($monthTotal, "totalv"); - $text .= "
".ADSTAT_L35." ".($amount+1)." ".ADSTAT_L36."".ADSTAT_L34."
\n\n\n\n\n"; + $text .= " $text = "
".ADSTAT_L37."".ADSTAT_L34."
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n"; foreach($monthTotal as $date => $total) { @@ -2030,7 +2060,9 @@ class siteStats } $text .= "
".ADSTAT_L37."".ADSTAT_L34."
"; - $text .= "
\n\n\n\n\n"; + $text .= "
$text = "
".ADSTAT_L38."".ADSTAT_L34."
\n\n\n\n\n\n"; + $text = "
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n\n"; +
".ADSTAT_L19."".ADSTAT_L20."%
\n\n\n\n\n"; foreach($monthTotal as $date => $total) { $barWidth = round(($total['uniquev']/$utotal) * 100, 2); diff --git a/e107_plugins/newsfeed/templates/newsfeed_template.php b/e107_plugins/newsfeed/templates/newsfeed_template.php index 78c941be6..12c91a9e3 100644 --- a/e107_plugins/newsfeed/templates/newsfeed_template.php +++ b/e107_plugins/newsfeed/templates/newsfeed_template.php @@ -20,7 +20,7 @@ if (!defined('e107_INIT')) { exit; } $NEWSFEED_MAIN_CAPTION = NFLAN_38; $NEWSFEED_LIST_START = " -
".ADSTAT_L38."".ADSTAT_L34."
\n"; +
\n"; $NEWSFEED_LIST = " @@ -32,7 +32,7 @@ $NEWSFEED_LIST_END = "
\n"; $NEWSFEED_MAIN_START = " - +
diff --git a/e107_themes/core/theme.php b/e107_themes/core/theme.php index 9fda54e7e..e59b3ed13 100644 --- a/e107_themes/core/theme.php +++ b/e107_themes/core/theme.php @@ -520,7 +520,7 @@ $sc_style["RATING"]["post"] = '

'; $sc_style["COMMENT"]["post"] = "
"; $COMMENTSTYLE = '
-
{FEEDIMAGE} {FEEDTITLE}
+
'.LAN_THEME_9.' {USERNAME} '.LAN_THEME_8.' {TIMEDATE}