Menu
▾
▴
[mxbb-commits] mx_contact/admin admin_contact.php, 1.5, 1.6 admin_mass_mail.php, 1.8, 1.9 admin_mass_newsletter.php, 1.9, 1.10
|
From: FlorinCB <ory...@us...> - 2008-12-25 18:19:11
|
Update of /cvsroot/mxbb/mx_contact/admin In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15597/admin Modified Files: admin_contact.php admin_mass_mail.php admin_mass_newsletter.php Log Message: new version Index: admin_mass_mail.php =================================================================== RCS file: /cvsroot/mxbb/mx_contact/admin/admin_mass_mail.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** admin_mass_mail.php 25 Dec 2008 16:56:50 -0000 1.8 --- admin_mass_mail.php 25 Dec 2008 18:19:06 -0000 1.9 *************** *** 226,231 **** } - $domainkey_signature = $contact_config['domainkey_signature']; - $emailer = new emailer($board_config['smtp_delivery']); --- 226,229 ---- *************** *** 243,247 **** $email_antetes .= "Content-Transfer-Encoding: 8bit" . "\n"; // 7bit ! $email_antetes .= "DomainKey-Signature: a=rsa-sha1; c=nofws; d=" . $portal_config['server_name'] . "; s=gamma; h=message-id:date:from:to:subject:cc:bcc:in-reply-to:return-path:mime-version:message-id:date:content-type:content-transfer-encoding:references;b=" . $domainkey_signature . "\n"; $email_antetes .= "X-Priority: 3" . "\n"; --- 241,245 ---- $email_antetes .= "Content-Transfer-Encoding: 8bit" . "\n"; // 7bit ! $email_antetes .= "DomainKey-Signature: a=rsa-sha1; c=nofws; d=" . $portal_config['server_name'] . "; s=gamma; h=message-id:date:from:to:subject:cc:bcc:in-reply-to:return-path:mime-version:message-id:date:content-type:content-transfer-encoding:references; b=" . $contact_config['domainkey_signature'] . "\n"; $email_antetes .= "X-Priority: 3" . "\n"; *************** *** 254,259 **** $email_antetes .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n"; $email_antetes .= "X-AntiAbuse: UserName - " . $userdata['username'] . "\n"; - $email_antetes .= "X-AntiAbuse: User_Level - " . ($userdata['user_level'] == ADMIN) ? "Portal Admin" : "User Level: " . $userdata['user_level'] . "\n"; $email_antetes .= "X-AntiAbuse: User_IP - " . contact_decode_ip($user_ip) . "\n"; $emailer->set_mail_html(true); --- 252,257 ---- $email_antetes .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n"; $email_antetes .= "X-AntiAbuse: UserName - " . $userdata['username'] . "\n"; $email_antetes .= "X-AntiAbuse: User_IP - " . contact_decode_ip($user_ip) . "\n"; + $email_antetes .= "X-AntiAbuse: User_Level - " . ($userdata['user_level'] == ADMIN) ? "Portal Admin" : "User Level: " . $userdata['user_level'] . "\n"; $emailer->set_mail_html(true); Index: admin_mass_newsletter.php =================================================================== RCS file: /cvsroot/mxbb/mx_contact/admin/admin_mass_newsletter.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_mass_newsletter.php 25 Dec 2008 16:56:50 -0000 1.9 --- admin_mass_newsletter.php 25 Dec 2008 18:19:06 -0000 1.10 *************** *** 49,53 **** // Read language definition // ********************************************************************** ! if ( !file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) { --- 49,53 ---- // Read language definition // ********************************************************************** ! /* if ( !file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) { *************** *** 58,61 **** --- 58,62 ---- include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); } + */ // *************** *** 227,232 **** } - $domainkey_signature = $contact_config['domainkey_signature']; - $emailer = new emailer($board_config['smtp_delivery']); --- 228,231 ---- *************** *** 244,248 **** $email_antetes .= "Content-Transfer-Encoding: 8bit" . "\n"; // 7bit ! $email_antetes .= "DomainKey-Signature: a=rsa-sha1; c=nofws; d=" . $portal_config['server_name'] . "; s=gamma; h=message-id:date:from:to:subject:cc:bcc:in-reply-to:return-path:mime-version:message-id:date:content-type:content-transfer-encoding:references;b=" . $domainkey_signature . "\n"; $email_antetes .= "X-Priority: 3" . "\n"; --- 243,247 ---- $email_antetes .= "Content-Transfer-Encoding: 8bit" . "\n"; // 7bit ! $email_antetes .= "DomainKey-Signature: a=rsa-sha1; c=nofws; d=" . $portal_config['server_name'] . "; s=gamma; h=message-id:date:from:to:subject:cc:bcc:in-reply-to:return-path:mime-version:message-id:date:content-type:content-transfer-encoding:references; b=" . $contact_config['domainkey_signature'] . "\n"; $email_antetes .= "X-Priority: 3" . "\n"; *************** *** 255,260 **** $email_antetes .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n"; $email_antetes .= "X-AntiAbuse: UserName - " . $userdata['username'] . "\n"; $email_antetes .= "X-AntiAbuse: User_Level - " . ($userdata['user_level'] == ADMIN) ? "Portal Admin" : "User Level: " . $userdata['user_level'] . "\n"; ! $email_antetes .= "X-AntiAbuse: User_IP - " . contact_decode_ip($user_ip) . "\n"; $emailer->set_mail_html(true); --- 254,260 ---- $email_antetes .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n"; $email_antetes .= "X-AntiAbuse: UserName - " . $userdata['username'] . "\n"; + $email_antetes .= "X-AntiAbuse: User_IP - " . contact_decode_ip($user_ip) . "\n"; $email_antetes .= "X-AntiAbuse: User_Level - " . ($userdata['user_level'] == ADMIN) ? "Portal Admin" : "User Level: " . $userdata['user_level'] . "\n"; ! $emailer->set_mail_html(true); *************** *** 266,270 **** $emailer->email_address($board_config['board_email']); $emailer->set_subject(htmlspecialchars_decode($subject)); ! $emailer->extra_headers($email_headers); $emailer->assign_vars(array( --- 266,270 ---- $emailer->email_address($board_config['board_email']); $emailer->set_subject(htmlspecialchars_decode($subject)); ! $emailer->extra_headers($email_antetes); $emailer->assign_vars(array( Index: admin_contact.php =================================================================== RCS file: /cvsroot/mxbb/mx_contact/admin/admin_contact.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_contact.php 25 Dec 2008 16:56:50 -0000 1.5 --- admin_contact.php 25 Dec 2008 18:19:06 -0000 1.6 *************** *** 27,86 **** include_once( $module_root_path . 'includes/contact_constants.' . $phpEx ); - // ********************************************************************** - // Read language definition - // ********************************************************************** - if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) - { - include_once($module_root_path . 'language/lang_english/lang_main.'.$phpEx); - $link_language = 'lang_english'; - } - else - { - include_once($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx); - $link_language = 'lang_' . $board_config['default_lang']; - } - - // - // Pull all config data - // - $sql = "SELECT * - FROM " . CONTACT_CONFIG_TABLE; - - if(!$result = $db->sql_query($sql)) - { - mx_message_die(CRITICAL_ERROR, 'Could not query contact config information', '', __LINE__, __FILE__, $sql); - } - else - { - while($row = $db->sql_fetchrow($result)) - { - $contact_config[$row['config_name']] = $row['config_value']; - $config_name = $row['config_name']; - $config_value = $row['config_value']; - - $default_config[$config_name] = isset($HTTP_POST_VARS['submit']) ? str_replace("'", "\'", $config_value) : $config_value; - - $new[$config_name] = (isset($HTTP_POST_VARS[$config_name])) ? $HTTP_POST_VARS[$config_name] : $default_config[$config_name]; - - if ($mx_request_vars->is_post('submit')) - { - $sql = "UPDATE " . CONTACT_CONFIG_TABLE . " - SET config_value = '" . str_replace("\'", "''", $new[$config_name]) . "' - WHERE config_name = '$config_name'"; - - if(!$db->sql_query($sql)) - { - mx_message_die(GENERAL_ERROR, 'Failed to update general configuration for $config_name', '', __LINE__, __FILE__, $sql); - } - } - } - - if ($mx_request_vars->is_post('submit')) - { - $message = $lang['Contact_updated'] . "<br /><br />" . sprintf($lang['Click_return_contact'], "<a href=\"" . mx_append_sid("admin_contact.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); - mx_message_die(GENERAL_MESSAGE, $message); - } - } - // Contact Captcha define('CAPTCHA_TYPE_IMAGE', 0); --- 27,30 ---- |
