mirror of
https://github.com/e107inc/e107.git
synced 2025-07-25 17:01:43 +02:00
remove incompatible hook= code; replace w/ new support for "SuperModifiers" as designed
by team
This commit is contained in:
12
download.php
12
download.php
@@ -11,9 +11,9 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/download.php,v $
|
| $Source: /cvs_backup/e107_0.8/download.php,v $
|
||||||
| $Revision: 1.8 $ - with modifications
|
| $Revision: 1.9 $ - with modifications
|
||||||
| $Date: 2007-01-17 21:29:28 $
|
| $Date: 2007-01-20 14:52:34 $
|
||||||
| $Author: e107steved $
|
| $Author: mrpete $
|
||||||
|
|
|
|
||||||
+----------------------------------------------------------------------------+
|
+----------------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
@@ -277,7 +277,7 @@ if ($action == "list") {
|
|||||||
$DOWNLOAD_CATEGORY_ICON = ($download_category_icon ? "<img src='".e_IMAGE."icons/".$download_category_icon."' alt='' style='float: left' />" : " ");
|
$DOWNLOAD_CATEGORY_ICON = ($download_category_icon ? "<img src='".e_IMAGE."icons/".$download_category_icon."' alt='' style='float: left' />" : " ");
|
||||||
|
|
||||||
$DOWNLOAD_CATEGORY = $tp->toHTML($download_category_name,FALSE,"emotes_off, no_make_clickable");
|
$DOWNLOAD_CATEGORY = $tp->toHTML($download_category_name,FALSE,"emotes_off, no_make_clickable");
|
||||||
$DOWNLOAD_CATEGORY_DESCRIPTION = $tp -> toHTML($download_category_description, TRUE,'hook=description');
|
$DOWNLOAD_CATEGORY_DESCRIPTION = $tp -> toHTML($download_category_description, TRUE,'description');
|
||||||
|
|
||||||
if (!$DOWNLOAD_LIST_TABLE) {
|
if (!$DOWNLOAD_LIST_TABLE) {
|
||||||
if (file_exists(THEME."download_template.php")) {
|
if (file_exists(THEME."download_template.php")) {
|
||||||
@@ -653,7 +653,7 @@ function parse_download_cat_child_table($row)
|
|||||||
$dcatname=$tp->toHTML($row['download_category_name'],FALSE,"emotes_off, no_make_clickable");
|
$dcatname=$tp->toHTML($row['download_category_name'],FALSE,"emotes_off, no_make_clickable");
|
||||||
$DOWNLOAD_CAT_SUB_NAME = ($row['d_count'] ? "<a href='".e_BASE."download.php?list.".$row['download_category_id']."'>".$dcatname."</a>" : $dcatname);
|
$DOWNLOAD_CAT_SUB_NAME = ($row['d_count'] ? "<a href='".e_BASE."download.php?list.".$row['download_category_id']."'>".$dcatname."</a>" : $dcatname);
|
||||||
$DOWNLOAD_CAT_SUB_NAME_LINKED = "<a href='".e_BASE."download.php?list.".$row['download_category_id']."'>".$dcatname."</a>";
|
$DOWNLOAD_CAT_SUB_NAME_LINKED = "<a href='".e_BASE."download.php?list.".$row['download_category_id']."'>".$dcatname."</a>";
|
||||||
$DOWNLOAD_CAT_SUB_DESCRIPTION = $tp->toHTML($row['download_category_description'],TRUE,'hook=description');
|
$DOWNLOAD_CAT_SUB_DESCRIPTION = $tp->toHTML($row['download_category_description'],TRUE,'description');
|
||||||
$DOWNLOAD_CAT_SUB_COUNT = $row['d_count'];
|
$DOWNLOAD_CAT_SUB_COUNT = $row['d_count'];
|
||||||
$DOWNLOAD_CAT_SUB_SIZE = parsesize( $row['d_size']);
|
$DOWNLOAD_CAT_SUB_SIZE = parsesize( $row['d_size']);
|
||||||
$DOWNLOAD_CAT_SUB_DOWNLOADED = intval( $row['d_requests']);
|
$DOWNLOAD_CAT_SUB_DOWNLOADED = intval( $row['d_requests']);
|
||||||
@@ -662,7 +662,7 @@ function parse_download_cat_child_table($row)
|
|||||||
foreach($row['subsubcats'] as $subrow)
|
foreach($row['subsubcats'] as $subrow)
|
||||||
{
|
{
|
||||||
$DOWNLOAD_CAT_SUBSUB_ICON = get_cat_icons($subrow['download_category_icon'],$subrow['d_count']);
|
$DOWNLOAD_CAT_SUBSUB_ICON = get_cat_icons($subrow['download_category_icon'],$subrow['d_count']);
|
||||||
$DOWNLOAD_CAT_SUBSUB_DESCRIPTION = $tp->toHTML($subrow['download_category_description'],TRUE,'hook=description');
|
$DOWNLOAD_CAT_SUBSUB_DESCRIPTION = $tp->toHTML($subrow['download_category_description'],TRUE,'description');
|
||||||
$DOWNLOAD_CAT_SUBSUB_COUNT = intval($subrow['d_count']);
|
$DOWNLOAD_CAT_SUBSUB_COUNT = intval($subrow['d_count']);
|
||||||
$DOWNLOAD_CAT_SUBSUB_SIZE = parsesize($subrow['d_size']);
|
$DOWNLOAD_CAT_SUBSUB_SIZE = parsesize($subrow['d_size']);
|
||||||
$DOWNLOAD_CAT_SUBSUB_DOWNLOADED = intval($subrow['d_requests']);
|
$DOWNLOAD_CAT_SUBSUB_DOWNLOADED = intval($subrow['d_requests']);
|
||||||
|
12
page.php
12
page.php
@@ -11,9 +11,9 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/page.php,v $
|
| $Source: /cvs_backup/e107_0.8/page.php,v $
|
||||||
| $Revision: 1.8 $
|
| $Revision: 1.9 $
|
||||||
| $Date: 2007-01-17 21:29:28 $
|
| $Date: 2007-01-20 14:52:41 $
|
||||||
| $Author: e107steved $
|
| $Author: mrpete $
|
||||||
|
|
|
|
||||||
+----------------------------------------------------------------------------+
|
+----------------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
@@ -229,7 +229,7 @@ class pageClass
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this -> pageToRender = $tp -> toHTML($this -> pageText, TRUE, 'parse_sc, constants,hook=content');
|
$this -> pageToRender = $tp -> toHTML($this -> pageText, TRUE, 'BODY');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -265,11 +265,11 @@ class pageClass
|
|||||||
foreach($this -> pageTitles as $title)
|
foreach($this -> pageTitles as $title)
|
||||||
{
|
{
|
||||||
$titlep = preg_replace("/\[newpage=(.*?)\]/", "\\1", $title);
|
$titlep = preg_replace("/\[newpage=(.*?)\]/", "\\1", $title);
|
||||||
$this -> pageTitles[$count] = ($titlep == "[newpage]" ? LAN_PAGE_13." ".($count+1)." " : $tp -> toHTML($titlep, TRUE, 'parse_sc, constants,emotes_off,no_make_clickable,hook=title'));
|
$this -> pageTitles[$count] = ($titlep == "[newpage]" ? LAN_PAGE_13." ".($count+1)." " : $tp -> toHTML($titlep, TRUE, 'TITLE'));
|
||||||
$count++;
|
$count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this -> pageToRender = $tp -> toHTML($pages[$this -> pageSelected], TRUE, 'parse_sc,constants,hook=content');
|
$this -> pageToRender = $tp -> toHTML($pages[$this -> pageSelected], TRUE, 'BODY');
|
||||||
$this -> title = (substr($this -> pageTitles[$this -> pageSelected], -1) == ";" ? "" : $this -> pageTitles[$this -> pageSelected]);
|
$this -> title = (substr($this -> pageTitles[$this -> pageSelected], -1) == ";" ? "" : $this -> pageTitles[$this -> pageSelected]);
|
||||||
|
|
||||||
if($this -> debug)
|
if($this -> debug)
|
||||||
|
Reference in New Issue
Block a user