- tackle some usability issues

- fix bug #3147 - added the lock-images made by SHS` - fixed MSSQL errors (adding the correct ESCAPE sequence) git-svn-id: file:///svn/phpbb/trunk@6161 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2006-07-09 16:23:57 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2006-07-09 16:23:57 +0000
commit: 46af817cb058e2eecd89081af4a40075426a32ef (patch)
tree: d27156cb086223b91b8c67f23db969a980e1b7b8 /phpBB/includes/acp
parent: 455add06f29400af3176eea7c4958ed772934460 (diff)
download: forums-46af817cb058e2eecd89081af4a40075426a32ef.tar
forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.gz
forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.bz2
forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.xz
forums-46af817cb058e2eecd89081af4a40075426a32ef.zip
7 files changed, 70 insertions, 32 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index ab416068c4..109d08163b 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -71,6 +71,14 @@ class acp_board
 						'allow_sig_smilies'		=> array('lang' => 'ALLOW_SIG_SMILIES',		'type' => 'radio:yes_no', 'explain' => false),
 						'allow_nocensors'		=> array('lang' => 'ALLOW_NO_CENSORS',		'type' => 'radio:yes_no', 'explain' => true),
 						'allow_bookmarks'		=> array('lang' => 'ALLOW_BOOKMARKS',		'type' => 'radio:yes_no', 'explain' => true),
+
+						'legend2'				=> 'ACP_LOAD_SETTINGS',
+						'load_birthdays'		=> array('lang' => 'YES_BIRTHDAYS',		'type' => 'radio:yes_no', 'explain' => false),
+						'load_moderators'		=> array('lang' => 'YES_MODERATORS',	'type' => 'radio:yes_no', 'explain' => false),
+						'load_jumpbox'			=> array('lang' => 'YES_JUMPBOX',		'type' => 'radio:yes_no', 'explain' => false),
+						'load_cpf_memberlist'	=> array('lang' => 'LOAD_CPF_MEMBERLIST',	'type' => 'radio:yes_no', 'explain' => false),
+						'load_cpf_viewprofile'	=> array('lang' => 'LOAD_CPF_VIEWPROFILE',	'type' => 'radio:yes_no', 'explain' => false),
+						'load_cpf_viewtopic'	=> array('lang' => 'LOAD_CPF_VIEWTOPIC',	'type' => 'radio:yes_no', 'explain' => false),
 					)
 				);
 			break;
@@ -111,7 +119,6 @@ class acp_board
 						'auth_bbcode_pm'		=> array('lang' => 'ALLOW_BBCODE_PM',		'type' => 'radio:yes_no', 'explain' => false),
 						'auth_smilies_pm'		=> array('lang' => 'ALLOW_SMILIES_PM',		'type' => 'radio:yes_no', 'explain' => false),
 						'allow_pm_attach'		=> array('lang' => 'ALLOW_PM_ATTACHMENTS',	'type' => 'radio:yes_no', 'explain' => false),
-						'auth_download_pm'		=> array('lang' => 'ALLOW_DOWNLOAD_PM',		'type' => 'radio:yes_no', 'explain' => false),
 						'allow_sig_pm'			=> array('lang' => 'ALLOW_SIG_PM',			'type' => 'radio:yes_no', 'explain' => false),
 						'print_pm'				=> array('lang' => 'ALLOW_PRINT_PM',		'type' => 'radio:yes_no', 'explain' => false),
 						'forward_pm'			=> array('lang' => 'ALLOW_FORWARD_PM',		'type' => 'radio:yes_no', 'explain' => false),
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 257ad8e333..17a843f1a6 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -111,6 +111,7 @@ class acp_forums
 						'enable_indexing'		=> request_var('enable_indexing',true), 
 						'enable_icons'			=> request_var('enable_icons', false),
 						'enable_prune'			=> request_var('enable_prune', false),
+						'enable_post_review'	=> request_var('enable_post_review', true),
 						'prune_days'			=> request_var('prune_days', 7),
 						'prune_viewed'			=> request_var('prune_viewed', 7),
 						'prune_freq'			=> request_var('prune_freq', 1),
