[mxbb-commits] mx_smartor/admin admin_album_auth.php, 1.8, 1.9 admin_album_cat.php, 1.8, 1.9 admin_album_clearcache.php, 1.8, 1.9 admin_album_clown_SP.php, 1.10, 1.11 admin_album_config.php, 1.8, 1.9 admin_album_personal.php, 1.8, 1.9

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

Update of /cvsroot/mxbb/mx_smartor/admin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9308/modules/mx_smartor/admin

Modified Files:
	admin_album_auth.php admin_album_cat.php 
	admin_album_clearcache.php admin_album_clown_SP.php 
	admin_album_config.php admin_album_personal.php 
Log Message:
This module is really messy. I have done some general code cleanup and security scrutiny. Still, much to do...

Index: admin_album_auth.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_auth.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_album_auth.php	2 May 2006 23:29:32 -0000	1.8
--- admin_album_auth.php	30 Jun 2006 21:10:54 -0000	1.9
***************
*** 9,12 ****
--- 9,14 ----
  */
  
+ /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
+ 
  define( 'IN_PORTAL', 1 );
  
***************
*** 25,29 ****
  require( $mx_root_path . 'admin/pagestart.' . $phpEx );
  include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
! include_once( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  
  $album_user_id = ALBUM_PUBLIC_GALLERY;
--- 27,42 ----
  require( $mx_root_path . 'admin/pagestart.' . $phpEx );
  include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
! 
! // **********************************************************************
! // Read language definition
! // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
! {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
! }
! else
! {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
! }
  
  $album_user_id = ALBUM_PUBLIC_GALLERY;
***************
*** 59,70 ****
  		);
  
! 	$template->assign_vars( array( 'L_ALBUM_AUTH_TITLE' => $lang['Album_Auth_Title'],
! 			'L_ALBUM_AUTH_EXPLAIN' => $lang['Album_Auth_Explain'],
! 			'L_SELECT_CAT' => $lang['Select_a_Category'],
! 			'S_ALBUM_ACTION' => append_sid( "admin_album_auth.$phpEx" ),
! 			'L_LOOK_UP_CAT' => $lang['Look_up_Category'],
! 			// --- Album Category Hierarchy : begin
! 			// --- version : 1.1.0
! 			'CAT_SELECT_TITLE' => $s_album_cat_list )
  		// --- Album Category Hierarchy : end
  		);
--- 72,84 ----
  		);
  
! 	$template->assign_vars( array(
! 		'L_ALBUM_AUTH_TITLE' => $lang['Album_Auth_Title'],
! 		'L_ALBUM_AUTH_EXPLAIN' => $lang['Album_Auth_Explain'],
! 		'L_SELECT_CAT' => $lang['Select_a_Category'],
! 		'S_ALBUM_ACTION' => append_sid( "admin_album_auth.$phpEx" ),
! 		'L_LOOK_UP_CAT' => $lang['Look_up_Category'],
! 		// --- Album Category Hierarchy : begin
! 		// --- version : 1.1.0
! 		'CAT_SELECT_TITLE' => $s_album_cat_list )
  		// --- Album Category Hierarchy : end
  		);
***************
*** 80,105 ****
  		$cat_id = intval( $HTTP_POST_VARS['cat_id'] );
  
! 		$template->set_filenames( array( 'body' => 'admin/album_auth_body.tpl' )
! 			);
  
! 		$template->assign_vars( array( 'L_ALBUM_AUTH_TITLE' => $lang['Album_Auth_Title'],
! 				'L_ALBUM_AUTH_EXPLAIN' => $lang['Album_Auth_Explain'],
! 				'L_SUBMIT' => $lang['Submit'],
! 				'L_RESET' => $lang['Reset'],
  
! 				'L_GROUPS' => $lang['Usergroups'],
  
! 				'L_VIEW' => $lang['View'],
! 				'L_UPLOAD' => $lang['Upload'],
! 				'L_RATE' => $lang['Rate'],
! 				'L_COMMENT' => $lang['Comment'],
! 				'L_EDIT' => $lang['Edit'],
! 				'L_DELETE' => $lang['Delete'],
  
! 				'L_IS_MODERATOR' => $lang['Is_Moderator'],
! 				'S_ALBUM_ACTION' => append_sid( "admin_album_auth.$phpEx?cat_id=$cat_id" ),
! 				)
! 			);
  		// Get the list of phpBB usergroups
  		$sql = "SELECT group_id, group_name
  				FROM " . GROUPS_TABLE . "
--- 94,121 ----
  		$cat_id = intval( $HTTP_POST_VARS['cat_id'] );
  
! 		$template->set_filenames( array( 'body' => 'admin/album_auth_body.tpl' ) );
  
! 		$template->assign_vars( array(
! 			'L_ALBUM_AUTH_TITLE' => $lang['Album_Auth_Title'],
! 			'L_ALBUM_AUTH_EXPLAIN' => $lang['Album_Auth_Explain'],
! 			'L_SUBMIT' => $lang['Submit'],
! 			'L_RESET' => $lang['Reset'],
  
! 			'L_GROUPS' => $lang['Usergroups'],
  
! 			'L_VIEW' => $lang['View'],
! 			'L_UPLOAD' => $lang['Upload'],
! 			'L_RATE' => $lang['Rate'],
! 			'L_COMMENT' => $lang['Comment'],
! 			'L_EDIT' => $lang['Edit'],
! 			'L_DELETE' => $lang['Delete'],
  
! 			'L_IS_MODERATOR' => $lang['Is_Moderator'],
! 			'S_ALBUM_ACTION' => append_sid( "admin_album_auth.$phpEx?cat_id=$cat_id" ),
! 		));
! 
! 		//
  		// Get the list of phpBB usergroups
+ 		//
  		$sql = "SELECT group_id, group_name
  				FROM " . GROUPS_TABLE . "
***************
*** 115,119 ****
--- 131,138 ----
  			$groupdata[] = $row;
  		}
+ 
+ 		//
  		// Get info of this cat
+ 		//
  		$sql = "SELECT cat_id, cat_title, cat_view_groups, cat_upload_groups, cat_rate_groups, cat_comment_groups, cat_edit_groups, cat_delete_groups, cat_moderator_groups
  				FROM " . ALBUM_CAT_TABLE . "
***************
*** 137,157 ****
  		for ( $i = 0; $i < count( $groupdata ); $i++ )
  		{
! 			$template->assign_block_vars( 'grouprow', array( 'GROUP_ID' => $groupdata[$i]['group_id'],
! 					'GROUP_NAME' => $groupdata[$i]['group_name'],
! 
! 					'VIEW_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $view_groups ) ) ? 'checked="checked"' : '',
! 
! 					'UPLOAD_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $upload_groups ) ) ? 'checked="checked"' : '',
! 
! 					'RATE_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $rate_groups ) ) ? 'checked="checked"' : '',
! 
! 					'COMMENT_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $comment_groups ) ) ? 'checked="checked"' : '',
! 
! 					'EDIT_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $edit_groups ) ) ? 'checked="checked"' : '',
! 
! 					'DELETE_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $delete_groups ) ) ? 'checked="checked"' : '',
! 
! 					'MODERATOR_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $moderator_groups ) ) ? 'checked="checked"' : '' )
! 				);
  		}
  
--- 156,170 ----
  		for ( $i = 0; $i < count( $groupdata ); $i++ )
  		{
! 			$template->assign_block_vars( 'grouprow', array(
! 				'GROUP_ID' => $groupdata[$i]['group_id'],
! 				'GROUP_NAME' => $groupdata[$i]['group_name'],
! 				'VIEW_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $view_groups ) ) ? 'checked="checked"' : '',
! 				'UPLOAD_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $upload_groups ) ) ? 'checked="checked"' : '',
! 				'RATE_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $rate_groups ) ) ? 'checked="checked"' : '',
! 				'COMMENT_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $comment_groups ) ) ? 'checked="checked"' : '',
! 				'EDIT_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $edit_groups ) ) ? 'checked="checked"' : '',
! 				'DELETE_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $delete_groups ) ) ? 'checked="checked"' : '',
! 				'MODERATOR_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $moderator_groups ) ) ? 'checked="checked"' : '' )
! 			);
  		}
  
***************
*** 186,191 ****
  	}
  }
- 
- /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
- 
  ?>
\ No newline at end of file
--- 199,201 ----

Index: admin_album_clearcache.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clearcache.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_album_clearcache.php	2 May 2006 23:29:32 -0000	1.8
--- admin_album_clearcache.php	30 Jun 2006 21:10:55 -0000	1.9
***************
*** 9,12 ****
--- 9,14 ----
  */
  
+ /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
+ 
  define( 'IN_PORTAL', 1 );
  
***************
*** 18,23 ****
  }
  
  // Let's set the root dir for phpBB
! 
  $module_root_path = './../';
  $mx_root_path = './../../../';
--- 20,26 ----
  }
  
+ //
  // Let's set the root dir for phpBB
! //
  $module_root_path = './../';
  $mx_root_path = './../../../';
***************
*** 25,51 ****
  require( $mx_root_path . 'admin/pagestart.' . $phpEx );
  include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
