mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

Downloads plugin language file cleanup

Browse Source
This commit is contained in:
Cameron
2015-01-22 22:05:25 -08:00
parent 169ba435d5
commit 2fef44272e
7 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/language.php
View File

@@ -672,7 +672,7 @@ function multilang_prefs()
</tr>"; </tr>";
if(isset($_SERVER['E_DEV_LANGUAGE']) && $_SERVER['E_DEV_LANGUAGE'] === 'true') // if(isset($_SERVER['E_DEV_LANGUAGE']) && $_SERVER['E_DEV_LANGUAGE'] === 'true')
{ {
$text .= " $text .= "
@@ -1071,7 +1071,7 @@ function show_tools()
show_packs(); show_packs();
if(vartrue($_SERVER['E_DEV'])) if(!vartrue($_SERVER['E_DEV']))
{ {
return; return;
} }
@@ -1668,8 +1668,8 @@ function unused($lanfile,$script,$reverse=false)
// print_a($compare);
// print_a($lanDefines);
if(!$compare) if(!$compare)
{ {

2
e107_plugins/download/download.php
View File

@@ -18,7 +18,7 @@ if (!e107::isInstalled('download'))
header("location:".e_BASE."index.php"); header("location:".e_BASE."index.php");
} }
e107::lan('download','download'); // Loads e_PLUGIN.'download/languages/'.e_LANGUAGE.'/download.php' e107::lan('download',false, true); // Loads e_PLUGIN.'download/languages/'.e_LANGUAGE.'/English_front.php'
require_once(e_PLUGIN.'download/handlers/download_class.php'); require_once(e_PLUGIN.'download/handlers/download_class.php');
require_once(e_PLUGIN.'download/handlers/category_class.php'); require_once(e_PLUGIN.'download/handlers/category_class.php');

6
e107_plugins/download/download_shortcodes.php
View File

@@ -46,18 +46,18 @@ class download_shortcodes extends e_shortcode
switch ($this->qry['action']) switch ($this->qry['action'])
{ {
case 'mirror': case 'mirror':
$breadcrumb[] = array('text' => LAN_dl_18, 'url' => $url->create('download/index')); $breadcrumb[] = array('text' => LAN_PLUGIN_DOWNLOAD_NAME, 'url' => $url->create('download/index'));
$breadcrumb[] = array('text' => $this->var['download_category_name'], 'url' => $url->create('download/list/category', array('id'=>$this->var['download_category_id'],'name'=>$this->var['download_category_sef']))); // e_SELF."?action=list&id=".$this->var['download_category_id']); $breadcrumb[] = array('text' => $this->var['download_category_name'], 'url' => $url->create('download/list/category', array('id'=>$this->var['download_category_id'],'name'=>$this->var['download_category_sef']))); // e_SELF."?action=list&id=".$this->var['download_category_id']);
$breadcrumb[] = array('text' => $this->var['download_name'], 'url' => $url->create('download/view/item', array('id'=>$this->var['download_id'], 'name'=>$this->var['download_sef']))); // e_SELF."?action=view&id=".$this->var['download_id']); $breadcrumb[] = array('text' => $this->var['download_name'], 'url' => $url->create('download/view/item', array('id'=>$this->var['download_id'], 'name'=>$this->var['download_sef']))); // e_SELF."?action=view&id=".$this->var['download_id']);
$breadcrumb[] = array('text' => LAN_dl_67, 'url' => null); $breadcrumb[] = array('text' => LAN_dl_67, 'url' => null);
break; break;
case 'maincats': case 'maincats':
$breadcrumb[] = array('text' => LAN_dl_18, 'url' => $url->create('download/index')); $breadcrumb[] = array('text' => LAN_PLUGIN_DOWNLOAD_NAME, 'url' => $url->create('download/index'));
break; break;
default: default:
$breadcrumb[] = array('text' => LAN_dl_18, 'url' => $url->create('download/index')); $breadcrumb[] = array('text' => LAN_PLUGIN_DOWNLOAD_NAME, 'url' => $url->create('download/index'));
$breadcrumb[] = array('text' => $this->var['download_category_name'], 'url' => ($this->var['download_category_id']) ? $url->create('download/list/category', array('id'=>$this->var['download_category_id'],'name'=>$this->var['download_category_sef'])) : null); $breadcrumb[] = array('text' => $this->var['download_category_name'], 'url' => ($this->var['download_category_id']) ? $url->create('download/list/category', array('id'=>$this->var['download_category_id'],'name'=>$this->var['download_category_sef'])) : null);
$breadcrumb[] = array('text' => $this->var['download_name'], 'url' => null); $breadcrumb[] = array('text' => $this->var['download_name'], 'url' => null);
break; break;

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

@@ -208,7 +208,7 @@ class download
if ($dlcat->down_count == 0) if ($dlcat->down_count == 0)
{ {
return $ns->tablerender(LAN_dl_18, "<div style='text-align:center'>".LAN_dl_2."</div>",'download-categories',true); return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "<div style='text-align:center'>".LAN_dl_2."</div>",'download-categories',true);
} }
$download_cat_table_string = ""; $download_cat_table_string = "";
@@ -237,7 +237,7 @@ class download
$dl_text .= $download_cat_table_string; $dl_text .= $download_cat_table_string;
$dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $sc); $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $sc);
$caption = varset($DOWNLOAD_CAT_CAPTION) ? $tp->parseTemplate($DOWNLOAD_CAT_CAPTION, TRUE, $sc) : LAN_dl_18; $caption = varset($DOWNLOAD_CAT_CAPTION) ? $tp->parseTemplate($DOWNLOAD_CAT_CAPTION, TRUE, $sc) : LAN_PLUGIN_DOWNLOAD_NAME;
//ob_start(); //ob_start();
@@ -321,7 +321,7 @@ class download
if(!$sql->gen($query)) if(!$sql->gen($query))
{ {
//require_once(HEADERF); //require_once(HEADERF);
return $ns->tablerender(LAN_dl_18, "<div style='text-align:center'>".LAN_dl_3."</div>", 'download-view', true); return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "<div style='text-align:center'>".LAN_dl_3."</div>", 'download-view', true);
//require_once(FOOTERF); //require_once(FOOTERF);
//exit; //exit;
} }
@@ -336,7 +336,7 @@ class download
if(!isset($DL_VIEW_PAGETITLE)) if(!isset($DL_VIEW_PAGETITLE))
{ {
$DL_VIEW_PAGETITLE = PAGE_NAME." / {DOWNLOAD_CATEGORY} / {DOWNLOAD_VIEW_NAME}"; $DL_VIEW_PAGETITLE = LAN_PLUGIN_DOWNLOAD_NAME." / {DOWNLOAD_CATEGORY} / {DOWNLOAD_VIEW_NAME}";
} }
$DL_TITLE = $tp->parseTemplate($DL_VIEW_PAGETITLE, TRUE, $sc); $DL_TITLE = $tp->parseTemplate($DL_VIEW_PAGETITLE, TRUE, $sc);
@@ -465,12 +465,12 @@ class download
$this->qry['name'] = $dlrow['download_category_sef']; $this->qry['name'] = $dlrow['download_category_sef'];
define("e_PAGETITLE", PAGE_NAME." / ".$dlrow['download_category_name']); define("e_PAGETITLE", LAN_PLUGIN_DOWNLOAD_NAME." / ".$dlrow['download_category_name']);
} }
else else
{ // No access to this category { // No access to this category
define("e_PAGETITLE", PAGE_NAME); define("e_PAGETITLE", LAN_PLUGIN_DOWNLOAD_NAME);
return $ns->tablerender(LAN_dl_18, "<div class='alert alert-info' style='text-align:center'>".LAN_dl_3."</div>",'download-list',true); return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "<div class='alert alert-info' style='text-align:center'>".LAN_dl_3."</div>",'download-list',true);
} }
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
@@ -541,7 +541,7 @@ class download
{ {
$ns->tablerender(LAN_dl_18, " $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "
<div style='text-align:center'> <div style='text-align:center'>
" . LAN_dl_3 . " " . LAN_dl_3 . "
</div>"); </div>");
@@ -605,7 +605,7 @@ class download
$dl_text .= $tp->parseTemplate($this->templateFooter, TRUE, $sc); $dl_text .= $tp->parseTemplate($this->templateFooter, TRUE, $sc);
$text .= $ns->tablerender(LAN_dl_18, $dl_text, 'download-list', true); $text .= $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, $dl_text, 'download-list', true);
} }
if(!isset($DOWNLOAD_LIST_NEXTPREV)) if(!isset($DOWNLOAD_LIST_NEXTPREV))
@@ -697,21 +697,21 @@ class download
$sql->insert('generic', "0, 'Broken Download', ".time().",'".USERID."', '{$download_name}', {$id}, '{$report_add}'"); $sql->insert('generic', "0, 'Broken Download', ".time().",'".USERID."', '{$download_name}', {$id}, '{$report_add}'");
define("e_PAGETITLE", PAGE_NAME." / ".LAN_dl_47); define("e_PAGETITLE", LAN_PLUGIN_DOWNLOAD_NAME." / ".LAN_dl_47);
$text = LAN_dl_48."<br /><br /><a href='".e_PLUGIN."download/download.php?action=view&id=".$download_id."'>".LAN_dl_49."</a>"; $text = LAN_dl_48."<br /><br /><a href='".e_PLUGIN."download/download.php?action=view&id=".$download_id."'>".LAN_dl_49."</a>";
return $ns->tablerender(LAN_dl_18, $text, 'download-report', true); return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, $text, 'download-report', true);
} }
else else
{ {
define("e_PAGETITLE", PAGE_NAME." / ".LAN_dl_51." ".$download_name); define("e_PAGETITLE", LAN_PLUGIN_DOWNLOAD_NAME." / ".LAN_dl_51." ".$download_name);
// require_once(HEADERF); // require_once(HEADERF);
$breadcrumb = array(); $breadcrumb = array();
$breadcrumb[] = array('text' => LAN_dl_18, 'url' => e_SELF); $breadcrumb[] = array('text' => LAN_PLUGIN_DOWNLOAD_NAME, 'url' => e_SELF);
$breadcrumb[] = array('text' => $dlrow['download_category_name'], 'url' => e_SELF."?action=list&id=".$dlrow['download_category_id']); $breadcrumb[] = array('text' => $dlrow['download_category_name'], 'url' => e_SELF."?action=list&id=".$dlrow['download_category_id']);
$breadcrumb[] = array('text' => $dlrow['download_name'], 'url' => e_SELF."?action=view&id=".$dlrow['download_id']); $breadcrumb[] = array('text' => $dlrow['download_name'], 'url' => e_SELF."?action=view&id=".$dlrow['download_id']);
$breadcrumb[] = array('text' => LAN_dl_50, 'url' => null); $breadcrumb[] = array('text' => LAN_dl_50, 'url' => null);
@@ -729,7 +729,7 @@ class download
</div> </div>
</form>"; </form>";
return $ns->tablerender(LAN_dl_18, $text, 'download-report', true); return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, $text, 'download-report', true);
} }
} }
@@ -847,7 +847,7 @@ class download
$dl_text .= $tp->parseTemplate($this->templateFooter, TRUE, $sc); $dl_text .= $tp->parseTemplate($this->templateFooter, TRUE, $sc);
return $ns->tablerender(LAN_dl_18, $dl_text, 'download-mirror', true); return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, $dl_text, 'download-mirror', true);
} }

