From c98a403bf58b64d9fbf0da6cc8a9c008a91127df Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 2 Jul 2015 14:15:17 -0700 Subject: [PATCH] LAN Fixes and notice removal. --- e107_handlers/shortcode_handler.php | 1 + e107_handlers/sitelinks_class.php | 2 +- e107_languages/English/English.php | 7 +++++-- e107_languages/English/admin/lan_admin.php | 8 ++++---- .../download/handlers/download_class.php | 19 +++++++++++-------- .../languages/English/English_front.php | 4 ++-- .../download/templates/download_template.php | 11 ++++++----- submitnews.php | 2 +- 8 files changed, 31 insertions(+), 23 deletions(-) diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php index 0dfa5ec0c..fa06ed67b 100644 --- a/e107_handlers/shortcode_handler.php +++ b/e107_handlers/shortcode_handler.php @@ -887,6 +887,7 @@ class e_parse_shortcode $scCode = ''; $scFile = ''; + $_path = ''; $ret = ''; $_method = 'sc_'.strtolower($code); if (is_object($this->addedCodes) && method_exists($this->addedCodes, $_method)) //It is class-based batch shortcode. Class already loaded; call the method diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index d4683d321..8b1b93e24 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -734,7 +734,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; } } //About menu - No 20 - leave space for user-categories. - $this->admin_cat['title'][20] = ADLAN_CL_20; + $this->admin_cat['title'][20] = LAN_ABOUT; $this->admin_cat['id'][20] = 'aboutMenu'; $this->admin_cat['img'][20] = ''; // E_16_CAT_ABOUT;//E_16_NAV_DOCS $this->admin_cat['lrg_img'][20] = ''; // E_32_CAT_ABOUT; diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php index 114f7a55f..6c0cd3c76 100644 --- a/e107_languages/English/English.php +++ b/e107_languages/English/English.php @@ -94,7 +94,6 @@ define("LAN_LOGOUT", "Logout"); define("LAN_SETTINGS", "Settings"); define("LAN_PASSWORD", "Password"); define("LAN_TYPE", "Type"); -define("LAN_DESCRIPTION", "Description"); define("LAN_SCREENSHOT", "Screenshot"); define("LAN_FILE", "File"); define("LAN_FILETYPES", "Filetypes"); @@ -105,7 +104,11 @@ define("LAN_VERSION", "Version"); define("LAN_DOWNLOAD", "Download"); define("LAN_COMMENTS", "Comments"); define("LAN_LOCATION", "Location"); -define("LAN_NO_RECORDS_FOUND","No Records Found."); +define("LAN_NO_RECORDS_FOUND","No Records Found."); +define("LAN_RATING", "Rating"); +define("LAN_IMAGE","Image"); +define("LAN_ABOUT", "About"); +define("LAN_TITLE", "Title"); define("LAN_ENTER_USRNAME_EMAIL", "Please enter your username or email"); // admin php hover field admin name define("LAN_PWD_REQUIRED", "Password is required"); // admin php hover field admin password diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 5e666d752..fa397b030 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -194,7 +194,7 @@ define("ADLAN_CL_7", "Plugins"); define("ADLAN_CL_8", "Misc"); -define("ADLAN_CL_20", "About"); +// define("ADLAN_CL_20", "About"); define("ADLAN_LAT_1", "Latest"); @@ -281,7 +281,7 @@ define("LAN_PENDING","Pending"); define("LAN_SUBMITTED","Submitted"); define("LAN_BAN","Ban"); -define("LAN_RATING", "Rating"); + define("LAN_UPLOAD", "Upload"); define("LAN_UPLOADS","Uploads"); @@ -335,7 +335,7 @@ define("LAN_OWNER", "Owner"); define("LAN_EMAIL","Email address"); define("LAN_ID", "ID"); -define("LAN_TITLE", "Title"); + define("LAN_VISIBILITY", "Visibility"); define("LAN_ICON", "Icon"); @@ -346,7 +346,7 @@ define("LAN_RUN","Run"); define("LAN_SEFURL","SEF URL"); define("LAN_COPY","Copy"); define("LAN_KEYWORDS","Keywords"); -define("LAN_IMAGE","Image"); + define("LAN_TEMPLATE","Template"); // define("LAN_NONE", "None"); diff --git a/e107_plugins/download/handlers/download_class.php b/e107_plugins/download/handlers/download_class.php index 82cc0e8c6..3a9b83ba9 100644 --- a/e107_plugins/download/handlers/download_class.php +++ b/e107_plugins/download/handlers/download_class.php @@ -321,7 +321,7 @@ class download if(!$sql->gen($query)) { //require_once(HEADERF); - return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "
".LAN_NO_RECORDS_FOUND."."
", 'download-view', true); + return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "
".LAN_NO_RECORDS_FOUND."
", 'download-view', true); //require_once(FOOTERF); //exit; } @@ -330,9 +330,12 @@ class download $dlrow = $sql->fetch(); $sc->setVars($dlrow); - $comment_edit_query = 'comment.download.'.$id; + // $comment_edit_query = 'comment.download.'.$id; - if(!defined("DL_IMAGESTYLE")){ define("DL_IMAGESTYLE","border:0px");} + if(!defined("DL_IMAGESTYLE")) + { + define("DL_IMAGESTYLE","border:0px"); + } if(!isset($DL_VIEW_PAGETITLE)) { @@ -380,7 +383,7 @@ class download if ($dlrow['download_comment']) { - $comments = e107::getComment()->compose_comment("download", "comment", $dlrow['download_id'], $width, $dlrow['download_name'], FALSE, true); + $comments = e107::getComment()->compose_comment("download", "comment", $dlrow['download_id'], null, $dlrow['download_name'], FALSE, true); $ret .= $ns->tablerender($comments['caption'], $comments['comment'].$comments['comment_form'], 'download-comments', true); } @@ -475,8 +478,8 @@ class download if ($dlrow['download_category_parent'] == 0) // It's a main category - change the listing type required { - $action = 'maincats'; - $maincatval = $id; + // $action = 'maincats'; + // $maincatval = $id; } $dl_text = $tp->parseTemplate($this->templateHeader, TRUE, $sc); @@ -529,7 +532,7 @@ class download $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $sc); - $text = $ns->tablerender($dl_title, $dl_text, 'download-list', true); + $text = $ns->tablerender($dl_title, $dl_text, 'download-list', true); } }// End of subcategory display @@ -584,7 +587,7 @@ class download $sc->setVars($dlrow); $agreetext = $tp->toHTML($pref['agree_text'], TRUE, 'DESCRIPTION'); - $current_row = ($current_row)? 0: 1; + $current_row = ($current_row) ? 0: 1; // Alternating CSS for each row.(backwards compatible) $template = ($current_row == 1)? $DOWNLOAD_LIST_TABLE: str_replace("forumheader3", "forumheader3 forumheader3_alt", $DOWNLOAD_LIST_TABLE); diff --git a/e107_plugins/download/languages/English/English_front.php b/e107_plugins/download/languages/English/English_front.php index b947911fd..88b4d8f15 100644 --- a/e107_plugins/download/languages/English/English_front.php +++ b/e107_plugins/download/languages/English/English_front.php @@ -82,8 +82,8 @@ define("LAN_dl_66", "Select download mirror"); define("LAN_dl_67", "Select mirror ..."); define("LAN_dl_68", "Mirror Host"); // define("LAN_dl_69", "Download"); // duplicate -//define("LAN_dl_70", "Location");LAN_LOCATION -//define("LAN_dl_71", "About");//ADLAN_CL_20 +//define("LAN_dl_70", "Location"); // LAN_LOCATION +//define("LAN_dl_71", "About"); //LAN_ABOUT define("LAN_dl_72", "Requesting file: "); define("LAN_dl_73", "Downloads from this mirror: "); diff --git a/e107_plugins/download/templates/download_template.php b/e107_plugins/download/templates/download_template.php index db0924cd4..62d8b5111 100644 --- a/e107_plugins/download/templates/download_template.php +++ b/e107_plugins/download/templates/download_template.php @@ -15,6 +15,7 @@ */ if (!defined('e107_INIT')) { exit; } +if (!defined('USER_WIDTH')) { define('USER_WIDTH', 'display:block'); } // v1.x compat. // ##### CAT TABLE -------------------------------------------------------------------------------- @@ -38,7 +39,7 @@ if(!isset($DOWNLOAD_CAT_TABLE_START)) ".LAN_CATEGORY." - ".LAN_dl_20." + ".LAN_FILES." ".LAN_SIZE." ".LAN_dl_77." @@ -306,9 +307,9 @@ if(!isset($DOWNLOAD_MIRROR_START)) ".LAN_dl_68." - ".ADLAN_CL_20." + ".LAN_ABOUT." ".LAN_LOCATION." - ".LAN_SIZE" + ".LAN_SIZE." ".LAN_DOWNLOAD." "; @@ -361,7 +362,7 @@ $DOWNLOAD_TEMPLATE['categories']['start'] = " ".LAN_CATEGORY." - ".LAN_dl_20." + ".LAN_FILES." ".LAN_SIZE." ".LAN_dl_77." @@ -616,7 +617,7 @@ $DOWNLOAD_TEMPLATE['mirror']['start'] = " ".LAN_dl_68." - ".ADLAN_CL_20." + ".LAN_ABOUT." ".LAN_LOCATION." ".LAN_SIZE." ".LAN_DOWNLOAD." diff --git a/submitnews.php b/submitnews.php index a6aef104f..aaa79fe5c 100644 --- a/submitnews.php +++ b/submitnews.php @@ -202,7 +202,7 @@ $text .= " - ".LAN_TITE." + ".LAN_TITLE."