[mxbb-commits] mx_smartor/album_mod/modules album_modcp.php, 1.3, 1.4 album_personal_index.php, 1.3, 1.4

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1769

Modified Files:
	album_modcp.php album_personal_index.php 
Log Message:
Moving load_file to mx_cache...

Index: album_modcp.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_modcp.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_modcp.php	13 Mar 2008 08:35:56 -0000	1.3
--- album_modcp.php	10 Jul 2008 22:23:51 -0000	1.4
***************
*** 301,305 ****
  	$total_pics = $row['count'];
  
! 	$pics_per_page = $board_config['topics_per_page']; // Text list only
  
  	// get information from DB
--- 301,305 ----
  	$total_pics = $row['count'];
  
! 	$pics_per_page = (isset($board_config['topics_per_page']) ? $board_config['topics_per_page'] : 15); // Text list only
  
  	// get information from DB

Index: album_personal_index.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_personal_index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_personal_index.php	13 Mar 2008 08:35:57 -0000	1.3
--- album_personal_index.php	10 Jul 2008 22:23:51 -0000	1.4
***************
*** 100,116 ****
  {
  	case 'joined':
! 		$order_by = "user_regdate ASC LIMIT $start, " . $board_config['topics_per_page'];
  		break;
  	case 'username':
! 		$order_by = "username $sort_order LIMIT $start, " . $board_config['topics_per_page'];
  		break;
  	case 'pics':
! 		$order_by = "pics $sort_order LIMIT $start, " . $board_config['topics_per_page'];
  		break;
  	case 'last_pic':
! 		$order_by = "last_pic $sort_order LIMIT $start, " . $board_config['topics_per_page'];
  		break;
  	default:
! 		$order_by = "user_regdate $sort_order LIMIT $start, " . $board_config['topics_per_page'];
  		break;
  }
--- 100,116 ----
  {
  	case 'joined':
! 		$order_by = "user_regdate ASC LIMIT $start, " . (isset($board_config['topics_per_page']) ? $board_config['topics_per_page'] : 15);
  		break;
  	case 'username':
! 		$order_by = "username $sort_order LIMIT $start, " . (isset($board_config['topics_per_page']) ? $board_config['topics_per_page'] : 15);
  		break;
  	case 'pics':
! 		$order_by = "pics $sort_order LIMIT $start, " . (isset($board_config['topics_per_page']) ? $board_config['topics_per_page'] : 15);
  		break;
  	case 'last_pic':
! 		$order_by = "last_pic $sort_order LIMIT $start, " . (isset($board_config['topics_per_page']) ? $board_config['topics_per_page'] : 15);
  		break;
  	default:
! 		$order_by = "user_regdate $sort_order LIMIT $start, " . (isset($board_config['topics_per_page']) ? $board_config['topics_per_page'] : 15);
  		break;
  }
***************
*** 162,171 ****
  	$total_galleries = $total['total'];
  
! 	$pagination = mx_generate_pagination(this_smartor_mxurl("smartor_mode=album_personal_index&mode=$mode&order=$sort_order"), $total_galleries, $board_config['topics_per_page'], $start). ' ';
  }
  
  $template->assign_vars(array(
  	'PAGINATION' => $pagination,
! 	'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $total_galleries / $board_config['topics_per_page'] ))
  	)
  );
--- 162,171 ----
  	$total_galleries = $total['total'];
  
! 	$pagination = mx_generate_pagination(this_smartor_mxurl("smartor_mode=album_personal_index&mode=$mode&order=$sort_order"), $total_galleries, (isset($board_config['topics_per_page']) ? $board_config['topics_per_page'] : 15), $start). ' ';
  }
  
  $template->assign_vars(array(
  	'PAGINATION' => $pagination,
! 	'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / (isset($board_config['topics_per_page']) ? $board_config['topics_per_page'] : 15) ) + 1 ), ceil( $total_galleries / (isset($board_config['topics_per_page']) ? $board_config['topics_per_page'] : 15) ))
  	)
  );