Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Culprit <cul...@us...> - 2008-02-28 14:02:49
|
Update of /cvsroot/mxbb/core/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15739/templates/prosilver Modified Files: overall_header_navigation.html Log Message: Fixed IF/THEN/ELSE :: closing ENDIF Index: overall_header_navigation.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header_navigation.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** overall_header_navigation.html 21 Feb 2008 20:04:45 -0000 1.13 --- overall_header_navigation.html 28 Feb 2008 14:02:43 -0000 1.14 *************** *** 136,140 **** <!-- IF USER_LOGGED_OUT --> <li class="icon-register"><a href="{U_REGISTER}" class="mainmenu">{L_REGISTER}</a></li> ! <!-- END switch_user_logged_out --> <li class="icon-logout"><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></li> </ul> --- 136,140 ---- <!-- IF USER_LOGGED_OUT --> <li class="icon-register"><a href="{U_REGISTER}" class="mainmenu">{L_REGISTER}</a></li> ! <!-- ENDIF --> <li class="icon-logout"><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></li> </ul> |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:54
|
Update of /cvsroot/mxbb/mx_phpCA/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_phpCA/admin Modified Files: admin_ads_categ.php admin_ads_cfg.php admin_ads_ext.php Log Message: cvs commit test Index: admin_ads_categ.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/admin/admin_ads_categ.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_ads_categ.php 6 Jun 2007 22:24:28 -0000 1.1 --- admin_ads_categ.php 28 Feb 2008 06:26:17 -0000 1.2 *************** *** 1,22 **** ! <? ! /*************************************************************************** ! * admin_ads_categ.php ! * ------------------- ! * begin : Wednesday, Feb 15, 2006 ! * copyright : (C) 2006 Peter Mansion ! * email : su...@ph... ! * ! * $Id$ ! * ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ define('IN_PORTAL', 1); --- 1,11 ---- ! <?php ! /** ! * ! * @package mxBB Portal Module - mx_phpCA ! * @version $Id$ ! * @copyright (c) 2002-2006 [Peter Mansion, su...@ph...] mxBB Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * ! */ define('IN_PORTAL', 1); *************** *** 63,69 **** // Mode setting // ! if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) { ! $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; $mode = htmlspecialchars($mode); } --- 52,58 ---- // Mode setting // ! if ( isset($_POST['mode']) || isset($HTTP_GET_VARS['mode']) ) { ! $mode = ( isset($_POST['mode']) ) ? $_POST['mode'] : $HTTP_GET_VARS['mode']; $mode = htmlspecialchars($mode); } *************** *** 73,77 **** } ! if ( $HTTP_POST_VARS[cancel] ) { $mode = ""; --- 62,66 ---- } ! if ( $_POST[cancel] ) { $mode = ""; *************** *** 87,91 **** //Checks to see if the category, name, message or email fields are empty. ! if ( empty($HTTP_POST_VARS[category]) or empty($HTTP_POST_VARS[sub_category]) ) { mx_message_die(GENERAL_ERROR, $lang['create_category_instructions'], "", __LINE__, __FILE__); --- 76,80 ---- //Checks to see if the category, name, message or email fields are empty. ! if ( empty($_POST[category]) && empty($_POST[sub_category]) ) { mx_message_die(GENERAL_ERROR, $lang['create_category_instructions'], "", __LINE__, __FILE__); *************** *** 93,98 **** // Sanitize input data ! $category = htmlspecialchars($HTTP_POST_VARS[category]); ! $sub_category = htmlspecialchars($HTTP_POST_VARS[sub_category]); // Extra sanitize for SQL variables --- 82,87 ---- // Sanitize input data ! $category = htmlspecialchars($_POST[category]); ! $sub_category = empty($_POST[sub_category]) ? $category : htmlspecialchars($_POST[sub_category]); // Extra sanitize for SQL variables *************** *** 105,109 **** if ( $db->sql_query($sql) ) { ! $message = $lang['category_creation_conf'] . "<br /><br />" . sprintf($lang['ads_click_return_categories'], "<a href=\"" . append_sid("admin_ads_categ.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); } --- 94,98 ---- if ( $db->sql_query($sql) ) { ! $message = $lang['category_creation_conf'] . "<br /><br />" . sprintf($lang['ads_click_return_categories'], "<a href=\"" . append_sid("admin_ads_categ.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); } *************** *** 166,170 **** $sub_category = str_replace("\'", "''", $sub_category); ! if ( $HTTP_POST_VARS[confirm] ) { if ( $sub_category ) --- 155,159 ---- $sub_category = str_replace("\'", "''", $sub_category); ! if ( $_POST[confirm] ) { if ( $sub_category ) *************** *** 199,206 **** case 'edit': ! if ( isset($HTTP_POST_VARS['submit']) ) { ! if ( empty($HTTP_POST_VARS[category] ) ! or empty($HTTP_POST_VARS[sub_category]) ) { mx_message_die(GENERAL_ERROR, "Invalid edit request", "", __LINE__, __FILE__); --- 188,195 ---- case 'edit': ! if ( isset($_POST['submit']) ) { ! if ( empty($_POST[category] ) ! or empty($_POST[sub_category]) ) { mx_message_die(GENERAL_ERROR, "Invalid edit request", "", __LINE__, __FILE__); *************** *** 209,216 **** if ( file_exists("admin_ads_paid_ads.$phpEx") ) { ! $basic_cost = intval($HTTP_POST_VARS[basic_cost]); ! $standard_cost = intval($HTTP_POST_VARS[standard_cost]); ! $photo_cost = intval($HTTP_POST_VARS[photo_cost]); ! $premium_cost = intval($HTTP_POST_VARS[premium_cost]); } else --- 198,205 ---- if ( file_exists("admin_ads_paid_ads.$phpEx") ) { ! $basic_cost = intval($_POST[basic_cost]); ! $standard_cost = intval($_POST[standard_cost]); ! $photo_cost = intval($_POST[photo_cost]); ! $premium_cost = intval($_POST[premium_cost]); } else *************** *** 222,243 **** } ! $category = htmlspecialchars($HTTP_POST_VARS[category]); ! $sub_category = htmlspecialchars($HTTP_POST_VARS[sub_category]); ! $field_1_desc = htmlspecialchars($HTTP_POST_VARS[field_1_desc]); ! $field_2_desc = htmlspecialchars($HTTP_POST_VARS[field_2_desc]); ! $field_3_desc = htmlspecialchars($HTTP_POST_VARS[field_3_desc]); ! $field_4_desc = htmlspecialchars($HTTP_POST_VARS[field_4_desc]); ! $field_5_desc = htmlspecialchars($HTTP_POST_VARS[field_5_desc]); ! $field_6_desc = htmlspecialchars($HTTP_POST_VARS[field_6_desc]); ! $field_7_desc = htmlspecialchars($HTTP_POST_VARS[field_7_desc]); ! $field_8_desc = htmlspecialchars($HTTP_POST_VARS[field_8_desc]); ! $field_9_desc = htmlspecialchars($HTTP_POST_VARS[field_9_desc]); ! $field_10_desc = htmlspecialchars($HTTP_POST_VARS[field_10_desc]); ! $cat_create_level = htmlspecialchars($HTTP_POST_VARS[cat_create_level]); ! $cat_edit_level = htmlspecialchars($HTTP_POST_VARS[cat_edit_level]); ! $cat_delete_level = htmlspecialchars($HTTP_POST_VARS[cat_delete_level]); ! $cat_image_level = htmlspecialchars($HTTP_POST_VARS[cat_image_level]); ! $cat_comment_level = htmlspecialchars($HTTP_POST_VARS[cat_comment_level]); ! $cat_rate_level = htmlspecialchars($HTTP_POST_VARS[cat_rate_level]); // Extra sanitize for SQL variables --- 211,232 ---- } ! $category = htmlspecialchars($_POST[category]); ! $sub_category = htmlspecialchars($_POST[sub_category]); ! $field_1_desc = htmlspecialchars($_POST[field_1_desc]); ! $field_2_desc = htmlspecialchars($_POST[field_2_desc]); ! $field_3_desc = htmlspecialchars($_POST[field_3_desc]); ! $field_4_desc = htmlspecialchars($_POST[field_4_desc]); ! $field_5_desc = htmlspecialchars($_POST[field_5_desc]); ! $field_6_desc = htmlspecialchars($_POST[field_6_desc]); ! $field_7_desc = htmlspecialchars($_POST[field_7_desc]); ! $field_8_desc = htmlspecialchars($_POST[field_8_desc]); ! $field_9_desc = htmlspecialchars($_POST[field_9_desc]); ! $field_10_desc = htmlspecialchars($_POST[field_10_desc]); ! $cat_create_level = htmlspecialchars($_POST[cat_create_level]); ! $cat_edit_level = htmlspecialchars($_POST[cat_edit_level]); ! $cat_delete_level = htmlspecialchars($_POST[cat_delete_level]); ! $cat_image_level = htmlspecialchars($_POST[cat_image_level]); ! $cat_comment_level = htmlspecialchars($_POST[cat_comment_level]); ! $cat_rate_level = htmlspecialchars($_POST[cat_rate_level]); // Extra sanitize for SQL variables Index: admin_ads_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/admin/admin_ads_ext.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_ads_ext.php 8 Feb 2008 23:42:47 -0000 1.2 --- admin_ads_ext.php 28 Feb 2008 06:26:18 -0000 1.3 *************** *** 9,13 **** */ ! define( 'IN_PORTAL', 1 ); if ( !empty( $setmodules ) ) --- 9,13 ---- */ ! define('IN_PORTAL', 1); if ( !empty( $setmodules ) ) *************** *** 21,28 **** // Let's set the root dir for phpBB // ! $module_root_path = '../'; ! $mx_root_path = '../../../'; $ads_root_path = $module_root_path . 'ads_mod/'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . 'admin/pagestart.' . $phpEx); --- 21,28 ---- // Let's set the root dir for phpBB // ! $module_root_path = './../'; ! $mx_root_path = './../../../'; $ads_root_path = $module_root_path . 'ads_mod/'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . 'admin/pagestart.' . $phpEx); *************** *** 85,89 **** if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['ads_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_ads_config'], "<a href=\"" . append_sid( "admin_ads_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 85,89 ---- if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['ads_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_ads_config'], "<a href=\"" . append_sid( "admin_ads_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 164,166 **** include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); ! ?> \ No newline at end of file --- 164,166 ---- include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); ! ?> Index: admin_ads_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/admin/admin_ads_cfg.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_ads_cfg.php 6 Jun 2007 22:24:29 -0000 1.1 --- admin_ads_cfg.php 28 Feb 2008 06:26:18 -0000 1.2 *************** *** 1,22 **** ! <? ! /*************************************************************************** ! * admin_ads_cfg.php ! * ------------------- ! * begin : Wednesday, Feb 15, 2006 ! * copyright : (C) 2006 Peter Mansion ! * email : su...@ph... ! * ! * $Id$ ! * ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ define('IN_PORTAL', 1); --- 1,11 ---- ! <?php ! /** ! * ! * @package mxBB Portal Module - mx_phpCA ! * @version $Id$ ! * @copyright (c) 2002-2006 [Peter Mansion, su...@ph...] mxBB Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * ! */ define('IN_PORTAL', 1); *************** *** 94,98 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Config_updated'] . "<br /><br />" . sprintf($lang['ads_click_return_config'], "<a href=\"" . append_sid("admin_ads_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 83,87 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Config_updated'] . "<br /><br />" . sprintf($lang['ads_click_return_config'], "<a href=\"" . append_sid("admin_ads_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:50
|
Update of /cvsroot/mxbb/mx_shotcast In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast Modified Files: db_install.php db_uninstall.php db_upgrade.php getinfo.php moreinfo.php mx_install_readme.htm radio_update.php radioplayer.php shotcast.pak shotcast_front.php shotcast_last10.php shotcast_stats.php Removed Files: stop_real.php stop_wmp.php Log Message: cvs commit test --- stop_real.php DELETED --- Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/db_upgrade.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** db_upgrade.php 24 Feb 2008 01:26:47 -0000 1.5 --- db_upgrade.php 28 Feb 2008 06:26:38 -0000 1.6 *************** *** 41,45 **** // Precheck // ! if ( $result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "shotcast_config" ) ) { // --- 41,45 ---- // Precheck // ! if ($result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "shotcast_config" )) { // *************** *** 47,60 **** // $upgrade_100 = 0; // // validate before 1.0 Gold // ! $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "shotcast_config WHERE config_name = 'force_online'" ); ! if ( $db->sql_numrows( $result ) == 0 ) { $upgrade_100 = 1; } $message = "<b>Upgrading!</b><br/><br/>"; --- 47,68 ---- // $upgrade_100 = 0; + $upgrade_108 = 0; // // validate before 1.0 Gold // ! if (!$result = $db->sql_query("SELECT config_value from " . $mx_table_prefix . "shotcast_config WHERE config_name = 'force_online'")) { $upgrade_100 = 1; } + // + // validate before 1.08 + // + if (!$result = $db->sql_query("SELECT bot_id from " . $mx_table_prefix . "shotcast_session")) + { + $upgrade_108 = 1; + } + $message = "<b>Upgrading!</b><br/><br/>"; *************** *** 66,69 **** --- 74,95 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('stream_type', 'mp3')"; } + + if ($upgrade_108 == 1) + { + $message .= "<b>Upgrading to v. 1.08...</b><br/><br/>"; + + $sql[] = "DROP TABLE IF EXISTS " . $mx_table_prefix . "shotcast_session"; + + $sql[] = "CREATE TABLE ".$mx_table_prefix."shotcast_session ( + id int(11) unsigned NOT NULL auto_increment, + user_id mediumint(8) DEFAULT '0' NOT NULL, + username varchar(99) NOT NULL, + time int(11) DEFAULT '0' NOT NULL, + session_ip char(8) DEFAULT '0' NOT NULL, + bot_id mediumint(8) DEFAULT '0' NOT NULL, + PRIMARY KEY (id), + KEY user_id (user_id) + ) TYPE=MyISAM"; + } else { Index: shotcast_front.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/shotcast_front.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shotcast_front.php 24 Feb 2008 01:26:47 -0000 1.6 --- shotcast_front.php 28 Feb 2008 06:26:39 -0000 1.7 *************** *** 34,37 **** --- 34,38 ---- // Initialization // + define('IN_SHOTCAST', true); // *************** *** 42,56 **** mx_message_die(GENERAL_ERROR, "Could not find mx_shotcast includes folder.", "", __LINE__, __FILE__); } - define('IN_SHOTCAST', true); - include_once($module_root_path . 'includes/common.'.$phpEx); ! if ( !empty($shotcast_config['shotcast_host']) ) ! { ! include_once($module_root_path . 'getinfo.'.$phpEx); ! } ! else { $shotcast_config['shotcast_host'] = '127.0.0.1'; - include_once($module_root_path . 'getinfo.'.$phpEx); } --- 43,53 ---- mx_message_die(GENERAL_ERROR, "Could not find mx_shotcast includes folder.", "", __LINE__, __FILE__); } ! require($module_root_path .'includes/common.'.$phpEx); ! require($module_root_path . 'getinfo.'.$phpEx); ! ! if (empty($shotcast_config['shotcast_host'])) { $shotcast_config['shotcast_host'] = '127.0.0.1'; } *************** *** 68,79 **** // - // REMOVE OLD SESSIONS - drop_shotcast_users($shotcast_config['check_period']); - // Get all remain sessions ! $sql = "SELECT * FROM ".SHOTCAST_SESSION_TABLE; if (!$sol = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Could not query shotcast Session information", "", __LINE__, __FILE__, $sql); } --- 65,73 ---- // // Get all remain sessions ! $sql = "SELECT * FROM " . SHOTCAST_SESSION_TABLE; if (!$sol = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Could not query radio Session information", "", __LINE__, __FILE__, $sql); } *************** *** 95,99 **** } ! $isimler[0] = $howmanylisten = $db->sql_numrows($sol); // Return this $i = 1; --- 89,101 ---- } ! $howmanylisten = $db->sql_numrows($sol); // Return this ! ! //Get registreg users sessions ! $sql = "SELECT * FROM " . SHOTCAST_SESSION_TABLE . " WHERE user_id <> '" . ANONYMOUS . "'"; ! if (!$sol = $db->sql_query($sql)) ! { ! mx_message_die(GENERAL_ERROR, "Could not query radio Session information", "", __LINE__, __FILE__, $sql); ! } ! $isimler[0] = $db->sql_numrows($sol); $i = 1; *************** *** 103,125 **** if ( ( $shotcast_config['show_listen_select'] ) ) { ! $can_listen="yes"; } ! elseif ($record['username']==$userdata['username']) { ! $can_listen="no"; } else { ! $can_listen="yes"; } } $listeners = ( empty($isimler[1]) ? '' : ! '<a href="' . append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[1]) . '" >'.$isimler[1].'</a><br />' ); for($s = 2; $s <= $isimler[0]; $s++) { ! $listeners .= ', <a href="' . append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[$s]) . '" >'.$isimler[$s].'</a><br />'; } // -------------------------------------------------------------------------------- --- 105,164 ---- if ( ( $shotcast_config['show_listen_select'] ) ) { ! $can_listen="yes"; } ! elseif ($record['username'] == $userdata['username']) { ! $can_listen="no"; } else { ! $can_listen="yes"; } } $listeners = ( empty($isimler[1]) ? '' : ! '<a href="' . mx_append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[1]) . '" >'.$isimler[1].'</a>' ); for($s = 2; $s <= $isimler[0]; $s++) { ! $listeners .= ', <a href="' . mx_append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[$s]) . '" >'.$isimler[$s].'</a><br />'; } + //Get bots sessions + $sql = "SELECT * FROM " . SHOTCAST_SESSION_TABLE . " + WHERE user_id = '" . ANONYMOUS . "' + AND bot_id <> '" . ANONYMOUS . "'"; + if (!$sol = $db->sql_query($sql)) + { + mx_message_die(GENERAL_ERROR, "Could not query radio Session information", "", __LINE__, __FILE__, $sql); + } + $isimlerb[0] = $db->sql_numrows($sol); + + $i = 1; + while ($record = $db->sql_fetchrow($sol)) + { + $isimlerb[$i++] = $record['username']; + } + + $radio_bots = empty($isimlerb[1]) ? '' : $isimlerb[1]; + for($s = 2; $s <= $isimlerb[0]; $s++) + { + $radio_bots .= ', ' . $isimlerb[$s]; + } + + $msn_color = 'style="font-weight: bold; color:#' . $theme['fontcolor1'] . '"'; + $yahoo_color = 'style="font-weight: bold; color: #DD2222;"'; + $lycos_color = 'style="font-weight: bold;"'; + + $radio_bots = str_replace('google','<span style="font-weight: bold; color: #2244BB;">G</span><span style="font-weight: bold; color: #DD2222;">o</span><span style="font-weight: bold; color: #EEBB00;">o</span><span style="font-weight: bold; color: #2244BB;">g</span><span style="font-weight: bold; color: #339933;">l</span><span style="font-weight: bold; color: #DD2222;">e</span>',$radio_bots); + $radio_bots = str_replace('adsense','<span ' . $yahoo_color . '>adsense</span>',$radio_bots); + $radio_bots = str_replace('msn','<span ' . $msn_color . '>msn</span>',$radio_bots); + $radio_bots = str_replace('lycos','<span ' . $lycos_color . '>lycos</span>',$radio_bots); + $radio_bots = str_replace('yahoo','<span ' . $yahoo_color . '>Yahoo!</span>',$radio_bots); + $radio_bots = str_replace('slurp','<span ' . $yahoo_color . '>Yahoo! Slurp</span>',$radio_bots); + + if ($isimlerb[0]) + { + $listeners .= ', ' . $radio_bots; + } // -------------------------------------------------------------------------------- *************** *** 132,136 **** ! if ( !$userdata['session_logged_in'] ) { $template->assign_block_vars('switch_user_logged_out', array()); --- 171,175 ---- ! if (!$userdata['session_logged_in']) { $template->assign_block_vars('switch_user_logged_out', array()); *************** *** 138,148 **** else { ! if ( $can_listen=="no") { ! $template->assign_block_vars('switch_user_listening', array()); } else { ! $template->assign_block_vars('switch_user_logged_in', array()); } } --- 177,187 ---- else { ! if ($can_listen == "no") { ! $template->assign_block_vars('switch_user_listening', array()); } else { ! $template->assign_block_vars('switch_user_logged_in', array()); } } --- stop_wmp.php DELETED --- Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/db_install.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** db_install.php 24 Feb 2008 01:26:46 -0000 1.5 --- db_install.php 28 Feb 2008 06:26:37 -0000 1.6 *************** *** 51,57 **** $sql[] = "CREATE TABLE ".$mx_table_prefix."shotcast_session ( username varchar(99) NOT NULL, ! time bigint(20) NOT NULL, ! UNIQUE username (username) ) TYPE=MyISAM"; --- 51,62 ---- $sql[] = "CREATE TABLE ".$mx_table_prefix."shotcast_session ( + id int(11) unsigned NOT NULL auto_increment, + user_id mediumint(8) DEFAULT '0' NOT NULL, username varchar(99) NOT NULL, ! time int(11) DEFAULT '0' NOT NULL, ! session_ip char(8) DEFAULT '0' NOT NULL, ! bot_id mediumint(8) DEFAULT '0' NOT NULL, ! PRIMARY KEY (id), ! KEY user_id (user_id) ) TYPE=MyISAM"; Index: radio_update.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/radio_update.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** radio_update.php 24 Feb 2008 01:26:47 -0000 1.4 --- radio_update.php 28 Feb 2008 06:26:38 -0000 1.5 *************** *** 65,73 **** if (isset($_POST['update'])) { ! update_shotcast_users($nick,$time); } else { ! update_shotcast_users($nick,$time); } --- 65,73 ---- if (isset($_POST['update'])) { ! update_shotcast_users($nick); } else { ! update_shotcast_users($nick); } *************** *** 92,98 **** } - //read check period - $period = $shotcast_config['check_period'] * 1000; - //radio_update.php (send to the db the user statue "listening" every $period seconds) echo "<html>"; --- 92,95 ---- Index: shotcast.pak =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/shotcast.pak,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shotcast.pak 2 Oct 2007 04:40:14 -0000 1.2 --- shotcast.pak 28 Feb 2008 06:26:39 -0000 1.3 *************** *** 12,14 **** --- 12,18 ---- parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:ShotCast Stats=+:Demo block=+:88=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 + New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 + function=+:71=+:89=+:Radio Player=+:Radio Player or Index=+:radioplayer.php=+: + parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 + block=+:=+:Radio Player=+:Demo block=+:89=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:47
|
Update of /cvsroot/mxbb/mx_shotcast/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/templates/_core Modified Files: shotcast_stats.tpl Log Message: cvs commit test Index: shotcast_stats.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/templates/_core/shotcast_stats.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shotcast_stats.tpl 2 Oct 2007 04:49:37 -0000 1.1 --- shotcast_stats.tpl 28 Feb 2008 06:26:43 -0000 1.2 *************** *** 1,18 **** - <head> <style type="text/css"> <!-- ! .table {font-family: Verdana; font-size: 10px;} td.nav { border-top: 1px solid #FFFFFF; border-bottom: 1px solid #859288; padding: 1px 0 1px 5px; font-weight: bold; font-size: 12px} ! td.stat { border-top: 1px solid #FFFFFF; border-bottom: 1px solid #859288; padding: 1px 0 1px 5px; color: #000e88;} --> </style> ! </head> ! <table width="{BLOCK_SIZE}" cellpadding="0" cellspacing="0" border="0" class="forumline"> ! <tr> ! <td> ! ! <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border:none; padding:4px;"> <tr> ! <td class="row1" align="center" valign="middle" rowspan="1"> <img src="{SHOTCAST_STATE_IMG}" alt="{L_VERSION}" border="0" /> </td> --- 1,12 ---- <style type="text/css"> <!-- ! .table { font-family: Verdana; font-size: 10px; background-color: #c0c0c0; } td.nav { border-top: 1px solid #FFFFFF; border-bottom: 1px solid #859288; padding: 1px 0 1px 5px; font-weight: bold; font-size: 12px} ! td.stat { border-top: 1px solid #FFFFFF; border-bottom: 1px solid #859288; padding: 1px 0 1px 5px; color: ##000e88;} --> </style> ! <table width="{BLOCK_SIZE}" cellpadding="1" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td class="row1" align="center" valign="middle"> <img src="{SHOTCAST_STATE_IMG}" alt="{L_VERSION}" border="0" /> </td> *************** *** 28,32 **** <tr class="table"> <td class="stat" align="left" valign="bottom"> ! <b>{L_STATE} <i>{S_STATE}</i></b> </td> </tr> --- 22,26 ---- <tr class="table"> <td class="stat" align="left" valign="bottom"> ! <i>{L_STATE} <b>{S_STATE}</b></i> </td> </tr> *************** *** 77,84 **** </tr> </table> - - </td> - </tr> - </table> - <br clear="all" /> --- 71,73 ---- |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:47
|
Update of /cvsroot/mxbb/mx_shotcast/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/templates/_core/admin Modified Files: shotcast_config_body.tpl Log Message: cvs commit test Index: shotcast_config_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/templates/_core/admin/shotcast_config_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shotcast_config_body.tpl 2 Oct 2007 04:49:36 -0000 1.1 --- shotcast_config_body.tpl 28 Feb 2008 06:26:43 -0000 1.2 *************** *** 44,47 **** --- 44,55 ---- </tr> <tr> + <td class="row1"><p><b>{L_STREAM_TYPE}:</b><br></p></td> + <td class="row2">{STREAM_TYPE}</td></td> + </tr> + <tr> + <td class="row1"><p><b>{L_SHOW_STATUS}:</b><br></p></td> + <td class="row2">{SHOW_STATUS}</td></td> + </tr> + <tr> <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS} <input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> *************** *** 51,57 **** </tr> </table> - - - <br> </form> --- 59,62 ---- |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:47
|
Update of /cvsroot/mxbb/mx_shotcast/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/language/lang_english Modified Files: lang_admin.php lang_main.php Log Message: cvs commit test |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:47
|
Update of /cvsroot/mxbb/mx_shotcast/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/includes Modified Files: common.php Log Message: cvs commit test Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/includes/common.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** common.php 24 Feb 2008 01:26:47 -0000 1.4 --- common.php 28 Feb 2008 06:26:42 -0000 1.5 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_shotcast * @version $Id$ * @copyright (c) 2002-2006 [OryNider] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_shotcast * @version $Id$ * @copyright (c) 2002-2006 [OryNider] mxBB Development Team *************** *** 9,14 **** */ - - // // Security check --- 9,12 ---- *************** *** 22,28 **** // Define table names. // ! define('SHOTCAST_CONFIG_TABLE', $mx_table_prefix.'shotcast_config'); ! define('SHOTCAST_SESSION_TABLE', $mx_table_prefix.'shotcast_session'); // --- 20,31 ---- // Define table names. // + @define('SHOTCAST_CONFIG_TABLE', $mx_table_prefix.'shotcast_config'); + @define('SHOTCAST_SESSION_TABLE', $mx_table_prefix.'shotcast_session'); ! //Check for shotcast version ! if(file_exists($mx_root_path . "modules/mx_radio/includes/common.$phpEx")) ! { ! !defined('SHOTCAST_SESSION_TABLE') ? define('SHOTCAST_SESSION_TABLE', $mx_table_prefix.'radio_session') : false; ! } // *************** *** 55,59 **** } - // // Load language files. --- 58,61 ---- *************** *** 67,70 **** --- 69,73 ---- include($module_root_path . 'language/lang_english/lang_admin.' . $phpEx); } + //Load main laguage file if( file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) { *************** *** 79,85 **** // Common definitions... // ! $cfg_shotcastname = $board_config['sitename'] . ' -> ' . 'shotcast'; // ================================================================================ --- 82,110 ---- // Common definitions... // ! $time = date("U"); $cfg_shotcastname = $board_config['sitename'] . ' -> ' . 'shotcast'; + if(empty($user_ip)) + { + $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : getenv('REMOTE_ADDR') ); + $user_ip = phpBB2::encode_ip($client_ip); + } + + $user_id = $userdata['user_id']; + $nick = str_replace(" ", "_", $userdata['username']); + $radio_bot_id = ANONYMOUS; + + if (($userdata['user_id'] != ANONYMOUS) && defined('ONLINE_ADV_SESSION_TABLE')) + { + if($this_agent) + { + $nick = $this_agent; + } + + if ($this_bot_id) + { + $radio_bot_id = $this_bot_id; + } + } // ================================================================================ *************** *** 88,94 **** // ! // Get shotcast Settings from config table // - if( defined('IN_SHOTCAST') ) { --- 113,118 ---- // ! // Get radio Settings from config table // if( defined('IN_SHOTCAST') ) { *************** *** 109,169 **** } // ================================================================================ // [ COMMON FUNCTIONS ] // ================================================================================ - // $mx_user->init($user_ip, PAGE_INDEX); - // $nick = str_replace(" ", "_", $userdata['username']); - function user_listensc($nick) { ! global $shotcast_config, $db; ! $current_time=date("U"); ! $sql = "DELETE FROM ".SHOTCAST_SESSION_TABLE." WHERE username = '".addslashes($nick)."'"; ! if( !$result = $db->sql_query($sql) ) { ! die("SQL Error in function user_listen(): DELETE<br />" . $sql); } ! $sql = "INSERT INTO ".SHOTCAST_SESSION_TABLE." (username, time)" . ! " VALUES ('" .addslashes($nick). "', ".$current_time.")"; ! if( !$result = $db->sql_query($sql) ) { ! die("SQL Error in function user_listen(): INSERT<br />" . $sql); } } ! ! //Update user statue "listening/not listening" ! function update_shotcast_users($nick,$time) { ! global $shotcast_config, $board_config, $db, $lang; ! ! $sql="update ".SHOTCAST_SESSION_TABLE." set time='$time' where username='$nick'"; ! if( !$result = $db->sql_query($sql) ) { ! die("SQL Error in function update_shotcast_users(): UPDATE<br />" . $sql); } } function drop_shotcast_users($period) { ! global $shotcast_config, $board_config, $db, $lang; ! $current_time=date("U"); //prevent delay ! $period=$period+2; // Calcul max_time ! $max_time=$current_time-$period; ! ! $sql="delete from ".SHOTCAST_SESSION_TABLE." where time<'$max_time'"; ! if( !$result = $db->sql_query($sql) ) ! { ! die("SQL Error in function drop_shotcast_users()"); ! } } ?> --- 133,219 ---- } + //read check period + $period = $shotcast_config['check_period'] * 1000; + // ================================================================================ // [ COMMON FUNCTIONS ] // ================================================================================ function user_listensc($nick) { ! global $userdata, $shotcast_config, $db, $user_ip, $radio_bot_id; ! $current_time = date("U"); ! $user_id = $userdata['user_id']; ! ! $sql = "DELETE FROM " . SHOTCAST_SESSION_TABLE . " ! WHERE session_ip = '" . $user_ip . "'"; ! if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, 'SQL Error in function user_listensc(): DELETE<br />', '', __LINE__, __FILE__, $sql); } ! ! $sql = "INSERT INTO " . SHOTCAST_SESSION_TABLE . " ! (user_id, username, time, session_ip, bot_id) ! VALUES ('$user_id', '" . addslashes($nick) . "', '$current_time', '$user_ip', '$radio_bot_id')"; ! if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, 'SQL Error in function user_listensc(): INSERT INTO<br />', '', __LINE__, __FILE__, $sql); } } ! //Update user statue "listening/not listening" ! //Since this is loaded in a iframe it's not need for debuging code ! function update_shotcast_users($nick) { ! global $shotcast_config, $db, $lang, $user_ip; ! ! $time = date("U"); ! $sql = "UPDATE " . SHOTCAST_SESSION_TABLE . " ! SET time = $time ! WHERE session_ip = '" . $user_ip . "'"; ! if(!$result = $db->sql_query($sql)) { ! $sql = "UPDATE " . SHOTCAST_SESSION_TABLE . " ! SET time = $time ! WHERE username = '" . $nick . "'"; ! $db->sql_query($sql); } + /* + if(defined('RADIO_SESSION_TABLE')) + { + $sql = "DELETE FROM " . RADIO_SESSION_TABLE . " + WHERE session_ip = '$user_ip'"; + $db->sql_query($sql); + $sql = "INSERT INTO " . RADIO_SESSION_TABLE . " + (user_id, username, time, session_ip, bot_id) + VALUES ('$user_id', '" . addslashes($nick) . "', '$time', '$user_ip', '$radio_bot_id')"; + $db->sql_query($sql); + } + */ } + function drop_shotcast_users($period) { ! global $shotcast_config, $db, $lang; ! $current_time = date("U"); //prevent delay ! $period = $period + 2; // Calcul max_time ! $max_time = $current_time - $period; ! $sql = "DELETE FROM " . SHOTCAST_SESSION_TABLE . " WHERE time < {$max_time}"; ! if(!$result = $db->sql_query($sql)) ! { ! mx_message_die(CRITICAL_ERROR, 'SQL Error in function drop_shotcast_users()', '', __LINE__, __FILE__, $sql); ! } } + + // REMOVE OLD SESSIONS + drop_shotcast_users($period); ?> |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:47
|
Update of /cvsroot/mxbb/mx_shotcast/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/language/lang_romanian Modified Files: lang_main.php Log Message: cvs commit test Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/language/lang_romanian/lang_main.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_main.php 24 Feb 2008 01:14:56 -0000 1.3 --- lang_main.php 28 Feb 2008 06:26:43 -0000 1.4 *************** *** 4,8 **** $lang['How_Many_Peak'] = "În total <b>%d</b> sunt conectaþi."; $lang['Who_Are_Listening' ] = "Cine ascultã radio: <b>%s</b>"; ! $lang['Click_to_listen_station'] = "Click ca sã asculþi radio"; $lang['Click_to_listen_wmp'] = "Click ca sã asculþi radio cu Windows Media Player"; $lang['Click_to_listen_real'] = "Click ca sã asculþi radio cu Real Player"; --- 4,8 ---- $lang['How_Many_Peak'] = "În total <b>%d</b> sunt conectaþi."; $lang['Who_Are_Listening' ] = "Cine ascultã radio: <b>%s</b>"; ! $lang['Click_to_listen_station'] = "Click pt a asculta"; $lang['Click_to_listen_wmp'] = "Click ca sã asculþi radio cu Windows Media Player"; $lang['Click_to_listen_real'] = "Click ca sã asculþi radio cu Real Player"; |
Update of /cvsroot/mxbb/mx_radio In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_radio Modified Files: db_install.php db_uninstall.php db_upgrade.php mx_install_readme.htm radio_front.php radio_index.php radio_update.php Added Files: Media_Radio.pak Log Message: cvs commit test Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/db_upgrade.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_upgrade.php 8 Feb 2008 23:43:40 -0000 1.2 --- db_upgrade.php 28 Feb 2008 06:26:32 -0000 1.3 *************** *** 31,47 **** } ! $mx_module_version = '1.0.0'; $mx_module_copy = 'mxBB <i> - Media Radio</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; ! $message = "<b>Upgrading!</b><br/><br/>"; $sql = array(); ! $sql[] = "UPDATE " . $mx_table_prefix . "module" . " ! SET module_version = '" . $mx_module_version . "', ! module_copy = '" . $mx_module_copy . "' ! WHERE module_id = '" . $mx_module_id . "'"; ! $message .= mx_do_install_upgrade( $sql ); echo "<br /><br />"; --- 31,97 ---- } ! $mx_module_version = '1.0.8'; $mx_module_copy = 'mxBB <i> - Media Radio</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; ! $message = "<b>Upgrading!</b><br /><br />"; $sql = array(); ! // ! // Precheck ! // ! if ($result = $db->sql_query("SELECT config_name from " . $mx_table_prefix . "radio_config")) ! { ! // ! // Upgrade checks ! // ! $upgrade_108 = 0; ! // ! // validate before 1.08 ! // ! if (!$result = $db->sql_query("SELECT bot_id from " . $mx_table_prefix . "radio_session")) ! { ! $upgrade_108 = 1; ! } ! ! $message = "<b>Upgrading!</b><br/><br/>"; ! ! if ($upgrade_108 == 1) ! { ! $message .= "<b>Upgrading to v. 1.08...</b><br/><br/>"; ! ! $sql[] = "DROP TABLE IF EXISTS " . $mx_table_prefix . "radio_session"; ! ! $sql[] = "CREATE TABLE ".$mx_table_prefix."radio_session ( ! id int(11) unsigned NOT NULL auto_increment, ! user_id mediumint(8) DEFAULT '0' NOT NULL, ! username varchar(99) NOT NULL, ! time int(11) DEFAULT '0' NOT NULL, ! session_ip char(8) DEFAULT '0' NOT NULL, ! bot_id mediumint(8) DEFAULT '0' NOT NULL, ! PRIMARY KEY (id), ! KEY user_id (user_id) ! ) TYPE=MyISAM"; ! } ! else ! { ! $message .= "<b>Nothing to upgrade...</b><br/><br/>"; ! } ! ! $sql[] = "UPDATE " . $mx_table_prefix . "module" . " ! SET module_version = '" . $mx_module_version . "', ! module_copy = '" . $mx_module_copy . "' ! WHERE module_id = '" . $mx_module_id . "'"; ! ! $message .= mx_do_install_upgrade($sql); ! } ! else ! { ! // ! // If not installed ! // ! $message = "<b>Module is not installed...and thus cannot be upgraded ;)</b><br/><br/>"; ! } echo "<br /><br />"; *************** *** 50,53 **** echo "<tr><td class=\"row1\" align=\"left\"><span class=\"gen\">" . $message . "</span></td></tr>"; echo "</table><br />"; ! ! ?> \ No newline at end of file --- 100,102 ---- echo "<tr><td class=\"row1\" align=\"left\"><span class=\"gen\">" . $message . "</span></td></tr>"; echo "</table><br />"; ! ?> Index: radio_front.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/radio_front.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** radio_front.php 8 Feb 2008 23:43:41 -0000 1.2 --- radio_front.php 28 Feb 2008 06:26:33 -0000 1.3 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_radio * @version $Id$ * @copyright (c) 2002-2006 [OryNider] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_radio * @version $Id$ * @copyright (c) 2002-2006 [OryNider] mxBB Development Team *************** *** 29,43 **** // Initialization // ! $phpEx = substr(strrchr(__FILE__, '.'), 1); // // Common Includes and Read Module Settings // ! if( !file_exists($module_root_path . 'includes/common.'.$phpEx) ) { ! message_die(GENERAL_ERROR, "Could not find mx_radio includes folder.", "", __LINE__, __FILE__); } - define('_RADIO_CONFIG', true); - include_once($module_root_path . 'includes/common.'.$phpEx); // --- 29,41 ---- // Initialization // ! @define('_RADIO_CONFIG', true); // // Common Includes and Read Module Settings // ! if ((include_once $module_root_path . "includes/common.$phpEx") === false) { ! mx_message_die(GENERAL_ERROR, "Could not find mx_radio includes folder.", "", __LINE__, __FILE__); } // *************** *** 48,62 **** $radio_icon = 'radio_front_02.gif'; - // - // Instantiate the mx_text class - // - include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); - $mx_text = new mx_text(); - $mx_text->init(true, false, false); - - // - // Decode for display - // - $title = $mx_text->display($title); // -------------------------------------------------------------------------------- --- 46,49 ---- *************** *** 64,78 **** // - // REMOVE OLD SESSIONS - drop_radio_users($radio_config['check_period']); - // Get all remain sessions ! $sql = "SELECT * FROM ".RADIO_SESSION_TABLE; if (!$sol = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Could not query radio Session information", "", __LINE__, __FILE__, $sql); } $howmanylisten = $db->sql_numrows($sol); // Return this ! $isimler[0] = $db->sql_numrows($sol); $can_listen = 'TRUE'; --- 51,69 ---- // // Get all remain sessions ! $sql = "SELECT * FROM " . RADIO_SESSION_TABLE; if (!$sol = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Could not query radio Session information", "", __LINE__, __FILE__, $sql); } $howmanylisten = $db->sql_numrows($sol); // Return this ! ! //Get registreg users sessions ! $sql = "SELECT * FROM " . RADIO_SESSION_TABLE . " WHERE user_id <> '" . ANONYMOUS . "'"; ! if (!$sol = $db->sql_query($sql)) ! { ! mx_message_die(GENERAL_ERROR, "Could not query radio Session information", "", __LINE__, __FILE__, $sql); ! } ! $isimler[0] = $db->sql_numrows($sol); $can_listen = 'TRUE'; *************** *** 81,101 **** { $isimler[$i++] = $record['username']; ! if ($record['username']==$userdata['username']) { ! $can_listen="yes"; } else { ! $can_listen="yes"; } } $listeners = ( empty($isimler[1]) ? '' : ! '<a href="' . append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[1]) . '" >'.$isimler[1].'</a><br />' ); for($s = 2; $s <= $isimler[0]; $s++) { ! $listeners .= ', <a href="' . append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[$s]) . '" >'.$isimler[$s].'</a><br />'; } // -------------------------------------------------------------------------------- --- 72,129 ---- { $isimler[$i++] = $record['username']; ! if ($record['username'] == $userdata['username']) { ! $can_listen = "yes"; } else { ! $can_listen = "yes"; } } $listeners = ( empty($isimler[1]) ? '' : ! '<a href="' . mx_append_sid(PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[1]) . '" >'.$isimler[1].'</a><br />'); for($s = 2; $s <= $isimler[0]; $s++) { ! $listeners .= ', <a href="' . mx_append_sid(PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[$s]) . '" >'.$isimler[$s].'</a><br />'; ! } ! ! //Get bots sessions ! $sql = "SELECT * FROM " . RADIO_SESSION_TABLE . " ! WHERE user_id = '" . ANONYMOUS . "' ! AND bot_id <> '" . ANONYMOUS . "'"; ! if (!$sol = $db->sql_query($sql)) ! { ! mx_message_die(GENERAL_ERROR, "Could not query radio Session information", "", __LINE__, __FILE__, $sql); ! } ! $isimlerb[0] = $db->sql_numrows($sol); ! ! $i = 1; ! while ($record = $db->sql_fetchrow($sol)) ! { ! $isimlerb[$i++] = $record['username']; ! } ! ! $radio_bots = empty($isimlerb[1]) ? '' : $isimlerb[1]; ! for($s = 2; $s <= $isimlerb[0]; $s++) ! { ! $radio_bots .= ', ' . $isimlerb[$s]; } + $msn_color = 'style="font-weight: bold; color:#' . $theme['fontcolor1'] . '"'; + $yahoo_color = 'style="font-weight: bold; color: #DD2222;"'; + $lycos_color = 'style="font-weight: bold;"'; + + $radio_bots = str_replace('google','<span style="font-weight: bold; color: #2244BB;">G</span><span style="font-weight: bold; color: #DD2222;">o</span><span style="font-weight: bold; color: #EEBB00;">o</span><span style="font-weight: bold; color: #2244BB;">g</span><span style="font-weight: bold; color: #339933;">l</span><span style="font-weight: bold; color: #DD2222;">e</span>',$radio_bots); + $radio_bots = str_replace('adsense','<span ' . $yahoo_color . '>adsense</span>',$radio_bots); + $radio_bots = str_replace('msn','<span ' . $msn_color . '>msn</span>',$radio_bots); + $radio_bots = str_replace('lycos','<span ' . $lycos_color . '>lycos</span>',$radio_bots); + $radio_bots = str_replace('yahoo','<span ' . $yahoo_color . '>Yahoo!</span>',$radio_bots); + $radio_bots = str_replace('slurp','<span ' . $yahoo_color . '>Yahoo! Slurp</span>',$radio_bots); + + if ($isimlerb[0]) + { + $listeners .= ', ' . $radio_bots; + } // -------------------------------------------------------------------------------- *************** *** 114,124 **** else { ! if ( $can_listen=="no") { ! $template->assign_block_vars('switch_user_chatting', array()); } else { ! $template->assign_block_vars('switch_user_logged_in', array()); } } --- 142,152 ---- else { ! if ($can_listen == "no") { ! $template->assign_block_vars('switch_user_chatting', array()); } else { ! $template->assign_block_vars('switch_user_logged_in', array()); } } *************** *** 153,155 **** unset($liteners, $block_config, $sql, $howmanylisten, $listeners_list, $block_size, $module_root_path, $isimler, $can_listen); ! ?> \ No newline at end of file --- 181,183 ---- unset($liteners, $block_config, $sql, $howmanylisten, $listeners_list, $block_size, $module_root_path, $isimler, $can_listen); ! ?> Index: mx_install_readme.htm =================================================================== RCS file: /cvsroot/mxbb/mx_radio/mx_install_readme.htm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_install_readme.htm 6 Jun 2007 23:31:11 -0000 1.1 --- mx_install_readme.htm 28 Feb 2008 06:26:32 -0000 1.2 *************** *** 1,8 **** ! <html> <head> ! <title>Mx Portal installation - readme</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <!-- link rel="stylesheet" href="../../templates/subSilver/subSilver.css" type="text/css" --> <style type="text/css"> <!-- /* --- 1,16 ---- ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml"> ! <!-- $Id$ --> <head> ! <meta name="generator" content= ! "HTML Tidy for Windows (vers 19 September 2007), see www.w3.org" /> ! <title>mxBB Portal installation - readme</title> ! <meta http-equiv="Content-Type" content= ! "text/html; charset=us-ascii" /> <!-- link rel="stylesheet" href="../../templates/subSilver/subSilver.css" type="text/css" --> + <style type="text/css"> + /*<![CDATA[*/ <!-- /* *************** *** 18,29 **** /* General page style. The scroll bar colours only visible in IE5.5+ */ body { ! background-color: #E5E5E5; ! scrollbar-face-color: #DEE3E7; ! scrollbar-highlight-color: #FFFFFF; ! scrollbar-shadow-color: #DEE3E7; ! scrollbar-3dlight-color: #D1D7DC; ! scrollbar-arrow-color: #006699; ! scrollbar-track-color: #EFEFEF; ! scrollbar-darkshadow-color: #98AAB1; } --- 26,37 ---- /* General page style. The scroll bar colours only visible in IE5.5+ */ body { ! background-color: #E5E5E5; ! scrollbar-face-color: #DEE3E7; ! scrollbar-highlight-color: #FFFFFF; ! scrollbar-shadow-color: #DEE3E7; ! scrollbar-3dlight-color: #D1D7DC; ! scrollbar-arrow-color: #006699; ! scrollbar-track-color: #EFEFEF; ! scrollbar-darkshadow-color: #98AAB1; } *************** *** 31,47 **** font, th, td, p { font-family: Verdana, Arial, Helvetica, sans-serif } a:link, a:active, a:visited { color : #006699; } ! a:hover { text-decoration: underline; color : #DD6900; } ! hr { height: 0px; border: solid #D1D7DC 0px; border-top-width: 1px;} /* This is the border line & background colour round the entire page */ ! .bodyline { background-color: #FFFFFF; border: 1px #98AAB1 solid; } /* This is the outline round the main forum tables */ ! .forumline { background-color: #FFFFFF; border: 2px #006699 solid; } /* Main table cell colours and backgrounds */ ! td.row1 { background-color: #EFEFEF; } ! td.row2 { background-color: #DEE3E7; } ! td.row3 { background-color: #D1D7DC; } /* --- 39,55 ---- font, th, td, p { font-family: Verdana, Arial, Helvetica, sans-serif } a:link, a:active, a:visited { color : #006699; } ! a:hover { text-decoration: underline; color : #DD6900; } ! hr { height: 0px; border: solid #D1D7DC 0px; border-top-width: 1px;} /* This is the border line & background colour round the entire page */ ! .bodyline { background-color: #FFFFFF; border: 1px #98AAB1 solid; } /* This is the outline round the main forum tables */ ! .forumline { background-color: #FFFFFF; border: 2px #006699 solid; } /* Main table cell colours and backgrounds */ ! td.row1 { background-color: #EFEFEF; } ! td.row2 { background-color: #DEE3E7; } ! td.row3 { background-color: #D1D7DC; } /* *************** *** 51,69 **** */ td.rowpic { ! background-color: #FFFFFF; ! background-image: url('../../install/templates/subSilver/images/cellpic2.jpg'); ! background-repeat: repeat-y } /* Header cells - the blue and silver gradient backgrounds */ ! th { ! color: #FFA34F; font-size: 11px; font-weight : bold; ! background-color: #006699; height: 25px; ! background-image: url('../../install/templates/subSilver/images/cellpic3.gif'); } td.cat, td.catHead, td.catSides, td.catLeft, td.catRight, td.catBottom { ! background-image: url('../../install/templates/subSilver/images/cellpic1.gif'); ! background-color:#D1D7DC; border: medium solid #FFFFFF; height: 28px } --- 59,77 ---- */ td.rowpic { ! background-color: #FFFFFF; ! background-image: url('../../install/templates/subSilver/images/cellpic2.jpg'); ! background-repeat: repeat-y } /* Header cells - the blue and silver gradient backgrounds */ ! th { ! color: #FFA34F; font-size: 11px; font-weight : bold; ! background-color: #006699; height: 25px; ! background-image: url('../../install/templates/subSilver/images/cellpic3.gif'); } td.cat, td.catHead, td.catSides, td.catLeft, td.catRight, td.catBottom { ! background-image: url('../../install/templates/subSilver/images/cellpic1.gif'); ! background-color:#D1D7DC; border: medium solid #FFFFFF; height: 28px } *************** *** 74,100 **** */ td.cat, td.catHead, td.catBottom { ! height: 29px; ! border-width: 0px 0px 0px 0px; } th.thHead, th.thSides, th.thTop, th.thLeft, th.thRight, th.thBottom, th.thCornerL, th.thCornerR { ! font-weight: bold; border: #FFFFFF; border-style: solid; height: 28px; } td.row3Right, td.spaceRow { ! background-color: #D1D7DC; border: #FFFFFF; border-style: solid; } th.thHead, td.catHead { font-size: 12px; border-width: 1px 1px 0px 1px; } ! th.thSides, td.catSides, td.spaceRow { border-width: 0px 1px 0px 1px; } ! th.thRight, td.catRight, td.row3Right { border-width: 0px 1px 0px 0px; } ! th.thLeft, td.catLeft { border-width: 0px 0px 0px 1px; } th.thBottom, td.catBottom { border-width: 0px 1px 1px 1px; } ! th.thTop { border-width: 1px 0px 0px 0px; } th.thCornerL { border-width: 1px 0px 0px 1px; } th.thCornerR { border-width: 1px 1px 0px 0px; } /* The largest text used in the index page title and toptic title etc. */ ! .maintitle { ! font-weight: bold; font-size: 22px; font-family: "Trebuchet MS",Verdana, Arial, Helvetica, sans-serif; ! text-decoration: none; line-height : 120%; color : #000000; } --- 82,108 ---- */ td.cat, td.catHead, td.catBottom { ! height: 29px; ! border-width: 0px 0px 0px 0px; } th.thHead, th.thSides, th.thTop, th.thLeft, th.thRight, th.thBottom, th.thCornerL, th.thCornerR { ! font-weight: bold; border: #FFFFFF; border-style: solid; height: 28px; } td.row3Right, td.spaceRow { ! background-color: #D1D7DC; border: #FFFFFF; border-style: solid; } th.thHead, td.catHead { font-size: 12px; border-width: 1px 1px 0px 1px; } ! th.thSides, td.catSides, td.spaceRow { border-width: 0px 1px 0px 1px; } ! th.thRight, td.catRight, td.row3Right { border-width: 0px 1px 0px 0px; } ! th.thLeft, td.catLeft { border-width: 0px 0px 0px 1px; } th.thBottom, td.catBottom { border-width: 0px 1px 1px 1px; } ! th.thTop { border-width: 1px 0px 0px 0px; } th.thCornerL { border-width: 1px 0px 0px 1px; } th.thCornerR { border-width: 1px 1px 0px 0px; } /* The largest text used in the index page title and toptic title etc. */ ! .maintitle { ! font-weight: bold; font-size: 22px; font-family: "Trebuchet MS",Verdana, Arial, Helvetica, sans-serif; ! text-decoration: none; line-height : 120%; color : #000000; } *************** *** 105,145 **** .gen, .genmed, .gensmall { color : #000000; } a.gen, a.genmed, a.gensmall { color: #006699; text-decoration: none; } ! a.gen:hover, a.genmed:hover, a.gensmall:hover { color: #DD6900; text-decoration: underline; } /* The register, login, search etc links at the top of the page */ ! .mainmenu { font-size : 11px; color : #000000 } ! a.mainmenu { text-decoration: none; color : #006699; } a.mainmenu:hover{ text-decoration: underline; color : #DD6900; } /* Forum category titles */ ! .cattitle { font-weight: bold; font-size: 12px ; letter-spacing: 1px; color : #006699} ! a.cattitle { text-decoration: none; color : #006699; } a.cattitle:hover{ text-decoration: underline; } /* Forum title: Text and link to the forums used in: index.php */ ! .forumlink { font-weight: bold; font-size: 12px; color : #006699; } ! a.forumlink { text-decoration: none; color : #006699; } a.forumlink:hover{ text-decoration: underline; color : #DD6900; } /* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */ ! .nav { font-weight: bold; font-size: 11px; color : #000000;} ! a.nav { text-decoration: none; color : #006699; } ! a.nav:hover { text-decoration: underline; } /* titles for the topics: could specify viewed link colour too */ ! .topictitle, h1, h2 { font-weight: bold; font-size: 11px; color : #000000; } a.topictitle:link { text-decoration: none; color : #006699; } a.topictitle:visited { text-decoration: none; color : #5493B4; } ! a.topictitle:hover { text-decoration: underline; color : #DD6900; } /* Name of poster in viewmsg.php and viewtopic.php and other places */ ! .name { font-size : 11px; color : #000000;} /* Location, number of posts, post date etc */ ! .postdetails { font-size : 10px; color : #000000; } /* The content of the posts (body of text) */ .postbody { font-size : 12px; line-height: 18px} ! a.postlink:link { text-decoration: none; color : #006699 } a.postlink:visited { text-decoration: none; color : #5493B4; } a.postlink:hover { text-decoration: underline; color : #DD6900} --- 113,153 ---- .gen, .genmed, .gensmall { color : #000000; } a.gen, a.genmed, a.gensmall { color: #006699; text-decoration: none; } ! a.gen:hover, a.genmed:hover, a.gensmall:hover { color: #DD6900; text-decoration: underline; } /* The register, login, search etc links at the top of the page */ ! .mainmenu { font-size : 11px; color : #000000 } ! a.mainmenu { text-decoration: none; color : #006699; } a.mainmenu:hover{ text-decoration: underline; color : #DD6900; } /* Forum category titles */ ! .cattitle { font-weight: bold; font-size: 12px ; letter-spacing: 1px; color : #006699} ! a.cattitle { text-decoration: none; color : #006699; } a.cattitle:hover{ text-decoration: underline; } /* Forum title: Text and link to the forums used in: index.php */ ! .forumlink { font-weight: bold; font-size: 12px; color : #006699; } ! a.forumlink { text-decoration: none; color : #006699; } a.forumlink:hover{ text-decoration: underline; color : #DD6900; } /* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */ ! .nav { font-weight: bold; font-size: 11px; color : #000000;} ! a.nav { text-decoration: none; color : #006699; } ! a.nav:hover { text-decoration: underline; } /* titles for the topics: could specify viewed link colour too */ ! .topictitle, h1, h2 { font-weight: bold; font-size: 11px; color : #000000; } a.topictitle:link { text-decoration: none; color : #006699; } a.topictitle:visited { text-decoration: none; color : #5493B4; } ! a.topictitle:hover { text-decoration: underline; color : #DD6900; } /* Name of poster in viewmsg.php and viewtopic.php and other places */ ! .name { font-size : 11px; color : #000000;} /* Location, number of posts, post date etc */ ! .postdetails { font-size : 10px; color : #000000; } /* The content of the posts (body of text) */ .postbody { font-size : 12px; line-height: 18px} ! a.postlink:link { text-decoration: none; color : #006699 } a.postlink:visited { text-decoration: none; color : #5493B4; } a.postlink:hover { text-decoration: underline; color : #DD6900} *************** *** 147,176 **** /* Quote & Code blocks */ .code { ! font-family: Courier, 'Courier New', sans-serif; font-size: 11px; color: #006600; ! background-color: #FAFAFA; border: #D1D7DC; border-style: solid; ! border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px } .quote { ! font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #444444; line-height: 125%; ! background-color: #FAFAFA; border: #D1D7DC; border-style: solid; ! border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px } /* Copyright and bottom info */ ! .copyright { font-size: 10px; font-family: Verdana, Arial, Helvetica, sans-serif; color: #444444; letter-spacing: -1px;} ! a.copyright { color: #444444; text-decoration: none;} a.copyright:hover { color: #000000; text-decoration: underline;} /* Form elements */ input, textarea, select { ! color : #000000; ! font: normal 11px Verdana, Arial, Helvetica, sans-serif; ! border-color : #000000; } /* The text input fields background colour */ input.post, textarea.post, select { ! background-color : #FFFFFF; } --- 155,184 ---- /* Quote & Code blocks */ .code { ! font-family: Courier, 'Courier New', sans-serif; font-size: 11px; color: #006600; ! background-color: #FAFAFA; border: #D1D7DC; border-style: solid; ! border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px } .quote { ! font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #444444; line-height: 125%; ! background-color: #FAFAFA; border: #D1D7DC; border-style: solid; ! border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px } /* Copyright and bottom info */ ! .copyright { font-size: 10px; font-family: Verdana, Arial, Helvetica, sans-serif; color: #444444; letter-spacing: -1px;} ! a.copyright { color: #444444; text-decoration: none;} a.copyright:hover { color: #000000; text-decoration: underline;} /* Form elements */ input, textarea, select { ! color : #000000; ! font: normal 11px Verdana, Arial, Helvetica, sans-serif; ! border-color : #000000; } /* The text input fields background colour */ input.post, textarea.post, select { ! background-color : #FFFFFF; } *************** *** 179,197 **** /* The buttons used for bbCode styling in message post */ input.button { ! background-color : #EFEFEF; ! color : #000000; ! font-size: 11px; font-family: Verdana, Arial, Helvetica, sans-serif; } /* The main submit button option */ input.mainoption { ! background-color : #FAFAFA; ! font-weight : bold; } /* None-bold submit button */ input.liteoption { ! background-color : #FAFAFA; ! font-weight : normal; } --- 187,205 ---- /* The buttons used for bbCode styling in message post */ input.button { ! background-color : #EFEFEF; ! color : #000000; ! font-size: 11px; font-family: Verdana, Arial, Helvetica, sans-serif; } /* The main submit button option */ input.mainoption { ! background-color : #FAFAFA; ! font-weight : bold; } /* None-bold submit button */ input.liteoption { ! background-color : #FAFAFA; ! font-weight : normal; } *************** *** 205,279 **** @import url("../../templates/subSilver/formIE.css"); --> </style> <script language="Javascript" type="text/javascript"> <!-- ! if ( 0 ) ! { ! window.open('privmsg.php?mode=newpm', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400');; ! } //--> </script> </head> - <body bgcolor="#FFFFFF" text="#000000"> <table> ! <tr> ! <td colspan="2"><p><b><font size="5"><font face="Verdana">MX Module - ! mx_radio</font><br> ! <font size="2">v. 1.0 RC 2</font></font></b></p> ! <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span> ! <br /> ! - for Mx Portal v. 2.8.x</p> ! <p><strong>Author</strong><br /> ! OryNider<br /> ! <br /> ! <span style="font-weight: bold">Description</span> <br /> ! The MX Module is an addon product for the MX-portal.</p> ! <p><strong>Features</strong> <br /> ! Easy to use and install/uninstall module.</p> ! <p> <br /> ! I. <a href="#install">Installation instructions</a> <br /> ! <br /> ! II. <a href="#themes">Additional styles</a> <br /> ! <br /> ! III. <a href="#languages">Additional languages</a><br /> ! <br /> ! <a target="_blank" class="postlink" href="http://pubory.uv.ro/potal/">DEMO ! </a> <br /> ! <br /><a name="install"> ! <br /> ! <span style="font-weight: bold">I. Installation Instructions</span> <br /> ! To install this module, follow these instructions.</a></p> ! To summarize:<br> ! If installing from scratch, use import module in the AdminCP.<br> ! If upgrading, uninstall, then reinstall from AdminCP<br> ! If uninstalling, use the delete feature in the AdminCP</p> ! <p>Note: If upgrading,uninstall module without delting db entries, or else ! you'll lose all module data!<br /> ! <br /> ! <br /> ! <span class="gensmall"><a href="#top" onclick="window.scrollTo(0,0); return false"> ! <font size="2">Back to Top</font></a></span><font size="2"> </font> <br /> ! <br /><b>II. Additional Styles</b> <br> ! This module is compatible with any theme/style. <br> ! <a name="themes"> </font></p> ! <p style="margin-top: 0; margin-bottom: 0"><font face="Tahoma"> ! <span class="gensmall"><a href="#top" onclick="window.scrollTo(0,0); return false"> ! <font size="2">Back to Top</font></a></span><font size="2"> </font> ! <br /><a name="languages"> ! <br /> ! <span style="font-weight: bold">III. Additional Languages</span> <br /> ! First check to see if your language is already translated. </a> <br /> ! <br /> ! If exists, download and install in the modules/mx_radio/language ! folder. If not, duplicate (copy and paste) any included language file, ! rename to match your language, translate using any texteditor, save and ! upload. <br /> ! <br /> ! <a href="#top"> Back to Top</a> ! ! <p> /Mx MX_RADIO Module Team</p> ! </td> ! </tr> </table> </body> --- 213,295 ---- @import url("../../templates/subSilver/formIE.css"); --> + /*]]>*/ </style> + <script language="Javascript" type="text/javascript"> + //<![CDATA[ <!-- ! if ( 0 ) ! { ! window.open('privmsg.php?mode=newpm', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400');; ! } //--> + //]]> </script> </head> <body bgcolor="#FFFFFF" text="#000000"> <table> ! <tr> ! <td colspan="2"> ! <p><b><font size="5"><font face="Verdana">mxBB Module - ! mx_radio</font><br /> ! <font size="2">v. 1.0.0</font></font></b></p> ! <p><span style="font-weight: bold"><span style= ! "font-size: 16px; line-height: normal">Module</span></span><br /> ! - for mxBB Portal v. 2.8.1</p> ! <p><strong>Author</strong><br /> ! OryNider<br /> ! <br /> ! <span style="font-weight: bold">Description</span><br /> ! The MX Module is an addon product for the MX-portal.</p> ! <p><strong>Features</strong><br /> ! Easy to use and install/uninstall module.</p> ! <p><br /> ! I. <a href="#install">Installation instructions</a><br /> ! <br /> ! II. <a href="#themes">Additional styles</a><br /> ! <br /> ! III. <a href="#languages">Additional languages</a><br /> ! <br /> ! <a target="_blank" class="postlink" href= ! "http://pubory.uv.ro/potal/">DEMO</a><br /> ! <br /> ! <a name="install" id="install"><br /> ! <span style="font-weight: bold">I. Installation ! Instructions</span><br /> ! To install this module, follow these instructions.</a></p> ! To summarize:<br /> ! If installing from scratch, use import module in the AdminCP.<br /> ! If upgrading, uninstall, then reinstall from AdminCP<br /> ! If uninstalling, use the delete feature in the AdminCP ! <p>Note: If upgrading,uninstall module without delting db entries, ! or else you'll lose all module data!<br /> ! <br /> ! <br /> ! <span class="gensmall"><a href="#top" onclick= ! "window.scrollTo(0,0); return false"><font size="2">Back to ! Top</font></a></span><br /> ! <br /> ! <b>II. Additional Styles</b><br /> ! This module is compatible with any theme/style.<br /> ! <a name="themes" id="themes"> </a></p> ! <p style="margin-top: 0; margin-bottom: 0"><font face= ! "Tahoma"><span class="gensmall"><a href="#top" onclick= ! "window.scrollTo(0,0); return false"><font size="2">Back to ! Top</font></a></span><br /> ! <a name="languages" id="languages"><br /> ! <span style="font-weight: bold">III. Additional ! Languages</span><br /> ! First check to see if your language is already ! translated.</a><br /> ! <br /> ! If exists, download and install in the modules/mx_radio/language ! folder. If not, duplicate (copy and paste) any included language ! file, rename to match your language, translate using any ! texteditor, save and upload.<br /> ! <br /> ! <a href="#top">Back to Top</a></font></p> ! <p><font face="Tahoma">/Mx MX_RADIO Module Team</font></p> ! </td> ! </tr> </table> </body> Index: db_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/db_uninstall.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_uninstall.php 8 Feb 2008 23:43:40 -0000 1.2 --- db_uninstall.php 28 Feb 2008 06:26:32 -0000 1.3 *************** *** 13,17 **** { $mx_root_path = '../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'common.'.$phpEx); --- 13,17 ---- { $mx_root_path = '../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'common.'.$phpEx); *************** *** 19,23 **** // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); if( !$userdata['session_logged_in'] ) --- 19,23 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); if( !$userdata['session_logged_in'] ) *************** *** 62,64 **** echo '<tr><td class="row1" align="center"><span class="gen">' . $message . '</span></td></tr>'; echo '</table> <br />'; ! ?> \ No newline at end of file --- 62,64 ---- echo '<tr><td class="row1" align="center"><span class="gen">' . $message . '</span></td></tr>'; echo '</table> <br />'; ! ?> Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/db_install.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_install.php 8 Feb 2008 23:43:40 -0000 1.2 --- db_install.php 28 Feb 2008 06:26:32 -0000 1.3 *************** *** 35,39 **** } ! $mx_module_version = '1.0.0'; $mx_module_copy = 'mxBB <i> - Media Radio</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 35,39 ---- } ! $mx_module_version = '1.0.8'; $mx_module_copy = 'mxBB <i> - Media Radio</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; *************** *** 49,60 **** $sql[] = "DROP TABLE IF EXISTS " . $mx_table_prefix . "radio_session"; ! $sql[] = "CREATE TABLE ".$mx_table_prefix."radio_session ( username varchar(99) NOT NULL, ! time bigint(20) NOT NULL, ! UNIQUE username (username) ) TYPE=MyISAM"; - $sql[] = "CREATE TABLE " . $mx_table_prefix . "radio_config ( config_name VARCHAR(255) NOT NULL default '', --- 49,64 ---- $sql[] = "DROP TABLE IF EXISTS " . $mx_table_prefix . "radio_session"; ! $sql[] = "CREATE TABLE ".$mx_table_prefix."radio_session ( + id int(11) unsigned NOT NULL auto_increment, + user_id mediumint(8) DEFAULT '0' NOT NULL, username varchar(99) NOT NULL, ! time int(11) DEFAULT '0' NOT NULL, ! session_ip char(8) DEFAULT '0' NOT NULL, ! bot_id mediumint(8) DEFAULT '0' NOT NULL, ! PRIMARY KEY (id), ! KEY user_id (user_id) ) TYPE=MyISAM"; $sql[] = "CREATE TABLE " . $mx_table_prefix . "radio_config ( config_name VARCHAR(255) NOT NULL default '', *************** *** 93,95 **** echo "</table><br />"; ! ?> \ No newline at end of file --- 97,99 ---- echo "</table><br />"; ! ?> --- NEW FILE: Media_Radio.pak --- module=+:72=+:Media Radio=+:modules/mx_radio/=+:mx_radio=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:72=+:89=+:Radio Front=+:mx_radio front block=+:radio_front.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Radio Front=+:Demo block=+:89=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:72=+:126=+:Radio Player=+:Radio Player or Index=+:radio_index.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Radio Player=+:Demo block=+:126=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 Index: radio_update.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/radio_update.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** radio_update.php 6 Jun 2007 23:31:15 -0000 1.1 --- radio_update.php 28 Feb 2008 06:26:34 -0000 1.2 *************** *** 16,49 **** ***************************************************************************/ ! define('IN_PORTAL', true); ! $mx_root_path = '../../'; ! $module_root_path = './'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! ! include_once($mx_root_path . 'common.'.$phpEx); ! define('_RADIO_CONFIG', true); ! include_once($mx_module_path .'includes/common.'.$phpEx); ! $mx_user->init($user_ip, PAGE_INDEX); define('_RADIO_CONFIG', true); ! include_once($module_root_path . 'includes/common.'.$phpEx); ! $time=date("U"); // $nick = str_replace(" ", "_", $userdata['username']); ! if ($_POST['update']==true) { ! update_radio_users($nick,$time); } else { ! update_radio_users($nick,$time); } - //read check period - $period=$radio_config['check_period']*1000; //radio_update.php (send to the db the user statue "listening" every $period seconds) --- 16,76 ---- ***************************************************************************/ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) ! { ! @define('IN_PORTAL', true); ! $mx_root_path = "../../"; ! $module_root_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); ! ! // ! // Start session management ! // ! $mx_user->init($user_ip, PAGE_INDEX); ! // ! // End session management ! // ! ! $title = 'Media Player Radio'; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '315' ); ! ! ! $is_block = FALSE; ! } ! else ! { ! // ! // Read block Configuration ! // ! ! $title = $mx_block->block_info['block_title']; ! $block_size = $player_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! ! if( is_object($mx_block)) ! { ! $is_block = TRUE; ! } ! } define('_RADIO_CONFIG', true); ! include_once($module_root_path .'includes/common.'.$phpEx); ! ! //$time = date("U"); ! //$user_id = $userdata['user_id']; // $nick = str_replace(" ", "_", $userdata['username']); ! if ($_POST['update'] === true) { ! update_radio_users($nick); } else { ! update_radio_users($nick); } //radio_update.php (send to the db the user statue "listening" every $period seconds) Index: radio_index.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/radio_index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** radio_index.php 6 Jun 2007 23:31:14 -0000 1.1 --- radio_index.php 28 Feb 2008 06:26:33 -0000 1.2 *************** *** 8,61 **** * */ - define('IN_PORTAL', 1); ! $mx_root_path = "../../"; ! $mx_module_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); ! // ! // Start session management ! // ! $mx_user->init($user_ip, PAGE_INDEX); ! define('_RADIO_CONFIG', true); ! include_once($mx_module_path .'includes/common.'.$phpEx); ! // ! // End session management ! // ! // include_once($mx_module_path .'includes/player.'.$phpEx); ! // ! // Begin output of page ! // if ( $radio_config['gf_select'] ) ! { $template->set_filenames(array( 'body_radio' => 'mx_player.tpl' )); ! } else ! { $template->set_filenames(array( 'body_radio' => 'mx_playerg.tpl' )); ! } $template->assign_vars(array( 'BLOCK_SIZE' => $block_size, ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'U_PORTAL_ROOT_PATH' => PORTAL_URL, ! 'SITENAME' => $board_config['sitename'], 'L_TITLE' => $radio_config['radio_name'], 'RADIO_NAME' => $radio_config['radio_name'], 'FLASH_FILE' => $mx_root_path . $radio_config['flash_FileName'], 'GATEWAY_FILE' => $mx_root_path . $radio_config['gateway_FileName'], ! 'IMG_IFRAME_BG' => $mx_module_path .'images/iframe_bg.png', ! 'IMG_ADVIEW' => $mx_module_path .'gateway/gateway_files/adview.gif', ! 'JS_ADX' => $mx_module_path .'gateway/gateway_files/adx.js', 'STATION_STREAM' => $radio_config['radio_FileName'] )); --- 8,101 ---- * */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) ! { ! @define('IN_PORTAL', true); ! $mx_root_path = "../../"; ! $module_root_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); + // + // Start session management + // + $mx_user->init($user_ip, PAGE_INDEX); + // + // End session management + // ! $title = 'Media Player Radio'; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '315' ); ! $player_size = ( isset($block_size) && !empty($block_size) ? $block_size - 15 : '300' ); ! ! $is_block = FALSE; ! } ! else ! { ! // ! // Read block Configuration ! // ! ! $title = $mx_block->block_info['block_title']; ! $block_size = $player_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! ! if( is_object($mx_block)) ! { ! $is_block = TRUE; ! } ! } ! ! define('_RADIO_CONFIG', true); ! include_once($module_root_path .'includes/common.'.$phpEx); + // + // Begin output of page + // if ( $radio_config['gf_select'] ) ! { $template->set_filenames(array( 'body_radio' => 'mx_player.tpl' )); ! } else ! { $template->set_filenames(array( 'body_radio' => 'mx_playerg.tpl' )); ! } $template->assign_vars(array( 'BLOCK_SIZE' => $block_size, ! 'PLAYER_SIZE' => $player_size, ! 'SHOW_HEADER' => ($is_block) ? false : true, ! ! //+ MX-Publisher ! 'U_PORTAL_ROOT_PATH' => PORTAL_URL, ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'MODULE_PATH' => $module_root_path, ! ! 'T_PHPBB_STYLESHEET' => $theme['head_stylesheet'], ! 'T_MXBB_STYLESHEET' => $theme['head_stylesheet'], ! ! 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], ! 'S_CONTENT_ENCODING' => $lang['ENCODING'], ! 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], ! 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], ! 'S_USER_LANG' => ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'], ! ! 'S_UPDATE_RADIO' => mx_append_sid(PORTAL_URL."modules/mx_radio/radio_update.$phpEx"), ! 'SITENAME' => $board_config['sitename'], ! 'SITE_DESCRIPTION' => $board_config['site_desc'], 'L_TITLE' => $radio_config['radio_name'], 'RADIO_NAME' => $radio_config['radio_name'], 'FLASH_FILE' => $mx_root_path . $radio_config['flash_FileName'], 'GATEWAY_FILE' => $mx_root_path . $radio_config['gateway_FileName'], ! 'IMG_IFRAME_BG' => $module_root_path .'images/iframe_bg.png', ! 'IMG_ADVIEW' => $module_root_path .'gateway/gateway_files/adview.gif', ! 'JS_ADX' => $module_root_path .'gateway/gateway_files/adx.js', 'STATION_STREAM' => $radio_config['radio_FileName'] )); *************** *** 64,78 **** $template->pparse('body_radio'); - - $time=date("U"); - $nick = str_replace(" ", "_", $userdata['username']); - - if ($_POST['update']==true) - { - update_radio_user($nick,$time); - } - - //read check period - $period=$radio_config['check_period']*1000; - ?> \ No newline at end of file --- 104,106 ---- |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:43
|
Update of /cvsroot/mxbb/mx_radio/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_radio/templates/subSilver Modified Files: mx_player.tpl mx_playerg.tpl Log Message: cvs commit test Index: mx_playerg.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_radio/templates/subSilver/mx_playerg.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_playerg.tpl 6 Jun 2007 23:34:02 -0000 1.1 --- mx_playerg.tpl 28 Feb 2008 06:26:36 -0000 1.2 *************** *** 1,9 **** ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd"> ! <HTML> ! <HEAD> ! <title>{SITENAME} :: {L_TITLE}</title> ! <META http-equiv=Content-Type content="text/html; charset=utf-8"> ! <STYLE type=text/css>BODY { ! PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BACKGROUND-IMAGE: url({IMG_IFRAME_BG}); PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px; BACKGROUND-REPEAT: repeat-x; FONT-FAMILY: Arial, Helvetica, sans-serif; BACKGROUND-COLOR: #CEDEDF; } .ad_row { --- 1,18 ---- ! <!-- IF SHOW_HEADER --> ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}" /> ! <head> ! <meta http-equiv="Content-Type" content="text/html; charset="{S_CONTENT_ENCODING}" /> ! <meta http-equiv="Content-Style-Type" content="text/css" /> ! {META} ! <!-- First load standard template *.css definition, located in the the phpbb template folder --> ! <link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_PHPBB_STYLESHEET}" type="text/css" /> ! <!-- Then load MX-Publisher template *.css definition for mx, located in the the portal template folder --> ! <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" type="text/css" /> ! <CENTER><u><h2><title>{SITENAME} :: {L_TITLE}</title></h2></u></CENTER> ! <!-- ENDIF --> ! <STYLE type=text/css> ! BODY { ! PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px; BACKGROUND-REPEAT: repeat-x; FONT-FAMILY: Arial, Helvetica, sans-serif; BACKGROUND-COLOR: #CEDEDF; } .ad_row { *************** *** 71,79 **** } </STYLE> ! ! <META content="MSHTML 6.00.2800.1106" name=GENERATOR> </HEAD> <BODY> ! <TABLE cellSpacing=0 cellPadding=0 width=315 border=0> <TBODY> <TR> --- 80,88 ---- } </STYLE> ! <!-- IF SHOW_HEADER --> </HEAD> <BODY> ! <!-- ENDIF --> ! <TABLE cellSpacing="0" cellPadding="0" width="{BLOCK_SIZE}" border="0" class="forumline" style="border-top:none;"> <TBODY> <TR> *************** *** 85,89 **** <TD vAlign=center align=middle> ! <TABLE cellSpacing=0 cellPadding=0 width=300 border=0> <TBODY> <TR> --- 94,98 ---- <TD vAlign=center align=middle> ! <TABLE cellSpacing=0 cellPadding=0 width="{PLAYER_SIZE}" border=0> <TBODY> <TR> *************** *** 228,232 **** </TD></TR> <TR class=sendfriend> ! <TD align=right></TD></TR></TBODY></TABLE> </BODY> </HTML> --- 237,245 ---- </TD></TR> <TR class=sendfriend> ! <TD align=right></TD></TR></TBODY> ! </TABLE> ! <iframe width="350" height="1" id="myiframe" name="myiframe" src="{S_UPDATE_RADIO}" scrolling="no" style="width:350px;height:0px;border:0px"></iframe> ! <!-- IF SHOW_HEADER --> </BODY> </HTML> + <!-- ENDIF --> \ No newline at end of file Index: mx_player.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_radio/templates/subSilver/mx_player.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_player.tpl 6 Jun 2007 23:34:02 -0000 1.1 --- mx_player.tpl 28 Feb 2008 06:26:36 -0000 1.2 *************** *** 1,9 **** ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd"> ! <HTML> ! <HEAD> ! <title>{SITENAME} :: {L_TITLE}</title> ! <META http-equiv=Content-Type content="text/html; charset=utf-8"> ! <STYLE type=text/css>BODY { ! PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BACKGROUND-IMAGE: url({IMG_IFRAME_BG}); PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px; BACKGROUND-REPEAT: repeat-x; FONT-FAMILY: Arial, Helvetica, sans-serif; BACKGROUND-COLOR: #CEDEDF; } .ad_row { --- 1,18 ---- ! <!-- IF SHOW_HEADER --> ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}" /> ! <head> ! <meta http-equiv="Content-Type" content="text/html; charset="{S_CONTENT_ENCODING}" /> ! <meta http-equiv="Content-Style-Type" content="text/css" /> ! {META} ! <!-- First load standard template *.css definition, located in the the phpbb template folder --> ! <link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_PHPBB_STYLESHEET}" type="text/css" /> ! <!-- Then load MX-Publisher template *.css definition for mx, located in the the portal template folder --> ! <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" type="text/css" /> ! <CENTER><u><h2><title>{SITENAME} :: {L_TITLE}</title></h2></u></CENTER> ! <!-- ENDIF --> ! <STYLE type=text/css> ! BODY { ! PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px; BACKGROUND-REPEAT: repeat-x; FONT-FAMILY: Arial, Helvetica, sans-serif; BACKGROUND-COLOR: #CEDEDF; } .ad_row { *************** *** 71,78 **** } </STYLE> ! ! <META content="MSHTML 6.00.2800.1106" name=GENERATOR></HEAD> <BODY> ! <TABLE cellSpacing=0 cellPadding=0 width=315 border=0> <TBODY> <TR> --- 80,88 ---- } </STYLE> ! <!-- IF SHOW_HEADER --> ! </HEAD> <BODY> ! <!-- ENDIF --> ! <TABLE cellSpacing="0" cellPadding="0" width="{BLOCK_SIZE}" border="0" class="forumline" style="border-top:none;"> <TBODY> <TR> *************** *** 84,88 **** <TD vAlign=center align=middle> ! <TABLE cellSpacing=0 cellPadding=0 width=300 border=0> <TBODY> <TR> --- 94,98 ---- <TD vAlign=center align=middle> ! <TABLE cellSpacing=0 cellPadding=0 width="{PLAYER_SIZE}" border=0> <TBODY> <TR> *************** *** 228,231 **** --- 238,244 ---- <TD align=right> </TD></TR></TBODY></TABLE> + <iframe width="350" height="1" id="myiframe" name="myiframe" src="{S_UPDATE_RADIO}" scrolling="no" style="width:350px;height:0px;border:0px"></iframe> + <!-- IF SHOW_HEADER --> </BODY> </HTML> + <!-- ENDIF --> \ No newline at end of file |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:41
|
Update of /cvsroot/mxbb/mx_shotcast/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/admin Modified Files: admin_shotcast.php Log Message: cvs commit test |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:40
|
Update of /cvsroot/mxbb/mx_radio/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_radio/language/lang_english Modified Files: lang_main.php Log Message: cvs commit test Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/language/lang_english/lang_main.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_main.php 8 Feb 2008 23:44:02 -0000 1.2 --- lang_main.php 28 Feb 2008 06:26:35 -0000 1.3 *************** *** 15,17 **** // That's all Folks! // ------------------------------------------------- ! ?> \ No newline at end of file --- 15,17 ---- // That's all Folks! // ------------------------------------------------- ! ?> |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:39
|
Update of /cvsroot/mxbb/mx_phpCA/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_phpCA/language/lang_english Modified Files: lang_admin.php lang_main.php Log Message: cvs commit test Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/language/lang_english/lang_main.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_main.php 6 Jun 2007 22:25:10 -0000 1.1 --- lang_main.php 28 Feb 2008 06:26:31 -0000 1.2 *************** *** 1,3 **** ! <? // // Miscellaneous --- 1,25 ---- ! <?php ! /** ! * ! * @package MX-Publisher Module - mx_phpCA ! * @version $Id$ ! * @copyright (c) 2002-2008 [OryNider] MX-Publisher Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mx-publisher.com ! * ! */ ! // Translated by you ! // Web: yoursite ! // Date: February 20, 2008 ! // MODULE Web Address: http://www.mx-publisher.com/ ! // ! // The format of this file is: ! // ! // ---> $lang["message"] = "text"; ! // ! // Specify your language character encoding... [optional] ! // ! // setlocale(LC_ALL, "en"); ! // // Miscellaneous Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/language/lang_english/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 6 Jun 2007 22:25:09 -0000 1.1 --- lang_admin.php 28 Feb 2008 06:26:30 -0000 1.2 *************** *** 1,3 **** ! <? // // Configuration --- 1,25 ---- ! <?php ! /** ! * ! * @package MX-Publisher Module - mx_phpCA ! * @version $Id$ ! * @copyright (c) 2002-2008 [OryNider] MX-Publisher Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mx-publisher.com ! * ! */ ! // Translated by you ! // Web: yoursite ! // Date: February 20, 2008 ! // MODULE Web Address: http://www.mx-publisher.com/ ! // ! // The format of this file is: ! // ! // ---> $lang["message"] = "text"; ! // ! // Specify your language character encoding... [optional] ! // ! // setlocale(LC_ALL, "en"); ! // // Configuration |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:39
|
Update of /cvsroot/mxbb/mx_radio/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_radio/includes Modified Files: common.php Log Message: cvs commit test Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/includes/common.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** common.php 8 Feb 2008 23:43:41 -0000 1.2 --- common.php 28 Feb 2008 06:26:35 -0000 1.3 *************** *** 8,13 **** * */ - - /*************************************************************************** * History: --- 8,11 ---- *************** *** 18,22 **** * ***************************************************************************/ - // // Security check --- 16,19 ---- *************** *** 30,41 **** // mx_radio version... // ! define('_radio_VERSION', "mx_radio v 1.0 RC 2"); // // Define table names. // ! define('RADIO_CONFIG_TABLE', $mx_table_prefix.'radio_config'); ! define('RADIO_SESSION_TABLE', $mx_table_prefix.'radio_session'); // --- 27,43 ---- // mx_radio version... // ! @define('_radio_VERSION', "mx_radio v 1.0.0"); // // Define table names. // + @define('RADIO_CONFIG_TABLE', $mx_table_prefix.'radio_config'); + @define('RADIO_SESSION_TABLE', $mx_table_prefix.'radio_session'); ! //Check for shotcast version ! if( file_exists($mx_root_path . "modules/mx_shotcast/includes/common.$phpEx") ) ! { ! !defined('SHOTCAST_SESSION_TABLE') ? define('SHOTCAST_SESSION_TABLE', $mx_table_prefix.'shotcast_session') : false; ! } // *************** *** 50,53 **** --- 52,56 ---- include($module_root_path . 'language/lang_english/lang_admin.' . $phpEx); } + //Load main laguage file if( file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) { *************** *** 62,68 **** // Common definitions... // ! $cfg_radioname = $board_config['sitename'] . ' -> ' . 'radio'; // ================================================================================ --- 65,93 ---- // Common definitions... // ! $time = date("U"); $cfg_radioname = $board_config['sitename'] . ' -> ' . 'radio'; + if(empty($user_ip)) + { + $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : getenv('REMOTE_ADDR') ); + $user_ip = phpBB2::encode_ip($client_ip); + } + + $user_id = $userdata['user_id']; + $nick = str_replace(" ", "_", $userdata['username']); + $radio_bot_id = ANONYMOUS; + + if (($userdata['user_id'] != ANONYMOUS) && defined('ONLINE_ADV_SESSION_TABLE')) + { + if($this_agent) + { + $nick = $this_agent; + } + + if ($this_bot_id) + { + $radio_bot_id = $this_bot_id; + } + } // ================================================================================ *************** *** 81,89 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Couldn't query radio config table", "", __LINE__, __FILE__, $sql); } else { ! while( $row = $db->sql_fetchrow($result) ) { $radio_config[$row['config_name']] = $row['config_value']; --- 106,114 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't query radio config table", "", __LINE__, __FILE__, $sql); } else { ! while($row = $db->sql_fetchrow($result)) { $radio_config[$row['config_name']] = $row['config_value']; *************** *** 92,151 **** } // ================================================================================ // [ COMMON FUNCTIONS ] // ================================================================================ - $nick = str_replace(" ", "_", $userdata['username']); - function user_listen($nick) { ! global $radio_config, $db; ! $current_time=date("U"); ! $sql = "DELETE FROM ".RADIO_SESSION_TABLE." WHERE username = '".addslashes($nick)."'"; ! if( !$result = $db->sql_query($sql) ) { ! die("SQL Error in function user_listen(): DELETE<br />" . $sql); } ! $sql = "INSERT INTO ".RADIO_SESSION_TABLE." (username, time)" . ! " VALUES ('" .addslashes($nick). "', ".$current_time.")"; ! if( !$result = $db->sql_query($sql) ) { ! die("SQL Error in function user_listen(): INSERT<br />" . $sql); } } //Update user statue "listening/not listening" ! function update_radio_users($nick,$time) { ! global $radio_config, $board_config, $db, $lang; ! ! $sql="update ".RADIO_SESSION_TABLE." set time='$time' where username='$nick'"; ! if( !$result = $db->sql_query($sql) ) { ! die("SQL Error in function update_radio_users(): UPDATE<br />" . $sql); } } function drop_radio_users($period) { ! global $radio_config, $board_config, $db, $lang; ! $current_time=date("U"); //prevent delay ! $period=$period+2; // Calcul max_time ! $max_time=$current_time-$period; ! ! $sql="delete from ".RADIO_SESSION_TABLE." where time<'$max_time'"; ! if( !$result = $db->sql_query($sql) ) ! { ! die("SQL Error in function drop_radio_users()"); ! } } ! ?> \ No newline at end of file --- 117,205 ---- } + //read check period + $period = $radio_config['check_period'] * 1000; + // ================================================================================ // [ COMMON FUNCTIONS ] // ================================================================================ function user_listen($nick) { ! global $userdata, $radio_config, $db, $user_ip, $radio_bot_id; ! $current_time = date("U"); ! $user_id = $userdata['user_id']; ! ! $sql = "DELETE FROM " . RADIO_SESSION_TABLE . " ! WHERE session_ip = '" . $user_ip . "'"; ! if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, 'SQL Error in function user_listen(): DELETE<br />', '', __LINE__, __FILE__, $sql); } ! ! $sql = "INSERT INTO " . RADIO_SESSION_TABLE . " ! (user_id, username, time, session_ip, bot_id) ! VALUES ('$user_id', '" . addslashes($nick) . "', '$current_time', '$user_ip', '$radio_bot_id')"; ! if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, 'SQL Error in function user_listen(): INSERT INTO<br />', '', __LINE__, __FILE__, $sql); } } //Update user statue "listening/not listening" ! function update_radio_users($nick) { ! global $radio_config, $db, $lang, $user_ip, $radio_bot_id; ! ! $time = date("U"); ! $user_id = $userdata['user_id']; ! $sql = "UPDATE " . RADIO_SESSION_TABLE . " ! SET time = $time ! WHERE session_ip = '" . $user_ip . "'"; ! if(!$result = $db->sql_query($sql)) { ! $sql = "UPDATE " . RADIO_SESSION_TABLE . " ! SET time = $time ! WHERE username = '" . $nick . "'"; ! $db->sql_query($sql); } + /* + if(defined('SHOTCAST_SESSION_TABLE')) + { + $sql = "DELETE FROM " . SHOTCAST_SESSION_TABLE . " + WHERE user_id = '" . $user_id . "' + AND session_ip = '$user_ip'"; + $db->sql_query($sql); + $sql = "INSERT INTO " . SHOTCAST_SESSION_TABLE . " + (user_id, username, time, session_ip, bot_id) + VALUES ('$user_id', '" . addslashes($nick) . "', '$time', '$user_ip', '$radio_bot_id')"; + $db->sql_query($sql); + } + */ } function drop_radio_users($period) { ! global $radio_config, $db, $lang; ! $current_time = date("U"); //prevent delay ! $period = $period + 2; // Calcul max_time ! $max_time = $current_time - $period; ! $sql = "DELETE from " . RADIO_SESSION_TABLE . " ! WHERE time < '$max_time'"; ! if(!$result = $db->sql_query($sql)) ! { ! mx_message_die(CRITICAL_ERROR, 'SQL Error in function drop_radio_users()', '', __LINE__, __FILE__, $sql); ! } } ! ! // REMOVE OLD SESSIONS ! drop_radio_users($radio_config['check_period']); ! ?> |
Update of /cvsroot/mxbb/mx_phpCA/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_phpCA/includes Modified Files: ads_comment.php ads_comment_delete.php ads_comment_edit.php ads_comment_temp.php ads_create.php ads_images.php ads_item.php ads_item_block.php ads_item_delete.php ads_item_edit.php ads_item_renewal.php ads_item_status.php ads_popup.php ads_prices.php ads_rss2.php ads_search.php Log Message: cvs commit test Index: ads_comment_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_comment_edit.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_comment_edit.php 6 Jun 2007 22:24:41 -0000 1.1 --- ads_comment_edit.php 28 Feb 2008 06:26:24 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_comment_edit.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_comment_edit.php Index: ads_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_comment.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ads_comment.php 28 Jan 2008 21:58:51 -0000 1.2 --- ads_comment.php 28 Feb 2008 06:26:23 -0000 1.3 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_comment.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_comment.php *************** *** 39,43 **** // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management --- 39,43 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management *************** *** 127,131 **** // ------------------------------------ ! $sql = "SELECT COUNT(comment_id) AS comments_count FROM ". ADS_COMMENTS_TABLE ." WHERE comment_ad_id = $ad_id --- 127,131 ---- // ------------------------------------ ! $sql = "SELECT COUNT(comment_id) AS comments_count FROM ". ADS_COMMENTS_TABLE ." WHERE comment_ad_id = $ad_id *************** *** 180,185 **** // ------------------------------------ ! $sql = "SELECT user_id, username ! FROM ". USERS_TABLE ." WHERE user_id = $user_id"; --- 180,185 ---- // ------------------------------------ ! $sql = "SELECT user_id, username ! FROM ". USERS_TABLE ." WHERE user_id = $user_id"; *************** *** 195,199 **** mx_message_die(GENERAL_ERROR, $lang['user_does_not_exist']); } ! $username = $row['username']; } --- 195,199 ---- mx_message_die(GENERAL_ERROR, $lang['user_does_not_exist']); } ! $username = $row['username']; } *************** *** 203,207 **** // ------------------------------------ ! $sql = "SELECT * FROM ". ADS_IMAGES_TABLE ." WHERE id = $ad_id --- 203,207 ---- // ------------------------------------ ! $sql = "SELECT * FROM ". ADS_IMAGES_TABLE ." WHERE id = $ad_id *************** *** 213,225 **** if ( $db->sql_numrows($result) > 0 ) { ! while ($row = $db->sql_fetchrow($result)) { $img_url = ADS_IMAGES_PATH ."ad".$ad_id."_img".$row["img_seq_no"]."_thumb.jpg"; } ! } else { $img_url = $mx_images['noimage']; ! } // ------------------------------------ --- 213,225 ---- if ( $db->sql_numrows($result) > 0 ) { ! while ($row = $db->sql_fetchrow($result)) { $img_url = ADS_IMAGES_PATH ."ad".$ad_id."_img".$row["img_seq_no"]."_thumb.jpg"; } ! } else { $img_url = $mx_images['noimage']; ! } // ------------------------------------ *************** *** 363,367 **** for ($i = 0; $i < count($commentrow); $i++) { ! if ( ($commentrow[$i]['user_id'] == ADS_GUEST) or ($commentrow[$i]['username'] == '') ) { --- 363,367 ---- for ($i = 0; $i < count($commentrow); $i++) { ! if ( ($commentrow[$i]['user_id'] == ADS_GUEST) or ($commentrow[$i]['username'] == '') ) { *************** *** 401,405 **** 'POSTER' => $poster, 'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']), ! 'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://network-tools.com/default.asp?host=' . phpBB2::decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . phpBB2::decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '', 'TEXT' => nl2br($commentrow[$i]['comment_text']), --- 401,405 ---- 'POSTER' => $poster, 'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']), ! 'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://network-tools.com/default.asp?host=' . decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '', 'TEXT' => nl2br($commentrow[$i]['comment_text']), Index: ads_item_block.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_item_block.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ads_item_block.php 28 Jan 2008 21:58:52 -0000 1.2 --- ads_item_block.php 28 Feb 2008 06:26:27 -0000 1.3 *************** *** 1,3 **** ! <? /** * --- 1,3 ---- ! <?php /** * *************** *** 26,30 **** // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management --- 26,30 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management *************** *** 57,63 **** if( is_object($mx_block)) { ! $is_block = TRUE; } ! global $images, $mx_images, $postrow; } --- 57,63 ---- if( is_object($mx_block)) { ! $is_block = TRUE; } ! global $images, $mx_images, $postrow; } *************** *** 110,114 **** { mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl(), true)); ! } else { --- 110,114 ---- { mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl(), true)); ! } else { *************** *** 149,157 **** } ! $template->set_filenames(array('ads_item_page' => 'ads_item_block.tpl')); // SQL for adverts table ! $sql = "SELECT category, sub_category, COUNT(sub_category) AS number ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time GROUP BY category, sub_category"; --- 149,157 ---- } ! $template->set_filenames(array('ads_item_page' => 'ads_item_block.tpl')); // SQL for adverts table ! $sql = "SELECT category, sub_category, COUNT(sub_category) AS number ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time GROUP BY category, sub_category"; *************** *** 159,168 **** $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $sub_category_ar[$row['category'].'_'.$row['sub_category']] = $row['number']; } ! $sql = 'SELECT * FROM '. ADS_CATEGORIES_TABLE .' ORDER BY cat_category, cat_sub_category ASC'; --- 159,168 ---- $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $sub_category_ar[$row['category'].'_'.$row['sub_category']] = $row['number']; } ! $sql = 'SELECT * FROM '. ADS_CATEGORIES_TABLE .' ORDER BY cat_category, cat_sub_category ASC'; *************** *** 170,174 **** $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $category = $row['cat_category']; --- 170,174 ---- $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $category = $row['cat_category']; *************** *** 186,194 **** 'CAT_IMG' => $cat_img, 'CATEGORY' => "<b><a href='$category_url'>$category</a></b><br>" ! )); $save_category = $category; } ! $sub_category_temp = "<a href='".append_sid(this_ads_portalurl("ads_mode=ads_index&category=$u_category&sub_category=$u_sub_category"))."'>$sub_category</a>"; $sub_category_img = $mx_images['folder']; --- 186,194 ---- 'CAT_IMG' => $cat_img, 'CATEGORY' => "<b><a href='$category_url'>$category</a></b><br>" ! )); $save_category = $category; } ! $sub_category_temp = "<a href='".append_sid(this_ads_portalurl("ads_mode=ads_index&category=$u_category&sub_category=$u_sub_category"))."'>$sub_category</a>"; $sub_category_img = $mx_images['folder']; *************** *** 213,222 **** $start = 0; } ! // Get the total number of ads if ( !empty($inp_category) && !empty($inp_sub_category) ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time AND category = '$inp_category' --- 213,222 ---- $start = 0; } ! // Get the total number of ads if ( !empty($inp_category) && !empty($inp_sub_category) ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time AND category = '$inp_category' *************** *** 225,235 **** else if ( !empty($inp_category) ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time AND category = '$inp_category'";} ! else { ! $sql = "SELECT * FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time"; --- 225,235 ---- else if ( !empty($inp_category) ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time AND category = '$inp_category'";} ! else { ! $sql = "SELECT * FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time"; *************** *** 242,249 **** if ( $inp_category and $inp_sub_category ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." ! WHERE category = '$inp_category' ! AND sub_category = '$inp_sub_category' AND expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC --- 242,249 ---- if ( $inp_category and $inp_sub_category ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." ! WHERE category = '$inp_category' ! AND sub_category = '$inp_sub_category' AND expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC *************** *** 253,267 **** if ( $inp_category ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." ! WHERE category = '$inp_category' AND expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC LIMIT ".$start.", ".$ads_config['ads_per_page']; } ! else { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC --- 253,267 ---- if ( $inp_category ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." ! WHERE category = '$inp_category' AND expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC LIMIT ".$start.", ".$ads_config['ads_per_page']; } ! else { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC *************** *** 273,282 **** if ( $db->sql_numrows($result) > 0 ) { ! while ($row = $db->sql_fetchrow($result)) { $id = $row['id']; $user_id = $row['user_id']; ! $profiledata = mx_get_userdata($user_id); if ( $user_id != ANONYMOUS ) --- 273,282 ---- if ( $db->sql_numrows($result) > 0 ) { ! while ($row = $db->sql_fetchrow($result)) { $id = $row['id']; $user_id = $row['user_id']; ! $profiledata = get_userdata($user_id); if ( $user_id != ANONYMOUS ) *************** *** 310,320 **** $premium_ad = ''; } ! // Check to see if an image exists for this ad if ( $ads_config['images'] == 1 ) { ! $sql2 = "SELECT * FROM ". ADS_IMAGES_TABLE ." ! WHERE id = '$id' AND img_deleted_ind = 0 LIMIT 0,1"; --- 310,320 ---- $premium_ad = ''; } ! // Check to see if an image exists for this ad if ( $ads_config['images'] == 1 ) { ! $sql2 = "SELECT * FROM ". ADS_IMAGES_TABLE ." ! WHERE id = '$id' AND img_deleted_ind = 0 LIMIT 0,1"; *************** *** 324,339 **** if ( $db->sql_numrows($result2) > 0 ) { ! while ($row2 = $db->sql_fetchrow($result2)) { $img_url = ADS_IMAGES_PATH ."ad".$id."_img".$row2["img_seq_no"]."_thumb.jpg"; } ! } else { $img_url = $mx_images['noimage']; ! } $template->assign_block_vars('imagerow', array( ! 'U_ADS_ITEM' => append_sid(this_ads_portalurl("ads_mode=ads_item&id=".$row['id'])), 'U_PROFILE' => $profile, --- 324,339 ---- if ( $db->sql_numrows($result2) > 0 ) { ! while ($row2 = $db->sql_fetchrow($result2)) { $img_url = ADS_IMAGES_PATH ."ad".$id."_img".$row2["img_seq_no"]."_thumb.jpg"; } ! } else { $img_url = $mx_images['noimage']; ! } $template->assign_block_vars('imagerow', array( ! 'U_ADS_ITEM' => append_sid(this_ads_portalurl("ads_mode=ads_item&id=".$row['id'])), 'U_PROFILE' => $profile, *************** *** 348,357 **** 'VIEWS' => $row['views'], 'COMMENTS' => $total_comments, ! 'IMAGE' => $img_url)); } else { $template->assign_block_vars('noimagerow', array( ! 'U_ADS_ITEM' => append_sid(this_ads_portalurl("ads_mode=ads_item&id=".$row['id'])), 'U_PROFILE' => $profile, --- 348,357 ---- 'VIEWS' => $row['views'], 'COMMENTS' => $total_comments, ! 'IMAGE' => $img_url)); } else { $template->assign_block_vars('noimagerow', array( ! 'U_ADS_ITEM' => append_sid(this_ads_portalurl("ads_mode=ads_item&id=".$row['id'])), 'U_PROFILE' => $profile, *************** *** 365,374 **** 'EBAY_ID' => $row['ebay_id'], 'VIEWS' => $row['views'], ! 'COMMENTS' => $total_comments)); } } } else ! { $template->assign_block_vars('switch_no_items_found',array()); } --- 365,374 ---- 'EBAY_ID' => $row['ebay_id'], 'VIEWS' => $row['views'], ! 'COMMENTS' => $total_comments)); } } } else ! { $template->assign_block_vars('switch_no_items_found',array()); } *************** *** 409,413 **** $page_string = sprintf($lang['Page_of'], ( floor( $start / $ads_config['ads_per_page'] ) + 1 ), ceil( $ads_count / $ads_config['ads_per_page'] )); ! $template->assign_vars(array( 'U_ADS_INDEX' => append_sid(this_ads_portalurl()), --- 409,413 ---- $page_string = sprintf($lang['Page_of'], ( floor( $start / $ads_config['ads_per_page'] ) + 1 ), ceil( $ads_count / $ads_config['ads_per_page'] )); ! $template->assign_vars(array( 'U_ADS_INDEX' => append_sid(this_ads_portalurl()), *************** *** 419,423 **** 'U_RSS2' => append_sid($module_root_path . "adverts." . $phpEx . "?ads_mode=ads_rss2" . '&sid=' . $userdata['session_id']), 'IMG_RSS2' => $mx_images['ads_rss2'], ! 'L_CATEGORIES' => $lang['categories'], 'L_TITLE' => $lang['title'], --- 419,423 ---- 'U_RSS2' => append_sid($module_root_path . "adverts." . $phpEx . "?ads_mode=ads_rss2" . '&sid=' . $userdata['session_id']), 'IMG_RSS2' => $mx_images['ads_rss2'], ! 'L_CATEGORIES' => $lang['categories'], 'L_TITLE' => $lang['title'], *************** *** 437,441 **** 'MSG_NEWAD' => $mx_images['msg_newad'], 'GOTO_STRING' => $goto_string, ! 'PAGE_STRING' => $page_string, 'POINTER' => $pointer, 'POINTER2' => $pointer2, --- 437,441 ---- 'MSG_NEWAD' => $mx_images['msg_newad'], 'GOTO_STRING' => $goto_string, ! 'PAGE_STRING' => $page_string, 'POINTER' => $pointer, 'POINTER2' => $pointer2, *************** *** 443,447 **** 'SUB_CATEGORY' => stripslashes(str_replace("''", "\'", $inp_sub_category)))); ! $template->pparse('ads_item_page'); if ( !is_object($mx_block)) --- 443,447 ---- 'SUB_CATEGORY' => stripslashes(str_replace("''", "\'", $inp_sub_category)))); ! $template->pparse('ads_item_page'); if ( !is_object($mx_block)) *************** *** 449,453 **** include($mx_root_path . 'includes/page_tail.'.$phpEx); } ! // +-------------------------------------------------------------+ // | Powered by phpCA Classified Ads 0.5.6 (c) 2006 PeteMan | --- 449,453 ---- include($mx_root_path . 'includes/page_tail.'.$phpEx); } ! // +-------------------------------------------------------------+ // | Powered by phpCA Classified Ads 0.5.6 (c) 2006 PeteMan | Index: ads_popup.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_popup.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_popup.php 6 Jun 2007 22:24:47 -0000 1.1 --- ads_popup.php 28 Feb 2008 06:26:28 -0000 1.2 *************** *** 1,2 **** --- 1,5 ---- + <?php + // Do Nothing just here for easyphp :P + ?> <html> <head> Index: ads_comment_temp.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_comment_temp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ads_comment_temp.php 28 Jan 2008 21:58:52 -0000 1.2 --- ads_comment_temp.php 28 Feb 2008 06:26:24 -0000 1.3 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_comment.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_comment.php *************** *** 39,43 **** // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management --- 39,43 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management *************** *** 126,130 **** // ------------------------------------ ! $sql = "SELECT COUNT(comment_id) AS comments_count FROM ". ADS_COMMENTS_TABLE ." WHERE comment_ad_id = $ad_id --- 126,130 ---- // ------------------------------------ ! $sql = "SELECT COUNT(comment_id) AS comments_count FROM ". ADS_COMMENTS_TABLE ." WHERE comment_ad_id = $ad_id *************** *** 179,184 **** // ------------------------------------ ! $sql = "SELECT user_id, username ! FROM ". USERS_TABLE ." WHERE user_id = $user_id"; --- 179,184 ---- // ------------------------------------ ! $sql = "SELECT user_id, username ! FROM ". USERS_TABLE ." WHERE user_id = $user_id"; *************** *** 194,198 **** mx_message_die(GENERAL_ERROR, $lang['user_does_not_exist']); } ! $username = $row['username']; } --- 194,198 ---- mx_message_die(GENERAL_ERROR, $lang['user_does_not_exist']); } ! $username = $row['username']; } *************** *** 202,206 **** // ------------------------------------ ! $sql = "SELECT * FROM ". ADS_IMAGES_TABLE ." WHERE id = $ad_id --- 202,206 ---- // ------------------------------------ ! $sql = "SELECT * FROM ". ADS_IMAGES_TABLE ." WHERE id = $ad_id *************** *** 212,224 **** if ( $db->sql_numrows($result) > 0 ) { ! while ($row = $db->sql_fetchrow($result)) { $img_url = ADS_IMAGES_PATH ."ad".$ad_id."_img".$row["img_seq_no"]."_thumb.jpg"; } ! } else { $img_url = $mx_images['noimage']; ! } // ------------------------------------ --- 212,224 ---- if ( $db->sql_numrows($result) > 0 ) { ! while ($row = $db->sql_fetchrow($result)) { $img_url = ADS_IMAGES_PATH ."ad".$ad_id."_img".$row["img_seq_no"]."_thumb.jpg"; } ! } else { $img_url = $mx_images['noimage']; ! } // ------------------------------------ *************** *** 362,366 **** for ($i = 0; $i < count($commentrow); $i++) { ! if ( ($commentrow[$i]['user_id'] == ADS_GUEST) or ($commentrow[$i]['username'] == '') ) { --- 362,366 ---- for ($i = 0; $i < count($commentrow); $i++) { ! if ( ($commentrow[$i]['user_id'] == ADS_GUEST) or ($commentrow[$i]['username'] == '') ) { *************** *** 400,404 **** 'POSTER' => $poster, 'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']), ! 'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . phpBB2::decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . phpBB2::decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '', 'TEXT' => nl2br($commentrow[$i]['comment_text']), --- 400,404 ---- 'POSTER' => $poster, 'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']), ! 'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '', 'TEXT' => nl2br($commentrow[$i]['comment_text']), *************** *** 594,599 **** // Get recipients details from phpBB ! $profiledata = mx_get_userdata($user_id); ! $recip_email = $profiledata['user_email']; $subject = 'XXX SUBJECT XXX'; --- 594,599 ---- // Get recipients details from phpBB ! $profiledata = get_userdata($user_id); ! $recip_email = $profiledata['user_email']; $subject = 'XXX SUBJECT XXX'; *************** *** 605,622 **** $emailer->from($board_config['board_email']); $emailer->replyto($board_config['board_email']); ! $emailer->use_template('admin_send_email', $user_lang); $emailer->email_address($recip_email); $emailer->set_subject($subject); $emailer->extra_headers($email_headers); ! $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], ! 'BOARD_EMAIL' => $board_config['board_email'], 'MESSAGE' => $message)); $emailer->send(); $emailer->reset(); ! $user_id_array[] = $user_id; } --- 605,622 ---- $emailer->from($board_config['board_email']); $emailer->replyto($board_config['board_email']); ! $emailer->use_template('admin_send_email', $user_lang); $emailer->email_address($recip_email); $emailer->set_subject($subject); $emailer->extra_headers($email_headers); ! $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], ! 'BOARD_EMAIL' => $board_config['board_email'], 'MESSAGE' => $message)); $emailer->send(); $emailer->reset(); ! $user_id_array[] = $user_id; } *************** *** 629,638 **** $sql = "SELECT comment_user_id ! FROM ". ADS_COMMENTS_TABLE ." WHERE comment_ad_id= $ad_id"; $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $comment_user_id = $row['comment_user_id']; --- 629,638 ---- $sql = "SELECT comment_user_id ! FROM ". ADS_COMMENTS_TABLE ." WHERE comment_ad_id= $ad_id"; $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $comment_user_id = $row['comment_user_id']; *************** *** 647,652 **** // Get recipients details from phpBB ! $profiledata = mx_get_userdata($comment_user_id); ! $recip_email = $profiledata['user_email']; $subject = 'XXX SUBJECT XXX'; --- 647,652 ---- // Get recipients details from phpBB ! $profiledata = get_userdata($comment_user_id); ! $recip_email = $profiledata['user_email']; $subject = 'XXX SUBJECT XXX'; *************** *** 658,670 **** $emailer->from($board_config['board_email']); $emailer->replyto($board_config['board_email']); ! $emailer->use_template('admin_send_email', $user_lang); $emailer->email_address($recip_email); $emailer->set_subject($subject); $emailer->extra_headers($email_headers); ! $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], ! 'BOARD_EMAIL' => $board_config['board_email'], 'MESSAGE' => $message)); --- 658,670 ---- $emailer->from($board_config['board_email']); $emailer->replyto($board_config['board_email']); ! $emailer->use_template('admin_send_email', $user_lang); $emailer->email_address($recip_email); $emailer->set_subject($subject); $emailer->extra_headers($email_headers); ! $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], ! 'BOARD_EMAIL' => $board_config['board_email'], 'MESSAGE' => $message)); Index: ads_prices.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_prices.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_prices.php 6 Jun 2007 22:24:47 -0000 1.1 --- ads_prices.php 28 Feb 2008 06:26:29 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_prices.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_prices.php Index: ads_create.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_create.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_create.php 6 Jun 2007 22:24:42 -0000 1.1 --- ads_create.php 28 Feb 2008 06:26:25 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_create.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_create.php Index: ads_rss2.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_rss2.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_rss2.php 6 Jun 2007 22:24:47 -0000 1.1 --- ads_rss2.php 28 Feb 2008 06:26:29 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_rss2.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_rss2.php Index: ads_item_delete.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_item_delete.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_item_delete.php 6 Jun 2007 22:24:44 -0000 1.1 --- ads_item_delete.php 28 Feb 2008 06:26:27 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** ads_item_delete.php --- 1,3 ---- ! <?php /*************************************************************************** ads_item_delete.php Index: ads_item_renewal.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_item_renewal.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_item_renewal.php 6 Jun 2007 22:24:45 -0000 1.1 --- ads_item_renewal.php 28 Feb 2008 06:26:28 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_item_renewal.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_item_renewal.php Index: ads_item_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_item_edit.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_item_edit.php 6 Jun 2007 22:24:45 -0000 1.1 --- ads_item_edit.php 28 Feb 2008 06:26:27 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** ads_item_edit.php --- 1,3 ---- ! <?php /*************************************************************************** ads_item_edit.php Index: ads_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_search.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ads_search.php 28 Jan 2008 21:58:52 -0000 1.2 --- ads_search.php 28 Feb 2008 06:26:29 -0000 1.3 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_search.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_search.php *************** *** 39,43 **** // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management --- 39,43 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management *************** *** 63,67 **** if ( search_allowed($ads_config['search_level']) == FALSE ) { ! if ( !$userdata['session_logged_in'] ) { mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . this_ads_loginurl("ads_mode=ads_search"))); --- 63,67 ---- if ( search_allowed($ads_config['search_level']) == FALSE ) { ! if ( !$userdata['session_logged_in'] ) { mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . this_ads_loginurl("ads_mode=ads_search"))); *************** *** 84,95 **** } ! $template->set_filenames(array('search_page' => 'ads_search.tpl')); ! $sql = 'SELECT * FROM '. ADS_CATEGORIES_TABLE .' ORDER BY cat_category, cat_sub_category ASC'; $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $option = $row['cat_category'].'>>'.$row['cat_sub_category']; --- 84,95 ---- } ! $template->set_filenames(array('search_page' => 'ads_search.tpl')); ! $sql = 'SELECT * FROM '. ADS_CATEGORIES_TABLE .' ORDER BY cat_category, cat_sub_category ASC'; $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $option = $row['cat_category'].'>>'.$row['cat_sub_category']; *************** *** 97,101 **** } ! $template->assign_vars(array( 'U_ADS_INDEX' => append_sid(this_ads_mxurl()), --- 97,101 ---- } ! $template->assign_vars(array( 'U_ADS_INDEX' => append_sid(this_ads_mxurl()), *************** *** 109,120 **** 'L_SEARCH_FOR_ALL_TERMS' => $lang['search_for_all_terms'], 'L_SEARCH_FOR_USERNAME' => $lang['search_for_username'], ! 'L_SEARCH_FOR_AD_ID' => $lang['search_for_ad_id'], 'L_SEARCH_OPTIONS' => $lang['search_options'], 'L_CAT_SUB_CAT' => $lang['cat_sub_cat'], 'L_ALL' => $lang['all'], 'L_AD_STATUS' => $lang['ad_status'], ! 'L_ACTIVE' => $lang['active'], ! 'L_SOLD' => $lang['sold'], ! 'L_EXPIRED' => $lang['expired'], 'L_SORT_BY' => $lang['sort_by'], --- 109,120 ---- 'L_SEARCH_FOR_ALL_TERMS' => $lang['search_for_all_terms'], 'L_SEARCH_FOR_USERNAME' => $lang['search_for_username'], ! 'L_SEARCH_FOR_AD_ID' => $lang['search_for_ad_id'], 'L_SEARCH_OPTIONS' => $lang['search_options'], 'L_CAT_SUB_CAT' => $lang['cat_sub_cat'], 'L_ALL' => $lang['all'], 'L_AD_STATUS' => $lang['ad_status'], ! 'L_ACTIVE' => $lang['active'], ! 'L_SOLD' => $lang['sold'], ! 'L_EXPIRED' => $lang['expired'], 'L_SORT_BY' => $lang['sort_by'], *************** *** 130,151 **** 'SITE_NAME' => $board_config['sitename'])); ! $template->pparse('search_page'); if ( !is_object($mx_block)) { include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } } else { // Process search ! // Check for a search parameter ! if ( !isset($HTTP_POST_VARS['search_term']) and !isset($HTTP_GET_VARS['search_term']) ! and !isset($HTTP_POST_VARS['search_name']) ! and !isset($HTTP_GET_VARS['search_name']) ! and !isset($HTTP_POST_VARS['search_id']) ! and !isset($HTTP_GET_VARS['search_id']) ) { mx_message_die(GENERAL_ERROR, $lang['invalid_request']); --- 130,151 ---- 'SITE_NAME' => $board_config['sitename'])); ! $template->pparse('search_page'); if ( !is_object($mx_block)) { include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } } else { // Process search ! // Check for a search parameter ! if ( !isset($HTTP_POST_VARS['search_term']) and !isset($HTTP_GET_VARS['search_term']) ! and !isset($HTTP_POST_VARS['search_name']) ! and !isset($HTTP_GET_VARS['search_name']) ! and !isset($HTTP_POST_VARS['search_id']) ! and !isset($HTTP_GET_VARS['search_id']) ) { mx_message_die(GENERAL_ERROR, $lang['invalid_request']); *************** *** 167,172 **** include($mx_root_path . 'includes/page_header.'.$phpEx); } ! ! $template->set_filenames(array('search_results' => 'ads_search_results.tpl')); // Sanitize input variables --- 167,172 ---- include($mx_root_path . 'includes/page_header.'.$phpEx); } ! ! $template->set_filenames(array('search_results' => 'ads_search_results.tpl')); // Sanitize input variables *************** *** 181,185 **** } ! if ( isset($HTTP_POST_VARS['search_name']) ) { $search_name = htmlspecialchars($HTTP_POST_VARS['search_name']); --- 181,185 ---- } ! if ( isset($HTTP_POST_VARS['search_name']) ) { $search_name = htmlspecialchars($HTTP_POST_VARS['search_name']); *************** *** 191,195 **** } ! if ( isset($HTTP_POST_VARS['search_id']) ) { $search_id = intval($HTTP_POST_VARS['search_id']); --- 191,195 ---- } ! if ( isset($HTTP_POST_VARS['search_id']) ) { $search_id = intval($HTTP_POST_VARS['search_id']); *************** *** 274,280 **** // Trim whitespace from the search term $search_term = trim($search_term); ! // Separate key-phrases into keywords ! $trimmed_array = explode(' ',$search_term); if ( $HTTP_POST_VARS['search_terms'] ) // This is the any/all indicator --- 274,280 ---- // Trim whitespace from the search term $search_term = trim($search_term); ! // Separate key-phrases into keywords ! $trimmed_array = explode(' ',$search_term); if ( $HTTP_POST_VARS['search_terms'] ) // This is the any/all indicator *************** *** 300,306 **** } ! $sql= "SELECT * FROM ". ADS_ADVERTS_TABLE ." ! WHERE $sql1 OR $sql2"; } --- 300,306 ---- } ! $sql= "SELECT * FROM ". ADS_ADVERTS_TABLE ." ! WHERE $sql1 OR $sql2"; } *************** *** 311,316 **** // Trim whitespace from the search name $search_name = trim($search_name); ! ! $sql= "SELECT * FROM ". ADS_ADVERTS_TABLE ." WHERE username = '$search_name'"; --- 311,316 ---- // Trim whitespace from the search name $search_name = trim($search_name); ! ! $sql= "SELECT * FROM ". ADS_ADVERTS_TABLE ." WHERE username = '$search_name'"; *************** *** 320,324 **** if ( !empty($search_id) ) { ! $sql= "SELECT * FROM ". ADS_ADVERTS_TABLE ." WHERE id = '$search_id'"; --- 320,324 ---- if ( !empty($search_id) ) { ! $sql= "SELECT * FROM ". ADS_ADVERTS_TABLE ." WHERE id = '$search_id'"; *************** *** 383,387 **** $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $id = $row['id']; --- 383,387 ---- $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $id = $row['id']; *************** *** 394,398 **** $views = $row['views']; ! $profiledata = mx_get_userdata($user_id); if ( $user_id != ANONYMOUS ) --- 394,398 ---- $views = $row['views']; ! $profiledata = get_userdata($user_id); if ( $user_id != ANONYMOUS ) *************** *** 407,419 **** // Check to see if an image exists for this ad ! $sql2 = "SELECT * FROM ". ADS_IMAGES_TABLE ." ! WHERE id = '$id' AND img_deleted_ind = 0 LIMIT 0,1"; //global $ebay_id, $mx_images; ! $sql3 = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE ebay_id = '$ebay_id' LIMIT 0,1"; --- 407,419 ---- // Check to see if an image exists for this ad ! $sql2 = "SELECT * FROM ". ADS_IMAGES_TABLE ." ! WHERE id = '$id' AND img_deleted_ind = 0 LIMIT 0,1"; //global $ebay_id, $mx_images; ! $sql3 = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE ebay_id = '$ebay_id' LIMIT 0,1"; *************** *** 426,437 **** if ( $db->sql_numrows($result2) > 0 ) { ! while ($row2 = $db->sql_fetchrow($result2)) { $img_url = ADS_IMAGES_PATH ."ad".$id."_img".$row2["img_seq_no"]."_thumb.jpg"; } } ! elseif ( $db->sql_numrows($result3) > 0 ) { ! while ($row3 = $db->sql_fetchrow($result3)) { $ebay_id = $row3['ebay_id']; --- 426,437 ---- if ( $db->sql_numrows($result2) > 0 ) { ! while ($row2 = $db->sql_fetchrow($result2)) { $img_url = ADS_IMAGES_PATH ."ad".$id."_img".$row2["img_seq_no"]."_thumb.jpg"; } } ! elseif ( $db->sql_numrows($result3) > 0 ) { ! while ($row3 = $db->sql_fetchrow($result3)) { $ebay_id = $row3['ebay_id']; *************** *** 443,465 **** } } ! } else { $img_url = $mx_images['noimage']; ! } ! ! if ( $row['status'] == 'sold' ) ! { ! $status2 = $lang['sold']; ! } ! elseif ( $row['status'] == 'expired' ) ! { ! $status2 = $lang['expired']; ! } ! elseif ( $row['status'] == 'active' ) ! { ! $status2 = ''; ! } $template->assign_block_vars('advertrow', array( --- 443,465 ---- } } ! } else { $img_url = $mx_images['noimage']; ! } + if ( $row['status'] == 'sold' ) + { + $status2 = $lang['sold']; + } + elseif ( $row['status'] == 'expired' ) + { + $status2 = $lang['expired']; + } + elseif ( $row['status'] == 'active' ) + { + $status2 = ''; + } + $template->assign_block_vars('advertrow', array( *************** *** 472,480 **** 'SHORT_DESC' => nl2br($row['short_desc']), 'DATE_ADDED' => date($lang['DATE_FORMAT'],$time), ! 'STATUS' => $status2, 'PRICE' => $row['price'], 'EBAY_ID' => $row['ebay_id'], 'VIEWS' => $row['views'], ! 'IMAGE' => $img_url)); } --- 472,480 ---- 'SHORT_DESC' => nl2br($row['short_desc']), 'DATE_ADDED' => date($lang['DATE_FORMAT'],$time), ! 'STATUS' => $status2, 'PRICE' => $row['price'], 'EBAY_ID' => $row['ebay_id'], 'VIEWS' => $row['views'], ! 'IMAGE' => $img_url)); } *************** *** 482,486 **** { $ads_count = 1; ! } // Encode the fields --- 482,486 ---- { $ads_count = 1; ! } // Encode the fields *************** *** 491,495 **** $template->assign_vars(array( ! 'U_ADS_INDEX' => append_sid(this_ads_mxurl()), --- 491,495 ---- $template->assign_vars(array( ! 'U_ADS_INDEX' => append_sid(this_ads_mxurl()), *************** *** 501,505 **** 'L_PRICE' => $lang['price'], 'L_EBAY_ID' => $lang['ebay_id'], ! 'L_AD_STATUS' => $lang['ad_status'], 'L_USERNAME' => $lang['username'], 'L_IMAGE' => $lang['image'], --- 501,505 ---- 'L_PRICE' => $lang['price'], 'L_EBAY_ID' => $lang['ebay_id'], ! 'L_AD_STATUS' => $lang['ad_status'], 'L_USERNAME' => $lang['username'], 'L_IMAGE' => $lang['image'], *************** *** 511,520 **** 'PAGE_STRING' => $page_string)); ! $template->pparse('search_results'); if ( !is_object($mx_block)) { include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } ! } ?> \ No newline at end of file --- 511,520 ---- 'PAGE_STRING' => $page_string)); ! $template->pparse('search_results'); if ( !is_object($mx_block)) { include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } ! } ?> \ No newline at end of file Index: ads_images.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_images.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_images.php 6 Jun 2007 22:24:42 -0000 1.1 --- ads_images.php 28 Feb 2008 06:26:25 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_images.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_images.php Index: ads_item_status.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_item_status.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_item_status.php 6 Jun 2007 22:24:46 -0000 1.1 --- ads_item_status.php 28 Feb 2008 06:26:28 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_status.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_status.php Index: ads_comment_delete.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_comment_delete.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_comment_delete.php 6 Jun 2007 22:24:40 -0000 1.1 --- ads_comment_delete.php 28 Feb 2008 06:26:24 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_comment_delete.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_comment_delete.php Index: ads_item.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_item.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ads_item.php 28 Jan 2008 21:58:52 -0000 1.2 --- ads_item.php 28 Feb 2008 06:26:26 -0000 1.3 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_item.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_item.php *************** *** 29,33 **** if ( view_allowed($ads_config['view_level']) == FALSE ) { ! if ( !$userdata['session_logged_in'] ) { mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . this_ads_loginurl())); --- 29,33 ---- if ( view_allowed($ads_config['view_level']) == FALSE ) { ! if ( !$userdata['session_logged_in'] ) { mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . this_ads_loginurl())); *************** *** 49,56 **** // Get the row from the adverts table ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE id = '$id'"; ! $result = $db->sql_query($sql); $adverts_row = $db->sql_fetchrow($result); --- 49,56 ---- // Get the row from the adverts table ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE id = '$id'"; ! $result = $db->sql_query($sql); $adverts_row = $db->sql_fetchrow($result); *************** *** 80,84 **** // Update the views counter ! $sql = "UPDATE ". ADS_ADVERTS_TABLE ." SET views = views + 1 WHERE id = $id"; --- 80,84 ---- // Update the views counter ! $sql = "UPDATE ". ADS_ADVERTS_TABLE ." SET views = views + 1 WHERE id = $id"; *************** *** 93,97 **** // Get the row from the categories table ! $sql = "SELECT * FROM ". ADS_CATEGORIES_TABLE ." WHERE cat_category = '".addslashes($category)."' --- 93,97 ---- // Get the row from the categories table ! $sql = "SELECT * FROM ". ADS_CATEGORIES_TABLE ." WHERE cat_category = '".addslashes($category)."' *************** *** 113,120 **** // Get the row from the details table ! $sql = "SELECT * ! FROM ". ADS_DETAILS_TABLE ." WHERE id = '$id'"; ! $result = $db->sql_query($sql); $details_row = $db->sql_fetchrow($result); --- 113,120 ---- // Get the row from the details table ! $sql = "SELECT * ! FROM ". ADS_DETAILS_TABLE ." WHERE id = '$id'"; ! $result = $db->sql_query($sql); $details_row = $db->sql_fetchrow($result); *************** *** 152,156 **** { // Get advertisers details from phpBB ! $profiledata = mx_get_userdata($user_id); $temp_url = append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id"); --- 152,156 ---- { // Get advertisers details from phpBB ! $profiledata = get_userdata($user_id); $temp_url = append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id"); *************** *** 162,171 **** $pm = '<a href="' . $temp_url . '">' . $lang['Send_private_message'] . '</a>'; ! if ( !empty($profiledata['user_viewemail']) || $userdata['user_level'] == ADMIN ) ! { ! $email_uri = ( $board_config['board_email_form'] ) ? append_sid($phpbb_root_path . "profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $user_id) : 'mailto:' . $profiledata['user_email']; ! $email_img = '<a href="' . $email_uri . '"><img src="' . $mx_images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>'; ! $email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>'; } else --- 162,171 ---- $pm = '<a href="' . $temp_url . '">' . $lang['Send_private_message'] . '</a>'; ! if ( !empty($profiledata['user_viewemail']) || $userdata['user_level'] == ADMIN ) ! { ! $email_uri = ( $board_config['board_email_form'] ) ? append_sid($phpbb_root_path . "profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $user_id) : 'mailto:' . $profiledata['user_email']; ! $email_img = '<a href="' . $email_uri . '"><img src="' . $mx_images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>'; ! $email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>'; } else *************** *** 262,266 **** { // Get recipients details from phpBB ! $profiledata = mx_get_userdata($edit_user_id); $edit_details = sprintf($lang['last_edited_by'], $profiledata['username'], date($lang['DATE_FORMAT'],$edit_time), $edit_count); --- 262,266 ---- { // Get recipients details from phpBB ! $profiledata = get_userdata($edit_user_id); $edit_details = sprintf($lang['last_edited_by'], $profiledata['username'], date($lang['DATE_FORMAT'],$edit_time), $edit_count); *************** *** 269,273 **** { // Get recipients details from phpBB ! //$profiledata = mx_get_userdata($edit_user_id); $edit_details = ''; --- 269,273 ---- { // Get recipients details from phpBB ! //$profiledata = get_userdata($edit_user_id); $edit_details = ''; *************** *** 282,312 **** ! $template->set_filenames(array('item_page' => 'ads_item.tpl')); // Do not allow details to be input for basic ads if ( $ad_type_code != 1 ) ! { $template->assign_block_vars('not_basic_ad',array()); // Set the custom field template variables ! for ($counter = 1; $counter <= 10; $counter += 1) { $field_val = $details_row['field_'.$counter]; $field_desc = $category_row['cat_field_'.$counter.'_desc']; ! if ($field_val != '') {$template->assign_block_vars( 'custom_field', array( 'FIELD_VAL' => $field_val, ! 'FIELD_DESC' => $field_desc));} } } // Get rows from the images table ! $sql = "SELECT * ! FROM ". ADS_IMAGES_TABLE ." WHERE id = '$id' AND img_deleted_ind = 0"; ! $sql2 = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE ebay_id = '$ebay_id' LIMIT 1"; --- 282,312 ---- ! $template->set_filenames(array('item_page' => 'ads_item.tpl')); // Do not allow details to be input for basic ads if ( $ad_type_code != 1 ) ! { $template->assign_block_vars('not_basic_ad',array()); // Set the custom field template variables ! for ($counter = 1; $counter <= 10; $counter += 1) { $field_val = $details_row['field_'.$counter]; $field_desc = $category_row['cat_field_'.$counter.'_desc']; ! if ($field_val != '') {$template->assign_block_vars( 'custom_field', array( 'FIELD_VAL' => $field_val, ! 'FIELD_DESC' => $field_desc));} } } // Get rows from the images table ! $sql = "SELECT * ! FROM ". ADS_IMAGES_TABLE ." WHERE id = '$id' AND img_deleted_ind = 0"; ! $sql2 = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE ebay_id = '$ebay_id' LIMIT 1"; *************** *** 318,322 **** if ($db->sql_numrows($result)>0) { ! while ($row = $db->sql_fetchrow($result)) { $medium_img_url = ADS_IMAGES_PATH .'ad'.$id.'_img'.$row['img_seq_no'].'_medium.jpg'; --- 318,322 ---- if ($db->sql_numrows($result)>0) { ! while ($row = $db->sql_fetchrow($result)) { $medium_img_url = ADS_IMAGES_PATH .'ad'.$id.'_img'.$row['img_seq_no'].'_medium.jpg'; *************** *** 324,328 **** // $image = popup($medium_img_url, $large_img_url, $title); $image = "<a onClick=\"window.open('$large_img_url','','scrollbars=yes,resizable=no,width=804,height=610')\" target='_blank'><img src='$medium_img_url' border='0' alt='$title'></a>"; ! $template->assign_block_vars('imagerow', array( 'IMAGE' => $image)); } $template->assign_block_vars('switch_images_found',array()); --- 324,328 ---- // $image = popup($medium_img_url, $large_img_url, $title); $image = "<a onClick=\"window.open('$large_img_url','','scrollbars=yes,resizable=no,width=804,height=610')\" target='_blank'><img src='$medium_img_url' border='0' alt='$title'></a>"; ! $template->assign_block_vars('imagerow', array( 'IMAGE' => $image)); } $template->assign_block_vars('switch_images_found',array()); *************** *** 331,335 **** if ( $db->sql_numrows($result2) > 0 ) { ! while ($row2 = $db->sql_fetchrow($result2)) { $ebay_id = $row2['ebay_id']; --- 331,335 ---- if ( $db->sql_numrows($result2) > 0 ) { ! while ($row2 = $db->sql_fetchrow($result2)) { $ebay_id = $row2['ebay_id']; *************** *** 358,366 **** if ($webmasterplan_site != '0') { ! $banner = '<IMG SRC="http://banners.webmasterplan.com/view.asp?site=' . $webmasterplan_site . '&ref=' . $ebay_ref . '&b=' . rand(23, 43) . '&tnb=23" BORDER="0" WIDTH="100" HEIGHT="100">'; } else { ! $banner = '<IMG SRC="' . $mx_images['ebayimage'] . '" BORDER="0" WIDTH="100" HEIGHT="100">'; } --- 358,366 ---- if ($webmasterplan_site != '0') { ! $banner = '<IMG SRC="http://banners.webmasterplan.com/view.asp?site=' . $webmasterplan_site . '&ref=' . $ebay_ref . '&b=' . rand(23, 43) . '&tnb=23" BORDER="0" WIDTH="100" HEIGHT="100">'; } else { ! $banner = '<IMG SRC="' . $mx_images['ebayimage'] . '" BORDER="0" WIDTH="100" HEIGHT="100">'; } *************** *** 370,374 **** 'IMAGE' => $ref_image)); } ! } } --- 370,374 ---- 'IMAGE' => $ref_image)); } ! } } *************** *** 389,393 **** // Set the rest of the template variables ! $template->assign_vars(array( 'U_ADS_ITEM' => append_sid(this_ads_mxurl("ads_mode=ads_item&id=$id")), --- 389,393 ---- // Set the rest of the template variables ! $template->assign_vars(array( 'U_ADS_ITEM' => append_sid(this_ads_mxurl("ads_mode=ads_item&id=$id")), *************** *** 474,482 **** 'USERNAME' => $username)); ! $template->pparse('item_page'); if ( !is_object($mx_block)) { include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } ?> \ No newline at end of file --- 474,482 ---- 'USERNAME' => $username)); ! $template->pparse('item_page'); if ( !is_object($mx_block)) { include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } ?> \ No newline at end of file |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:36
|
Update of /cvsroot/mxbb/mx_phpCA/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_phpCA/templates/subSilver Modified Files: subSilver.cfg Log Message: cvs commit test |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:35
|
Update of /cvsroot/mxbb/mx_radio/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_radio/admin Modified Files: admin_radio.php Log Message: cvs commit test Index: admin_radio.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/admin/admin_radio.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_radio.php 8 Feb 2008 23:43:33 -0000 1.2 --- admin_radio.php 28 Feb 2008 06:26:32 -0000 1.3 *************** *** 42,46 **** // // require($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . '/admin/pagestart.'.$phpEx); --- 42,46 ---- // // require($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . '/admin/pagestart.'.$phpEx); *************** *** 153,155 **** include_once($mx_root_path . 'admin/page_footer_admin.' . $phpEx); ! ?> \ No newline at end of file --- 153,155 ---- include_once($mx_root_path . 'admin/page_footer_admin.' . $phpEx); ! ?> |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:28
|
Update of /cvsroot/mxbb/mx_phpCA In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_phpCA Modified Files: adverts.php db_install.php db_uninstall.php db_upgrade.php Log Message: cvs commit test Index: db_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/db_uninstall.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_uninstall.php 8 Feb 2008 23:42:47 -0000 1.2 --- db_uninstall.php 28 Feb 2008 06:26:23 -0000 1.3 *************** *** 13,17 **** { $mx_root_path = '../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'common.'.$phpEx); --- 13,17 ---- { $mx_root_path = '../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'common.'.$phpEx); *************** *** 71,73 **** echo '<tr><td class="row1" align="center"><span class="gen">' . $message . '</span></td></tr>'; echo '</table> <br />'; ! ?> \ No newline at end of file --- 71,73 ---- echo '<tr><td class="row1" align="center"><span class="gen">' . $message . '</span></td></tr>'; echo '</table> <br />'; ! ?> Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/db_upgrade.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_upgrade.php 8 Feb 2008 23:42:47 -0000 1.2 --- db_upgrade.php 28 Feb 2008 06:26:23 -0000 1.3 *************** *** 93,95 **** echo "</table><br />"; ! ?> \ No newline at end of file --- 93,95 ---- echo "</table><br />"; ! ?> Index: adverts.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/adverts.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** adverts.php 28 Jan 2008 21:58:51 -0000 1.2 --- adverts.php 28 Feb 2008 06:26:22 -0000 1.3 *************** *** 1,3 **** ! <? /** * --- 1,3 ---- ! <?php /** * *************** *** 26,30 **** // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management --- 26,30 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management *************** *** 57,63 **** if( is_object($mx_block)) { ! $is_block = TRUE; } ! global $images, $mx_images, $postrow; } --- 57,63 ---- if( is_object($mx_block)) { ! $is_block = TRUE; } ! global $images, $mx_images, $postrow; } *************** *** 154,158 **** { mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl(), true)); ! } else { --- 154,158 ---- { mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl(), true)); ! } else { *************** *** 203,211 **** } ! $template->set_filenames(array('adverts_page' => 'adverts.tpl')); // SQL for adverts table ! $sql = "SELECT category, sub_category, COUNT(sub_category) AS number ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time GROUP BY category, sub_category"; --- 203,211 ---- } ! $template->set_filenames(array('adverts_page' => 'adverts.tpl')); // SQL for adverts table ! $sql = "SELECT category, sub_category, COUNT(sub_category) AS number ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time GROUP BY category, sub_category"; *************** *** 213,222 **** $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $sub_category_ar[$row['category'].'_'.$row['sub_category']] = $row['number']; } ! $sql = 'SELECT * FROM '. ADS_CATEGORIES_TABLE .' ORDER BY cat_category, cat_sub_category ASC'; --- 213,222 ---- $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $sub_category_ar[$row['category'].'_'.$row['sub_category']] = $row['number']; } ! $sql = 'SELECT * FROM '. ADS_CATEGORIES_TABLE .' ORDER BY cat_category, cat_sub_category ASC'; *************** *** 225,229 **** ! while ($row = $db->sql_fetchrow($result)) { $category = $row['cat_category']; --- 225,229 ---- ! while ($row = $db->sql_fetchrow($result)) { $category = $row['cat_category']; *************** *** 246,254 **** 'CAT_IMG' => $cat_img, 'CATEGORY' => "<b><a href='$category_url'>$category</a></b><br>" ! )); $save_category = $category; } ! $sub_category_temp = "<a href='".append_sid(this_ads_mxurl("ads_mode=ads_index&category=$u_category&sub_category=$u_sub_category"))."'>$sub_category</a>"; $sub_category_img = $mx_images['folder']; --- 246,254 ---- 'CAT_IMG' => $cat_img, 'CATEGORY' => "<b><a href='$category_url'>$category</a></b><br>" ! )); $save_category = $category; } ! $sub_category_temp = "<a href='".append_sid(this_ads_mxurl("ads_mode=ads_index&category=$u_category&sub_category=$u_sub_category"))."'>$sub_category</a>"; $sub_category_img = $mx_images['folder']; *************** *** 266,270 **** /* ! while ($row = $db->sql_fetchrow($result)) { $category = $row['cat_category']; --- 266,270 ---- /* ! while ($row = $db->sql_fetchrow($result)) { $category = $row['cat_category']; *************** *** 278,286 **** { $category_url = append_sid("adverts.$phpEx?category=$u_category"); ! $template->assign_block_vars('categoryrow', array('CATEGORY' => "<b><a href='$category_url'>$category</a></b><br>")); $save_category = $category; } ! $sub_category_temp = "<a href='".append_sid("adverts.$phpEx?category=$u_category&sub_category=$u_sub_category")."'>$sub_category</a>"; if ( $sub_category_ar[$save_category.'_'.$sub_category] ) --- 278,286 ---- { $category_url = append_sid("adverts.$phpEx?category=$u_category"); ! $template->assign_block_vars('categoryrow', array('CATEGORY' => "<b><a href='$category_url'>$category</a></b><br>")); $save_category = $category; } ! $sub_category_temp = "<a href='".append_sid("adverts.$phpEx?category=$u_category&sub_category=$u_sub_category")."'>$sub_category</a>"; if ( $sub_category_ar[$save_category.'_'.$sub_category] ) *************** *** 302,311 **** $start = 0; } ! // Get the total number of ads if ( !empty($inp_category) && !empty($inp_sub_category) ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time AND category = '$inp_category' --- 302,311 ---- $start = 0; } ! // Get the total number of ads if ( !empty($inp_category) && !empty($inp_sub_category) ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time AND category = '$inp_category' *************** *** 314,324 **** else if ( !empty($inp_category) ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time AND category = '$inp_category'";} ! else { ! $sql = "SELECT * FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time"; --- 314,324 ---- else if ( !empty($inp_category) ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time AND category = '$inp_category'";} ! else { ! $sql = "SELECT * FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time"; *************** *** 331,338 **** if ( $inp_category and $inp_sub_category ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." ! WHERE category = '$inp_category' ! AND sub_category = '$inp_sub_category' AND expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC --- 331,338 ---- if ( $inp_category and $inp_sub_category ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." ! WHERE category = '$inp_category' ! AND sub_category = '$inp_sub_category' AND expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC *************** *** 342,356 **** if ( $inp_category ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." ! WHERE category = '$inp_category' AND expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC LIMIT ".$start.", ".$ads_config['ads_per_page']; } ! else { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC --- 342,356 ---- if ( $inp_category ) { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." ! WHERE category = '$inp_category' AND expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC LIMIT ".$start.", ".$ads_config['ads_per_page']; } ! else { ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE expiry_date > $current_time ORDER BY premium_ad_ind DESC, id DESC *************** *** 362,366 **** if ( $db->sql_numrows($result) > 0 ) { ! while ($row = $db->sql_fetchrow($result)) { $id = $row['id']; --- 362,366 ---- if ( $db->sql_numrows($result) > 0 ) { ! while ($row = $db->sql_fetchrow($result)) { $id = $row['id']; *************** *** 368,372 **** $ebay_id = $row['ebay_id']; ! $profiledata = mx_get_userdata($user_id); if ( $user_id != ANONYMOUS ) --- 368,372 ---- $ebay_id = $row['ebay_id']; ! $profiledata = get_userdata($user_id); if ( $user_id != ANONYMOUS ) *************** *** 402,429 **** // Count the comments ! $sql2 = "SELECT COUNT(comment_id) AS comments_count ! FROM ". ADS_COMMENTS_TABLE ." ! WHERE comment_ad_id = '$id' ! GROUP BY comment_ad_id ! LIMIT 1"; ! $result2 = $db->sql_query($sql2); ! $row2 = $db->sql_fetchrow($result2); ! if ( empty($row2) ) ! { ! $total_comments = 0; ! } ! else ! { ! $total_comments = $row2['comments_count']; } ! // Check to see if an image exists for this ad if ( $ads_config['images'] == 1 ) { ! $sql2 = "SELECT * FROM ". ADS_IMAGES_TABLE ." ! WHERE id = '$id' AND img_deleted_ind = 0 LIMIT 0,1"; --- 402,429 ---- // Count the comments ! $sql2 = "SELECT COUNT(comment_id) AS comments_count ! FROM ". ADS_COMMENTS_TABLE ." ! WHERE comment_ad_id = '$id' ! GROUP BY comment_ad_id ! LIMIT 1"; ! $result2 = $db->sql_query($sql2); ! $row2 = $db->sql_fetchrow($result2); ! if ( empty($row2) ) ! { ! $total_comments = 0; ! } ! else ! { ! $total_comments = $row2['comments_count']; } ! // Check to see if an image exists for this ad if ( $ads_config['images'] == 1 ) { ! $sql2 = "SELECT * FROM ". ADS_IMAGES_TABLE ." ! WHERE id = '$id' AND img_deleted_ind = 0 LIMIT 0,1"; *************** *** 431,436 **** //global $ebay_id, $mx_images; ! $sql3 = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE ebay_id = '$ebay_id' LIMIT ".$start.", ".$ads_config['ads_per_page']; --- 431,436 ---- //global $ebay_id, $mx_images; ! $sql3 = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE ebay_id = '$ebay_id' LIMIT ".$start.", ".$ads_config['ads_per_page']; *************** *** 443,454 **** if ( $db->sql_numrows($result2) > 0 ) { ! while ($row2 = $db->sql_fetchrow($result2)) { $img_url = ADS_IMAGES_PATH ."ad".$id."_img".$row2["img_seq_no"]."_thumb.jpg"; } } ! elseif ( $db->sql_numrows($result3) > 0 ) { ! while ($row3 = $db->sql_fetchrow($result3)) { $ebay_id = $row3['ebay_id']; --- 443,454 ---- if ( $db->sql_numrows($result2) > 0 ) { ! while ($row2 = $db->sql_fetchrow($result2)) { $img_url = ADS_IMAGES_PATH ."ad".$id."_img".$row2["img_seq_no"]."_thumb.jpg"; } } ! elseif ( $db->sql_numrows($result3) > 0 ) { ! while ($row3 = $db->sql_fetchrow($result3)) { $ebay_id = $row3['ebay_id']; *************** *** 463,467 **** $template->assign_block_vars('imagerow', array( ! 'U_ADS_ITEM' => append_sid(this_ads_mxurl("ads_mode=ads_item&id=".$row['id'])), 'U_PROFILE' => $profile, --- 463,467 ---- $template->assign_block_vars('imagerow', array( ! 'U_ADS_ITEM' => append_sid(this_ads_mxurl("ads_mode=ads_item&id=".$row['id'])), 'U_PROFILE' => $profile, *************** *** 477,486 **** 'COMMENTS' => $total_comments, 'IMAGE' => ( !empty($img_url) ? $img_url : $mx_images['noimage'] ) ! )); } else { $template->assign_block_vars('noimagerow', array( ! 'U_ADS_ITEM' => append_sid(this_ads_mxurl("ads_mode=ads_item&id=".$row['id'])), 'U_PROFILE' => $profile, --- 477,486 ---- 'COMMENTS' => $total_comments, 'IMAGE' => ( !empty($img_url) ? $img_url : $mx_images['noimage'] ) ! )); } else { $template->assign_block_vars('noimagerow', array( ! 'U_ADS_ITEM' => append_sid(this_ads_mxurl("ads_mode=ads_item&id=".$row['id'])), 'U_PROFILE' => $profile, *************** *** 493,502 **** 'PRICE' => $row['price'], 'VIEWS' => $row['views'], ! 'COMMENTS' => $total_comments)); } } } else ! { $template->assign_block_vars('switch_no_items_found',array()); } --- 493,502 ---- 'PRICE' => $row['price'], 'VIEWS' => $row['views'], ! 'COMMENTS' => $total_comments)); } } } else ! { $template->assign_block_vars('switch_no_items_found',array()); } *************** *** 537,541 **** $page_string = sprintf($lang['Page_of'], ( floor( $start / $ads_config['ads_per_page'] ) + 1 ), ceil( $ads_count / $ads_config['ads_per_page'] )); ! $template->assign_vars(array( 'U_ADS_INDEX' => append_sid(this_ads_mxurl()), --- 537,541 ---- $page_string = sprintf($lang['Page_of'], ( floor( $start / $ads_config['ads_per_page'] ) + 1 ), ceil( $ads_count / $ads_config['ads_per_page'] )); ! $template->assign_vars(array( 'U_ADS_INDEX' => append_sid(this_ads_mxurl()), *************** *** 547,551 **** 'U_RSS2' => append_sid($module_root_path . "adverts." . $phpEx . "?ads_mode=ads_rss2" . '&sid=' . $userdata['session_id']), 'IMG_RSS2' => $mx_images['ads_rss2'], ! 'L_CATEGORIES' => $lang['categories'], 'L_TITLE' => $lang['title'], --- 547,551 ---- 'U_RSS2' => append_sid($module_root_path . "adverts." . $phpEx . "?ads_mode=ads_rss2" . '&sid=' . $userdata['session_id']), 'IMG_RSS2' => $mx_images['ads_rss2'], ! 'L_CATEGORIES' => $lang['categories'], 'L_TITLE' => $lang['title'], *************** *** 564,568 **** 'MSG_NEWAD' => $mx_images['msg_newad'], 'GOTO_STRING' => $goto_string, ! 'PAGE_STRING' => $page_string, 'POINTER' => $pointer, 'POINTER2' => $pointer2, --- 564,568 ---- 'MSG_NEWAD' => $mx_images['msg_newad'], 'GOTO_STRING' => $goto_string, ! 'PAGE_STRING' => $page_string, 'POINTER' => $pointer, 'POINTER2' => $pointer2, *************** *** 570,574 **** 'SUB_CATEGORY' => stripslashes(str_replace("''", "\'", $inp_sub_category)))); ! $template->pparse('adverts_page'); if ( !is_object($mx_block)) --- 570,574 ---- 'SUB_CATEGORY' => stripslashes(str_replace("''", "\'", $inp_sub_category)))); ! $template->pparse('adverts_page'); if ( !is_object($mx_block)) *************** *** 576,580 **** include($mx_root_path . 'includes/page_tail.'.$phpEx); } ! // +-------------------------------------------------------------+ // | Powered by phpCA Classified Ads 0.5.6 (c) 2006 PeteMan | --- 576,580 ---- include($mx_root_path . 'includes/page_tail.'.$phpEx); } ! // +-------------------------------------------------------------+ // | Powered by phpCA Classified Ads 0.5.6 (c) 2006 PeteMan | Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/db_install.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_install.php 8 Feb 2008 23:42:47 -0000 1.2 --- db_install.php 28 Feb 2008 06:26:23 -0000 1.3 *************** *** 124,128 **** last_chase_type char(1) NOT NULL default '', renewal_password int(9) NOT NULL default '0', ! PRIMARY KEY (id) ) TYPE=MyISAM"; --- 124,128 ---- last_chase_type char(1) NOT NULL default '', renewal_password int(9) NOT NULL default '0', ! PRIMARY KEY (id) ) TYPE=MyISAM"; *************** *** 142,146 **** KEY comment_user_id (comment_user_id), KEY comment_user_ip (comment_user_ip), ! KEY comment_time (comment_time) ) TYPE=MyISAM"; --- 142,146 ---- KEY comment_user_id (comment_user_id), KEY comment_user_ip (comment_user_ip), ! KEY comment_time (comment_time) ) TYPE=MyISAM"; *************** *** 229,262 **** notify_version varchar(10), verify_sign varchar(10), ! custom mediumint(8), PRIMARY KEY (invoice) ) TYPE=MyISAM"; $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('max_pics', '1024')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('ads_per_page', '5')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('ad_duration_months', '3')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('board_disable', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('config_id', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('default_style', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('first_chase_days', '28')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('large_img_height', '480')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('large_img_width', '640')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('max_ads_per_user', '100')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('max_images_per_ad', '5')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('medium_img_height', '200')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('medium_img_width', '200')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('second_chase_days', '14')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('thumb_img_height', '100')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('thumb_img_width', '100')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('rate_scale', '10')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('comment', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('rate', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('images', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('paid_ads', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('renewals', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('view_level', '-1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('move_level', '2')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('search_level', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('private_trade_ind', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('version', '0.5.5')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('enable_integration', '1')"; --- 229,262 ---- notify_version varchar(10), verify_sign varchar(10), ! custom mediumint(8), PRIMARY KEY (invoice) ) TYPE=MyISAM"; $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('max_pics', '1024')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('ads_per_page', '5')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('ad_duration_months', '3')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('board_disable', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('config_id', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('default_style', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('first_chase_days', '28')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('large_img_height', '480')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('large_img_width', '640')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('max_ads_per_user', '100')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('max_images_per_ad', '5')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('medium_img_height', '200')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('medium_img_width', '200')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('second_chase_days', '14')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('thumb_img_height', '100')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('thumb_img_width', '100')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('rate_scale', '10')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('comment', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('rate', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('images', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('paid_ads', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('renewals', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('view_level', '-1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('move_level', '2')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('search_level', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('private_trade_ind', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('version', '0.5.5')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('enable_integration', '1')"; *************** *** 264,277 **** $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('index', '6')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('ebay_ref', '172425')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('webmasterplan_site', '1382')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('currency_code', 'GBP')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('language_code', 'GB')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('business_email', 'web...@ho...')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('sandbox', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('basic', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('standard', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('photo', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('premium', '1')"; $sql[] = "UPDATE " . $mx_table_prefix . "module" . " --- 264,277 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('index', '6')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('ebay_ref', '172425')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_config VALUES ('webmasterplan_site', '1382')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('currency_code', 'GBP')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('language_code', 'GB')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('business_email', 'web...@ho...')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('sandbox', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('basic', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('standard', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('photo', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "ads_paid_ads_config VALUES ('premium', '1')"; $sql[] = "UPDATE " . $mx_table_prefix . "module" . " *************** *** 294,296 **** echo "</table><br />"; ! ?> \ No newline at end of file --- 294,296 ---- echo "</table><br />"; ! ?> |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:28
|
Update of /cvsroot/mxbb/mx_phpCA/ads_mod In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_phpCA/ads_mod Modified Files: ads_common.php ads_constants.php ads_functions.php ads_integration.php ads_renewal_mailer.php Added Files: ads_emailer.php Log Message: cvs commit test Index: ads_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/ads_mod/ads_common.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_common.php 6 Jun 2007 22:24:31 -0000 1.1 --- ads_common.php 28 Feb 2008 06:26:20 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_common.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_common.php *************** *** 79,83 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Could not query ads config information", "", __LINE__, __FILE__, $sql); } --- 79,83 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Could not query ads config information", "", __LINE__, __FILE__, $sql); } *************** *** 95,99 **** if ( !$ads_config['version'] == '0.5.5' ) { ! message_die(GENERAL_ERROR, "Script and data out of sync. Please run dbupgrade.php", "", __LINE__, __FILE__); } --- 95,99 ---- if ( !$ads_config['version'] == '0.5.5' ) { ! mx_message_die(GENERAL_ERROR, "Script and data out of sync. Please run dbupgrade.php", "", __LINE__, __FILE__); } *************** *** 108,112 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Could not query paid ads config information", "", __LINE__, __FILE__, $sql); } --- 108,112 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Could not query paid ads config information", "", __LINE__, __FILE__, $sql); } Index: ads_renewal_mailer.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/ads_mod/ads_renewal_mailer.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ads_renewal_mailer.php 28 Jan 2008 21:58:51 -0000 1.2 --- ads_renewal_mailer.php 28 Feb 2008 06:26:21 -0000 1.3 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_renewal_mailer.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_renewal_mailer.php *************** *** 23,27 **** $file = fopen($filename, 'w'); ! if ( !$file ) { message_die(GENERAL_ERROR, 'Error creating chaser log file'); --- 23,27 ---- $file = fopen($filename, 'w'); ! if ( !$file ) { message_die(GENERAL_ERROR, 'Error creating chaser log file'); *************** *** 29,34 **** // Get all active ads ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE status = 'active' AND USER_ID <> ". ADS_GUEST; --- 29,34 ---- // Get all active ads ! $sql = "SELECT * ! FROM ". ADS_ADVERTS_TABLE ." WHERE status = 'active' AND USER_ID <> ". ADS_GUEST; *************** *** 41,45 **** srand((double) microtime() * 1000000); ! while ($row = $db->sql_fetchrow($result)) { $id = $row['id']; --- 41,45 ---- srand((double) microtime() * 1000000); ! while ($row = $db->sql_fetchrow($result)) { $id = $row['id']; *************** *** 49,53 **** $status = $row['status']; ! $sql = "SELECT * FROM ". ADS_CHASERS_TABLE ." WHERE id = '$id'"; --- 49,53 ---- $status = $row['status']; ! $sql = "SELECT * FROM ". ADS_CHASERS_TABLE ." WHERE id = '$id'"; *************** *** 62,67 **** { // Get recipients details from phpBB ! $profiledata = mx_get_userdata($username,'true'); ! $recip_email = $profiledata['user_email']; // Renewal passwords only for free ads! --- 62,67 ---- { // Get recipients details from phpBB ! $profiledata = get_userdata($username,'true'); ! $recip_email = $profiledata['user_email']; // Renewal passwords only for free ads! *************** *** 105,114 **** { // Is second chase due? ! if ( $row2['last_chase_type'] == '1' and time() >= ($expiry_date - ($ads_config['second_chase_days']*60*60*24)) ) { // Get recipients details from phpBB ! $profiledata = mx_get_userdata($username,'true'); ! $recip_email = $profiledata['user_email']; // Renewal passwords only for free ads! --- 105,114 ---- { // Is second chase due? ! if ( $row2['last_chase_type'] == '1' and time() >= ($expiry_date - ($ads_config['second_chase_days']*60*60*24)) ) { // Get recipients details from phpBB ! $profiledata = get_userdata($username,'true'); ! $recip_email = $profiledata['user_email']; // Renewal passwords only for free ads! *************** *** 137,141 **** $sql = "UPDATE ". ADS_CHASERS_TABLE ." ! SET last_chase_type = '$last_chase_type' WHERE id = $id"; --- 137,141 ---- $sql = "UPDATE ". ADS_CHASERS_TABLE ." ! SET last_chase_type = '$last_chase_type' WHERE id = $id"; *************** *** 149,159 **** fwrite ($file, $record); } ! // Is final chase due? if ( $row2['last_chase_type'] == '2' and time() >= $expiry_date ) { // Get recipients details from phpBB ! $profiledata = mx_get_userdata($username,'true'); ! $recip_email = $profiledata['user_email']; // Renewal passwords only for free ads! --- 149,159 ---- fwrite ($file, $record); } ! // Is final chase due? if ( $row2['last_chase_type'] == '2' and time() >= $expiry_date ) { // Get recipients details from phpBB ! $profiledata = get_userdata($username,'true'); ! $recip_email = $profiledata['user_email']; // Renewal passwords only for free ads! *************** *** 182,186 **** $sql = "UPDATE ". ADS_CHASERS_TABLE ." ! SET last_chase_type = '$last_chase_type' WHERE id = $id"; --- 182,186 ---- $sql = "UPDATE ". ADS_CHASERS_TABLE ." ! SET last_chase_type = '$last_chase_type' WHERE id = $id"; *************** *** 198,202 **** $sql = "UPDATE ". ADS_ADVERTS_TABLE ." ! SET status = '$status' WHERE id = $id"; --- 198,202 ---- $sql = "UPDATE ". ADS_ADVERTS_TABLE ." ! SET status = '$status' WHERE id = $id"; *************** *** 207,211 **** // Delete the images ! $sql = "SELECT * FROM ". ADS_IMAGES_TABLE ." WHERE id = $id --- 207,211 ---- // Delete the images ! $sql = "SELECT * FROM ". ADS_IMAGES_TABLE ." WHERE id = $id *************** *** 214,218 **** $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $img_seq_no = $row['img_seq_no']; --- 214,218 ---- $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $img_seq_no = $row['img_seq_no']; *************** *** 220,224 **** $sql2 = "UPDATE ". ADS_IMAGES_TABLE ." SET img_deleted_ind = 1 ! WHERE id = '$id' AND img_seq_no = '$img_seq_no'"; --- 220,224 ---- $sql2 = "UPDATE ". ADS_IMAGES_TABLE ." SET img_deleted_ind = 1 ! WHERE id = '$id' AND img_seq_no = '$img_seq_no'"; *************** *** 245,248 **** fwrite ($file, $record); ! fclose ($file); ?> \ No newline at end of file --- 245,248 ---- fwrite ($file, $record); ! fclose ($file); ?> \ No newline at end of file Index: ads_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/ads_mod/ads_constants.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ads_constants.php 6 Jun 2007 22:24:31 -0000 1.1 --- ads_constants.php 28 Feb 2008 06:26:20 -0000 1.2 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_constants.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_constants.php *************** *** 26,54 **** // User Levels for Ads system <- do NOT change these values ! define('ADS_ANONYMOUS', -1); ! define('ADS_GUEST', -1); ! define('ADS_USER', 0); ! define('ADS_ADMIN', 1); ! define('ADS_MOD', 2); ! define('ADS_PRIVATE', 3); // Path (trailing slash required) ! define('ADS_IMAGES_PATH', $module_root_path . 'upload/images/'); // define('ADS_CHASERS_PATH', $module_root_path . 'upload/chasers/'); ! define('ADS_CHASERS_PATH', $module_root_path . 'upload/chasers/'); ! define('ADS_PAYMENTS_PATH', $module_root_path . 'upload/payments/'); // Table names ! !defined('ADS_ADVERTS_TABLE') ? define('ADS_ADVERTS_TABLE', $mx_table_prefix.'ads_adverts') : false; ! !defined('ADS_CATEGORIES_TABLE') ? define('ADS_CATEGORIES_TABLE', $mx_table_prefix.'ads_categories') : false; ! !defined('ADS_CHASERS_TABLE') ? define('ADS_CHASERS_TABLE', $mx_table_prefix.'ads_chasers') : false; ! !defined('ADS_COMMENTS_TABLE') ? define('ADS_COMMENTS_TABLE', $mx_table_prefix.'ads_comments') : false; ! !defined('ADS_CONFIG_TABLE') ? define('ADS_CONFIG_TABLE', $mx_table_prefix.'ads_config') : false; ! !defined('ADS_DETAILS_TABLE') ? define('ADS_DETAILS_TABLE', $mx_table_prefix.'ads_details') : false; ! !defined('ADS_IMAGES_TABLE') ? define('ADS_IMAGES_TABLE', $mx_table_prefix.'ads_images') : false; ! !defined('ADS_PAID_ADS_CONFIG_TABLE') ? define('ADS_PAID_ADS_CONFIG_TABLE', $mx_table_prefix.'ads_paid_ads_config') : false; ! !defined('ADS_PAYPAL_PAYMENTS') ? define('ADS_PAYPAL_PAYMENTS', $mx_table_prefix.'ads_paypal_payments') : false; ! !defined('ADS_RATE_TABLE') ? define('ADS_RATE_TABLE', $mx_table_prefix.'ads_rate') : false; ! !defined('ADS_USERS_TABLE') ? define('ADS_USERS_TABLE', $mx_table_prefix.'ads_users') : false; ?> \ No newline at end of file --- 26,54 ---- // User Levels for Ads system <- do NOT change these values ! @define('ADS_ANONYMOUS', -1); ! @define('ADS_GUEST', -1); ! @define('ADS_USER', 0); ! @define('ADS_ADMIN', 1); ! @define('ADS_MOD', 2); ! @define('ADS_PRIVATE', 3); // Path (trailing slash required) ! @define('ADS_IMAGES_PATH', $module_root_path . 'upload/images/'); // define('ADS_CHASERS_PATH', $module_root_path . 'upload/chasers/'); ! @define('ADS_CHASERS_PATH', $module_root_path . 'upload/chasers/'); ! @define('ADS_PAYMENTS_PATH', $module_root_path . 'upload/payments/'); // Table names ! @define('ADS_ADVERTS_TABLE', $mx_table_prefix.'ads_adverts'); ! @define('ADS_CATEGORIES_TABLE', $mx_table_prefix.'ads_categories'); ! @define('ADS_CHASERS_TABLE', $mx_table_prefix.'ads_chasers'); ! @define('ADS_COMMENTS_TABLE', $mx_table_prefix.'ads_comments'); ! @define('ADS_CONFIG_TABLE', $mx_table_prefix.'ads_config'); ! @define('ADS_DETAILS_TABLE', $mx_table_prefix.'ads_details'); ! @define('ADS_IMAGES_TABLE', $mx_table_prefix.'ads_images'); ! @define('ADS_PAID_ADS_CONFIG_TABLE', $mx_table_prefix.'ads_paid_ads_config'); ! @define('ADS_PAYPAL_PAYMENTS', $mx_table_prefix.'ads_paypal_payments'); ! @define('ADS_RATE_TABLE', $mx_table_prefix.'ads_rate'); ! @define('ADS_USERS_TABLE', $mx_table_prefix.'ads_users'); ?> \ No newline at end of file --- NEW FILE: ads_emailer.php --- <?php /*************************************************************************** ads_emailer.php ------------------- begin : Sunday Aug. 12, 2001 copyright : (C) 2001 The phpBB Group email : su...@ph... $Id: ads_emailer.php,v 1.1 2008/02/28 06:26:21 orynider Exp $ ***************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ // // The emailer class has support for attaching files, that isn't implemented // in the 2.0 release but we can probable find some way of using it in a future // release // class emailer { var $msg, $subject, $extra_headers; var $addresses, $reply_to, $from; var $use_smtp; var $tpl_msg = array(); function emailer($use_smtp) { $this->reset(); $this->use_smtp = $use_smtp; $this->reply_to = $this->from = ''; } // Resets all the data (address, template file, etc etc to default function reset() { $this->addresses = array(); $this->vars = $this->msg = $this->extra_headers = ''; } // Sets an email address to send to function email_address($address) { $this->addresses['to'] = trim($address); } function cc($address) { $this->addresses['cc'][] = trim($address); } function bcc($address) { $this->addresses['bcc'][] = trim($address); } function replyto($address) { $this->reply_to = trim($address); } function from($address) { $this->from = trim($address); } // set up subject for mail function set_subject($subject = '') { $this->subject = trim(preg_replace('#[\n\r]+#s', '', $subject)); } // set up extra mail headers function extra_headers($headers) { $this->extra_headers .= trim($headers) . "\n"; } function use_template($template_file, $template_lang = '') { global $board_config, $phpbb_root_path, $module_root_path, $mx_root_path; if (trim($template_file) == '') { mx_message_die(GENERAL_ERROR, 'No template file set', '', __LINE__, __FILE__); } if (trim($template_lang) == '') { $template_lang = $board_config['default_lang']; } if (empty($this->tpl_msg[$template_lang . $template_file])) { $tpl_file = $module_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'; if (!@file_exists(@phpbb_realpath($tpl_file))) { $tpl_file = $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl'; if (!@file_exists(@phpbb_realpath($tpl_file))) { mx_message_die(GENERAL_ERROR, 'Could not find email template file :: ' . $template_file . ' @:' . $tpl_file, '', __LINE__, __FILE__); } } if (!($fd = @fopen($tpl_file, 'r'))) { mx_message_die(GENERAL_ERROR, 'Failed opening template file :: ' . $template_file . ' @:' . $tpl_file, '', __LINE__, __FILE__); } $this->tpl_msg[$template_lang . $template_file] = fread($fd, filesize($tpl_file)); fclose($fd); } $this->msg = $this->tpl_msg[$template_lang . $template_file]; return true; } // assign variables function assign_vars($vars) { $this->vars = (empty($this->vars)) ? $vars : $this->vars . $vars; } // Send the mail out to the recipients set previously in var $this->address function send() { global $board_config, $lang, $phpEx, $phpbb_root_path, $db; // Added by Email Disable MOD if (!$board_config['email_enabled']) { mx_message_die(GENERAL_ERROR, $lang['Email_disabled']); } // Finish Email Disable MOD // Escape all quotes, else the eval will fail. $this->msg = str_replace ("'", "\'", $this->msg); $this->msg = preg_replace('#\{([a-z0-9\-_]*?)\}#is', "' . $\\1 . '", $this->msg); // Set vars reset ($this->vars); while (list($key, $val) = each($this->vars)) { $$key = $val; } eval("\$this->msg = '$this->msg';"); // Clear vars reset ($this->vars); while (list($key, $val) = each($this->vars)) { unset($$key); } // We now try and pull a subject from the email body ... if it exists, // do this here because the subject may contain a variable $drop_header = ''; $match = array(); if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match)) { $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject'); $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); } else { $this->subject = (($this->subject != '') ? $this->subject : 'No Subject'); } if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match)) { $this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim($lang['ENCODING']); $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); } else { $this->encoding = trim($lang['ENCODING']); } if ($drop_header != '') { $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg)); } $to = $this->addresses['to']; $cc = (count($this->addresses['cc'])) ? implode(', ', $this->addresses['cc']) : ''; $bcc = (count($this->addresses['bcc'])) ? implode(', ', $this->addresses['bcc']) : ''; // Build header $this->extra_headers = (($this->reply_to != '') ? "Reply-to: $this->reply_to\n" : '') . (($this->from != '') ? "From: $this->from\n" : "From: " . $board_config['board_email'] . "\n") . "Return-Path: " . $board_config['board_email'] . "\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . date('r', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By phpBB2\n" . $this->extra_headers . (($cc != '') ? "Cc: $cc\n" : '') . (($bcc != '') ? "Bcc: $bcc\n" : ''); // Send message ... removed $this->encode() from subject for time being if ( $this->use_smtp ) { if ( !defined('SMTP_INCLUDED') ) { include($phpbb_root_path . 'includes/smtp.' . $phpEx); } $result = smtpmail($to, $this->subject, $this->msg, $this->extra_headers); } else { $empty_to_header = ($to == '') ? TRUE : FALSE; $to = ($to == '') ? (($board_config['sendmail_fix']) ? ' ' : 'Undisclosed-recipients:;') : $to; $result = @mail($to, $this->subject, preg_replace("#(?<!\r)\n#s", "\n", $this->msg), $this->extra_headers); if (!$result && !$board_config['sendmail_fix'] && $empty_to_header) { $to = ' '; $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '1' WHERE config_name = 'sendmail_fix'"; if (!$db->sql_query($sql)) { mx_message_die(GENERAL_ERROR, 'Unable to update config table', '', __LINE__, __FILE__, $sql); } $board_config['sendmail_fix'] = 1; $result = mail($to, $this->subject, preg_replace("#(?<!\r)\n#s", "\n", $this->msg), $this->extra_headers); } } // Did it work? if (!$result) { mx_message_die(GENERAL_ERROR, 'Failed sending email, mail() disabled? :: ' . (($this->use_smtp) ? 'SMTP' : 'PHP') . ' :: ' . $result, '', __LINE__ , __FILE__); } return true; } // Encodes the given string for proper display for this encoding ... nabbed // from php.net and modified. There is an alternative encoding method which // may produce lesd output but it's questionable as to its worth in this // scenario IMO function encode($str) { if ($this->encoding == '') { return $str; } // define start delimimter, end delimiter and spacer $end = "?="; $start = "=?$this->encoding?B?"; $spacer = "$end\r\n $start"; // determine length of encoded text within chunks and ensure length is even $length = 75 - strlen($start) - strlen($end); $length = floor($length / 2) * 2; // encode the string and split it into chunks with spacers after each chunk $str = chunk_split(base64_encode($str), $length, $spacer); // remove trailing spacer and add start and end delimiters $str = preg_replace('#' . preg_quote($spacer, '#') . '$#', '', $str); return $start . $str . $end; } // // Attach files via MIME. // function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay) { global $lang; $mime_boundary = "--==================_846811060==_"; $this->msg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"" . $lang['ENCODING'] . "\"\n\n" . $this->msg; if ($mime_filename) { $filename = $mime_filename; $encoded = $this->encode_file($filename); } $fd = fopen($filename, "r"); $contents = fread($fd, filesize($filename)); $this->mimeOut = "--" . $mime_boundary . "\n"; $this->mimeOut .= "Content-Type: " . $mimetype . ";\n\tname=\"$szFilenameToDisplay\"\n"; $this->mimeOut .= "Content-Transfer-Encoding: quoted-printable\n"; $this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=\"$szFilenameToDisplay\"\n\n"; if ( $mimetype == "message/rfc822" ) { $this->mimeOut .= "From: ".$szFromAddress."\n"; $this->mimeOut .= "To: ".$this->emailAddress."\n"; $this->mimeOut .= "Date: ".date("D, d M Y H:i:s") . " UT\n"; $this->mimeOut .= "Reply-To:".$szFromAddress."\n"; $this->mimeOut .= "Subject: ".$this->mailSubject."\n"; $this->mimeOut .= "X-Mailer: PHP/".phpversion()."\n"; $this->mimeOut .= "MIME-Version: 1.0\n"; } $this->mimeOut .= $contents."\n"; $this->mimeOut .= "--" . $mime_boundary . "--" . "\n"; return $out; // added -- to notify email client attachment is done } function getMimeHeaders($filename, $mime_filename="") { $mime_boundary = "--==================_846811060==_"; if ($mime_filename) { $filename = $mime_filename; } $out = "MIME-Version: 1.0\n"; $out .= "Content-Type: multipart/mixed;\n\tboundary=\"$mime_boundary\"\n\n"; $out .= "This message is in MIME format. Since your mail reader does not understand\n"; $out .= "this format, some or all of this message may not be legible."; return $out; } // // Split string by RFC 2045 semantics (76 chars per line, end with \r\n). // function myChunkSplit($str) { $stmp = $str; $len = strlen($stmp); $out = ""; while ($len > 0) { if ($len >= 76) { $out .= substr($stmp, 0, 76) . "\r\n"; $stmp = substr($stmp, 76); $len = $len - 76; } else { $out .= $stmp . "\r\n"; $stmp = ""; $len = 0; } } return $out; } // // Split the specified file up into a string and return it // function encode_file($sourcefile) { if (is_readable(phpbb_realpath($sourcefile))) { $fd = fopen($sourcefile, "r"); $contents = fread($fd, filesize($sourcefile)); $encoded = $this->myChunkSplit(base64_encode($contents)); fclose($fd); } return $encoded; } } // class emailer ?> Index: ads_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/ads_mod/ads_functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ads_functions.php 28 Jan 2008 21:58:51 -0000 1.2 --- ads_functions.php 28 Feb 2008 06:26:20 -0000 1.3 *************** *** 1,3 **** ! <? /*************************************************************************** * ads_functions.php --- 1,3 ---- ! <?php /*************************************************************************** * ads_functions.php *************** *** 27,31 **** global $userdata, $phpEx; ! if ( $view_level == ADS_GUEST ) { $view_allowed = TRUE; --- 27,31 ---- global $userdata, $phpEx; ! if ( $view_level == ADS_GUEST ) { $view_allowed = TRUE; *************** *** 57,92 **** } ! // ========================= ! // Move allowed ! // ========================= ! function move_allowed($user_id, $ads_move_level) ! { ! global $userdata, $phpEx; ! if ( ( $ads_move_level == ADS_USER and $userdata['user_id'] == $user_id and $userdata['session_logged_in'] ) ! or ( $ads_move_level == ADS_USER and $userdata['user_level'] == MOD ) ) ! { ! $move_allowed = TRUE; ! } ! if ( $ads_move_level == ADS_MOD and $userdata['user_level'] == MOD ) ! { ! $move_allowed = TRUE; ! } ! if ($userdata['user_level'] == ADMIN ) ! { ! $move_allowed = TRUE; ! } ! if ( $move_allowed == TRUE) ! { ! return TRUE; ! } ! else ! { ! return FALSE; ! } ! } // ========================= --- 57,92 ---- } ! // ========================= ! // Move allowed ! // ========================= ! function move_allowed($user_id, $ads_move_level) ! { ! global $userdata, $phpEx; ! if ( ( $ads_move_level == ADS_USER and $userdata['user_id'] == $user_id and $userdata['session_logged_in'] ) ! or ( $ads_move_level == ADS_USER and $userdata['user_level'] == MOD ) ) ! { ! $move_allowed = TRUE; ! } ! if ( $ads_move_level == ADS_MOD and $userdata['user_level'] == MOD ) ! { ! $move_allowed = TRUE; ! } ! if ($userdata['user_level'] == ADMIN ) ! { ! $move_allowed = TRUE; ! } ! if ( $move_allowed == TRUE) ! { ! return TRUE; ! } ! else ! { ! return FALSE; ! } ! } // ========================= *************** *** 97,101 **** global $userdata, $phpEx; ! if ( $search_level == ADS_GUEST ) { $search_allowed = TRUE; --- 97,101 ---- global $userdata, $phpEx; ! if ( $search_level == ADS_GUEST ) { $search_allowed = TRUE; *************** *** 134,138 **** global $userdata, $phpEx; ! if ( $cat_create_level == ADS_GUEST ) { $create_allowed = TRUE; --- 134,138 ---- global $userdata, $phpEx; ! if ( $cat_create_level == ADS_GUEST ) { $create_allowed = TRUE; *************** *** 140,146 **** else { ! if ( !$userdata['session_logged_in'] ) { ! mx_redirect(append_sid("login.$phpEx?redirect=ads_create.$phpEx")); } } --- 140,146 ---- else { ! if ( !$userdata['session_logged_in'] ) { ! redirect(append_sid("login.$phpEx?redirect=ads_create.$phpEx")); } } *************** *** 277,281 **** global $userdata, $phpEx; ! if ( $cat_comment_level == ADS_GUEST ) { $comment_allowed = TRUE; --- 277,281 ---- global $userdata, $phpEx; ! if ( $cat_comment_level == ADS_GUEST ) { $comment_allowed = TRUE; *************** *** 315,319 **** $height = imagesy($im); ! if (($resizewidth and $width > $resizewidth) or ($resizeheight and $height > $resizeheight)) { --- 315,319 ---- $height = imagesy($im); ! if (($resizewidth and $width > $resizewidth) or ($resizeheight and $height > $resizeheight)) { *************** *** 360,364 **** imagecopyresized($newim, $im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height); } ! touch($filename . ".jpg"); ImageJpeg ($newim,$filename . ".jpg"); // ImageDestroy ($newim); --- 360,364 ---- imagecopyresized($newim, $im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height); } ! touch($filename . ".jpg"); ImageJpeg ($newim,$filename . ".jpg"); // ImageDestroy ($newim); *************** *** 366,370 **** else { ! touch($filename . ".jpg"); ImageJpeg ($im,$filename . ".jpg"); } --- 366,370 ---- else { ! touch($filename . ".jpg"); ImageJpeg ($im,$filename . ".jpg"); } *************** *** 374,378 **** // Image popups // ========================= ! //function popup($medium_img_url, $large_img_url, $title, $width=false, $height=false) //{ // $title_urlencoded = rawurlencode($title); --- 374,378 ---- // Image popups // ========================= ! //function popup($medium_img_url, $large_img_url, $title, $width=false, $height=false) //{ // $title_urlencoded = rawurlencode($title); *************** *** 400,404 **** srand((double)microtime()*1000000); ! for ($i = 0; $i < 30; $i++) { $x1 = rand(0,120); --- 400,404 ---- srand((double)microtime()*1000000); ! for ($i = 0; $i < 30; $i++) { $x1 = rand(0,120); *************** *** 406,413 **** $x2 = rand(0,120); $y2 = rand(0,30); ! imageline($image, $x1, $y1, $x2, $y2 , $gray); } ! for ($i = 0; $i < 5; $i++) { $cnum[$i] = rand(0,9); --- 406,413 ---- $x2 = rand(0,120); $y2 = rand(0,30); ! imageline($image, $x1, $y1, $x2, $y2 , $gray); } ! for ($i = 0; $i < 5; $i++) { $cnum[$i] = rand(0,9); *************** *** 418,423 **** $fnt = rand(5,8); $x = $x + rand(12 , 20); ! $y = rand(7 , 12); ! imagestring($image, $fnt, $x, $y, $cnum[$i] , $darkgray); } --- 418,423 ---- $fnt = rand(5,8); $x = $x + rand(12 , 20); ! $y = rand(7 , 12); ! imagestring($image, $fnt, $x, $y, $cnum[$i] , $darkgray); } *************** *** 429,433 **** //header('Content-type: image/png'); $image = imagepng($image); ! imagedestroy($image); return $image; --- 429,433 ---- //header('Content-type: image/png'); $image = imagepng($image); ! imagedestroy($image); return $image; *************** *** 439,446 **** function chaser_email($sender_email, $recip_email, $subject, $message) { ! global $board_config, $phpEx, $phpbb_root_path; global $email_headers, $user_lang; ! include_once($phpbb_root_path . 'includes/emailer.'.$phpEx); // Left in for debugging --- 439,446 ---- function chaser_email($sender_email, $recip_email, $subject, $message) { ! global $board_config, $phpEx, $phpbb_root_path, $module_root_path; global $email_headers, $user_lang; ! include_once($module_root_path . 'includes/ads_emailer.'.$phpEx); // Left in for debugging *************** *** 455,467 **** $emailer->from($sender_email); $emailer->replyto($sender_email); ! $emailer->use_template('admin_send_email', $user_lang); $emailer->email_address($recip_email); $emailer->set_subject($subject); $emailer->extra_headers($email_headers); ! $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], ! 'BOARD_EMAIL' => $board_config['board_email'], 'MESSAGE' => $message)); --- 455,467 ---- $emailer->from($sender_email); $emailer->replyto($sender_email); ! $emailer->use_template('admin_send_email', $user_lang); $emailer->email_address($recip_email); $emailer->set_subject($subject); $emailer->extra_headers($email_headers); ! $emailer->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], ! 'BOARD_EMAIL' => $board_config['board_email'], 'MESSAGE' => $message)); *************** *** 473,511 **** // Create a comma separated value file from an array // ========================================================== ! function create_csv_file($file, $data) { //check for array ! if (is_array($data)) ! { ! $post_values=array_values($data); //build csv data ! foreach($post_values as $i) {$csv.="\"$i\",";} //remove the last comma from string ! $csv = substr($csv,0,-1); //check for existence of file ! if (file_exists($file) and is_writeable($file)) ! {$mode = "a";} ! else {$mode="w";} //create file pointer $fp = @fopen($file,$mode); ! //write to file ! fwrite($fp,$csv . "\n"); //close file pointer ! fclose($fp); ! return true; ! } else ! { ! return false; ! } } --- 473,511 ---- // Create a comma separated value file from an array // ========================================================== ! function create_csv_file($file, $data) { //check for array ! if (is_array($data)) ! { ! $post_values=array_values($data); //build csv data ! foreach($post_values as $i) {$csv.="\"$i\",";} //remove the last comma from string ! $csv = substr($csv,0,-1); //check for existence of file ! if (file_exists($file) and is_writeable($file)) ! {$mode = "a";} ! else {$mode="w";} //create file pointer $fp = @fopen($file,$mode); ! //write to file ! fwrite($fp,$csv . "\n"); //close file pointer ! fclose($fp); ! return true; ! } else ! { ! return false; ! } } *************** *** 513,517 **** // Create a comma separated value file from an array // ========================================================== ! function create_error_file($file, $message) { $open = fopen ($file, "a"); --- 513,517 ---- // Create a comma separated value file from an array // ========================================================== ! function create_error_file($file, $message) { $open = fopen ($file, "a"); *************** *** 519,523 **** { fwrite ($open, $message."\r\n"); ! fclose ($open); } } --- 519,523 ---- { fwrite ($open, $message."\r\n"); ! fclose ($open); } } *************** *** 572,576 **** // htmlspecialchars_decode // ========================================================== ! function htmlspecialchars_decode_php4($str, $quote_style = ENT_COMPAT) { if ( function_exists('htmlspecialchars_decode') ) --- 572,576 ---- // htmlspecialchars_decode // ========================================================== ! function htmlspecialchars_decode_php4($str, $quote_style = ENT_COMPAT) { if ( function_exists('htmlspecialchars_decode') ) |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:26
|
Update of /cvsroot/mxbb/mx_shotcast/images/red In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/images/red Added Files: player.png player2.png player3_real.png player3_wmp.png small_real.png small_wmp.png Log Message: cvs commit test --- NEW FILE: player3_real.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: small_real.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: small_wmp.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player3_wmp.png --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/mxbb/mx_shotcast/images/default In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/images/default Added Files: player.png player2.png player3.png player3_real.png player3_wmp.png playerbg.png small_real.png small_wmp.png Log Message: cvs commit test --- NEW FILE: player3_real.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: small_real.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: playerbg.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: small_wmp.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player3_wmp.png --- (This appears to be a binary file; contents omitted.) |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:24
|
Update of /cvsroot/mxbb/mx_shotcast/images/purple In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/images/purple Added Files: player.png player2.png player3_real.png player3_wmp.png small_real.png small_wmp.png Log Message: cvs commit test --- NEW FILE: player3_real.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: small_real.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: small_wmp.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player3_wmp.png --- (This appears to be a binary file; contents omitted.) |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:20
|
Update of /cvsroot/mxbb/mx_shotcast/images/cyan In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/images/cyan Added Files: player.png player2.png player3_real.png player3_wmp.png small_real.png small_wmp.png Log Message: cvs commit test --- NEW FILE: player3_real.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: small_real.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: small_wmp.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player3_wmp.png --- (This appears to be a binary file; contents omitted.) |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:17
|
Update of /cvsroot/mxbb/mx_shotcast/images/custom_skining In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/images/custom_skining Added Files: equalizer_play.gif equalizer_stop.gif player3_.png trans_real.gif trans_wmp.gif Log Message: cvs commit test --- NEW FILE: trans_wmp.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: trans_real.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: equalizer_stop.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player3_.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: equalizer_play.gif --- (This appears to be a binary file; contents omitted.) |
|
From: OryNider <ory...@us...> - 2008-02-28 06:27:15
|
Update of /cvsroot/mxbb/mx_shotcast/images/blue In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_shotcast/images/blue Added Files: player.png player2.png player3_real.png player3_wmp.png small_real.png small_wmp.png Log Message: cvs commit test --- NEW FILE: player3_real.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: small_real.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: small_wmp.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: player3_wmp.png --- (This appears to be a binary file; contents omitted.) |
2 messages has been excluded from this view by a project administrator.