Updated various internal code, altered some template var names, etc.

git-svn-id: file:///svn/phpbb/trunk@964 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-09-01 23:11:34 +00:00
parent e1a620276e
commit 71f747a252

View file

@ -43,6 +43,7 @@ require('pagestart.inc');
// Check to see what mode we should operate in. // Check to see what mode we should operate in.
// //
$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; $mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
// //
// Read a listing of uploaded smilies for use in the add or edit smliey code... // Read a listing of uploaded smilies for use in the add or edit smliey code...
// //
@ -54,28 +55,31 @@ while($file = readdir($dir))
$smiley_images[] = $file; $smiley_images[] = $file;
} }
} }
switch($mode) switch($mode)
{ {
case 'delete':
// //
// Admin has selected to delete a smiley. // Admin has selected to delete a smiley.
// //
case 'delete':
// $smiley_id = ( !empty($HTTP_GET_VARS['id']) ) ? $HTTP_GET_VARS['id'] : $HTTP_POST_VARS['id'];
// Get the data that should be passed.
// $sql = "DELETE FROM " . SMILIES_TABLE . "
$smiley_id = ($HTTP_GET_VARS['id']) ? $HTTP_GET_VARS['id']: $HTTP_POST_VARS['id']; WHERE smilies_id = " . $smiley_id;
$sql = 'DELETE FROM ' . SMILIES_TABLE . '
WHERE smilies_id = ' . $smiley_id;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if( !$result ) if( !$result )
{ {
message_die(GENERAL_ERROR, $lang['smile_remove_err'], "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, $lang['smile_remove_err'], "", __LINE__, __FILE__, $sql);
} }
$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/smile_action.tpl") "body" => "admin/smile_result_body.tpl")
); );
$template->assign_vars(array( $template->assign_vars(array(
"S_SMILEY_URL" => append_sid("admin_smilies.$phpEx"), "U_SMILEY_ADMIN" => append_sid("admin_smilies.$phpEx"),
"L_SMILEY_TITLE" => $lang['smiley_title'], "L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_TEXT" => $lang['smiley_return'], "L_SMILEY_TEXT" => $lang['smiley_return'],
"L_SMILEY_ACTION" => $lang['smiley_del_success']) "L_SMILEY_ACTION" => $lang['smiley_del_success'])
@ -85,93 +89,113 @@ switch($mode)
// //
$template->pparse("body"); $template->pparse("body");
break; break;
case 'edit':
// //
// Admin has selected to edit a smiley. // Admin has selected to edit a smiley.
// //
case 'edit':
// $smiley_id = ( !empty($HTTP_GET_VARS['id']) ) ? $HTTP_GET_VARS['id'] : $HTTP_POST_VARS['id'];
// Get the data for the selected smiley.
// $sql = "SELECT *
$smiley_id = ($HTTP_GET_VARS['id']) ? $HTTP_GET_VARS['id']: $HTTP_POST_VARS['id']; FROM " . SMILIES_TABLE . "
$sql = 'SELECT * WHERE smilies_id = " . $smiley_id;
FROM ' . SMILIES_TABLE . '
WHERE smilies_id = ' . $smiley_id;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if( !$result ) if( !$result )
{ {
message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql);
} }
$template->set_filenames(array(
"body" => "admin/smile_edit.tpl")
);
$smile_data = $db->sql_fetchrow($result); $smile_data = $db->sql_fetchrow($result);
$template->assign_vars(array(
"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"), $filename_list = "";
"L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_INSTR" => $lang['smile_instr'],
"L_SMILEY_CODE_LBL" => $lang['smiley_code'],
"L_SMILEY_URL_LBL" => $lang['smiley_url'],
"L_SMILEY_EMOTION_LBL" => $lang['smiley_emot'],
"L_SUBMIT" => $lang['Submit_changes'],
"L_RESET" => $lang['Reset_changes'],
"SMILEY_CODE_VAL" => $smile_data['code'],
"SMILEY_ID_VAL" => $smile_data['smilies_id'],
"SMILEY_URL_VAL" => $smile_data['smile_url'],
"SMILEY_EMOTION" => $smile_data['emoticon'],
"S_HIDDEN_VAR" => "save",
"S_SMILEY_BASEDIR" => $phpbb_root_path . '/' . $board_config['smilies_path'])
);
for( $i = 0; $i < count($smiley_images); $i++ ) for( $i = 0; $i < count($smiley_images); $i++ )
{ {
$smiley_selected = ($smiley_images[$i] == $smile_data['smile_url']) ? "SELECTED" : ""; if( $smiley_images[$i] == $smile_data['smile_url'] )
$template->assign_block_vars("smile_images", array( {
"FILENAME" => $smiley_images[$i], $smiley_selected = "selected=\"selected\"";
"SELECTED" => $smiley_selected) $smiley_edit_img = $smiley_images[$i];
); }
else
{
$smiley_selected = "";
} }
// $filename_list .= '<option value="' . $smiley_images[$i] . '"' . $smiley_selected . '>' . $smiley_images[$i] . '</option>';
// Spit out the edit form. }
//
$template->set_filenames(array(
"body" => "admin/smile_edit_body.tpl")
);
$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="smile_id" value="' . $smile_data['smilies_id'] . '" />';
$template->assign_vars(array(
"SMILEY_CODE" => $smile_data['code'],
"SMILEY_EMOTICON" => $smile_data['emoticon'],
"L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_CONFIG" => $lang['smiley_config'],
"L_SMILEY_EXPLAIN" => $lang['smiley_instr'],
"L_SMILEY_CODE" => $lang['smiley_code'],
"L_SMILEY_URL" => $lang['smiley_url'],
"L_SMILEY_EMOTION" => $lang['smiley_emot'],
"L_SUBMIT" => $lang['Submit_changes'],
"L_RESET" => $lang['Reset_changes'],
"SMILEY_IMG" => $phpbb_root_path . '/' . $board_config['smilies_path'] . '/' . $smiley_edit_img,
"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
"S_HIDDEN_FIELDS" => $s_hidden_fields,
"S_FILENAME_OPTIONS" => $filename_list,
"S_SMILEY_BASEDIR" => $phpbb_root_path . '/' . $board_config['smilies_path'])
);
$template->pparse("body"); $template->pparse("body");
break; break;
case "add":
// //
// Admin has selected to add a smiley. // Admin has selected to add a smiley.
// //
case "add":
$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/smile_edit.tpl") "body" => "admin/smile_edit_body.tpl")
);
$template->assign_vars(array(
"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
"L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_CONFIG" => $lang['smiley_config'],
"L_SMILEY_INSTR" => $lang['smiley_instr'],
"L_SMILEY_CODE_LBL" => $lang['smiley_code'],
"L_SMILEY_URL_LBL" => $lang['smiley_url'],
"L_SMILEY_EMOTION_LBL" => $lang['smiley_emot'],
"SMILEY_URL_VAL" => $smiley_images[0],
"L_SUBMIT" => $lang['Submit_changes'],
"L_RESET" => $lang['Reset_changes'],
"S_HIDDEN_VAR" => "savenew",
"S_SMILEY_BASEDIR" => $phpbb_root_path . '/' . $board_config['smilies_path'])
); );
$filename_list = "";
for( $i = 0; $i < count($smiley_images); $i++ ) for( $i = 0; $i < count($smiley_images); $i++ )
{ {
$template->assign_block_vars("smile_images", array( $filename_list .= '<option value="' . $smiley_images[$i] . '">' . $smiley_images[$i] . '</option>';
"FILENAME" => $smiley_images[$i])
);
} }
// $s_hidden_fields = '<input type="hidden" name="mode" value="savenew" />';
// Spit out the add form.
// $template->assign_vars(array(
"L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_CONFIG" => $lang['smiley_config'],
"L_SMILEY_EXPLAIN" => $lang['smiley_instr'],
"L_SMILEY_CODE" => $lang['smiley_code'],
"L_SMILEY_URL" => $lang['smiley_url'],
"L_SMILEY_EMOTION" => $lang['smiley_emot'],
"L_SUBMIT" => $lang['Submit_changes'],
"L_RESET" => $lang['Reset_changes'],
"SMILEY_IMG" => $phpbb_root_path . '/' . $board_config['smilies_path'] . '/' . $smiley_images[0],
"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
"S_HIDDEN_FIELDS" => $s_hidden_fields,
"S_FILENAME_OPTIONS" => $filename_list,
"S_SMILEY_BASEDIR" => $phpbb_root_path . '/' . $board_config['smilies_path'])
);
$template->pparse("body"); $template->pparse("body");
break; break;
case "save":
// //
// Admin has submitted changes while editing a smiley. // Admin has submitted changes while editing a smiley.
// //
case "save":
// //
// Get the submitted data, being careful to ensure that we only // Get the submitted data, being careful to ensure that we only
// accept the data we are looking for. // accept the data we are looking for.
@ -184,7 +208,7 @@ switch($mode)
// //
// Proceed with updating the smiley table. // Proceed with updating the smiley table.
// //
$sql = 'UPDATE ' . SMILIES_TABLE . " $sql = "UPDATE " . SMILIES_TABLE . "
SET code = '$smile_code', smile_url = '$smile_url', emoticon = '$smile_emotion' SET code = '$smile_code', smile_url = '$smile_url', emoticon = '$smile_emotion'
WHERE smilies_id = $smile_id"; WHERE smilies_id = $smile_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -192,25 +216,27 @@ switch($mode)
{ {
message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql);
} }
$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/smile_action.tpl") "body" => "admin/smile_result_body.tpl")
); );
$template->assign_vars(array( $template->assign_vars(array(
"S_SMILEY_URL" => append_sid("admin_smilies.$phpEx"), "U_SMILEY_ADMIN" => append_sid("admin_smilies.$phpEx"),
"L_SMILEY_TITLE" => $lang['smiley_title'], "L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_TEXT" => $lang['smiley_return'], "L_SMILEY_TEXT" => $lang['smiley_return'],
"L_SMILEY_ACTION" => $lang['smiley_edit_success']) "L_SMILEY_ACTION" => $lang['smiley_edit_success'])
); );
//
// Spit out a results page..
//
$template->pparse("body"); $template->pparse("body");
break; break;
case "savenew":
// //
// Admin has submitted changes while adding a new smiley. // Admin has submitted changes while adding a new smiley.
// //
case "savenew":
// //
// Get the submitted data being careful to ensure the the data // Get the submitted data being careful to ensure the the data
// we recieve and process is only the data we are looking for. // we recieve and process is only the data we are looking for.
@ -222,58 +248,51 @@ switch($mode)
// //
// Save the data to the smiley table. // Save the data to the smiley table.
// //
$sql = 'INSERT INTO ' . SMILIES_TABLE . " (code, smile_url, emoticon) $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon)
VALUES ('$smile_code', '$smile_url', '$smile_emotion')"; VALUES ('$smile_code', '$smile_url', '$smile_emotion')";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if( !$result ) if( !$result )
{ {
message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql);
} }
$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/smile_action.tpl") "body" => "admin/smile_result_body.tpl")
); );
$template->assign_vars(array( $template->assign_vars(array(
"S_SMILEY_URL" => append_sid("admin_smilies.$phpEx"), "U_SMILEY_ADMIN" => append_sid("admin_smilies.$phpEx"),
"L_SMILEY_TITLE" => $lang['smiley_title'], "L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_TEXT" => $lang['smiley_return'], "L_SMILEY_TEXT" => $lang['smiley_return'],
"L_SMILEY_ACTION" => $lang['smiley_add_success']) "L_SMILEY_ACTION" => $lang['smiley_add_success'])
); );
//
// Spit out a results page.
//
$template->pparse("body"); $template->pparse("body");
break; break;
default:
// //
// This is the main display of the page before the admin has selected // This is the main display of the page before the admin has selected
// any options. // any options.
// //
default: $sql = "SELECT *
// FROM " . SMILIES_TABLE;
// Get a listing of smileys.
//
$sql = 'SELECT *
FROM ' . SMILIES_TABLE;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if( !$result ) if( !$result )
{ {
message_die(GENERAL_ERROR, $lang['smile_load_err'], "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, $lang['smile_load_err'], "", __LINE__, __FILE__, $sql);
} }
$smilies = $db->sql_fetchrowset($result); $smilies = $db->sql_fetchrowset($result);
$total_smilies = $db->sql_numrows($result);
$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/admin_smile.tpl") "body" => "admin/smile_list_body.tpl")
); );
//
// Set the main text variables for the page. $s_hidden_fields = '<input type="hidden" name="mode" value="add">';
//
$my_path = append_sid("admin_smilies.$phpEx");
if(!ereg('\?', $my_path))
{
$my_path .= '?';
}
$template->assign_vars(array( $template->assign_vars(array(
"S_SMILEY_URL" => $my_path,
"S_SMILEY_BASEDIR" => $phpbb_root_path . '/' . $board_config['smilies_path'],
"L_ACTION" => $lang['Action'], "L_ACTION" => $lang['Action'],
"L_SMILEY_TITLE" => $lang['smiley_title'], "L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_TEXT" => $lang['smile_desc'], "L_SMILEY_TEXT" => $lang['smile_desc'],
@ -282,18 +301,24 @@ switch($mode)
"L_SMILEY_ADD" => $lang['smile_add'], "L_SMILEY_ADD" => $lang['smile_add'],
"L_CODE" => $lang['Code'], "L_CODE" => $lang['Code'],
"L_EMOT" => $lang['Emotion'], "L_EMOT" => $lang['Emotion'],
"L_SMILE" => $lang['Smile']) "L_SMILE" => $lang['Smile'],
"S_HIDDEN_FIELDS" => $s_hidden_fields,
"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"))
); );
// //
// Loop throuch the rows of smilies setting block vars for the template. // Loop throuh the rows of smilies setting block vars for the template.
// //
for( $i = 0; $i < $total_smilies; $i++ ) for( $i = 0; $i < count($smilies); $i++ )
{ {
$template->assign_block_vars("smiles", array( $template->assign_block_vars("smiles", array(
"ID" => $smilies[$i]['smilies_id'], "SMILEY_IMG" => $phpbb_root_path . '/' . $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'],
"CODE" => $smilies[$i]['code'], "CODE" => $smilies[$i]['code'],
"URL" => $smilies[$i]['smile_url'], "EMOT" => $smilies[$i]['emoticon'],
"EMOT" => $smilies[$i]['emoticon'])
"U_SMILEY_EDIT" => append_sid("admin_smilies.$phpEx?mode=edit&amp;id=" . $smilies[$i]['smilies_id']),
"U_SMILEY_DELETE" => append_sid("admin_smilies.$phpEx?mode=delete&amp;id=" . $smilies[$i]['smilies_id']))
); );
} }
// //