makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some tidy ups and fixes

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4384 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-08-12 11:56:04 +00:00
parent 232576450d
commit 7f8e853356
1 changed files with 67 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
phpBB/adm/admin_styles.php
View file

@ -16,7 +16,6 @@
// Previews of templates, imagesets, themes ... unified -> M-3 // Previews of templates, imagesets, themes ... unified -> M-3
// Add custom theme classes // Add custom theme classes
// Security review // Security review
// .zip not appearing @ area51 ...
if (!empty($setmodules)) if (!empty($setmodules))
{ {
@ -150,11 +149,8 @@ switch ($mode)
WHERE user_style = $id"; WHERE user_style = $id";
$db->sql_query($sql); $db->sql_query($sql);
break; break;
case 'edit':
} }
adm_page_header($user->lang['MANAGE_STYLE']); adm_page_header($user->lang['MANAGE_STYLE']);
?> ?>
@ -278,8 +274,6 @@ switch ($mode)
// TEMPLATES // TEMPLATES
case 'template': case 'template':
$template_id = &$id;
$tpllist = array( $tpllist = array(
'misc' => array( 'misc' => array(
'confirm_body.html', 'faq_body.html', 'index_body.html', 'message_body.html', 'viewonline_body.html', 'confirm_body.html', 'faq_body.html', 'index_body.html', 'message_body.html', 'viewonline_body.html',
@ -326,11 +320,11 @@ switch ($mode)
$tplname = (isset($_POST['tplname'])) ? htmlspecialchars($_POST['tplname']) : ''; $tplname = (isset($_POST['tplname'])) ? htmlspecialchars($_POST['tplname']) : '';
$tpldata = (!empty($_POST['tpldata'])) ? stripslashes($_POST['tpldata']) : ''; // NB : STRIPSLASHED! $tpldata = (!empty($_POST['tpldata'])) ? stripslashes($_POST['tpldata']) : ''; // NB : STRIPSLASHED!
if ($template_id) if ($id)
{ {
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_TPL_TABLE . " FROM ' . STYLES_TPL_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!(extract($db->sql_fetchrow($result)))) if (!(extract($db->sql_fetchrow($result))))
@ -361,17 +355,17 @@ switch ($mode)
// We change the path to one relative to the root rather than the theme folder // We change the path to one relative to the root rather than the theme folder
$sql = 'UPDATE ' . STYLES_TPL_TABLE . ' $sql = 'UPDATE ' . STYLES_TPL_TABLE . '
SET template_storedb = 1 SET template_storedb = 1
WHERE template_id = ' . $template_id; WHERE template_id = ' . $id;
$db->sql_query($sql); $db->sql_query($sql);
$filelist = filelist("{$phpbb_root_path}styles/$template_path/template"); $filelist = filelist("{$phpbb_root_path}styles/$template_path/template");
$filelist = array('/template' => $filelist['']); $filelist = array('/template' => $filelist['']);
store_templates('insert', $template_id, $template_path, $filelist); store_templates('insert', $id, $template_path, $filelist);
} }
$sql = 'UPDATE ' . STYLES_TPLDATA_TABLE . " $sql = 'UPDATE ' . STYLES_TPLDATA_TABLE . "
SET template_data = '" . $db->sql_escape($tpldata) . "', template_mtime = " . time() . " SET template_data = '" . $db->sql_escape($tpldata) . "', template_mtime = " . time() . "
WHERE template_id = $template_id WHERE template_id = $id
AND template_filename = '" . $db->sql_escape($tplname) . "'"; AND template_filename = '" . $db->sql_escape($tplname) . "'";
$db->sql_query($sql); $db->sql_query($sql);
@ -419,7 +413,7 @@ switch ($mode)
{ {
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_TPLDATA_TABLE . " FROM ' . STYLES_TPLDATA_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -461,7 +455,6 @@ switch ($mode)
} }
} }
// Output page // Output page
adm_page_header($user->lang['EDIT_TEMPLATE']); adm_page_header($user->lang['EDIT_TEMPLATE']);
@ -519,7 +512,7 @@ switch ($mode)
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_TPL_TABLE . " FROM ' . STYLES_TPL_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!(extract($db->sql_fetchrow($result)))) if (!(extract($db->sql_fetchrow($result))))
@ -669,7 +662,6 @@ switch ($mode)
} }
closedir($dp); closedir($dp);
// Output the page // Output the page
adm_page_header($user->lang['TEMPLATE_CACHE']); adm_page_header($user->lang['TEMPLATE_CACHE']);
@ -755,11 +747,11 @@ function viewsource(url)
break; break;
case 'refresh': case 'refresh':
if ($template_id) if ($id)
{ {
$sql = 'SELECT template_path, template_storedb $sql = 'SELECT template_path, template_storedb
FROM ' . STYLES_TPL_TABLE . " FROM ' . STYLES_TPL_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!extract($db->sql_fetchrow($result))) if (!extract($db->sql_fetchrow($result)))
@ -774,7 +766,7 @@ function viewsource(url)
$sql = 'SELECT template_filename, template_mtime $sql = 'SELECT template_filename, template_mtime
FROM ' . STYLES_TPLDATA_TABLE . " FROM ' . STYLES_TPLDATA_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -786,7 +778,7 @@ function viewsource(url)
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
store_templates('update', $template_id, $template_path, $filelist); store_templates('update', $id, $template_path, $filelist);
unset($filelist); unset($filelist);
} }
} }
@ -879,7 +871,6 @@ function viewsource(url)
$stylesheet = &$theme_data; $stylesheet = &$theme_data;
} }
// Pull out list of "custom" tags // Pull out list of "custom" tags
if (preg_match_all('#([a-z\.:]+?) {.*?}#si', $stylesheet, $matches)) if (preg_match_all('#([a-z\.:]+?) {.*?}#si', $stylesheet, $matches))
{ {
@ -939,7 +930,6 @@ function viewsource(url)
$css_element = explode('; ', ltrim(substr($matches[1], 0, -2))); $css_element = explode('; ', ltrim(substr($matches[1], 0, -2)));
} }
// User wants to submit data ... // User wants to submit data ...
if ($update) if ($update)
{ {
@ -977,7 +967,6 @@ function viewsource(url)
add_log('admin', 'LOG_EDIT_THEME', $theme_name); add_log('admin', 'LOG_EDIT_THEME', $theme_name);
} }
// I guess really this needs some basic examples, pulled from subSilver // I guess really this needs some basic examples, pulled from subSilver
// to demonstrate the default classes. Other, custom classes can just use // to demonstrate the default classes. Other, custom classes can just use
// the div/span and some text? This is gonna get nasty :( // the div/span and some text? This is gonna get nasty :(
@ -988,7 +977,6 @@ function viewsource(url)
exit; exit;
} }
// Here we pull out the appropriate class entry then proceed to pull it apart, // Here we pull out the appropriate class entry then proceed to pull it apart,
// setting appropriate variables to their respective values. We only match // setting appropriate variables to their respective values. We only match
// certain css elements, the rest are "hidden" and can be accessed by exposing // certain css elements, the rest are "hidden" and can be accessed by exposing
@ -1061,7 +1049,6 @@ function viewsource(url)
} }
} }
// Grab list of potential images for class backgrounds // Grab list of potential images for class backgrounds
$imglist = filelist("{$phpbb_root_path}styles/$theme_path/theme"); $imglist = filelist("{$phpbb_root_path}styles/$theme_path/theme");
@ -1079,7 +1066,6 @@ function viewsource(url)
$bg_imglist = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>' . $user->lang['NONE'] . '</option>' . $bg_imglist; $bg_imglist = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>' . $user->lang['NONE'] . '</option>' . $bg_imglist;
unset($imglist); unset($imglist);
// Output the page // Output the page
adm_page_header($user->lang['EDIT_THEME']); adm_page_header($user->lang['EDIT_THEME']);
@ -1352,7 +1338,6 @@ function csspreview()
$imgheight = (preg_match('#height="([0-9]+?)"#i', $$imgname, $matches)) ? $matches[1] : 0; $imgheight = (preg_match('#height="([0-9]+?)"#i', $$imgname, $matches)) ? $matches[1] : 0;
} }
// Generate list of image options // Generate list of image options
$img_options = ''; $img_options = '';
foreach ($imglist as $category => $img_ary) foreach ($imglist as $category => $img_ary)
@ -1382,7 +1367,6 @@ function csspreview()
$imagesetlist_options = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>' . $user->lang['NONE'] . '</option>' . $imagesetlist_options; $imagesetlist_options = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>' . $user->lang['NONE'] . '</option>' . $imagesetlist_options;
unset($imagesetlist); unset($imagesetlist);
adm_page_header($user->lang['EDIT_IMAGESET']); adm_page_header($user->lang['EDIT_IMAGESET']);
?> ?>
@ -1578,7 +1562,7 @@ function frontend($type, $options)
function remove($type, $id) function remove($type, $id)
{ {
global $phpbb_root_path, $SID, $config, $db, $user, $mode, $action; global $phpbb_root_path, $phpEx, $SID, $config, $db, $user, $mode, $action;
$new_id = (!empty($_POST['newid'])) ? intval($_POST['newid']) : false; $new_id = (!empty($_POST['newid'])) ? intval($_POST['newid']) : false;
$deletefs = (!empty($_POST['deletefs'])) ? true : false; $deletefs = (!empty($_POST['deletefs'])) ? true : false;
@ -2115,7 +2099,7 @@ function export($mode, $id)
{ {
if (!extension_loaded($module)) if (!extension_loaded($module))
{ {
break; continue;
} }
echo '<input type="radio" name="format" value="' . $type . '" /> .' . $type . '&nbsp;&nbsp;'; echo '<input type="radio" name="format" value="' . $type . '" /> .' . $type . '&nbsp;&nbsp;';
} }
@ -2184,6 +2168,8 @@ function store_templates($mode, $id, $path, $filelist)
} }
} }
// Does what it says in the function title ... give it a src location, array of files
// and destination
function copy_files($src, $filelist, $dst) function copy_files($src, $filelist, $dst)
{ {
global $phpbb_root_path; global $phpbb_root_path;
@ -2222,6 +2208,7 @@ function copy_files($src, $filelist, $dst)
} }
} }
// You can guess what this does ... just give it a path
function cleanup_folder($path) function cleanup_folder($path)
{ {
$filelist = filelist($path, '', '*'); $filelist = filelist($path, '', '*');
@ -2242,6 +2229,7 @@ function cleanup_folder($path)
@rmdir("$path"); @rmdir("$path");
} }
// Is this element installed? If not, grab its cfg details
function test_installed($element, $root_path, $reqd_name, &$id, &$name, &$copyright) function test_installed($element, $root_path, $reqd_name, &$id, &$name, &$copyright)
{ {
global $db, $user; global $db, $user;
@ -2299,6 +2287,7 @@ function test_installed($element, $root_path, $reqd_name, &$id, &$name, &$copyri
return true; return true;
} }
// Install an element, doing various checks as we go
function install_element($type, $action, $root_path, &$id, $name, $copyright, $storedb = 0) function install_element($type, $action, $root_path, &$id, $name, $copyright, $storedb = 0)
{ {
global $phpbb_root_path, $db, $user; global $phpbb_root_path, $db, $user;
@ -2421,6 +2410,7 @@ function install_element($type, $action, $root_path, &$id, $name, $copyright, $s
add_log('admin', $log, $name); add_log('admin', $log, $name);
} }
// Commented inline
function install($type, $action, $id) function install($type, $action, $id)
{ {
global $phpbb_root_path, $phpEx, $SID, $config, $db, $user; global $phpbb_root_path, $phpEx, $SID, $config, $db, $user;
@ -2973,7 +2963,7 @@ function install($type, $action, $id)
if ($type != 'imageset' && sizeof($sql_ary)) if ($type != 'imageset' && sizeof($sql_ary))
{ {
echo $sql = "UPDATE $sql_from $sql = "UPDATE $sql_from
SET " . $db->sql_build_array('UPDATE', $sql_ary) . " SET " . $db->sql_build_array('UPDATE', $sql_ary) . "
WHERE {$type}_id = $id"; WHERE {$type}_id = $id";
$db->sql_query($sql); $db->sql_query($sql);
@ -3109,8 +3099,31 @@ function install($type, $action, $id)
} }
if ($type == 'template' || $type == 'theme')
{
$storedb_no = (!$storedb) ? ' checked="checked"' : '';
$storedb_yes = ($storedb) ? ' checked="checked"' : '';
?>
<tr>
<td class="row1" width="40%"><b><?php echo $user->lang[$l_type . '_LOCATION']; ?>:</b><br /><span class="gensmall"><?php echo $user->lang[$l_type . '_LOCATION_EXPLAIN']; ?></span></td>
<td class="row2"><input type="radio" name="storedb" value="0"<?php echo $storedb_no; ?> /> <?php echo $user->lang['STORE_FILESYSTEM']; ?>&nbsp;&nbsp;<input type="radio" name="storedb" value="1"<?php echo $storedb_yes; ?> /> <?php echo $user->lang['STORE_DATABASE']; ?></td>
</tr>
<?php
}
// Import, upload and basis options // Import, upload and basis options
if ($action == 'add' && !$basis && !$safe_mode && is_writeable("{$phpbb_root_path}styles")) if ($action == 'add' && !$safe_mode && is_writeable("{$phpbb_root_path}styles"))
{
?>
<tr>
<th colspan="2"><?php echo $user->lang['OPTIONS']; ?></th>
</tr>
<?php
if (!$basis)
{ {
$store_options = ''; $store_options = '';
$dp = @opendir("{$phpbb_root_path}store"); $dp = @opendir("{$phpbb_root_path}store");
@ -3125,12 +3138,6 @@ function install($type, $action, $id)
$store_options = '<option value="">' . $user->lang['NO_IMPORT'] . '</option>' . $store_options; $store_options = '<option value="">' . $user->lang['NO_IMPORT'] . '</option>' . $store_options;
?>
<tr>
<th colspan="2"><?php echo $user->lang['EXISTING_' . $l_type]; ?></th>
</tr>
<?php
if ($file_uploads) if ($file_uploads)
{ {
@ -3151,6 +3158,18 @@ function install($type, $action, $id)
<?php <?php
} }
else if ($basis)
{
?>
<tr>
<td class="row1" width="40%"><b><?php echo $user->lang[$l_type . '_BASIS']; ?>: </b></td>
<td class="row2"><b><?php echo ${$type . '_name'}; ?></b></td>
</tr>
<?php
}
}
if ($type == 'style') if ($type == 'style')
{ {
@ -3181,21 +3200,6 @@ function install($type, $action, $id)
} }
} }
else if ($type != 'imageset')
{
$storedb_no = (!$storedb) ? ' checked="checked"' : '';
$storedb_yes = ($storedb) ? ' checked="checked"' : '';
?>
<tr>
<td class="row1" width="40%"><b><?php echo $user->lang[$l_type . '_LOCATION']; ?>:</b><br /><span class="gensmall"><?php echo $user->lang[$l_type . '_LOCATION_EXPLAIN']; ?></span></td>
<td class="row2"><input type="radio" name="storedb" value="0"<?php echo $storedb_no; ?> /> <?php echo $user->lang['STORE_FILESYSTEM']; ?>&nbsp;&nbsp;<input type="radio" name="storedb" value="1"<?php echo $storedb_yes; ?> /> <?php echo $user->lang['STORE_DATABASE']; ?></td>
</tr>
<?php
}
?> ?>
<tr> <tr>