@@ -318,12 +319,13 @@ class acp_forums
 
 				if ($update)
 				{
-					$forum_data['forum_flags']	= 0;
-					$forum_data['forum_flags']	+= (request_var('forum_link_track', false)) ? 1 : 0;
-					$forum_data['forum_flags']	+= (request_var('prune_old_polls', false)) ? 2 : 0;
-					$forum_data['forum_flags']	+= (request_var('prune_announce', false)) ? 4 : 0;
-					$forum_data['forum_flags']	+= (request_var('prune_sticky', false)) ? 8 : 0;
-					$forum_data['forum_flags']	+= ($forum_data['show_active']) ? 16 : 0;
+					$forum_data['forum_flags'] = 0;
+					$forum_data['forum_flags'] += (request_var('forum_link_track', false)) ? 1 : 0;
+					$forum_data['forum_flags'] += (request_var('prune_old_polls', false)) ? 2 : 0;
+					$forum_data['forum_flags'] += (request_var('prune_announce', false)) ? 4 : 0;
+					$forum_data['forum_flags'] += (request_var('prune_sticky', false)) ? 8 : 0;
+					$forum_data['forum_flags'] += ($forum_data['show_active']) ? 16 : 0;
+					$forum_data['forum_flags'] += (request_var('enable_post_review', true)) ? 32 : 0;
 				}
 
 				// Show form to create/modify a forum
@@ -520,15 +522,16 @@ class acp_forums
 					'S_FORUM_ORIG_POST'			=> (isset($old_forum_type) && $old_forum_type == FORUM_POST) ? true : false,
 					'S_FORUM_LINK'				=> ($forum_data['forum_type'] == FORUM_LINK) ? true : false,
 					'S_FORUM_CAT'				=> ($forum_data['forum_type'] == FORUM_CAT) ? true : false,
-					'S_FORUM_LINK_TRACK'		=> ($forum_data['forum_flags'] & 1) ? true : false,
 					'S_ENABLE_INDEXING'			=> ($forum_data['enable_indexing']) ? true : false,
 					'S_TOPIC_ICONS'				=> ($forum_data['enable_icons']) ? true : false,
 					'S_DISPLAY_ON_INDEX'		=> ($forum_data['display_on_index']) ? true : false,
 					'S_PRUNE_ENABLE'			=> ($forum_data['enable_prune']) ? true : false,
+					'S_FORUM_LINK_TRACK'		=> ($forum_data['forum_flags'] & 1) ? true : false,
 					'S_PRUNE_OLD_POLLS'			=> ($forum_data['forum_flags'] & 2) ? true : false,
 					'S_PRUNE_ANNOUNCE'			=> ($forum_data['forum_flags'] & 4) ? true : false,
 					'S_PRUNE_STICKY'			=> ($forum_data['forum_flags'] & 8) ? true : false,
 					'S_DISPLAY_ACTIVE_TOPICS'	=> ($forum_data['forum_flags'] & 16) ? true : false,
+					'S_ENABLE_POST_REVIEW'		=> ($forum_data['forum_flags'] & 32) ? true : false,
 					)
 				);
 
@@ -757,12 +760,14 @@ class acp_forums
 		// 4 = prune announcements
 		// 8 = prune stickies
 		// 16 = show active topics
+		// 32 = enable post review
 		$forum_data['forum_flags'] = 0;
 		$forum_data['forum_flags'] += ($forum_data['forum_link_track']) ? 1 : 0;
 		$forum_data['forum_flags'] += ($forum_data['prune_old_polls']) ? 2 : 0;
 		$forum_data['forum_flags'] += ($forum_data['prune_announce']) ? 4 : 0;
 		$forum_data['forum_flags'] += ($forum_data['prune_sticky']) ? 8 : 0;
 		$forum_data['forum_flags'] += ($forum_data['show_active']) ? 16 : 0;
+		$forum_data['forum_flags'] += ($forum_data['enable_post_review']) ? 32 : 0;
 
 		// Unset data that are not database fields
 		$forum_data_sql = $forum_data;
@@ -772,6 +777,7 @@ class acp_forums
 		unset($forum_data_sql['prune_announce']);
 		unset($forum_data_sql['prune_sticky']);
 		unset($forum_data_sql['show_active']);
