mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 20:51:53 +02:00
Code Issues Releases Wiki Activity

Downloads: Issue #2544 - Fix for e_PAGETITLE. 'view/pagetitle' template added.

Browse Source
This commit is contained in:
Cameron 2017-03-31 15:19:19 -07:00
parent 3c65faf6e3
commit 3758d55e1c
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/download/download.php
View File

@ -44,7 +44,6 @@ if (!e107::isInstalled('download'))
$dl = new download();
if(!defined("e_PAGETITLE")) {define("e_PAGETITLE", LAN_PLUGIN_DOWNLOAD_NAME);}
if(!defined("USER_WIDTH") && !deftrue('BOOTSTRAP')) { define("USER_WIDTH","width:100%"); }
@ -92,6 +91,9 @@ if (!e107::isInstalled('download'))
$texts = $dl->render(); // Load before header.
if(!defined("e_PAGETITLE")) {define("e_PAGETITLE", LAN_PLUGIN_DOWNLOAD_NAME);}
require_once (HEADERF);

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

@ -327,7 +327,6 @@ class download
$metaImage = $tp->thumbUrl($row['download_image'], array('w'=>500), null, true);
$metaDescription = $tp->toHtml($row['download_description'],true);
define('e_PAGETITLE', $tp->toText($row['download_name']));
e107::meta('description', $tp->toText($metaDescription));
e107::meta('keywords', $row['download_keywords']);
e107::meta('og:description', $tp->toText($metaDescription));
@ -354,7 +353,7 @@ class download
$DOWNLOAD_VIEW_TABLE = $template['item'];
$DOWNLOAD_VIEW_TABLE_END = varset($template['end']);
$DL_VIEW_NEXTPREV = varset($template['nextprev']);
// $DL_VIEW_PAGETITLE = varset($template['pagetitle']);
$DL_VIEW_PAGETITLE = varset($template['pagetitle']);
$DL_VIEW_CAPTION = varset($template['caption'],"{DOWNLOAD_VIEW_CAPTION}");
}
else // Legacy v1.x
@ -406,29 +405,25 @@ class download
//require_once(FOOTERF);
//exit;
}
$dlrow = $sql->fetch();
$sc->setVars($dlrow);
$this->setMeta($dlrow);
if(!defined("DL_IMAGESTYLE"))
{
define("DL_IMAGESTYLE","border:0px");
}
$dlrow = $sql->fetch();
$sc->setVars($dlrow);
$this->setMeta($dlrow);
if(!isset($DL_VIEW_PAGETITLE))
{
$DL_VIEW_PAGETITLE = LAN_PLUGIN_DOWNLOAD_NAME." / {DOWNLOAD_CATEGORY} / {DOWNLOAD_VIEW_NAME}";
$DL_VIEW_PAGETITLE = "{DOWNLOAD_VIEW_NAME} / {DOWNLOAD_CATEGORY} / ".LAN_PLUGIN_DOWNLOAD_NAME;
}
$DL_TITLE = $tp->parseTemplate($DL_VIEW_PAGETITLE, TRUE, $sc);
define("e_PAGETITLE", $DL_TITLE);
$DL_TEMPLATE = $DOWNLOAD_VIEW_TABLE_START.$DOWNLOAD_VIEW_TABLE.$DOWNLOAD_VIEW_TABLE_END;

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

@ -438,8 +438,9 @@ $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_TEMPLATE['view']['caption'] = LAN_PLUGIN_DOWNLOAD_NAME;
$DOWNLOAD_TEMPLATE['view']['start'] = " ";
$DOWNLOAD_TEMPLATE['view']['caption'] = LAN_PLUGIN_DOWNLOAD_NAME;
$DOWNLOAD_TEMPLATE['view']['pagetitle'] = "{DOWNLOAD_VIEW_NAME} / {DOWNLOAD_CATEGORY} / ".LAN_PLUGIN_DOWNLOAD_NAME;
$DOWNLOAD_TEMPLATE['view']['start'] = "";
$DOWNLOAD_TEMPLATE['view']['item'] = "
<div id='download'>