11
e107_plugins/download/languages/English/download.php → e107_plugins/download/languages/English/English_front.php
View File

@@ -5,7 +5,6 @@
* Language file - download plugin * Language file - download plugin
* *
*/ */
define("PAGE_NAME", "Downloads"); //FIXME use term from English_global.php
define("LAN_dl_1", "(Restricted)"); define("LAN_dl_1", "(Restricted)");
define("LAN_dl_2", "No downloads yet, please check back soon"); define("LAN_dl_2", "No downloads yet, please check back soon");
@@ -24,7 +23,7 @@ define("LAN_dl_14", "Rate this download");
define("LAN_dl_15", "Thanks for rating"); define("LAN_dl_15", "Thanks for rating");
define("LAN_dl_16", "download(s) from"); define("LAN_dl_16", "download(s) from");
define("LAN_dl_17", "files"); define("LAN_dl_17", "files");
define("LAN_dl_18", "Downloads"); //FIXME use term from English_global.php // define("LAN_dl_18", "Downloads");
define("LAN_dl_19", "Category"); //FIXME Use Generic define("LAN_dl_19", "Category"); //FIXME Use Generic
define("LAN_dl_20", "Files"); define("LAN_dl_20", "Files");
define("LAN_dl_21", "Size"); define("LAN_dl_21", "Size");
@@ -33,14 +32,14 @@ define("LAN_dl_23", "Filename");
define("LAN_dl_24", "Author"); //FIXME Use Generic define("LAN_dl_24", "Author"); //FIXME Use Generic
define("LAN_dl_25", "Ascending"); define("LAN_dl_25", "Ascending");
define("LAN_dl_26", "Descending"); define("LAN_dl_26", "Descending");
define("LAN_dl_27", "Go"); //FIXME Use Generic // define("LAN_dl_27", "Go");
define("LAN_dl_28", "Name"); //FIXME Use Generic define("LAN_dl_28", "Name"); //FIXME Use Generic
define("LAN_dl_29", "DL's"); define("LAN_dl_29", "DL's");
define("LAN_dl_30", "Author email"); define("LAN_dl_30", "Author email");
define("LAN_dl_31", "Author website"); define("LAN_dl_31", "Author website");
define("LAN_dl_32", "Download"); define("LAN_dl_32", "Download");
define("LAN_dl_33", "Previous"); // define("LAN_dl_33", "Previous");
define("LAN_dl_34", "Next"); //FIXME Use Generic // define("LAN_dl_34", "Next");
define("LAN_dl_35", "Back to list"); //FIXME Use Generic define("LAN_dl_35", "Back to list"); //FIXME Use Generic
define("LAN_dl_36", "New downloads"); define("LAN_dl_36", "New downloads");
@@ -75,7 +74,7 @@ define("LAN_dl_60", "Broken download report from");
define("LAN_dl_61", "Download Error"); define("LAN_dl_61", "Download Error");
define("LAN_dl_62", "You have been prevented from downloading this file; you have exceeded your download quota"); define("LAN_dl_62", "You have been prevented from downloading this file; you have exceeded your download quota");
define("LAN_dl_63", "You do not have the correct permissions to download this file."); define("LAN_dl_63", "You do not have the correct permissions to download this file.");
define("LAN_dl_64", "Back"); // define("LAN_dl_64", "Back");
define("LAN_dl_65", "File Not Found"); define("LAN_dl_65", "File Not Found");
define("LAN_dl_66", "Select download mirror"); define("LAN_dl_66", "Select download mirror");