+		unset($forum_data_sql['enable_post_review']);
 		unset($forum_data_sql['forum_password_confirm']);
 
 		// What are we going to do tonight Brain? The same thing we do everynight,
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 5aee176524..69757b45f2 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -85,7 +85,7 @@ class acp_groups
 					break;
 				}
 
-				trigger_error($user->lang[$message] . adm_back_link($this->u_action));
+				trigger_error($user->lang[$message] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 			break;
 
 			case 'default':
@@ -134,7 +134,7 @@ class acp_groups
 						group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row);
 					}
 
-					trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action));
+					trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 				}
 				else
 				{
@@ -165,7 +165,7 @@ class acp_groups
 						case 'delete':
 							if (!$auth->acl_get('a_groupdel'))
 							{
-								trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action));
+								trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 							}
 
 							$error = group_delete($group_id, $group_row['group_name']);
@@ -178,7 +178,7 @@ class acp_groups
 
 					if ($error)
 					{
-						trigger_error($user->lang[$error] . adm_back_link($this->u_action));
+						trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 					}
 
 					$message = ($action == 'delete') ? 'GROUP_DELETED' : 'GROUP_USERS_REMOVE';
@@ -204,7 +204,7 @@ class acp_groups
 
 				if (!$name_ary)
 				{
-					trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action));
+					trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 				}
 
 				$name_ary = array_unique(explode("\n", $name_ary));
@@ -212,11 +212,11 @@ class acp_groups
 				// Add user/s to group
 				if ($error = group_user_add($group_id, false, $name_ary, $group_row['group_name'], $default, $leader, 0, $group_row))
 				{
-					trigger_error($user->lang[$error] . adm_back_link($this->u_action));
+					trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 				}
 
 				$message = ($action == 'addleaders') ? 'GROUP_MODS_ADDED' : 'GROUP_USERS_ADDED';
-				trigger_error($user->lang[$message] . adm_back_link($this->u_action));
+				trigger_error($user->lang[$message] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 			break;
 
 			case 'edit':
@@ -607,10 +607,12 @@ class acp_groups
 
 					'S_ON_PAGE'		=> on_page($total_members, $config['topics_per_page'], $start),
 					'PAGINATION'	=> generate_pagination($this->u_action . "&amp;action=$action&amp;g=$group_id", $total_members, $config['topics_per_page'], $start, true),
+					'GROUP_NAME'	=> ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'],
 
 					'U_ACTION'			=> $this->u_action . "&amp;g=$group_id",
 					'U_BACK'			=> $this->u_action,
-					'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=list&amp;field=usernames'))
+					'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=list&amp;field=usernames'),
+					'U_DEFAULT_ALL'		=> "{$this->u_action}&amp;action=default&amp;g=$group_id")
 				);
 
 				foreach ($group_data['leader'] as $row)
@@ -701,7 +703,6 @@ class acp_groups
 				
 				$template->assign_block_vars('groups', array(
 					'U_LIST'		=> "{$this->u_action}&amp;action=list&amp;g=$group_id",
-					'U_DEFAULT'		=> "{$this->u_action}&amp;action=default&amp;g=$group_id",
 					'U_EDIT'		=> "{$this->u_action}&amp;action=edit&amp;g=$group_id",
 					'U_DELETE'		=> ($auth->acl_get('a_groupdel')) ? "{$this->u_action}&amp;action=delete&amp;g=$group_id" : '',
 
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 07aabc672a..8cde981346 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -412,8 +412,10 @@ class acp_main
 			'DBSIZE'			=> $dbsize,
 			'UPLOAD_DIR_SIZE'	=> $upload_dir_size,
 			'GZIP_COMPRESSION'	=> ($config['gzip_compress']) ? $user->lang['ON'] : $user->lang['OFF'],
+			'DATABASE_INFO'		=> $db->sql_server_info(),
 
 			'U_ACTION'			=> append_sid("{$phpbb_admin_path}index.$phpEx"),
+			'U_ADMIN_LOG'		=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=logs&amp;mode=admin'),
 
 			'S_ACTION_OPTIONS'	=> ($auth->acl_get('a_board')) ? $s_action_options : '',
 			)
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index ce14694adf..1d1ef640fe 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -792,9 +792,12 @@ class acp_modules
 			{
 				$this->move_module($module_data['module_id'], $module_data['parent_id']);
 			}
-		
+
+			$update_ary = $module_data;
+			unset($update_ary['module_id']);
+
 			$sql = 'UPDATE ' . MODULES_TABLE . '
-				SET ' . $db->sql_build_array('UPDATE', $module_data) . "
+				SET ' . $db->sql_build_array('UPDATE', $update_ary) . "
 				WHERE module_class = '" . $db->sql_escape($this->module_class) . "'
 					AND module_id = {$module_data['module_id']}";
 			$db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 23743824e1..cbf386b04d 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -82,7 +82,7 @@ parse_css_file = {PARSE_CSS_FILE}
 pagination_sep = \'{PAGINATION_SEP}\'
 ';
 
-		$this->imageset_keys = 'site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10';
+		$this->imageset_keys = 'site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_locked_announce, folder_locked_announce_new, folder_locked_announce_posted, folder_locked_announce_new_posted, folder_locked_global, folder_locked_global_new, folder_locked_global_posted, folder_locked_global_new_posted, folder_locked_sticky, folder_locked_sticky_new, folder_locked_sticky_posted, folder_locked_sticky_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10';
 
 		// Execute overall actions
 		switch ($action)
@@ -183,7 +183,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 					break;
 				}
 