- include_once( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  
! if ( !isset( $HTTP_POST_VARS['confirm'] ) )
  {
  
  	// Start output of page
  
! 	$template->set_filenames( array( 'body' => 'confirm_body.tpl' )
! 		);
! 
! 	$template->assign_vars( array( 'MESSAGE_TITLE' => $lang['Confirm'],
  
! 			'MESSAGE_TEXT' => $lang['Album_clear_cache_confirm'],
  
! 			'L_NO' => $lang['No'],
! 			'L_YES' => $lang['Yes'],
  
! 			'S_CONFIRM_ACTION' => append_sid( "admin_album_clearcache.$phpEx" ),
! 			)
! 		);
  
  	// Generate the page
! 
  	$template->pparse( 'body' );
  
--- 28,65 ----
  require( $mx_root_path . 'admin/pagestart.' . $phpEx );
  include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
  
! // **********************************************************************
! // Read language definition
! // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
+ 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
+ }
+ else
+ {
+ 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
+ }
  
+ if ( !isset( $HTTP_POST_VARS['confirm'] ) )
+ {
+ 	//
  	// Start output of page
+ 	//
+ 	$template->set_filenames( array( 'body' => 'confirm_body.tpl' ) );
  
! 	$template->assign_vars( array(
! 		'MESSAGE_TITLE' => $lang['Confirm'],
  
! 		'MESSAGE_TEXT' => $lang['Album_clear_cache_confirm'],
  
! 		'L_NO' => $lang['No'],
! 		'L_YES' => $lang['Yes'],
  
! 		'S_CONFIRM_ACTION' => append_sid( "admin_album_clearcache.$phpEx" ),
! 	));
  
+ 	//
  	// Generate the page
! 	//
  	$template->pparse( 'body' );
  
***************
*** 68,73 ****
  	mx_message_die( GENERAL_MESSAGE, $lang['Thumbnail_cache_cleared_successfully'] );
  }
- 
- /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
- 
  ?>
\ No newline at end of file
--- 82,84 ----

Index: admin_album_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cat.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_album_cat.php	2 May 2006 23:29:32 -0000	1.8
--- admin_album_cat.php	30 Jun 2006 21:10:55 -0000	1.9
***************
*** 9,12 ****
--- 9,14 ----
  */
  
+ /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
+ 
  define( 'IN_PORTAL', 1 );
  
***************
*** 18,23 ****
  }
  
  // Let's set the root dir for phpBB
! 
  $module_root_path = './../';
  $mx_root_path = './../../../';
--- 20,26 ----
  }
  
+ //
  // Let's set the root dir for phpBB
! //
  $module_root_path = './../';
  $mx_root_path = './../../../';
***************
*** 26,56 ****
  
  include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