8
e107_plugins/download/request.php
View File

@@ -122,7 +122,7 @@ if (preg_match("#.*\.[a-z,A-Z]{3,4}#", e_QUERY))
$log->addError("Line".__LINE__.": Couldn't find ".e_DOWNLOAD.e_QUERY); $log->addError("Line".__LINE__.": Couldn't find ".e_DOWNLOAD.e_QUERY);
$log->toFile('download_requests','Download Requests', true); // Create a log file and add the log messages $log->toFile('download_requests','Download Requests', true); // Create a log file and add the log messages
require_once(HEADERF); require_once(HEADERF);
$ns->tablerender(LAN_dl_61, "<div style='text-align:center'>".LAN_dl_65."\n<br /><br />\n<a href='javascript:history.back(1)'>".LAN_dl_64."</a></div>"); $ns->tablerender(LAN_dl_61, "<div style='text-align:center'>".LAN_dl_65."\n<br /><br />\n<a href='javascript:history.back(1)'>".LAN_BACK."</a></div>");
require_once(FOOTERF); require_once(FOOTERF);
exit(); exit();
} }
@@ -275,7 +275,7 @@ if ($type == "file")
$log->addError("Line".__LINE__.": Couldn't find ".e_DOWNLOAD.e_QUERY); $log->addError("Line".__LINE__.": Couldn't find ".e_DOWNLOAD.e_QUERY);
$log->toFile('download_requests','Download Requests', true); // Create a log file and add the log messages $log->toFile('download_requests','Download Requests', true); // Create a log file and add the log messages
require_once(HEADERF); require_once(HEADERF);
$ns -> tablerender(LAN_dl_61, "<div style='text-align:center'>".LAN_dl_65."<br /><br /><a href='javascript:history.back(1)'>".LAN_dl_64."</a></div>"); $ns -> tablerender(LAN_dl_61, "<div style='text-align:center'>".LAN_dl_65."<br /><br /><a href='javascript:history.back(1)'>".LAN_BACK."</a></div>");
require_once(FOOTERF); require_once(FOOTERF);
exit(); exit();
} }
@@ -324,7 +324,7 @@ else
$image = $tp->replaceConstants($image); $image = $tp->replaceConstants($image);
$disp = "<div style='text-align:center'><img src='".$image."' alt='' /></div>"; $disp = "<div style='text-align:center'><img src='".$image."' alt='' /></div>";
} }
$disp .= "<br /><div style='text-align:center'><a href='javascript:history.back(1)'>".LAN_dl_64."</a></div>"; $disp .= "<br /><div style='text-align:center'><a href='javascript:history.back(1)'>".LAN_BACK."</a></div>";
$ns->tablerender($imagecaption, $disp); $ns->tablerender($imagecaption, $disp);
require_once(FOOTERF); require_once(FOOTERF);
@@ -341,7 +341,7 @@ else
else else
{ {
require_once(HEADERF); require_once(HEADERF);
$ns->tablerender(LAN_dl_61, "<div style='text-align:center'>".LAN_dl_65."<br /><br /><a href='javascript:history.back(1)'>".LAN_dl_64."</a></div>"); $ns->tablerender(LAN_dl_61, "<div style='text-align:center'>".LAN_dl_65."<br /><br /><a href='javascript:history.back(1)'>".LAN_BACK."</a></div>");
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
} }

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

