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: Jon O. <jon...@us...> - 2007-08-12 22:29:24
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22995/includes Modified Files: Tag: core28x mx_functions_core.php page_header.php Log Message: Page auth and overall_header blockCP Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.45 retrieving revision 1.45.2.1 diff -C2 -d -r1.45 -r1.45.2.1 *** page_header.php 22 Jul 2007 20:59:56 -0000 1.45 --- page_header.php 12 Aug 2007 22:29:17 -0000 1.45.2.1 *************** *** 461,502 **** // Navigation Menu in overall_header // ! if (!is_object($mx_block)) { ! $mx_block = new mx_block(); ! } ! $block_id = $mx_page->page_navigation_block; ! if(!empty($block_id) ) ! { ! define('MX_OVERALL_NAVIGATION', true); ! $mx_block->init( $block_id ); ! // ! // Define $module_root_path, to be used within blocks ! // ! $module_root_path = $mx_root_path . $mx_block->module_root_path; ! $template = new mx_Template($mx_root_path . 'templates/'. $theme['template_name']); ! // ! // Include block file and cache output ! // ! ob_start(); ! include($module_root_path . $mx_block->block_file); ! $overall_navigation_menu = ob_get_contents(); ! ob_end_clean(); ! // ! // Output Block contents ! // ! $layouttemplate->assign_vars(array( ! 'OVERALL_NAVIGATION' => $overall_navigation_menu) ! ); ! if ( ( ( $mx_block->auth_view && $mx_block->auth_edit && $mx_block->show_block ) || $mx_block->auth_mod ) ) ! { ! $mx_block->output_cp_button(true); } } --- 461,505 ---- // Navigation Menu in overall_header // ! if ($mx_page->auth_view || $mx_page->auth_mod) { ! if (!is_object($mx_block)) ! { ! $mx_block = new mx_block(); ! } ! $block_id = $mx_page->page_navigation_block; ! if(!empty($block_id) ) ! { ! define('MX_OVERALL_NAVIGATION', true); ! $mx_block->init( $block_id ); ! // ! // Define $module_root_path, to be used within blocks ! // ! $module_root_path = $mx_root_path . $mx_block->module_root_path; ! $template = new mx_Template($mx_root_path . 'templates/'. $theme['template_name']); ! // ! // Include block file and cache output ! // ! ob_start(); ! include($module_root_path . $mx_block->block_file); ! $overall_navigation_menu = ob_get_contents(); ! ob_end_clean(); ! // ! // Output Block contents ! // ! $layouttemplate->assign_vars(array( ! 'OVERALL_NAVIGATION' => $overall_navigation_menu) ! ); ! if ( ( ( $mx_block->auth_view && $mx_block->auth_edit && $mx_block->show_block ) || $mx_block->auth_mod ) ) ! { ! $mx_block->output_cp_button(true); ! } } } Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.52 retrieving revision 1.52.2.1 diff -C2 -d -r1.52 -r1.52.2.1 *** mx_functions_core.php 6 Aug 2007 21:11:42 -0000 1.52 --- mx_functions_core.php 12 Aug 2007 22:29:16 -0000 1.52.2.1 *************** *** 2532,2535 **** --- 2532,2536 ---- var $auth_view = false; + var $auth_mod = false; var $auth_ip = false; var $phpbb_stats = '-1'; *************** *** 2711,2714 **** --- 2712,2716 ---- $this->_auth_ary = $this->auth(); $this->auth_view = $this->_auth_ary['auth_view']; + $this->auth_mod = $this->_auth_ary['auth_mod']; $this->auth_ip = $mx_ip->auth($this->info['ip_filter']); |
|
From: Jon O. <jon...@us...> - 2007-08-12 22:29:22
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22995 Modified Files: Tag: core28x index.php Log Message: Page auth and overall_header blockCP Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.70 retrieving revision 1.70.2.1 diff -C2 -d -r1.70 -r1.70.2.1 *** index.php 22 Jul 2007 20:59:56 -0000 1.70 --- index.php 12 Aug 2007 22:29:18 -0000 1.70.2.1 *************** *** 70,79 **** // Page Auth and IP filter // ! if ( !$mx_page->auth_view && $userdata['session_logged_in'] ) { $message = empty( $lang['Page_Not_Authorised'] ) ? "Sorry, but you don't have privilege to access this page." : $lang['Page_Not_Authorised']; mx_message_die(GENERAL_MESSAGE, $message, '', __LINE__, __FILE__, ''); } ! elseif ( !$mx_page->auth_view && !$userdata['session_logged_in'] ) { mx_redirect( append_sid( "login.$phpEx?redirect=" . 'index.php?page=' . $page_id, true ) ); --- 70,79 ---- // Page Auth and IP filter // ! if ( !($mx_page->auth_view || $mx_page->auth_mod) && $userdata['session_logged_in'] ) { $message = empty( $lang['Page_Not_Authorised'] ) ? "Sorry, but you don't have privilege to access this page." : $lang['Page_Not_Authorised']; mx_message_die(GENERAL_MESSAGE, $message, '', __LINE__, __FILE__, ''); } ! elseif ( !($mx_page->auth_view || $mx_page->auth_mod) && !$userdata['session_logged_in'] ) { mx_redirect( append_sid( "login.$phpEx?redirect=" . 'index.php?page=' . $page_id, true ) ); |
|
From: Jon O. <jon...@us...> - 2007-08-12 20:55:44
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8379 Modified Files: NavigationMenu.pak Log Message: installation bug Index: NavigationMenu.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/NavigationMenu.pak,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** NavigationMenu.pak 21 Jul 2007 23:08:18 -0000 1.14 --- NavigationMenu.pak 12 Aug 2007 20:55:41 -0000 1.15 *************** *** 9,15 **** block=+:=+:Demo - User Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:50=+:100=+:Page Navigation Menu=+:Site Navigation=+:mx_site_nav.php=+: ! parameter=+:100=+:202=+:Site Menu=+:site_menu=+:=+:=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Page Navigation Menu=+:Demo block=+:100=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 9,18 ---- block=+:=+:Demo - User Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:50=+:52=+:Page Navigation Menu=+:Site Navigation=+:mx_site_nav.php=+: ! parameter=+:52=+:100=+:Site menu=+:site_menu=+:=+:=+:0=+:10 ! parameter=+:52=+:101=+:menu_display_style=+:Radio_single_select=+:Overall_navigation=+:a:5:{i:0;s:7:"Classic";i:1;s:8:"Advanced";i:2;s:15:"Simple_CSS_menu";i:3;s:17:"Advanced_CSS_menu";i:4;s:18:"Overall_navigation";}=+:0=+:20 ! parameter=+:52=+:102=+:menu_display_mode=+:Radio_single_select=+:Horizontal=+:a:2:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";}=+:0=+:30 ! parameter=+:52=+:103=+:menu_page_sync=+:Boolean=+:1=+:=+:0=+:40 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Page Navigation Menu=+:Demo block=+:52=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: Jon O. <jon...@us...> - 2007-08-12 20:54:51
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7936 Modified Files: mysql_schema_install.sql postgres_schema_install.sql Log Message: installation bug Index: postgres_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/postgres_schema_install.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** postgres_schema_install.sql 22 Jul 2007 21:00:21 -0000 1.3 --- postgres_schema_install.sql 12 Aug 2007 20:54:45 -0000 1.4 *************** *** 273,277 **** -- INSERT INTO "mx_table_function" VALUES (8, 30,'phpBB Index','phpBB Index Block','mx_forum.php',''); ! INSERT INTO "mx_table_function" VALUES (51, 50,'Navigation Menu','Site Navigation Menu Blocks','mx_menu_nav.php',''); INSERT INTO "mx_table_function" VALUES (14, 30,'mxBB Polls','mxBB Polls','mx_poll.php',''); INSERT INTO "mx_table_function" VALUES (6, 10,'Language Select','Language Select Block','mx_language.php',''); --- 273,278 ---- -- INSERT INTO "mx_table_function" VALUES (8, 30,'phpBB Index','phpBB Index Block','mx_forum.php',''); ! INSERT INTO "mx_table_function" VALUES (51, 50,'User Navigation Menu','Site Navigation','mx_menu_nav.php',''); ! INSERT INTO "mx_table_function" VALUES (52, 50,'Site Navigation Menu','Site Navigation','mx_site_nav.php',''); INSERT INTO "mx_table_function" VALUES (14, 30,'mxBB Polls','mxBB Polls','mx_poll.php',''); INSERT INTO "mx_table_function" VALUES (6, 10,'Language Select','Language Select Block','mx_language.php',''); *************** *** 432,440 **** -- Dumping data for table 'mx_table_page' -- ! INSERT INTO "mx_table_page" VALUES (1,'Home','This is the startpage','0','','0','icon_home.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (2,'Forum','This is the phpBB Forum startpage','0','','0','icon_forum.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',1); ! INSERT INTO "mx_table_page" VALUES (3,'Demo Page','Block Demos','0','','0','icon_settings.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (4,'Sitestats','Sitestats page','0','','0','icon_statistics.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (5,'Site Search','Site Search page','0','','0','icon_search.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); --- 433,441 ---- -- Dumping data for table 'mx_table_page' -- ! INSERT INTO "mx_table_page" VALUES (1,'Home','This is the startpage','0','','10','icon_home.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (2,'Forum','This is the phpBB Forum startpage','0','','20','icon_forum.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',1); ! INSERT INTO "mx_table_page" VALUES (3,'Demo Page','Block Demos','0','','30','icon_settings.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (4,'Sitestats','Sitestats page','0','','40','icon_statistics.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (5,'Site Search','Site Search page','0','','50','icon_search.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); *************** *** 535,538 **** --- 536,544 ---- INSERT INTO "mx_table_parameter" VALUES (64,51,'menu_page_sync','Boolean','0','',0,40); + INSERT INTO "mx_table_parameter" VALUES (100,52,'Site menu','site_menu','','',0,10); + INSERT INTO "mx_table_parameter" VALUES (101,52,'menu_display_style','Radio_single_select','Overall_navigation','a:5:{i:0;s:7:"Classic";i:1;s:8:"Advanced";i:2;s:15:"Simple_CSS_menu";i:3;s:17:"Advanced_CSS_menu";i:4;s:18:"Overall_navigation";}',0,20); + INSERT INTO "mx_table_parameter" VALUES (102,52,'menu_display_mode','Radio_single_select','Horizontal','a:2:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";}',0,30); + INSERT INTO "mx_table_parameter" VALUES (103,52,'menu_page_sync','Boolean','1','',0,40); + INSERT INTO "mx_table_parameter" VALUES (92,10,'numOfEvents','Number','5','',0,0); Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** mysql_schema_install.sql 22 Jul 2007 22:29:01 -0000 1.41 --- mysql_schema_install.sql 12 Aug 2007 20:54:45 -0000 1.42 *************** *** 274,278 **** # INSERT INTO mx_table_function VALUES("8", "30", "phpBB Index", "phpBB Index Block", "mx_forum.php", ""); ! INSERT INTO mx_table_function VALUES("51", "50", "Navigation Menu", "Site Navigation Menu Blocks", "mx_menu_nav.php", ""); INSERT INTO mx_table_function VALUES("14", "30", "mxBB Polls", "mxBB Polls", "mx_poll.php", ""); INSERT INTO mx_table_function VALUES("6", "10", "Language Select", "Language Select Block", "mx_language.php", ""); --- 274,279 ---- # INSERT INTO mx_table_function VALUES("8", "30", "phpBB Index", "phpBB Index Block", "mx_forum.php", ""); ! INSERT INTO mx_table_function VALUES("51", "50", "User Navigation Menu", "Site Navigation", "mx_menu_nav.php", ""); ! INSERT INTO mx_table_function VALUES("52", "50", "Page Navigation Menu", "Site Navigation", "mx_site_nav.php", ""); INSERT INTO mx_table_function VALUES("14", "30", "mxBB Polls", "mxBB Polls", "mx_poll.php", ""); INSERT INTO mx_table_function VALUES("6", "10", "Language Select", "Language Select Block", "mx_language.php", ""); *************** *** 437,445 **** # Dumping data for table 'mx_table_page' # ! INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "10", "", "0","icon_home.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "20", "", "0","icon_forum.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "1"); ! INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "30", "", "0","icon_docs.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "40", "", "0","icon_stats.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("5", "Site Search", "Site Search page", "50", "", "0","icon_search.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); --- 438,446 ---- # Dumping data for table 'mx_table_page' # ! INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "0", "", "10","icon_home.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "0", "", "20","icon_forum.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "1"); ! INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "0", "", "30","icon_docs.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "0", "", "40","icon_stats.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("5", "Site Search", "Site Search page", "0", "", "50","icon_search.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); *************** *** 541,544 **** --- 542,550 ---- INSERT INTO mx_table_parameter VALUES("64", "51", "menu_page_sync", "Boolean", "0", "", "0", "40"); + INSERT INTO mx_table_parameter VALUES("100", "52", "Site menu", "site_menu", "", "", "0", "10"); + INSERT INTO mx_table_parameter VALUES("101", "52", "menu_display_style", "Radio_single_select", "Overall_navigation", "a:5:{i:0;s:7:\"Classic\";i:1;s:8:\"Advanced\";i:2;s:15:\"Simple_CSS_menu\";i:3;s:17:\"Advanced_CSS_menu\";i:4;s:18:\"Overall_navigation\";}", "0", "20"); + INSERT INTO mx_table_parameter VALUES("102", "52", "menu_display_mode", "Radio_single_select", "Horizontal", "a:2:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";}", "0", "30"); + INSERT INTO mx_table_parameter VALUES("103", "52", "menu_page_sync", "Boolean", "1", "", "0", "40"); + INSERT INTO mx_table_parameter VALUES("92", "10", "numOfEvents", "Number", "5", "", "0", "0"); |
|
From: Jon O. <jon...@us...> - 2007-08-12 20:49:07
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5440 Modified Files: Tag: core28x NavigationMenu.pak Log Message: schema bugs Index: NavigationMenu.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/NavigationMenu.pak,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** NavigationMenu.pak 21 Jul 2007 23:08:18 -0000 1.14 --- NavigationMenu.pak 12 Aug 2007 20:48:34 -0000 1.14.2.1 *************** *** 9,15 **** block=+:=+:Demo - User Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:50=+:100=+:Page Navigation Menu=+:Site Navigation=+:mx_site_nav.php=+: ! parameter=+:100=+:202=+:Site Menu=+:site_menu=+:=+:=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Page Navigation Menu=+:Demo block=+:100=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 9,18 ---- block=+:=+:Demo - User Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:50=+:52=+:Page Navigation Menu=+:Site Navigation=+:mx_site_nav.php=+: ! parameter=+:52=+:100=+:Site menu=+:site_menu=+:=+:=+:0=+:10 ! parameter=+:52=+:101=+:menu_display_style=+:Radio_single_select=+:Overall_navigation=+:a:5:{i:0;s:7:"Classic";i:1;s:8:"Advanced";i:2;s:15:"Simple_CSS_menu";i:3;s:17:"Advanced_CSS_menu";i:4;s:18:"Overall_navigation";}=+:0=+:20 ! parameter=+:52=+:102=+:menu_display_mode=+:Radio_single_select=+:Horizontal=+:a:2:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";}=+:0=+:30 ! parameter=+:52=+:103=+:menu_page_sync=+:Boolean=+:1=+:=+:0=+:40 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Page Navigation Menu=+:Demo block=+:52=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: Jon O. <jon...@us...> - 2007-08-12 20:48:26
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5417 Modified Files: Tag: core28x mysql_schema_install.sql postgres_schema_install.sql Log Message: schema bugs Index: postgres_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/postgres_schema_install.sql,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** postgres_schema_install.sql 22 Jul 2007 21:00:21 -0000 1.3 --- postgres_schema_install.sql 12 Aug 2007 20:48:22 -0000 1.3.2.1 *************** *** 273,277 **** -- INSERT INTO "mx_table_function" VALUES (8, 30,'phpBB Index','phpBB Index Block','mx_forum.php',''); ! INSERT INTO "mx_table_function" VALUES (51, 50,'Navigation Menu','Site Navigation Menu Blocks','mx_menu_nav.php',''); INSERT INTO "mx_table_function" VALUES (14, 30,'mxBB Polls','mxBB Polls','mx_poll.php',''); INSERT INTO "mx_table_function" VALUES (6, 10,'Language Select','Language Select Block','mx_language.php',''); --- 273,278 ---- -- INSERT INTO "mx_table_function" VALUES (8, 30,'phpBB Index','phpBB Index Block','mx_forum.php',''); ! INSERT INTO "mx_table_function" VALUES (51, 50,'User Navigation Menu','Site Navigation','mx_menu_nav.php',''); ! INSERT INTO "mx_table_function" VALUES (52, 50,'Site Navigation Menu','Site Navigation','mx_site_nav.php',''); INSERT INTO "mx_table_function" VALUES (14, 30,'mxBB Polls','mxBB Polls','mx_poll.php',''); INSERT INTO "mx_table_function" VALUES (6, 10,'Language Select','Language Select Block','mx_language.php',''); *************** *** 432,440 **** -- Dumping data for table 'mx_table_page' -- ! INSERT INTO "mx_table_page" VALUES (1,'Home','This is the startpage','0','','0','icon_home.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (2,'Forum','This is the phpBB Forum startpage','0','','0','icon_forum.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',1); ! INSERT INTO "mx_table_page" VALUES (3,'Demo Page','Block Demos','0','','0','icon_settings.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (4,'Sitestats','Sitestats page','0','','0','icon_statistics.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (5,'Site Search','Site Search page','0','','0','icon_search.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); --- 433,441 ---- -- Dumping data for table 'mx_table_page' -- ! INSERT INTO "mx_table_page" VALUES (1,'Home','This is the startpage','0','','10','icon_home.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (2,'Forum','This is the phpBB Forum startpage','0','','20','icon_forum.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',1); ! INSERT INTO "mx_table_page" VALUES (3,'Demo Page','Block Demos','0','','30','icon_settings.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (4,'Sitestats','Sitestats page','0','','40','icon_statistics.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); ! INSERT INTO "mx_table_page" VALUES (5,'Site Search','Site Search page','0','','50','icon_search.gif','','','','','1','0','0','0',-1,-1,'','','','0','a:1:{i:0;s:0:"";}',-1); *************** *** 535,538 **** --- 536,544 ---- INSERT INTO "mx_table_parameter" VALUES (64,51,'menu_page_sync','Boolean','0','',0,40); + INSERT INTO "mx_table_parameter" VALUES (100,52,'Site menu','site_menu','','',0,10); + INSERT INTO "mx_table_parameter" VALUES (101,52,'menu_display_style','Radio_single_select','Overall_navigation','a:5:{i:0;s:7:"Classic";i:1;s:8:"Advanced";i:2;s:15:"Simple_CSS_menu";i:3;s:17:"Advanced_CSS_menu";i:4;s:18:"Overall_navigation";}',0,20); + INSERT INTO "mx_table_parameter" VALUES (102,52,'menu_display_mode','Radio_single_select','Horizontal','a:2:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";}',0,30); + INSERT INTO "mx_table_parameter" VALUES (103,52,'menu_page_sync','Boolean','1','',0,40); + INSERT INTO "mx_table_parameter" VALUES (92,10,'numOfEvents','Number','5','',0,0); Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.41 retrieving revision 1.41.2.1 diff -C2 -d -r1.41 -r1.41.2.1 *** mysql_schema_install.sql 22 Jul 2007 22:29:01 -0000 1.41 --- mysql_schema_install.sql 12 Aug 2007 20:48:21 -0000 1.41.2.1 *************** *** 274,278 **** # INSERT INTO mx_table_function VALUES("8", "30", "phpBB Index", "phpBB Index Block", "mx_forum.php", ""); ! INSERT INTO mx_table_function VALUES("51", "50", "Navigation Menu", "Site Navigation Menu Blocks", "mx_menu_nav.php", ""); INSERT INTO mx_table_function VALUES("14", "30", "mxBB Polls", "mxBB Polls", "mx_poll.php", ""); INSERT INTO mx_table_function VALUES("6", "10", "Language Select", "Language Select Block", "mx_language.php", ""); --- 274,279 ---- # INSERT INTO mx_table_function VALUES("8", "30", "phpBB Index", "phpBB Index Block", "mx_forum.php", ""); ! INSERT INTO mx_table_function VALUES("51", "50", "User Navigation Menu", "Site Navigation", "mx_menu_nav.php", ""); ! INSERT INTO mx_table_function VALUES("52", "50", "Page Navigation Menu", "Site Navigation", "mx_site_nav.php", ""); INSERT INTO mx_table_function VALUES("14", "30", "mxBB Polls", "mxBB Polls", "mx_poll.php", ""); INSERT INTO mx_table_function VALUES("6", "10", "Language Select", "Language Select Block", "mx_language.php", ""); *************** *** 437,445 **** # Dumping data for table 'mx_table_page' # ! INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "10", "", "0","icon_home.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "20", "", "0","icon_forum.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "1"); ! INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "30", "", "0","icon_docs.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "40", "", "0","icon_stats.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("5", "Site Search", "Site Search page", "50", "", "0","icon_search.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); --- 438,446 ---- # Dumping data for table 'mx_table_page' # ! INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "0", "", "10","icon_home.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "0", "", "20","icon_forum.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "1"); ! INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "0", "", "30","icon_docs.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "0", "", "40","icon_stats.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("5", "Site Search", "Site Search page", "0", "", "50","icon_search.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); *************** *** 541,544 **** --- 542,550 ---- INSERT INTO mx_table_parameter VALUES("64", "51", "menu_page_sync", "Boolean", "0", "", "0", "40"); + INSERT INTO mx_table_parameter VALUES("100", "52", "Site menu", "site_menu", "", "", "0", "10"); + INSERT INTO mx_table_parameter VALUES("101", "52", "menu_display_style", "Radio_single_select", "Overall_navigation", "a:5:{i:0;s:7:\"Classic\";i:1;s:8:\"Advanced\";i:2;s:15:\"Simple_CSS_menu\";i:3;s:17:\"Advanced_CSS_menu\";i:4;s:18:\"Overall_navigation\";}", "0", "20"); + INSERT INTO mx_table_parameter VALUES("102", "52", "menu_display_mode", "Radio_single_select", "Horizontal", "a:2:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";}", "0", "30"); + INSERT INTO mx_table_parameter VALUES("103", "52", "menu_page_sync", "Boolean", "1", "", "0", "40"); + INSERT INTO mx_table_parameter VALUES("92", "10", "numOfEvents", "Number", "5", "", "0", "0"); |
|
From: OryNider <ory...@us...> - 2007-08-12 18:46:15
|
Update of /cvsroot/mxbb/mx_glance In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32609 Modified Files: mx_glance.pak mx_glance.php Log Message: Added option to enable/disable user colors and bold. Index: mx_glance.php =================================================================== RCS file: /cvsroot/mxbb/mx_glance/mx_glance.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_glance.php 11 Aug 2007 21:53:18 -0000 1.7 --- mx_glance.php 12 Aug 2007 18:46:01 -0000 1.8 *************** *** 46,49 **** --- 46,55 ---- // CHANGE THE BULLET IF A TOPIC IS NEW? (true / false) $recent_show_new_bullets = $mx_block->get_parameters( 'Glance_show_new_bullets' ); + + // SHOW ADMIN AND MOD WITH COLORS? (true / false) + $recent_show_user_color = $mx_block->get_parameters( 'Glance_show_user_color' ); + + // SHOW USERS WITH BOLD IF PREVIOUS OPTION IS FALSE? (true / false) + $recent_show_user_bold = $mx_block->get_parameters( 'Glance_show_user_bold' ); // MESSAGE TRACKING WILL TRACK TO SEE IF A USER HAS READ THE TOPIC DURING THEIR SESSION (true / false) *************** *** 488,551 **** else { ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_news[$i]['poster_id']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); ! } ! ! while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { ! $last_poster_color = $theme['fontcolor3']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $last_poster_color = $theme['fontcolor2']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; } ! else ! { ! $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; } } - $db->sql_freeresult($result); $last_poster = ($latest_news[$i]['poster_id'] == ANONYMOUS ) ? '<span ' . $last_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_news[$i]['poster_id']) . '"><span ' . $last_poster_style . '>' . $latest_news[$i]['last_username'] . '</span></a> '; $last_poster_full = $last_poster . '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $latest_news[$i]['topic_last_post_id']) . '#' . $latest_news[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_news[$i]['topic_poster']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); ! } ! ! while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { ! $topic_poster_color = $theme['fontcolor3']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $topic_poster_color = $theme['fontcolor2']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; } ! else ! { $topic_poster_color = ''; $topic_poster_style = 'style="font-weight : bold;"'; } } - $db->sql_freeresult($result); $topic_poster = ($latest_news[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_news[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_news[$i]['author_username'] . '</span></a> '; --- 494,583 ---- else { ! if ($recent_show_user_color) { ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_news[$i]['poster_id']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); } ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! if ($row['user_level'] == ADMIN) ! { ! $last_poster_color = $theme['fontcolor3']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $last_poster_color = $theme['fontcolor2']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else ! { ! $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; ! } } + $db->sql_freeresult($result); + } + else if ($recent_show_user_bold) + { + $last_poster_color = ''; + $last_poster_style = 'style="font-weight : bold;"'; + } + else + { + $last_poster_color = ''; + $last_poster_style = ''; } $last_poster = ($latest_news[$i]['poster_id'] == ANONYMOUS ) ? '<span ' . $last_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_news[$i]['poster_id']) . '"><span ' . $last_poster_style . '>' . $latest_news[$i]['last_username'] . '</span></a> '; $last_poster_full = $last_poster . '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $latest_news[$i]['topic_last_post_id']) . '#' . $latest_news[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; ! if ($recent_show_user_color) { ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_news[$i]['topic_poster']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); } ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! if ($row['user_level'] == ADMIN) ! { ! $topic_poster_color = $theme['fontcolor3']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $topic_poster_color = $theme['fontcolor2']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else ! { $topic_poster_color = ''; $topic_poster_style = 'style="font-weight : bold;"'; + } } + $db->sql_freeresult($result); + } + else if ($recent_show_user_bold) + { + $topic_poster_color = ''; + $topic_poster_style = 'style="font-weight : bold;"'; + } + else + { + $topic_poster_color = ''; + $topic_poster_style = ''; } $topic_poster = ($latest_news[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_news[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_news[$i]['author_username'] . '</span></a> '; *************** *** 730,795 **** else { ! ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_topics[$i]['poster_id']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); ! } ! ! while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { ! $last_poster_color = $theme['fontcolor3']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $last_poster_color = $theme['fontcolor2']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; } ! else ! { ! $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; } } - $db->sql_freeresult($result); $last_poster = ($latest_topics[$i]['poster_id'] == ANONYMOUS ) ? '<span ' . $last_poster_style . '>' . $lang['Guest'] . '</span>' : '<a alt="' . $last_post_time . '" title="' . $last_post_time . '" href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['poster_id']) . '"><span ' . $last_poster_style . '>' . $latest_topics[$i]['last_username'] . '</span></a> '; $last_poster_full = $last_poster . '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $latest_topics[$i]['topic_last_post_id']) . '#' . $latest_topics[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_topics[$i]['topic_poster']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); ! } ! ! while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { ! $topic_poster_color = $theme['fontcolor3']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $topic_poster_color = $theme['fontcolor2']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; } ! else ! { ! $topic_poster_color = $theme['fontcolor1']; ! $topic_poster_style = 'style="font-weight : bold;"'; } } - $db->sql_freeresult($result); - $topic_poster = ($latest_topics[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_topics[$i]['author_username'] . '</span></a> '; --- 762,851 ---- else { ! if ($recent_show_user_color) { ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_topics[$i]['poster_id']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); } ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! if ($row['user_level'] == ADMIN) ! { ! $last_poster_color = $theme['fontcolor3']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $last_poster_color = $theme['fontcolor2']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else ! { ! $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; ! } } + $db->sql_freeresult($result); + } + else if ($recent_show_user_bold) + { + $last_poster_color = ''; + $last_poster_style = 'style="font-weight : bold;"'; + } + else + { + $last_poster_color = ''; + $last_poster_style = ''; } $last_poster = ($latest_topics[$i]['poster_id'] == ANONYMOUS ) ? '<span ' . $last_poster_style . '>' . $lang['Guest'] . '</span>' : '<a alt="' . $last_post_time . '" title="' . $last_post_time . '" href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['poster_id']) . '"><span ' . $last_poster_style . '>' . $latest_topics[$i]['last_username'] . '</span></a> '; $last_poster_full = $last_poster . '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $latest_topics[$i]['topic_last_post_id']) . '#' . $latest_topics[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; ! if ($recent_show_user_color) { ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_topics[$i]['topic_poster']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); } ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! if ($row['user_level'] == ADMIN) ! { ! $topic_poster_color = $theme['fontcolor3']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $topic_poster_color = $theme['fontcolor2']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else ! { ! $topic_poster_color = $theme['fontcolor1']; ! $topic_poster_style = 'style="font-weight : bold;"'; ! } } + $db->sql_freeresult($result); + } + else if ($recent_show_user_bold) + { + $topic_poster_color = ''; + $topic_poster_style = 'style="font-weight : bold;"'; + } + else + { + $topic_poster_color = ''; + $topic_poster_style = ''; } $topic_poster = ($latest_topics[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_topics[$i]['author_username'] . '</span></a> '; Index: mx_glance.pak =================================================================== RCS file: /cvsroot/mxbb/mx_glance/mx_glance.pak,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_glance.pak 5 Aug 2007 19:42:07 -0000 1.3 --- mx_glance.pak 12 Aug 2007 18:46:00 -0000 1.4 *************** *** 9,12 **** --- 9,14 ---- parameter=+:73=+:142=+:Glance_title_length=+:Number=+:0=+:=+:0 parameter=+:73=+:143=+:Glance_show_new_bullets=+:Boolean=+:TRUE=+:=+:0=+:0 + parameter=+:73=+:143=+:Glance_show_user_color=+:Boolean=+:TRUE=+:=+:0=+:0 + parameter=+:73=+:143=+:Glance_show_user_bold=+:Boolean=+:TRUE=+:=+:0=+:0 parameter=+:73=+:144=+:Glance_track=+:Boolean=+:TRUE=+:=+:0=+:0 parameter=+:73=+:145=+:Glance_auth_read=+:Boolean=+:FALSE=+:=+:0=+:0 |
|
From: OryNider <ory...@us...> - 2007-08-11 21:53:24
|
Update of /cvsroot/mxbb/mx_glance In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14155 Modified Files: mx_glance.php Log Message: This is fixing the color ptoblem with phpBB2. Index: mx_glance.php =================================================================== RCS file: /cvsroot/mxbb/mx_glance/mx_glance.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_glance.php 11 Aug 2007 07:00:57 -0000 1.6 --- mx_glance.php 11 Aug 2007 21:53:18 -0000 1.7 *************** *** 190,193 **** --- 190,194 ---- $recent_news_forum_id = ($recent_news_forum_id) ? $recent_news_forum_id : 0; + /* $sql = $db->sql_build_query('SELECT', array( 'SELECT' => 'f.forum_id, f.forum_name' . $sql_title . ', t.*, p.post_time, p.poster_id, u.username as last_username, u.username as author_username', *************** *** 210,213 **** --- 211,238 ---- )); + */ + + $sql = " + SELECT + f.forum_id, f.forum_name" . $sql_title . ", t.*, + p2.post_time, p2.poster_id, + u.username as last_username, + u2.username as author_username + FROM " + . FORUMS_TABLE . " f, " + . POSTS_TABLE . " p, " + . TOPICS_TABLE . " t, " + . POSTS_TABLE . " p2, " + . USERS_TABLE . " u, " + . USERS_TABLE . " u2 + WHERE + f.forum_id IN (" . $recent_news_forum_id . ") + AND t.forum_id = f.forum_id + AND p.post_id = t.topic_first_post_id + AND p2.post_id = t.topic_last_post_id + AND t.topic_moved_id = 0 + AND p2.poster_id = u.user_id + AND t.topic_poster = u2.user_id + ORDER BY t.topic_last_post_id DESC"; if( !($result = $db->sql_query_limit($sql, $sql_news_limit, $sql_news_start)) ) *************** *** 317,320 **** --- 342,346 ---- $sql_forums_start = ($recent_forums_offset) ? $recent_forums_offset : 0; + /* $sql = $db->sql_build_query('SELECT', array( 'SELECT' => 'f.forum_id, f.forum_name' . $sql_title . ', t.*, p.post_time, p.poster_id, u.username as last_username, u.username as author_username', *************** *** 337,340 **** --- 363,390 ---- )); + */ + + $sql = " + SELECT + f.forum_id, f.forum_name" . $sql_title . ", t.*, + p2.post_time, p2.poster_id, + u.username as last_username, + u2.username as author_username + FROM " + . FORUMS_TABLE . " f, " + . POSTS_TABLE . " p, " + . TOPICS_TABLE . " t, " + . POSTS_TABLE . " p2, " + . USERS_TABLE . " u, " + . USERS_TABLE . " u2 + WHERE + f.forum_id NOT IN (" . $recentforumsignore . $recent_forums_ignore . ") + AND t.forum_id = f.forum_id + AND p.post_id = t.topic_first_post_id + AND p2.post_id = t.topic_last_post_id + AND t.topic_moved_id = 0 + AND p2.poster_id = u.user_id + AND t.topic_poster = u2.user_id + ORDER BY t.topic_last_post_id DESC"; if( !($result = $db->sql_query_limit($sql, $sql_forums_limit, $sql_forums_start)) ) *************** *** 438,447 **** else { ! $last_poster = ($latest_news[$i]['poster_id'] == ANONYMOUS ) ? ( ($latest_news[$i]['last_username'] != '' ) ? $latest_news[$i]['last_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_news[$i]['poster_id']) . '">' . $latest_news[$i]['last_username'] . '</a> '; $last_poster_full = $last_poster . '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $latest_news[$i]['topic_last_post_id']) . '#' . $latest_news[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; ! $last_poster_color = ''; //never used ! $topic_poster = ($latest_news[$i]['topic_poster'] == ANONYMOUS ) ? ( ($latest_news[$i]['author_username'] != '' ) ? $latest_news[$i]['author_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_news[$i]['topic_poster']) . '">' . $latest_news[$i]['author_username'] . '</a> '; $topic_poster_full = $topic_poster; - $topic_poster_color = ''; //never used } --- 488,554 ---- else { ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_news[$i]['poster_id']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); ! } ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! if ($row['user_level'] == ADMIN) ! { ! $last_poster_color = $theme['fontcolor3']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $last_poster_color = $theme['fontcolor2']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else ! { ! $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; ! } ! } ! $db->sql_freeresult($result); ! ! $last_poster = ($latest_news[$i]['poster_id'] == ANONYMOUS ) ? '<span ' . $last_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_news[$i]['poster_id']) . '"><span ' . $last_poster_style . '>' . $latest_news[$i]['last_username'] . '</span></a> '; $last_poster_full = $last_poster . '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $latest_news[$i]['topic_last_post_id']) . '#' . $latest_news[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; ! ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_news[$i]['topic_poster']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); ! } ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! if ($row['user_level'] == ADMIN) ! { ! $topic_poster_color = $theme['fontcolor3']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $topic_poster_color = $theme['fontcolor2']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else ! { ! $topic_poster_color = ''; ! $topic_poster_style = 'style="font-weight : bold;"'; ! } ! } ! $db->sql_freeresult($result); ! ! $topic_poster = ($latest_news[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_news[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_news[$i]['author_username'] . '</span></a> '; $topic_poster_full = $topic_poster; } *************** *** 623,633 **** else { ! $last_poster = ($latest_topics[$i]['poster_id'] == ANONYMOUS ) ? ( ($latest_topics[$i]['last_username'] != '' ) ? $latest_topics[$i]['last_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a alt="' . $last_post_time . '" title="' . $last_post_time . '" href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['poster_id']) . '">' . $latest_topics[$i]['last_username'] . '</a> '; $last_poster_full = $last_poster . '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $latest_topics[$i]['topic_last_post_id']) . '#' . $latest_topics[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; - $last_poster_color = ''; //never used ! $topic_poster = ($latest_topics[$i]['topic_poster'] == ANONYMOUS ) ? ( ($latest_topics[$i]['author_username'] != '' ) ? $latest_topics[$i]['author_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['topic_poster']) . '">' . $latest_topics[$i]['author_username'] . '</a> '; $topic_poster_full = $topic_poster; - $topic_poster_color = ''; //never used } --- 730,798 ---- else { ! ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_topics[$i]['poster_id']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); ! } ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! if ($row['user_level'] == ADMIN) ! { ! $last_poster_color = $theme['fontcolor3']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $last_poster_color = $theme['fontcolor2']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else ! { ! $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; ! } ! } ! $db->sql_freeresult($result); ! ! $last_poster = ($latest_topics[$i]['poster_id'] == ANONYMOUS ) ? '<span ' . $last_poster_style . '>' . $lang['Guest'] . '</span>' : '<a alt="' . $last_post_time . '" title="' . $last_post_time . '" href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['poster_id']) . '"><span ' . $last_poster_style . '>' . $latest_topics[$i]['last_username'] . '</span></a> '; $last_poster_full = $last_poster . '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $latest_topics[$i]['topic_last_post_id']) . '#' . $latest_topics[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; ! $sql = "SELECT username, user_id, user_level ! FROM ".USERS_TABLE." ! WHERE user_id = ".$latest_topics[$i]['topic_poster']." ! ORDER BY username ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); ! } ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! if ($row['user_level'] == ADMIN) ! { ! $topic_poster_color = $theme['fontcolor3']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { ! $topic_poster_color = $theme['fontcolor2']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else ! { ! $topic_poster_color = $theme['fontcolor1']; ! $topic_poster_style = 'style="font-weight : bold;"'; ! } ! } ! $db->sql_freeresult($result); ! ! ! $topic_poster = ($latest_topics[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_topics[$i]['author_username'] . '</span></a> '; $topic_poster_full = $topic_poster; } |
|
From: OryNider <ory...@us...> - 2007-08-11 07:01:02
|
Update of /cvsroot/mxbb/mx_glance In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29659 Modified Files: mx_glance.php Log Message: a fix for previous added feature. Index: mx_glance.php =================================================================== RCS file: /cvsroot/mxbb/mx_glance/mx_glance.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_glance.php 5 Aug 2007 19:42:07 -0000 1.5 --- mx_glance.php 11 Aug 2007 07:00:57 -0000 1.6 *************** *** 457,460 **** --- 457,462 ---- } + $recent_news_total_info = count($i); + if (($recent_news_offset > 0) or ($recent_news_offset+$recent_num_news < $overall_news_topics)) { *************** *** 468,472 **** $prev_news_url = ''; } ! if ($recent_news_offset+$recent_num_news < $overall_total_topics) { $next_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset+$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th">Next ' . $recent_num_news . ' >></a>' : $new_url . ($recent_news_offset+$recent_num_news).'" class="th">Next ' . $recent_num_news . ' >></a>'; --- 470,474 ---- $prev_news_url = ''; } ! if ( ($recent_news_offset+$recent_num_news < $overall_total_topics) && ($recent_news_offset < $recent_num_news+recent_news_total_info) ) { $next_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset+$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th">Next ' . $recent_num_news . ' >></a>' : $new_url . ($recent_news_offset+$recent_num_news).'" class="th">Next ' . $recent_num_news . ' >></a>'; *************** *** 482,487 **** $next_news_url = ''; } ! $recent_news_total_info = count($i); ! $template->assign_block_vars('latest_news', array( 'NEWEST_POST_IMG' => $$bullet_full, 'TOPIC_FOLDER_IMG_SRC' => $$bullet_src, --- 484,489 ---- $next_news_url = ''; } ! ! $template->assign_block_vars('latest_news', array( 'NEWEST_POST_IMG' => $$bullet_full, 'TOPIC_FOLDER_IMG_SRC' => $$bullet_src, *************** *** 509,513 **** 'SWITCH_RECENT_NEWS' => (!empty($recent_num_news)) ? 1 : false, 'S_ROW_COUNT' => $i) ! ); } --- 511,515 ---- 'SWITCH_RECENT_NEWS' => (!empty($recent_num_news)) ? 1 : false, 'S_ROW_COUNT' => $i) ! ); } *************** *** 516,519 **** --- 518,542 ---- { $recent_news_total_info = 'None'; + + if (($recent_news_offset > 0) or ($recent_news_offset+$recent_num_news < $overall_news_topics)) + { + $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_news_offset=')); + if ($recent_news_offset > 0) + { + $prev_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset-$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th"><< Prev ' . $recent_num_news . '</a>' : $new_url . ($recent_news_offset-$recent_num_news).'" class="th"><< Prev ' . $recent_num_news . '</a>'; + } + else + { + $prev_news_url = ''; + } + + $next_news_url = ''; + } + else + { + $prev_news_url = ''; + $next_news_url = ''; + } + $template->assign_block_vars('latest_news', array( 'TOPIC_FOLDER_IMG_SRC' => $recent_forums_bullet_old, *************** *** 609,612 **** --- 632,636 ---- } + $recent_forums_total_info = count($i); if (($recent_forums_offset > 0) or ($recent_forums_offset+$recent_num_topics < $overall_total_topics)) *************** *** 621,625 **** $prev_recent_url = ''; } ! if ($recent_forums_offset+$recent_num_topics < $overall_total_topics) { $next_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset+$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th">Next ' . $recent_num_topics . ' >></a>' : $new_url . ($recent_forums_offset+$recent_num_topics).'" class="th">Next ' . $recent_num_topics . ' >></a>'; --- 645,649 ---- $prev_recent_url = ''; } ! if ( ($recent_forums_offset+$recent_num_topics < $overall_total_topics) && ($recent_forums_offset < $recent_num_topics+$recent_forums_total_info) ) { $next_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset+$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th">Next ' . $recent_num_topics . ' >></a>' : $new_url . ($recent_forums_offset+$recent_num_topics).'" class="th">Next ' . $recent_num_topics . ' >></a>'; *************** *** 635,640 **** $next_recent_url = ''; } ! $recent_forums_total_info = count($i); ! $template->assign_block_vars('latest_topics', array( 'NEWEST_POST_IMG' => $$bullet_full, 'TOPIC_FOLDER_IMG_SRC' => $$bullet_src, --- 659,664 ---- $next_recent_url = ''; } ! ! $template->assign_block_vars('latest_topics', array( 'NEWEST_POST_IMG' => $$bullet_full, 'TOPIC_FOLDER_IMG_SRC' => $$bullet_src, *************** *** 662,666 **** 'SWITCH_RECENT_POSTS' => (!empty($recent_num_topics)) ? 1 : false, 'S_ROW_COUNT' => $i) ! ); } } --- 686,690 ---- 'SWITCH_RECENT_POSTS' => (!empty($recent_num_topics)) ? 1 : false, 'S_ROW_COUNT' => $i) ! ); } } *************** *** 668,671 **** --- 692,716 ---- { $recent_forums_total_info = 'None'; + + if (($recent_forums_offset > 0) or ($recent_forums_offset+$recent_num_topics < $overall_total_topics)) + { + $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_posts_offset=')); + if ($recent_forums_offset > 0) + { + $prev_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset-$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th"><< Prev ' . $recent_num_topics . '</a>' : $new_url . ($recent_forums_offset-$recent_num_topics).'" class="th"><< Prev ' . $recent_num_topics . '</a>'; + } + else + { + $prev_recent_url = ''; + } + + $next_recent_url = ''; + } + else + { + $prev_recent_url = ''; + $next_recent_url = ''; + } + $template->assign_block_vars('latest_topics', array( 'BULLET' => $recent_forums_bullet_old, |
|
From: OryNider <ory...@us...> - 2007-08-11 04:43:48
|
Update of /cvsroot/mxbb/mx_glance/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2766 Modified Files: glance_body.tpl Log Message: This will add glance offset that simulates pagination. Index: glance_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_glance/templates/subSilver/glance_body.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** glance_body.tpl 10 Aug 2007 22:16:34 -0000 1.3 --- glance_body.tpl 11 Aug 2007 04:43:44 -0000 1.4 *************** *** 13,34 **** <table width="100%" cellspacing="0" cellpadding="0" border="0"> <!-- END switch_glance_news --> ! <!-- BEGIN latest_news --> ! <tr> ! <td class="row2" align="center"> ! <span class="cattitle"> ! {latest_news.TOPIC_FOLDER_IMG_SRC} ! </span> ! </td> ! <td class="row1" align="left" valign="top" width="100%"> ! <span class="genmed" style="font-weight: bold;"><a title="{L_LAST_REPLY}: {latest_news.LAST_POST_TIME}" href="{latest_news.U_VIEW_TOPIC}" class="genmed">{latest_news.TOPIC_TITLE}</a></span> ! <br /> ! <span class="gensmall" nowrap="nowrap">{latest_news.TOPIC_TIME} ! </span> ! </td> ! </tr> ! <!-- END latest_news --> <!-- BEGIN switch_glance_news --> ! </table> ! </span></td> </tr> <!-- END switch_glance_news --> --- 13,37 ---- <table width="100%" cellspacing="0" cellpadding="0" border="0"> <!-- END switch_glance_news --> ! <!-- BEGIN latest_news --> ! <tr> ! <td class="row2" align="center"> ! <span class="cattitle"> ! {latest_news.TOPIC_FOLDER_IMG_SRC} ! </span> ! </td> ! <td class="row1" align="left" valign="top" width="100%"> ! <span class="genmed" style="font-weight: bold;"><a title="{L_LAST_REPLY}: {latest_news.LAST_POST_TIME}" href="{latest_news.U_VIEW_TOPIC}" class="genmed">{latest_news.TOPIC_TITLE}</a></span> ! <br /> ! <span class="gensmall" nowrap="nowrap">{latest_news.TOPIC_TIME} ! </span> ! </td> ! </tr> ! <!-- END latest_news --> <!-- BEGIN switch_glance_news --> ! <tr valign="middle"> ! <td align="right" valign="top" nowrap="nowrap" colspan="2" height="28" class="cat"><span class="gensmall">{switch_glance_news.PREV_URL} {switch_glance_news.NEXT_URL} </span></td> ! </tr> ! </table> ! </span></td> </tr> <!-- END switch_glance_news --> *************** *** 72,77 **** <!-- END latest_topics --> <!-- BEGIN switch_glance_recent --> ! </table> ! </span></td> </tr> <!-- END switch_glance_recent --> --- 75,83 ---- <!-- END latest_topics --> <!-- BEGIN switch_glance_recent --> ! <tr valign="middle"> ! <td align="right" valign="top" nowrap="nowrap" colspan="2" height="28" class="cat"><span class="gensmall">{switch_glance_recent.PREV_URL} {switch_glance_recent.NEXT_URL} </span></td> ! </tr> ! </table> ! </span></td> </tr> <!-- END switch_glance_recent --> |
|
From: OryNider <ory...@us...> - 2007-08-11 03:49:38
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24064 Modified Files: functions_install.php Log Message: the tpl extension replaced from .html with .tpl Index: functions_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functions_install.php 6 Aug 2007 19:33:28 -0000 1.1 --- functions_install.php 11 Aug 2007 03:49:32 -0000 1.2 *************** *** 19,23 **** global $template, $lang, $mx_root_path, $mx_portal_name, $mx_portal_version; ! $template->set_filenames(array('header' => 'mx_install_header.html')); $template->assign_vars(array( 'L_PORTAL_NAME' => $mx_portal_name, --- 19,23 ---- global $template, $lang, $mx_root_path, $mx_portal_name, $mx_portal_version; ! $template->set_filenames(array('header' => 'mx_install_header.tpl')); $template->assign_vars(array( 'L_PORTAL_NAME' => $mx_portal_name, *************** *** 42,46 **** ); ! $template->set_filenames(array('footer' => 'mx_install_footer.html')); $template->assign_vars(array( 'L_INSTALLER_NAME' => INSTALLER_NAME, --- 42,46 ---- ); ! $template->set_filenames(array('footer' => 'mx_install_footer.tpl')); $template->assign_vars(array( 'L_INSTALLER_NAME' => INSTALLER_NAME, *************** *** 979,983 **** $template = new Template($mx_root_path . 'install/templates'); page_header_install('phpInfo()'); ! $template->set_filenames(array('phpinfo' => 'mx_install_phpinfo.html')); $template->assign_vars(array('PHPINFO' => $body_part)); $template->pparse('phpinfo'); --- 979,983 ---- $template = new Template($mx_root_path . 'install/templates'); page_header_install('phpInfo()'); ! $template->set_filenames(array('phpinfo' => 'mx_install_phpinfo.tpl')); $template->assign_vars(array('PHPINFO' => $body_part)); $template->pparse('phpinfo'); |
|
From: OryNider <ory...@us...> - 2007-08-10 22:16:39
|
Update of /cvsroot/mxbb/mx_glance/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21091 Modified Files: glance_body.tpl Log Message: <br /> added to subSilver tpl file. Index: glance_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_glance/templates/subSilver/glance_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** glance_body.tpl 5 Aug 2007 19:42:57 -0000 1.2 --- glance_body.tpl 10 Aug 2007 22:16:34 -0000 1.3 *************** *** 58,62 **** <span class="gensmall" nowrap="nowrap"> {latest_topics.LAST_POST_TIME} ! </span> <span class="gensmall" nowrap="nowrap"> {latest_topics.TOPIC_AUTHOR_FULL} {latest_topics.LAST_POSTER_FULL} --- 58,62 ---- <span class="gensmall" nowrap="nowrap"> {latest_topics.LAST_POST_TIME} ! </span><br /> <span class="gensmall" nowrap="nowrap"> {latest_topics.TOPIC_AUTHOR_FULL} {latest_topics.LAST_POSTER_FULL} |
|
From: Jon O. <jon...@us...> - 2007-08-10 18:36:27
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9569 Modified Files: functions_pafiledb.php Log Message: To avoid server cache system failure. Index: functions_pafiledb.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** functions_pafiledb.php 9 Jul 2007 22:40:09 -0000 1.47 --- functions_pafiledb.php 10 Aug 2007 18:36:22 -0000 1.48 *************** *** 15,77 **** /** - * Public pafiledb class - * - */ - class pafiledb_public extends mx_pafiledb - { - var $modules = array(); - var $module_name = ''; - - /** - * load module. - * - * @param unknown_type $module_name send module name to load it - */ - function module( $module_name ) - { - if ( !class_exists( 'pafiledb_' . $module_name ) ) - { - global $module_root_path, $phpEx; - - $this->module_name = $module_name; - - require_once( $module_root_path . 'pafiledb/modules/pa_' . $module_name . '.' . $phpEx ); - eval( '$this->modules[' . $module_name . '] = new pafiledb_' . $module_name . '();' ); - - if ( method_exists( $this->modules[$module_name], 'init' ) ) - { - $this->modules[$module_name]->init(); - } - } - } - - /** - * this will be replaced by the loaded module - * - * @param unknown_type $module_id - * @return unknown - */ - function main( $module_id = false ) - { - return false; - } - - /** - * go ahead and output the page - * - * @param unknown_type $page_title send page title - * @param unknown_type $tpl_name template file name - */ - function display( $page_title, $tpl_name ) - { - global $pafiledb_template, $pafiledb_functions; - - $pafiledb_functions->page_header( $page_title ); - $pafiledb_template->set_filenames( array( 'body' => $tpl_name ) ); - $pafiledb_functions->page_footer(); - } - } - - /** * pafiledb class * --- 15,18 ---- *************** *** 2339,2341 **** --- 2280,2341 ---- } } + + /** + * Public pafiledb class + * + */ + class pafiledb_public extends mx_pafiledb + { + var $modules = array(); + var $module_name = ''; + + /** + * load module. + * + * @param unknown_type $module_name send module name to load it + */ + function module( $module_name ) + { + if ( !class_exists( 'pafiledb_' . $module_name ) ) + { + global $module_root_path, $phpEx; + + $this->module_name = $module_name; + + require_once( $module_root_path . 'pafiledb/modules/pa_' . $module_name . '.' . $phpEx ); + eval( '$this->modules[' . $module_name . '] = new pafiledb_' . $module_name . '();' ); + + if ( method_exists( $this->modules[$module_name], 'init' ) ) + { + $this->modules[$module_name]->init(); + } + } + } + + /** + * this will be replaced by the loaded module + * + * @param unknown_type $module_id + * @return unknown + */ + function main( $module_id = false ) + { + return false; + } + + /** + * go ahead and output the page + * + * @param unknown_type $page_title send page title + * @param unknown_type $tpl_name template file name + */ + function display( $page_title, $tpl_name ) + { + global $pafiledb_template, $pafiledb_functions; + + $pafiledb_functions->page_header( $page_title ); + $pafiledb_template->set_filenames( array( 'body' => $tpl_name ) ); + $pafiledb_functions->page_footer(); + } + } ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2007-08-10 18:35:55
|
Update of /cvsroot/mxbb/mx_simpledoc/simpledoc/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9063 Modified Files: functions_simpledoc.php Log Message: To avoid server cache system failure. Index: functions_simpledoc.php =================================================================== RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/includes/functions_simpledoc.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** functions_simpledoc.php 17 Sep 2006 20:15:56 -0000 1.6 --- functions_simpledoc.php 10 Aug 2007 18:35:52 -0000 1.7 *************** *** 15,59 **** // =================================================== - // public mx_simpledoc class - // =================================================== - class mx_simpledoc_public extends mx_simpledoc - { - var $modules = array(); - var $module_name = ''; - - // =================================================== - // load module - // $module name : send module name to load it - // =================================================== - function module( $module_name ) - { - if ( !class_exists( 'mx_simpledoc_' . $module_name ) ) - { - global $phpbb_root_path, $phpEx; - global $mx_root_path, $module_root_path, $is_block, $phpEx; - - $this->module_name = $module_name; - - require_once( $module_root_path . 'simpledoc/modules/simpledoc_' . $module_name . '.' . $phpEx ); - eval( '$this->modules[' . $module_name . '] = new mx_simpledoc_' . $module_name . '();' ); - - if ( method_exists( $this->modules[$module_name], 'init' ) ) - { - $this->modules[$module_name]->init(); - } - } - } - - // =================================================== - // this will be replaced by the loaded module - // =================================================== - function main( $module_id = false ) - { - return false; - } - - } - - // =================================================== // mx_simpledoc class // =================================================== --- 15,18 ---- *************** *** 497,499 **** --- 456,498 ---- } + // =================================================== + // public mx_simpledoc class + // =================================================== + class mx_simpledoc_public extends mx_simpledoc + { + var $modules = array(); + var $module_name = ''; + + // =================================================== + // load module + // $module name : send module name to load it + // =================================================== + function module( $module_name ) + { + if ( !class_exists( 'mx_simpledoc_' . $module_name ) ) + { + global $phpbb_root_path, $phpEx; + global $mx_root_path, $module_root_path, $is_block, $phpEx; + + $this->module_name = $module_name; + + require_once( $module_root_path . 'simpledoc/modules/simpledoc_' . $module_name . '.' . $phpEx ); + eval( '$this->modules[' . $module_name . '] = new mx_simpledoc_' . $module_name . '();' ); + + if ( method_exists( $this->modules[$module_name], 'init' ) ) + { + $this->modules[$module_name]->init(); + } + } + } + + // =================================================== + // this will be replaced by the loaded module + // =================================================== + function main( $module_id = false ) + { + return false; + } + + } ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2007-08-10 18:35:36
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9036 Modified Files: functions_linkdb.php Log Message: To avoid server cache system failure. Index: functions_linkdb.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_linkdb.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** functions_linkdb.php 22 Jul 2007 22:38:24 -0000 1.25 --- functions_linkdb.php 10 Aug 2007 18:35:32 -0000 1.26 *************** *** 15,76 **** /** - * Public linkdb class - * - */ - class linkdb_public extends linkdb - { - var $modules = array(); - var $module_name = ''; - - /** - * load module - * - * @param unknown_type $module_name send module name to load it - */ - function module( $module_name ) - { - if ( !class_exists( 'linkdb_' . $module_name ) ) - { - global $module_root_path, $phpEx; - - $this->module_name = $module_name; - - require_once( $module_root_path . 'linkdb/modules/link_' . $module_name . '.' . $phpEx ); - eval( '$this->modules[' . $module_name . '] = new linkdb_' . $module_name . '();' ); - - if ( method_exists( $this->modules[$module_name], 'init' ) ) - { - $this->modules[$module_name]->init(); - } - } - } - - /** - * this will be replaced by the loaded module - * - * @param unknown_type $module_id - * @return unknown - */ - function main( $module_id = false ) - { - return false; - } - - /** - * go ahead and output the page - * - * @param unknown_type $page_title send page title - * @param unknown_type $tpl_name template file name - */ - function display( $page_title1, $tpl_name ) - { - global $page_title, $linkdb_tpl_name; - - $page_title = $page_title1; - $linkdb_tpl_name = $tpl_name; - } - } - - /** * linkdb class * --- 15,18 ---- *************** *** 1688,1690 **** --- 1630,1690 ---- } } + + /** + * Public linkdb class + * + */ + class linkdb_public extends linkdb + { + var $modules = array(); + var $module_name = ''; + + /** + * load module + * + * @param unknown_type $module_name send module name to load it + */ + function module( $module_name ) + { + if ( !class_exists( 'linkdb_' . $module_name ) ) + { + global $module_root_path, $phpEx; + + $this->module_name = $module_name; + + require_once( $module_root_path . 'linkdb/modules/link_' . $module_name . '.' . $phpEx ); + eval( '$this->modules[' . $module_name . '] = new linkdb_' . $module_name . '();' ); + + if ( method_exists( $this->modules[$module_name], 'init' ) ) + { + $this->modules[$module_name]->init(); + } + } + } + + /** + * this will be replaced by the loaded module + * + * @param unknown_type $module_id + * @return unknown + */ + function main( $module_id = false ) + { + return false; + } + + /** + * go ahead and output the page + * + * @param unknown_type $page_title send page title + * @param unknown_type $tpl_name template file name + */ + function display( $page_title1, $tpl_name ) + { + global $page_title, $linkdb_tpl_name; + + $page_title = $page_title1; + $linkdb_tpl_name = $tpl_name; + } + } ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2007-08-10 18:35:15
|
Update of /cvsroot/mxbb/mx_kb/kb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8971 Modified Files: functions_kb.php Log Message: To avoid server cache system failure. Index: functions_kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** functions_kb.php 28 Apr 2007 19:59:05 -0000 1.20 --- functions_kb.php 10 Aug 2007 18:35:10 -0000 1.21 *************** *** 15,77 **** /** - * Public mx_kb class. - * - */ - class mx_kb_public extends mx_kb - { - var $modules = array(); - var $module_name = ''; - - /** - * load module - * - * @param unknown_type $module_name send module name to load it - */ - function module( $module_name ) - { - if ( !class_exists( 'mx_kb_' . $module_name ) ) - { - global $module_root_path, $phpEx; - - $this->module_name = $module_name; - - require_once( $module_root_path . 'kb/modules/kb_' . $module_name . '.' . $phpEx ); - eval( '$this->modules[' . $module_name . '] = new mx_kb_' . $module_name . '();' ); - - if ( method_exists( $this->modules[$module_name], 'init' ) ) - { - $this->modules[$module_name]->init(); - } - } - } - - /** - * this will be replaced by the loaded module. - * - * @param unknown_type $module_id - * @return unknown - */ - function main( $module_id = false ) - { - return false; - } - - /** - * go ahead and output the page - * - not used in mx_kb - * - * @param unknown_type $page_title send page title - * @param unknown_type $tpl_name template file name - */ - function display( $page_title1, $tpl_name ) - { - global $page_title, $kb_tpl_name; - - $page_title = $page_title1; - $kb_tpl_name = $tpl_name; - } - } - - /** * mx_kb class. * --- 15,18 ---- *************** *** 2095,2098 **** --- 2036,2098 ---- } + /** + * Public mx_kb class. + * + */ + class mx_kb_public extends mx_kb + { + var $modules = array(); + var $module_name = ''; + + /** + * load module + * + * @param unknown_type $module_name send module name to load it + */ + function module( $module_name ) + { + if ( !class_exists( 'mx_kb_' . $module_name ) ) + { + global $module_root_path, $phpEx; + + $this->module_name = $module_name; + + require_once( $module_root_path . 'kb/modules/kb_' . $module_name . '.' . $phpEx ); + eval( '$this->modules[' . $module_name . '] = new mx_kb_' . $module_name . '();' ); + + if ( method_exists( $this->modules[$module_name], 'init' ) ) + { + $this->modules[$module_name]->init(); + } + } + } + + /** + * this will be replaced by the loaded module. + * + * @param unknown_type $module_id + * @return unknown + */ + function main( $module_id = false ) + { + return false; + } + + /** + * go ahead and output the page + * - not used in mx_kb + * + * @param unknown_type $page_title send page title + * @param unknown_type $tpl_name template file name + */ + function display( $page_title1, $tpl_name ) + { + global $page_title, $kb_tpl_name; + + $page_title = $page_title1; + $kb_tpl_name = $tpl_name; + } + } + if ( !function_exists( 'html_entity_decode' ) ) { |
|
From: Jon O. <jon...@us...> - 2007-08-10 18:34:52
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8331 Modified Files: functions_bugsbt.php Log Message: To avoid server cache system failure. Index: functions_bugsbt.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/includes/functions_bugsbt.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** functions_bugsbt.php 6 Aug 2007 13:22:58 -0000 1.5 --- functions_bugsbt.php 10 Aug 2007 18:34:46 -0000 1.6 *************** *** 16,78 **** /** - * Public mx_kb class. - * - */ - class mx_bugsbt_public extends mx_bugsbt - { - var $modules = array(); - var $module_name = ''; - - /** - * load module - * - * @param unknown_type $module_name send module name to load it - */ - function module( $module_name ) - { - if ( !class_exists( 'mx_bugsbt_' . $module_name ) ) - { - global $module_root_path, $phpEx; - - $this->module_name = $module_name; - - require_once( $module_root_path . 'bugsbt/modules/bugsbt_' . $module_name . '.' . $phpEx ); - eval( '$this->modules[' . $module_name . '] = new mx_bugsbt_' . $module_name . '();' ); - - if ( method_exists( $this->modules[$module_name], 'init' ) ) - { - $this->modules[$module_name]->init(); - } - } - } - - /** - * this will be replaced by the loaded module. - * - * @param unknown_type $module_id - * @return unknown - */ - function main( $module_id = false ) - { - return false; - } - - /** - * go ahead and output the page - * - not used in mx_bugsbt - * - * @param unknown_type $page_title send page title - * @param unknown_type $tpl_name template file name - */ - function display( $page_title1, $tpl_name ) - { - global $page_title, $kb_tpl_name; - - $page_title = $page_title1; - $bugsbt_tpl_name = $tpl_name; - } - } - - /** * mx_kb class. * --- 16,19 ---- *************** *** 2022,2025 **** --- 1963,2025 ---- } + /** + * Public mx_kb class. + * + */ + class mx_bugsbt_public extends mx_bugsbt + { + var $modules = array(); + var $module_name = ''; + + /** + * load module + * + * @param unknown_type $module_name send module name to load it + */ + function module( $module_name ) + { + if ( !class_exists( 'mx_bugsbt_' . $module_name ) ) + { + global $module_root_path, $phpEx; + + $this->module_name = $module_name; + + require_once( $module_root_path . 'bugsbt/modules/bugsbt_' . $module_name . '.' . $phpEx ); + eval( '$this->modules[' . $module_name . '] = new mx_bugsbt_' . $module_name . '();' ); + + if ( method_exists( $this->modules[$module_name], 'init' ) ) + { + $this->modules[$module_name]->init(); + } + } + } + + /** + * this will be replaced by the loaded module. + * + * @param unknown_type $module_id + * @return unknown + */ + function main( $module_id = false ) + { + return false; + } + + /** + * go ahead and output the page + * - not used in mx_bugsbt + * + * @param unknown_type $page_title send page title + * @param unknown_type $tpl_name template file name + */ + function display( $page_title1, $tpl_name ) + { + global $page_title, $kb_tpl_name; + + $page_title = $page_title1; + $bugsbt_tpl_name = $tpl_name; + } + } + if ( !function_exists( 'html_entity_decode' ) ) { |
|
From: OryNider <ory...@us...> - 2007-08-09 13:21:07
|
Update of /cvsroot/mxbb/mx_smartor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15539 Added Files: hierarchy_db_migrate.php Log Message: I add this file just in case we will upgrade the personal gallery system, not to be released in the package. --- NEW FILE: hierarchy_db_migrate.php --- <?php /** * * @package mxBB Portal Module - mx_smartor * @version $Id: hierarchy_db_migrate.php,v 1.6 2007/08/09 13:21:03 orynider Exp $ * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ define( 'IN_PORTAL', true ); $album_root_path = '../modules/mx_smartor/album_mod/'; // Table names define( 'ALBUM_TABLE', $mx_table_prefix . 'smartor_album' ); define( 'ALBUM_CAT_TABLE', $mx_table_prefix . 'smartor_album_cat' ); define( 'ALBUM_CONFIG_TABLE', $mx_table_prefix . 'smartor_album_config' ); define( 'ALBUM_COMMENT_TABLE', $mx_table_prefix . 'smartor_album_comment' ); define( 'ALBUM_RATE_TABLE', $mx_table_prefix . 'smartor_album_rate' ); define( 'ALBUM_SP_CONFIG_TABLE', $mx_table_prefix . 'smartor_album_sp_config' ); if ( !$userdata['session_logged_in'] ) { die( 'no valid admin' ); } if ( $userdata['user_level'] != ADMIN ) { mx_message_die( GENERAL_MESSAGE, 'You are not authorised to access this page' ); } $page_title = 'Converting/Migrating the database for IdleVoid\'s Album Category Hierarchy Mod 1.2.0'; // include($phpbb_root_path . 'includes/page_header.'.$phpEx); echo '<table width="100%" cellspacing="1" cellpadding="2" border="0" class="forumline">'; echo '<th>This will convert/migrate all the personal galleries into the data model used in the Album Category Hierarchy 1.1.0 mod.</th>'; echo '<tr><td align="center"><table width="100%" cellspacing="1" cellpadding="2" border="0" class="forumline">'; echo '<tr><th>Updating the database</th></tr><tr><td><span class="genmed"><ul type="circle">'; $personal_gallery_info = array(); $sql = "SELECT DISTINCT p.pic_user_id, p.pic_username FROM " . ALBUM_TABLE . " AS p WHERE p.pic_cat_id = 0 ORDER BY pic_user_id"; if ( !$result = $db->sql_query( $sql ) ) { mx_message_die( GENERAL_ERROR, 'Could not query personal gallery information', '', __LINE__, __FILE__, $sql ); } if ( $db->sql_numrows( $result ) == 0 ) { // mx_message_die(GENERAL_ERROR, 'There aren\'t any \'old\' personal galleries. Script is ending.'); echo '<li><font color="#0000FF"><b>NOTICE:</b></font> There aren\'t any \'old\' personal galleries to migrate. Script is ending.</li><br />'; } else { while ( $row = $db->sql_fetchrow( $result ) ) { $personal_gallery_info[] = $row; } reset( $personal_gallery_info ); $sql = ""; for( $i = 0; $i < count( $personal_gallery_info ); $i++ ) { // check wheter the personal gallery root id already exists...it shouldn't tho'. $sql = "SELECT cat_id FROM " . ALBUM_CAT_TABLE . " WHERE cat_user_id = " . $personal_gallery_info[$i]['pic_user_id'] . " AND cat_parent = 0 LIMIT 1"; if ( !$result = $db->sql_query ( $sql ) ) { $error = $db->sql_error(); echo '<li>' . $sql . '<br /><font color="#FF0000"><b>ERROR:</b></font> ' . $error['message'] . '</li><br />'; // try the next personal gallery continue; } if ( $db->sql_numrows( $result ) == 0 ) { $root_cat_name = sprintf( $lang['Personal_Gallery_Of_User'], $personal_gallery_info[$i]['pic_username'] ); $sql = "INSERT INTO " . ALBUM_CAT_TABLE . " (cat_title, cat_desc, cat_order, cat_view_level, cat_upload_level, cat_rate_level, cat_comment_level, cat_edit_level, cat_delete_level, cat_approval, cat_parent, cat_user_id) VALUES ('" . $root_cat_name . "', '" . $root_cat_name . "', '0', '" . $album_config['personal_gallery_view'] . "', '" . ALBUM_PRIVATE . "', '0', '0', '" . ALBUM_PRIVATE . "', '" . ALBUM_PRIVATE . "', '0', '0', '" . $personal_gallery_info[$i]['pic_user_id'] . "')"; if ( !$result = $db->sql_query ( $sql ) ) { $error = $db->sql_error(); echo '<li>' . $sql . '<br /><font color="#FF0000"><b>ERROR:</b></font> ' . $error['message'] . '</li><br />'; echo ' Personal gallery was <b>NOT</b> created for user : \'' . $personal_gallery_info[$i]['pic_username'] . '\'<br />'; echo ' Please inform IdleVoid (the Author) about this, including the user name<br />'; // try the next personal gallery and by that skip the updating of this users personal gallery continue; } // get the newly created personal gallery root id. $sql = "SELECT cat_id FROM " . ALBUM_CAT_TABLE . " WHERE cat_user_id = " . $personal_gallery_info[$i]['pic_user_id'] . " AND cat_parent = 0 LIMIT 1"; if ( !$result = $db->sql_query ( $sql ) ) { $error = $db->sql_error(); echo '<li>' . $sql . '<br /><font color="#FF0000"><b>ERROR:</b></font> ' . $error['message'] . '</li><br />'; continue; } $row = $db->sql_fetchrow( $result ); $root_cat_id = $row['cat_id']; // move the pictures of this user into the $sql = "UPDATE " . ALBUM_TABLE . " SET pic_cat_id = $root_cat_id WHERE pic_cat_id = 0 AND pic_user_id = " . $personal_gallery_info[$i]['pic_user_id']; if ( !$result = $db->sql_query ( $sql ) ) { $error = $db->sql_error(); echo '<li>' . $sql . '<br /><font color="#FF0000"><b>ERROR:</b></font> ' . $error['message'] . '</li><br />'; } else { echo '<li>' . $sql . '<br /><font color="#00AA00"><b>SUCCESSFULL</b></font></li><br />'; } } } } echo '</ul></span></td></tr>'; echo '<tr><th>Finish</th></tr><tr><td><span class="genmed"><center><br />Installation is now finished.<br /></center></span></td></tr></table></td></tr></table>'; // include($phpbb_root_path . 'includes/page_tail.'.$phpEx); ?> |
|
From: OryNider <ory...@us...> - 2007-08-09 13:18:14
|
Update of /cvsroot/mxbb/mx_smartor/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12345 Modified Files: lang_admin.php Added Files: lang_main.php Removed Files: lang_admin_album.php lang_main_album.php Log Message: This will make use of: $mx_user->extend(MX_LANG_MAIN, MX_IMAGES); and: $mode = $mx_request_vars->request('smartor_mode', MX_TYPE_NO_TAGS, 'album_index'); --- lang_main_album.php DELETED --- --- lang_admin_album.php DELETED --- --- NEW FILE: lang_main.php --- <?php /** * * @package mxBB Portal Module - mx_smartor * @version $Id: lang_main.php,v 1.7 2007/08/09 13:18:03 orynider Exp $ * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ // // The format of this file is: // // ---> $lang["message"] = "text"; // // Specify your language character encoding... [optional] // // setlocale(LC_ALL, "en"); // // Album Index // $lang['Photo_Album'] = 'Photo Album'; $lang['Pics'] = 'Pics'; $lang['Last_Pic'] = 'Last Pic'; $lang['Public_Categories'] = 'Public Categories'; $lang['No_Pics'] = 'No Pics'; $lang['Users_Personal_Galleries'] = 'Users Personal Galleries'; $lang['Your_Personal_Gallery'] = 'Your Personal Gallery'; $lang['Recent_Public_Pics'] = 'Recent Public Pics'; $lang['Toprated_Public_Pics'] = 'Highest Rated Pictures'; $lang['Random_Public_Pics'] = 'Random Pictures'; $lang['Most_Public_Pics'] = 'Most Viewed Pictures'; $lang['View'] = 'View'; // Category View $lang['Category_not_exist'] = 'This category does not exist'; $lang['Upload_Pic'] = 'Upload Pic'; $lang['JUpload_Pic'] = 'Upload Multiple Pictures with Jupload'; $lang['Upload_Pics'] = 'Upload Pics'; $lang['Pic_Title'] = 'Pic Title'; $lang['View'] = 'View'; $lang['Pic_Poster'] = 'Poster'; $lang['Pic_Image'] = 'Image'; $lang['Album_upload_can'] = 'You <b>can</b> upload new pics in this category'; $lang['Album_upload_cannot'] = 'You <b>cannot</b> upload new pics in this category'; $lang['Album_rate_can'] = 'You <b>can</b> rate pics in this category'; $lang['Album_rate_cannot'] = 'You <b>cannot</b> rate pics in this category'; $lang['Album_comment_can'] = 'You <b>can</b> post comments to pics in this category'; $lang['Album_comment_cannot'] = 'You <b>cannot</b> post comments to pics in this category'; $lang['Album_edit_can'] = 'You <b>can</b> edit your pics and comments in this category'; $lang['Album_edit_cannot'] = 'You <b>cannot</b> edit your pics and comments in this category'; $lang['Album_delete_can'] = 'You <b>can</b> delete your pics and comments in this category'; $lang['Album_delete_cannot'] = 'You <b>cannot</b> delete your pics and comments in this category'; $lang['Album_moderate_can'] = 'You <b>can</b> %smoderate%s this category'; $lang['Edit_pic'] = 'Edit'; $lang['Delete_pic'] = 'Delete'; $lang['Rating'] = 'Rating'; $lang['Comments'] = 'Comments'; $lang['New_Comment'] = 'New Comment'; $lang['Not_rated'] = '<i>not rated</i>'; $lang['Select_initial'] = 'Select:'; // // Upload // $lang['Pic_Desc'] = 'Pic Description'; $lang['Plain_text_only'] = 'Plain text only'; $lang['Max_length'] = 'Max length (bytes)'; $lang['Upload_pic_from_machine'] = 'Upload a pic from your machine'; $lang['Upload_to_Category'] = 'Upload to Category'; $lang['Upload_thumbnail_from_machine'] = 'Upload its thumbnail from your machine (must be the same type with your pic)'; $lang['Upload_thumbnail'] = 'Upload a thumbnail image'; $lang['Upload_thumbnail_explain'] = 'It must be of the same file type as your picture'; $lang['Thumbnail_size'] = 'Thumbnail size (pixel)'; $lang['Filetype_and_thumbtype_do_not_match'] = 'Your pic and your thumbnail must be the same type'; $lang['Add_File'] = 'Add File'; $lang['Upload_no_title'] = 'You must enter a title for your pic'; $lang['Upload_no_file'] = 'You must enter your path and your filename'; $lang['Desc_too_long'] = 'Your description is too long'; $lang['Rotation'] = 'Rotate (Anti-Clockwise) - Degrees'; $lang['Max_file_size'] = 'Maximum file size (bytes)'; $lang['Max_width'] = 'Maximum image width before recompression (pixel)'; $lang['Max_height'] = 'Maximum image height before recompression (pixel)'; $lang['JPG_allowed'] = 'Allowed to upload JPG files'; $lang['PNG_allowed'] = 'Allowed to upload PNG files'; $lang['GIF_allowed'] = 'Allowed to upload GIF files'; $lang['Album_reached_quota'] = 'This category has reached the quota of pics. Now you cannot upload any more. Please contact the administrators for more information'; $lang['User_reached_pics_quota'] = 'You have reached your quota of pics. Now you cannot upload any more. Please contact the administrators for more information'; $lang['Bad_upload_file_size'] = 'Your uploaded file is too large or corrupted'; $lang['Not_allowed_file_type'] = 'Your file type is not allowed'; $lang['Upload_image_size_too_big'] = 'Your image dimension size is too large'; $lang['Upload_thumbnail_size_too_big'] = 'Your thumbnail dimension size is too large'; $lang['Missed_pic_title'] = 'You must enter your pic title'; $lang['Album_upload_successful'] = 'Your pic has been uploaded successfully'; $lang['Album_upload_need_approval'] = 'Your pic has been uploaded successfully.<br /><br />But the feature Pic Approval has been enabled so your pic must be approved by a administrator or a moderator before posting'; $lang['Click_return_category'] = 'Click %shere%s to return to the category'; $lang['Click_return_album_index'] = 'Click %shere%s to return to the Album Index'; // View Pic $lang['Pic_ID'] = 'ID'; $lang['Pic_Details'] = 'Image Details'; $lang['Pic_Size'] = 'Size'; $lang['Pic_Type'] = 'Image Type'; $lang['Pic_BBCode'] = 'BBCode'; $lang['Pic_not_exist'] = 'This pic does not exist'; $lang['Click_enlarge'] = 'Click on image to view larger image'; $lang['Prev_Pic'] = 'View Previous Picture'; $lang['Next_Pic'] = 'View Next Picture'; $lang['Slideshow'] = 'Slide Show'; $lang['Slideshow_Delay'] = 'Slide Show Delay'; $lang['Slideshow_On'] = 'Slide Show'; $lang['Slideshow_Off'] = 'Stop Slide Show'; $lang['Pics_Nav'] = 'Pictures Navigation'; $lang['Pics_Nav_Next'] = 'Next Pictures'; $lang['Pics_Nav_Prev'] = 'Previous Pictures'; // Edit Pic $lang['Edit_Pic_Info'] = 'Edit Pic Information'; $lang['Pics_updated_successfully'] = 'Your pic information has been updated successfully'; // Delete Pic $lang['Album_delete_confirm'] = 'Are you sure to delete these pic(s)?'; $lang['Pics_deleted_successfully'] = 'These pic(s) have been deleted successfully'; // // ModCP // $lang['Approval'] = 'Approval'; $lang['Approve'] = 'Approve'; $lang['Unapprove'] = 'Unapprove'; $lang['Status'] = 'Status'; $lang['Locked'] = 'Locked'; $lang['Not_approved'] = 'Not approved'; $lang['Approved'] = 'Approved'; $lang['Move_to_Category'] = 'Move to Category'; $lang['Pics_moved_successfully'] = 'Your pic(s) have been moved successfully'; $lang['Pics_locked_successfully'] = 'Your pic(s) have been locked successfully'; $lang['Pics_unlocked_successfully'] = 'Your pic(s) have been unlocked successfully'; $lang['Pics_approved_successfully'] = 'Your pic(s) have been approved successfully'; $lang['Pics_unapproved_successfully'] = 'Your pic(s) have been unapproved successfully'; // // Rate // $lang['Current_Rating'] = 'Current Rating'; $lang['Please_Rate_It'] = 'Please Rate It'; $lang['Already_rated'] = 'You have already rated this pic'; $lang['Album_rate_successfully'] = 'Your pic has been rated successfully'; // // Comment // $lang['Comment_no_text'] = 'Please enter your comment'; $lang['Comment_too_long'] = 'Your comment is too long'; $lang['Comment_delete_confirm'] = 'Are you sure to delete this comment?'; $lang['Pic_Locked'] = 'Sorry, this pic was locked. So you cannot post comment for this pic anymore'; // // Personal Gallery // $lang['Personal_Gallery_Explain'] = 'You can view the personal galleries of other members by clicking on the link in their profiles'; $lang['Personal_gallery_not_created'] = 'The personal gallery of %s is empty or has not been created'; $lang['Not_allowed_to_create_personal_gallery'] = 'Sorry, the administrators of this board donot allowed you to create your personal gallery'; $lang['Click_return_personal_gallery'] = 'Click %shere%s to return to the personal gallery'; // added $lang['Album'] = 'Album Index'; $lang['Personal_Gallery_Of_User'] = 'Personal Gallery of %s'; $lang['Post_your_comment'] = 'Post your comment'; $lang['Not_Authorised'] = 'You are not authorized for this page, or you are not logged in as required.'; $lang['Nav_Separator'] = ' » '; $lang['Rss_Feed'] = 'RSS Feed'; $lang['Album_Search'] = 'Searching the Album'; $lang['Pic_Name'] = 'Picture Name'; $lang['Description'] = 'Description'; $lang['Search_Contents'] = ' that contains: '; $lang['Search_Found'] = 'Search found '; $lang['Search_Matches'] = 'Matches:'; // The picture list of a member (album_memberlist.php) $lang['Pic_Cat'] = 'Category'; $lang['Picture_List_Of_User'] = 'All Pictures by %s'; $lang['Member_Picture_List_Explain'] = 'You can view the complete list of picture contributed by other members by clicking on the link in their profiles'; $lang['Comment_List_Of_User'] = 'All Comments by %s'; $lang['Rating_List_Of_User'] = 'All Ratings by %s'; $lang['Show_All_Pictures_Of_user'] = 'Show All Pictures by %s'; $lang['Show_All_Comments_Of_user'] = 'Show All Comments by %s'; $lang['Show_All_Ratings_Of_user'] = 'Show All Ratings by %s'; // Album Nuffload $lang['time_elapsed'] = 'Time Elapsed'; $lang['time_remaining'] = 'Time Remaining'; $lang['upload_in_progress'] = 'Upload In Progress'; $lang['please_wait'] = 'Please Wait...'; $lang['uploaded'] = 'Uploaded %multi_id% of %multi_max% images.'; $lang['no_file_received'] = 'No image file received'; $lang['no_thumbnail_file_received'] = 'No thumbnail file received'; $lang['file_too_big'] = 'Image file size too big'; $lang['thumbnail_too_big'] = 'Thumbnail file size too big'; $lang['image_res_too_high'] = 'Image resolution too high'; $lang['add_field'] = 'Add file upload field'; $lang['remove_field'] = 'Remove file upload field'; $lang['ZIP_allowed'] = 'Allowed to upload ZIP files'; // Album Hierarchy Index Table $lang['Last_Comment'] = 'Last Comment'; $lang['Last_Comments'] = 'Last Comments'; $lang['No_Comment_Info'] = 'No Comments'; $lang['No_Pictures_In_Cat']= 'No Pictures In Category'; $lang['Total_Pics'] = 'Total Pics'; $lang['Total_Comments'] = 'Total Comments'; $lang['Last_Index_Thumbnail'] = 'Last Pic'; $lang['One_Sub_Total_Pics'] = '%d Pic'; $lang['Multiple_Sub_Total_Pics'] = '%d Pics'; $lang['Album_sub_categories'] = 'Sub Categories'; $lang['No_Public_Galleries'] = 'No Public Galleries'; $lang['One_new_picture'] = '%d new picture'; $lang['Multiple_new_pictures'] = '%d new pictures'; // The pictures list $lang['All_Picture_List_Of_User'] = 'All Pictures'; $lang['All_Comment_List_Of_User'] = 'All Comments'; $lang['All_Rating_List_Of_User'] = 'All Ratings'; $lang['All_Show_All_Pictures_Of_user'] = 'Show All Pictures'; $lang['All_Show_All_Comments_Of_user'] = 'Show All Comments'; $lang['All_Show_All_Ratings_Of_user'] = 'Show All Ratings'; $lang['Not_commented'] = '<i>Not Commented</i>'; // Nuff's Stuff $lang['Nuff_Click'] = 'Click here to apply Special Effects'; $lang['Nuff_UnClick'] = 'Click here for normal visualization'; $lang['Nuff_Title'] = 'Special Effects'; $lang['Nuff_Explain'] ='Using this page you can apply multiple effects to the pictures.<br />Remember that this is a <i><b>very heavy operation on server CPU load</b></i>, so please do not abuse it. Some effects will automatically resize the output image so to not charge too much server CPU.'; $lang['Nuff_Normal'] = 'Normal Image'; $lang['Nuff_Normal_Explain'] = 'No effects applied'; $lang['Nuff_BW'] = 'Black & White'; $lang['Nuff_BW_Explain'] = 'This effect will transform the image into Black and White'; $lang['Nuff_Sepia'] = 'Sepia Tone'; $lang['Nuff_Sepia_Explain'] = 'This effect will apply sepia toning to the picture'; $lang['Nuff_Flip'] = 'Flip'; $lang['Nuff_Flip_Explain'] = 'Using this function you can flip the image'; $lang['Nuff_Mirror'] = 'Mirror'; $lang['Nuff_Mirror_Explain'] = 'Using this function you can mirror the image'; $lang['Nuff_Flip_H'] = 'Horizontal'; $lang['Nuff_Flip_V'] = 'Vertical'; $lang['Nuff_Rotate'] = 'Picture Rotation (Anti Clockwise)'; $lang['Nuff_Rotate_Explain'] = 'Rotates the images anti clockwise'; $lang['Nuff_Resize'] = 'Resize'; $lang['Nuff_Resize_Explain'] = 'This function is for image resizing'; $lang['Nuff_Resize_W'] = 'Width'; $lang['Nuff_Resize_H'] = 'Height'; $lang['Nuff_Resize_No_Resize'] = 'No Resize'; $lang['Nuff_Watermark'] = 'Watermark'; $lang['Nuff_Watermark_Explain'] = 'Apply a watermark to the image'; $lang['Nuff_Recompress'] = 'Recompress'; $lang['Nuff_Recompress_Explain'] = 'This function can recompress the image'; $lang['Nuff_Alpha'] = 'Alpha'; $lang['Nuff_Alpha_Explain'] = 'This effect will overlay an alpha channel to the image'; $lang['Nuff_Blur'] = 'Blur'; $lang['Nuff_Blur_Explain'] = 'This effect will apply a blur filter to the image'; $lang['Nuff_Pixelate'] = 'Pixelate'; $lang['Nuff_Pixelate_Explain'] = 'This effect will apply a pixelate filter to the image'; $lang['Nuff_Scatter'] = 'Scatter'; $lang['Nuff_Scatter_Explain'] = 'This effect will apply a scatter filter to the image'; $lang['Nuff_Infrared'] = 'Infrared'; $lang['Nuff_Infrared_Explain'] = 'This effect will apply an infrared filter to the image'; $lang['Nuff_Tint'] = 'Tint'; $lang['Nuff_Tint_Explain'] = 'This effect will apply a red tint to the image'; $lang['Nuff_Interlace'] = 'Interlace (Horizontal Lines)'; $lang['Nuff_Interlace_Explain'] = 'This effect will overlay an interlace channel to the image'; $lang['Nuff_Screen'] = 'Screen (Hor Ver Lines)'; $lang['Nuff_Screen_Explain'] = 'This effect will overlay a screen channel to the image'; $lang['Nuff_Stereogram'] = 'Stereogram'; $lang['Nuff_Stereogram_Explain'] = 'This effect will convert the image to a stereogram (BW 16 bit required)'; $lang['Pic_Gallery'] = 'OTF Gallery'; $lang['Album_otf'] = 'OTF Gallery'; $lang['Select_Pic'] = 'Select Pic'; $lang['Select_Category'] = 'Select Category'; // Personal Album Hierarchy Index Table $lang['Personal_Categories'] = 'Personal Gallery'; $lang['Create_Personal_Categories'] = 'Create Personal Gallery'; $lang['Personal_Cat_Admin'] = 'Personal Gallery Category Admin'; $lang['Recent_Personal_Pics'] = 'Recent Pictures From the Personal Gallery of %s'; // Access language strings $lang['Album_Can_Manage_Categories'] = 'You <b>can</b> %smanage%s the categories in the gallery'; $lang['No_Personal_Category_admin'] = 'You are not allowed to manage your personal gallery categories'; // // Welcome // $lang['Welcome'] = "Welcome"; $lang['Welcome_User'] = "Welcome, %s !"; $lang['Search_at'] = "Search at"; $lang['Advanced_search'] = "Advanced Search"; $lang['Search_unread'] = "View unread posts"; $lang['Search_self_topics'] = "Topics you've started"; $lang['Search_self_posts'] = "View all your posts"; $lang['Posts_since_last_visit'] = "Posts since last visit"; $lang['View_latest'] = "View latest"; $lang['Total_Personal_Pics'] = "You have <b>%d</b> personal pictures."; // // That's all Folks! // ------------------------------------------------- ?> Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/language/lang_english/lang_admin.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lang_admin.php 13 Jun 2007 18:46:44 -0000 1.6 --- lang_admin.php 9 Aug 2007 13:18:02 -0000 1.7 *************** *** 4,13 **** * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ - // // The format of this file is: --- 4,12 ---- * @package mxBB Portal Module - mx_smartor * @version $Id$ ! * @copyright (c) 2003 [sma...@ho..., Smartor] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ // // The format of this file is: *************** *** 19,22 **** --- 18,210 ---- // setlocale(LC_ALL, "en"); + // + // Configuration + // + $lang['Album_config'] = 'Album Configuration'; + $lang['Album_config_explain'] = 'You can change the general settings of your Photo Album here'; + $lang['Album_config_updated'] = 'Album Configuration has been updated successfully'; + $lang['Click_return_album_config'] = 'Click %sHere%s to return to the Album Configuration'; + $lang['Max_pics'] = 'Maximum pics for each Category (-1 = unlimited)'; + $lang['User_pics_limit'] = 'Pics limit per category for each user (-1 = unlimited)'; + $lang['Moderator_pics_limit'] = 'Pics limit per category for each moderator (-1 = unlimited)'; + $lang['Pics_Approval'] = 'Pics Approval'; + $lang['Rows_per_page'] = 'Number of rows on thumbnail page'; + $lang['Cols_per_page'] = 'Number of columns on thumbnail page'; + $lang['Thumbnail_quality'] = 'Thumbnail quality (1-100)'; + $lang['Thumbnail_cache'] = 'Thumbnail cache'; + $lang['Manual_thumbnail'] = 'Manual thumbnail'; + $lang['GD_version'] = 'Optimize for the version of GD'; + $lang['Pic_Desc_Max_Length'] = 'Pic Description/Comment Max Length (bytes)'; + $lang['Hotlink_prevent'] = 'Hotlink Prevention'; + $lang['Hotlink_allowed'] = 'Allowed domains for hotlink (separated by a comma)'; + $lang['Personal_gallery'] = 'Allowed to create personal gallery for users'; + $lang['Personal_gallery_limit'] = 'Pics limit for each personal gallery (-1 = unlimited)'; + $lang['Personal_gallery_view'] = 'Who can view personal galleries'; + $lang['Rate_system'] = 'Enable rate system'; + $lang['Rate_Scale'] =' Rating Scale'; + $lang['Comment_system'] = 'Enable comment system'; + $lang['Thumbnail_Settings'] = 'Thumbnail Settings'; + $lang['Extra_Settings'] = 'Extra Settings'; + $lang['Default_Sort_Method'] = 'Default Sort Method'; + $lang['Default_Sort_Order'] = 'Default Sort Order'; + $lang['Fullpic_Popup'] = 'View full pic as a popup'; + $lang['Show_Download'] = 'Show DOWNLOAD button (which enables the downloading of pictures in ZIP format) only to those who have UPLOAD permissions in the Album (if you choose ALWAYS the button will be always available even if the users has no UPLOAD permissions)'; + $lang['Show_Slideshow'] = 'Enable Slideshow feature'; + $lang['Show_Slideshow_Script'] = 'Enable transition effects for Slideshow'; + $lang['Show_Pic_Size'] = 'Show the pic size on thumbnail'; + $lang['Show_IMG_No_GD'] = 'Show GIF thumbnails without using GD libraries (full images are loaded and then just shown resized).'; + $lang['Show_GIF_MidThumb'] = 'Show full GIF images if Mid Thumb is enabled.'; + $lang['Show_Pics_Nav'] = 'Show Picture Navigation Box in Show Page'; + $lang['Invert_Nav_Arrows'] = 'Invert the Arrows link in Showpage (right arrow = more recent)'; + $lang['Show_Inline_Copyright'] = 'Show Copyrights Info on a single line'; + $lang['Enable_Nuffimage'] = 'Enable Pictures Special Effects page based on Nuffmon Images Class'; + $lang['Enable_Sepia_BW'] = 'Enable Sepia and B&W in Special Effects page (disable this function if you want no to load server\'s CPU)'; + $lang['Show_EXIF_Info'] = 'Show picture EXIF informations'; + $lang['Enable_BBCode'] = 'Enable BBCode'; + $lang['Set_Memory'] = 'Set a memory limit via PHP (MB)'; + $lang['Set_Memory_Explain'] = 'This feature may be used to increase memory limit in PHP (this setting must be allowed by your hosting): you can try to increase memory when your images are not loaded correctly. To avoid higher memory limits the max value is forced to be 16MB.'; + $lang['LB_Preview'] = 'Enable LightBox Preview'; + $lang['LB_Preview_Explain'] = 'This feature will show a LightBox with picture preview when moving the mouse over a thumbnail.'; + $lang['Album_config_notice'] = 'If you change the current Photo Album settings and then select another tab, you will be prompted to save your changes.<br />The system will <b>not save</b> the changes for you automatically.'; + $lang['Save_sucessfully_confimation'] = '%s was saved successfully'; + $lang['Show_Recent_In_Subcats'] = 'Show recent pictures in sub categories'; + $lang['Show_Recent_Instead_of_NoPics'] = 'Show recent pictures instead of no picture message'; + $lang['Show_Last_Comments'] = 'Display last comments block on album index and categories'; + $lang['Album_Index_Settings'] = 'Album Index'; + $lang['Show_Index_Subcats'] = 'Show sub categories in index table'; + $lang['Show_Index_Thumb'] = 'Show category thumbnails in index table'; + $lang['Show_Index_Pics'] = 'Show the number of pictures in current category in index table'; + $lang['Show_Index_Comments'] = 'Show the number of comments in current category in index table'; + $lang['Show_Index_Total_Pics'] = 'Show the number of total pictures for current categories and all it\'s sub categories in index table'; + $lang['Show_Index_Total_Comments'] = 'Show the number of total comments for current categories and all it\'s sub categories in index table'; + $lang['Show_Index_Last_Comment'] = 'Show last comments for current categories and all it\'s sub categories in index table'; + $lang['Show_Index_Last_Pic'] = 'Show last picture info for current categories and all it\'s sub categories in index table'; + $lang['Line_Break_Subcats'] = 'Show each sub cat on a new line'; + $lang['Show_Personal_Gallery_Link'] = 'Show Personal Gallery and Users Personal Gallery link in Sub Categories'; + $lang['Album_Personal_Auth_Explain'] = 'Here you can choose which usergroup(s) can be the moderators for <b>all</b> personal album categories or just has the private access to them'; + $lang['Album_debug_mode'] = 'Enable the hierarchy debug mode.<br /><span class="gensmall">This will generate a lot of extra output on the page and also some header warnings, which are all ok.<br />This option should <b>only</b> be used when having problems.</span>'; + $lang['New_Pic_Check_Interval'] = 'The time to use to see if a picture is new or not.<br /><span class="gensmall"><b>Format</b> : <number><type> Where type is either h, d, w or m (hour, day, week or month)<br /> e.g. 12H = 12 hours and 12D = 12 days and 12W = 12 weeks and 12M = 12 months<br />If no type is specified the system will use <b>days</b></span>'; + $lang['New_Pic_Check_Interval_Desc'] = '<span class="gensmall">H = HOURS, D = DAYS, W = WEEKS, M = MONTHS</span>'; + $lang['New_Pic_Check_Interval_LV'] = 'Enabling this option the new pics counter is based on users last visit time.'; + $lang['Enable_Show_All_Pics'] = 'Enable toggling of personal gallery view mode (all pictures or only selected category).<br /> When set to <b>no</b>, only selected category is shown.'; + $lang['Enable_Index_Supercells'] = 'Enable super cells in the index table. <br /><span class="gensmall">This will enable the mouseover effects on the columns, also knows as the supercell effect.</span>'; + $lang['Show_OTF_Link'] = 'Show "Album OTF" link on Album Index'; + $lang['Show_AllPics_Link'] = 'Show "All Pics" link on Album Index'; + $lang['Show_PG_Link'] = 'Show "Personal Galleries" link on Album Index'; + + + // Personal Gallery Page + $lang['Personal_Galleries'] = 'Personal Galleries'; + $lang['Album_personal_gallery_title'] = 'Personal Gallery'; + $lang['Album_personal_gallery_explain'] = 'On this page, you can choose which usergroups have right to create and view personal galleries. These settings only affect when you set "PRIVATE" for "Allowed to create personal gallery for users" or "Who can view personal galleries" in Album Configuration screen'; + $lang['Album_personal_successfully'] = 'The setting has been updated successfully'; + $lang['Click_return_album_personal'] = 'Click %sHere%s to return to the Personal Gallery Settings'; + $lang['Allow_Album_Avatars'] = 'Allow users to use own posted images in Album as Avatar'; + + + // Personal Gallery FAP + $lang['Album_Personal_Settings'] = 'Personal Galleries'; + $lang['Album_Personal_Settings_Explain'] = 'You can change the settings of your Personal Galleries here'; + $lang['Show_Personal_Sub_Cats'] = 'Show personal sub categories in index table'; + $lang['Personal_Gallery_Approval'] = 'Personal gallery pics approval'; + $lang['Personal_Gallery_MOD'] = 'Personal gallery can be moderated by owner'; + $lang['Personal_Sub_Cat_Limit'] = 'Maximum number of sub categories (-1 = unlimited)'; + $lang['User_Can_Create_Personal_SubCats'] = 'Users can create sub categories in own personal gallery'; + $lang['Click_return_personal_gallery_index'] = 'Click %shere%s to return to the personal gallery index'; + $lang['Show_Recent_In_Personal_Subcats'] = 'Show recent pictures in personal sub categories'; + $lang['Show_Recent_Instead_of_Personal_NoPics'] = 'Show recent pictures instead of no picture message in personal gallery'; + + // + // Categories + // + $lang['Album_Categories_Title'] = 'Album Categories Control'; + $lang['Album_Categories_Explain'] = 'On this screen you can manage your categories: create, alter, delete, sort, etc.'; + $lang['Category_Permissions'] = 'Category Permissions'; + $lang['Category_Title'] = 'Category Title'; + $lang['Category_Desc'] = 'Category Description'; + $lang['View_level'] = 'View Level'; + $lang['Upload_level'] = 'Upload Level'; + $lang['Rate_level'] = 'Rate Level'; + $lang['Comment_level'] = 'Comment Level'; + $lang['Edit_level'] = ' Edit Level'; + $lang['Delete_level'] = 'Delete Level'; + $lang['New_category_created'] = 'New category has been created successfully'; + $lang['Click_return_album_category'] = 'Click %sHere%s to return to the Album Categories Manager'; + $lang['Category_updated'] = 'This category has been updated successfully'; + $lang['Delete_Category'] = 'Delete Category'; + $lang['Delete_Category_Explain'] = 'The form below will allow you to delete a category and decide where you want to put pics it contained'; + $lang['Delete_all_pics'] = 'Delete all pics'; + $lang['Category_deleted'] = 'This category has been deleted successfully'; + $lang['Category_changed_order'] = 'This category has been changed order successfully'; + $lang['Watermark'] = 'WaterMark'; + $lang['Watermark_explain'] = 'You can specify the watermark file to be used in this category. Insert the watermark file path respect to your phpBB root (i.e.: <b>modules/mx_smartor/album_mod/mark_fap.png</b>). The watermark will be applied only if Watermark feature is on.'; + $lang['Personal_Root_Gallery'] = 'Personal Gallery Root Category'; + $lang['Parent_Category'] = 'Parent Category (for this category)'; + $lang['Child_Category_Moved'] = 'Selected category had child categories. The child categories got moved to the <B>%s</B> category.'; + $lang['No_Self_Refering_Cat'] = 'You cannot set a category\'s parent to itself'; + $lang['Can_Not_Change_Main_Parent'] = 'You cannot change to parent of the main category of your personal gallery'; + + // + // Permissions + // + $lang['Album_Auth_Title'] = 'Album Permissions'; + $lang['Album_Auth_Explain'] = 'Here you can choose which usergroup(s) can be the moderators for each album category or just has the private access'; + $lang['Select_a_Category'] = 'Select a Category'; + $lang['Look_up_Category'] = 'Look up Category'; + $lang['Album_Auth_successfully'] = 'Auth has been updated successfully'; + $lang['Click_return_album_auth'] = 'Click %sHere%s to return to the Album Permissions'; + + $lang['Upload'] = 'Upload'; + $lang['Rate'] = 'Rate'; + $lang['Comment'] = 'Comment'; + + // + // Clear Cache + // + $lang['Clear_Cache'] = 'Clear Cache'; + $lang['Album_clear_cache_confirm'] = 'If you use the Thumbnail Cache feature you must clear your thumbnail cache after changing your thumbnail settings in Album Configuration to make them re-generated.<br /><br /> Do you want to clear them now?'; + $lang['Thumbnail_cache_cleared_successfully'] = '<br />Your thumbnail cache has been cleared successfully<br /> '; + + // CLowN + $lang['SP_Album_config'] = 'ADV CLowN SP Configuration'; + $lang['SP_Album_config_explain'] = 'Here you can configure some options for the Album Service Pack'; + $lang['SP_Album_sp_general'] = 'General Config'; + $lang['SP_Album_sp_watermark'] = 'WaterMark Config'; + $lang['SP_Album_sp_hotornot'] = 'Hot or Not Config'; + $lang['SP_Rate_type'] = 'Select how do you want picture rating to be displayed'; + $lang['SP_Rate_type_0'] = 'Images only'; + $lang['SP_Rate_type_1'] = 'Numbers only'; + $lang['SP_Rate_type_2'] = 'Numbers and Images'; + $lang['SP_Display_latest'] = 'Display latest submited pictures block'; + $lang['SP_Display_highest'] = 'Display highest rated pictures block'; + $lang['SP_Display_most_viewed'] = 'Display most viewed pictures block'; + $lang['SP_Display_random'] = 'Display random pictures block'; + $lang['SP_Pic_row'] = 'Number of rows on thumbnail blocks'; + $lang['SP_Pic_col'] = 'Number of columns on thumbnail blocks'; + $lang['SP_Midthumb_use'] = 'Use mid-thumbnail'; + $lang['SP_Midthumb_cache'] = 'Enable caching of mid-thumbnail'; + $lang['SP_Midthumb_high'] = 'Height of mid-thumbnail (pixel)'; + $lang['SP_Midthumb_width'] = 'Width of mid-thumbnail (pixel)'; + $lang['SP_Watermark'] = 'Use WaterMark'; + $lang['SP_Watermark_users'] = 'Show WaterMark for all users, if \'No\' only display to unregistered users'; + $lang['SP_Watermark_placent'] = 'WaterMark position on the picture'; + $lang['SP_Hon_already_rated'] = 'Unlimited rating on Hot or Not page'; + $lang['SP_Hon_sep_rating'] = 'Store Hot or Not rating in a separate table'; + $lang['SP_Hon_where'] = 'Display pictures on hot or not from what categories? (leave blank to use pictures from all of the categories, if more then one category, separate by commas)'; + $lang['SP_Hon_users'] = 'Can unregistered users rate'; + $lang['SP_jaime_lettering'] = 'Show alphabetic navigation index within a category (Jaime Lettering)'; + $lang['SP_Always'] = 'Always'; + + // Multiple Uploads Admin configuration + $lang['Upload_Settings'] = 'Upload'; + $lang['Max_Files_To_Upload'] = 'Maximum number of files user can upload at a time'; + $lang['Album_upload_settings'] = 'Album Upload Settings'; + $lang['Max_pregenerated_fields'] = 'Maximum number of fields to pre-generate'; + $lang['Dynamic_field_generation'] = 'Enable dynamic adding of upload fields'; + $lang['Pre_generate_fields'] = 'Pre generate the upload fields'; + $lang['Propercase_pic_title'] = 'Propercase picture title e.g. <i>\'This Is A Picture Title\'</i><br />Setting it to \'NO\' will result in this <i>\'This is a picture title\'</i>'; + $lang['Pic_Resampling'] = 'Enabling this option, each image will be resized on the fly if needed (to keep image properties respecting the album settings in ACP).'; + $lang['Max_file_size_resampling'] = 'Maximum file size before resampling (bytes)'; + $lang['display_most_posts'] = "Display most posts"; $lang['display_random_posts'] = "Display random posts"; *************** *** 69,72 **** // That's all Folks! // ------------------------------------------------- - ?> \ No newline at end of file --- 257,259 ---- |
Update of /cvsroot/mxbb/mx_smartor/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11014/includes Modified Files: album_allpics.php album_cat.php album_cat_sort.php album_memberlist.php album_otf.php album_otf_thumbnail.php album_personal.php album_personal_cat_admin.php album_personal_random.php album_picm.php album_rdf.php album_rss.php album_search.php album_showpage.php album_thumbnail.php Log Message: This will make use of: $mx_user->extend(MX_LANG_MAIN, MX_IMAGES); and: $mode = $mx_request_vars->request('smartor_mode', MX_TYPE_NO_TAGS, 'album_index'); Index: album_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_personal.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** album_personal.php 7 Jun 2007 20:13:29 -0000 1.7 --- album_personal.php 9 Aug 2007 13:16:57 -0000 1.8 *************** *** 387,391 **** $template->assign_vars(array( 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=". PERSONAL_GALLERY)), ! 'UPLOAD_PIC_IMG' => $mx_images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], --- 387,391 ---- $template->assign_vars(array( 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=". PERSONAL_GALLERY)), ! 'UPLOAD_PIC_IMG' => $images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], Index: album_cat_sort.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_cat_sort.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** album_cat_sort.php 7 Jun 2007 20:13:27 -0000 1.9 --- album_cat_sort.php 9 Aug 2007 13:16:55 -0000 1.10 *************** *** 601,605 **** 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=$cat_id")), ! 'UPLOAD_PIC_IMG' => $mx_images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], --- 601,605 ---- 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=$cat_id")), ! 'UPLOAD_PIC_IMG' => $images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], Index: album_showpage.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_showpage.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** album_showpage.php 11 Jul 2007 20:07:30 -0000 1.11 --- album_showpage.php 9 Aug 2007 13:17:00 -0000 1.12 *************** *** 833,844 **** //users mesangers, website, email ! 'PROFILE_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$profile_url . '"><img src="' . $mx_images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>' : '', ! 'PM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$pm_url . '"><img src="' . $mx_images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>' : '', ! 'AIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_aim'] ) ? '<a href="aim:goim?screenname=' . $commentrow[$i]['user_aim'] . '&message=Hello+Are+you+there?"><img src="' . $mx_images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '' : '', ! 'YIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $commentrow[$i]['user_yim'] . '&.src=pg"><img src="' . $mx_images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '' : '', ! 'MSNM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_msnm'] ) ? '<a href="' . $temp_url . '"><img src="' . $mx_images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : '' : '', ! 'ICQ_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_icq'] ) ? '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $commentrow[$i]['user_icq'] . '"><img src="' . $mx_images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>' : '' : '', ! 'EMAIL_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $email_uri . '"><img src="' . $mx_images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>' : '', ! 'WWW_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_website'] ) ? '<a href="' . $commentrow[$i]['user_website'] . '" target="_userwww"><img src="' . $mx_images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '' : '', 'POSTER_AVATAR' => $poster_avatar, --- 833,844 ---- //users mesangers, website, email ! 'PROFILE_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$profile_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>' : '', ! 'PM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$pm_url . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>' : '', ! 'AIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_aim'] ) ? '<a href="aim:goim?screenname=' . $commentrow[$i]['user_aim'] . '&message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '' : '', ! 'YIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $commentrow[$i]['user_yim'] . '&.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '' : '', ! 'MSNM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_msnm'] ) ? '<a href="' . $temp_url . '"><img src="' . $images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : '' : '', ! 'ICQ_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_icq'] ) ? '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $commentrow[$i]['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>' : '' : '', ! 'EMAIL_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>' : '', ! 'WWW_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_website'] ) ? '<a href="' . $commentrow[$i]['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '' : '', 'POSTER_AVATAR' => $poster_avatar, Index: album_personal_random.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_personal_random.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_personal_random.php 13 Jun 2007 18:46:45 -0000 1.1 --- album_personal_random.php 9 Aug 2007 13:16:58 -0000 1.2 *************** *** 434,438 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; --- 434,438 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; *************** *** 484,488 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; --- 484,488 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; *************** *** 530,534 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); break; } --- 530,534 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); break; } *************** *** 592,596 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; } --- 592,596 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; } Index: album_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_cat.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** album_cat.php 11 Jul 2007 14:25:27 -0000 1.11 --- album_cat.php 9 Aug 2007 13:16:55 -0000 1.12 *************** *** 605,626 **** // END build jumpbox ! global $mx_images; $current_template_images = $module_root_path . "templates/". $theme['template_name'] ."/images"; - if ( file_exists( $mx_images['upload_pic'] ) ) - { - $upload_img = $mx_images['upload_pic']; - } - elseif ( file_exists( PORTAL_URL . $current_template_images . "/" . LANG . "/upload_pic.gif" ) ) - { - $upload_img = PORTAL_URL . $current_template_images . "/" . LANG . "/upload_pic.gif"; - } - else - { - $upload_img = PORTAL_URL . $module_root_path . "templates/subSilver/images" . "/" . LANG . "/upload_pic.gif"; - } ! $jupload_img = $mx_images['jupload_pic']; // $upload_link = append_sid(album_append_uid("album_upload.$phpEx?cat_id=$cat_id")); --- 605,617 ---- // END build jumpbox ! global $images; $current_template_images = $module_root_path . "templates/". $theme['template_name'] ."/images"; ! $upload_img = $images['upload_pic']; ! $jupload_img = $images['jupload_pic']; ! $download_img = $images['download_pic']; ! $download_all_img = $images['download_all_pic']; // $upload_link = append_sid(album_append_uid("album_upload.$phpEx?cat_id=$cat_id")); *************** *** 630,645 **** $jupload_full_link = '<a href="' . $jupload_link . '"><img src="' . $jupload_img .'" alt="' . $lang['JUpload_Pic'] . '" title="' . $lang['JUpload_Pic'] . '" align="middle" border="0" /></a>'; - if ( file_exists( $mx_images['download_pic'] ) ) - { - $download_img = $mx_images['download_pic']; - } - elseif ( file_exists( PORTAL_URL . $current_template_images . "/" . LANG . "/download.gif" ) ) - { - $download_img = PORTAL_URL . $current_template_images . "/" . LANG . "/download.gif"; - } - else - { - $download_img = PORTAL_URL . $module_root_path . "templates/subSilver/images" . "/" . LANG . "/download.gif"; - } // $download_link = append_sid(album_append_uid('album_download.' . $phpEx . '?cat_id=' . $cat_id . ( ($sort_method != '') ? '&sort_method=' . $sort_method : '' ) . ( ($sort_order != '') ? '&sort_order=' . $sort_order : '' ) . ( ($start != '') ? '&start=' . $start : '' ))); // $download_link =append_sid(this_smartor_mxurl("smartor_mode=album_download" . '&cat_id=' . $cat_id . ( ($sort_method != '') ? '&sort_method=' . $sort_method : '' ) . ( ($sort_order != '') ? '&sort_order=' . $sort_order : '' ) . ( ($start != '') ? '&start=' . $start : '' ))); --- 621,624 ---- *************** *** 647,658 **** $download_full_link = '<a href="' . $download_link . '"><img src="' . $download_img . '" alt="' . $lang['Download_page'] . '" title="' . $lang['Download_page'] . '" align="middle" border="0" /></a>'; - if ( file_exists( $mx_images['download_all_pic'] ) ) - { - $download_all_img = $mx_images['download_all_pic']; - } - else - { - $download_all_img = PORTAL_URL . $current_template_images . "/" . LANG . "/download_all.gif"; - } // $download_all_link = append_sid(album_append_uid('album_download.' . $phpEx . '?cat_id=' . $cat_id . ( ($sort_method != '') ? '&sort_method=' . $sort_method : '' ) . ( ($sort_order != '') ? '&sort_order=' . $sort_order : '' ) . '&download_all_pics=true')); $download_all_link =append_sid(this_smartor_mxurl("smartor_mode=album_download" . '&cat_id=' . $cat_id . ( ($sort_method != '') ? '&sort_method=' . $sort_method : '' ) . ( ($sort_order != '') ? '&sort_order=' . $sort_order : '' ) . '&download_all_pics=true')); --- 626,629 ---- *************** *** 799,803 **** 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=" . $cat_id)), ! 'UPLOAD_PIC_IMG' => $mx_images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], 'UPLOAD_FULL_LINK' => $upload_full_link, --- 770,774 ---- 'U_UPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_upload&cat_id=" . $cat_id)), ! 'UPLOAD_PIC_IMG' => $images['upload_pic'], 'L_UPLOAD_PIC' => $lang['Upload_Pic'], 'UPLOAD_FULL_LINK' => $upload_full_link, *************** *** 805,809 **** 'U_JUPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_jupload&cat_id=" . $cat_id)), ! 'JUPLOAD_PIC_IMG' => $mx_images['jupload_pic'], 'L_JUPLOAD_PIC' => $lang['JUpload_Pic'], --- 776,780 ---- 'U_JUPLOAD_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_jupload&cat_id=" . $cat_id)), ! 'JUPLOAD_PIC_IMG' => $images['jupload_pic'], 'L_JUPLOAD_PIC' => $lang['JUpload_Pic'], *************** *** 823,827 **** 'U_MANAGE_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_personal_cat_admin&cat_id=$cat_id")), ! 'MANAGE_PIC_IMG' => $mx_images['manage_pic'], 'L_MANAGE_PIC' => $lang['manage_Pic'], --- 794,798 ---- 'U_MANAGE_PIC' => append_sid(this_smartor_mxurl("smartor_mode=album_personal_cat_admin&cat_id=$cat_id")), ! 'MANAGE_PIC_IMG' => $images['manage_pic'], 'L_MANAGE_PIC' => $lang['manage_Pic'], Index: album_picm.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_picm.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** album_picm.php 7 Jun 2007 20:13:30 -0000 1.6 --- album_picm.php 9 Aug 2007 13:16:59 -0000 1.7 *************** *** 170,174 **** header('Content-type: image/jpeg'); ! readfile($mx_images['no_thumbnail']); exit; } --- 170,174 ---- header('Content-type: image/jpeg'); ! readfile($images['no_thumbnail']); exit; } Index: album_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_search.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** album_search.php 11 Jul 2007 15:35:12 -0000 1.8 --- album_search.php 9 Aug 2007 13:17:00 -0000 1.9 *************** *** 215,219 **** 'L_NRESULTS' => $numres, 'L_TRESULTS' => $total_pics, ! 'IMG_FOLDER' => $mx_images['folder'], 'L_TCATEGORY' => $lang['Pic_Cat'], 'L_TTITLE' => $lang['Pic_Image'], --- 215,219 ---- 'L_NRESULTS' => $numres, 'L_TRESULTS' => $total_pics, ! 'IMG_FOLDER' => $images['folder'], 'L_TCATEGORY' => $lang['Pic_Cat'], 'L_TTITLE' => $lang['Pic_Image'], Index: album_rdf.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_rdf.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_rdf.php 7 Jun 2007 20:13:34 -0000 1.1 --- album_rdf.php 9 Aug 2007 13:16:59 -0000 1.2 *************** *** 76,82 **** ! if (!isset($mx_images['logo_url']) || empty($mx_images['logo_url'])) { ! $mx_images['logo_url'] = PORTAL_URL . 'templates/' . $theme['template_name'] . '/' . $logo; } --- 76,82 ---- ! if (!isset($images['logo_url']) || empty($images['logo_url'])) { ! $images['logo_url'] = PORTAL_URL . 'templates/' . $theme['template_name'] . '/' . $logo; } *************** *** 99,103 **** <link>" . $index_site . "</link> <description>" . $board_config['site_desc'] . "</description> ! <url>" . $mx_images['logo_url'] . "</url> </image> </channel> --- 99,103 ---- <link>" . $index_site . "</link> <description>" . $board_config['site_desc'] . "</description> ! <url>" . $images['logo_url'] . "</url> </image> </channel> Index: album_otf_thumbnail.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_otf_thumbnail.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_otf_thumbnail.php 7 Jun 2007 20:13:33 -0000 1.1 --- album_otf_thumbnail.php 9 Aug 2007 13:16:57 -0000 1.2 *************** *** 86,90 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_posted_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); exit; break; --- 86,90 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_posted_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); exit; break; *************** *** 118,122 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); exit; break; --- 118,122 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); exit; break; *************** *** 160,164 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); exit; break; --- 160,164 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); exit; break; *************** *** 194,198 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); exit; break; --- 194,198 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); exit; break; *************** *** 255,259 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); break; } --- 255,259 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); break; } *************** *** 314,318 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($mx_images['no_thumbnail']); exit; } --- 314,318 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile($images['no_thumbnail']); exit; } Index: album_otf.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_otf.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_otf.php 7 Jun 2007 20:13:33 -0000 1.1 --- album_otf.php 9 Aug 2007 13:16:56 -0000 1.2 *************** *** 77,81 **** /* ! global $album_config, $template, $lang, $mx_images, $theme; global $mx_root_path, $phpEx; */ --- 77,81 ---- /* ! global $album_config, $template, $lang, $images, $theme; global $mx_root_path, $phpEx; */ Index: album_personal_cat_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_personal_cat_admin.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** album_personal_cat_admin.php 7 Jun 2007 20:13:30 -0000 1.7 --- album_personal_cat_admin.php 9 Aug 2007 13:16:57 -0000 1.8 *************** *** 46,64 **** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ); } --- 46,64 ---- // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } Index: album_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_rss.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_rss.php 7 Jun 2007 20:13:34 -0000 1.1 --- album_rss.php 9 Aug 2007 13:16:59 -0000 1.2 *************** *** 86,96 **** ! if (!isset($mx_images['logo_url']) || empty($mx_images['logo_url'])) { ! $mx_images['logo_url'] = PORTAL_URL . 'templates/' . $theme['template_name'] . '/images/' . $logo; } elseif (!isset($theme['template_name']) || empty($theme['template_name'])) { ! $mx_images['logo_url'] = PORTAL_URL . 'templates/subSilver/images/' . $logo; } --- 86,96 ---- ! if (!isset($images['logo_url']) || empty($images['logo_url'])) { ! $images['logo_url'] = PORTAL_URL . 'templates/' . $theme['template_name'] . '/images/' . $logo; } elseif (!isset($theme['template_name']) || empty($theme['template_name'])) { ! $images['logo_url'] = PORTAL_URL . 'templates/subSilver/images/' . $logo; } *************** *** 117,121 **** <link>" . $index_site . "</link> <description>" . $board_config['site_desc'] . "</description> ! <url>" . $mx_images['logo_url'] . "</url> </image> "; --- 117,121 ---- <link>" . $index_site . "</link> <description>" . $board_config['site_desc'] . "</description> ! <url>" . $images['logo_url'] . "</url> </image> "; Index: album_memberlist.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_memberlist.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** album_memberlist.php 7 Jun 2007 20:13:29 -0000 1.5 --- album_memberlist.php 9 Aug 2007 13:16:56 -0000 1.6 *************** *** 368,380 **** 'U_SHOW_ALL_PICS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=pic")), 'L_SHOW_ALL_PICS' => sprintf($lang['Show_All_Pictures_Of_user'], $username), ! 'SHOW_ALL_PICS_IMG' => $mx_images['show_all_pics'], 'U_SHOW_ALL_RATINGS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=rating")), 'L_SHOW_ALL_RATINGS' => sprintf($lang['Show_All_Ratings_Of_user'], $username), ! 'SHOW_ALL_RATINGS_IMG' => $mx_images['show_all_ratings'], 'U_SHOW_ALL_COMMENTS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=comment")), 'L_SHOW_ALL_COMMENTS' => sprintf($lang['Show_All_Comments_Of_user'], $username), ! 'SHOW_ALL_COMMENTS_IMG' => $mx_images['show_all_comments'], 'L_PICTURES_OF_USER' => $list_title, --- 368,380 ---- 'U_SHOW_ALL_PICS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=pic")), 'L_SHOW_ALL_PICS' => sprintf($lang['Show_All_Pictures_Of_user'], $username), ! 'SHOW_ALL_PICS_IMG' => $images['show_all_pics'], 'U_SHOW_ALL_RATINGS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=rating")), 'L_SHOW_ALL_RATINGS' => sprintf($lang['Show_All_Ratings_Of_user'], $username), ! 'SHOW_ALL_RATINGS_IMG' => $images['show_all_ratings'], 'U_SHOW_ALL_COMMENTS' => append_sid(album_append_uid("album.$phpEx?user_id=$album_user_id$album_view_mode_param&type=comment")), 'L_SHOW_ALL_COMMENTS' => sprintf($lang['Show_All_Comments_Of_user'], $username), ! 'SHOW_ALL_COMMENTS_IMG' => $images['show_all_comments'], 'L_PICTURES_OF_USER' => $list_title, Index: album_thumbnail.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_thumbnail.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** album_thumbnail.php 7 Jun 2007 20:13:30 -0000 1.6 --- album_thumbnail.php 9 Aug 2007 13:17:01 -0000 1.7 *************** *** 180,184 **** header('Content-type: image/jpeg'); header('Content-Disposition: filename=' . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; */ --- 180,184 ---- header('Content-type: image/jpeg'); header('Content-Disposition: filename=' . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; */ *************** *** 209,213 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; --- 209,213 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; *************** *** 259,263 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; --- 259,263 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; break; *************** *** 320,324 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); break; } --- 320,324 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $mx_module_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); break; } *************** *** 387,391 **** header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($mx_images['no_thumbnail']) ? $mx_images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; } --- 387,391 ---- header('Content-type: image/jpeg'); header("Content-Disposition: filename=thumb_" . $pic_title_reg . $pic_filetype); ! readfile(!empty($images['no_thumbnail']) ? $images['no_thumbnail'] : $module_root_path . 'templates/'. $theme['template_name'] . '/images/nothumbnail.jpg'); exit; } Index: album_allpics.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_allpics.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_allpics.php 7 Jun 2007 20:13:31 -0000 1.1 --- album_allpics.php 9 Aug 2007 13:16:55 -0000 1.2 *************** *** 576,588 **** 'U_SHOW_ALL_PICS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=pic')), 'L_SHOW_ALL_PICS' => $lang['All_Show_All_Pictures_Of_user'], ! 'SHOW_ALL_PICS_IMG' => $mx_images['show_all_pics'], 'U_SHOW_ALL_RATINGS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=rating')), 'L_SHOW_ALL_RATINGS' => $lang['All_Show_All_Ratings_Of_user'], ! 'SHOW_ALL_RATINGS_IMG' => $mx_images['show_all_ratings'], 'U_SHOW_ALL_COMMENTS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=comment')), 'L_SHOW_ALL_COMMENTS' => $lang['All_Show_All_Comments_Of_user'], ! 'SHOW_ALL_COMMENTS_IMG' => $mx_images['show_all_comments'], 'L_PICTURES_OF_USER' => $list_title, --- 576,588 ---- 'U_SHOW_ALL_PICS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=pic')), 'L_SHOW_ALL_PICS' => $lang['All_Show_All_Pictures_Of_user'], ! 'SHOW_ALL_PICS_IMG' => $images['show_all_pics'], 'U_SHOW_ALL_RATINGS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=rating')), 'L_SHOW_ALL_RATINGS' => $lang['All_Show_All_Ratings_Of_user'], ! 'SHOW_ALL_RATINGS_IMG' => $images['show_all_ratings'], 'U_SHOW_ALL_COMMENTS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics" . $album_view_mode_param . '&type=comment')), 'L_SHOW_ALL_COMMENTS' => $lang['All_Show_All_Comments_Of_user'], ! 'SHOW_ALL_COMMENTS_IMG' => $images['show_all_comments'], 'L_PICTURES_OF_USER' => $list_title, |
|
From: OryNider <ory...@us...> - 2007-08-09 13:17:30
|
Update of /cvsroot/mxbb/mx_smartor/album_mod In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11014/album_mod Modified Files: album_common.php album_hierarchy_functions.php Log Message: This will make use of: $mx_user->extend(MX_LANG_MAIN, MX_IMAGES); and: $mode = $mx_request_vars->request('smartor_mode', MX_TYPE_NO_TAGS, 'album_index'); Index: album_hierarchy_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_hierarchy_functions.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** album_hierarchy_functions.php 7 Jun 2007 20:13:15 -0000 1.6 --- album_hierarchy_functions.php 9 Aug 2007 13:16:53 -0000 1.7 *************** *** 62,66 **** function album_display_admin_index($cur = ALBUM_ROOT_CATEGORY, $level = 0, $max_level = -1, $column_offset=1) { ! global $db, $template, $phpEx, $lang, $mx_images, $album_data, $userdata, $user_id; static $username = ''; --- 62,66 ---- function album_display_admin_index($cur = ALBUM_ROOT_CATEGORY, $level = 0, $max_level = -1, $column_offset=1) { ! global $db, $template, $phpEx, $lang, $images, $album_data, $userdata, $user_id; static $username = ''; *************** *** 214,218 **** global $phpEx; global $template, $db; ! global $board_config, $album_config, $album_sp_config, $lang, $mx_images, $userdata, $album_data; // init some variables --- 214,218 ---- global $phpEx; global $template, $db; ! global $board_config, $album_config, $album_sp_config, $lang, $images, $userdata, $album_data; // init some variables *************** *** 334,339 **** $new_images_class = ($total > 0) ? '-new' : ''; $xs_new = ($total > 0) ? '-new' : ''; ! $slideshow_img_xs = ($xs_new) ? $mx_images['icon_minipost_new'] : $mx_images['icon_minipost']; ! $link_spacer = '<img src="' . $mx_images['spacer'] . '" width="1" height="0" />'; $subfolder_img = '<img src="' . $slideshow_img_xs . '" valign="middle" title="' . $sub_total_pics . '" alt="' . $sub_total_pics . '"/>'; $sub_cat_separator = ( $i != count ($sub_cats) ) ? ',':''; --- 334,339 ---- $new_images_class = ($total > 0) ? '-new' : ''; $xs_new = ($total > 0) ? '-new' : ''; ! $slideshow_img_xs = ($xs_new) ? $images['icon_minipost_new'] : $images['icon_minipost']; ! $link_spacer = '<img src="' . $images['spacer'] . '" width="1" height="0" />'; $subfolder_img = '<img src="' . $slideshow_img_xs . '" valign="middle" title="' . $sub_total_pics . '" alt="' . $sub_total_pics . '"/>'; $sub_cat_separator = ( $i != count ($sub_cats) ) ? ',':''; *************** *** 344,349 **** { $new_images = ($total > 0) ? true : false; ! $new_images_img = ($new_images == true) ? $mx_images['icon_minipost_new'] : $mx_images['icon_minipost']; ! $link_spacer = '<img src="' . $mx_images['spacer'] . '" width="1" height="0" />'; $subfolder_img = '<img src="' . $new_images_img . '" valign="middle" title="' . $sub_total_pics . '" alt="' . $sub_total_pics . '"/>'; $subfolder_dot = '• '; --- 344,349 ---- { $new_images = ($total > 0) ? true : false; ! $new_images_img = ($new_images == true) ? $images['icon_minipost_new'] : $images['icon_minipost']; ! $link_spacer = '<img src="' . $images['spacer'] . '" width="1" height="0" />'; $subfolder_img = '<img src="' . $new_images_img . '" valign="middle" title="' . $sub_total_pics . '" alt="' . $sub_total_pics . '"/>'; $subfolder_dot = '• '; *************** *** 382,386 **** { $new_text = ($total == 1) ? sprintf($lang['One_new_picture'], $total) : sprintf($lang['Multiple_new_pictures'], $total); ! $newpics_sub_link = ' <img src="' . $mx_images['mini_new_pictures'] . '" alt="' . $new_text .'" title="' . $new_text .'"> '; $link = $link . $slideshow_link_full; } --- 382,386 ---- { $new_text = ($total == 1) ? sprintf($lang['One_new_picture'], $total) : sprintf($lang['Multiple_new_pictures'], $total); ! $newpics_sub_link = ' <img src="' . $images['mini_new_pictures'] . '" alt="' . $new_text .'" title="' . $new_text .'"> '; $link = $link . $slideshow_link_full; } *************** *** 394,398 **** $first_pic_id = album_get_first_pic_id($ss_cat_id); $last_pic_id = album_get_last_pic_id($ss_cat_id); ! $slideshow_img = '<img src="' . $mx_images['icon_latest_reply'] . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" align="middle" />'; $slideshow_link = append_sid(this_fap_portalurl("smartor_mode=album_showpage" . "&pic_id=" . $first_pic_id . "&slideshow=5")); $slideshow_link_full = '[<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>]'; --- 394,398 ---- $first_pic_id = album_get_first_pic_id($ss_cat_id); $last_pic_id = album_get_last_pic_id($ss_cat_id); ! $slideshow_img = '<img src="' . $images['icon_latest_reply'] . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" align="middle" />'; $slideshow_link = append_sid(this_fap_portalurl("smartor_mode=album_showpage" . "&pic_id=" . $first_pic_id . "&slideshow=5")); $slideshow_link_full = '[<a href="' . $slideshow_link . '">' . $lang['Slideshow'] . '</a>]'; *************** *** 407,411 **** { $new_text = ($total == 1) ? sprintf($lang['One_new_picture'], $total) : sprintf($lang['Multiple_new_pictures'], $total); ! $newpics_sub_link = ' <img src="' . $mx_images['mini_new_pictures'] . '" alt="' . $new_text .'" title="' . $new_text .'"> '; $link = $link . $slideshow_link_full; //$link = $link . '[' . $sub_total_pics . $newpics_sub_link . $slideshow_link_full . ']'; --- 407,411 ---- { $new_text = ($total == 1) ? sprintf($lang['One_new_picture'], $total) : sprintf($lang['Multiple_new_pictures'], $total); ! $newpics_sub_link = ' <img src="' . $images['mini_new_pictures'] . '" alt="' . $new_text .'" title="' . $new_text .'"> '; $link = $link . $slideshow_link_full; //$link = $link . '[' . $sub_total_pics . $newpics_sub_link . $slideshow_link_full . ']'; *************** *** 463,467 **** $first_pic_id = album_get_first_pic_id($cur_cat_id); // Bicet - XS Support - BEGIN ! $slideshow_img_xs = ($xs_new) ? $mx_images['icon_newest_reply'] : $mx_images['icon_latest_reply']; $slideshow_img = '<img src="' . $slideshow_img_xs . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" />'; // Bicet - XS Support - END --- 463,467 ---- $first_pic_id = album_get_first_pic_id($cur_cat_id); // Bicet - XS Support - BEGIN ! $slideshow_img_xs = ($xs_new) ? $images['icon_newest_reply'] : $images['icon_latest_reply']; $slideshow_img = '<img src="' . $slideshow_img_xs . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" />'; // Bicet - XS Support - END *************** *** 474,478 **** $first_pic_id = album_get_first_pic_id($cur_cat_id); $last_pic_id = album_get_last_pic_id($cur_cat_id); ! $slideshow_icon = ($new_images == true) ? $mx_images['icon_newest_reply'] : $mx_images['icon_latest_reply']; $slideshow_img = '<img src="' . $slideshow_icon . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" align="middle" />'; --- 474,478 ---- $first_pic_id = album_get_first_pic_id($cur_cat_id); $last_pic_id = album_get_last_pic_id($cur_cat_id); ! $slideshow_icon = ($new_images == true) ? $images['icon_newest_reply'] : $images['icon_latest_reply']; $slideshow_img = '<img src="' . $slideshow_icon . '" alt="' . $lang['Slideshow'] . '" title="' . $lang['Slideshow'] . '" border="0" align="middle" />'; *************** *** 493,501 **** if ($xs_new) { ! $cat_img = ( intval(count($sub_cats)) >0 ) ? $mx_images['category_new']: $cat_img = $mx_images['forum_new']; } else { ! $cat_img = ( intval(count($sub_cats)) >0 ) ? $mx_images['category']: $cat_img = $mx_images['forum']; } global $config_mg; --- 493,501 ---- if ($xs_new) { ! $cat_img = ( intval(count($sub_cats)) >0 ) ? $images['category_new']: $cat_img = $images['forum_new']; } else { ! $cat_img = ( intval(count($sub_cats)) >0 ) ? $images['category']: $cat_img = $images['forum']; } global $config_mg; *************** *** 506,514 **** if ($new_images == true) { ! $cat_img = $mx_images['forum_new']; } else { ! $cat_img = $mx_images['forum']; } $xs_new = ''; --- 506,514 ---- if ($new_images == true) { ! $cat_img = $images['forum_new']; } else { ! $cat_img = $images['forum']; } $xs_new = ''; *************** *** 542,546 **** } $template->assign_block_vars('catmain.catrow.newpics', array( ! 'I_NEWEST_PICS' => $mx_images['mini_new_pictures'], 'L_NEWEST_PICS' => $new_text ) --- 542,546 ---- } $template->assign_block_vars('catmain.catrow.newpics', array( ! 'I_NEWEST_PICS' => $images['mini_new_pictures'], 'L_NEWEST_PICS' => $new_text ) *************** *** 1369,1373 **** function album_display_index($user_id, $cur_cat_id = ALBUM_ROOT_CATEGORY, $show_header = false, $show_public_footer = false, $force_display = false) { ! global $lang, $album_config, $board_config, $template, $mx_images, $album_data, $phpEx, $userdata; $keys = array(); --- 1369,1373 ---- function album_display_index($user_id, $cur_cat_id = ALBUM_ROOT_CATEGORY, $show_header = false, $show_public_footer = false, $force_display = false) { ! global $lang, $album_config, $board_config, $template, $images, $album_data, $phpEx, $userdata; $keys = array(); *************** *** 1399,1403 **** $template->assign_block_vars('catmain.catrow', array( 'CAT_TITLE' => $lang['No_Public_Galleries'], ! 'CAT_IMG' => $mx_images['forum_locked'] ) ); --- 1399,1403 ---- $template->assign_block_vars('catmain.catrow', array( 'CAT_TITLE' => $lang['No_Public_Galleries'], ! 'CAT_IMG' => $images['forum_locked'] ) ); Index: album_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_common.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** album_common.php 15 Jul 2007 20:03:11 -0000 1.18 --- album_common.php 9 Aug 2007 13:16:53 -0000 1.19 *************** *** 28,155 **** // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ); ! $link_language='lang_english'; ! } ! else ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ); ! $link_language='lang_' . $board_config['default_lang']; ! } ! ! ! // ********************************************************************** ! // Read theme definition and language in theme definition // ********************************************************************** ! if ( !MXBB_MODULE ) ! { ! $sql = 'SELECT * ! FROM ' . THEMES_TABLE . ' ! WHERE themes_id = ' . (int) $style; ! if ( !($result = $db->sql_query($sql)) ) ! { ! message_die(CRITICAL_ERROR, 'Could not query database for theme info'); ! } ! ! if ( !($row = $db->sql_fetchrow($result)) ) ! { ! // We are trying to setup a style which does not exist in the database ! // Try to fallback to the board default (if the user had a custom style) ! // and then any users using this style to the default if it succeeds ! if ( $style != $board_config['default_style']) ! { ! $sql = 'SELECT * ! FROM ' . THEMES_TABLE . ' ! WHERE themes_id = ' . (int) $board_config['default_style']; ! if ( !($result = $db->sql_query($sql)) ) ! { ! message_die(CRITICAL_ERROR, 'Could not query database for theme info'); ! } ! ! if ( $row = $db->sql_fetchrow($result) ) ! { ! $db->sql_freeresult($result); ! $template_name = $row['template_name'] ; ! } ! else ! { ! message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]"); ! } ! } ! else ! { ! message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]"); ! } ! } ! ! $template_path = 'templates/' ; ! //$template_name = $row['template_name'] ; ! ! $template = new Template($phpbb_root_path . $template_path . $template_name); ! ! if ( $template ) ! { ! $current_template_path = $template_path . $template_name; ! } ! else ! { ! $current_template_path = $template_path . 'subSilver'; ! } ! ! // ------------------------------------------------------------------------- ! // Prefix with PORTAL_URL ! // ------------------------------------------------------------------------- ! $current_template_images = $phpbb_root_path . $current_template_path . "/images"; ! ! @include($phpbb_root_path . $template_path . $template_name . '/' . 'fap.cfg'); ! ! ! } ! else ! { ! ! $template_name = $theme['template_name']; ! ! $template_path = 'templates/' . $theme['template_name']; ! ! $current_template_path = $template_path . $template_name; ! ! if ( file_exists( $module_root_path . $current_template_path . "/" . $template_name . ".cfg" ) ) ! { ! // ---------- ! @include($module_root_path . $current_template_path . "/" . $template_name . ".cfg"); ! // ---------- ! } ! else ! { ! // ---------- ! @include($module_root_path . "templates/" . "subSilver/" . "subSilver.cfg"); ! // ---------- ! } ! } ! ! //$mx_user->_load_mxbb_images($module_root_path); ! ! $img_lang = ( file_exists($module_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english'; ! ! while( list($key, $value) = @each($mx_images) ) ! { ! if (is_array($value)) ! { ! foreach( $value as $key2 => $val2 ) ! { ! $mx_images[$key][$key2] = $val2; ! } ! } ! else ! { ! $mx_images[$key] = str_replace('{LANG}', 'lang_' . $img_lang, $value); ! } ! ! } // --- 28,34 ---- // ********************************************************************** ! // Read main language definition and theme images definition // ********************************************************************** ! $mx_user->extend(MX_LANG_MAIN, MX_IMAGES); // |
|
From: OryNider <ory...@us...> - 2007-08-09 13:17:30
|
Update of /cvsroot/mxbb/mx_smartor/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11014/admin Modified Files: admin_album_auth.php admin_album_cat.php admin_album_cfg.php admin_album_clearcache.php admin_album_clown_SP.php admin_album_config_personal.php admin_album_personal.php Log Message: This will make use of: $mx_user->extend(MX_LANG_MAIN, MX_IMAGES); and: $mode = $mx_request_vars->request('smartor_mode', MX_TYPE_NO_TAGS, 'album_index'); Index: admin_album_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cfg.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_album_cfg.php 4 Jul 2007 15:49:30 -0000 1.3 --- admin_album_cfg.php 9 Aug 2007 13:16:49 -0000 1.4 *************** *** 30,48 **** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ); } --- 30,48 ---- // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } Index: admin_album_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_auth.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_album_auth.php 7 Jun 2007 20:13:02 -0000 1.10 --- admin_album_auth.php 9 Aug 2007 13:16:48 -0000 1.11 *************** *** 40,58 **** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ); } --- 40,58 ---- // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } Index: admin_album_clearcache.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clearcache.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_album_clearcache.php 7 Jun 2007 20:13:03 -0000 1.10 --- admin_album_clearcache.php 9 Aug 2007 13:16:50 -0000 1.11 *************** *** 30,40 **** // Read language definition // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ); } --- 30,40 ---- // Read language definition // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } Index: admin_album_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cat.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_album_cat.php 7 Jun 2007 20:13:02 -0000 1.10 --- admin_album_cat.php 9 Aug 2007 13:16:49 -0000 1.11 *************** *** 59,77 **** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ); } --- 59,77 ---- // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } Index: admin_album_config_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_config_personal.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_album_config_personal.php 7 Jun 2007 20:13:07 -0000 1.1 --- admin_album_config_personal.php 9 Aug 2007 13:16:50 -0000 1.2 *************** *** 45,63 **** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ); } --- 45,63 ---- // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } Index: admin_album_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_personal.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_album_personal.php 7 Jun 2007 20:13:05 -0000 1.10 --- admin_album_personal.php 9 Aug 2007 13:16:51 -0000 1.11 *************** *** 45,67 **** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ); } --- 45,67 ---- // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } Index: admin_album_clown_SP.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clown_SP.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** admin_album_clown_SP.php 7 Jun 2007 20:13:04 -0000 1.12 --- admin_album_clown_SP.php 9 Aug 2007 13:16:50 -0000 1.13 *************** *** 30,48 **** // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin_album.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_album.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main_album.' . $phpEx ); } --- 30,48 ---- // Read language definition // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); } ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } |
|
From: OryNider <ory...@us...> - 2007-08-09 13:17:29
|
Update of /cvsroot/mxbb/mx_smartor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11014 Modified Files: album.php album_lists.php welcome.php Log Message: This will make use of: $mx_user->extend(MX_LANG_MAIN, MX_IMAGES); and: $mode = $mx_request_vars->request('smartor_mode', MX_TYPE_NO_TAGS, 'album_index'); Index: welcome.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/welcome.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** welcome.php 2 Aug 2007 13:28:46 -0000 1.7 --- welcome.php 9 Aug 2007 13:16:52 -0000 1.8 *************** *** 50,55 **** $view_jump_to = $mx_block->get_parameters( 'View_JumpTo' ) == 'TRUE' ? TRUE : FALSE; //$default_avatar = $mx_block->get_parameters( 'Default_Avatar' ); ! $default_avatar = $mx_images['default_avatar']; ! $guest_avatar = $mx_images['guest_avatar']; $view_postcount = $mx_block->get_parameters( 'View_PostCount' ) == 'TRUE' ? TRUE : FALSE; //$report_page = intval($mx_block->get_parameters( 'Report_Page' )); --- 50,55 ---- $view_jump_to = $mx_block->get_parameters( 'View_JumpTo' ) == 'TRUE' ? TRUE : FALSE; //$default_avatar = $mx_block->get_parameters( 'Default_Avatar' ); ! $default_avatar = $images['default_avatar']; ! $guest_avatar = $images['guest_avatar']; $view_postcount = $mx_block->get_parameters( 'View_PostCount' ) == 'TRUE' ? TRUE : FALSE; //$report_page = intval($mx_block->get_parameters( 'Report_Page' )); *************** *** 335,339 **** 'L_REGISTER_MSG' => $register_msg, ! 'IMG_ICON_DOT' => PORTAL_URL . $mx_images['icon_dot'], 'L_SEARCH_NEW' => ( isset($s_search_new) ) ? $s_search_new : $lang['Posts_since_last_visit'], --- 335,339 ---- 'L_REGISTER_MSG' => $register_msg, ! 'IMG_ICON_DOT' => PORTAL_URL . $images['icon_dot'], 'L_SEARCH_NEW' => ( isset($s_search_new) ) ? $s_search_new : $lang['Posts_since_last_visit'], Index: album.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** album.php 15 Jul 2007 20:03:10 -0000 1.16 --- album.php 9 Aug 2007 13:16:52 -0000 1.17 *************** *** 78,82 **** } ! global $images, $mx_images; } --- 78,82 ---- } ! global $images; } *************** *** 112,250 **** // ! //mode // ! if ( isset($HTTP_POST_VARS['smartor_mode']) || isset($HTTP_GET_VARS['smartor_mode']) ) { ! $mode = ( isset($HTTP_POST_VARS['smartor_mode']) ) ? $HTTP_POST_VARS['smartor_mode'] : $HTTP_GET_VARS['smartor_mode']; } ! else { ! $mode= 'album_index'; } ! ! if ( $mode == 'album_cat' ) ! { ! include($module_root_path. 'includes/album_cat.'.$phpEx); ! } ! else if ( $mode == 'album_comment' ) ! { ! include($module_root_path. 'includes/album_comment.'.$phpEx); ! } ! else if ( $mode == 'album_comment_delete') ! { ! include($module_root_path. 'includes/album_comment_delete.'.$phpEx); ! } ! else if ( $mode == 'album_comment_edit' ) ! { ! include($module_root_path. 'includes/album_comment_edit.'.$phpEx); ! } ! else if ( $mode == 'album_delete' ) ! { ! include($module_root_path. 'includes/album_delete.'.$phpEx); ! } ! else if ( $mode == 'album_edit' ) ! { ! include($module_root_path. 'includes/album_edit.'.$phpEx); ! } ! else if ( $mode == 'album_hotornot' ) ! { ! include($module_root_path. 'includes/album_hotornot.'.$phpEx); ! } ! else if ( $mode == 'album_modcp' ) ! { ! include($module_root_path. 'includes/album_modcp.'.$phpEx); ! } ! else if ( $mode == 'album_page' ) ! { ! include($module_root_path. 'includes/album_page.'.$phpEx); ! } ! else if ( $mode == 'album_personal' ) ! { ! include($module_root_path. 'includes/album_personal.'.$phpEx); ! } ! else if ( $mode == 'album_personal_index' ) ! { ! include($module_root_path. 'includes/album_personal_index.'.$phpEx); ! } ! else if ( $mode == 'album_pic' ) ! { ! include($module_root_path. 'includes/album_pic.'.$phpEx); ! } ! else if ( $mode == 'album_picm' ) ! { ! include($module_root_path. 'includes/album_picm.'.$phpEx); ! } ! else if ( $mode == 'album_rate' ) ! { ! include($module_root_path. 'includes/album_rate.'.$phpEx); ! } ! else if ( $mode == 'album_search' ) ! { ! include($module_root_path. 'includes/album_search.'.$phpEx); ! } ! else if ( $mode == 'album_showpage' ) ! { ! include($module_root_path. 'includes/album_showpage.'.$phpEx); ! } ! else if ( $mode == 'album_thumbnail' ) ! { ! include($module_root_path. 'includes/album_thumbnail.'.$phpEx); ! } ! else if ( $mode == 'album_otf_thumbnail' ) ! { ! include($module_root_path. 'includes/album_otf_thumbnail.'.$phpEx); ! } ! else if ( $mode == 'album_upload' ) ! { ! include($module_root_path. 'includes/album_upload.'.$phpEx); ! } ! else if ( $mode == 'album_download' ) ! { ! include($module_root_path. 'includes/album_download.'.$phpEx); ! } ! else if ( $mode == 'album_otf' ) ! { ! include($module_root_path. 'includes/album_otf.'.$phpEx); ! } ! else if ( $mode == 'album_personal_cat_admin' ) ! { ! include($module_root_path. 'includes/album_personal_cat_admin.'.$phpEx); ! } ! else if ( $mode == 'album_pic_nuffed' ) ! { ! include($module_root_path. 'includes/album_pic_nuffed.'.$phpEx); ! } ! else if ( $mode == 'album_rdf' ) ! { ! include($module_root_path. 'includes/album_rdf.'.$phpEx); ! } ! else if ( $mode == 'album_rss' ) ! { ! include($module_root_path. 'includes/album_rss.'.$phpEx); ! } ! else if ( $mode == 'album_allpics' ) ! { ! include($module_root_path. 'includes/album_allpics.'.$phpEx); ! } ! else if ( $mode == 'smilies' ) ! { ! generate_smilies_album('window', PAGE_ALBUM_PICTURE); ! exit; ! } ! else if ( $mode == 'album_jupload' ) ! { ! include($module_root_path. 'includes/album_jupload.'.$phpEx); ! } ! else if ( $mode == 'random_personal_thumbnail' ) ! { ! include($module_root_path. 'includes/album_personal_random.'.$phpEx); ! } ! else if( !is_object($mx_block)) ! { ! die("Hacking attempt"); ! } ! else ! { ! if ($album_user_id != ALBUM_PUBLIC_GALLERY) --- 112,242 ---- // ! // Mode setting // ! $mode = $mx_request_vars->request('smartor_mode', MX_TYPE_NO_TAGS, 'album_index'); ! ! if ( $mode == 'album_cat' ) { ! include($module_root_path. 'includes/album_cat.'.$phpEx); } ! else if ( $mode == 'album_comment' ) { ! include($module_root_path. 'includes/album_comment.'.$phpEx); } ! else if ( $mode == 'album_comment_delete') ! { ! include($module_root_path. 'includes/album_comment_delete.'.$phpEx); ! } ! else if ( $mode == 'album_comment_edit' ) ! { ! include($module_root_path. 'includes/album_comment_edit.'.$phpEx); ! } ! else if ( $mode == 'album_delete' ) ! { ! include($module_root_path. 'includes/album_delete.'.$phpEx); ! } ! else if ( $mode == 'album_edit' ) ! { ! include($module_root_path. 'includes/album_edit.'.$phpEx); ! } ! else if ( $mode == 'album_hotornot' ) ! { ! include($module_root_path. 'includes/album_hotornot.'.$phpEx); ! } ! else if ( $mode == 'album_modcp' ) ! { ! include($module_root_path. 'includes/album_modcp.'.$phpEx); ! } ! else if ( $mode == 'album_page' ) ! { ! include($module_root_path. 'includes/album_page.'.$phpEx); ! } ! else if ( $mode == 'album_personal' ) ! { ! include($module_root_path. 'includes/album_personal.'.$phpEx); ! } ! else if ( $mode == 'album_personal_index' ) ! { ! include($module_root_path. 'includes/album_personal_index.'.$phpEx); ! } ! else if ( $mode == 'album_pic' ) ! { ! include($module_root_path. 'includes/album_pic.'.$phpEx); ! } ! else if ( $mode == 'album_picm' ) ! { ! include($module_root_path. 'includes/album_picm.'.$phpEx); ! } ! else if ( $mode == 'album_rate' ) ! { ! include($module_root_path. 'includes/album_rate.'.$phpEx); ! } ! else if ( $mode == 'album_search' ) ! { ! include($module_root_path. 'includes/album_search.'.$phpEx); ! } ! else if ( $mode == 'album_showpage' ) ! { ! include($module_root_path. 'includes/album_showpage.'.$phpEx); ! } ! else if ( $mode == 'album_thumbnail' ) ! { ! include($module_root_path. 'includes/album_thumbnail.'.$phpEx); ! } ! else if ( $mode == 'album_otf_thumbnail' ) ! { ! include($module_root_path. 'includes/album_otf_thumbnail.'.$phpEx); ! } ! else if ( $mode == 'album_upload' ) ! { ! include($module_root_path. 'includes/album_upload.'.$phpEx); ! } ! else if ( $mode == 'album_download' ) ! { ! include($module_root_path. 'includes/album_download.'.$phpEx); ! } ! else if ( $mode == 'album_otf' ) ! { ! include($module_root_path. 'includes/album_otf.'.$phpEx); ! } ! else if ( $mode == 'album_personal_cat_admin' ) ! { ! include($module_root_path. 'includes/album_personal_cat_admin.'.$phpEx); ! } ! else if ( $mode == 'album_pic_nuffed' ) ! { ! include($module_root_path. 'includes/album_pic_nuffed.'.$phpEx); ! } ! else if ( $mode == 'album_rdf' ) ! { ! include($module_root_path. 'includes/album_rdf.'.$phpEx); ! } ! else if ( $mode == 'album_rss' ) ! { ! include($module_root_path. 'includes/album_rss.'.$phpEx); ! } ! else if ( $mode == 'album_allpics' ) ! { ! include($module_root_path. 'includes/album_allpics.'.$phpEx); ! } ! else if ( $mode == 'smilies' ) ! { ! generate_smilies_album('window', PAGE_ALBUM_PICTURE); ! exit; ! } ! else if ( $mode == 'album_jupload' ) ! { ! include($module_root_path. 'includes/album_jupload.'.$phpEx); ! } ! else if ( $mode == 'random_personal_thumbnail' ) ! { ! include($module_root_path. 'includes/album_personal_random.'.$phpEx); ! } ! else if( !is_object($mx_block)) ! { ! die("Hacking attempt"); ! } ! else ! { if ($album_user_id != ALBUM_PUBLIC_GALLERY) *************** *** 579,585 **** if ( !is_object($mx_block)) ! { include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } // +--------------------------------------------------------+ --- 571,577 ---- if ( !is_object($mx_block)) ! { include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } // +--------------------------------------------------------+ |
|
From: Jon O. <jon...@us...> - 2007-08-06 22:40:16
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15986 Modified Files: mx_functions_style.php Log Message: Populating $mx_user->data, for Olympus stylish modules. Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mx_functions_style.php 19 Jun 2007 19:42:25 -0000 1.16 --- mx_functions_style.php 6 Aug 2007 22:40:07 -0000 1.17 *************** *** 221,224 **** --- 221,226 ---- var $page_id = ''; var $user_ip = ''; + + var $data = array(); // For future Olympus comp. /**#@-*/ *************** *** 239,243 **** * * Start session management (phpBB 2.0.x) ! * - populate $userdata * * @access private --- 241,245 ---- * * Start session management (phpBB 2.0.x) ! * - populate $userdata, $mx_user->data * * @access private *************** *** 249,252 **** --- 251,255 ---- global $userdata; $userdata = session_pagestart($this->user_ip, - ( MX_PORTAL_PAGES_OFFSET + $this->page_id )); // Use native phpBB 2.0.x session handling + $this->data = $userdata; //for compatibility with Olympus style modules $this->is_admin = $userdata['user_level'] == ADMIN && $userdata['session_logged_in']; } |
|
From: Jon O. <jon...@us...> - 2007-08-06 21:14:54
|
Update of /cvsroot/mxbb/mx_simpledoc/simpledoc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31479 Modified Files: simpledoc_common.php Log Message: Something... Index: simpledoc_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/simpledoc_common.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** simpledoc_common.php 17 Sep 2006 20:15:57 -0000 1.6 --- simpledoc_common.php 6 Aug 2007 21:14:51 -0000 1.7 *************** *** 59,65 **** $CONFIG['encoding'] = 'iso-8859-1'; ! ini_set('display_errors', 1); ! ini_set('magic_quotes_runtime', 0); ! ini_set('zend.ze1_compatibility_mode', 1); set_error_handler('raiseError'); --- 59,65 ---- $CONFIG['encoding'] = 'iso-8859-1'; ! @ini_set('display_errors', 1); ! @ini_set('magic_quotes_runtime', 0); ! @ini_set('zend.ze1_compatibility_mode', 1); set_error_handler('raiseError'); |
2 messages has been excluded from this view by a project administrator.