- include_once( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  
! /*
! define('IN_PHPBB', true);
! 
! if( !empty($setmodules) )
  {
! 	$filename = basename(__FILE__);
! 	$module['Photo_Album']['Categories'] = $filename;
! 	return;
  }
- 
- //
- // Let's set the root dir for phpBB
- //
- $phpbb_root_path = '../';
- //--- Album Category Hierarchy : begin
- //--- version : <= 1.1.0
- $album_root_path = $phpbb_root_path . 'album_mod/';
- //--- Album Category Hierarchy : end
- $phpEx = substr(strrchr(__FILE__, '.'), 1);
- require('./pagestart.' . $phpEx);
- require($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
- require($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
- 
- require($album_root_path. 'album_common.'.$phpEx);
- */
  
  if ( !isset( $HTTP_POST_VARS['mode'] ) )
--- 29,44 ----
  
  include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
  
! // **********************************************************************
! // Read language definition
! // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
! }
! else
! {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
  if ( !isset( $HTTP_POST_VARS['mode'] ) )
***************
*** 66,88 ****
  		   then go back to this template file 'admin/album_cat_body.tpl'.
  		*/
! 		$template->set_filenames( array( 'body' => 'admin/album_cat_body.tpl' )
! 			);
  		// --- Album Category Hierarchy : end
! 		$template->assign_vars( array( 'S_ALBUM_ACTION' => append_sid( "admin_album_cat.$phpEx" ),
! 				'L_CREATE_CATEGORY' => $lang['Create_category'],
! 				// --- Album Category Hierarchy : begin
! 				// --- version <= 1.1.0
! 				'L_ALBUM_INDEX' => $lang['Album_Categories_Title']
! 				// --- Album Category Hierarchy : end
! 				)
! 			);
  		// --- Album Category Hierarchy : begin
  		// --- version <= 1.1.0
  		// get the values of level selected
  		if ( !empty( $cat_id ) )
  			$parent = $cat_id;
  
  		if ( !isset( $album_cat_tree['keys'][$parent] ) )
  			$parent = ALBUM_ROOT_CATEGORY;
  		// display the tree
  		album_display_admin_index( $parent );
--- 54,79 ----
  		   then go back to this template file 'admin/album_cat_body.tpl'.
  		*/
! 		$template->set_filenames( array( 'body' => 'admin/album_cat_body.tpl' ) );
  		// --- Album Category Hierarchy : end
! 		$template->assign_vars( array(
! 			'S_ALBUM_ACTION' => append_sid( "admin_album_cat.$phpEx" ),
! 			'L_CREATE_CATEGORY' => $lang['Create_category'],
! 			// --- Album Category Hierarchy : begin
! 			// --- version <= 1.1.0
! 			'L_ALBUM_INDEX' => $lang['Album_Categories_Title']
! 			// --- Album Category Hierarchy : end
! 		));
  		// --- Album Category Hierarchy : begin
  		// --- version <= 1.1.0
  		// get the values of level selected
  		if ( !empty( $cat_id ) )
+ 		{
  			$parent = $cat_id;
+ 		}
  
  		if ( !isset( $album_cat_tree['keys'][$parent] ) )
+ 		{
  			$parent = ALBUM_ROOT_CATEGORY;
+ 		}
  		// display the tree
  		album_display_admin_index( $parent );
***************
*** 118,211 ****
  			$s_album_cat_list = album_get_tree_option( $catrow['cat_parent_id'], ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL | ALBUM_SELECTBOX_INCLUDE_ROOT );
  			// --- Album Category Hierarchy : end
! 			$template->set_filenames( array( 'body' => 'admin/album_cat_new_body.tpl' )
! 				);
  
! 			$template->assign_block_vars( 'acp', array( 'L_ALBUM_CAT_TITLE' => $lang['Album_Categories_Title'],
! 					'L_ALBUM_CAT_EXPLAIN' => $lang['Album_Categories_Explain']
! 					)
! 				);
  
  			$template->assign_vars( array(
! 					// --- Album Category Hierarchy : begin
! 					// --- version = 1.1.0
! 					// -- deleted
! 					// --- Album Category Hierarchy : end
! 					'S_ALBUM_ACTION' => append_sid( "admin_album_cat.$phpEx?cat_id=$cat_id" ),
! 					'L_CAT_TITLE' => $lang['Category_Title'],
! 					'L_CAT_DESC' => $lang['Category_Desc'],
! 					// --- Album Category Hierarchy : begin
! 					// --- version <= 1.1.0
! 					'L_CAT_PARENT_TITLE' => $lang['Parent_Category'],
! 					// --- Album Category Hierarchy : end
! 					'L_CAT_PERMISSIONS' => $lang['Category_Permissions'],
! 					'L_VIEW_LEVEL' => $lang['View_level'],
! 					'L_UPLOAD_LEVEL' => $lang['Upload_level'],
! 					'L_RATE_LEVEL' => $lang['Rate_level'],
! 					'L_COMMENT_LEVEL' => $lang['Comment_level'],
! 					'L_EDIT_LEVEL' => $lang['Edit_level'],
! 					'L_DELETE_LEVEL' => $lang['Delete_level'],
! 					'L_PICS_APPROVAL' => $lang['Pics_Approval'],
! 					'L_GUEST' => $lang['Forum_ALL'],
! 					'L_REG' => $lang['Forum_REG'],
! 					'L_PRIVATE' => $lang['Forum_PRIVATE'],
! 					'L_MOD' => $lang['Forum_MOD'],
! 					'L_ADMIN' => $lang['Forum_ADMIN'],
! 
! 					'L_DISABLED' => $lang['Disabled'],
  
! 					'S_CAT_TITLE' => $catrow['cat_title'],
! 					'S_CAT_DESC' => $catrow['cat_desc'],
! 					// --- Album Category Hierarchy : begin
! 					// --- version <= 1.1.0
! 					'S_CAT_PARENT_OPTIONS' => $s_album_cat_list,
! 					// --- Album Category Hierarchy : end
! 					'VIEW_GUEST' => ( $catrow['cat_view_level'] == ALBUM_GUEST ) ? 'selected="selected"' : '',
! 					'VIEW_REG' => ( $catrow['cat_view_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 					'VIEW_PRIVATE' => ( $catrow['cat_view_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 					'VIEW_MOD' => ( $catrow['cat_view_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 					'VIEW_ADMIN' => ( $catrow['cat_view_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 					'UPLOAD_GUEST' => ( $catrow['cat_upload_level'] == ALBUM_GUEST ) ? 'selected="selected"' : '',
! 					'UPLOAD_REG' => ( $catrow['cat_upload_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 					'UPLOAD_PRIVATE' => ( $catrow['cat_upload_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 					'UPLOAD_MOD' => ( $catrow['cat_upload_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 					'UPLOAD_ADMIN' => ( $catrow['cat_upload_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 					'RATE_GUEST' => ( $catrow['cat_rate_level'] == ALBUM_GUEST ) ? 'selected="selected"' : '',
! 					'RATE_REG' => ( $catrow['cat_rate_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 					'RATE_PRIVATE' => ( $catrow['cat_rate_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 					'RATE_MOD' => ( $catrow['cat_rate_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 					'RATE_ADMIN' => ( $catrow['cat_rate_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 					'COMMENT_GUEST' => ( $catrow['cat_comment_level'] == ALBUM_GUEST ) ? 'selected="selected"' : '',
! 					'COMMENT_REG' => ( $catrow['cat_comment_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 					'COMMENT_PRIVATE' => ( $catrow['cat_comment_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 					'COMMENT_MOD' => ( $catrow['cat_comment_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 					'COMMENT_ADMIN' => ( $catrow['cat_comment_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 					'EDIT_REG' => ( $catrow['cat_edit_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 					'EDIT_PRIVATE' => ( $catrow['cat_edit_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 					'EDIT_MOD' => ( $catrow['cat_edit_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 					'EDIT_ADMIN' => ( $catrow['cat_edit_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 					'DELETE_REG' => ( $catrow['cat_delete_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 					'DELETE_PRIVATE' => ( $catrow['cat_delete_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 					'DELETE_MOD' => ( $catrow['cat_delete_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 					'DELETE_ADMIN' => ( $catrow['cat_delete_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 					'APPROVAL_DISABLED' => ( $catrow['cat_approval'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 					'APPROVAL_MOD' => ( $catrow['cat_approval'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 					'APPROVAL_ADMIN' => ( $catrow['cat_approval'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 					'S_MODE' => 'edit',
  
! 					'S_GUEST' => ALBUM_GUEST,
! 					'S_USER' => ALBUM_USER,
! 					'S_PRIVATE' => ALBUM_PRIVATE,
! 					'S_MOD' => ALBUM_MOD,
! 					'S_ADMIN' => ALBUM_ADMIN,
  
! 					'L_PANEL_TITLE' => $lang['Edit_Category'] )
! 				);
  
  			$template->pparse( 'body' );
--- 109,200 ----
  			$s_album_cat_list = album_get_tree_option( $catrow['cat_parent_id'], ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL | ALBUM_SELECTBOX_INCLUDE_ROOT );
  			// --- Album Category Hierarchy : end
! 			$template->set_filenames( array( 'body' => 'admin/album_cat_new_body.tpl' ) );
  
! 			$template->assign_block_vars( 'acp', array(
! 				'L_ALBUM_CAT_TITLE' => $lang['Album_Categories_Title'],
! 				'L_ALBUM_CAT_EXPLAIN' => $lang['Album_Categories_Explain']
! 			));
  
  			$template->assign_vars( array(
! 				// --- Album Category Hierarchy : begin
! 				// --- version = 1.1.0
! 				// -- deleted
! 				// --- Album Category Hierarchy : end
! 				'S_ALBUM_ACTION' => append_sid( "admin_album_cat.$phpEx?cat_id=$cat_id" ),
! 				'L_CAT_TITLE' => $lang['Category_Title'],
! 				'L_CAT_DESC' => $lang['Category_Desc'],
! 				// --- Album Category Hierarchy : begin
! 				// --- version <= 1.1.0
! 				'L_CAT_PARENT_TITLE' => $lang['Parent_Category'],
! 				// --- Album Category Hierarchy : end
! 				'L_CAT_PERMISSIONS' => $lang['Category_Permissions'],
! 				'L_VIEW_LEVEL' => $lang['View_level'],
! 				'L_UPLOAD_LEVEL' => $lang['Upload_level'],
! 				'L_RATE_LEVEL' => $lang['Rate_level'],
! 				'L_COMMENT_LEVEL' => $lang['Comment_level'],
! 				'L_EDIT_LEVEL' => $lang['Edit_level'],
! 				'L_DELETE_LEVEL' => $lang['Delete_level'],
! 				'L_PICS_APPROVAL' => $lang['Pics_Approval'],
! 				'L_GUEST' => $lang['Forum_ALL'],
! 				'L_REG' => $lang['Forum_REG'],
! 				'L_PRIVATE' => $lang['Forum_PRIVATE'],
! 				'L_MOD' => $lang['Forum_MOD'],
! 				'L_ADMIN' => $lang['Forum_ADMIN'],
! 				'L_DISABLED' => $lang['Disabled'],
  
! 				'S_CAT_TITLE' => $catrow['cat_title'],
! 				'S_CAT_DESC' => $catrow['cat_desc'],
! 				// --- Album Category Hierarchy : begin
! 				// --- version <= 1.1.0
! 				'S_CAT_PARENT_OPTIONS' => $s_album_cat_list,
! 				// --- Album Category Hierarchy : end
! 				'VIEW_GUEST' => ( $catrow['cat_view_level'] == ALBUM_GUEST ) ? 'selected="selected"' : '',
! 				'VIEW_REG' => ( $catrow['cat_view_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 				'VIEW_PRIVATE' => ( $catrow['cat_view_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 				'VIEW_MOD' => ( $catrow['cat_view_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 				'VIEW_ADMIN' => ( $catrow['cat_view_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 				'UPLOAD_GUEST' => ( $catrow['cat_upload_level'] == ALBUM_GUEST ) ? 'selected="selected"' : '',
! 				'UPLOAD_REG' => ( $catrow['cat_upload_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 				'UPLOAD_PRIVATE' => ( $catrow['cat_upload_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 				'UPLOAD_MOD' => ( $catrow['cat_upload_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 				'UPLOAD_ADMIN' => ( $catrow['cat_upload_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 				'RATE_GUEST' => ( $catrow['cat_rate_level'] == ALBUM_GUEST ) ? 'selected="selected"' : '',
! 				'RATE_REG' => ( $catrow['cat_rate_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 				'RATE_PRIVATE' => ( $catrow['cat_rate_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 				'RATE_MOD' => ( $catrow['cat_rate_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 				'RATE_ADMIN' => ( $catrow['cat_rate_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 				'COMMENT_GUEST' => ( $catrow['cat_comment_level'] == ALBUM_GUEST ) ? 'selected="selected"' : '',
! 				'COMMENT_REG' => ( $catrow['cat_comment_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 				'COMMENT_PRIVATE' => ( $catrow['cat_comment_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 				'COMMENT_MOD' => ( $catrow['cat_comment_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 				'COMMENT_ADMIN' => ( $catrow['cat_comment_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 				'EDIT_REG' => ( $catrow['cat_edit_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 				'EDIT_PRIVATE' => ( $catrow['cat_edit_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 				'EDIT_MOD' => ( $catrow['cat_edit_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 				'EDIT_ADMIN' => ( $catrow['cat_edit_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 				'DELETE_REG' => ( $catrow['cat_delete_level'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 				'DELETE_PRIVATE' => ( $catrow['cat_delete_level'] == ALBUM_PRIVATE ) ? 'selected="selected"' : '',
! 				'DELETE_MOD' => ( $catrow['cat_delete_level'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 				'DELETE_ADMIN' => ( $catrow['cat_delete_level'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 				'APPROVAL_DISABLED' => ( $catrow['cat_approval'] == ALBUM_USER ) ? 'selected="selected"' : '',
! 				'APPROVAL_MOD' => ( $catrow['cat_approval'] == ALBUM_MOD ) ? 'selected="selected"' : '',
! 				'APPROVAL_ADMIN' => ( $catrow['cat_approval'] == ALBUM_ADMIN ) ? 'selected="selected"' : '',
  
! 				'S_MODE' => 'edit',
  
! 				'S_GUEST' => ALBUM_GUEST,
! 				'S_USER' => ALBUM_USER,
! 				'S_PRIVATE' => ALBUM_PRIVATE,
! 				'S_MOD' => ALBUM_MOD,
! 				'S_ADMIN' => ALBUM_ADMIN,
  
! 				'L_PANEL_TITLE' => $lang['Edit_Category'] )
! 			);
  
  			$template->pparse( 'body' );
***************
*** 249,264 ****
  			$select_to .= '</select>';
  			// --- Album Category Hierarchy : end
! 			$template->set_filenames( array( 'body' => 'admin/album_cat_delete_body.tpl' )
! 				);
  
! 			$template->assign_vars( array( 'S_ALBUM_ACTION' => append_sid( "admin_album_cat.$phpEx?cat_id=$cat_id" ),
! 					'L_CAT_DELETE' => $lang['Delete_Category'],
! 					'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'],
! 					'L_CAT_TITLE' => $lang['Category_Title'],
! 					'S_CAT_TITLE' => $thiscat['cat_title'],
! 					'L_MOVE_CONTENTS' => $lang['Move_contents'],
! 					'L_MOVE_DELETE' => $lang['Move_and_Delete'],
! 					'S_SELECT_TO' => $select_to )
! 				);
  
  			$template->pparse( 'body' );
--- 238,253 ----
  			$select_to .= '</select>';
  			// --- Album Category Hierarchy : end
! 			$template->set_filenames( array( 'body' => 'admin/album_cat_delete_body.tpl' ));
  
! 			$template->assign_vars( array(
! 				'S_ALBUM_ACTION' => append_sid( "admin_album_cat.$phpEx?cat_id=$cat_id" ),
! 				'L_CAT_DELETE' => $lang['Delete_Category'],
! 				'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'],
! 				'L_CAT_TITLE' => $lang['Category_Title'],
! 				'S_CAT_TITLE' => $thiscat['cat_title'],
! 				'L_MOVE_CONTENTS' => $lang['Move_contents'],
! 				'L_MOVE_DELETE' => $lang['Move_and_Delete'],
! 				'S_SELECT_TO' => $select_to )
! 			);
  
  			$template->pparse( 'body' );
***************
*** 302,357 ****
  			$s_album_cat_list = album_get_tree_option( $cat_parent, ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL );
  			// --- Album Category Hierarchy : end
! 			$template->set_filenames( array( 'body' => 'admin/album_cat_new_body.tpl' )
! 				);
  
! 			$template->assign_vars( array( 'L_ALBUM_CAT_TITLE' => $lang['Album_Categories_Title'],
! 					'L_ALBUM_CAT_EXPLAIN' => $lang['Album_Categories_Explain'],
! 					'S_ALBUM_ACTION' => append_sid( "admin_album_cat.$phpEx" ),
  
! 					'L_CAT_TITLE' => $lang['Category_Title'],
! 					'L_CAT_DESC' => $lang['Category_Desc'],
! 					// --- Album Category Hierarchy : begin
! 					// --- version <= 1.1.0
! 					'L_CAT_PARENT_TITLE' => $lang['Parent_Category'],
! 					// --- Album Category Hierarchy : end
! 					'L_CAT_PERMISSIONS' => $lang['Category_Permissions'],
  
! 					'L_VIEW_LEVEL' => $lang['View_level'],
! 					'L_UPLOAD_LEVEL' => $lang['Upload_level'],
! 					'L_RATE_LEVEL' => $lang['Rate_level'],
! 					'L_COMMENT_LEVEL' => $lang['Comment_level'],
! 					'L_EDIT_LEVEL' => $lang['Edit_level'],
! 					'L_DELETE_LEVEL' => $lang['Delete_level'],
! 					'L_PICS_APPROVAL' => $lang['Pics_Approval'],
! 					'L_GUEST' => $lang['Forum_ALL'],
! 					'L_REG' => $lang['Forum_REG'],
! 					'L_PRIVATE' => $lang['Forum_PRIVATE'],
! 					'L_MOD' => $lang['Forum_MOD'],
! 					'L_ADMIN' => $lang['Forum_ADMIN'],
  
! 					'L_DISABLED' => $lang['Disabled'],
! 					// --- Album Category Hierarchy : begin
! 					// --- version <= 1.1.0
! 					'S_CAT_TITLE' => $cat_title,
! 					'S_CAT_PARENT_OPTIONS' => $s_album_cat_list,
! 					// --- Album Category Hierarchy : end
! 					'VIEW_GUEST' => 'selected="selected"',
! 					'UPLOAD_REG' => 'selected="selected"',
! 					'RATE_REG' => 'selected="selected"',
! 					'COMMENT_REG' => 'selected="selected"',
! 					'EDIT_REG' => 'selected="selected"',
! 					'DELETE_MOD' => 'selected="selected"',
! 					'APPROVAL_DISABLED' => 'selected="selected"',
  
! 					'S_MODE' => 'new',
  
! 					'S_GUEST' => ALBUM_GUEST,
! 					'S_USER' => ALBUM_USER,
! 					'S_PRIVATE' => ALBUM_PRIVATE,
! 					'S_MOD' => ALBUM_MOD,
! 					'S_ADMIN' => ALBUM_ADMIN,
  
! 					'L_PANEL_TITLE' => $lang['Create_category'] )
! 				);
  
  			$template->pparse( 'body' );
--- 291,346 ----
  			$s_album_cat_list = album_get_tree_option( $cat_parent, ALBUM_AUTH_VIEW, ALBUM_SELECTBOX_INCLUDE_ALL );
  			// --- Album Category Hierarchy : end
! 			$template->set_filenames( array( 'body' => 'admin/album_cat_new_body.tpl' ) );
  
! 			$template->assign_vars( array(
! 				'L_ALBUM_CAT_TITLE' => $lang['Album_Categories_Title'],
! 				'L_ALBUM_CAT_EXPLAIN' => $lang['Album_Categories_Explain'],
! 				'S_ALBUM_ACTION' => append_sid( "admin_album_cat.$phpEx" ),
  
! 				'L_CAT_TITLE' => $lang['Category_Title'],
! 				'L_CAT_DESC' => $lang['Category_Desc'],
! 				// --- Album Category Hierarchy : begin
! 				// --- version <= 1.1.0
! 				'L_CAT_PARENT_TITLE' => $lang['Parent_Category'],
! 				// --- Album Category Hierarchy : end
! 				'L_CAT_PERMISSIONS' => $lang['Category_Permissions'],
  
! 				'L_VIEW_LEVEL' => $lang['View_level'],
! 				'L_UPLOAD_LEVEL' => $lang['Upload_level'],
! 				'L_RATE_LEVEL' => $lang['Rate_level'],
! 				'L_COMMENT_LEVEL' => $lang['Comment_level'],
! 				'L_EDIT_LEVEL' => $lang['Edit_level'],
! 				'L_DELETE_LEVEL' => $lang['Delete_level'],
! 				'L_PICS_APPROVAL' => $lang['Pics_Approval'],
! 				'L_GUEST' => $lang['Forum_ALL'],
! 				'L_REG' => $lang['Forum_REG'],
! 				'L_PRIVATE' => $lang['Forum_PRIVATE'],
! 				'L_MOD' => $lang['Forum_MOD'],
! 				'L_ADMIN' => $lang['Forum_ADMIN'],
  
! 				'L_DISABLED' => $lang['Disabled'],
! 				// --- Album Category Hierarchy : begin
! 				// --- version <= 1.1.0
! 				'S_CAT_TITLE' => $cat_title,
! 				'S_CAT_PARENT_OPTIONS' => $s_album_cat_list,
! 				// --- Album Category Hierarchy : end
! 				'VIEW_GUEST' => 'selected="selected"',
! 				'UPLOAD_REG' => 'selected="selected"',
! 				'RATE_REG' => 'selected="selected"',
! 				'COMMENT_REG' => 'selected="selected"',
! 				'EDIT_REG' => 'selected="selected"',
! 				'DELETE_MOD' => 'selected="selected"',
! 				'APPROVAL_DISABLED' => 'selected="selected"',
  
! 				'S_MODE' => 'new',
  
! 				'S_GUEST' => ALBUM_GUEST,
! 				'S_USER' => ALBUM_USER,
! 				'S_PRIVATE' => ALBUM_PRIVATE,
! 				'S_MOD' => ALBUM_MOD,
! 				'S_ADMIN' => ALBUM_ADMIN,
  
! 				'L_PANEL_TITLE' => $lang['Create_category'] )
! 			);
  
  			$template->pparse( 'body' );
***************
*** 447,460 ****
  
  		if ( $target == 0 ) // Delete All
! 			{
! 				// --- Album Category Hierarchy : begin
! 				// --- version <= 1.1.0
! 				// check if the selected category is a parent to another category
! 				$sql = "SELECT cat_id FROM " . ALBUM_CAT_TABLE . " WHERE cat_parent = " . $cat_id . ";";
  			if ( !$result = $db->sql_query( $sql ) )
  			{
  				mx_message_die( GENERAL_ERROR, 'Could not query Album information for existing child categories', '', __LINE__, __FILE__, $sql );
  			}
  			// the selected category is parent to another...proceed
  			if ( $db->sql_numrows( $result ) > 0 )
  			{
--- 436,453 ----
  
  		if ( $target == 0 ) // Delete All
! 		{
! 			// --- Album Category Hierarchy : begin
! 			// --- version <= 1.1.0
! 			// check if the selected category is a parent to another category
! 			$sql = "SELECT cat_id FROM " . ALBUM_CAT_TABLE . " WHERE cat_parent = " . $cat_id . ";";
! 
  			if ( !$result = $db->sql_query( $sql ) )
  			{
  				mx_message_die( GENERAL_ERROR, 'Could not query Album information for existing child categories', '', __LINE__, __FILE__, $sql );
  			}
+ 
+ 			//
  			// the selected category is parent to another...proceed
+ 			//
  			if ( $db->sql_numrows( $result ) > 0 )
  			{
***************
*** 509,517 ****
  					// Delete all physical pic & cached thumbnail files
  					for ( $i = 0; $i < count( $picrow ); $i++ )
! 				{
! 					@unlink( '../' . ALBUM_CACHE_PATH . $picrow[$i]['pic_thumbnail'] );
  
! 					@unlink( '../' . ALBUM_UPLOAD_PATH . $picrow[$i]['pic_filename'] );
! 				}
  
  				$pic_id_sql = '(' . implode( ',', $pic_id_row ) . ')';
--- 502,510 ----
  					// Delete all physical pic & cached thumbnail files
  					for ( $i = 0; $i < count( $picrow ); $i++ )
! 					{
! 						@unlink( '../' . ALBUM_CACHE_PATH . $picrow[$i]['pic_thumbnail'] );
  
! 						@unlink( '../' . ALBUM_UPLOAD_PATH . $picrow[$i]['pic_filename'] );
! 					}
  
  				$pic_id_sql = '(' . implode( ',', $pic_id_row ) . ')';
***************
*** 560,567 ****
  		}
  		else // Move content...
! 			{
! 				$sql = "UPDATE " . ALBUM_TABLE . "
! 					SET pic_cat_id = '$target'
! 					WHERE pic_cat_id = '$cat_id'";
  
  			if ( !$result = $db->sql_query( $sql ) )
--- 553,560 ----
  		}
  		else // Move content...
! 		{
! 			$sql = "UPDATE " . ALBUM_TABLE . "
! 				SET pic_cat_id = '$target'
! 				WHERE pic_cat_id = '$cat_id'";
  
  			if ( !$result = $db->sql_query( $sql ) )
***************
*** 585,590 ****
  	}
  }
- 
- /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
- 
  ?>
\ No newline at end of file
--- 578,580 ----

Index: admin_album_personal.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_personal.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_album_personal.php	2 May 2006 23:29:32 -0000	1.8
--- admin_album_personal.php	30 Jun 2006 21:10:55 -0000	1.9
***************
*** 9,12 ****
--- 9,14 ----
  */
  
+ /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
+ 
  define( 'IN_PORTAL', 1 );
  
***************
*** 25,35 ****
  require( $mx_root_path . 'admin/pagestart.' . $phpEx );
  include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
! include_once( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  
  if ( !isset( $HTTP_POST_VARS['submit'] ) )
  {
! 	$template->set_filenames( array( 'body' => 'admin/album_personal_body.tpl' )
! 		);
  	// Get the list of phpBB usergroups
  	$sql = "SELECT group_id, group_name
  			FROM " . GROUPS_TABLE . "
--- 27,50 ----
  require( $mx_root_path . 'admin/pagestart.' . $phpEx );
  include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
! 
! // **********************************************************************
! // Read language definition
! // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
! {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
! }
! else
! {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
! }
  
  if ( !isset( $HTTP_POST_VARS['submit'] ) )
  {
! 	$template->set_filenames( array( 'body' => 'admin/album_personal_body.tpl' ) );
! 
! 	//
  	// Get the list of phpBB usergroups
+ 	//
  	$sql = "SELECT group_id, group_name
  			FROM " . GROUPS_TABLE . "
***************
*** 45,49 ****
--- 60,67 ----
  		$groupdata[] = $row;
  	}
+ 
+ 	//
  	// Get the current album settings for non created personal galleries
+ 	//
  	$sql = "SELECT *
  			FROM " . ALBUM_CONFIG_TABLE . "
***************
*** 88,144 ****
  		// --- added
  		$template->assign_block_vars( 'creation_grouprow', array(
! 				// --- Album Category Hierarchy : end
! 				'GROUP_ID' => $groupdata[$i]['group_id'],
! 				'GROUP_NAME' => $groupdata[$i]['group_name'],
! 				'PRIVATE_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $private_groups ) ) ? 'checked="checked"' : ''
! 				) // end array
! 			);
  		// --- Album Category Hierarchy : begin
  		// --- version : 1.1.0beta6
! 		$template->assign_block_vars( 'grouprow', array( 'GROUP_ID' => $groupdata[$i]['group_id'],
! 				'GROUP_NAME' => $groupdata[$i]['group_name'],
! 
! 				'VIEW_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $view_groups ) ) ? 'checked="checked"' : '',
! 
! 				'UPLOAD_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $upload_groups ) ) ? 'checked="checked"' : '',
! 
! 				'RATE_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $rate_groups ) ) ? 'checked="checked"' : '',
! 
! 				'COMMENT_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $comment_groups ) ) ? 'checked="checked"' : '',
! 
! 				'EDIT_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $edit_groups ) ) ? 'checked="checked"' : '',
! 
! 				'DELETE_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $delete_groups ) ) ? 'checked="checked"' : '',
! 
! 				'MODERATOR_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $moderator_groups ) ) ? 'checked="checked"' : '' )
! 			);
  		// --- Album Category Hierarchy : end
  	}
  
! 	$template->assign_vars( array( 'L_ALBUM_PERSONAL_TITLE' => $lang['Album_personal_gallery_title'],
! 			'L_ALBUM_PERSONAL_EXPLAIN' => $lang['Album_personal_gallery_explain'],
! 			// --- Album Category Hierarchy : begin
! 			// --- version : 1.1.0beta6
! 			'L_ALBUM_AUTH_EXPLAIN' => $lang['Album_Personal_Auth_Explain'],
! 			// --- Album Category Hierarchy : end
! 			'L_SUBMIT' => $lang['Submit'],
! 			'L_RESET' => $lang['Reset'],
! 			'L_GROUP_CONTROL' => $lang['Auth_Control_Group'],
! 			'L_GROUPS' => $lang['Usergroups'],
! 			// --- Album Category Hierarchy : begin
! 			// --- version : 1.1.0beta6
! 			'L_VIEW' => $lang['View'],
! 			'L_UPLOAD' => $lang['Upload'],
! 			'L_RATE' => $lang['Rate'],
! 			'L_COMMENT' => $lang['Comment'],
! 			'L_EDIT' => $lang['Edit'],
! 			'L_DELETE' => $lang['Delete'],
  
! 			'L_IS_MODERATOR' => $lang['Is_Moderator'],
! 			// --- Album Category Hierarchy : end
! 			'L_PRIVATE_ACCESS' => $lang['Private_access'],
! 			'S_ALBUM_ACTION' => append_sid( 'admin_album_personal.' . $phpEx )
! 			)
! 		);
  
  	$template->pparse( 'body' );
--- 106,155 ----
  		// --- added
  		$template->assign_block_vars( 'creation_grouprow', array(
! 			// --- Album Category Hierarchy : end
! 			'GROUP_ID' => $groupdata[$i]['group_id'],
! 			'GROUP_NAME' => $groupdata[$i]['group_name'],
! 			'PRIVATE_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $private_groups ) ) ? 'checked="checked"' : ''
! 		));
  		// --- Album Category Hierarchy : begin
  		// --- version : 1.1.0beta6
! 		$template->assign_block_vars( 'grouprow', array(
! 			'GROUP_ID' => $groupdata[$i]['group_id'],
! 			'GROUP_NAME' => $groupdata[$i]['group_name'],
! 			'VIEW_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $view_groups ) ) ? 'checked="checked"' : '',
! 			'UPLOAD_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $upload_groups ) ) ? 'checked="checked"' : '',
! 			'RATE_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $rate_groups ) ) ? 'checked="checked"' : '',
! 			'COMMENT_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $comment_groups ) ) ? 'checked="checked"' : '',
! 			'EDIT_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $edit_groups ) ) ? 'checked="checked"' : '',
! 			'DELETE_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $delete_groups ) ) ? 'checked="checked"' : '',
! 			'MODERATOR_CHECKED' => ( in_array( $groupdata[$i]['group_id'], $moderator_groups ) ) ? 'checked="checked"' : '' )
! 		);
  		// --- Album Category Hierarchy : end
  	}
  
! 	$template->assign_vars( array(
! 		'L_ALBUM_PERSONAL_TITLE' => $lang['Album_personal_gallery_title'],
! 		'L_ALBUM_PERSONAL_EXPLAIN' => $lang['Album_personal_gallery_explain'],
! 		// --- Album Category Hierarchy : begin
! 		// --- version : 1.1.0beta6
! 		'L_ALBUM_AUTH_EXPLAIN' => $lang['Album_Personal_Auth_Explain'],
! 		// --- Album Category Hierarchy : end
! 		'L_SUBMIT' => $lang['Submit'],
! 		'L_RESET' => $lang['Reset'],
! 		'L_GROUP_CONTROL' => $lang['Auth_Control_Group'],
! 		'L_GROUPS' => $lang['Usergroups'],
! 		// --- Album Category Hierarchy : begin
! 		// --- version : 1.1.0beta6
! 		'L_VIEW' => $lang['View'],
! 		'L_UPLOAD' => $lang['Upload'],
! 		'L_RATE' => $lang['Rate'],
! 		'L_COMMENT' => $lang['Comment'],
! 		'L_EDIT' => $lang['Edit'],
! 		'L_DELETE' => $lang['Delete'],
  
! 		'L_IS_MODERATOR' => $lang['Is_Moderator'],
! 		// --- Album Category Hierarchy : end
! 		'L_PRIVATE_ACCESS' => $lang['Private_access'],
! 		'S_ALBUM_ACTION' => append_sid( 'admin_album_personal.' . $phpEx )
! 	));
  
  	$template->pparse( 'body' );
***************
*** 185,190 ****
  	mx_message_die( GENERAL_MESSAGE, $message );
  }
- 
- /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
- 
  ?>
\ No newline at end of file
--- 196,198 ----

Index: admin_album_config.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_config.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_album_config.php	2 May 2006 23:29:32 -0000	1.8
--- admin_album_config.php	30 Jun 2006 21:10:55 -0000	1.9
***************
*** 9,12 ****
--- 9,14 ----
  */
  
+ /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
+ 
  define( 'IN_PORTAL', 1 );
  
***************
*** 18,23 ****
  }
  
  // Let's set the root dir for phpBB
! 
  $module_root_path = './../';
  $mx_root_path = './../../../';
--- 20,26 ----
  }
  
+ //
  // Let's set the root dir for phpBB
! //
  $module_root_path = './../';
  $mx_root_path = './../../../';
***************
*** 30,37 ****
  // ------------------------------
  include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
- include_once( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  
! // Pull all config data
  
  $sql = "SELECT * FROM " . ALBUM_CONFIG_TABLE;
  if ( !$result = $db->sql_query( $sql ) )
--- 33,52 ----
  // ------------------------------
  include_once( $module_root_path . 'album_mod/album_common.' . $phpEx );
  
! // **********************************************************************
! // Read language definition
! // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
! {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
! }
! else
! {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
! }
  
+ //
+ // Pull all config data
+ //
  $sql = "SELECT * FROM " . ALBUM_CONFIG_TABLE;
  if ( !$result = $db->sql_query( $sql ) )
***************
*** 69,305 ****
  }
  
! $template->set_filenames( array( "body" => "admin/album_config_body.tpl" )
! 	);
  
! $template->assign_vars( array( 'L_ALBUM_CONFIG' => $lang['Album_config'],
! 		'L_ALBUM_CONFIG_EXPLAIN' => $lang['Album_config_explain'],
! 		'S_ALBUM_CONFIG_ACTION' => append_sid( 'admin_album_config.' . $phpEx ),
  
! 		'MAX_PICS' => $new['max_pics'],
! 		'MAX_FILE_SIZE' => $new['max_file_size'],
! 		'MAX_WIDTH' => $new['max_width'],
! 		'MAX_HEIGHT' => $new['max_height'],
! 		'ROWS_PER_PAGE' => $new['rows_per_page'],
! 		'COLS_PER_PAGE' => $new['cols_per_page'],
! 		'THUMBNAIL_QUALITY' => $new['thumbnail_quality'],
! 		'THUMBNAIL_SIZE' => $new['thumbnail_size'],
! 		'PERSONAL_GALLERY_LIMIT' => $new['personal_gallery_limit'],
  
! 		'USER_PICS_LIMIT' => $new['user_pics_limit'],
! 		'MOD_PICS_LIMIT' => $new['mod_pics_limit'],
  
! 		'THUMBNAIL_CACHE_ENABLED' => ( $new['thumbnail_cache'] == 1 ) ? 'checked="checked"' : '',
! 		'THUMBNAIL_CACHE_DISABLED' => ( $new['thumbnail_cache'] == 0 ) ? 'checked="checked"' : '',
! 		// --- Album Category Hierarchy : begin
! 		// --- version : <= 1.1.0
! 		'INDEX_SHOW_SUBCATS_ENABLED' => ( $new['show_index_subcats'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_SHOW_SUBCATS_DISABLED' => ( $new['show_index_subcats'] == 0 ) ? 'checked="checked"' : '',
! 		'INDEX_THUMB_ENABLED' => ( $new['show_index_thumb'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_THUMB_DISABLED' => ( $new['show_index_thumb'] == 0 ) ? 'checked="checked"' : '',
! 		'INDEX_TOTAL_PICS_ENABLED' => ( $new['show_index_total_pics'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_TOTAL_PICS_DISABLED' => ( $new['show_index_total_pics'] == 0 ) ? 'checked="checked"' : '',
! 		'INDEX_TOTAL_COMMENTS_ENABLED' => ( $new['show_index_total_comments'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_TOTAL_COMMENTS_DISABLED' => ( $new['show_index_total_comments'] == 0 ) ? 'checked="checked"' : '',
! 		'INDEX_PICS_ENABLED' => ( $new['show_index_pics'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_PICS_DISABLED' => ( $new['show_index_pics'] == 0 ) ? 'checked="checked"' : '',
! 		'INDEX_COMMENTS_ENABLED' => ( $new['show_index_comments'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_COMMENTS_DISABLED' => ( $new['show_index_comments'] == 0 ) ? 'checked="checked"' : '',
! 		'INDEX_LAST_COMMENT_ENABLED' => ( $new['show_index_last_comment'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_LAST_COMMENT_DISABLED' => ( $new['show_index_last_comment'] == 0 ) ? 'checked="checked"' : '',
! 		'INDEX_LAST_PIC_ENABLED' => ( $new['show_index_last_pic'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_LAST_PIC_DISABLED' => ( $new['show_index_last_pic'] == 0 ) ? 'checked="checked"' : '',
! 		'INDEX_LINEBREAK_ENABLED' => ( $new['line_break_subcats'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_LINEBREAK_DISABLED' => ( $new['line_break_subcats'] == 0 ) ? 'checked="checked"' : '',
! 		'SHOW_RECENT_IN_SUBCATS_ENABLED' => ( $new['show_recent_in_subcats'] == 1 ) ? 'checked="checked"' : '',
! 		'SHOW_RECENT_IN_SUBCATS_DISABLED' => ( $new['show_recent_in_subcats'] == 0 ) ? 'checked="checked"' : '',
! 		'SHOW_RECENT_INSTEAD_OF_NOPICS_ENABLED' => ( $new['show_recent_instead_of_nopics'] == 1 ) ? 'checked="checked"' : '',
! 		'SHOW_RECENT_INSTEAD_OF_NOPICS_DISABLED' => ( $new['show_recent_instead_of_nopics'] == 0 ) ? 'checked="checked"' : '',
  
! 		'INDEX_SHOW_PERSONAL_GALLERY_LINK_ENABLED' => ( $new['show_personal_gallery_link'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_SHOW_PERSONAL_GALLERY_LINK_DISABLED' => ( $new['show_personal_gallery_link'] == 0 ) ? 'checked="checked"' : '',
  
! 		'ALBUM_CATEGORY_SORTING_ID' => ( $new['album_category_sorting'] == 'cat_id' ) ? 'checked="checked"' : '',
! 		'ALBUM_CATEGORY_SORTING_NAME' => ( $new['album_category_sorting'] == 'cat_title' ) ? 'checked="checked"' : '',
! 		'ALBUM_CATEGORY_SORTING_ORDER' => ( $new['album_category_sorting'] == 'cat_order' ) ? 'checked="checked"' : '',
  
! 		'ALBUM_CATEGORY_SORTING_ASC' => ( $new['album_category_sorting_direction'] == 'ASC' ) ? 'checked="checked"' : '',
! 		'ALBUM_CATEGORY_SORTING_DESC' => ( $new['album_category_sorting_direction'] == 'DESC' ) ? 'checked="checked"' : '',
  
! 		'PERSONAL_SHOW_RECENT_IN_SUBCATS_ENABLED' => ( $new['personal_show_recent_in_subcats'] == 1 ) ? 'checked="checked"' : '',
! 		'PERSONAL_SHOW_RECENT_IN_SUBCATS_DISABLED' => ( $new['personal_show_recent_in_subcats'] == 0 ) ? 'checked="checked"' : '',
! 		'PERSONAL_SHOW_RECENT_INSTEAD_OF_NOPICS_ENABLED' => ( $new['personal_show_recent_instead_of_nopics'] == 1 ) ? 'checked="checked"' : '',
! 		'PERSONAL_SHOW_RECENT_INSTEAD_OF_NOPICS_DISABLED' => ( $new['personal_show_recent_instead_of_nopics'] == 0 ) ? 'checked="checked"' : '',
! 		'PERSONAL_MOD_ENABLED' => ( $new['personal_allow_gallery_mod'] == 1 ) ? 'checked="checked"' : '',
! 		'PERSONAL_MOD_DISABLED' => ( $new['personal_allow_gallery_mod'] == 0 ) ? 'checked="checked"' : '',
! 		'PERSONAL_SUBCAT_ENABLED' => ( $new['personal_allow_sub_categories'] == 1 ) ? 'checked="checked"' : '',
! 		'PERSONAL_SUBCAT_DISABLED' => ( $new['personal_allow_sub_categories'] == 0 ) ? 'checked="checked"' : '',
! 		'PERSONAL_SUB_GALLERY_LIMIT' => $new['personal_sub_category_limit'],
! 		'PERSONAL_SHOW_SUBCATS_ENABLED' => ( $new['personal_show_subcats_in_index'] == 1 ) ? 'checked="checked"' : '',
! 		'PERSONAL_SHOW_SUBCATS_DISABLED' => ( $new['personal_show_subcats_in_index'] == 0 ) ? 'checked="checked"' : '',
! 		// --- version : 1.2.0
! 		'ALBUM_DEBUG_MODE_ENABLED' => ( $new['album_debug_mode'] == 1 ) ? 'checked="checked"' : '',
! 		'ALBUM_DEBUG_MODE_DISABLED' => ( $new['album_debug_mode'] == 0 ) ? 'checked="checked"' : '',
! 		'PERSONAL_SHOW_ALL_PICS_ENABLED' => ( $new['show_all_in_personal_gallery'] == 1 ) ? 'checked="checked"' : '',
! 		'PERSONAL_SHOW_ALL_PICS_DISABLED' => ( $new['show_all_in_personal_gallery'] == 0 ) ? 'checked="checked"' : '',
! 		'NEW_PIC_CHECK_INTERVAL' => $new['new_pic_check_interval'],
! 		// --- version : 1.3.0
! 		'INDEX_SUPERCELLS_ENABLED' => ( $new['index_enable_supercells'] == 1 ) ? 'checked="checked"' : '',
! 		'INDEX_SUPERCELLS_DISABLED' => ( $new['index_enable_supercells'] == 0 ) ? 'checked="checked"' : '',
! 		// --- Album Category Hierarchy : end
! 		'JPG_ENABLED' => ( $new['jpg_allowed'] == 1 ) ? 'checked="checked"' : '',
! 		'JPG_DISABLED' => ( $new['jpg_allowed'] == 0 ) ? 'checked="checked"' : '',
  
! 		'PNG_ENABLED' => ( $new['png_allowed'] == 1 ) ? 'checked="checked"' : '',
! 		'PNG_DISABLED' => ( $new['png_allowed'] == 0 ) ? 'checked="checked"' : '',
  
! 		'GIF_ENABLED' => ( $new['gif_allowed'] == 1 ) ? 'checked="checked"' : '',
! 		'GIF_DISABLED' => ( $new['gif_allowed'] == 0 ) ? 'checked="checked"' : '',
  
! 		'PIC_DESC_MAX_LENGTH' => $new['desc_length'],
  
! 		'HOTLINK_PREVENT_ENABLED' => ( $new['hotlink_prevent'] == 1 ) ? 'checked="checked"' : '',
! 		'HOTLINK_PREVENT_DISABLED' => ( $new['hotlink_prevent'] == 0 ) ? 'checked="checked"' : '',
  
! 		'HOTLINK_ALLOWED' => $new['hotlink_allowed'],
  
! 		'PERSONAL_GALLERY_USER' => ( $new['personal_gallery'] == ALBUM_USER ) ? 'checked="checked"' : '',
! 		'PERSONAL_GALLERY_PRIVATE' => ( $new['personal_gallery'] == ALBUM_PRIVATE ) ? 'checked="checked"' : '',
! 		'PERSONAL_GALLERY_ADMIN' => ( $new['personal_gallery'] == ALBUM_ADMIN ) ? 'checked="checked"' : '',
  
! 		'PERSONAL_GALLERY_VIEW_ALL' => ( $new['personal_gallery_view'] == ALBUM_GUEST ) ? 'checked="checked"' : '',
! 		'PERSONAL_GALLERY_VIEW_REG' => ( $new['personal_gallery_view'] == ALBUM_USER ) ? 'checked="checked"' : '',
! 		'PERSONAL_GALLERY_VIEW_PRIVATE' => ( $new['personal_gallery_view'] == ALBUM_PRIVATE ) ? 'checked="checked"' : '',
  
! 		'RATE_ENABLED' => ( $new['rate'] == 1 ) ? 'checked="checked"' : '',
! 		'RATE_DISABLED' => ( $new['rate'] == 0 ) ? 'checked="checked"' : '',
  
! 		'RATE_SCALE' => $new['rate_scale'],
  
! 		'COMMENT_ENABLED' => ( $new['comment'] == 1 ) ? 'checked="checked"' : '',
! 		'COMMENT_DISABLED' => ( $new['comment'] == 0 ) ? 'checked="checked"' : '',
  
! 		'NO_GD' => ( $new['gd_version'] == 0 ) ? 'checked="checked"' : '',
! 		'GD_V1' => ( $new['gd_version'] == 1 ) ? 'checked="checked"' : '',
! 		'GD_V2' => ( $new['gd_version'] == 2 ) ? 'checked="checked"' : '',
  
! 		'SORT_TIME' => ( $new['sort_method'] == 'pic_time' ) ? 'selected="selected"' : '',
! 		'SORT_PIC_TITLE' => ( $new['sort_method'] == 'pic_title' ) ? 'selected="selected"' : '',
! 		'SORT_USERNAME' => ( $new['sort_method'] == 'pic_user_id' ) ? 'selected="selected"' : '',
! 		'SORT_VIEW' => ( $new['sort_method'] == 'pic_view_count' ) ? 'selected="selected"' : '',
! 		'SORT_RATING' => ( $new['sort_method'] == 'rating' ) ? 'selected="selected"' : '',
! 		'SORT_COMMENTS' => ( $new['sort_method'] == 'comments' ) ? 'selected="selected"' : '',
! 		'SORT_NEW_COMMENT' => ( $new['sort_method'] == 'new_comment' ) ? 'selected="selected"' : '',
  
! 		'SORT_ASC' => ( $new['sort_order'] == 'ASC' ) ? 'selected="selected"' : '',
! 		'SORT_DESC' => ( $new['sort_order'] == 'DESC' ) ? 'selected="selected"' : '',
  
! 		'FULLPIC_POPUP_ENABLED' => ( $new['fullpic_popup'] == 1 ) ? 'checked="checked"' : '',
! 		'FULLPIC_POPUP_DISABLED' => ( $new['fullpic_popup'] == 0 ) ? 'checked="checked"' : '',
  
! 		'S_GUEST' => ALBUM_GUEST,
! 		'S_USER' => ALBUM_USER,
! 		'S_PRIVATE' => ALBUM_PRIVATE,
! 		'S_MOD' => ALBUM_MOD,
! 		'S_ADMIN' => ALBUM_ADMIN,
  
! 		'L_MAX_PICS' => $lang['Max_pics'],
! 		'L_MAX_FILE_SIZE' => $lang['Max_file_size'],
! 		'L_MAX_WIDTH' => $lang['Max_width'],
! 		'L_MAX_HEIGHT' => $lang['Max_height'],
! 		'L_USER_PICS_LIMIT' => $lang['User_pics_limit'],
! 		'L_MOD_PICS_LIMIT' => $lang['Moderator_pics_limit'],
! 		'L_ROWS_PER_PAGE' => $lang['Rows_per_page'],
! 		'L_COLS_PER_PAGE' => $lang['Cols_per_page'],
! 		'L_MANUAL_THUMBNAIL' => $lang['Manual_thumbnail'],
! 		'L_THUMBNAIL_QUALITY' => $lang['Thumbnail_quality'],
! 		'L_THUMBNAIL_SIZE' => $lang['Thumbnail_size'],
! 		'L_THUMBNAIL_CACHE' => $lang['Thumbnail_cache'],
! 		'L_JPG_ALLOWED' => $lang['JPG_allowed'],
! 		'L_PNG_ALLOWED' => $lang['PNG_allowed'],
! 		'L_GIF_ALLOWED' => $lang['GIF_allowed'],
! 		'L_PIC_DESC_MAX_LENGTH' => $lang['Pic_Desc_Max_Length'],
! 		'L_HOTLINK_PREVENT' => $lang['Hotlink_prevent'],
! 		'L_HOTLINK_ALLOWED' => $lang['Hotlink_allowed'],
! 		'L_PERSONAL_GALLERY' => $lang['Personal_gallery'],
! 		'L_PERSONAL_GALLERY_LIMIT' => $lang['Personal_gallery_limit'],
! 		'L_PERSONAL_GALLERY_VIEW' => $lang['Personal_gallery_view'],
! 		'L_RATE_SYSTEM' => $lang['Rate_system'],
! 		'L_RATE_SCALE' => $lang['Rate_Scale'],
! 		'L_COMMENT_SYSTEM' => $lang['Comment_system'],
! 		'L_GD_VERSION' => $lang['GD_version'],
! 		'L_THUMBNAIL_SETTINGS' => $lang['Thumbnail_Settings'],
! 		'L_EXTRA_SETTINGS' => $lang['Extra_Settings'],
! 		'L_DEFAULT_SORT_METHOD' => $lang['Default_Sort_Method'],
! 		'L_TIME' => $lang['Time'],
! 		'L_PIC_TITLE' => $lang['Pic_Title'],
! 		'L_USERNAME' => $lang['Sort_Username'],
! 		'L_VIEW' => $lang['View'],
! 		'L_RATING' => $lang['Rating'],
! 		'L_COMMENTS' => $lang['Comments'],
! 		'L_NEW_COMMENT' => $lang['New_Comment'],
! 		'L_DEFAULT_SORT_ORDER' => $lang['Default_Sort_Order'],
! 		'L_ASC' => $lang['Sort_Ascending'],
! 		'L_DESC' => $lang['Sort_Descending'],
! 		'L_FULLPIC_POPUP' => $lang['Fullpic_Popup'],
! 		'L_GUEST' => $lang['Forum_ALL'],
! 		'L_REG' => $lang['Forum_REG'],
! 		'L_PRIVATE' => $lang['Forum_PRIVATE'],
! 		'L_MOD' => $lang['Forum_MOD'],
! 		'L_ADMIN' => $lang['Forum_ADMIN'],
! 		// --- Album Category Hierarchy : begin
! 		// --- version : <= 1.1.0
! 		'L_ALBUM_INDEX_SETTINGS' => $lang['Album_Index_Settings'],
! 		'L_INDEX_SHOW_SUBCATS' => $lang['Show_Index_Subcats'],
! 		'L_INDEX_THUMB' => $lang['Show_Index_Thumb'],
! 		'L_INDEX_TOTAL_PICS' => $lang['Show_Index_Total_Pics'],
! 		'L_INDEX_TOTAL_COMMENTS' => $lang['Show_Index_Total_Comments'],
! 		'L_INDEX_PICS' => $lang['Show_Index_Pics'],
! 		'L_INDEX_COMMENTS' => $lang['Show_Index_Comments'],
! 		'L_INDEX_LAST_COMMENT' => $lang['Show_Index_Last_Comment'],
! 		'L_INDEX_LAST_PIC' => $lang['Show_Index_Last_Pic'],
! 		'L_INDEX_LINEBREAK_SUBCATS' => $lang['Line_Break_Subcats'],
! 		'L_SHOW_RECENT_IN_SUBCATS' => $lang['Show_Recent_In_Subcats'],
! 		'L_SHOW_RECENT_INSTEAD_OF_NOPICS' => $lang['Show_Recent_Instead_of_NoPics'],
  
! 		'L_SHOW_PERSONAL_GALLERY_LINK' => $lang['Show_Personal_Gallery_Link'],
  
! 		'L_ALBUM_CATEGORY_SORTING' => $lang['Album_Category_Sorting'],
! 		'L_ALBUM_CATEGORY_SORTING_ID' => $lang['Album_Category_Sorting_Id'],
! 		'L_ALBUM_CATEGORY_SORTING_NAME' => $lang['Album_Category_Sorting_Name'],
! 		'L_ALBUM_CATEGORY_SORTING_ORDER' => $lang['Album_Category_Sorting_Order'],
  
! 		'L_ALBUM_CATEGORY_DIRECTION' => $lang['Album_Category_Sorting_Direction'],
! 		'L_ALBUM_CATEGORY_SORTING_ASC' => $lang['Album_Category_Sorting_Asc'],
! 		'L_ALBUM_CATEGORY_SORTING_DESC' => $lang['Album_Category_Sorting_Desc'],
  
! 		'L_ALBUM_PERSONAL_GALLERY_SETTINGS' => $lang['Album_Personal_Settings'],
! 		'L_ALBUM_PERSONAL_MODERATOR' => $lang['Personal_Gallery_MOD'],
! 		'L_PERSONAL_SUB_GALLERY_LIMIT' => $lang['Personal_Sub_Cat_Limit'],
! 		'L_PERSONAL_ALLOW_SUB_GATTEGORY' => $lang['User_Can_Create_Personal_SubCats'],
! 		'L_PERSONAL_SHOW_SUBCATS' => $lang['Show_Personal_Sub_Cats'],
! 		'L_PERSONAL_SHOW_RECENT_IN_SUBCATS' => $lang['Show_Recent_In_Personal_Subcats'],
! 		'L_PERSONAL_SHOW_RECENT_INSTEAD_OF_NOPICS' => $lang['Show_Recent_Instead_of_Personal_NoPics'],
! 		// --- version : 1.2.0
! 		'L_ALBUM_DEBUG_MODE' => $lang['Album_debug_mode'],
! 		'L_PERSONAL_SHOW_ALL_PICS' => $lang['Enable_Show_All_Pics'],
  
! 		'L_NEW_PIC_CHECK_INTERVAL' => $lang['New_Pic_Check_Interval'],
! 		'L_NEW_PIC_CHECK_INTERVAL_DESC' => $lang['New_Pic_Check_Interval_Desc'],
! 		// --- version : 1.3.0
! 		'L_ENABLE_SUPERCELLS' => $lang['Enable_Index_Supercells'],
! 		// --- Album Category Hierarchy : end
! 		'L_DISABLED' => $lang['Disabled'],
! 		'L_ENABLED' => $lang['Enabled'],
! 		'L_YES' => $lang['Yes'],
! 		'L_NO' => $lang['No'],
! 		'L_SUBMIT' => $lang['Submit'],
! 		'L_RESET' => $lang['Reset'] )
! 	);
  
  $template->pparse( "body" );
  
  include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );
- 
- /* Powered by Photo Album v2.x.x (c) 2002-2003 Smartor */
- 
  ?>
\ No newline at end of file
--- 84,317 ----
  }
  
! $template->set_filenames( array( "body" => "admin/album_config_body.tpl" ));
  
! $template->assign_vars( array(
! 	'L_ALBUM_CONFIG' => $lang['Album_config'],
! 	'L_ALBUM_CONFIG_EXPLAIN' => $lang['Album_config_explain'],
! 	'S_ALBUM_CONFIG_ACTION' => append_sid( 'admin_album_config.' . $phpEx ),
  
! 	'MAX_PICS' => $new['max_pics'],
! 	'MAX_FILE_SIZE' => $new['max_file_size'],
! 	'MAX_WIDTH' => $new['max_width'],
! 	'MAX_HEIGHT' => $new['max_height'],
! 	'ROWS_PER_PAGE' => $new['rows_per_page'],
! 	'COLS_PER_PAGE' => $new['cols_per_page'],
! 	'THUMBNAIL_QUALITY' => $new['thumbnail_quality'],
! 	'THUMBNAIL_SIZE' => $new['thumbnail_size'],
! 	'PERSONAL_GALLERY_LIMIT' => $new['personal_gallery_limit'],
  
! 	'USER_PICS_LIMIT' => $new['user_pics_limit'],
! 	'MOD_PICS_LIMIT' => $new['mod_pics_limit'],
  
! 	'THUMBNAIL_CACHE_ENABLED' => ( $new['thumbnail_cache'] == 1 ) ? 'checked="checked"' : '',
! 	'THUMBNAIL_CACHE_DISABLED' => ( $new['thumbnail_cache'] == 0 ) ? 'checked="checked"' : '',
! 	// --- Album Category Hierarchy : begin
! 	// --- version : <= 1.1.0
! 	'INDEX_SHOW_SUBCATS_ENABLED' => ( $new['show_index_subcats'] == 1 ) ? 'checked="checked"' : '',
! 	'INDEX_SHOW_SUBCATS_DISABLED' => ( $new['show_index_subcats'] == 0 ) ? 'checked="checked"' : '',
! 	'INDEX_THUMB_ENABLED' => ( $new['show_index_thumb'] == 1 ) ? 'checked="checked"' : '',
! 	'INDEX_THUMB_DISABLED' => ( $new['show_index_thumb'] == 0 ) ? 'checked="checked"' : '',
! 	'INDEX_TOTAL_PICS_ENABLED' => ( $new['show_index_total_pics'] == 1 ) ? 'checked="checked"' : '',
! 	'INDEX_TOTAL_PICS_DISABLED' => ( $new['show_index_total_pics'] == 0 ) ? 'checked="checked"' : '',
! 	'INDEX_TOTAL_COMMENTS_ENABLED' => ( $new['show_index_total_comments'] == 1 ) ? 'checked="checked"' : '',
! 	'INDEX_TOTAL_COMMENTS_DISABLED' => ( $new['show_index_total_comments'] == 0 ) ? 'checked="checked"' : '',
! 	'INDEX_PICS_ENABLED' => ( $new['show_index_pics'] == 1 ) ? 'checked="checked"' : '',
! 	'INDEX_PICS_DISABLED' => ( $new['show_index_pics'] == 0 ) ? 'checked="checked"' : '',
! 	'INDEX_COMMENTS_ENABLED' => ( $new['show_index_comments'] == 1 ) ? 'checked="checked"' : '',
! 	'INDEX_COMMENTS_DISABLED' => ( $new['show_index_comments'] == 0 ) ? 'checked="checked"' : '',
! 	'INDEX_LAST_COMMENT_ENABLED' => ( $new['show_index_last_comment'] == 1 ) ? 'checked="checked"' : '',
! 	'INDEX_LAST_COMMENT_DISABLED' => ( $new['show_index_last_comment'] == 0 ) ? 'checked="checked"' : '',
! 	'INDEX_LAST_PIC_ENABLED' => ( $new['show_index_last_pic'] == 1 ) ? 'checked="checked"' : '',
! 	'INDEX_LAST_PIC_DISABLED' => ( $new['show_index_last_pic'] == 0 ) ? 'checked="checked"' : '',
! 	'INDEX_LINEBREAK_ENABLED' => ( $new['line_break_subcats'] == 1 ) ? 'checked="checked"' : '',
! 	'INDEX_LINEBREAK_DISABLED' => ( $new['line_break_subcats'] == 0 ) ? 'checked="checked"' : '',
! 	'SHOW_RECENT_IN_SUBCATS_ENABLED' => ( $new['show_recent_in_subcats'] == 1 ) ? 'checked="checked"' : '',
! 	'SHOW_RECENT_IN_SUBCATS_DISABLED' => ( $new['show_recent_in_subcats'] == 0 ) ? 'checked="checked"' : '',
! 	'SHOW_RECENT_INSTEAD_OF_NOPICS_ENABLED' => ( $new['show_recent_instead_of_nopics'] == 1 ) ? 'checked="checked"' : '',
! 	'SHOW_RECENT_INSTEAD_OF_NOPICS_DISABLED' => ( $new['show_recent_instead_of_nopics'] == 0 ) ? 'check...
 
[truncated message content]