-				$this->frontend('style', array('details', 'export', 'delete'));
+				$this->frontend('style', array('details'), array('export', 'delete'));
 			break;
 
 			case 'template':
@@ -260,7 +260,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 					break;
 				}
 
-				$this->frontend('template', array('cache', 'details', 'refresh', 'edit', 'export', 'delete'));
+				$this->frontend('template', array('edit', 'cache', 'details'), array('refresh', 'export', 'delete'));
 			break;
 
 			case 'theme':
@@ -318,11 +318,11 @@ pagination_sep = \'{PAGINATION_SEP}\'
 					break;
 				}
 
-				$this->frontend('theme', array('details', 'refresh', 'edit', 'export', 'delete'));
+				$this->frontend('theme', array('edit', 'details'), array('refresh', 'export', 'delete'));
 			break;
 
 			case 'imageset':
-				$this->frontend('imageset', array('details', 'edit', 'delete', 'export'));
+				$this->frontend('imageset', array('edit', 'details'), array('export', 'delete'));
 			break;
 		}
 	}
@@ -330,7 +330,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 	/**
 	* Build Frontend with supplied options
 	*/
-	function frontend($mode, $options)
+	function frontend($mode, $options, $actions)
 	{
 		global $user, $template, $db, $config, $phpbb_root_path, $phpEx;
 
@@ -408,12 +408,19 @@ pagination_sep = \'{PAGINATION_SEP}\'
 				$s_options[] = '<a href="' . $this->u_action . "&amp;action=$option&amp;id=" . $row[$mode . '_id'] . '">' . $user->lang[strtoupper($option)] . '</a>';
 			}
 
