aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_attachments.php34
-rw-r--r--phpBB/includes/acp/acp_ban.php14
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php8
-rw-r--r--phpBB/includes/acp/acp_board.php8
-rw-r--r--phpBB/includes/acp/acp_bots.php54
-rw-r--r--phpBB/includes/acp/acp_captcha.php14
-rw-r--r--phpBB/includes/acp/acp_database.php24
-rw-r--r--phpBB/includes/acp/acp_disallow.php14
-rw-r--r--phpBB/includes/acp/acp_email.php26
-rw-r--r--phpBB/includes/acp/acp_forums.php40
-rw-r--r--phpBB/includes/acp/acp_groups.php52
-rw-r--r--phpBB/includes/acp/acp_icons.php54
-rwxr-xr-xphpBB/includes/acp/acp_inactive.php22
-rw-r--r--phpBB/includes/acp/acp_jabber.php8
-rw-r--r--phpBB/includes/acp/acp_language.php30
-rw-r--r--phpBB/includes/acp/acp_logs.php14
-rw-r--r--phpBB/includes/acp/acp_main.php16
-rw-r--r--phpBB/includes/acp/acp_modules.php20
-rw-r--r--phpBB/includes/acp/acp_permission_roles.php18
-rw-r--r--phpBB/includes/acp/acp_permissions.php14
-rw-r--r--phpBB/includes/acp/acp_php_info.php24
-rw-r--r--phpBB/includes/acp/acp_profile.php78
-rw-r--r--phpBB/includes/acp/acp_prune.php24
-rw-r--r--phpBB/includes/acp/acp_ranks.php20
-rw-r--r--phpBB/includes/acp/acp_reasons.php16
-rw-r--r--phpBB/includes/acp/acp_search.php8
-rw-r--r--phpBB/includes/acp/acp_styles.php22
-rw-r--r--phpBB/includes/acp/acp_users.php22
-rw-r--r--phpBB/includes/acp/acp_words.php14
-rw-r--r--phpBB/includes/acp/auth.php25
30 files changed, 485 insertions, 252 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 7f85542264..4ab47ec9d6 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_attachments
@@ -296,7 +304,7 @@ class acp_attachments
{
if ($row['group_id'] != $extensions[$row['extension_id']]['group_id'])
{
- $sql = 'UPDATE ' . EXTENSIONS_TABLE . '
+ $sql = 'UPDATE ' . EXTENSIONS_TABLE . '
SET group_id = ' . (int) $extensions[$row['extension_id']]['group_id'] . '
WHERE extension_id = ' . $row['extension_id'];
$db->sql_query($sql);
@@ -311,7 +319,7 @@ class acp_attachments
if (sizeof($extension_id_list))
{
- $sql = 'SELECT extension
+ $sql = 'SELECT extension
FROM ' . EXTENSIONS_TABLE . '
WHERE ' . $db->sql_in_set('extension_id', $extension_id_list);
$result = $db->sql_query($sql);
@@ -323,7 +331,7 @@ class acp_attachments
}
$db->sql_freeresult($result);
- $sql = 'DELETE
+ $sql = 'DELETE
FROM ' . EXTENSIONS_TABLE . '
WHERE ' . $db->sql_in_set('extension_id', $extension_id_list);
$db->sql_query($sql);
@@ -379,8 +387,8 @@ class acp_attachments
'GROUP_SELECT_OPTIONS' => (isset($_POST['add_extension_check'])) ? $this->group_select('add_group_select', $add_extension_group, 'extension_group') : $this->group_select('add_group_select', false, 'extension_group'))
);
- $sql = 'SELECT *
- FROM ' . EXTENSIONS_TABLE . '
+ $sql = 'SELECT *
+ FROM ' . EXTENSIONS_TABLE . '
ORDER BY group_id, extension';
$result = $db->sql_query($sql);
@@ -460,7 +468,7 @@ class acp_attachments
// Check New Group Name
if ($new_group_name)
{
- $sql = 'SELECT group_id
+ $sql = 'SELECT group_id
FROM ' . EXTENSION_GROUPS_TABLE . "
WHERE LOWER(group_name) = '" . $db->sql_escape(utf8_strtolower($new_group_name)) . "'";
$result = $db->sql_query($sql);
@@ -535,7 +543,7 @@ class acp_attachments
if (sizeof($extension_list))
{
- $sql = 'UPDATE ' . EXTENSIONS_TABLE . "
+ $sql = 'UPDATE ' . EXTENSIONS_TABLE . "
SET group_id = $group_id
WHERE " . $db->sql_in_set('extension_id', $extension_list);
$db->sql_query($sql);
@@ -567,15 +575,15 @@ class acp_attachments
if (confirm_box(true))
{
- $sql = 'SELECT group_name
+ $sql = 'SELECT group_name
FROM ' . EXTENSION_GROUPS_TABLE . "
WHERE group_id = $group_id";
$result = $db->sql_query($sql);
$group_name = (string) $db->sql_fetchfield('group_name');
$db->sql_freeresult($result);
- $sql = 'DELETE
- FROM ' . EXTENSION_GROUPS_TABLE . "
+ $sql = 'DELETE
+ FROM ' . EXTENSION_GROUPS_TABLE . "
WHERE group_id = $group_id";
$db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php
index 218927f2a4..77fb44dda9 100644
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_ban
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 1eaec67e89..1b5de909c3 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -9,6 +9,14 @@
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_bbcodes
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index a2d91e9196..95b792593f 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -10,6 +10,14 @@
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_board
diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php
index 50458718ba..d08cabb062 100644
--- a/phpBB/includes/acp/acp_bots.php
+++ b/phpBB/includes/acp/acp_bots.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_bots
@@ -51,7 +59,7 @@ class acp_bots
{
$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
- $sql = 'UPDATE ' . BOTS_TABLE . "
+ $sql = 'UPDATE ' . BOTS_TABLE . "
SET bot_active = 1
WHERE bot_id $sql_id";
$db->sql_query($sql);
@@ -65,7 +73,7 @@ class acp_bots
{
$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
- $sql = 'UPDATE ' . BOTS_TABLE . "
+ $sql = 'UPDATE ' . BOTS_TABLE . "
SET bot_active = 0
WHERE bot_id $sql_id";
$db->sql_query($sql);
@@ -82,8 +90,8 @@ class acp_bots
// We need to delete the relevant user, usergroup and bot entries ...
$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
- $sql = 'SELECT bot_name, user_id
- FROM ' . BOTS_TABLE . "
+ $sql = 'SELECT bot_name, user_id
+ FROM ' . BOTS_TABLE . "
WHERE bot_id $sql_id";
$result = $db->sql_query($sql);
@@ -97,7 +105,7 @@ class acp_bots
$db->sql_transaction('begin');
- $sql = 'DELETE FROM ' . BOTS_TABLE . "
+ $sql = 'DELETE FROM ' . BOTS_TABLE . "
WHERE bot_id $sql_id";
$db->sql_query($sql);
@@ -200,9 +208,9 @@ class acp_bots
// New bot? Create a new user and group entry
if ($action == 'add')
{
- $sql = 'SELECT group_id, group_colour
- FROM ' . GROUPS_TABLE . "
- WHERE group_name = 'BOTS'
+ $sql = 'SELECT group_id, group_colour
+ FROM ' . GROUPS_TABLE . "
+ WHERE group_name = 'BOTS'
AND group_type = " . GROUP_SPECIAL;
$result = $db->sql_query($sql);
$group_row = $db->sql_fetchrow($result);
@@ -215,22 +223,22 @@ class acp_bots
$user_id = user_add(array(
- 'user_type' => (int) USER_IGNORE,
- 'group_id' => (int) $group_row['group_id'],
- 'username' => (string) $bot_row['bot_name'],
+ 'user_type' => (int) USER_IGNORE,
+ 'group_id' => (int) $group_row['group_id'],
+ 'username' => (string) $bot_row['bot_name'],
'user_regdate' => time(),
'user_password' => '',
'user_colour' => (string) $group_row['group_colour'],
'user_email' => '',
- 'user_lang' => (string) $bot_row['bot_lang'],
+ 'user_lang' => (string) $bot_row['bot_lang'],
'user_style' => (int) $bot_row['bot_style'],
'user_allow_massemail' => 0,
));
$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
'user_id' => (int) $user_id,
- 'bot_name' => (string) $bot_row['bot_name'],
- 'bot_active' => (int) $bot_row['bot_active'],
+ 'bot_name' => (string) $bot_row['bot_name'],
+ 'bot_active' => (int) $bot_row['bot_active'],
'bot_agent' => (string) $bot_row['bot_agent'],
'bot_ip' => (string) $bot_row['bot_ip'])
);
@@ -240,8 +248,8 @@ class acp_bots
}
else if ($bot_id)
{
- $sql = 'SELECT user_id, bot_name
- FROM ' . BOTS_TABLE . "
+ $sql = 'SELECT user_id, bot_name
+ FROM ' . BOTS_TABLE . "
WHERE bot_id = $bot_id";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
@@ -267,8 +275,8 @@ class acp_bots
$db->sql_query($sql);
$sql = 'UPDATE ' . BOTS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
- 'bot_name' => (string) $bot_row['bot_name'],
- 'bot_active' => (int) $bot_row['bot_active'],
+ 'bot_name' => (string) $bot_row['bot_name'],
+ 'bot_active' => (int) $bot_row['bot_active'],
'bot_agent' => (string) $bot_row['bot_agent'],
'bot_ip' => (string) $bot_row['bot_ip'])
) . " WHERE bot_id = $bot_id";
@@ -292,7 +300,7 @@ class acp_bots
}
else if ($bot_id)
{
- $sql = 'SELECT b.*, u.user_lang, u.user_style
+ $sql = 'SELECT b.*, u.user_lang, u.user_style
FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . " u
WHERE b.bot_id = $bot_id
AND u.user_id = b.user_id";
@@ -358,7 +366,7 @@ class acp_bots
'S_BOT_OPTIONS' => $s_options)
);
- $sql = 'SELECT b.bot_id, b.bot_name, b.bot_active, u.user_lastvisit
+ $sql = 'SELECT b.bot_id, b.bot_name, b.bot_active, u.user_lastvisit
FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . ' u
WHERE u.user_id = b.user_id
ORDER BY u.user_lastvisit DESC, b.bot_name ASC';
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php
index 80b6b625e3..0d653c22d1 100644
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -1,11 +1,19 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*/
+
+/**
+* @ignore
*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
/**
* @package acp
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index d8d4b8a306..62331fbca2 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_database
@@ -713,7 +721,7 @@ class mysql_extractor extends base_extractor
// Get field information
$field = array();
- for ($i = 0; $i < $fields_cnt; $i++)
+ for ($i = 0; $i < $fields_cnt; $i++)
{
$field[] = mysql_fetch_field($result, $i);
}
@@ -915,8 +923,8 @@ class sqlite_extractor extends base_extractor
$sql_data .= "DROP TABLE $table_name;\n";
$sql = "SELECT sql
- FROM sqlite_master
- WHERE type = 'table'
+ FROM sqlite_master
+ WHERE type = 'table'
AND name = '" . $db->sql_escape($table_name) . "'
ORDER BY type DESC, name;";
$result = $db->sql_query($sql);
@@ -974,8 +982,8 @@ class sqlite_extractor extends base_extractor
else
{
$sql = "SELECT sql
- FROM sqlite_master
- WHERE type = 'table'
+ FROM sqlite_master
+ WHERE type = 'table'
AND name = '" . $table_name . "'";
$table_data = sqlite_single_query($db->db_connect_id, $sql);
$table_data = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', '', $table_data);
diff --git a/phpBB/includes/acp/acp_disallow.php b/phpBB/includes/acp/acp_disallow.php
index 0423c4cc38..9549955cc8 100644
--- a/phpBB/includes/acp/acp_disallow.php
+++ b/phpBB/includes/acp/acp_disallow.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_disallow
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 7598b729c4..125908c296 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_email
@@ -39,7 +47,7 @@ class acp_email
// Do the job ...
if ($submit)
{
- // Error checking needs to go here ... if no subject and/or no message then skip
+ // Error checking needs to go here ... if no subject and/or no message then skip
// over the send and return to the form
$use_queue = (isset($_POST['send_immediately'])) ? false : true;
$priority = request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY);
@@ -64,7 +72,7 @@ class acp_email
if ($usernames)
{
// If giving usernames the admin is able to email inactive users too...
- $sql = 'SELECT username, user_email, user_jabber, user_notify_type, user_lang
+ $sql = 'SELECT username, user_email, user_jabber, user_notify_type, user_lang
FROM ' . USERS_TABLE . '
WHERE ' . $db->sql_in_set('username_clean', array_map('utf8_clean_string', explode("\n", $usernames))) . '
AND user_allow_massemail = 1
@@ -74,18 +82,18 @@ class acp_email
{
if ($group_id)
{
- $sql = 'SELECT u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type
- FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
+ $sql = 'SELECT u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type
+ FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
WHERE ug.group_id = ' . $group_id . '
AND ug.user_pending = 0
- AND u.user_id = ug.user_id
+ AND u.user_id = ug.user_id
AND u.user_allow_massemail = 1
AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
ORDER BY u.user_lang, u.user_notify_type';
}
else
{
- $sql = 'SELECT username, username_clean, user_email, user_jabber, user_notify_type, user_lang
+ $sql = 'SELECT username, username_clean, user_email, user_jabber, user_notify_type, user_lang
FROM ' . USERS_TABLE . '
WHERE user_allow_massemail = 1
AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 47e12152bc..afbde3cd57 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -9,6 +9,14 @@
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_forums
@@ -127,8 +135,8 @@ class acp_forums
'forum_image' => request_var('forum_image', ''),
'forum_style' => request_var('forum_style', 0),
'display_on_index' => request_var('display_on_index', false),
- 'forum_topics_per_page' => request_var('topics_per_page', 0),
- 'enable_indexing' => request_var('enable_indexing', true),
+ 'forum_topics_per_page' => request_var('topics_per_page', 0),
+ '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),
@@ -173,7 +181,7 @@ class acp_forums
$forum_perm_from = request_var('forum_perm_from', 0);
// Copy permissions?
- if ($forum_perm_from && !empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] &&
+ if ($forum_perm_from && !empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] &&
(($action != 'edit') || $auth->acl_get('acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth')))
{
// if we edit a forum delete current permissions first
@@ -465,8 +473,8 @@ class acp_forums
'forum_image' => '',
'forum_style' => 0,
'display_on_index' => false,
- 'forum_topics_per_page' => 0,
- 'enable_indexing' => true,
+ 'forum_topics_per_page' => 0,
+ 'enable_indexing' => true,
'enable_icons' => false,
'enable_prune' => false,
'prune_days' => 7,
@@ -1100,7 +1108,7 @@ class acp_forums
$db->sql_query($sql);
// Delete forum ids from extension groups table
- $sql = 'SELECT group_id, allowed_forums
+ $sql = 'SELECT group_id, allowed_forums
FROM ' . EXTENSION_GROUPS_TABLE;
$result = $db->sql_query($sql);
@@ -1114,7 +1122,7 @@ class acp_forums
$allowed_forums = unserialize(trim($_row['allowed_forums']));
$allowed_forums = array_diff($allowed_forums, $forum_ids);
- $sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . "
+ $sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . "
SET allowed_forums = '" . ((sizeof($allowed_forums)) ? serialize($allowed_forums) : '') . "'
WHERE group_id = {$_row['group_id']}";
$db->sql_query($sql);
@@ -1131,7 +1139,7 @@ class acp_forums
return array($user->lang['NO_DESTINATION_FORUM']);
}
- $sql = 'SELECT forum_name
+ $sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $subforums_to_id;
$result = $db->sql_query($sql);
@@ -1386,7 +1394,7 @@ class acp_forums
{
$log_action_posts = 'MOVE_POSTS';
- $sql = 'SELECT forum_name
+ $sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $posts_to_id;
$result = $db->sql_query($sql);
@@ -1450,7 +1458,7 @@ class acp_forums
{
$log_action_forums = 'MOVE_FORUMS';
- $sql = 'SELECT forum_name
+ $sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $subforums_to_id;
$result = $db->sql_query($sql);
@@ -1532,7 +1540,7 @@ class acp_forums
$db->sql_query($sql);
// Delete forum ids from extension groups table
- $sql = 'SELECT group_id, allowed_forums
+ $sql = 'SELECT group_id, allowed_forums
FROM ' . EXTENSION_GROUPS_TABLE;
$result = $db->sql_query($sql);
@@ -1546,7 +1554,7 @@ class acp_forums
$allowed_forums = unserialize(trim($row['allowed_forums']));
$allowed_forums = array_diff($allowed_forums, $forum_ids);
- $sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . "
+ $sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . "
SET allowed_forums = '" . ((sizeof($allowed_forums)) ? serialize($allowed_forums) : '') . "'
WHERE group_id = {$row['group_id']}";
$db->sql_query($sql);
@@ -1749,12 +1757,12 @@ class acp_forums
{
$sql = 'UPDATE ' . USERS_TABLE . '
SET user_posts = 0
- WHERE user_id = ' . $poster_id . '
+ WHERE user_id = ' . $poster_id . '
AND user_posts < ' . $substract;
$db->sql_query($sql);
$sql = 'UPDATE ' . USERS_TABLE . '
SET user_posts = user_posts - ' . $substract . '
- WHERE user_id = ' . $poster_id . '
+ WHERE user_id = ' . $poster_id . '
AND user_posts >= ' . $substract;
$db->sql_query($sql);
}
@@ -1763,7 +1771,7 @@ class acp_forums
$db->sql_transaction('commit');
// Make sure the overall post/topic count is correct...
- $sql = 'SELECT COUNT(post_id) AS stat
+ $sql = 'SELECT COUNT(post_id) AS stat
FROM ' . POSTS_TABLE . '
WHERE post_approved = 1';
$result = $db->sql_query($sql);
@@ -1873,7 +1881,7 @@ class acp_forums
ELSE {$diff_down}
END,
forum_parents = ''
- WHERE
+ WHERE
left_id BETWEEN {$left_id} AND {$right_id}
AND right_id BETWEEN {$left_id} AND {$right_id}";
$db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index a024a55a81..eb785ced23 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_groups
@@ -47,8 +55,8 @@ class acp_groups
// Grab basic data for group, if group_id is set and exists
if ($group_id)
{
- $sql = 'SELECT *
- FROM ' . GROUPS_TABLE . "
+ $sql = 'SELECT *
+ FROM ' . GROUPS_TABLE . "
WHERE group_id = $group_id";
$result = $db->sql_query($sql);
$group_row = $db->sql_fetchrow($result);
@@ -115,9 +123,9 @@ class acp_groups
do
{
- $sql = 'SELECT user_id
+ $sql = 'SELECT user_id
FROM ' . USER_GROUP_TABLE . "
- WHERE group_id = $group_id
+ WHERE group_id = $group_id
ORDER BY user_id";
$result = $db->sql_query_limit($sql, 200, $start);
@@ -299,10 +307,10 @@ class acp_groups
{
// Avatar stuff
$var_ary = array(
- 'uploadurl' => array('string', true, 5, 255),
- 'remotelink' => array('string', true, 5, 255),
- 'width' => array('string', true, 1, 3),
- 'height' => array('string', true, 1, 3),
+ 'uploadurl' => array('string', true, 5, 255),
+ 'remotelink' => array('string', true, 5, 255),
+ 'width' => array('string', true, 1, 3),
+ 'height' => array('string', true, 1, 3),
);
if (!($error = validate_data($data, $var_ary)))
@@ -375,7 +383,7 @@ class acp_groups
if (!sizeof($error))
{
// Only set the rank, colour, etc. if it's changed or if we're adding a new
- // group. This prevents existing group members being updated if no changes
+ // group. This prevents existing group members being updated if no changes
// were made.
$group_attributes = array();
@@ -477,7 +485,7 @@ class acp_groups
$group_rank = $group_row['group_rank'];
}
- $sql = 'SELECT *
+ $sql = 'SELECT *
FROM ' . RANKS_TABLE . '
WHERE rank_special = 1
ORDER BY rank_title';
@@ -585,9 +593,9 @@ class acp_groups
$this->page_title = 'GROUP_MEMBERS';
// Grab the leaders - always, on every page...
- $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
- FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
- WHERE ug.group_id = $group_id
+ $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
+ FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
+ WHERE ug.group_id = $group_id
AND u.user_id = ug.user_id
AND ug.group_leader = 1
ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean";
@@ -608,9 +616,9 @@ class acp_groups
$db->sql_freeresult($result);
// Total number of group members (non-leaders)
- $sql = 'SELECT COUNT(user_id) AS total_members
- FROM ' . USER_GROUP_TABLE . "
- WHERE group_id = $group_id
+ $sql = 'SELECT COUNT(user_id) AS total_members
+ FROM ' . USER_GROUP_TABLE . "
+ WHERE group_id = $group_id
AND group_leader = 0";
$result = $db->sql_query($sql);
$total_members = (int) $db->sql_fetchfield('total_members');
@@ -640,9 +648,9 @@ class acp_groups
));
// Grab the members
- $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
- FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
- WHERE ug.group_id = $group_id
+ $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
+ FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
+ WHERE ug.group_id = $group_id
AND u.user_id = ug.user_id
AND ug.group_leader = 0
ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean";
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index a024e09e84..97864d0e27 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @todo [smilies] check regular expressions for special char replacements (stored specialchared in db)
* @package acp
*/
@@ -108,7 +116,7 @@ class acp_icons
if ($action == 'add' && $mode == 'smilies')
{
- $sql = 'SELECT *
+ $sql = 'SELECT *
FROM ' . SMILIES_TABLE . '
ORDER BY smiley_order';
$result = $db->sql_query($sql);
@@ -147,8 +155,8 @@ class acp_icons
}
}
- $sql = "SELECT *
- FROM $table
+ $sql = "SELECT *
+ FROM $table
ORDER BY {$fields}_order " . (($icon_id || $action == 'add') ? 'DESC' : 'ASC');
$result = $db->sql_query($sql);
@@ -202,13 +210,13 @@ class acp_icons
$db->sql_freeresult($result);
$order_list = '<option value="1"' . ((!isset($after)) ? ' selected="selected"' : '') . '>' . $user->lang['FIRST'] . '</option>';
- $add_order_list = '<option value="1">' . $user->lang['FIRST'] . '</option>';
-
+ $add_order_list = '<option value="1">' . $user->lang['FIRST'] . '</option>';
+
if ($action == 'add')
{
$data = $_images;
}
-
+
$colspan = (($mode == 'smilies') ? '7' : '5');
$colspan += ($icon_id) ? 1 : 0;
$colspan += ($action == 'add') ? 2 : 0;
@@ -388,7 +396,7 @@ class acp_icons
if ($action == 'modify' && !empty($image_id[$image]))
{
$sql = "UPDATE $table
- SET " . $db->sql_build_array('UPDATE', $img_sql) . "
+ SET " . $db->sql_build_array('UPDATE', $img_sql) . "
WHERE {$fields}_id = " . $image_id[$image];
$db->sql_query($sql);
$icons_updated++;
@@ -451,7 +459,7 @@ class acp_icons
{
if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data))
{
- if ((sizeof($data[1]) != 4 && $mode == 'icons') ||
+ if ((sizeof($data[1]) != 4 && $mode == 'icons') ||
(sizeof($data[1]) != 6 && $mode == 'smilies'))
{
trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -491,7 +499,7 @@ class acp_icons
break;
}
}
- else
+ else
{
$cur_img = array();
@@ -514,7 +522,7 @@ class acp_icons
$data = array();
if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data))
{
- if ((sizeof($data[1]) != 4 && $mode == 'icons') ||
+ if ((sizeof($data[1]) != 4 && $mode == 'icons') ||
(sizeof($data[1]) != 6 && $mode == 'smilies'))
{
trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -532,8 +540,8 @@ class acp_icons
$code = stripslashes($data[1][5]);
}
- if ($current == 'replace' &&
- (($mode == 'smilies' && !empty($cur_img[$code])) ||
+ if ($current == 'replace' &&
+ (($mode == 'smilies' && !empty($cur_img[$code])) ||
($mode == 'icons' && !empty($cur_img[$img]))))
{
$replace_sql = ($mode == 'smilies') ? $code : $img;
@@ -551,7 +559,7 @@ class acp_icons
));
}
- $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . "
+ $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . "
WHERE $field_sql = '" . $db->sql_escape($replace_sql) . "'";
$db->sql_query($sql);
}
@@ -630,7 +638,7 @@ class acp_icons
case 'send':
- $sql = "SELECT *
+ $sql = "SELECT *
FROM $table
ORDER BY {$fields}_order";
$result = $db->sql_query($sql);
@@ -689,12 +697,12 @@ class acp_icons
case 'icons':
// Reset appropriate icon_ids
- $db->sql_query('UPDATE ' . TOPICS_TABLE . "
- SET icon_id = 0
+ $db->sql_query('UPDATE ' . TOPICS_TABLE . "
+ SET icon_id = 0
WHERE icon_id = $icon_id");
- $db->sql_query('UPDATE ' . POSTS_TABLE . "
- SET icon_id = 0
+ $db->sql_query('UPDATE ' . POSTS_TABLE . "
+ SET icon_id = 0
WHERE icon_id = $icon_id");
break;
}
@@ -736,7 +744,7 @@ class acp_icons
// on move_up, switch position with previous order_id...
$switch_order_id = ($action == 'move_down') ? $current_order + 1 : $current_order - 1;
- //
+ //
$sql = "UPDATE $table
SET {$fields}_order = $current_order
WHERE {$fields}_order = $switch_order_id
@@ -804,7 +812,7 @@ class acp_icons
$spacer = false;
- $sql = "SELECT *
+ $sql = "SELECT *
FROM $table
ORDER BY {$fields}_order ASC";
$result = $db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index 59b5a3d6e2..b440c5cbc3 100755
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2006 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_inactive
@@ -55,7 +63,7 @@ class acp_inactive
case 'activate':
case 'delete':
- $sql = 'SELECT user_id, username
+ $sql = 'SELECT user_id, username
FROM ' . USERS_TABLE . '
WHERE ' . $db->sql_in_set('user_id', $mark);
$result = $db->sql_query($sql);
@@ -137,8 +145,8 @@ class acp_inactive
trigger_error($user->lang['EMAIL_DISABLED'] . adm_back_link($this->u_action), E_USER_WARNING);
}
- $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey
- FROM ' . USERS_TABLE . '
+ $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey
+ FROM ' . USERS_TABLE . '
WHERE ' . $db->sql_in_set('user_id', $mark);
$result = $db->sql_query($sql);
@@ -159,7 +167,7 @@ class acp_inactive
$messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($row['username']),
- 'REGISTER_DATE' => $user->format_date($row['user_regdate']),
+ 'REGISTER_DATE' => $user->format_date($row['user_regdate']),
'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey'])
);
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php
index 7f0b681a8c..3862ee1ee8 100644
--- a/phpBB/includes/acp/acp_jabber.php
+++ b/phpBB/includes/acp/acp_jabber.php
@@ -10,6 +10,14 @@
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_jabber
diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php
index 3bbab2a083..f68b3ea287 100644
--- a/phpBB/includes/acp/acp_language.php
+++ b/phpBB/includes/acp/acp_language.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_language
@@ -161,7 +169,7 @@ class acp_language
'lang_author' => utf8_normalize_nfc(request_var('lang_author', $row['lang_author'], true)),
);
- $db->sql_query('UPDATE ' . LANG_TABLE . '
+ $db->sql_query('UPDATE ' . LANG_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE lang_id = ' . $lang_id);
@@ -760,7 +768,7 @@ class acp_language
$db->sql_query('DELETE FROM ' . LANG_TABLE . ' WHERE lang_id = ' . $lang_id);
- $sql = 'UPDATE ' . USERS_TABLE . "
+ $sql = 'UPDATE ' . USERS_TABLE . "
SET user_lang = '" . $db->sql_escape($config['default_lang']) . "'
WHERE user_lang = '" . $db->sql_escape($row['lang_iso']) . "'";
$db->sql_query($sql);
@@ -939,7 +947,7 @@ class acp_language
trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
}
- $sql = 'SELECT *
+ $sql = 'SELECT *
FROM ' . LANG_TABLE . '
WHERE lang_id = ' . $lang_id;
$result = $db->sql_query($sql);
@@ -1055,7 +1063,7 @@ class acp_language
}
$sql = 'SELECT user_lang, COUNT(user_lang) AS lang_count
- FROM ' . USERS_TABLE . '
+ FROM ' . USERS_TABLE . '
GROUP BY user_lang';
$result = $db->sql_query($sql);
@@ -1066,7 +1074,7 @@ class acp_language
}
$db->sql_freeresult($result);
- $sql = 'SELECT *
+ $sql = 'SELECT *
FROM ' . LANG_TABLE . '
ORDER BY lang_english_name';
$result = $db->sql_query($sql);
@@ -1148,15 +1156,15 @@ class acp_language
global $phpEx;
$this->language_file_header = '<?php
-/**
+/**
*
* {FILENAME} [{LANG_NAME}]
*
* @package language
* @version $' . 'Id: ' . '$
-* @copyright (c) ' . date('Y') . ' phpBB Group
+* @copyright (c) ' . date('Y') . ' phpBB Group
* @author {CHANGED} - {AUTHOR}
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php
index 402209e66c..12953173f1 100644
--- a/phpBB/includes/acp/acp_logs.php
+++ b/phpBB/includes/acp/acp_logs.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_logs
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 84ea8cdfbd..06385fd97b 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_main
@@ -117,7 +125,7 @@ class acp_main
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
}
- $sql = 'SELECT COUNT(post_id) AS stat
+ $sql = 'SELECT COUNT(post_id) AS stat
FROM ' . POSTS_TABLE . '
WHERE post_approved = 1';
$result = $db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 44fe4ed462..f3540941df 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* - Able to check for new module versions (modes changed/adjusted/added/removed)
* Icons for:
* - module enabled and displayed (common)
@@ -124,7 +132,7 @@ class acp_modules
trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
}
- $sql = 'UPDATE ' . MODULES_TABLE . '
+ $sql = 'UPDATE ' . MODULES_TABLE . '
SET module_enabled = ' . (($action == 'enable') ? 1 : 0) . "
WHERE module_class = '" . $db->sql_escape($this->module_class) . "'
AND module_id = $module_id";
@@ -346,7 +354,7 @@ class acp_modules
'ACTION' => $action,
'MODULE_ID' => $module_id,
- ),
+ ),
array_change_key_case($module_data, CASE_UPPER))
);
@@ -730,7 +738,7 @@ class acp_modules
/**
* Update/Add module
- *
+ *
* @param bool $run_inline if set to true errors will be returned and no logs being written
*/
function update_module_data(&$module_data, $run_inline = false)
diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index c772488bd6..03ea5a39dd 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_permission_roles
@@ -179,8 +187,8 @@ class acp_permission_roles
if ($action == 'edit')
{
- $sql = 'UPDATE ' . ACL_ROLES_TABLE . '
- SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+ $sql = 'UPDATE ' . ACL_ROLES_TABLE . '
+ SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE role_id = ' . $role_id;
$db->sql_query($sql);
}
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index fb90e4b692..1b2b19d4ab 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -9,6 +9,14 @@
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_permissions
@@ -601,7 +609,7 @@ class acp_permissions
}
}
- /**
+ /**
* Apply permissions
*/
function set_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id)
@@ -690,7 +698,7 @@ class acp_permissions
trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action));
}
- /**
+ /**
* Apply all permissions
*/
function set_all_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id)
@@ -862,7 +870,7 @@ class acp_permissions
else
{
// Grab the forum details if non-zero forum_id
- $sql = 'SELECT forum_name
+ $sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE ' . $db->sql_in_set('forum_id', $forum_id);
$result = $db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_php_info.php b/phpBB/includes/acp/acp_php_info.php
index 3b4873bdc8..9935c0466e 100644
--- a/phpBB/includes/acp/acp_php_info.php
+++ b/phpBB/includes/acp/acp_php_info.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_php_info
@@ -28,16 +36,16 @@ class acp_php_info
$this->tpl_name = 'acp_php_info';
$this->page_title = 'ACP_PHP_INFO';
- ob_start();
- @phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES);
- $phpinfo = ob_get_clean();
+ ob_start();
+ @phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES);
+ $phpinfo = ob_get_clean();
$phpinfo = trim($phpinfo);
// Here we play around a little with the PHP Info HTML to try and stylise
// it along phpBB's lines ... hopefully without breaking anything. The idea
// for this was nabbed from the PHP annotated manual
- preg_match_all('#<body[^>]*>(.*)</body>#si', $phpinfo, $output);
+ preg_match_all('#<body[^>]*>(.*)</body>#si', $phpinfo, $output);
if (empty($phpinfo) || empty($output))
{
@@ -66,7 +74,7 @@ class acp_php_info
$orig_output = $output;
- preg_match_all('#<div class="center">(.*)</div>#siU', $output, $output);
+ preg_match_all('#<div class="center">(.*)</div>#siU', $output, $output);
$output = (!empty($output[1][0])) ? $output[1][0] : $orig_output;
$template->assign_var('PHPINFO', $output);
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 7babebdfa5..9acfbe41c1 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -9,6 +9,14 @@
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_profile
@@ -99,8 +107,8 @@ class acp_profile
if (confirm_box(true))
{
- $sql = 'SELECT field_ident
- FROM ' . PROFILE_FIELDS_TABLE . "
+ $sql = 'SELECT field_ident
+ FROM ' . PROFILE_FIELDS_TABLE . "
WHERE field_id = $field_id";
$result = $db->sql_query($sql);
$field_ident = (string) $db->sql_fetchfield('field_ident');
@@ -116,8 +124,8 @@ class acp_profile
{
case 'sqlite':
$sql = "SELECT sql
- FROM sqlite_master
- WHERE type = 'table'
+ FROM sqlite_master
+ WHERE type = 'table'
AND name = '" . PROFILE_FIELDS_DATA_TABLE . "'
ORDER BY type DESC, name;";
$result = $db->sql_query($sql);
@@ -176,8 +184,8 @@ class acp_profile
$order++;
if ($row['field_order'] != $order)
{
- $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
- SET field_order = $order
+ $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
+ SET field_order = $order
WHERE field_id = {$row['field_id']}";
$db->sql_query($sql);
}
@@ -209,8 +217,8 @@ class acp_profile
trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
}
- $sql = 'SELECT lang_id
- FROM ' . LANG_TABLE . "
+ $sql = 'SELECT lang_id
+ FROM ' . LANG_TABLE . "
WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
$result = $db->sql_query($sql);
$default_lang_id = (int) $db->sql_fetchfield('lang_id');
@@ -221,13 +229,13 @@ class acp_profile
trigger_error($user->lang['DEFAULT_LANGUAGE_NOT_FILLED'] . adm_back_link($this->u_action), E_USER_WARNING);
}
- $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
- SET field_active = 1
+ $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
+ SET field_active = 1
WHERE field_id = $field_id";
$db->sql_query($sql);
- $sql = 'SELECT field_ident
- FROM ' . PROFILE_FIELDS_TABLE . "
+ $sql = 'SELECT field_ident
+ FROM ' . PROFILE_FIELDS_TABLE . "
WHERE field_id = $field_id";
$result = $db->sql_query($sql);
$field_ident = (string) $db->sql_fetchfield('field_ident');
@@ -247,12 +255,12 @@ class acp_profile
}
$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
- SET field_active = 0
+ SET field_active = 0
WHERE field_id = $field_id";
$db->sql_query($sql);
- $sql = 'SELECT field_ident
- FROM ' . PROFILE_FIELDS_TABLE . "
+ $sql = 'SELECT field_ident
+ FROM ' . PROFILE_FIELDS_TABLE . "
WHERE field_id = $field_id";
$result = $db->sql_query($sql);
$field_ident = (string) $db->sql_fetchfield('field_ident');
@@ -296,7 +304,7 @@ class acp_profile
}
$sql = 'SELECT l.*, f.*
- FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
+ FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
WHERE l.lang_id = ' . $this->edit_lang_id . "
AND f.field_id = $field_id
AND l.field_id = f.field_id";
@@ -308,7 +316,7 @@ class acp_profile
{
// Some admin changed the default language?
$sql = 'SELECT l.*, f.*
- FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
+ FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
WHERE l.lang_id <> ' . $this->edit_lang_id . "
AND f.field_id = $field_id
AND l.field_id = f.field_id";
@@ -327,7 +335,7 @@ class acp_profile
// Get language entries
$sql = 'SELECT *
- FROM ' . PROFILE_FIELDS_LANG_TABLE . '
+ FROM ' . PROFILE_FIELDS_LANG_TABLE . '
WHERE lang_id = ' . $this->edit_lang_id . "
AND field_id = $field_id
ORDER BY option_id ASC";
@@ -497,7 +505,7 @@ class acp_profile
list($cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']) = explode('-', $var);
}
}
- }
+ }
/* else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
{
// Get the number of options if this key is 'field_maxlen'
@@ -512,7 +520,7 @@ class acp_profile
{
// Get language entries
$sql = 'SELECT *
- FROM ' . PROFILE_FIELDS_LANG_TABLE . '
+ FROM ' . PROFILE_FIELDS_LANG_TABLE . '
WHERE lang_id <> ' . $this->edit_lang_id . "
AND field_id = $field_id
ORDER BY option_id ASC";
@@ -527,7 +535,7 @@ class acp_profile
$sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value
- FROM ' . PROFILE_LANG_TABLE . '
+ FROM ' . PROFILE_LANG_TABLE . '
WHERE lang_id <> ' . $this->edit_lang_id . "
AND field_id = $field_id
ORDER BY lang_id ASC";
@@ -602,8 +610,8 @@ class acp_profile
// Check for already existing field ident
if ($action != 'edit')
{
- $sql = 'SELECT field_ident
- FROM ' . PROFILE_FIELDS_TABLE . "
+ $sql = 'SELECT field_ident
+ FROM ' . PROFILE_FIELDS_TABLE . "
WHERE field_ident = '" . $db->sql_escape($cp->vars['field_ident']) . "'";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
@@ -710,7 +718,7 @@ class acp_profile
switch ($step)
{
// Create basic options - only small differences between field types
- case 1:
+ case 1:
// Build common create options
$template->assign_vars(array(
@@ -789,7 +797,7 @@ class acp_profile
break;
// Define remaining language variables
- case 3:
+ case 3:
$template->assign_var('S_STEP_THREE', true);
$options = $this->build_language_options($cp, $field_type, $action);
@@ -885,7 +893,7 @@ class acp_profile
$default_lang_id = (!empty($this->edit_lang_id)) ? $this->edit_lang_id : $this->lang_defs['iso'][$config['default_lang']];
- $sql = 'SELECT lang_id, lang_iso
+ $sql = 'SELECT lang_id, lang_iso
FROM ' . LANG_TABLE . '
WHERE lang_id <> ' . (int) $default_lang_id . '
ORDER BY lang_english_name';
@@ -1108,7 +1116,7 @@ class acp_profile
foreach ($empty_lang as $lang_id => $NULL)
{
- $sql = 'DELETE FROM ' . PROFILE_LANG_TABLE . "
+ $sql = 'DELETE FROM ' . PROFILE_LANG_TABLE . "
WHERE field_id = $field_id
AND lang_id = " . (int) $lang_id;
$db->sql_query($sql);
@@ -1142,7 +1150,7 @@ class acp_profile
if ($action != 'create')
{
- $sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . "
+ $sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . "
WHERE field_id = $field_id
AND lang_id = " . (int) $default_lang_id;
$db->sql_query($sql);
@@ -1194,7 +1202,7 @@ class acp_profile
{
if ($action != 'create')
{
- $sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . "
+ $sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . "
WHERE field_id = $field_id
AND lang_id = " . (int) $lang_id;
$db->sql_query($sql);
@@ -1215,7 +1223,7 @@ class acp_profile
foreach ($empty_lang as $lang_id => $NULL)
{
- $sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . "
+ $sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . "
WHERE field_id = $field_id
AND lang_id = " . (int) $lang_id;
$db->sql_query($sql);
@@ -1252,7 +1260,7 @@ class acp_profile
unset($sql['lang_id'], $sql['field_id'], $sql['option_id']);
$this->update_insert(PROFILE_FIELDS_LANG_TABLE, $sql, array(
- 'lang_id' => $lang_id,
+ 'lang_id' => $lang_id,
'field_id' => $field_id,
'option_id' => $option_id)
);
@@ -1306,7 +1314,7 @@ class acp_profile
return;
}
- $sql = "SELECT $check_key
+ $sql = "SELECT $check_key
FROM $table
WHERE " . implode(' AND ', $where_sql);
$result = $db->sql_query($sql);
@@ -1326,7 +1334,7 @@ class acp_profile
{
if (sizeof($sql_ary))
{
- $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql_ary) . '
+ $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE ' . implode(' AND ', $where_sql);
$db->sql_query($sql);
}
@@ -1415,8 +1423,8 @@ class acp_profile
if (version_compare(sqlite_libversion(), '3.0') == -1)
{
$sql = "SELECT sql
- FROM sqlite_master
- WHERE type = 'table'
+ FROM sqlite_master
+ WHERE type = 'table'
AND name = '" . PROFILE_FIELDS_DATA_TABLE . "'
ORDER BY type DESC, name;";
$result = $db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index b7e49ea983..308f83387c 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_prune
@@ -89,10 +97,10 @@ class acp_prune
$sql_forum = (sizeof($forum_id)) ? ' AND ' . $db->sql_in_set('forum_id', $forum_id) : '';
// Get a list of forum's or the data for the forum that we are pruning.
- $sql = 'SELECT forum_id, forum_name
+ $sql = 'SELECT forum_id, forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_type = ' . FORUM_POST . "
- $sql_forum
+ $sql_forum
ORDER BY left_id ASC";
$result = $db->sql_query($sql);
@@ -181,8 +189,8 @@ class acp_prune
}
else
{
- $sql = 'SELECT forum_id, forum_name
- FROM ' . FORUMS_TABLE . '
+ $sql = 'SELECT forum_id, forum_name
+ FROM ' . FORUMS_TABLE . '
WHERE ' . $db->sql_in_set('forum_id', $forum_id);
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
@@ -407,7 +415,7 @@ class acp_prune
}
// Get bot ids
- $sql = 'SELECT user_id
+ $sql = 'SELECT user_id
FROM ' . BOTS_TABLE;
$result = $db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php
index bb69d1e53e..51561e03f1 100644
--- a/phpBB/includes/acp/acp_ranks.php
+++ b/phpBB/includes/acp/acp_ranks.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_ranks
@@ -138,8 +146,8 @@ class acp_ranks
$data = $ranks = $existing_imgs = array();
- $sql = 'SELECT *
- FROM ' . RANKS_TABLE . '
+ $sql = 'SELECT *
+ FROM ' . RANKS_TABLE . '
ORDER BY rank_min ASC, rank_special ASC';
$result = $db->sql_query($sql);
@@ -163,7 +171,7 @@ class acp_ranks
foreach ($img_ary as $img)
{
- $img = $path . $img;
+ $img = $path . $img;
if (!in_array($img, $existing_imgs) || $action == 'edit')
{
diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/includes/acp/acp_reasons.php
index 2b37c0a89e..8d7bc88769 100644
--- a/phpBB/includes/acp/acp_reasons.php
+++ b/phpBB/includes/acp/acp_reasons.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_reasons
@@ -315,7 +323,7 @@ class acp_reasons
// Reason count
$sql = 'SELECT reason_id, COUNT(reason_id) AS reason_count
- FROM ' . REPORTS_TABLE . '
+ FROM ' . REPORTS_TABLE . '
GROUP BY reason_id';
$result = $db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index 12d3095d40..65634ebb25 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -9,6 +9,14 @@
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_search
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index a0c648ba1f..a8fe46b8e4 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -9,6 +9,14 @@
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_styles
@@ -61,10 +69,10 @@ class acp_styles
# For on/off options the valid values are on, off, 1, 0, true and false
#
# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes.
+# the value, then enclose the value with single or double quotes.
# Single and double quotes do not need to be escaped.
#
-#
+#
# General Information about this {MODE}
name = {NAME}
@@ -76,7 +84,7 @@ version = {VERSION}
# Some configuration options
#
-# You have to turn this option on if you want to use the
+# You have to turn this option on if you want to use the
# path template variables ({T_IMAGESET_PATH} for example) within
# your css file.
# This is mostly the case if you want to use language specific
@@ -978,7 +986,7 @@ parse_css_file = {PARSE_CSS_FILE}
{
$file = str_replace('/', '.', $file);
- // perform some dirty guessing to get the path right.
+ // perform some dirty guessing to get the path right.
// We assume that three dots in a row were '../'
$tpl_file = str_replace('.', '/', $file);
$tpl_file = str_replace('///', '../', $tpl_file);
@@ -1286,7 +1294,7 @@ parse_css_file = {PARSE_CSS_FILE}
}
$imgwidth = ($imgname != 'poll_center') ? (int) $imgwidth : 0;
$imgheight = (int) $imgheight;
- }
+ }
if (strpos($imgpath, '/') !== false)
@@ -1511,8 +1519,8 @@ parse_css_file = {PARSE_CSS_FILE}
$sql = "SELECT {$mode}_id, {$mode}_name
FROM $sql_from
- WHERE {$mode}_id <> $style_id
- $sql_where
+ WHERE {$mode}_id <> $style_id
+ $sql_where
ORDER BY {$mode}_name ASC";
$result = $db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 237d1ba18b..344df3169d 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -9,6 +9,14 @@
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @package acp
*/
class acp_users
@@ -1488,7 +1496,7 @@ class acp_users
trigger_error($user->lang['USER_RANK_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
}
- $sql = 'SELECT *
+ $sql = 'SELECT *
FROM ' . RANKS_TABLE . '
WHERE rank_special = 1
ORDER BY rank_title';
@@ -1544,13 +1552,13 @@ class acp_users
if (!sizeof($error) && $submit)
{
$sql_ary = array(
- 'user_sig' => (string) $message_parser->message,
- 'user_sig_bbcode_uid' => (string) $message_parser->bbcode_uid,
+ 'user_sig' => (string) $message_parser->message,
+ 'user_sig_bbcode_uid' => (string) $message_parser->bbcode_uid,
'user_sig_bbcode_bitfield' => (string) $message_parser->bbcode_bitfield
);
- $sql = 'UPDATE ' . USERS_TABLE . '
- SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+ $sql = 'UPDATE ' . USERS_TABLE . '
+ SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE user_id = ' . $user_id;
$db->sql_query($sql);
@@ -1590,7 +1598,7 @@ class acp_users
'L_SIGNATURE_EXPLAIN' => sprintf($user->lang['SIGNATURE_EXPLAIN'], $config['max_sig_chars']),
- 'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'],
+ 'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'],
'S_SMILIES_ALLOWED' => $config['allow_sig_smilies'],
'S_BBCODE_IMG' => ($config['allow_sig_img']) ? true : false,
'S_BBCODE_FLASH' => ($config['allow_sig_flash']) ? true : false,
@@ -1700,7 +1708,7 @@ class acp_users
$db->sql_freeresult($result);
$sql = 'SELECT a.*, t.topic_title, p.message_subject as message_title
- FROM ' . ATTACHMENTS_TABLE . ' a
+ FROM ' . ATTACHMENTS_TABLE . ' a
LEFT JOIN ' . TOPICS_TABLE . ' t ON (a.topic_id = t.topic_id
AND a.in_message = 0)
LEFT JOIN ' . PRIVMSGS_TABLE . ' p ON (a.post_msg_id = p.msg_id
diff --git a/phpBB/includes/acp/acp_words.php b/phpBB/includes/acp/acp_words.php
index e9adfe8e56..596c2fc743 100644
--- a/phpBB/includes/acp/acp_words.php
+++ b/phpBB/includes/acp/acp_words.php
@@ -1,14 +1,22 @@
<?php
-/**
+/**
*
* @package acp
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
* @todo [words] check regular expressions for special char replacements (stored specialchared in db)
* @package acp
*/
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index 68156718ab..b4ea0e46d0 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -1,14 +1,15 @@
<?php
-/**
+/**
*
* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
/**
+* @ignore
*/
if (!defined('IN_PHPBB'))
{
@@ -119,7 +120,7 @@ class auth_admin extends auth
// If forum_ids is false and the scope is local we actually want to have all forums within the array
if ($scope == 'local' && !sizeof($forum_ids))
{
- $sql = 'SELECT forum_id
+ $sql = 'SELECT forum_id
FROM ' . FORUMS_TABLE;
$result = $db->sql_query($sql, 120);
@@ -206,10 +207,10 @@ class auth_admin extends auth
// Do not include the global auth_option
unset($options[$auth_option]);
- // Not a "fine" solution, but at all it's a 1-dimensional
+ // Not a "fine" solution, but at all it's a 1-dimensional
// array_diff_key function filling the resulting array values with zeros
// The differences get merged into $hold_ary (all permissions having $acl_fill set)
- $hold_ary[$ug_id][$id] = array_merge($options,
+ $hold_ary[$ug_id][$id] = array_merge($options,
array_map($return_acl_fill,
array_flip(
@@ -253,7 +254,7 @@ class auth_admin extends auth
}
$db->sql_freeresult($result);
- // Now grab groups...
+ // Now grab groups...
$sql = 'SELECT group_id, forum_id
FROM ' . ACL_GROUPS_TABLE . '
WHERE auth_role_id = ' . $role_id . '
@@ -428,7 +429,7 @@ class auth_admin extends auth
unset($memberships, $groups);
}
- // If we only have one forum id to display or being in local mode and more than one user/group to display,
+ // If we only have one forum id to display or being in local mode and more than one user/group to display,
// we switch the complete interface to group by user/usergroup instead of grouping by forum
// To achieve this, we need to switch the array a bit
if (sizeof($forum_ids) == 1 || ($local && sizeof($ug_names_ary) > 1))
@@ -628,7 +629,7 @@ class auth_admin extends auth
// Get forum names
$sql = 'SELECT forum_id, forum_name
FROM ' . FORUMS_TABLE . '
- WHERE ' . $db->sql_in_set('forum_id', array_keys($hold_ary)) . '
+ WHERE ' . $db->sql_in_set('forum_id', array_keys($hold_ary)) . '
ORDER BY left_id';
$result = $db->sql_query($sql);
@@ -639,7 +640,7 @@ class auth_admin extends auth
$forum_names[$row['forum_id']] = $row['forum_name'];
}
$db->sql_freeresult($result);
-
+
foreach ($forum_names as $forum_id => $forum_name)
{
$auth_ary = $hold_ary[$forum_id];
@@ -1224,7 +1225,7 @@ class auth_admin extends auth
/**
* Use permissions from another user. This transferes a permission set from one user to another.
* The other user is always able to revert back to his permission set.
- * This function does not check for lower/higher permissions, it is possible for the user to gain
+ * This function does not check for lower/higher permissions, it is possible for the user to gain
* "more" permissions by this.
* Admin permissions will not be copied.
*/