aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-12 22:16:27 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-12 22:16:27 +0000
commit298d3c0c50f14601472b832f3ecd8fcd8c07dfe4 (patch)
tree68b06c337a4b20fe2bfba66732085d66fe9c1e12 /phpBB/includes/ucp
parent4a0ddb9dfbe76f0e074d85a417541591ec25daa6 (diff)
downloadforums-298d3c0c50f14601472b832f3ecd8fcd8c07dfe4.tar
forums-298d3c0c50f14601472b832f3ecd8fcd8c07dfe4.tar.gz
forums-298d3c0c50f14601472b832f3ecd8fcd8c07dfe4.tar.bz2
forums-298d3c0c50f14601472b832f3ecd8fcd8c07dfe4.tar.xz
forums-298d3c0c50f14601472b832f3ecd8fcd8c07dfe4.zip
- 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
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_attachments.php1
-rw-r--r--phpBB/includes/ucp/ucp_groups.php3
-rw-r--r--phpBB/includes/ucp/ucp_main.php3
-rw-r--r--phpBB/includes/ucp/ucp_pm.php5
-rw-r--r--phpBB/includes/ucp/ucp_pm_options.php3
-rw-r--r--phpBB/includes/ucp/ucp_prefs.php1
-rw-r--r--phpBB/includes/ucp/ucp_profile.php1
-rw-r--r--phpBB/includes/ucp/ucp_register.php1
-rw-r--r--phpBB/includes/ucp/ucp_remind.php1
-rw-r--r--phpBB/includes/ucp/ucp_resend.php1
-rw-r--r--phpBB/includes/ucp/ucp_zebra.php1
11 files changed, 18 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php
index 8582a92478..c9ae7ed314 100644
--- a/phpBB/includes/ucp/ucp_attachments.php
+++ b/phpBB/includes/ucp/ucp_attachments.php
@@ -160,6 +160,7 @@ class ucp_attachments
);
$this->tpl_name = 'ucp_attachments';
+ $this->page_title = 'UCP_ATTACHMENTS';
}
}
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 3f30ec2d37..40e5fca5d3 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/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);
}
}
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index a0eec4b5ad..9ba40d1a50 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/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);
}
}
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index b2dd23b9d8..73b81b0c17 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/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);
}
}
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index 3362b5d9b4..c9e911b5f4 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/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;
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index a8ca9ad844..577d89a62a 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/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);
}
}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index ef39ba81a3..8fa3d1b7a7 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/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);
}
}
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 8dd482a0c1..8d59a976be 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -470,6 +470,7 @@ class ucp_register
//
$this->tpl_name = 'ucp_register';
+ $this->page_title = 'UCP_REGISTRATION';
}
}
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index 0bdfb685a3..838cc810ab 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -92,6 +92,7 @@ class ucp_remind
);
$this->tpl_name = 'ucp_remind';
+ $this->page_title = 'UCP_REMIND';
}
}
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php
index 51dd2ea4f2..2080feb8be 100644
--- a/phpBB/includes/ucp/ucp_resend.php
+++ b/phpBB/includes/ucp/ucp_resend.php
@@ -140,6 +140,7 @@ class ucp_resend
);
$this->tpl_name = 'ucp_resend';
+ $this->page_title = 'UCP_RESEND';
}
}
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index 9b2de97b8e..df86aae6e4 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/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);
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-11 20:29:16 +0000