+			$s_actions = array();
+			foreach ($actions as $option)
+			{
+				$s_actions[] = '<a href="' . $this->u_action . "&amp;action=$option&amp;id=" . $row[$mode . '_id'] . '">' . $user->lang[strtoupper($option)] . '</a>';
+			}
+
 			$template->assign_block_vars('installed', array(
 				'S_DEFAULT_STYLE'		=> ($mode == 'style' && $row['style_id'] == $config['default_style']) ? true : false,
 				'U_EDIT'				=> $this->u_action . '&amp;action=' . (($mode == 'style') ? 'details' : 'edit') . '&amp;id=' . $row[$mode . '_id'],
 				'U_STYLE_ACT_DEACT'		=> $this->u_action . '&amp;action=' . $stylevis . '&amp;id=' . $row[$mode . '_id'],
 				'L_STYLE_ACT_DEACT'		=> $user->lang['STYLE_' . strtoupper($stylevis)],
 				'S_OPTIONS'				=> implode(' | ', $s_options),
+				'S_ACTIONS'				=> implode(' | ', $s_actions),
 				'U_PREVIEW'				=> ($mode == 'style') ? append_sid("{$phpbb_root_path}index.$phpEx", "$mode=" . $row[$mode . '_id']) : '',
 
 				'NAME'					=> $row[$mode . '_name'],
@@ -1272,7 +1279,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 				'forums'		=> array(
 					'forum', 'forum_new', 'forum_locked', 'forum_link', 'sub_forum', 'sub_forum_new',),
 				'folders'	=> array(
-					'folder', 'folder_posted', 'folder_new', 'folder_new_posted', 'folder_hot', 'folder_hot_posted', 'folder_hot_new', 'folder_hot_new_posted', 'folder_locked', 'folder_locked_posted', 'folder_locked_new', 'folder_locked_new_posted', 'folder_sticky', 'folder_sticky_posted', 'folder_sticky_new', 'folder_sticky_new_posted', 'folder_announce', 'folder_announce_posted', 'folder_announce_new', 'folder_announce_new_posted', 'folder_global', 'folder_global_posted', 'folder_global_new', 'folder_global_new_posted',),
+					'folder', 'folder_posted', 'folder_new', 'folder_new_posted', 'folder_hot', 'folder_hot_posted', 'folder_hot_new', 'folder_hot_new_posted', 'folder_locked', 'folder_locked_posted', 'folder_locked_new', 'folder_locked_new_posted', 'folder_locked_announce', 'folder_locked_announce_new', 'folder_locked_announce_posted', 'folder_locked_announce_new_posted', 'folder_locked_global', 'folder_locked_global_new', 'folder_locked_global_posted', 'folder_locked_global_new_posted', 'folder_locked_sticky', 'folder_locked_sticky_new', 'folder_locked_sticky_posted', 'folder_locked_sticky_new_posted', 'folder_sticky', 'folder_sticky_posted', 'folder_sticky_new', 'folder_sticky_new_posted', 'folder_announce', 'folder_announce_posted', 'folder_announce_new', 'folder_announce_new_posted', 'folder_global', 'folder_global_posted', 'folder_global_new', 'folder_global_new_posted',),
 				'polls'		=> array(
 					'poll_left', 'poll_center', 'poll_right',),
 			);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index f6fe02e617..adc5064b67 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1871,9 +1871,15 @@ class acp_users
 				// Select auth options
 				$sql = 'SELECT auth_option, is_local, is_global
 					FROM ' . ACL_OPTIONS_TABLE . "
-					WHERE auth_option LIKE '%\_'
-						AND is_global = 1
-					ORDER BY auth_option";
+					WHERE auth_option LIKE '%\_'";
+
+				if (SQL_LAYER == 'mssql' || SQL_LAYER == 'mssql_odbc')
+				{
+					$sql .= " ESCAPE '\\'";
+				}
+
+				$sql .= 'AND is_global = 1
+					ORDER BY auth_option';
 				$result = $db->sql_query($sql);
 
 				while ($row = $db->sql_fetchrow($result))
@@ -1885,9 +1891,15 @@ class acp_users
 
 				$sql = 'SELECT auth_option, is_local, is_global
 					FROM ' . ACL_OPTIONS_TABLE . "
-					WHERE auth_option LIKE '%\_'
-						AND is_local = 1
-					ORDER BY is_global DESC, auth_option";
+					WHERE auth_option LIKE '%\_'";
+
+				if (SQL_LAYER == 'mssql' || SQL_LAYER == 'mssql_odbc')
+				{
+					$sql .= " ESCAPE '\\'";
+				}
+
+				$sql .= 'AND is_local = 1
+					ORDER BY is_global DESC, auth_option';
 				$result = $db->sql_query($sql);
 
 				while ($row = $db->sql_fetchrow($result))
author	Meik Sievertsen <acydburn@phpbb.com>	2006-07-09 16:23:57 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2006-07-09 16:23:57 +0000
commit	46af817cb058e2eecd89081af4a40075426a32ef (patch)
tree	d27156cb086223b91b8c67f23db969a980e1b7b8 /phpBB/includes/acp
parent	455add06f29400af3176eea7c4958ed772934460 (diff)
download	forums-46af817cb058e2eecd89081af4a40075426a32ef.tar forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.gz forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.bz2 forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.xz forums-46af817cb058e2eecd89081af4a40075426a32ef.zip