- get swatch converted into new acp format

- add page title to ucp pages
- add ability to supress getting the who is online list in page_header() (saves us ideally 1-2 queries on ucp/mcp pages)
- fixing pm rules a bit as well as now having complete author memberships for author_in_group (sender -> is in usergroup -> xxx)


git-svn-id: file:///svn/phpbb/trunk@6054 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/ucp/ucp_attachments.php

@@ -160,6 +160,7 @@ class ucp_attachments
 		);
 
 		$this->tpl_name = 'ucp_attachments';
+		$this->page_title = 'UCP_ATTACHMENTS';
 	}
 }
 

phpBB/includes/ucp/ucp_groups.php

@@ -514,6 +514,8 @@ class ucp_groups
 
 								if (!($error = group_create($group_id, $group_type, $group_name, $group_desc, $group_attributes, $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies)))
 								{
+									$cache->destroy('sql', GROUPS_TABLE);
+
 									$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
 									trigger_error($user->lang[$message] . $return_page);
 								}
@@ -919,6 +921,7 @@ class ucp_groups
 		}
 
 		$this->tpl_name = 'ucp_groups_' . $mode;
+		$this->page_title = 'UCP_GROUPS_' . strtoupper($mode);
 	}
 }
 

phpBB/includes/ucp/ucp_main.php

@@ -181,6 +181,7 @@ class ucp_main
 			case 'subscribed':
 
 				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+
 				$user->add_lang('viewforum');
 
 				$unwatch = (isset($_POST['unwatch'])) ? true : false;
@@ -464,6 +465,7 @@ class ucp_main
 				}
 
 				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+
 				$user->add_lang('viewforum');
 
 				$move_up = request_var('move_up', 0);
@@ -785,6 +787,7 @@ class ucp_main
 
 		// Set desired template
 		$this->tpl_name = 'ucp_main_' . $mode;
+		$this->page_title = 'UCP_MAIN_' . strtoupper($mode);
 	}
 }
 

phpBB/includes/ucp/ucp_pm.php

@@ -126,7 +126,7 @@ class ucp_pm
 				$sql = 'SELECT group_message_limit
 					FROM ' . GROUPS_TABLE . '
 					WHERE group_id = ' . $user->data['group_id'];
-				$result = $db->sql_query($sql);
+				$result = $db->sql_query($sql, 3600);
 				$message_limit = (int) $db->sql_fetchfield('group_message_limit');
 				$db->sql_freeresult($result);
 
@@ -162,7 +162,7 @@ class ucp_pm
 				$sql = 'SELECT group_message_limit
 					FROM ' . GROUPS_TABLE . '
 					WHERE group_id = ' . $user->data['group_id'];
-				$result = $db->sql_query($sql);
+				$result = $db->sql_query($sql, 3600);
 				$message_limit = (int) $db->sql_fetchfield('group_message_limit');
 				$db->sql_freeresult($result);
 
@@ -401,6 +401,7 @@ class ucp_pm
 
 		// Set desired template
 		$this->tpl_name = $tpl_file;
+		$this->page_title = 'UCP_PM_' . strtoupper($mode);
 	}
 }
 

phpBB/includes/ucp/ucp_pm_options.php

@@ -741,7 +741,8 @@ function show_defined_rules($user_id, $check_lang, $rule_lang, $action_lang, $fo
 
 	$sql = 'SELECT *
 		FROM ' . PRIVMSGS_RULES_TABLE . '
-		WHERE user_id = ' . $user_id;
+		WHERE user_id = ' . $user_id . '
+		ORDER BY rule_id ASC';
 	$result = $db->sql_query($sql);
 	
 	$count = 0;

phpBB/includes/ucp/ucp_prefs.php

@@ -342,6 +342,7 @@ class ucp_prefs
 		);
 
 		$this->tpl_name = 'ucp_prefs_' . $mode;
+		$this->page_title = 'UCP_PREFS_' . strtoupper($mode);
 	}
 }
 

phpBB/includes/ucp/ucp_profile.php

@@ -672,6 +672,7 @@ class ucp_profile
 
 		// Set desired template
 		$this->tpl_name = 'ucp_profile_' . $mode;
+		$this->page_title = 'UCP_PROFILE_' . strtoupper($mode);
 	}
 }
 

phpBB/includes/ucp/ucp_register.php

@@ -470,6 +470,7 @@ class ucp_register
 
 		//
 		$this->tpl_name = 'ucp_register';
+		$this->page_title = 'UCP_REGISTRATION';
 	}
 }
 

phpBB/includes/ucp/ucp_remind.php

@@ -92,6 +92,7 @@ class ucp_remind
 		);
 
 		$this->tpl_name = 'ucp_remind';
+		$this->page_title = 'UCP_REMIND';
 	}
 }
 

phpBB/includes/ucp/ucp_resend.php

@@ -140,6 +140,7 @@ class ucp_resend
 		);
 
 		$this->tpl_name = 'ucp_resend';
+		$this->page_title = 'UCP_RESEND';
 	}
 }
 

phpBB/includes/ucp/ucp_zebra.php

@@ -210,6 +210,7 @@ class ucp_zebra
 		);
 
 		$this->tpl_name = 'ucp_zebra_' . $mode;
+		$this->page_title = 'UCP_ZEBRA_' . strtoupper($mode);
 	}
 }