@@ -195,7 +195,7 @@ if(!isset($DOWNLOAD_LIST_TABLE_END))
</div>\n"; </div>\n";
} }
// ##### VIEW TABLE ------------------------------------------------------------------------------- // ##### VIEW TABLE -------------------------------------------------------------------------------
$DL_VIEW_PAGETITLE = PAGE_NAME." / {DOWNLOAD_CATEGORY} / {DOWNLOAD_VIEW_NAME}"; $DL_VIEW_PAGETITLE = LAN_PLUGIN_DOWNLOAD_NAME." / {DOWNLOAD_CATEGORY} / {DOWNLOAD_VIEW_NAME}";
$DL_VIEW_NEXTPREV = " $DL_VIEW_NEXTPREV = "
<div style='text-align:center'> <div style='text-align:center'>
@@ -437,7 +437,7 @@ $DOWNLOAD_WRAPPER['view']['DOWNLOAD_VIEW_AUTHORWEBSITE'] = "<td style='width:8
$DOWNLOAD_WRAPPER['view']['DOWNLOAD_REPORT_LINK'] = "<tr><td style='width:20%' colspan='2'>{---}</td></tr>"; $DOWNLOAD_WRAPPER['view']['DOWNLOAD_REPORT_LINK'] = "<tr><td style='width:20%' colspan='2'>{---}</td></tr>";
$DOWNLOAD_TEMPLATE['view']['caption'] = LAN_dl_18; $DOWNLOAD_TEMPLATE['view']['caption'] = LAN_PLUGIN_DOWNLOAD_NAME;
$DOWNLOAD_TEMPLATE['view']['start'] = " "; $DOWNLOAD_TEMPLATE['view']['start'] = " ";
$DOWNLOAD_TEMPLATE['view']['item'] = " $DOWNLOAD_TEMPLATE['view']['item'] = "