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

Bugfix: tablerender modes were missing on some pages.

Browse Source
This commit is contained in:
CaMer0n
2007-08-19 21:46:20 +00:00
parent 15b82dd644
commit 7148abd6c2
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_files/shortcode/nextprev.sc
View File

@@ -6,19 +6,20 @@ global $pref;
$parm_count = substr_count($parm, ","); $parm_count = substr_count($parm, ",");
while($parm_count < 4) while($parm_count < 5)
{ {
$parm .= ","; $parm .= ",";
$parm_count++; $parm_count++;
} }
$p = explode(",", $parm, 5); $p = explode(",", $parm, 6);
$total_items = intval($p[0]); $total_items = intval($p[0]);
$perpage = intval($p[1]); $perpage = intval($p[1]);
$current_start = intval($p[2]); $current_start = intval($p[2]);
$url = trim($p[3]); $url = trim($p[3]);
$caption = trim($p[4]); $caption = trim($p[4]);
$pagetitle = explode("|",trim($p[5]));
if($total_items < $perpage) { return ""; } if($total_items < $perpage) { return ""; }
@@ -184,7 +185,9 @@ if($total_pages > 1)
} }
$newstart = ($i-1)*$perpage; $newstart = ($i-1)*$perpage;
$link = str_replace("[FROM]", $newstart, $url); $link = str_replace("[FROM]", $newstart, $url);
$dropdown .= "<option value='{$link}' {$sel}>{$i}</option>\n"; $c = $i-1;
$title = ($pagetitle[$c]) ? $pagetitle[$c] : $i;
$dropdown .= "<option value='{$link}' {$sel}>{$title}</option>\n";
} }
$dropdown .= "</select>"; $dropdown .= "</select>";
$ret = $np_parm['template']; $ret = $np_parm['template'];

29
page.php
View File

@@ -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.12 $ | $Revision: 1.13 $
| $Date: 2007-08-08 19:34:34 $ | $Date: 2007-08-19 21:46:20 $
| $Author: e107steved $ | $Author: e107coders $
| |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -58,7 +58,7 @@ else
require_once(HEADERF); require_once(HEADERF);
if ($tmp['err']) // Need to display error block after header defined if ($tmp['err']) // Need to display error block after header defined
{ {
$ns -> tablerender($tmp['title'], $tmp['text']); $ns -> tablerender($tmp['title'], $tmp['text'],"cpage");
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
} }
@@ -73,7 +73,7 @@ else
} }
else else
{ {
$ns -> tablerender($tmp['title'], $tmp['text']); $ns -> tablerender($tmp['title'], $tmp['text'],"cpage");
$comment_flag = $tmp['comment_flag']; $comment_flag = $tmp['comment_flag'];
} }
} }
@@ -196,12 +196,12 @@ class pageClass
if($page_author) if($page_author)
{ {
$text .= "<div class='smalltext' style='text-align:right'>".$user_name.", ".$gen->convert_date($page_datestamp, "long")."</div><br />"; $text .= "<div class='smalltext cpage_author' style='text-align:right'>".$user_name.", ".$gen->convert_date($page_datestamp, "long")."</div><br />";
} }
if($this -> title) if($this -> title)
{ {
$text .= "<b>".$this -> title."</b><br /><br />"; $text .= "<div class='cpage_title'>".$this -> title."</div>";
} }
$text .= $this -> pageToRender; $text .= $this -> pageToRender;
@@ -287,14 +287,25 @@ class pageClass
function pageIndex() function pageIndex()
{ {
global $tp,$pref;
$itext = '';
if(isset($pref['old_np']) && $pref['old_np'])
{
$count = 0; $count = 0;
$itext = '';
foreach($this -> pageTitles as $title) foreach($this -> pageTitles as $title)
{ {
if (!$count) { $itext = "<br /><br />"; } if (!$count) { $itext = "<br /><br />"; }
$itext .= $this -> bullet." ".($count == $this -> pageSelected ? $title : "<a href='".e_SELF."?".$this -> pageID.".".$count."'>".$title."</a>")."<br />\n"; $itext .= $this -> bullet." ".($count == $this -> pageSelected ? $title : "<a href='".e_SELF."?".$this -> pageID.".".$count."'>".$title."</a>")."<br />\n";
$count++; $count++;
} }
}
else
{
$titles = implode("|",$this -> pageTitles);
$total_items = count($this -> pageTitles);
$parms = $total_items.",1,".$this -> pageSelected.",".e_SELF."?".$this -> pageID.".[FROM],,$titles";
$itext = ($total_items) ? "<div class='nextprev nextprev_custom'>".$tp->parseTemplate("{NEXTPREV={$parms}}")."</div>" : "";
}
return $itext; return $itext;
} }
@@ -429,7 +440,7 @@ class pageClass
"; ";
// Mustn't return to higher level code here // Mustn't return to higher level code here
$ns->tablerender($page_title, $pw_entry_text); // HEADERF also clears $text - hence different variable $ns->tablerender($page_title, $pw_entry_text,"cpage_pw"); // HEADERF also clears $text - hence different variable
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
} }