mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-12 02:26:21 +02:00
Code Issues Releases Wiki Activity

LAN Fixes and notice removal.

Browse Source
This commit is contained in:
Cameron
2015-07-02 14:15:17 -07:00
parent b06aab269b
commit c98a403bf5
8 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
e107_handlers/shortcode_handler.php
View File

@ -887,6 +887,7 @@ class e_parse_shortcode
$scCode = ''; $scCode = '';
$scFile = ''; $scFile = '';
$_path = '';
$ret = ''; $ret = '';
$_method = 'sc_'.strtolower($code); $_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 if (is_object($this->addedCodes) && method_exists($this->addedCodes, $_method)) //It is class-based batch shortcode. Class already loaded; call the method

2
e107_handlers/sitelinks_class.php
View File

@ -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. //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['id'][20] = 'aboutMenu';
$this->admin_cat['img'][20] = ''; // E_16_CAT_ABOUT;//E_16_NAV_DOCS $this->admin_cat['img'][20] = ''; // E_16_CAT_ABOUT;//E_16_NAV_DOCS
$this->admin_cat['lrg_img'][20] = ''; // E_32_CAT_ABOUT; $this->admin_cat['lrg_img'][20] = ''; // E_32_CAT_ABOUT;

7
e107_languages/English/English.php
View File

@ -94,7 +94,6 @@ define("LAN_LOGOUT", "Logout");
define("LAN_SETTINGS", "Settings"); define("LAN_SETTINGS", "Settings");
define("LAN_PASSWORD", "Password"); define("LAN_PASSWORD", "Password");
define("LAN_TYPE", "Type"); define("LAN_TYPE", "Type");
define("LAN_DESCRIPTION", "Description");
define("LAN_SCREENSHOT", "Screenshot"); define("LAN_SCREENSHOT", "Screenshot");
define("LAN_FILE", "File"); define("LAN_FILE", "File");
define("LAN_FILETYPES", "Filetypes"); define("LAN_FILETYPES", "Filetypes");
@ -105,7 +104,11 @@ define("LAN_VERSION", "Version");
define("LAN_DOWNLOAD", "Download"); define("LAN_DOWNLOAD", "Download");
define("LAN_COMMENTS", "Comments"); define("LAN_COMMENTS", "Comments");
define("LAN_LOCATION", "Location"); 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_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 define("LAN_PWD_REQUIRED", "Password is required"); // admin php hover field admin password

8
e107_languages/English/admin/lan_admin.php
View File

@ -194,7 +194,7 @@ define("ADLAN_CL_7", "Plugins");
define("ADLAN_CL_8", "Misc"); define("ADLAN_CL_8", "Misc");
define("ADLAN_CL_20", "About"); // define("ADLAN_CL_20", "About");
define("ADLAN_LAT_1", "Latest"); define("ADLAN_LAT_1", "Latest");
@ -281,7 +281,7 @@ define("LAN_PENDING","Pending");
define("LAN_SUBMITTED","Submitted"); define("LAN_SUBMITTED","Submitted");
define("LAN_BAN","Ban"); define("LAN_BAN","Ban");
define("LAN_RATING", "Rating");
define("LAN_UPLOAD", "Upload"); define("LAN_UPLOAD", "Upload");
define("LAN_UPLOADS","Uploads"); define("LAN_UPLOADS","Uploads");
@ -335,7 +335,7 @@ define("LAN_OWNER", "Owner");
define("LAN_EMAIL","Email address"); define("LAN_EMAIL","Email address");
define("LAN_ID", "ID"); define("LAN_ID", "ID");
define("LAN_TITLE", "Title");
define("LAN_VISIBILITY", "Visibility"); define("LAN_VISIBILITY", "Visibility");
define("LAN_ICON", "Icon"); define("LAN_ICON", "Icon");
@ -346,7 +346,7 @@ define("LAN_RUN","Run");
define("LAN_SEFURL","SEF URL"); define("LAN_SEFURL","SEF URL");
define("LAN_COPY","Copy"); define("LAN_COPY","Copy");
define("LAN_KEYWORDS","Keywords"); define("LAN_KEYWORDS","Keywords");
define("LAN_IMAGE","Image");
define("LAN_TEMPLATE","Template"); define("LAN_TEMPLATE","Template");
// define("LAN_NONE", "None"); // define("LAN_NONE", "None");

19
e107_plugins/download/handlers/download_class.php
View File

@ -321,7 +321,7 @@ class download
if(!$sql->gen($query)) if(!$sql->gen($query))
{ {
//require_once(HEADERF); //require_once(HEADERF);
return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "<div style='text-align:center'>".LAN_NO_RECORDS_FOUND."."</div>", 'download-view', true); return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "<div style='text-align:center'>".LAN_NO_RECORDS_FOUND."</div>", 'download-view', true);
//require_once(FOOTERF); //require_once(FOOTERF);
//exit; //exit;
} }
@ -330,9 +330,12 @@ class download
$dlrow = $sql->fetch(); $dlrow = $sql->fetch();
$sc->setVars($dlrow); $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)) if(!isset($DL_VIEW_PAGETITLE))
{ {
@ -380,7 +383,7 @@ class download
if ($dlrow['download_comment']) 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); $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 if ($dlrow['download_category_parent'] == 0) // It's a main category - change the listing type required
{ {
$action = 'maincats'; // $action = 'maincats';
$maincatval = $id; // $maincatval = $id;
} }
$dl_text = $tp->parseTemplate($this->templateHeader, TRUE, $sc); $dl_text = $tp->parseTemplate($this->templateHeader, TRUE, $sc);
@ -529,7 +532,7 @@ class download
$dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $sc); $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 }// End of subcategory display
@ -584,7 +587,7 @@ class download
$sc->setVars($dlrow); $sc->setVars($dlrow);
$agreetext = $tp->toHTML($pref['agree_text'], TRUE, 'DESCRIPTION'); $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) // Alternating CSS for each row.(backwards compatible)
$template = ($current_row == 1)? $DOWNLOAD_LIST_TABLE: str_replace("forumheader3", "forumheader3 forumheader3_alt", $DOWNLOAD_LIST_TABLE); $template = ($current_row == 1)? $DOWNLOAD_LIST_TABLE: str_replace("forumheader3", "forumheader3 forumheader3_alt", $DOWNLOAD_LIST_TABLE);

