From 27b835c161bc57a515c89c4b019ff900788713ad Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Sun, 21 May 2017 05:41:04 +0100 Subject: [PATCH] remove php4 constructor; hide some cNav_bar variables and rename some variables --- list-virtual.php | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/list-virtual.php b/list-virtual.php index 0e41c4d8..109d5358 100644 --- a/list-virtual.php +++ b/list-virtual.php @@ -325,12 +325,16 @@ class cNav_bar { - var $count, $title, $limit, $page_size, $pages, $search; //* arguments - var $url; //* manually - var $fInit, $arr_prev, $arr_next, $arr_top; //* internal - var $anchor; + protected $count, $title, $limit, $page_size, $pages, $search; //* arguments - function cNav_bar ($aTitle, $aLimit, $aPage_size, $aPages, $aSearch) { + /* @var string - appended to page link href */ + public $append_to_url = ''; + + protected $have_run_init = false; + protected $arr_prev, $arr_next, $arr_top; //* internal + protected $anchor; + + public function __construct ($aTitle, $aLimit, $aPage_size, $aPages, $aSearch) { $this->count = count($aPages); $this->title = $aTitle; $this->limit = $aLimit; @@ -341,20 +345,18 @@ function cNav_bar ($aTitle, $aLimit, $aPage_size, $aPages, $aSearch) { } else { $this->search = ""; } - $this->url = ''; - $this->fInit = false; } - function init () { + private function init () { $this->anchor = 'a'.substr ($this->title, 3); - $this->url .= '#'.$this->anchor; - ($this->limit >= $this->page_size) ? $this->arr_prev = ' '.$GLOBALS ['PALANG']['pOverview_left_arrow'].' ' : $this->arr_prev = ''; - ($this->limit > 0) ? $this->arr_top = ' '.$GLOBALS ['PALANG']['pOverview_up_arrow'].' ' : $this->arr_top = ''; - (($this->limit + $this->page_size) < ($this->count * $this->page_size)) ? $this->arr_next = ' '.$GLOBALS ['PALANG']['pOverview_right_arrow'].' ' : $this->arr_next = ''; - $this->fInit = true; + $this->append_to_url .= '#'.$this->anchor; + ($this->limit >= $this->page_size) ? $this->arr_prev = ' '.$GLOBALS ['PALANG']['pOverview_left_arrow'].' ' : $this->arr_prev = ''; + ($this->limit > 0) ? $this->arr_top = ' '.$GLOBALS ['PALANG']['pOverview_up_arrow'].' ' : $this->arr_top = ''; + (($this->limit + $this->page_size) < ($this->count * $this->page_size)) ? $this->arr_next = ' '.$GLOBALS ['PALANG']['pOverview_right_arrow'].' ' : $this->arr_next = ''; + $this->have_run_init = true; } - function display_pre () { + private function display_pre() { $ret_val = '
count < 1) return $ret_val; - if (!$this->fInit) + if (!$this->have_run_init) $this->init (); $ret_val .= ''; @@ -386,7 +388,7 @@ function display_top () { if ($i == $highlight_at) { $ret_val .= ''.$lPage.''."\n"; } else { - $ret_val .= ''.$lPage.''."\n"; + $ret_val .= ''.$lPage.''."\n"; } } $ret_val .= ''; @@ -395,15 +397,15 @@ function display_top () { $ret_val .= $this->arr_top; $ret_val .= $this->arr_next; - $ret_val .= $this->display_post (); + $ret_val .= $this->display_post(); return $ret_val; } - function display_bottom () { + public function display_bottom() { $ret_val = ''; if ($this->count < 1) return $ret_val; - if (!$this->fInit) + if (!$this->have_run_init) $this->init (); $ret_val .= $this->display_pre (); $ret_val .= ''; @@ -419,12 +421,11 @@ function display_bottom () { $nav_bar_alias = new cNav_bar ($PALANG['pOverview_alias_title'], $fDisplay, $CONF['page_size'], $pagebrowser_alias, $search); -$nav_bar_alias->url = '&domain='.$fDomain; +$nav_bar_alias->append_to_url = '&domain='.$fDomain; $pagebrowser_mailbox = create_page_browser("$table_mailbox.username", $mailbox_pagebrowser_query); $nav_bar_mailbox = new cNav_bar ($PALANG['pOverview_mailbox_title'], $fDisplay, $CONF['page_size'], $pagebrowser_mailbox, $search); -$nav_bar_mailbox->url = '&domain='.$fDomain; -//print $nav_bar_alias->display_top (); +$nav_bar_mailbox->append_to_url = '&domain='.$fDomain; // this is why we need a proper template layer.