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: OryNider <ory...@us...> - 2008-03-14 12:36:01
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3680 Modified Files: album_constants.php Log Message: some @ since this constans should be defined in core too Index: album_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** album_constants.php 13 Mar 2008 08:47:23 -0000 1.4 --- album_constants.php 14 Mar 2008 12:35:51 -0000 1.5 *************** *** 32,37 **** } ! $mx_user->set_module_lang_path($module_root_path . 'album_mod/'); ! if (!MXBB_MODULE) { --- 32,42 ---- } ! // ------------------------------------------------------------------------- ! // Extend User Style with module lang and images ! // Usage: $mx_user->extend(LANG, IMAGES) ! // Switches: ! // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE ! // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE ! // ------------------------------------------------------------------------- if (!MXBB_MODULE) { *************** *** 39,42 **** --- 44,48 ---- { $mx_user->set_module_cfg_name('mx_smartor'); + $mx_user->set_module_lang_path($module_root_path . 'album_mod/'); $mx_user->extend(MX_LANG_ALL, MX_IMAGES); } *************** *** 48,61 **** $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x } - } ! // ------------------------------------------------------------------------- ! // Extend User Style with module lang and images ! // Usage: $mx_user->extend(LANG, IMAGES) ! // Switches: ! // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE ! // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE ! // ------------------------------------------------------------------------- ! $mx_user->extend(MX_LANG_ALL, MX_IMAGES); // Album Tables --- 54,70 ---- $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x } ! if (is_object($mx_page)) ! { ! // ------------------------------------------------------------------------- ! // Extend User Style with module lang and images ! // Usage: $mx_user->extend(LANG, IMAGES) ! // Switches: ! // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE ! // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE ! // ------------------------------------------------------------------------- ! $mx_user->extend(MX_LANG_ALL, MX_IMAGES); ! } ! } // Album Tables *************** *** 67,74 **** !defined('ALBUM_SP_CONFIG_TABLE') ? define('ALBUM_SP_CONFIG_TABLE', $mx_table_prefix.'smartor_album_sp_config') : false; ! define('PAGE_ALBUM', -50); // for Session Handling ! define('PAGE_ALBUM_PERSONAL', -51); ! define('PAGE_ALBUM_PICTURE', -52); ! define('PAGE_ALBUM_SEARCH', -53); define('PERSONAL_GALLERY', 0); // pic_cat_id <- do NOT change this value --- 76,83 ---- !defined('ALBUM_SP_CONFIG_TABLE') ? define('ALBUM_SP_CONFIG_TABLE', $mx_table_prefix.'smartor_album_sp_config') : false; ! @define('PAGE_ALBUM', -50); // for Session Handling ! @define('PAGE_ALBUM_PERSONAL', -51); ! @define('PAGE_ALBUM_PICTURE', -52); ! @define('PAGE_ALBUM_SEARCH', -53); define('PERSONAL_GALLERY', 0); // pic_cat_id <- do NOT change this value |
|
From: Jon O. <jon...@us...> - 2008-03-13 20:51:13
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3309 Modified Files: mx_functions_style.php Log Message: fix Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** mx_functions_style.php 11 Mar 2008 21:05:36 -0000 1.65 --- mx_functions_style.php 13 Mar 2008 20:50:56 -0000 1.66 *************** *** 247,251 **** } - // // phpBB.........................................................................phpBB --- 247,250 ---- *************** *** 258,262 **** case 'internal': case 'phpbb2': - $fileSearch = array(); $fileSearch[] = $style_path; // First check current template --- 257,260 ---- *************** *** 276,280 **** // case 'phpbb3': - $fileSearch = array(); $fileSearch[] = $style_path . '/' . 'theme'; // First check current template --- 274,277 ---- *************** *** 323,341 **** function doFileSearch($fileSearch, $filename, $filename2, $root, $module_root_path = '', $check_file2 = true) { foreach ($fileSearch as $key => $path) { if (!empty($path)) { ! if( file_exists($module_root_path . $root . $path . '/' . $filename) ) { ! $this->module_template_path = $root . $path . '/'; ! return $module_root_path . $root . $path . '/' . $filename; } if ($check_file2) { ! if( file_exists($module_root_path . $root . $path . '/' . $filename2) ) { ! $this->module_template_path = $root . $path . '/'; ! return $module_root_path . $root . $path . '/' . $filename2; } } --- 320,341 ---- function doFileSearch($fileSearch, $filename, $filename2, $root, $module_root_path = '', $check_file2 = true) { + global $mx_root_path; + + $this->module_template_path = ''; foreach ($fileSearch as $key => $path) { if (!empty($path)) { ! if( file_exists($mx_root_path . $module_root_path . $root . $path . '/' . $filename) ) { ! $this->module_template_path = $mx_root_path . $root . $path . '/'; ! return $mx_root_path . $module_root_path . $root . $path . '/' . $filename; } if ($check_file2) { ! if( file_exists($mx_root_path . $module_root_path . $root . $path . '/' . $filename2) ) { ! $this->module_template_path = $mx_root_path . $root . $path . '/'; ! return $mx_root_path . $module_root_path . $root . $path . '/' . $filename2; } } *************** *** 343,357 **** else if ($path == './') { ! if( file_exists($module_root_path . $root . $filename) ) { ! $this->module_template_path = $root; ! return $module_root_path . $root . $filename; } if ($check_file2) { ! if( file_exists($module_root_path . $root . $filename2) ) { ! $this->module_template_path = $root; ! return $module_root_path . $root . $filename2; } } --- 343,357 ---- else if ($path == './') { ! if( file_exists($mx_root_path . $module_root_path . $root . $filename) ) { ! $this->module_template_path = $mx_root_path . $root; ! return $mx_root_path . $module_root_path . $root . $filename; } if ($check_file2) { ! if( file_exists($mx_root_path . $module_root_path . $root . $filename2) ) { ! $this->module_template_path = $mx_root_path . $root; ! return $mx_root_path . $module_root_path . $root . $filename2; } } |
|
From: Jon O. <jon...@us...> - 2008-03-13 20:20:15
|
Update of /cvsroot/mxbb/mx_news/mx_news/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23356 Modified Files: functions.php functions_mx_news.php Log Message: making this module virtual id aware... Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/mx_news/includes/functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions.php 16 Feb 2008 00:14:04 -0000 1.3 --- functions.php 13 Mar 2008 20:19:55 -0000 1.4 *************** *** 332,335 **** --- 332,353 ---- $mx_news_cache->unload(); } + + /** + * Since we must a have scalar identity, with both block_id and virtual_id be create a composite. + * The first 4 digits are the block_id, the rest are the virtual id + * + * @param unknown_type $block_id + */ + function generate_virtualId($block_id) + { + global $mx_request_vars; + + if ($mx_request_vars->is_request('virtual')) + { + $key = -1000 - $block_id; // We support 8999 virtual blocks and unlimited virtual ids + return $key . $mx_request_vars->request('virtual', MX_TYPE_INT, '0'); + } + return $block_id; + } } Index: functions_mx_news.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/mx_news/includes/functions_mx_news.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functions_mx_news.php 8 Feb 2008 21:58:21 -0000 1.1 --- functions_mx_news.php 13 Mar 2008 20:19:58 -0000 1.2 *************** *** 40,43 **** --- 40,45 ---- { global $db, $userdata, $debug, $mx_news_config, $mx_block; + global $mx_news_functions; + unset( $this->block_id ); unset( $this->comments ); *************** *** 45,105 **** unset( $this->notification ); ! $this->block_id = $mx_block->block_id; ! ! /* ! $sql = 'SELECT * ! FROM ' . LINK_CATEGORIES_TABLE . ' ! ORDER BY cat_order ASC'; ! ! if ( !( $result = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql ); ! } ! $cat_rowset = $db->sql_fetchrowset( $result ); ! ! $db->sql_freeresult( $result ); ! ! $this->auth( AUTH_ALL, AUTH_LIST_ALL, $userdata, $cat_rowset ); ! ! for( $i = 0; $i < count( $cat_rowset ); $i++ ) ! { ! if ( $this->auth_user[$cat_rowset[$i]['cat_id']]['auth_view'] ) ! { ! $this->cat_rowset[$cat_rowset[$i]['cat_id']] = $cat_rowset[$i]; ! $this->subcat_rowset[$cat_rowset[$i]['cat_parent']][$cat_rowset[$i]['cat_id']] = $cat_rowset[$i]; ! $this->total_cat++; ! ! // ! // Comments ! // Note: some settings are category dependent, but may use default config settings ! // ! $this->comments[$cat_rowset[$i]['cat_id']]['activated'] = $cat_rowset[$i]['cat_allow_comments'] == -1 ? ($mx_news_config['use_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['cat_allow_comments'] == 1 ? true : false ); ! $this->comments[$cat_rowset[$i]['cat_id']]['internal_comments'] = $cat_rowset[$i]['internal_comments'] == -1 ? ($mx_news_config['internal_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['internal_comments'] == 1 ? true : false ); // phpBB or internal comments ! $this->comments[$cat_rowset[$i]['cat_id']]['autogenerate_comments'] = $cat_rowset[$i]['autogenerate_comments'] == -1 ? ($mx_news_config['autogenerate_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['autogenerate_comments'] == 1 ? true : false ); // autocreate comments when updated ! $this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id'] = $cat_rowset[$i]['comments_forum_id'] < 1 ? ( intval($mx_news_config['comments_forum_id']) ) : ( intval($cat_rowset[$i]['comments_forum_id']) ); // phpBB target forum (only used for phpBB comments) ! ! if ($this->comments[$cat_rowset[$i]['cat_id']]['activated'] && !$this->comments[$cat_rowset[$i]['cat_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id']) < 1) ! { ! mx_message_die(GENERAL_ERROR, 'Init Failure, phpBB comments with no target forum_id :(<br> Category: ' . $cat_rowset[$i]['cat_name'] . ' Forum_id: ' . $this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id']); ! } ! ! // ! // Ratings ! // ! $this->ratings[$cat_rowset[$i]['cat_id']]['activated'] = $cat_rowset[$i]['cat_allow_ratings'] == -1 ? ($mx_news_config['use_ratings'] == 1 ? true : false ) : ( $cat_rowset[$i]['cat_allow_ratings'] == 1 ? true : false ); ! ! // ! // Information ! // ! $this->information[$cat_rowset[$i]['cat_id']]['activated'] = $cat_rowset[$i]['show_pretext'] == -1 ? ($mx_news_config['show_pretext'] == 1 ? true : false ) : ( $cat_rowset[$i]['show_pretext'] == 1 ? true : false ); // phpBB or internal ratings ! ! // ! // Notification ! // ! $this->notification[$cat_rowset[$i]['cat_id']]['activated'] = $cat_rowset[$i]['notify'] == -1 ? (intval($mx_news_config['notify'])) : ( intval($cat_rowset[$i]['notify']) ); // -1, 0, 1, 2 ! $this->notification[$cat_rowset[$i]['cat_id']]['notify_group'] = $cat_rowset[$i]['notify_group'] == -1 || $cat_rowset[$i]['notify_group'] == 0 ? (intval($mx_news_config['notify_group'])) : ( intval($cat_rowset[$i]['notify_group']) ); // Group_id ! } ! } ! */ // --- 47,52 ---- unset( $this->notification ); ! $this->block_id = $mx_news_functions->generate_virtualId($mx_block->block_id); ! //$this->block_id = $mx_block->block_id; // |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:16:52
|
Update of /cvsroot/mxbb/mx_slides In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4813 Modified Files: mx_slides.php Log Message: enable_module bugfix Index: mx_slides.php =================================================================== RCS file: /cvsroot/mxbb/mx_slides/mx_slides.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_slides.php 5 May 2007 20:33:17 -0000 1.1 --- mx_slides.php 13 Mar 2008 19:16:46 -0000 1.2 *************** *** 43,49 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $slides_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['slides_disable'] ); --- 43,49 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($slides_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['slides_disable'] ); |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:16:28
|
Update of /cvsroot/mxbb/mx_simpledoc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4590 Modified Files: mx_simpledoc.php Log Message: enable_module bugfix Index: mx_simpledoc.php =================================================================== RCS file: /cvsroot/mxbb/mx_simpledoc/mx_simpledoc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_simpledoc.php 15 Feb 2008 22:15:58 -0000 1.4 --- mx_simpledoc.php 13 Mar 2008 19:16:24 -0000 1.5 *************** *** 59,65 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $simpledoc_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['simpledoc_disable'] ); --- 59,65 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($simpledoc_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['simpledoc_disable'] ); |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:15:58
|
Update of /cvsroot/mxbb/mx_news/language/lang_swedish In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3630/language/lang_swedish Modified Files: lang_admin.php Log Message: enable_module bugfix Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/language/lang_swedish/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 13 Feb 2008 21:20:01 -0000 1.1 --- lang_admin.php 13 Mar 2008 19:15:54 -0000 1.2 *************** *** 33,37 **** $lang['Enable_module'] = 'Aktivera modulen'; ! $lang['Enable_module_explain'] = 'Detta alternativ inaktiverar all nerladdning för alla användare utan admin, som då kan utföra underhåll av databasen eller liknande'; $lang['Wysiwyg_path'] = 'Var finns wysiwyg mjukvaran?'; --- 33,37 ---- $lang['Enable_module'] = 'Aktivera modulen'; ! $lang['Enable_module_explain'] = 'När modulen är inaktiverad för användare har fortfarande administratören tillträde.'; $lang['Wysiwyg_path'] = 'Var finns wysiwyg mjukvaran?'; |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:15:58
|
Update of /cvsroot/mxbb/mx_news In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3630 Modified Files: db_install.php mx_news.php Log Message: enable_module bugfix Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/db_install.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** db_install.php 16 Feb 2008 21:47:02 -0000 1.3 --- db_install.php 13 Mar 2008 19:15:53 -0000 1.4 *************** *** 67,71 **** // General ! "INSERT INTO " . $mx_table_prefix . "simplenews_config VALUES ('enable_module', '0')", // settings_disable "INSERT INTO " . $mx_table_prefix . "simplenews_config VALUES ('module_name', 'News Manager')", // settings_dbname "INSERT INTO " . $mx_table_prefix . "simplenews_config VALUES ('wysiwyg_path', 'modules/mx_shared/')", --- 67,71 ---- // General ! "INSERT INTO " . $mx_table_prefix . "simplenews_config VALUES ('enable_module', '1')", "INSERT INTO " . $mx_table_prefix . "simplenews_config VALUES ('module_name', 'News Manager')", // settings_dbname "INSERT INTO " . $mx_table_prefix . "simplenews_config VALUES ('wysiwyg_path', 'modules/mx_shared/')", Index: mx_news.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/mx_news.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_news.php 16 Feb 2008 00:14:04 -0000 1.3 --- mx_news.php 13 Mar 2008 19:15:53 -0000 1.4 *************** *** 194,200 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $mx_news_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['mx_news_disable'] ); --- 194,200 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($mx_news_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['mx_news_disable'] ); |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:15:58
|
Update of /cvsroot/mxbb/mx_news/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3630/language/lang_english Modified Files: lang_admin.php Log Message: enable_module bugfix Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_news/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 8 Feb 2008 21:57:56 -0000 1.1 --- lang_admin.php 13 Mar 2008 19:15:53 -0000 1.2 *************** *** 39,43 **** $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'This will make the download section unavailable to users. This is a good option to use when making modifications to your database. Only Admins will be able to view the database.'; $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; --- 39,43 ---- $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'When disabled for users, admin is still allowed access.'; $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:15:29
|
Update of /cvsroot/mxbb/mx_pafiledb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2926 Modified Files: db_install.php dload.php dload_lists.php dload_mini.php dload_quickdl.php Log Message: enable_module bugfix Index: dload_mini.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload_mini.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dload_mini.php 23 Feb 2008 19:41:21 -0000 1.5 --- dload_mini.php 13 Mar 2008 19:15:20 -0000 1.6 *************** *** 55,61 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $pafiledb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); --- 55,61 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($pafiledb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); Index: dload_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload_lists.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** dload_lists.php 23 Feb 2008 19:41:21 -0000 1.27 --- dload_lists.php 13 Mar 2008 19:15:19 -0000 1.28 *************** *** 53,59 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $pafiledb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); --- 53,59 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($pafiledb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_install.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** db_install.php 18 Feb 2008 17:34:01 -0000 1.34 --- db_install.php 13 Mar 2008 19:15:19 -0000 1.35 *************** *** 275,279 **** // General ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('enable_module', '0')", // settings_disable "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('module_name', 'Download Database')", // settings_dbname "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('wysiwyg_path', 'modules/mx_shared/')", --- 275,279 ---- // General ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('enable_module', '1')", // settings_disable "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('module_name', 'Download Database')", // settings_dbname "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('wysiwyg_path', 'modules/mx_shared/')", Index: dload.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** dload.php 17 Feb 2008 10:46:14 -0000 1.27 --- dload.php 13 Mar 2008 19:15:19 -0000 1.28 *************** *** 193,199 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $pafiledb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); --- 193,199 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($pafiledb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); Index: dload_quickdl.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload_quickdl.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** dload_quickdl.php 23 Feb 2008 19:41:21 -0000 1.17 --- dload_quickdl.php 13 Mar 2008 19:15:20 -0000 1.18 *************** *** 55,61 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $pafiledb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); --- 55,61 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($pafiledb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:15:28
|
Update of /cvsroot/mxbb/mx_pafiledb/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2926/language/lang_english Modified Files: lang_admin.php Log Message: enable_module bugfix Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/language/lang_english/lang_admin.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** lang_admin.php 13 Aug 2006 19:44:45 -0000 1.14 --- lang_admin.php 13 Mar 2008 19:15:20 -0000 1.15 *************** *** 54,58 **** $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'This will make the download section unavailable to users. This is a good option to use when making modifications to your database. Only Admins will be able to view the database.'; $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; --- 54,58 ---- $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'When disabled for users, admin is still allowed access.'; $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:15:28
|
Update of /cvsroot/mxbb/mx_pafiledb/language/lang_swedish In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2926/language/lang_swedish Modified Files: lang_admin.php Log Message: enable_module bugfix Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/language/lang_swedish/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 13 Feb 2008 21:32:17 -0000 1.1 --- lang_admin.php 13 Mar 2008 19:15:21 -0000 1.2 *************** *** 54,58 **** $lang['Enable_module'] = 'Aktivera modulen'; ! $lang['Enable_module_explain'] = 'Detta alternativ inaktiverar all nerladdning för alla användare utan admin, som då kan utföra underhåll av databasen eller liknande'; $lang['Wysiwyg_path'] = 'Var finns wysiwyg mjukvaran?'; --- 54,58 ---- $lang['Enable_module'] = 'Aktivera modulen'; ! $lang['Enable_module_explain'] = 'När modulen är inaktiverad för användare har fortfarande administratören tillträde.'; $lang['Wysiwyg_path'] = 'Var finns wysiwyg mjukvaran?'; |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:14:44
|
Update of /cvsroot/mxbb/mx_linkdb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1692 Modified Files: db_install.php linkdb.php linkdb_lists.php linkdb_mini.php Log Message: enable_module bugfix Index: linkdb.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** linkdb.php 15 Feb 2008 22:44:32 -0000 1.15 --- linkdb.php 13 Mar 2008 19:14:35 -0000 1.16 *************** *** 194,200 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $linkdb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['linkdb_disable'] ); --- 194,200 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($linkdb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['linkdb_disable'] ); Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/db_install.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** db_install.php 16 Feb 2008 21:46:53 -0000 1.24 --- db_install.php 13 Mar 2008 19:14:34 -0000 1.25 *************** *** 185,189 **** // General ! "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('enable_module', '0')", // settings_disable "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('module_name', 'Download Database')", // settings_dbname "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('wysiwyg_path', 'modules/mx_shared/')", --- 185,189 ---- // General ! "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('enable_module', '1')", "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('module_name', 'Download Database')", // settings_dbname "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('wysiwyg_path', 'modules/mx_shared/')", Index: linkdb_mini.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb_mini.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** linkdb_mini.php 13 Aug 2006 19:43:51 -0000 1.2 --- linkdb_mini.php 13 Mar 2008 19:14:35 -0000 1.3 *************** *** 55,63 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $kb_config['module_enable'] ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); } --- 55,63 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($linkdb_config['enable_module'] || $mx_user->is_admin)) { ! mx_message_die( GENERAL_MESSAGE, $lang['linkdb_disable'] ); } Index: linkdb_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb_lists.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** linkdb_lists.php 13 Aug 2006 19:43:51 -0000 1.2 --- linkdb_lists.php 13 Mar 2008 19:14:35 -0000 1.3 *************** *** 53,59 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $linkdb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['linkdb_disable'] ); --- 53,59 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($linkdb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['linkdb_disable'] ); |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:14:43
|
Update of /cvsroot/mxbb/mx_linkdb/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1692/language/lang_english Modified Files: lang_admin.php Log Message: enable_module bugfix Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/language/lang_english/lang_admin.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** lang_admin.php 31 May 2007 19:53:14 -0000 1.11 --- lang_admin.php 13 Mar 2008 19:14:35 -0000 1.12 *************** *** 50,54 **** $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'This will make the download section unavailable to users. This is a good option to use when making modifications to your database. Only Admins will be able to view the database.'; $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; --- 50,54 ---- $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'When disabled for users, admin is still allowed access.'; $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:14:43
|
Update of /cvsroot/mxbb/mx_linkdb/language/lang_swedish In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1692/language/lang_swedish Modified Files: lang_admin.php Log Message: enable_module bugfix Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/language/lang_swedish/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 13 Feb 2008 21:19:39 -0000 1.1 --- lang_admin.php 13 Mar 2008 19:14:36 -0000 1.2 *************** *** 45,49 **** $lang['Enable_module'] = 'Aktivera modulen'; ! $lang['Enable_module_explain'] = 'Detta alternativ inaktiverar all nerladdning för alla användare utan admin, som då kan utföra underhåll av databasen eller liknande'; $lang['Wysiwyg_path'] = 'Var finns wysiwyg mjukvaran?'; --- 45,49 ---- $lang['Enable_module'] = 'Aktivera modulen'; ! $lang['Enable_module_explain'] = 'När modulen är inaktiverad för användare har fortfarande administratören tillträde.'; $lang['Wysiwyg_path'] = 'Var finns wysiwyg mjukvaran?'; |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:13:50
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32489 Modified Files: kb.php kb_app.php kb_article_reader.php kb_lists.php kb_mini.php Log Message: enable_module bugfix Index: kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** kb.php 18 Feb 2008 21:02:57 -0000 1.46 --- kb.php 13 Mar 2008 19:13:36 -0000 1.47 *************** *** 234,240 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $kb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); --- 234,240 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($kb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); Index: kb_mini.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb_mini.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kb_mini.php 13 Aug 2006 19:43:07 -0000 1.2 --- kb_mini.php 13 Mar 2008 19:13:38 -0000 1.3 *************** *** 55,61 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $kb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); --- 55,61 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($kb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); Index: kb_app.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb_app.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_app.php 18 Feb 2008 21:02:57 -0000 1.4 --- kb_app.php 13 Mar 2008 19:13:37 -0000 1.5 *************** *** 151,157 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $kb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); --- 151,157 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($kb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); Index: kb_article_reader.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb_article_reader.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** kb_article_reader.php 18 Feb 2008 21:02:57 -0000 1.24 --- kb_article_reader.php 13 Mar 2008 19:13:38 -0000 1.25 *************** *** 149,155 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $kb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); --- 149,155 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($kb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); Index: kb_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb_lists.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_lists.php 13 Aug 2006 19:43:07 -0000 1.4 --- kb_lists.php 13 Mar 2008 19:13:38 -0000 1.5 *************** *** 53,59 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $kb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); --- 53,59 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($kb_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:13:45
|
Update of /cvsroot/mxbb/mx_kb/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32489/language/lang_english Modified Files: lang_admin.php Log Message: enable_module bugfix Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/language/lang_english/lang_admin.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** lang_admin.php 13 Aug 2006 19:43:08 -0000 1.9 --- lang_admin.php 13 Mar 2008 19:13:39 -0000 1.10 *************** *** 56,60 **** $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'Let users view and post new articles on in your Knowledge Base.'; $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; --- 56,60 ---- $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'When disabled for users, admin is still allowed access.'; $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:13:45
|
Update of /cvsroot/mxbb/mx_kb/language/lang_swedish In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32489/language/lang_swedish Modified Files: lang_admin.php Log Message: enable_module bugfix Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/language/lang_swedish/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 13 Feb 2008 21:18:40 -0000 1.1 --- lang_admin.php 13 Mar 2008 19:13:39 -0000 1.2 *************** *** 56,60 **** $lang['Enable_module'] = 'Aktivera modulen'; ! $lang['Enable_module_explain'] = 'Tillåt att användare ser och kan skicka nya artiklar till KB'; $lang['Wysiwyg_path'] = 'Var finns wysiwyg mjukvaran?'; --- 56,60 ---- $lang['Enable_module'] = 'Aktivera modulen'; ! $lang['Enable_module_explain'] = 'När modulen är inaktiverad för användare har fortfarande administratören tillträde.'; $lang['Wysiwyg_path'] = 'Var finns wysiwyg mjukvaran?'; |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:12:58
|
Update of /cvsroot/mxbb/mx_bugsbt In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31370 Modified Files: bugsbt.php Log Message: enable_module bugfix Index: bugsbt.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bugsbt.php 9 Sep 2007 19:35:10 -0000 1.3 --- bugsbt.php 13 Mar 2008 19:12:53 -0000 1.4 *************** *** 43,49 **** // =================================================== ! // if the database disabled give them a nice message // =================================================== ! if ( intval( $bugsbt_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['bugsbt_disable'] ); --- 43,49 ---- // =================================================== ! // if the module is disabled give them a nice message // =================================================== ! if (!($bugsbt_config['enable_module'] || $mx_user->is_admin)) { mx_message_die( GENERAL_MESSAGE, $lang['bugsbt_disable'] ); |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:12:58
|
Update of /cvsroot/mxbb/mx_bugsbt/language/lang_swedish In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31370/language/lang_swedish Modified Files: lang_admin.php Log Message: enable_module bugfix Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/language/lang_swedish/lang_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_admin.php 12 Jul 2007 22:45:23 -0000 1.2 --- lang_admin.php 13 Mar 2008 19:12:53 -0000 1.3 *************** *** 34,38 **** $lang['Enable_module'] = 'Aktivera modulen'; ! $lang['Enable_module_explain'] = 'Tillåt att användare ser och kan skicka nya buggar till BugsBT'; $lang['Wysiwyg_path'] = 'Var finns wysiwyg mjukvaran?'; --- 34,38 ---- $lang['Enable_module'] = 'Aktivera modulen'; ! $lang['Enable_module_explain'] = 'När modulen är inaktiverad för användare har fortfarande administratören tillträde.'; $lang['Wysiwyg_path'] = 'Var finns wysiwyg mjukvaran?'; |
|
From: Jon O. <jon...@us...> - 2008-03-13 19:12:58
|
Update of /cvsroot/mxbb/mx_bugsbt/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31370/language/lang_english Modified Files: lang_admin.php Log Message: enable_module bugfix Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/language/lang_english/lang_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_admin.php 12 Jul 2007 22:45:22 -0000 1.3 --- lang_admin.php 13 Mar 2008 19:12:53 -0000 1.4 *************** *** 35,39 **** $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'Let users view and post new bugs on in your BugsBT.'; $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; --- 35,39 ---- $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'When disabled for users, admin is still allowed access.'; $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; |
|
From: OryNider <ory...@us...> - 2008-03-13 11:57:02
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3285 Modified Files: Tag: core28x album_jupload.php album_pic_nuffed.php Log Message: fix Index: album_pic_nuffed.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_pic_nuffed.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** album_pic_nuffed.php 12 Mar 2008 22:34:39 -0000 1.1.2.1 --- album_pic_nuffed.php 13 Mar 2008 11:56:08 -0000 1.1.2.2 *************** *** 158,162 **** $Image = new ImgObj(); $Image->ReadSourceFile(ALBUM_UPLOAD_PATH . $pic_filename); ! if( (($nuff_http['nuff_sepia'] == true) || ($nuff_http['nuff_bw'] == true) || ($nuff_http['nuff_blur'] == true) || ($nuff_http['nuff_scatter'] == true)) && ($album_config['enable_sepia_bw'] == true) ) { --- 158,162 ---- $Image = new ImgObj(); $Image->ReadSourceFile(ALBUM_UPLOAD_PATH . $pic_filename); ! //include(ALBUM_UPLOAD_PATH . $pic_filename); if( (($nuff_http['nuff_sepia'] == true) || ($nuff_http['nuff_bw'] == true) || ($nuff_http['nuff_blur'] == true) || ($nuff_http['nuff_scatter'] == true)) && ($album_config['enable_sepia_bw'] == true) ) { *************** *** 230,237 **** } ! //$Image->SendToFile("cache/test2"); //Write image to file //JPG Compression ! ( ($nuff_http['nuff_recompress'] == false) || ($nuff_http['nuff_recompress_r'] == 0) ) ? ($nuff_http['nuff_recompress_r'] = 75) : false; $Image->SendToBrowser($pic_title, $pic_filetype, '', '_nuffed', $nuff_http['nuff_recompress_r']); --- 230,237 ---- } ! $Image->SendToFile(ALBUM_UPLOAD_PATH . "cache/" . $pic_filename); //Write image to file //JPG Compression ! $nuff_http['nuff_recompress_r'] = (($nuff_http['nuff_recompress'] == false) || ($nuff_http['nuff_recompress_r'] == 0)) ? 75 : false; $Image->SendToBrowser($pic_title, $pic_filetype, '', '_nuffed', $nuff_http['nuff_recompress_r']); Index: album_jupload.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_jupload.php,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** album_jupload.php 13 Mar 2008 08:27:30 -0000 1.1.2.3 --- album_jupload.php 13 Mar 2008 11:55:58 -0000 1.1.2.4 *************** *** 837,841 **** else if ($album_config['gd_version'] > 0) { ! $pic_thumbnail = ''; } --- 837,841 ---- else if ($album_config['gd_version'] > 0) { ! $pic_thumbnail = $pic_filename; } |
|
From: OryNider <ory...@us...> - 2008-03-13 11:53:48
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27748 Modified Files: album_jupload.php album_pic_nuffed.php Log Message: fix Index: album_pic_nuffed.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_pic_nuffed.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** album_pic_nuffed.php 13 Mar 2008 03:44:12 -0000 1.2 --- album_pic_nuffed.php 13 Mar 2008 11:52:44 -0000 1.3 *************** *** 158,162 **** $Image = new ImgObj(); $Image->ReadSourceFile(ALBUM_UPLOAD_PATH . $pic_filename); ! if( (($nuff_http['nuff_sepia'] == true) || ($nuff_http['nuff_bw'] == true) || ($nuff_http['nuff_blur'] == true) || ($nuff_http['nuff_scatter'] == true)) && ($album_config['enable_sepia_bw'] == true) ) { --- 158,162 ---- $Image = new ImgObj(); $Image->ReadSourceFile(ALBUM_UPLOAD_PATH . $pic_filename); ! //include(ALBUM_UPLOAD_PATH . $pic_filename); if( (($nuff_http['nuff_sepia'] == true) || ($nuff_http['nuff_bw'] == true) || ($nuff_http['nuff_blur'] == true) || ($nuff_http['nuff_scatter'] == true)) && ($album_config['enable_sepia_bw'] == true) ) { *************** *** 230,237 **** } ! //$Image->SendToFile("cache/test2"); //Write image to file //JPG Compression ! ( ($nuff_http['nuff_recompress'] == false) || ($nuff_http['nuff_recompress_r'] == 0) ) ? ($nuff_http['nuff_recompress_r'] = 75) : false; $Image->SendToBrowser($pic_title, $pic_filetype, '', '_nuffed', $nuff_http['nuff_recompress_r']); --- 230,237 ---- } ! $Image->SendToFile(ALBUM_UPLOAD_PATH . "cache/" . $pic_filename); //Write image to file //JPG Compression ! $nuff_http['nuff_recompress_r'] = (($nuff_http['nuff_recompress'] == false) || ($nuff_http['nuff_recompress_r'] == 0)) ? 75 : false; $Image->SendToBrowser($pic_title, $pic_filetype, '', '_nuffed', $nuff_http['nuff_recompress_r']); Index: album_jupload.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_jupload.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** album_jupload.php 13 Mar 2008 08:35:54 -0000 1.3 --- album_jupload.php 13 Mar 2008 11:52:32 -0000 1.4 *************** *** 837,841 **** else if ($album_config['gd_version'] > 0) { ! $pic_thumbnail = ''; } --- 837,841 ---- else if ($album_config['gd_version'] > 0) { ! $pic_thumbnail = $pic_filename; } |
Update of /cvsroot/mxbb/mx_music/music_box/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32467/music_box/modules Modified Files: Tag: core28x music_cat.php music_comment.php music_comment_delete.php music_comment_edit.php music_delete.php music_download.php music_edit.php music_list.php music_media_cat.php music_modcp.php music_page.php music_pic_cat.php music_rate.php music_rss.php music_song.php music_stream.php music_upload.php Log Message: upgrade version for core28x branch |
|
From: OryNider <ory...@us...> - 2008-03-13 10:36:16
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32467 Modified Files: Tag: core28x db_install.php db_upgrade.php music.php music_center.pak music_lists.php mx_install_readme.htm release.txt Added Files: Tag: core28x music_flv.php Log Message: upgrade version for core28x branch Index: release.txt =================================================================== RCS file: /cvsroot/mxbb/mx_music/Attic/release.txt,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** release.txt 25 Aug 2007 03:30:26 -0000 1.4 --- release.txt 13 Mar 2008 10:34:54 -0000 1.4.2.1 *************** *** 1,17 **** ! [b][Release][mx_music]: Music Center[/b] [b][Authors]: Cf Manager, OryNider[/b] ! [b][Version]: 2.0.7 [/b] ! ! [b]Designed for mxBB Version: 2.8.0[/b] ! [b][Support]:[/b] [u]Here[/u] [b][DEMO]:[/b] [url=http://atcer.ministry.ro/board/?page=16]Here[/url] - [b][Note]:[/b] - [color=red]If you upgrade from 2.7.x and you have mx_musiconline, the posibility of migration to mx_music it's just teoretical with unknown rezult, and you do it at your own risc!!! A mx_musiconline module for 2.8.0 may be relesed by Selven.[/color] - [b][Description]:[/b] This Module allows you create the Music Center Page/Block where users can upload, listen, rate and comment on songs. --- 1,12 ---- ! [[b][RELEASE NOTES]:[/b] Media Center Module [b][Authors]: Cf Manager, OryNider[/b] ! [b][Version]: 2.1.0 [/b] ! [b]Designed for mxBB Version: 2.8.1[/b] [b][DEMO]:[/b] [url=http://atcer.ministry.ro/board/?page=16]Here[/url] [b][Description]:[/b] This Module allows you create the Music Center Page/Block where users can upload, listen, rate and comment on songs. *************** *** 35,39 **** In version 2.0.2 and above if you are posting a radio stream that ends with "/listen.pls" on music_page will be swiched to music_stream mode and will make traffic on your website, but if it's submited like a normal url with no "/listen.pls" will make traffic on the shotcast server who is brotcasting the stream. But if it's submited with "/listen.pls" can be listened with your favorite player and the original stream informations will he hidden To do this copy the link from Download/Listen in your player on the website or local computer such as WinAMP :wink: But do not try to save the file couse you will just make not needed traffic and get a very large file!!![/color] ! [b][Download]:[/b] [URL=http://www.mx-system.com/modules/mx_pafiledb/dload.php?action=download&file_id=368]mx_music_center.zip[/URL] [b][Languages]:[/b] --- 30,34 ---- In version 2.0.2 and above if you are posting a radio stream that ends with "/listen.pls" on music_page will be swiched to music_stream mode and will make traffic on your website, but if it's submited like a normal url with no "/listen.pls" will make traffic on the shotcast server who is brotcasting the stream. But if it's submited with "/listen.pls" can be listened with your favorite player and the original stream informations will he hidden To do this copy the link from Download/Listen in your player on the website or local computer such as WinAMP :wink: But do not try to save the file couse you will just make not needed traffic and get a very large file!!![/color] ! [b][Download]:[/b] [URL=http://www.mx-system.com/index.php?page=4&action=file&file_id=368]Mx_Media_Center.zip[/URL] [b][Languages]:[/b] *************** *** 48,50 **** [b][Chinese Language][/b]: [url=http://pubory.uv.ro/portal/modules/mx_pafiledb/dload.php?action=download&file_id=47]mx_music_lang_chinese.zip[/url] ! [b][Vietnamese Language][/b]: [url=http://pubory.uv.ro/portal/modules/mx_pafiledb/dload.php?action=download&file_id=48]mx_music_lang_vietnamese.zip[/url] \ No newline at end of file --- 43,48 ---- [b][Chinese Language][/b]: [url=http://pubory.uv.ro/portal/modules/mx_pafiledb/dload.php?action=download&file_id=47]mx_music_lang_chinese.zip[/url] ! [b][Vietnamese Language][/b]: [url=http://pubory.uv.ro/portal/modules/mx_pafiledb/dload.php?action=download&file_id=48]mx_music_lang_vietnamese.zip[/url] ! ! [b][Note]:[/b] ! [color=red]If you upgrade from 2.7.x and you have mx_musiconline, the posibility of migration to mx_music it's just teoretical with unknown rezult, and you do it at your own risc!!! A mx_musiconline module for 2.8.0 may be relesed by Selven.[/color] \ No newline at end of file --- NEW FILE: music_flv.php --- <?php /** * * @package mxBB Portal Module - mx_music * @version $Id: music_flv.php,v 1.1.2.2 2008/03/13 10:34:55 orynider Exp $ * @copyright (c) 2003 [ory...@rd..., OryNider] mxBB Development Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ // // ERROR HANDLING // //error_reporting( E_ALL ); @ini_set( 'display_errors', '1' ); $phpEx = substr(strrchr(__FILE__, '.'), 1); if ( !defined('PORTAL_BACKEND') && @file_exists( './viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE { define('MXBB_MODULE', false); define('IN_PHPBB', true); $phpbb_root_path = $module_root_path = './'; $mx_mod_path = $phpbb_root_path . 'mx_mod/'; include($phpbb_root_path . 'common.' . $phpEx); include($mx_mod_path . "includes/functions_required.$phpEx"); //Check if forum_hack is installed if (!isset($mx_root_path)) { $mx_root_path = './'; @define('IN_PORTAL', true); include_once($mx_mod_path . "includes/mx_constants.$phpEx"); include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions.$phpEx"); } else { @define('IN_PORTAL', true); include_once($mx_root_path . "includes/mx_constants.$phpEx"); include_once($mx_root_path . "includes/shared/phpbb2/includes/functions.$phpEx"); //Redefine mx_root_path to include phpbb page_tail.php $mx_root_path = $phpbb_root_path; } require($mx_mod_path . "includes/functions_core.$phpEx"); require($mx_mod_path . "includes/functions_styles.$phpEx"); //Check for cash mod if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) { define('IN_CASHMOD', true); } //@ini_set( 'display_errors', '1' ); error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables //error_reporting(E_ALL & ~E_NOTICE); define( 'PAGE_KB', -502 ); // If this id generates a conflict with other mods, change it ;) // // Instatiate the mx_cache class // $mx_cache = new mx_cache(); // // Get mxBB config settings // //$portal_config = $mx_cache->obtain_mxbb_config(); // // instatiate the mx_request_vars class // $mx_request_vars = new mx_request_vars(); // // Page selector // $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); $is_block = false; // // instatiate the mx_user class // $mx_user = new mx_user(); if (file_exists("./modcp.$phpEx")) // phpBB2 { define('PORTAL_BACKEND', 'phpbb2'); $tplEx = 'tpl'; // // Start user session // - populate $userdata and $lang // $mx_user->init($user_ip, $page_id, false); //init_userprefs($userdata); $mx_user->init_style(); //Overwrite template class /* $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x if (!$userdata['user_level'] == ADMIN) { die('Only admins may run this script!!!'); } */ include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx); } else if (@file_exists("./mcp.$phpEx")) // phpBB3 { define('PORTAL_BACKEND', 'phpbb3'); $tplEx = 'html'; // // Start user session // - populate $userdata and $lang // $mx_user->init($user_ip, $page_id, false); $user->setup(); // // End session management // /* $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x if ($userdata['user_type'] != USER_FOUNDER) { die('Only admins may run this script!!!'); } */ include_once($mx_mod_path . "includes/shared/phpbb2/includes/bbcode.$phpEx"); include_once($mx_mod_path . "includes/shared/phpbb2/includes/functions_post.$phpEx"); } else { die('Copy this file in phpbb_root_path were is your viewtopic.php file!!!'); } } else { if( !defined('IN_PORTAL') || !is_object($mx_block)) { @define("IN_PORTAL", true); $mx_root_path = '../../'; // // Let's include some stuff... // $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 // $block_id = ( !empty($HTTP_GET_VARS['block_id']) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id']; if( empty($block_id) ) { $sql = "SELECT * FROM " . BLOCK_TABLE . " WHERE block_title = 'Music Center' LIMIT 1"; if(!$result = $db->sql_query($sql)) { mx_message_die(GENERAL_ERROR, "Could not query Music Center module information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); $block_id = $row['block_id']; } $is_block = FALSE; } else { // // Read block Configuration // $title = $mx_block->block_info['block_title']; $block_size = isset($block_size) && !empty($block_size) ? $block_size : '100%'; $flv_file = $mx_block->get_parameters('flv_file') ? $mx_block->get_parameters('flv_file') : $music_root_path . 'upload/default.flv'; $flv_img = $mx_block->get_parameters('flv_img') ? $mx_block->get_parameters('flv_img') : $images['no_image']; if(is_object($mx_block)) { $is_block = TRUE; } global $images; } @define("MXBB_MODULE", true); @define("MXBB_27x", file_exists($mx_root_path . "mx_login.$phpEx")); } $music_root_path = $module_root_path . 'music_box/'; // // Get general music information // include_once($module_root_path . "music_box/music_common.$phpEx"); $song_image_path = MUSIC_IMAGE_PATH; $song_image_default = $images['no_image']; // The default image // // Start output of page // $page_title = $lang['Music']; if ( !$is_block ) { include($mx_root_path . 'includes/page_header.'.$phpEx); } $template->set_filenames(array( 'body' => 'music_flv_body.tpl') ); if (is_numeric($flv_file)) { $song_id = $flv_file; // ------------------------------------ // PREVIOUS & NEXT // ------------------------------------ if( isset($HTTP_GET_VARS['mode']) ) { if( ($HTTP_GET_VARS['mode'] == 'next') or ($HTTP_GET_VARS['mode'] == 'previous') ) { $sql = "SELECT song_id, song_cat_id, song_user_id FROM ". MUSIC_TABLE ." WHERE song_id = $song_id"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query song information', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); if( empty($row) ) { mx_message_die(GENERAL_ERROR, 'Bad song_id'); } $sql = "SELECT new.song_id, new.song_time FROM ". MUSIC_TABLE ." AS new, ". MUSIC_TABLE ." AS cur WHERE cur.song_id = $song_id AND new.song_id <> cur.song_id AND new.song_cat_id = cur.song_cat_id"; $sql .= ($HTTP_GET_VARS['mode'] == 'next') ? " AND new.song_time >= cur.song_time" : " AND new.song_time <= cur.song_time"; $sql .= ($HTTP_GET_VARS['mode'] == 'next') ? " ORDER BY song_time ASC LIMIT 1" : " ORDER BY song_time DESC LIMIT 1"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query song information', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); if( empty($row) ) { mx_message_die(GENERAL_ERROR, $lang['Song_not_exist']); } $song_id = $row['song_id']; // NEW song_id } } // ------------------------------------ // Get this song info // ------------------------------------ $sql = "SELECT s.*, u.user_id, u.username, r.rate_song_id, AVG(r.rate_point) AS rating, COUNT(DISTINCT c.comment_id) AS comments FROM ". MUSIC_TABLE ." AS s LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id LEFT JOIN ". MUSIC_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id WHERE song_id = '$song_id' GROUP BY s.song_id"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query song information', '', __LINE__, __FILE__, $sql); } $thissong = $db->sql_fetchrow($result); $cat_id = $thissong['song_cat_id']; $user_id = $thissong['song_user_id']; if( empty($thissong['song_url']) && !file_exists(MUSIC_UPLOAD_PATH . $thissong['song_filename']) ) { mx_message_die(GENERAL_ERROR, $lang['Song_not_exist']); } if ( $thissong['song_imagename'] == '' ) { $img_id = $song_image_default; } else { $img_id = $song_image_path . $thissong['song_imagename']; } if ( $thissong['song_url'] == '' ) { $song_filetype = substr($thissong['song_filename'], strlen($thissong['song_filename']) - 3, 3); $song_filename = ( !empty($thissong['song_filename']) ? $thissong['song_filename'] : '' ); } else { $song_filetype = substr($thissong['song_url'], strlen($thissong['song_url']) - 3, 3); $song_url = $thissong['song_url']; } // ------------------------------------ // Get the current Category Info // ------------------------------------ $sql = "SELECT * FROM ". MUSIC_CAT_TABLE ." WHERE cat_id = '$cat_id'"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query category information', '', __LINE__, __FILE__, $sql); } $thiscat = $db->sql_fetchrow($result); if (empty($thiscat)) { mx_message_die(GENERAL_ERROR, $lang['Category_not_exist']); } // ------------------------------------ // Check the permissions // ------------------------------------ $music_user_access = music_user_access($cat_id, $thiscat, 1, 0, 0, 0, 0, 0); // UPLOAD if ($music_user_access['view'] == 0) { if (!$userdata['session_logged_in']) { mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_page&song_id=$song_id"), true)); } else { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); } } // ------------------------------------ // Check song Approval // ------------------------------------ if ($userdata['user_level'] != ADMIN) { if( ($thiscat['cat_approval'] == ADMIN) or (($thiscat['cat_approval'] == MOD) and !$music_user_access['moderator']) ) { if ($thissong['song_approval'] != 1) { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); } } } // ------------------------------------ // Increase view counter // ------------------------------------ $sql = "UPDATE ". MUSIC_TABLE ." SET song_view_count = song_view_count + 1 WHERE song_id = '$song_id'"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not update song information', '', __LINE__, __FILE__, $sql); } /* +---------------------------------------------------------- | Main work here... +---------------------------------------------------------- */ if( ($thissong['song_user_id'] == MUSIC_GUEST) or ($thissong['username'] == '') ) { $poster = ($thissong['song_username'] == '') ? $lang['Guest'] : $thissong['song_username']; } else { $poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thissong['song_user_id']) .'">'. $thissong['song_username'] .'</a>'; } if ($music_config['rate']) { $template->assign_block_vars('rate_switch', array()); } if ($music_config['comment']) { $template->assign_block_vars('comment_switch', array()); } if ($music_config['download']) { $template->assign_block_vars('download_switch', array()); } $url_player = ''; // // Media Center // if ( $song_filetype == 'swf' ) { $template->assign_block_vars('flash', array()); $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; } else if ( $song_filetype == 'ram' ) { $template->assign_block_vars('ram', array()); $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; } else if ( $song_filetype == '.rm' ) { $template->assign_block_vars('rm', array()); $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; } else if ( $song_filetype == '.qt' ) { $template->assign_block_vars('qt', array()); $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; } else if ( $song_filetype == 'flv' ) { /* if ( !is_object($mx_page) ) { $mx_page = new mx_page(); } $mx_page->add_footer_text( $music_root_path . 'music_player.js', true ); */ $template->assign_block_vars('flv', array()); $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $music_root_path . 'music_player.swf'; } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; $template->assign_block_vars('img', array( 'VIDEO_URL' => $url_video, 'SONG_URL' => $url_video )); } else if( ($song_filetype == 'pls') && !empty($thissong['song_url']) ) { $template->assign_block_vars('media', array()); $url_download = mx_append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; } else if(!empty($thissong['song_url'])) { $host = explode("//", $thissong['song_url']); $host = $host[1]; $host = explode("/", $host); $domain = $host[0]; $counthost = count($host) - 1; $docid2 = $host[$counthost]; // $domaintmp = explode(".", $domain, -1); // Php 5 only // $sitename = implode(".", $domaintmp); function mx_music_sitename($domain) { $domaintmp = explode(".", $domain); $y = count($domaintmp) - 1; $r = ""; for ($a = 0; $y > $a; $a++) { $r .= ".".$domaintmp[$a]; } return $r; } $sitename = substr(mx_music_sitename($domain), 1); function mx_music_sitesufix($domain) { $domaintmp = explode(".", $domain); $y = count($domaintmp) - 1; $r = $domaintmp[$y];; return $r; } $sitesufix = mx_music_sitesufix($domain); if (!empty($sitesufix) ) { if ($sitesufix == 'de') { $sitelngprefix = 'de.'; } else { $sitelngprefix = 'en.'; } } else { $sitelngprefix = ''; } if ($sitename == 'video.google') { $videoid['song_url'] = explode("-", $thissong['song_url']); if (empty($videoid['song_url'][1]) ) { $docid['song_url'] = explode("?", $thissong['song_url']); if (empty($docid['song_url'][1]) ) { $template->assign_block_vars('flashvideo', array()); $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $thissong['song_url'] ); $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); } else { $template->assign_block_vars('youtube', array()); $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $thissong['song_url'] ); $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Watch'] : 'Watch URL' ); } } else { $template->assign_block_vars('youtube', array()); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?docId=-' . $videoid['song_url'][1] : $thissong['song_url'] ); $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplay?docid=-' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); } } else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') ) { $videoid['song_url'] = explode("=", $thissong['song_url']); if (empty($videoid['song_url'][1]) ) { $videoid['song_url'] = explode("/v/", $thissong['song_url']); } if (empty($videoid['song_url'][1]) ) { $template->assign_block_vars('flashvideo', array()); } else { $template->assign_block_vars('youtube', array()); } if ($sitename == 'www.youtube') { $domain = 'youtube.' . $sitesufix; } $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $img_id = !empty($thissong['song_imagename']) ? $thissong['song_imagename'] : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; $url_video = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download; //$url_player = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player2.swf?video_id=' . $videoid['song_url'][1] : $url_download; } else if ( ($sitename == 'www.clipfish') || ($sitename == 'clipfish') ) { $thisvid['song_url'] = explode("videoid", $thissong['song_url']); $videoid['song_url'] = explode("=", $thisvid['song_url'][1]); if (empty($videoid['song_url'][1]) ) { $template->assign_block_vars('flashvideo', array()); $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; } else { $template->assign_block_vars('youtube', array()); $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player.php?videoid=' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplayer.swf?as=0&videoid=' . $videoid['song_url'][1] : $url_download ); } } else if ( ($sitename == 'www.myvideo') || ($sitename == 'myvideo') ) { if (empty($docid2) ) { $template->assign_block_vars('flashvideo', array()); $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; } else { $template->assign_block_vars('youtube', array()); $url_download = ( !empty($docid2) ? 'http://' . $domain . '/watch/' . $docid2 : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); } } else if ( ($sitename == 'de.sevenload') || ($sitename == 'sevenload') || ($sitename == 'page.sevenload') || ($sitename == 'www.sevenload') ) { $videoid['song_url'] = explode("=", $thissong['song_url']); if (empty($videoid['song_url'][1]) ) { if (empty($docid2) ) { $template->assign_block_vars('flashvideo', array()); $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; } else { $template->assign_block_vars('youtube', array()); $url_download = ( !empty($docid2) ? 'http://' . $sitelngprefix . 'sevenload.' . 'com' . '/videos/' . $docid2 : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download ); } } else { $template->assign_block_vars('youtube', array()); $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $sitelngprefix . 'sevenload.'. 'com' . '/videos/' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/swf/player.swf?id=' . $videoid['song_url'][1] : $url_download ); } } else { $template->assign_block_vars('media', array()); $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; } } else { $template->assign_block_vars('media', array()); //$url_download = mx_append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; } if ( $song_filetype == 'flv' ) { $url_song = PORTAL_URL . MUSIC_UPLOAD_PATH . $thissong['song_filename']; } else { $url_song = mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id, true)); } $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'U_SONG' => $url_song, 'U_IMG' => mx_append_sid("$img_id"), 'SONG_TITLE' => $thissong['song_title'], 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id . "&item_size=425", true)), 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, 'SONG_DESC' => nl2br($thissong['song_desc']), 'SINGER' => $thissong['song_singer'], 'POSTER' => $poster, 'SONG_TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], 'SONG_DOWNLOAD' => ( !empty($thissong['song_download_count']) ? $thissong['song_download_count'] : '0' ), 'SONG_RATING' => ($thissong['rating'] != 0) ? round($thissong['rating'], 2) : $lang['Not_rated'], 'SONG_COMMENTS' => $thissong['comments'], 'U_RATE' => mx_append_sid(this_mo_mxurl("music_mode=music_rate&song_id=$song_id")), 'U_COMMENT' => mx_append_sid(this_mo_mxurl("music_mode=music_comment&song_id=$song_id")), 'U_DOWNLOAD' => $url_download, 'U_NEXT' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=$song_id&mode=next")), 'U_PREVIOUS' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=$song_id&mode=previous")), 'L_NEXT' => $lang['Next'], 'L_PREVIOUS' => $lang['Previous'], 'NAV_SEP' => $lang['Nav_Separator'], 'NAV_DOT' => '•', 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', 'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], 'U_MUSIC' => mx_append_sid(this_mo_mxurl()), 'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), 'FLASH' => 'flash', 'RAM' => 'ram', 'FLASHVIDEO' => 'flashvideo', 'YOUTUBE' => 'youtube', 'QT' => 'qt', 'FLV' => 'flv', 'IMG' => 'img', 'MEDIA' => 'media', 'L_RATING' => $lang['Rating'], 'L_SONG_TITLE' => $lang['Song_Title'], 'L_SONG_DESC' => $lang['Song_Desc'], 'L_SINGER' => $lang['Singer'], 'L_POSTER' => $lang['Poster'], 'L_POSTED' => $lang['Posted'], 'L_VIEW' => $lang['View'], 'L_DOWNLOAD' => $lang['Download'], 'L_COMMENTS' => $lang['Comments']) ); } else { $template->assign_block_vars('flv', array()); $url_download = ''; $url_video = $music_root_path . 'music_player.swf'; if (@file_exists($mx_root_path . $flv_file)) { $url_song = PORTAL_URL . $flv_file; } elseif (@file_exists($mx_root_path . 'modules/mx_music/upload/' . $flv_file)) { $url_song = PORTAL_URL . 'modules/mx_music/upload/' . $flv_file; } else { $url_song = $flv_file; } if (@file_exists($mx_root_path . $flv_img)) { $img_id = PORTAL_URL . $flv_img; } elseif (@file_exists($mx_root_path . 'modules/mx_music/upload/song_image/' . $flv_img)) { $img_id = PORTAL_URL . 'modules/mx_music/upload/song_image/' . $flv_img; } else { $img_id = $flv_img; } $template->assign_vars(array( 'CAT_TITLE' => '', 'U_VIEW_CAT' => '', 'U_SONG' => $url_song, 'U_IMG' => mx_append_sid("$img_id"), 'SONG_TITLE' => '', 'SONG_URL' => $url_song, 'SONG_THUMB_URL' => $flv_img, 'SONG_FULL_URL' => '', 'VIDEO_URL' => $url_video, 'SONG_DESC' => '', 'SINGER' => '', 'POSTER' => '', 'SONG_TIME' => '', 'SONG_VIEW' => '', 'SONG_DOWNLOAD' => '', 'SONG_RATING' => '', 'SONG_COMMENTS' => '', 'U_RATE' => '', 'U_COMMENT' => '', 'U_DOWNLOAD' => '', 'U_NEXT' => '', 'U_PREVIOUS' => '', 'L_NEXT' => $lang['Next'], 'L_PREVIOUS' => $lang['Previous'], 'NAV_SEP' => $lang['Nav_Separator'], 'NAV_DOT' => '•', 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', 'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], 'U_MUSIC' => mx_append_sid(this_mo_mxurl()), 'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), 'FLASH' => 'flash', 'RAM' => 'ram', 'FLASHVIDEO' => 'flashvideo', 'YOUTUBE' => 'youtube', 'QT' => 'qt', 'FLV' => 'flv', 'IMG' => 'img', 'MEDIA' => 'media', 'L_RATING' => $lang['Rating'], 'L_SONG_TITLE' => $lang['Song_Title'], 'L_SONG_DESC' => $lang['Song_Desc'], 'L_SINGER' => $lang['Singer'], 'L_POSTER' => $lang['Poster'], 'L_POSTED' => $lang['Posted'], 'L_VIEW' => $lang['View'], 'L_DOWNLOAD' => $lang['Download'], 'L_COMMENTS' => $lang['Comments']) ); } // // Generate the page // $template->pparse('body'); if (!$is_block) { include($mx_root_path . 'includes/page_tail.'.$phpEx); } ?> Index: music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music.php,v retrieving revision 1.8.2.5 retrieving revision 1.8.2.6 diff -C2 -d -r1.8.2.5 -r1.8.2.6 *** music.php 8 Mar 2008 15:42:44 -0000 1.8.2.5 --- music.php 13 Mar 2008 10:34:51 -0000 1.8.2.6 *************** *** 144,150 **** else { if( !defined('IN_PORTAL') || !is_object($mx_block)) { ! define('IN_PORTAL', true); $mx_root_path = '../../'; // --- 144,151 ---- else { + if( !defined('IN_PORTAL') || !is_object($mx_block)) { ! @define("IN_PORTAL", true); $mx_root_path = '../../'; // *************** *** 166,170 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Could not query Music Center module information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); --- 167,171 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Could not query Music Center module information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); *************** *** 175,187 **** else { - // // Read block Configuration // - $title = $mx_block->block_info['block_title']; $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! if( is_object($mx_block)) { $is_block = TRUE; --- 176,186 ---- else { // // Read block Configuration // $title = $mx_block->block_info['block_title']; $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! if(is_object($mx_block)) { $is_block = TRUE; *************** *** 190,193 **** --- 189,194 ---- global $images; } + @define("MXBB_MODULE", true); + @define("MXBB_27x", file_exists($mx_root_path . "mx_login.$phpEx")); } Index: music_center.pak =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_center.pak,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** music_center.pak 12 Sep 2007 23:49:16 -0000 1.2.2.1 --- music_center.pak 13 Mar 2008 10:34:52 -0000 1.2.2.2 *************** *** 1,10 **** ! module=+:57=+:Media Center=+:modules/mx_music/=+:mxBB Media Center=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:57=+:60=+:music_center=+:Media Center=+:music.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Media Center=+:Demo block=+:60=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:57=+:61=+:Music_list=+:Media toplists=+:music_lists.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Media Toplist=+:Demo block=+:61=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 1,16 ---- ! module=+:74=+:Media Center=+:modules/mx_music/=+:mxBB Media Center=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:74=+:89=+:music_center=+:Media Center=+:music.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:music_center=+:Demo block=+:89=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:74=+:91=+:music_flv=+:flv_player=+:music_flv.php=+: ! parameter=+:91=+:199=+:flv_file=+:Text=+:no_image.flv=+:=+:1=+:0 ! parameter=+:91=+:200=+:flv_img=+:Text=+:no_image.gif=+:=+:1=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:music_flv=+:Demo block=+:91=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:74=+:90=+:Music_list=+:Media toplists=+:music_lists.php=+: ! parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Music_list=+:Demo block=+:90=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! function=+:0=+:0=+:0=+:endoflist=+:0=+:0 \ No newline at end of file |
|
From: OryNider <ory...@us...> - 2008-03-13 10:36:13
|
Update of /cvsroot/mxbb/mx_music/music_box/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32467/music_box/includes Modified Files: Tag: core28x music_constants.php music_functions.php music_integration.php Log Message: upgrade version for core28x branch Index: music_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_constants.php,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** music_constants.php 10 Mar 2008 05:56:39 -0000 1.1.2.4 --- music_constants.php 13 Mar 2008 10:34:58 -0000 1.1.2.5 *************** *** 16,27 **** if ( !MXBB_MODULE ) { ! $server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://'; ! $server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])); ! $server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : ''; ! $script_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])); ! $script_name = ($script_name == '') ? $script_name : '/' . $script_name; ! ! define( 'PORTAL_URL', $server_protocol . $server_name . $server_port . $script_name . '/' ); ! define( 'PHPBB_URL', PORTAL_URL ); $mx_table_prefix = $table_prefix; --- 16,21 ---- if ( !MXBB_MODULE ) { ! define('PORTAL_URL', $portal_config['portal_url']); ! define('PHPBB_URL', PORTAL_URL); $mx_table_prefix = $table_prefix; *************** *** 64,74 **** // Footer Copyrights // ------------------------------------------------------------------------- if (!MXBB_MODULE) { if (!defined( 'IN_ADMIN' )) { ! $mx_user->set_module_cfg_name('linkdb'); ! $mx_user->set_module_lang_path($module_root_path . 'linkdb/'); ! $mx_user->extend(); } } --- 58,69 ---- // Footer Copyrights // ------------------------------------------------------------------------- + //$mx_user->set_module_lang_path($module_root_path . 'music_box/'); + if (!MXBB_MODULE) { if (!defined( 'IN_ADMIN' )) { ! $mx_user->set_module_lang_path($module_root_path . 'music_box/'); ! $mx_user->set_module_cfg_name('mx_music'); } } *************** *** 77,95 **** if (!$_GET['print']) // Do not "fix" with reuest wrapper!! { ! $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x ! } ! ! if (is_object($mx_page)) ! { ! // ------------------------------------------------------------------------- ! // Extend User Style with module lang and images ! // Usage: $mx_user->extend(LANG, IMAGES) ! // Switches: ! // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE ! // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE ! // ------------------------------------------------------------------------- ! $mx_user->extend(MX_LANG_ALL, MX_IMAGES); } } ?> \ No newline at end of file --- 72,87 ---- if (!$_GET['print']) // Do not "fix" with reuest wrapper!! { ! //$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x } } + // ------------------------------------------------------------------------- + // Extend User Style with module lang and images + // Usage: $mx_user->extend(LANG, IMAGES) + // Switches: + // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE + // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE + // ------------------------------------------------------------------------- + $mx_user->extend(MX_LANG_ALL, MX_IMAGES); + ?> \ No newline at end of file |
2 messages has been excluded from this view by a project administrator.