4
e107_plugins/download/languages/English/English_front.php
View File

@ -82,8 +82,8 @@ define("LAN_dl_66", "Select download mirror");
define("LAN_dl_67", "Select mirror ..."); define("LAN_dl_67", "Select mirror ...");
define("LAN_dl_68", "Mirror Host"); define("LAN_dl_68", "Mirror Host");
// define("LAN_dl_69", "Download"); // duplicate // define("LAN_dl_69", "Download"); // duplicate
//define("LAN_dl_70", "Location");LAN_LOCATION //define("LAN_dl_70", "Location"); // LAN_LOCATION
//define("LAN_dl_71", "About");//ADLAN_CL_20 //define("LAN_dl_71", "About"); //LAN_ABOUT
define("LAN_dl_72", "Requesting file: "); define("LAN_dl_72", "Requesting file: ");
define("LAN_dl_73", "Downloads from this mirror: "); define("LAN_dl_73", "Downloads from this mirror: ");

11
e107_plugins/download/templates/download_template.php
View File

@ -15,6 +15,7 @@
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
if (!defined('USER_WIDTH')) { define('USER_WIDTH', 'display:block'); } // v1.x compat.
// ##### CAT TABLE -------------------------------------------------------------------------------- // ##### CAT TABLE --------------------------------------------------------------------------------
@ -38,7 +39,7 @@ if(!isset($DOWNLOAD_CAT_TABLE_START))
<thead> <thead>
<tr> <tr>
<th class='fcaption' colspan='2'>".LAN_CATEGORY."</th> <th class='fcaption' colspan='2'>".LAN_CATEGORY."</th>
<th class='fcaption'>".LAN_dl_20."</th> <th class='fcaption'>".LAN_FILES."</th>
<th class='fcaption'>".LAN_SIZE."</th> <th class='fcaption'>".LAN_SIZE."</th>
<th class='fcaption'>".LAN_dl_77."</th> <th class='fcaption'>".LAN_dl_77."</th>
</tr> </tr>
@ -306,9 +307,9 @@ if(!isset($DOWNLOAD_MIRROR_START))
</tr> </tr>
<tr> <tr>
<th class='forumheader' colspan='2'>".LAN_dl_68."</th> <th class='forumheader' colspan='2'>".LAN_dl_68."</th>
<th class='forumheader'>".ADLAN_CL_20."</th> <th class='forumheader'>".LAN_ABOUT."</th>
<th class='forumheader'>".LAN_LOCATION."</th> <th class='forumheader'>".LAN_LOCATION."</th>
<th class='forumheader'>".LAN_SIZE"</th> <th class='forumheader'>".LAN_SIZE."</th>
<th class='forumheader'>".LAN_DOWNLOAD."</th> <th class='forumheader'>".LAN_DOWNLOAD."</th>
</tr> </tr>
"; ";
@ -361,7 +362,7 @@ $DOWNLOAD_TEMPLATE['categories']['start'] = "
<thead> <thead>
<tr> <tr>
<th colspan='2'>".LAN_CATEGORY."</th> <th colspan='2'>".LAN_CATEGORY."</th>
<th>".LAN_dl_20."</th> <th>".LAN_FILES."</th>
<th>".LAN_SIZE."</th> <th>".LAN_SIZE."</th>
<th>".LAN_dl_77."</th> <th>".LAN_dl_77."</th>
</tr> </tr>
@ -616,7 +617,7 @@ $DOWNLOAD_TEMPLATE['mirror']['start'] = "
</tr> </tr>
<tr> <tr>
<th colspan='2'>".LAN_dl_68."</th> <th colspan='2'>".LAN_dl_68."</th>
<th>".ADLAN_CL_20."</th> <th>".LAN_ABOUT."</th>
<th>".LAN_LOCATION."</th> <th>".LAN_LOCATION."</th>
<th>".LAN_SIZE."</th> <th>".LAN_SIZE."</th>
<th>".LAN_DOWNLOAD."</th> <th>".LAN_DOWNLOAD."</th>

2
submitnews.php
View File

@ -202,7 +202,7 @@ $text .= "
</td> </td>
</tr> </tr>
<tr> <tr>
<td style='width:20%' class='forumheader3'>".LAN_TITE."</td> <td style='width:20%' class='forumheader3'>".LAN_TITLE."</td>
<td style='width:80%' class='forumheader3'> <td style='width:80%' class='forumheader3'>
<input class='tbox form-control' type='text' id='submitnews_title' name='submitnews_title' size='60' value='".$tp->toHTML(vartrue($_POST['submitnews_title']),TRUE,'USER_TITLE')."' maxlength='200' style='width:90%' required /> <input class='tbox form-control' type='text' id='submitnews_title' name='submitnews_title' size='60' value='".$tp->toHTML(vartrue($_POST['submitnews_title']),TRUE,'USER_TITLE')."' maxlength='200' style='width:90%' required />
</td> </td>