diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-13 23:29:22 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-13 23:29:22 +0000 |
| commit | 7668388b4ed9fddc95e6740da0e6fb3c97edb187 (patch) | |
| tree | 896e035591d2d4acff7c9bd6a9d68a49e8179206 /phpBB/includes/functions.php | |
| parent | 2c400376a17e981bffd7e07de474cc20400a7457 (diff) | |
| download | forums-7668388b4ed9fddc95e6740da0e6fb3c97edb187.tar forums-7668388b4ed9fddc95e6740da0e6fb3c97edb187.tar.gz forums-7668388b4ed9fddc95e6740da0e6fb3c97edb187.tar.bz2 forums-7668388b4ed9fddc95e6740da0e6fb3c97edb187.tar.xz forums-7668388b4ed9fddc95e6740da0e6fb3c97edb187.zip | |
More styling stuff ... activate, deactivate styles ... deactivated styles can still be used in forum/board styling selectors
git-svn-id: file:///svn/phpbb/trunk@4253 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index a6be30a4e9..96d5c867d9 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -56,9 +56,9 @@ function get_userdata($user) { global $db; - $sql = "SELECT * - FROM " . USERS_TABLE . " - WHERE "; + $sql = 'SELECT * + FROM ' . USERS_TABLE . ' + WHERE '; $sql .= ((is_integer($user)) ? "user_id = $user" : "username = '" . $db->sql_escape($user) . "'") . " AND user_id <> " . ANONYMOUS; $result = $db->sql_query($sql); @@ -318,14 +318,15 @@ function language_select($default = '') } // Pick a template/theme combo, -function style_select($default = '') +function style_select($default = '', $all = false) { global $db; + $sql_where = (!$all) ? 'WHERE style_active = 1 ' : ''; $sql = 'SELECT style_id, style_name - FROM ' . STYLES_TABLE . ' - WHERE style_active = 1 - ORDER BY style_name'; + FROM ' . STYLES_TABLE . " + $sql_where + ORDER BY style_name"; $result = $db->sql_query($sql); $style_options = ''; @@ -735,8 +736,8 @@ function obtain_word_list(&$censors) } else { - $sql = "SELECT word, replacement - FROM " . WORDS_TABLE; + $sql = 'SELECT word, replacement + FROM ' . WORDS_TABLE; $result = $db->sql_query($sql); $censors = array(); @@ -769,9 +770,9 @@ function obtain_icons(&$icons) else { // Topic icons - $sql = "SELECT * - FROM " . ICONS_TABLE . " - ORDER BY icons_order"; + $sql = 'SELECT * + FROM ' . ICONS_TABLE . ' + ORDER BY icons_order'; $result = $db->sql_query($sql); $icons = array(); @@ -843,10 +844,10 @@ function obtain_attach_extensions(&$extensions) else { // Don't count on forbidden extensions table, because it is not allowed to allow forbidden extensions at all - $sql = "SELECT e.extension, g.* - FROM " . EXTENSIONS_TABLE . " e, " . EXTENSION_GROUPS_TABLE . " g + $sql = 'SELECT e.extension, g.* + FROM ' . EXTENSIONS_TABLE . ' e, ' . EXTENSION_GROUPS_TABLE . ' g WHERE e.group_id = g.group_id - AND g.allow_group = 1"; + AND g.allow_group = 1'; $result = $db->sql_query($sql); $extensions = array(); |