Menu
▾
▴
[mxbb-commits] core/admin admin_mx_smilies.php,1.11,1.12
|
From: FlorinCB <ory...@us...> - 2008-06-18 16:14:07
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12510 Modified Files: admin_mx_smilies.php Log Message: smilies.pak fixed for all backends Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin_mx_smilies.php 18 Jun 2008 06:20:56 -0000 1.11 --- admin_mx_smilies.php 18 Jun 2008 16:13:59 -0000 1.12 *************** *** 37,50 **** } - /* - $mx_root_path = "./../"; - require($mx_root_path . 'extension.inc'); - - $cancel = $mx_request_vars->is_post('cancel'); - $no_page_header = $cancel; - - require('./pagestart.' . $phpEx); - */ - // // Security and Page header --- 37,40 ---- *************** *** 67,71 **** $cancel = $mx_request_vars->is_post('cancel'); ! $no_page_header = $cancel; require('./pagestart.' . $phpEx); --- 57,61 ---- $cancel = $mx_request_vars->is_post('cancel'); ! require('./pagestart.' . $phpEx); *************** *** 73,77 **** // Load default header // ! include_once('./page_header_admin.' . $phpEx); if ($cancel) --- 63,70 ---- // Load default header // ! if ($no_page_header === false) ! { ! include_once('./page_header_admin.' . $phpEx); ! } if ($cancel) *************** *** 93,120 **** } - $delimeter = '=+:'; - switch (PORTAL_BACKEND) { case 'internal': $smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed ! $smiley_root_path = $phpbb_root_path; //same here $smiley_url = 'smile_url'; $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; break; case 'phpbb2': $smiley_path_url = PHPBB_URL; ! $smiley_root_path = $phpbb_root_path; $smiley_url = 'smile_url'; $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; break; case 'phpbb3': $smiley_path_url = PHPBB_URL; ! $smiley_root_path = $phpbb_root_path; $smiley_url = 'smiley_url'; $smiley_id = 'smiley_id'; ! $emotion = 'emotion'; $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); break; --- 86,120 ---- } switch (PORTAL_BACKEND) { case 'internal': $smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed ! $smiley_root_path = $phpbb_root_path; //same here ! $fields = 'smilies'; $smiley_url = 'smile_url'; $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; ! $table = SMILIES_TABLE; ! $delimeter = '=+:'; break; case 'phpbb2': $smiley_path_url = PHPBB_URL; ! $smiley_root_path = $phpbb_root_path; ! $fields = 'smilies'; $smiley_url = 'smile_url'; $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; ! $table = SMILIES_TABLE; ! $delimeter = '=+:'; break; case 'phpbb3': $smiley_path_url = PHPBB_URL; ! $smiley_root_path = $phpbb_root_path; ! $fields = 'smiley'; $smiley_url = 'smiley_url'; $smiley_id = 'smiley_id'; ! $emotion = 'emotion'; ! $table = SMILIES_TABLE; ! $delimeter = ', '; $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); break; *************** *** 165,169 **** { $sql = "DELETE ! FROM " . SMILIES_TABLE; if( !$result = $db->sql_query($sql) ) { --- 165,169 ---- { $sql = "DELETE ! FROM " . $table; if( !$result = $db->sql_query($sql) ) { *************** *** 174,178 **** { $sql = "SELECT code ! FROM ". SMILIES_TABLE; if( !$result = $db->sql_query($sql) ) { --- 174,178 ---- { $sql = "SELECT code ! FROM ". $table; if( !$result = $db->sql_query($sql) ) { *************** *** 217,221 **** case 'internal': case 'phpbb2': ! $sql = "UPDATE " . SMILIES_TABLE . " SET smile_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "' WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; --- 217,221 ---- case 'internal': case 'phpbb2': ! $sql = "UPDATE " . $table . " SET smile_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "' WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; *************** *** 223,227 **** case 'phpbb3': ! $sql = "UPDATE " . SMILIES_TABLE . " SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emotion = '" . str_replace("\'", "''", $smile_data[1]) . "' WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; --- 223,227 ---- case 'phpbb3': ! $sql = "UPDATE " . $table . " SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emotion = '" . str_replace("\'", "''", $smile_data[1]) . "' WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; *************** *** 240,249 **** case 'internal': case 'phpbb2': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon) VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; case 'phpbb3': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emotion) VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; --- 240,249 ---- case 'internal': case 'phpbb2': ! $sql = "INSERT INTO " . $table . " (code, smile_url, emoticon) VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; case 'phpbb3': ! $sql = "INSERT INTO " . $table . " (code, smiley_url, emotion) VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; *************** *** 314,319 **** if ($mx_request_vars->get('export_pack', MX_TYPE_NO_TAGS) == "send" ) { ! $sql = "SELECT * ! FROM " . SMILIES_TABLE; if( !$result = $db->sql_query($sql) ) { --- 314,334 ---- if ($mx_request_vars->get('export_pack', MX_TYPE_NO_TAGS) == "send" ) { ! //$gen_simple_header = true; ! ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT * ! FROM " . SMILIES_TABLE; ! break; ! ! case 'phpbb3': ! $sql = 'SELECT * ! FROM ' . SMILIES_TABLE . ' ! ORDER BY smiley_order'; ! break; ! } ! if( !$result = $db->sql_query($sql) ) { *************** *** 322,342 **** $resultset = $db->sql_fetchrowset($result); ! $smile_pak = ""; ! for($i = 0; $i < count($resultset); $i++ ) { ! $smile_pak .= $resultset[$i][$smiley_url] . $delimeter; ! $smile_pak .= $resultset[$i][$emotion] . $delimeter; ! $smile_pak .= $resultset[$i]['code'] . "\n"; } ! header("Content-Type: text/x-delimtext; name=\"smiles.pak\""); ! header("Content-disposition: attachment; filename=smiles.pak"); ! echo $smile_pak; ! exit; } - $message = sprintf($lang['export_smiles'], "<a href=\"" . mx_append_sid("admin_mx_smilies.$phpEx?export_pack=send", true) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . mx_append_sid("admin_mx_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); --- 337,387 ---- $resultset = $db->sql_fetchrowset($result); ! $smile_pak = ""; ! switch (PORTAL_BACKEND) { ! case 'internal': ! case 'phpbb2': ! for($i = 0; $i < count($resultset); $i++ ) ! { ! $smile_pak .= $resultset[$i][$smiley_url] . $delimeter; ! $smile_pak .= $resultset[$i]['emoticon'] . $delimeter; ! $smile_pak .= $resultset[$i]['code'] . "\n"; ! } ! break; ! ! case 'phpbb3': ! for($i = 0; $i < count($resultset); $i++ ) ! { ! $smile_pak .= "'" . addslashes($resultset[$i][$smiley_url]) . "'" . $delimeter; ! $smile_pak .= "'" . addslashes($resultset[$i][$fields . '_width']) . "'" . $delimeter; ! $smile_pak .= "'" . addslashes($resultset[$i][$fields . '_height']) . "'" . $delimeter; ! $smile_pak .= "'" . addslashes($resultset[$i]['display_on_posting']) . "'" . $delimeter; ! $smile_pak .= "'" . addslashes($resultset[$i][$emotion]) . "'" . $delimeter; ! $smile_pak .= "'" . addslashes($resultset[$i]['code']) . "'" . $delimeter . "\n"; ! } ! break; } + $db->sql_freeresult($result); ! if ($smile_pak != '') ! { ! //garbage_collection(); ! header('Pragma: public'); ! header ('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); ! // Send out the Headers ! header('Content-Type: text/x-delimtext; name="smilies.pak"'); ! header('Content-Disposition: inline; filename="smilies.pak"'); ! echo $smile_pak; ! flush(); ! exit; ! } ! else ! { ! mx_message_die(GENERAL_MESSAGE, 'Error'); ! } } $message = sprintf($lang['export_smiles'], "<a href=\"" . mx_append_sid("admin_mx_smilies.$phpEx?export_pack=send", true) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . mx_append_sid("admin_mx_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); *************** *** 395,399 **** if ($mx_request_vars->is_post('confirm')) { ! $sql = "DELETE FROM " . SMILIES_TABLE . " WHERE smilies_id = " . $smiley_id; $result = $db->sql_query($sql); --- 440,444 ---- if ($mx_request_vars->is_post('confirm')) { ! $sql = "DELETE FROM " . $table . " WHERE smilies_id = " . $smiley_id; $result = $db->sql_query($sql); *************** *** 442,446 **** case 'phpbb2': $sql = "SELECT * ! FROM " . SMILIES_TABLE . " WHERE smilies_id = " . $smiley_id; break; --- 487,491 ---- case 'phpbb2': $sql = "SELECT * ! FROM " . $table . " WHERE smilies_id = " . $smiley_id; break; *************** *** 448,452 **** case 'phpbb3': $sql = "SELECT * ! FROM " . SMILIES_TABLE . " WHERE smiley_id = " . $smiley_id; break; --- 493,497 ---- case 'phpbb3': $sql = "SELECT * ! FROM " . $table . " WHERE smiley_id = " . $smiley_id; break; *************** *** 481,489 **** ); ! $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[$emotion], "L_SMILEY_TITLE" => $lang['smiley_title'], --- 526,538 ---- ); ! $s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="smile_id" value="' . $smile_data[$smiley_id] . '" />'; $template->assign_vars(array( ! 'SMILEY_URL' => addslashes($smile_data[$smiley_url]), ! 'SMILEY_CODE' => addslashes($smile_data['code']), ! 'SMILEY_EMOTICON' => addslashes($smile_data[$emotion]), ! 'SMILEY_WIDTH' => (PORTAL_BACKEND === 'phpbb3') ? $smile_data['smiley_width'] : '', ! 'SMILEY_HEIGHT' => (PORTAL_BACKEND === 'phpbb3') ? $smile_data['smiley_height'] : '', ! 'SMILEY_ORDER' => (PORTAL_BACKEND === 'phpbb3') ? $smile_data['smiley_order'] + 1 : '', "L_SMILEY_TITLE" => $lang['smiley_title'], *************** *** 523,526 **** --- 572,583 ---- $smile_code = trim($smile_code); $smile_url = trim($smile_url); + + if (PORTAL_BACKEND === 'phpbb3') + { + $smiley_width = $mx_request_vars->post('smile_width', MX_TYPE_NO_HTML); + $smiley_height = $mx_request_vars->post('smile_height', MX_TYPE_NO_HTML); + $smiley_order = $mx_request_vars->post('smile_order', MX_TYPE_NO_HTML); + } + // If no code was entered complain ... *************** *** 543,547 **** case 'internal': case 'phpbb2': ! $sql = "UPDATE " . SMILIES_TABLE . " SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "' WHERE smilies_id = $smile_id"; --- 600,604 ---- case 'internal': case 'phpbb2': ! $sql = "UPDATE " . $table . " SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "' WHERE smilies_id = $smile_id"; *************** *** 549,555 **** case 'phpbb3': ! $sql = "UPDATE " . SMILIES_TABLE . " ! SET code = '" . str_replace("\'", "''", $smile_code) . "', smiley_url = '" . str_replace("\'", "''", $smile_url) . "', emotion = '" . str_replace("\'", "''", $smile_emotion) . "' ! WHERE smiley_id = $smile_id"; break; } --- 606,621 ---- case 'phpbb3': ! $sql = array( ! 'emotion' => $smile_emotion, ! $fields . '_url' => $smile_url, ! $fields . '_height' => (int) $smiley_height, ! $fields . '_width' => (int) $smiley_width, ! $fields . '_order' => (int) $smiley_order, ! 'display_on_posting'=> (int) $display_on_posting, ! ); ! ! $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . " ! WHERE $field_sql = '" . $db->sql_escape($smile_code) . "'"; ! $db->sql_query($sql); break; } *************** *** 580,583 **** --- 646,657 ---- $smile_code = trim($smile_code); $smile_url = trim($smile_url); + + if (PORTAL_BACKEND === 'phpbb3') + { + $smiley_width = $mx_request_vars->post('smile_width', MX_TYPE_NO_HTML); + $smiley_height = $mx_request_vars->post('smile_height', MX_TYPE_NO_HTML); + $smiley_order = $mx_request_vars->post('smile_order', MX_TYPE_NO_HTML); + $display_on_posting = $mx_request_vars->request('display', MX_TYPE_INT, 1); + } // If no code was entered complain ... *************** *** 600,604 **** case 'internal': case 'phpbb2': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon) VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; $result = $db->sql_query($sql); --- 674,678 ---- case 'internal': case 'phpbb2': ! $sql = "INSERT INTO " . $table . " (code, smile_url, emoticon) VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; $result = $db->sql_query($sql); *************** *** 606,612 **** case 'phpbb3': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emotion) ! VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; ! $result = $db->sql_query($sql); break; } --- 680,693 ---- case 'phpbb3': ! $sql = array( ! 'code' => $smile_code, ! 'emotion' => $smile_emotion, ! $fields . '_url' => $smile_url, ! $fields . '_height' => (int) $smiley_height, ! $fields . '_width' => (int) $smiley_width, ! $fields . '_order' => (int) $smiley_order, ! 'display_on_posting'=> (int) $display_on_posting, ! ); ! $db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql)); break; } *************** *** 631,637 **** // any options. // ! $sql = "SELECT * ! FROM " . SMILIES_TABLE; ! $result = $db->sql_query($sql); if( !$result ) { --- 712,731 ---- // any options. // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT * ! FROM " . $table; ! $result = $db->sql_query($sql); ! break; ! ! case 'phpbb3': ! $sql = 'SELECT * ! FROM ' . $table . ' ! ORDER BY smiley_order'; ! $result = $db->sql_query($sql); ! break; ! } if( !$result ) { |
