[osbb-commits Mailing List] osbb/lib functions.inc.php,1.21,1.22 templates2file.php,1.5,1.6

[Sven <bra...@us...>]

Update of /cvsroot/osbb/osbb/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12402/lib

Modified Files:
	functions.inc.php templates2file.php 
Log Message:
Fixed board pagelinks (new tempalte system again)

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/osbb/osbb/lib/functions.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** functions.inc.php	8 Jan 2005 13:55:00 -0000	1.21
--- functions.inc.php	8 Jan 2005 16:19:10 -0000	1.22
***************
*** 966,1004 ****
  */
  function makePageLink($page,$pages,$link){
!  global $lang,$template;
!  $big = 0;
!  if($page-2 > 0){
!   $p = $page-2;
!   eval("\$front = \"".$template->get('pagelink_bit')."\";");
!   $p = $page-1;
!   eval("\$front .= \"".$template->get('pagelink_bit')."\";");
!   $show_links_f = 1;
!  }elseif($page-1 > 0){
!   $p = $page-1;
!   eval("\$front = \"".$template->get('pagelink_bit')."\";");
!   $show_links_f = 1;
!  }else{
!   $front = '';
!   $show_links_f = 0;
!  }
!  if($page+2 <= $pages){
!   $p = $page+1;
!   eval("\$back = \"".$template->get('pagelink_bit')."\";");
!   $p = $page+2;
!   eval("\$back .= \"".$template->get('pagelink_bit')."\";");
!   $show_links_b = 1;
!  }elseif($page+1 <= $pages){
!   $p = $page+1;
!   eval("\$back = \"".$template->get('pagelink_bit')."\";");
!   $show_links_b = 1;
!  }else{
!   $back = '';
!   $show_links_b = 0;
!  }
!  $p = $page;
!  $big = 1;
!  eval("\$middle = \"".$template->get('pagelink_bit')."\";");
!  eval("\$return = \"".$template->get('pagelink')."\";");
!  return $return;
  }
  
--- 966,974 ----
  */
  function makePageLink($page,$pages,$link){
!  global $template;
!  $template->assignVar('pagelink','page',$page);
!  $template->assignVar('pagelink','pages',$pages);
!  $template->assignVar('pagelink','link',$link);
!  return $template->get2('pagelink');
  }
  

Index: templates2file.php
===================================================================
RCS file: /cvsroot/osbb/osbb/lib/templates2file.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** templates2file.php	7 Jan 2005 12:48:25 -0000	1.5
--- templates2file.php	8 Jan 2005 16:19:10 -0000	1.6
***************
*** 42,45 ****
--- 42,46 ----
    $templates[] = 'index_subboards';
    $templates[] = 'index_subboards_board';
+   $templates[] = 'pagelink';
   break;
  }