mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] core/language/lang_english lang_admin.php, 1.93, 1.94 lang_main.php, 1.41, 1.42 lang_meta.php, 1.8, 1.9

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/language/lang_english
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1530/lang_english

Modified Files:
	lang_admin.php lang_main.php lang_meta.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: lang_meta.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_english/lang_meta.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** lang_meta.php	14 Feb 2008 21:31:38 -0000	1.8
--- lang_meta.php	28 Jun 2013 15:34:31 -0000	1.9
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** lang_admin.php	25 Jun 2013 18:16:21 -0000	1.93
--- lang_admin.php	28 Jun 2013 15:34:30 -0000	1.94
***************
*** 6,25 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
  
! //
! // Editor Settings: Please set Tabsize to 4 ;-)
! //
! 
! //
! // The format of this file is:
! //
! // ---> $lang['message'] = 'text';
! //
! // Specify your language character encoding... [optional]
! //
! // setlocale(LC_ALL, 'en');
  
  $lang['ENCODING'] = 'UTF-8';
--- 6,18 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */
  
! /*  Editor Settings: Please set Tabsize to 4 ;-) */
!  
! /*  The format of this file is:  ---> $lang['message'] = 'text';
! /*  Specify your language character encoding... [optional] */  
! setlocale(LC_ALL, 'en');
  
  $lang['ENCODING'] = 'UTF-8';
***************
*** 31,38 ****
  $lang['Mx-Publisher_adminCP']	= 'MX-Publisher Administration';
  $lang['Portal_Desc'] 			= 'A little text to describe your website.';
! 
! //
! // Left AdminCP Panel
! //
  $lang['1_General_admin'] = 'General';
  $lang['1_1_Management'] = 'Configuration';
--- 24,30 ----
  $lang['Mx-Publisher_adminCP']	= 'MX-Publisher Administration';
  $lang['Portal_Desc'] 			= 'A little text to describe your website.';
! /*
! * Left AdminCP Panel
! */
  $lang['1_General_admin'] = 'General';
  $lang['1_1_Management'] = 'Configuration';
***************
*** 173,180 ****
  $lang['Portal_backend'] = 'Portal Backend';
  $lang['Portal_url_explain'] = 'Full Portal URL, ex. <br />http://www.example.com/';
! 
! //
! // Module Management
! //
  $lang['Module_admin'] = 'Module Administration';
  $lang['Module_admin_explain'] = 'Use this form to manage modules: installation, upgrading and module development.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
--- 165,171 ----
  $lang['Portal_backend'] = 'Portal Backend';
  $lang['Portal_url_explain'] = 'Full Portal URL, ex. <br />http://www.example.com/';
! /*
! * Module Management
! */
  $lang['Module_admin'] = 'Module Administration';
  $lang['Module_admin_explain'] = 'Use this form to manage modules: installation, upgrading and module development.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
***************
*** 191,198 ****
  $lang['Module_path'] = 'Path, ex. \'modules/mx_textblocks/\'';
  $lang['Module_include_admin'] = 'Include this module in the AdminCP navigation';
! 
! //
! // Module Installation
! //
  $lang['Module_delete_db'] = 'Do you really want to uninstall the module? Warning: You will lose all module data. Consider upgrading instead.';
  $lang['Click_module_delete_yes'] = 'Click %sHere%s to uninstall the module';
--- 182,188 ----
  $lang['Module_path'] = 'Path, ex. \'modules/mx_textblocks/\'';
  $lang['Module_include_admin'] = 'Include this module in the AdminCP navigation';
! /*
! * Module Installation
! */
  $lang['Module_delete_db'] = 'Do you really want to uninstall the module? Warning: You will lose all module data. Consider upgrading instead.';
  $lang['Click_module_delete_yes'] = 'Click %sHere%s to uninstall the module';
***************
*** 227,233 ****
  $lang['module_install_info'] = 'Mod Installation/Upgrading/Uninstalling Information - mod specific db tables';
  
! //
! // Functions & Parameters Administration
! //
  $lang['Function_admin'] = 'Block Function Administration';
  $lang['Function_admin_explain'] = 'Modules have one or more block bunctions. Use this form to edit, add, or delete a block function';
--- 217,223 ----
  $lang['module_install_info'] = 'Mod Installation/Upgrading/Uninstalling Information - mod specific db tables';
  
! /*
! * Functions & Parameters Administration
! */
  $lang['Function_admin'] = 'Block Function Administration';
  $lang['Function_admin_explain'] = 'Modules have one or more block bunctions. Use this form to edit, add, or delete a block function';
***************
*** 261,267 ****
  $lang['Click_parameter_delete_yes'] = 'Click %sHere%s to delete the Parameter';
  
! //
! // Parameter Types
! //
  $lang['ParType_BBText'] = 'Simple BBCode Textblock';
  $lang['ParType_BBText_info'] = 'This is a simple textblock that parses BBCode';
--- 251,257 ----
  $lang['Click_parameter_delete_yes'] = 'Click %sHere%s to delete the Parameter';
  
! /*
! * Parameter Types
! */
  $lang['ParType_BBText'] = 'Simple BBCode Textblock';
  $lang['ParType_BBText_info'] = 'This is a simple textblock that parses BBCode';
***************
*** 288,294 ****
  $lang['ParType_Checkbox_multiple_select_info'] = '';
  
! //
! // Blocks Administration
! //
  $lang['Block_admin'] = 'Block Control Panel';
  $lang['Block_admin_explain'] = 'Use this form to manage portal blocks.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
--- 278,284 ----
  $lang['ParType_Checkbox_multiple_select_info'] = '';
  
! /*
! * Blocks Administration
! */
  $lang['Block_admin'] = 'Block Control Panel';
  $lang['Block_admin_explain'] = 'Use this form to manage portal blocks.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
***************
*** 315,321 ****
  $lang['Click_block_delete_yes'] = 'Click %sHere%s to delete the Block';
  
! //
! // BlockCP Administration
! //
  $lang['Block_cp'] = 'BlockCP';
  $lang['Click_return_blockCP_admin'] = 'Click %sHere%s to return to the Block Control Panel';
--- 305,311 ----
  $lang['Click_block_delete_yes'] = 'Click %sHere%s to delete the Block';
  
! /*
! * BlockCP Administration
! */
  $lang['Block_cp'] = 'BlockCP';
  $lang['Click_return_blockCP_admin'] = 'Click %sHere%s to return to the Block Control Panel';
***************
*** 323,329 ****
  $lang['BlockCP_Config_updated'] = 'This block has been updated.';
  
! //
! // Pages Administration
! //
  $lang['Page_admin'] = 'Page Administration';
  $lang['Page_admin_explain'] = 'Use this form to add, delete and change the settings for Portal Pages and Page Templates.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
--- 313,319 ----
  $lang['BlockCP_Config_updated'] = 'This block has been updated.';
  
! /*
! * Pages Administration
! */
  $lang['Page_admin'] = 'Page Administration';
  $lang['Page_admin_explain'] = 'Use this form to add, delete and change the settings for Portal Pages and Page Templates.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
***************
*** 397,403 ****
  $lang['Add_Virtual_Block_explain'] 	= 'This block turns the page into a virtual (blog) page';
  
! //
! // Page templates
! //
  $lang['Page_templates_admin'] = 'Page Templates Administration';
  $lang['Page_templates_admin_explain'] = 'Use this page to create, edit or delete Page Templates';
--- 387,393 ----
  $lang['Add_Virtual_Block_explain'] 	= 'This block turns the page into a virtual (blog) page';
  
! /*
! * Page templates
! */
  $lang['Page_templates_admin'] = 'Page Templates Administration';
  $lang['Page_templates_admin_explain'] = 'Use this page to create, edit or delete Page Templates';
***************
*** 419,425 ****
  $lang['Click_page_template_column_delete_yes'] = 'Click %sHere%s to delete the Page Template';
  
! //
! // Cache
! //
  $lang['Cache_dir_write_protect'] = 'Your cache directory is write-protected. MX-Publisher is unable to generate the cache file. Please make your cache directory writeable to continue.';
  $lang['Cache_generate'] = 'Your cache files have been generated.';
--- 409,415 ----
  $lang['Click_page_template_column_delete_yes'] = 'Click %sHere%s to delete the Page Template';
  
! /*
! * Cache
! */
  $lang['Cache_dir_write_protect'] = 'Your cache directory is write-protected. MX-Publisher is unable to generate the cache file. Please make your cache directory writeable to continue.';
  $lang['Cache_generate'] = 'Your cache files have been generated.';
***************
*** 428,435 ****
  $lang['Generate_mx_cache'] = 'Generate Block Cache';
  
! //
! // These are displayed in the drop down boxes for advanced
! // mode Module auth, try and keep them short!
! //
  $lang['Menu_Navigation'] = 'Navigation Menu';
  $lang['Portal_index'] = 'Portal Index';
--- 418,425 ----
  $lang['Generate_mx_cache'] = 'Generate Block Cache';
  
! /*
! * These are displayed in the drop down boxes for advanced
! * mode Module auth, try and keep them short!
! */
  $lang['Menu_Navigation'] = 'Navigation Menu';
  $lang['Portal_index'] = 'Portal Index';
***************
*** 438,444 ****
  $lang['Preview_portal'] = 'Preview Portal';
  
! //
! // META
! //
  $lang['Meta_admin'] = 'META Tags Administration';
  $lang['Mega_admin_explain'] = 'Use this form to customize your META tags';
--- 428,434 ----
  $lang['Preview_portal'] = 'Preview Portal';
  
! /*
! * META
! */
  $lang['Meta_admin'] = 'META Tags Administration';
  $lang['Mega_admin_explain'] = 'Use this form to customize your META tags';
***************
*** 461,467 ****
  $lang['Meta_data_ioerror'] = 'Unable to open mx_meta.inc. Make sure the file is writeable (chmod 777).';
  
! //
! // Portal permissons
! //
  $lang['Mx_Block_Auth_Title'] = 'Private Block Permissions' ;
  $lang['Mx_Block_Auth_Explain'] = 'Here you can configure Private Block Permissions';
--- 451,457 ----
  $lang['Meta_data_ioerror'] = 'Unable to open mx_meta.inc. Make sure the file is writeable (chmod 777).';
  
! /*
! * Portal permissons
! */
  $lang['Mx_Block_Auth_Title'] = 'Private Block Permissions' ;
  $lang['Mx_Block_Auth_Explain'] = 'Here you can configure Private Block Permissions';
***************
*** 479,495 ****
  $lang['AUTH_ANONYMOUS'] = 'ANONYMOUS';
  
! // -----------------------------------
! // BlockCP - Block Parameter Specific
! // -----------------------------------
  
! //
! // General
! //
  $lang['target_block'] = 'Target Block';
  $lang['target_block_explain'] = '- links, data etc are refering with this block';
! 
! //
! // Split column
! //
  $lang['block_ids'] = 'Source Blocks';
  $lang['block_ids_explain'] = '- to be placed left to right';
--- 469,480 ----
  $lang['AUTH_ANONYMOUS'] = 'ANONYMOUS';
  
! /* -----------------------------------/
! * BlockCP - Block Parameter Specific/
! * ----------------------------------- */
  
! /* General */
  $lang['target_block'] = 'Target Block';
  $lang['target_block_explain'] = '- links, data etc are refering with this block';
! /* Split column */
  $lang['block_ids'] = 'Source Blocks';
  $lang['block_ids_explain'] = '- to be placed left to right';
***************
*** 497,512 ****
  $lang['block_sizes_explain'] = '- You may specify size using numbers (pixels), percentages (relative sizes, ie. \'40%\') or \'*\' for the remainder.';
  $lang['space_between'] = 'Space between Blocks';
! 
! //
! // Sitelog
! //
  $lang['log_filter_date'] = 'Filter by time';
  $lang['log_filter_date_explain'] = '- Show logs from last week, month, year...';
  $lang['numOfEvents'] = 'Number';
  $lang['numOfEvents_explain'] = '- Number of events to show';
! 
! //
! // IncludeX
! //
  $lang['x_listen'] = 'Listen (GET)';
  $lang['x_iframe'] = 'IFrame';
--- 482,491 ----
  $lang['block_sizes_explain'] = '- You may specify size using numbers (pixels), percentages (relative sizes, ie. \'40%\') or \'*\' for the remainder.';
  $lang['space_between'] = 'Space between Blocks';
! /* Sitelog */
  $lang['log_filter_date'] = 'Filter by time';
  $lang['log_filter_date_explain'] = '- Show logs from last week, month, year...';
  $lang['numOfEvents'] = 'Number';
  $lang['numOfEvents_explain'] = '- Number of events to show';
! /* IncludeX */
  $lang['x_listen'] = 'Listen (GET)';
  $lang['x_iframe'] = 'IFrame';
***************
*** 523,536 ****
  $lang['x_3'] = 'Variable 3:';
  $lang['x_3_explain'] = '- <i>Multimedia:</i> height (pixles)';
! 
! //
! // Dynamic Block
! //
  $lang['default_block_id'] = 'Default Block';
  $lang['default_block_id_explain'] = '- This is the default or first block to display, unless a dynamic block is set';
! 
! //
! // Menu Navigation
! //
  $lang['menu_display_mode'] = 'Layout mode';
  $lang['menu_display_mode_explain '] = 'Horizonal or Vertical layout mode';
--- 502,509 ----
  $lang['x_3'] = 'Variable 3:';
  $lang['x_3_explain'] = '- <i>Multimedia:</i> height (pixles)';
! /* Dynamic Block */
  $lang['default_block_id'] = 'Default Block';
  $lang['default_block_id_explain'] = '- This is the default or first block to display, unless a dynamic block is set';
! /* Menu Navigation */
  $lang['menu_display_mode'] = 'Layout mode';
  $lang['menu_display_mode_explain '] = 'Horizonal or Vertical layout mode';
***************
*** 539,554 ****
  $lang['menu_page_parent']				= "Parent Page";
  $lang['menu_page_parent_explain ']		= "Navigation from this parent page";
  
! //
! // Version Checker
! //
! $lang['Mx-Publisher_Version_up_to_date'] = 'Your MX-Publisher installation is up to date. No updates are available for your version of MX-Publisher.';
! $lang['Mx-Publisher_Version_outdated'] = 'Your MX-Publisher installation does <b>not</b> seem to be up to date. Updates are available for your version of MX-Publisher. Please visit <a href="http://www.mx-publisher.com/download" target="_new">the MX-Publisher Core package download</a> to obtain the latest version.';
! $lang['Mx-Publisher_Latest_version_info'] = 'The latest available version is <b>MX-Publisher %s</b>. ';
! $lang['Mx-Publisher_Current_version_info'] = 'You are running <b>MX-Publisher %s</b>.';
! $lang['Mx-Publisher_Mailing_list_subscribe_reminder'] = 'For the latest information on news and updates to MX-Publisher, why not <a href="http://lists.sourceforge.net/lists/listinfo/mxbb-news" target="_new">subscribe to our mailing list</a>?';
! 
! //
! // That's all Folks!
! // -------------------------------------------------
  ?>
\ No newline at end of file
--- 512,524 ----
  $lang['menu_page_parent']				= "Parent Page";
  $lang['menu_page_parent_explain ']		= "Navigation from this parent page";
+ /* Version Checker */
+ $lang['MXP_Version_up_to_date'] = 'Your MX-Publisher installation is up to date. No updates are available for your version of MX-Publisher.';
+ $lang['MXP_Version_outdated'] = 'Your MX-Publisher installation does <b>not</b> seem to be up to date. Updates are available for your version of MX-Publisher. Please visit <a href="http://mxpcms.sourceforge.net//download" target="_new">the MX-Publisher Core package download</a> to obtain the latest version.';
+ $lang['MXP_Latest_version_info'] = 'The latest available version is <b>MX-Publisher %s</b>. ';
+ $lang['MXP_Current_version_info'] = 'You are running <b>MX-Publisher %s</b>.';
+ $lang['MXP_Mailing_list_subscribe_reminder'] = 'For the latest information on news and updates to MX-Publisher, why not <a href="http://lists.sourceforge.net/lists/listinfo/mxbb-news" target="_new">subscribe to our mailing list</a>?';
  
! /*
! * That's all Folks!
! * -------------------------------------------------*/
  ?>
\ No newline at end of file

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_english/lang_main.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** lang_main.php	18 Jun 2008 11:37:47 -0000	1.41
--- lang_main.php	28 Jun 2013 15:34:31 -0000	1.42
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */
***************
*** 128,132 ****
  // along with our copyright message indicating you are the translator
  // please add it here.
! //$lang['TRANSLATION_INFO_MXBB'] = 'English Language by <a href="http://www.mx-publisher.com" target="_blank">MX-Publisher Development Team</a>';
  
  //
--- 128,132 ----
  // along with our copyright message indicating you are the translator
  // please add it here.
! //$lang['TRANSLATION_INFO_MXBB'] = 'English Language by <a href="http://mxpcms.sourceforge.net/" target="_blank">MX-Publisher Development Team</a>';
  
  //

[mxbb-commits] core/language/lang_romanian lang_admin.php, 1.13, 1.14 lang_main.php, 1.7, 1.8

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/language/lang_romanian
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1530/lang_romanian

Modified Files:
	lang_admin.php lang_main.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_romanian/lang_main.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** lang_main.php	17 Jun 2013 21:29:08 -0000	1.7
--- lang_main.php	28 Jun 2013 15:34:32 -0000	1.8
***************
*** 121,125 ****
  // along with our copyright message indicating you are the translator
  // please add it here.
! $lang['TRANSLATION_INFO_MXBB'] = 'Traducerea în Limba Română de <a href="http://www.mx-publisher.com/phpBB2/profile.php?mode=viewprofile&u=6605" target="_blank">FlorinCB</a>';
  
  //
--- 121,125 ----
  // along with our copyright message indicating you are the translator
  // please add it here.
! $lang['TRANSLATION_INFO_MXBB'] = 'Traducerea în Limba Română de <a href="http://mxpcms.sourceforge.net//phpBB2/profile.php?mode=viewprofile&u=6605" target="_blank">FlorinCB</a>';
  
  //

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_romanian/lang_admin.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** lang_admin.php	25 Jun 2013 18:16:21 -0000	1.13
--- lang_admin.php	28 Jun 2013 15:34:32 -0000	1.14
***************
*** 9,24 ****
  */
  
! //
! // Editor Settings: Please set Tabsize to 4 ;-)
! // 
! 
! //
! // The format of this file is:
! //
! // ---> $lang["message"] = 'text';
! //
! // Specify your language character encoding... [optional]
! //
! setlocale(LC_ALL, "ro");
  
  
--- 9,17 ----
  */
  
! /*  Editor Settings: Please set Tabsize to 4 ;-) */
!  
! /*  The format of this file is:  ---> $lang['message'] = 'text';
! /*  Specify your language character encoding... [optional] */  
! setlocale(LC_ALL, 'en');
  
  
***************
*** 32,38 ****
  $lang['Portal_Desc'] 			= 'A little text to describe your website.';
  
! //
! // Left AdminCP Panel
! //
  $lang['1_General_admin']		= 'General';
  $lang['1_1_Management']			= 'Configuraţie';
--- 25,31 ----
  $lang['Portal_Desc'] 			= 'A little text to describe your website.';
  
! /*
! * Left AdminCP Panel
! */
  $lang['1_General_admin']		= 'General';
  $lang['1_1_Management']			= 'Configuraţie';
***************
*** 58,70 ****
  
  
! //
! // Index
! //
  $lang['Welcome_Mx-Publisher'] 				= 'Bine aţi venit la panoul de control al MXP CMS';
  $lang['Admin_intro_Mx-Publisher'] 			= 'Vă mulţumim pentru aţi ales Mx-Publisher ca soluţie pentru portalul/cms-ul dumneavoastră şi phpBB ca soluţie pentru forumul dumneavoastră. Acest ecran vă oferă o privire de ansamblu a diverselor statistici ale site-ului dumneavoastră. Puteţi reveni la această pagină folosind legătura <span style="text-decoration: underline;">Pagina de start a administratorului</span> din panel-ul stâng. Pentru a reveni la pagina de start a forumului dumneavoastră, apăsaţi pe logo-ul phpBB-ului aflat, de asemenea, în panel-ul stâng. Celelalte legături din partea stângă vă permit să controlaţi orice aspect al forumului, fiecare ecran va avea instrucţiuni care dau explicaţii despre cum se folosesc uneltele.';
  
! //
! // General
! //
  $lang['Yes']						= 'Da';
  $lang['No']							= 'Nu';
--- 51,63 ----
  
  
! /*
! * Index
! */
  $lang['Welcome_Mx-Publisher'] 				= 'Bine aţi venit la panoul de control al MXP CMS';
  $lang['Admin_intro_Mx-Publisher'] 			= 'Vă mulţumim pentru aţi ales Mx-Publisher ca soluţie pentru portalul/cms-ul dumneavoastră şi phpBB ca soluţie pentru forumul dumneavoastră. Acest ecran vă oferă o privire de ansamblu a diverselor statistici ale site-ului dumneavoastră. Puteţi reveni la această pagină folosind legătura <span style="text-decoration: underline;">Pagina de start a administratorului</span> din panel-ul stâng. Pentru a reveni la pagina de start a forumului dumneavoastră, apăsaţi pe logo-ul phpBB-ului aflat, de asemenea, în panel-ul stâng. Celelalte legături din partea stângă vă permit să controlaţi orice aspect al forumului, fiecare ecran va avea instrucţiuni care dau explicaţii despre cum se folosesc uneltele.';
  
! /*
! * General
! */
  $lang['Yes']						= 'Da';
  $lang['No']							= 'Nu';
***************
*** 201,207 ****
  $lang['Module_include_admin']		= 'Include acest modul în panoul din stânga Navigare Admin Meniu';
  
! //
! // Module Installation
! //
  $lang['Module_delete_db']			= 'Chiar vrei să dezinstalezi acest Modul? Atenţie: O să pierzi tote datele modulului. Consideră upgradare în loc...';
  $lang['Click_module_delete_yes']	= 'Click %sAici%s pt. a dezinstala modulul';
--- 194,200 ----
  $lang['Module_include_admin']		= 'Include acest modul în panoul din stânga Navigare Admin Meniu';
  
! /*
! * Module Installation
! */
  $lang['Module_delete_db']			= 'Chiar vrei să dezinstalezi acest Modul? Atenţie: O să pierzi tote datele modulului. Consideră upgradare în loc...';
  $lang['Click_module_delete_yes']	= 'Click %sAici%s pt. a dezinstala modulul';
***************
*** 231,237 ****
  $lang['module_install_info'] = 'Mod Installation/Upgrading/Uninstalling Information - mod specific db tables';
  
! //
! // Functions & Parameters Administration
! //
  $lang['Function_admin']				= 'Administraţie Funcţiune Bloc';
  $lang['Function_admin_explain']		= 'Modulele au una sau mai multe Funcţiuni Bloc. Foloseşte acest form pt. a edita, şi, sau şterge Funcţiunea unui Bloc';
--- 224,230 ----
  $lang['module_install_info'] = 'Mod Installation/Upgrading/Uninstalling Information - mod specific db tables';
  
! /*
! * Functions & Parameters Administration
! */
  $lang['Function_admin']				= 'Administraţie Funcţiune Bloc';
  $lang['Function_admin_explain']		= 'Modulele au una sau mai multe Funcţiuni Bloc. Foloseşte acest form pt. a edita, şi, sau şterge Funcţiunea unui Bloc';
***************
*** 265,271 ****
  $lang['Click_parameter_delete_yes']	= 'Click %sAici%s pentru a şterge Parametru';
  
! //
! // Parameter Types
! //
  $lang['ParType_BBText'] 			= 'Simplu BBText BlocText';
  $lang['ParType_BBText_info'] 		= 'Acesta este un simplu bloctext, permite bbcod-uri';
--- 258,264 ----
  $lang['Click_parameter_delete_yes']	= 'Click %sAici%s pentru a şterge Parametru';
  
! /*
! * Parameter Types
! */
  $lang['ParType_BBText'] 			= 'Simplu BBText BlocText';
  $lang['ParType_BBText_info'] 		= 'Acesta este un simplu bloctext, permite bbcod-uri';
***************
*** 292,298 ****
  $lang['ParType_Checkbox_multiple_select_info'] 		= '';
  
! //
! // Blocks Administration
! //
  $lang['Block_admin']				= 'Panou de Contol Bloc';
  $lang['Block_admin_explain']		= 'Foloseşte acest form pentru a administra Blocurile Portalului.<br /><b>Pentru a folosi acest panou, trebuie să ai JavaScript şi cooki-urile activate în browser!</b>';
--- 285,291 ----
  $lang['ParType_Checkbox_multiple_select_info'] 		= '';
  
! /*
! * Blocks Administration
! */
  $lang['Block_admin']				= 'Panou de Contol Bloc';
  $lang['Block_admin_explain']		= 'Foloseşte acest form pentru a administra Blocurile Portalului.<br /><b>Pentru a folosi acest panou, trebuie să ai JavaScript şi cooki-urile activate în browser!</b>';
***************
*** 319,325 ****
  $lang['Click_block_delete_yes']		= 'Click %sAici%s pt. a şterge Blocul';
  
! //
! // BlockCP Administration
! //
  $lang['Block_cp']                   	= 'BlockCP';
  $lang['Click_return_blockCP_admin']		= 'Click %sAici%s pt. întoarcere la Panoul de Control Bloc';
--- 312,318 ----
  $lang['Click_block_delete_yes']		= 'Click %sAici%s pt. a şterge Blocul';
  
! /*
! * BlockCP Administration
! */
  $lang['Block_cp']                   	= 'BlockCP';
  $lang['Click_return_blockCP_admin']		= 'Click %sAici%s pt. întoarcere la Panoul de Control Bloc';
***************
*** 328,334 ****
  
  
! //
! // Pages Administration
! //
  $lang['Page_admin'] = 'Page Administration';
  $lang['Page_admin_explain'] = 'Use this form to add, delete and change the settings for Portal Pages and Page Templates.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
--- 321,327 ----
  
  
! /*
! * Pages Administration
! */
  $lang['Page_admin'] = 'Page Administration';
  $lang['Page_admin_explain'] = 'Use this form to add, delete and change the settings for Portal Pages and Page Templates.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
***************
*** 402,408 ****
  $lang['Add_Virtual_Block_explain'] 	= 'This block turns the page into a virtual (blog) page';
  
! //
! // Page templates
! //
  $lang['Page_templates_admin'] = 'Page Templates Administration';
  $lang['Page_templates_admin_explain'] = 'Use this page to create, edit or delete Page Templates';
--- 395,401 ----
  $lang['Add_Virtual_Block_explain'] 	= 'This block turns the page into a virtual (blog) page';
  
! /*
! * Page templates
! */
  $lang['Page_templates_admin'] = 'Page Templates Administration';
  $lang['Page_templates_admin_explain'] = 'Use this page to create, edit or delete Page Templates';
***************
*** 424,431 ****
  $lang['Click_page_template_column_delete_yes'] = 'Click %sHere%s to delete the Page Template';
  
! 
! //
! // Pages Administration
! //
  $lang['Page_admin']				= 'Administraţia Paginii';
  $lang['Page_admin_explain']		= 'Foloseşte acest form pt. a adăuga, şterge şi schimba setarile pentru Paginile Portalului şi Paginile Templaturi.<br /><b>Pentru a folosi acest panou, trebuie să ai JavaScript şi cooki-urile activate în browser!</b>';
--- 417,423 ----
  $lang['Click_page_template_column_delete_yes'] = 'Click %sHere%s to delete the Page Template';
  
! /*
! * Pages Administration
! */
  $lang['Page_admin']				= 'Administraţia Paginii';
  $lang['Page_admin_explain']		= 'Foloseşte acest form pt. a adăuga, şterge şi schimba setarile pentru Paginile Portalului şi Paginile Templaturi.<br /><b>Pentru a folosi acest panou, trebuie să ai JavaScript şi cooki-urile activate în browser!</b>';
***************
*** 493,499 ****
  $lang['Add_Virtual_Block_explain'] 	= 'This block turns the page into a virtual (blog) page';
  
! //
! // Page templates
! //
  $lang['Page_templates_admin']			= 'Administartie Templaturi Pagină';
  $lang['Page_templates_admin_explain'] 	= 'Foloseşte acesta pt. a crea, edita ori şterge Templaturi';
--- 485,491 ----
  $lang['Add_Virtual_Block_explain'] 	= 'This block turns the page into a virtual (blog) page';
  
! /*
! * Page templates
! */
  $lang['Page_templates_admin']			= 'Administartie Templaturi Pagină';
  $lang['Page_templates_admin_explain'] 	= 'Foloseşte acesta pt. a crea, edita ori şterge Templaturi';
***************
*** 515,521 ****
  $lang['Click_page_template_column_delete_yes']	= 'Click %sAici%s pt. a şterge Templatul Paginii';
  
! //
! // Cache
! //
  $lang['Cache_dir_write_protect']	= 'Directorul tau cache este protejat la scriere. Nu s-a putut genera fişierul cache';
  $lang['Cache_generate']				= 'Fişierele cache au fost generate.';
--- 507,513 ----
  $lang['Click_page_template_column_delete_yes']	= 'Click %sAici%s pt. a şterge Templatul Paginii';
  
! /*
! * Cache
! */
  $lang['Cache_dir_write_protect']	= 'Directorul tau cache este protejat la scriere. Nu s-a putut genera fişierul cache';
  $lang['Cache_generate']				= 'Fişierele cache au fost generate.';
***************
*** 524,531 ****
  $lang['Generate_mx_cache']			= 'Generează Bloc Cache';
  
! //
! // These are displayed in the drop down boxes for advanced
! // mode Module auth, try and keep them short!
! //
  $lang['Menu_Navigation']			= 'Meniu Navigare';
  $lang['Portal_index']				= 'Index Portal';
--- 516,523 ----
  $lang['Generate_mx_cache']			= 'Generează Bloc Cache';
  
! /*
! * These are displayed in the drop down boxes for advanced
! * mode Module auth, try and keep them short!
! */
  $lang['Menu_Navigation']			= 'Meniu Navigare';
  $lang['Portal_index']				= 'Index Portal';
***************
*** 534,540 ****
  $lang['Preview_portal']				= 'Previzualizare Portal';
  
! //
! // META
! //
  $lang['Meta_admin']					= 'Administratie Meta Taguri';
  $lang['Mega_admin_explain']			= 'Foloseste acest form să customizezi meta tagurile tale';
--- 526,532 ----
  $lang['Preview_portal']				= 'Previzualizare Portal';
  
! /*
! * META
! */
  $lang['Meta_admin']					= 'Administratie Meta Taguri';
  $lang['Mega_admin_explain']			= 'Foloseste acest form să customizezi meta tagurile tale';
***************
*** 557,563 ****
  $lang['Meta_data_ioerror']			= 'Nu se poate deschide mx_meta.inc. Asigurăte că fişierul e writabil (chmod 777).';
  
! //
! // Portal permissons
! //
  $lang['Mx_Block_Auth_Title']		= 'Permisii Bloc Privat';
  $lang['Mx_Block_Auth_Explain']		= 'Aici poti să configurezi Permisiile Blocului Privat';
--- 549,555 ----
  $lang['Meta_data_ioerror']			= 'Nu se poate deschide mx_meta.inc. Asigurăte că fişierul e writabil (chmod 777).';
  
! /*
! * Portal permissons
! */
  $lang['Mx_Block_Auth_Title']		= 'Permisii Bloc Privat';
  $lang['Mx_Block_Auth_Explain']		= 'Aici poti să configurezi Permisiile Blocului Privat';
***************
*** 575,591 ****
  $lang['AUTH_ANONYMOUS']				= 'ANONYMOUS';
  
! // -----------------------------------
! // BlockCP - Block Parameter Specific
! // -----------------------------------
  
! //
! // General
! //
  $lang['target_block']				= 'Bloc Ţinta';
  $lang['target_block_explain']		= '- linkuri, date etc sunt referite cu acest bloc';
  
! //
! // Split column
! //
  $lang['block_ids']					= 'Blocuri Sursă';
  $lang['block_ids_explain']			= '- să fie poziţionate stânga spre dreapta';
--- 567,583 ----
  $lang['AUTH_ANONYMOUS']				= 'ANONYMOUS';
  
! /* -----------------------------------/
! * BlockCP - Block Parameter Specific/
! * ----------------------------------- */
  
! /*
! * General
! */
  $lang['target_block']				= 'Bloc Ţinta';
  $lang['target_block_explain']		= '- linkuri, date etc sunt referite cu acest bloc';
  
! /*
! * Split column
! */
  $lang['block_ids']					= 'Blocuri Sursă';
  $lang['block_ids_explain']			= '- să fie poziţionate stânga spre dreapta';
***************
*** 594,600 ****
  $lang['space_between']				= 'Spaţiu între blocuri';
  
! //
! // Sitelog
! //
  $lang['log_filter_date']			= 'Filtru după timp';
  $lang['log_filter_date_explain']	= '- Arată loguri din săptămâna trecută, luna, anul...';
--- 586,592 ----
  $lang['space_between']				= 'Spaţiu între blocuri';
  
! /*
! * Sitelog
! */
  $lang['log_filter_date']			= 'Filtru după timp';
  $lang['log_filter_date_explain']	= '- Arată loguri din săptămâna trecută, luna, anul...';
***************
*** 602,608 ****
  $lang['numOfEvents_explain']		= '- Număr evenimente de arătat';
  
! //
! // IncludeX
! //
  $lang['x_listen']					= 'Ascultă (GET)';
  $lang['x_iframe']					= 'IFrame';
--- 594,600 ----
  $lang['numOfEvents_explain']		= '- Număr evenimente de arătat';
  
! /*
! * IncludeX
! */
  $lang['x_listen']					= 'Ascultă (GET)';
  $lang['x_iframe']					= 'IFrame';
***************
*** 620,626 ****
  $lang['x_3_explain']				= '- <i>Multimedia:</i> înaltime (pixeli)';
  
! //
! // Announcement
! //
  $lang['announce_nbr_display']		= 'Număr Maxim de Mesaje care să fie Afişate';
  $lang['announce_nbr_days']			= 'Număr de Zile în care se Afişeaza Mesaje';
--- 612,618 ----
  $lang['x_3_explain']				= '- <i>Multimedia:</i> înaltime (pixeli)';
  
! /*
! * Announcement
! */
  $lang['announce_nbr_display']		= 'Număr Maxim de Mesaje care să fie Afişate';
  $lang['announce_nbr_days']			= 'Număr de Zile în care se Afişeaza Mesaje';
***************
*** 636,642 ****
  $lang['announce_forum_explain']		= '- Poţi face selecţii multiple<br />* Dacă nu este selectat nimic, toate forumurile autorizate vor fi vizibile';
  
! //
! // Polls
! //
  $lang['Poll_Display']				= 'Care urnă vrei să o afişezi?';
  $lang['poll_forum']					= 'Forumuri Sursă';
--- 628,634 ----
  $lang['announce_forum_explain']		= '- Poţi face selecţii multiple<br />* Dacă nu este selectat nimic, toate forumurile autorizate vor fi vizibile';
  
! /*
! * Polls
! */
  $lang['Poll_Display']				= 'Care urnă vrei să o afişezi?';
  $lang['poll_forum']					= 'Forumuri Sursă';
***************
*** 644,656 ****
  $lang['Not_Specified']				= 'Ne Specificat';
  
! //
! // Dynamic Block
! //
  $lang['default_block_id']			= 'Bloc Implicit';
  $lang['default_block_id_explain']	= '- Acesta este blocul implicit de afişat, exceptând dacă un bloc dinamic este selectat';
  
! //
! // Menu Navigation
! //
  $lang['menu_display_mode']			= 'Mod Plan';
  $lang['menu_display_mode_explain ']	= 'Mod plan Orizonal ori Vertical';
--- 636,648 ----
  $lang['Not_Specified']				= 'Ne Specificat';
  
! /*
! * Dynamic Block
! */
  $lang['default_block_id']			= 'Bloc Implicit';
  $lang['default_block_id_explain']	= '- Acesta este blocul implicit de afişat, exceptând dacă un bloc dinamic este selectat';
  
! /*
! * Menu Navigation
! */
  $lang['menu_display_mode']			= 'Mod Plan';
  $lang['menu_display_mode_explain ']	= 'Mod plan Orizonal ori Vertical';
***************
*** 658,666 ****
  $lang['menu_page_sync_explain']		= 'Lumineză intrare la Meniul de Nav. curent...';
  
! //
! // Version Checker
! //
  $lang['MXP_Version_up_to_date'] = 'Instalarea MXP este la zi. Nu există actualizări pentru versiunea ta de MXP.';
! $lang['MXP_Version_outdated'] = 'Se pare ca instalarea ta MXP <b>nu</b> este la zi. Actualizări există pentru versiunea ta de MXP. Te rog viziteză <a href="http://www.mx-publisher.com/index.php?page=4&action=file&file_id=2" target="_new">downloadare pachetul MXP Core</a> pt. a obţine ultima versiune.';
  $lang['MXP_Latest_version_info'] = 'Ultima veriune disponibilă este <b>MXP %s</b>. ';
  $lang['MXP_Current_version_info'] = 'Tu ai <b>MXP %s</b>.';
--- 650,658 ----
  $lang['menu_page_sync_explain']		= 'Lumineză intrare la Meniul de Nav. curent...';
  
! /*
! * Version Checker
! */
  $lang['MXP_Version_up_to_date'] = 'Instalarea MXP este la zi. Nu există actualizări pentru versiunea ta de MXP.';
! $lang['MXP_Version_outdated'] = 'Se pare ca instalarea ta MXP <b>nu</b> este la zi. Actualizări există pentru versiunea ta de MXP. Te rog viziteză <a href="http://mxpcms.sourceforge.net//index.php?page=4&action=file&file_id=2" target="_new">downloadare pachetul MXP Core</a> pt. a obţine ultima versiune.';
  $lang['MXP_Latest_version_info'] = 'Ultima veriune disponibilă este <b>MXP %s</b>. ';
  $lang['MXP_Current_version_info'] = 'Tu ai <b>MXP %s</b>.';
***************
*** 679,688 ****
  $lang['Trans_save_file']			= 'Save language file';
  
! //
! // Asta e tot lume!
! //
! // Translated from english to romanian by OryNider
! // ory...@rd... // http://pubory.uv.ro/
! //
! // -------------------------------------------------
  ?>
\ No newline at end of file
--- 671,680 ----
  $lang['Trans_save_file']			= 'Save language file';
  
! /*
! * Asta e tot lume!
! *
! * Translated from english to romanian by OryNider
! * ory...@rd... // http://pubory.uv.ro/
! *
! * ------------------------------------------------- */
  ?>
\ No newline at end of file

[mxbb-commits] core/language/lang_italian lang_admin.php, 1.2, 1.3 lang_main.php, 1.1, 1.2 lang_meta.php, 1.1, 1.2

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/language/lang_italian
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1530/lang_italian

Modified Files:
	lang_admin.php lang_main.php lang_meta.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: lang_meta.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_italian/lang_meta.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lang_meta.php	21 Oct 2012 00:04:02 -0000	1.1
--- lang_meta.php	28 Jun 2013 15:34:32 -0000	1.2
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_italian/lang_admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lang_admin.php	17 Jun 2013 00:33:30 -0000	1.2
--- lang_admin.php	28 Jun 2013 15:34:32 -0000	1.3
***************
*** 6,32 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
  
! //
! // Editor Settings: Please set Tabsize to 4 ;-)
! //
  
! //
! // The format of this file is:
! //
! // ---> $lang['message'] = 'text';
! //
! // Specify your language character encoding... [optional]
! //
! // setlocale(LC_ALL, 'en');
  
  $lang['Mx-Publisher_adminCP'] = 'MX-Publisher Administration';
  $lang['Portal_Desc'] = 'A little text to describe your website.';
! 
! //
! // Left AdminCP Panel
! //
  $lang['Admin'] = 'Amministrazione';
  $lang['Admin_Index'] = 'Admin index';
--- 6,22 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */
  
! /*  Editor Settings: Please set Tabsize to 4 ;-) */ 
  
! /*  The format of this file is:  ---> $lang['message'] = 'text';
! /*  Specify your language character encoding... [optional] */  
! setlocale(LC_ALL, 'en');
  
  $lang['Mx-Publisher_adminCP'] = 'MX-Publisher Administration';
  $lang['Portal_Desc'] = 'A little text to describe your website.';
! /*  Left AdminCP Panel */ 
  $lang['Admin'] = 'Amministrazione';
  $lang['Admin_Index'] = 'Admin index';
***************
*** 51,65 ****
  $lang['4_1_Meta'] = 'META Tags';
  $lang['4_1_PHPinfo'] = 'phpInfo()';
! 
! //
! // Index
! //
  $lang['Welcome_mxBB'] = 'Welcome to MX-Publisher';
  $lang['Admin_intro_mxBB'] = 'Thank you for choosing MX-Publisher as your portal/cms solution and phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your site. You can get back to this page by clicking on the <span style="text-decoration: underline;">Admin Index</span> link in the left panel. To return to the index of your board, click the logo that is also in the left panel. The other links on the left hand side of this screen will allow you to control every aspect of your portal and forum experience. Each screen will have instructions on how to use the provided tools.';
  $lang['Version_information'] = 'Informazione versione';
! 
! //
! // General
! //
  $lang['Yes'] = 'Yes';
  $lang['No'] = 'No';
--- 41,49 ----
  $lang['4_1_Meta'] = 'META Tags';
  $lang['4_1_PHPinfo'] = 'phpInfo()';
! /*  Index */ 
  $lang['Welcome_mxBB'] = 'Welcome to MX-Publisher';
  $lang['Admin_intro_mxBB'] = 'Thank you for choosing MX-Publisher as your portal/cms solution and phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your site. You can get back to this page by clicking on the <span style="text-decoration: underline;">Admin Index</span> link in the left panel. To return to the index of your board, click the logo that is also in the left panel. The other links on the left hand side of this screen will allow you to control every aspect of your portal and forum experience. Each screen will have instructions on how to use the provided tools.';
  $lang['Version_information'] = 'Informazione versione';
! /*  General */ 
  $lang['Yes'] = 'Yes';
  $lang['No'] = 'No';
***************
*** 144,151 ****
  $lang['Login_reset_time_explain'] = 'Determina il tempo in minuti che l\'utente deve aspettare prima di fare di nuovo il login dopo avere ecceduto il numero di tentativi di login consentiti.';
  $lang['Default_language'] = 'Lingua di default';
! 
! //
! // Configuration
! //
  $lang['Portal_admin'] = 'Portal Administration';
  $lang['Portal_admin_explain'] = 'Use this form to customize your portal';
--- 128,132 ----
  $lang['Login_reset_time_explain'] = 'Determina il tempo in minuti che l\'utente deve aspettare prima di fare di nuovo il login dopo avere ecceduto il numero di tentativi di login consentiti.';
  $lang['Default_language'] = 'Lingua di default';
! /*  Configuration */ 
  $lang['Portal_admin'] = 'Portal Administration';
  $lang['Portal_admin_explain'] = 'Use this form to customize your portal';
***************
*** 199,206 ****
  $lang['Portal_config_valid_true'] = '<b><font color="green">Valid</font></b>';
  $lang['Portal_config_valid_false'] = '<b><font color="red">Bad Setup. Either your phpBB relative path is wrong or phpBB is uninstalled (your phpBB database is unavailable). Thus, \'internal\' backend is used.</font></b>';
! 
! //
! // Module Management
! //
  $lang['Module_admin'] = 'Module Administration';
  $lang['Module_admin_explain'] = 'Use this form to manage modules: installation, upgrading and module development.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
--- 180,184 ----
  $lang['Portal_config_valid_true'] = '<b><font color="green">Valid</font></b>';
  $lang['Portal_config_valid_false'] = '<b><font color="red">Bad Setup. Either your phpBB relative path is wrong or phpBB is uninstalled (your phpBB database is unavailable). Thus, \'internal\' backend is used.</font></b>';
! /*  Module Management */ 
  $lang['Module_admin'] = 'Module Administration';
  $lang['Module_admin_explain'] = 'Use this form to manage modules: installation, upgrading and module development.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
***************
*** 217,224 ****
  $lang['Module_path'] = 'Path, ex. \'modules/mx_textblocks/\'';
  $lang['Module_include_admin'] = 'Include this module in the AdminCP navigation';
! 
! //
! // Module Installation
! //
  $lang['Module_delete_db'] = 'Do you really want to uninstall the module? Warning: You will lose all module data. Consider upgrading instead.';
  $lang['Click_module_delete_yes'] = 'Click %sHere%s to uninstall the module';
--- 195,199 ----
  $lang['Module_path'] = 'Path, ex. \'modules/mx_textblocks/\'';
  $lang['Module_include_admin'] = 'Include this module in the AdminCP navigation';
! /*  Module Installation */ 
  $lang['Module_delete_db'] = 'Do you really want to uninstall the module? Warning: You will lose all module data. Consider upgrading instead.';
  $lang['Click_module_delete_yes'] = 'Click %sHere%s to uninstall the module';
***************
*** 252,259 ****
  $lang['fresh_install'] = 'This is a fresh install';
  $lang['module_install_info'] = 'Mod Installation/Upgrading/Uninstalling Information - mod specific db tables';
! 
! //
! // Functions & Parameters Administration
! //
  $lang['Function_admin'] = 'Block Function Administration';
  $lang['Function_admin_explain'] = 'Modules have one or more block bunctions. Use this form to edit, add, or delete a block function';
--- 227,231 ----
  $lang['fresh_install'] = 'This is a fresh install';
  $lang['module_install_info'] = 'Mod Installation/Upgrading/Uninstalling Information - mod specific db tables';
! /*  Functions & Parameters Administration */ 
  $lang['Function_admin'] = 'Block Function Administration';
  $lang['Function_admin_explain'] = 'Modules have one or more block bunctions. Use this form to edit, add, or delete a block function';
***************
*** 285,292 ****
  $lang['Delete_parameter_explain'] = 'This will delete the parameter and update all associated portal blocks. Beware: this operation cannot be undone!';
  $lang['Click_parameter_delete_yes'] = 'Click %sHere%s to delete the Parameter';
! 
! //
! // Parameter Types
! //
  $lang['ParType_BBText'] = 'Simple BBCode Textblock';
  $lang['ParType_BBText_info'] = 'This is a simple textblock that parses BBCode';
--- 257,261 ----
  $lang['Delete_parameter_explain'] = 'This will delete the parameter and update all associated portal blocks. Beware: this operation cannot be undone!';
  $lang['Click_parameter_delete_yes'] = 'Click %sHere%s to delete the Parameter';
! /*  Parameter Types */ 
  $lang['ParType_BBText'] = 'Simple BBCode Textblock';
  $lang['ParType_BBText_info'] = 'This is a simple textblock that parses BBCode';
***************
*** 313,319 ****
  $lang['ParType_Checkbox_multiple_select_info'] = '';
  
! //
! // Blocks Administration
! //
  $lang['Block_admin'] = 'Block Control Panel';
  $lang['Block_admin_explain'] = 'Use this form to manage portal blocks.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
--- 282,286 ----
  $lang['ParType_Checkbox_multiple_select_info'] = '';
  
! /*  Blocks Administration */ 
  $lang['Block_admin'] = 'Block Control Panel';
  $lang['Block_admin_explain'] = 'Use this form to manage portal blocks.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
***************
*** 340,346 ****
  $lang['Click_block_delete_yes'] = 'Click %sHere%s to delete the Block';
  
! //
! // BlockCP Administration
! //
  $lang['Block_cp'] = 'BlockCP';
  $lang['Click_return_blockCP_admin'] = 'Click %sHere%s to return to the Block Control Panel';
--- 307,311 ----
  $lang['Click_block_delete_yes'] = 'Click %sHere%s to delete the Block';
  
! /*  BlockCP Administration */ 
  $lang['Block_cp'] = 'BlockCP';
  $lang['Click_return_blockCP_admin'] = 'Click %sHere%s to return to the Block Control Panel';
***************
*** 348,354 ****
  $lang['BlockCP_Config_updated'] = 'This block has been updated.';
  
! //
! // Pages Administration
! //
  $lang['Page_admin'] = 'Page Administration';
  $lang['Page_admin_explain'] = 'Use this form to add, delete and change the settings for Portal Pages and Page Templates.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
--- 313,317 ----
  $lang['BlockCP_Config_updated'] = 'This block has been updated.';
  
! /*  Pages Administration */ 
  $lang['Page_admin'] = 'Page Administration';
  $lang['Page_admin_explain'] = 'Use this form to add, delete and change the settings for Portal Pages and Page Templates.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>';
***************
*** 422,428 ****
  $lang['Add_Virtual_Block_explain'] 	= 'This block turns the page into a virtual (blog) page';
  
! //
! // Page templates
! //
  $lang['Page_templates_admin'] = 'Page Templates Administration';
  $lang['Page_templates_admin_explain'] = 'Use this page to create, edit or delete Page Templates';
--- 385,389 ----
  $lang['Add_Virtual_Block_explain'] 	= 'This block turns the page into a virtual (blog) page';
  
! /*  Page templates */ 
  $lang['Page_templates_admin'] = 'Page Templates Administration';
  $lang['Page_templates_admin_explain'] = 'Use this page to create, edit or delete Page Templates';
***************
*** 444,450 ****
  $lang['Click_page_template_column_delete_yes'] = 'Click %sHere%s to delete the Page Template';
  
! //
! // Cache
! //
  $lang['Cache_dir_write_protect'] = 'Your cache directory is write-protected. MX-Publisher is unable to generate the cache file. Please make your cache directory writeable to continue.';
  $lang['Cache_generate'] = 'Your cache files have been generated.';
--- 405,409 ----
  $lang['Click_page_template_column_delete_yes'] = 'Click %sHere%s to delete the Page Template';
  
! /*  Cache */ 
  $lang['Cache_dir_write_protect'] = 'Your cache directory is write-protected. MX-Publisher is unable to generate the cache file. Please make your cache directory writeable to continue.';
  $lang['Cache_generate'] = 'Your cache files have been generated.';
***************
*** 453,460 ****
  $lang['Generate_mx_cache'] = 'Generate Block Cache';
  
! //
! // These are displayed in the drop down boxes for advanced
! // mode Module auth, try and keep them short!
! //
  $lang['Menu_Navigation'] = 'Navigation Menu';
  $lang['Portal_index'] = 'Portal Index';
--- 412,416 ----
  $lang['Generate_mx_cache'] = 'Generate Block Cache';
  
! /*  These are displayed in the drop down boxes for advanced  mode Module auth, try and keep them short! */ 
  $lang['Menu_Navigation'] = 'Navigation Menu';
  $lang['Portal_index'] = 'Portal Index';
***************
*** 463,469 ****
  $lang['Preview_portal'] = 'Preview Portal';
  
! //
! // META
! //
  $lang['Meta_admin'] = 'META Tags Administration';
  $lang['Mega_admin_explain'] = 'Use this form to customize your META tags';
--- 419,423 ----
  $lang['Preview_portal'] = 'Preview Portal';
  
! /*  META */ 
  $lang['Meta_admin'] = 'META Tags Administration';
  $lang['Mega_admin_explain'] = 'Use this form to customize your META tags';
***************
*** 484,490 ****
  $lang['Meta_data_ioerror'] = 'Unable to open mx_meta.inc. Make sure the file is writeable (chmod 777).';
  
! //
! // Portal permissons
! //
  $lang['Mx_Block_Auth_Title'] = 'Private Block Permissions' ;
  $lang['Mx_Block_Auth_Explain'] = 'Here you can configure Private Block Permissions';
--- 438,442 ----
  $lang['Meta_data_ioerror'] = 'Unable to open mx_meta.inc. Make sure the file is writeable (chmod 777).';
  
! /*  Portal permissons */ 
  $lang['Mx_Block_Auth_Title'] = 'Private Block Permissions' ;
  $lang['Mx_Block_Auth_Explain'] = 'Here you can configure Private Block Permissions';
***************
*** 502,518 ****
  $lang['AUTH_ANONYMOUS'] = 'ANONYMOUS';
  
! // -----------------------------------
! // BlockCP - Block Parameter Specific
! // -----------------------------------
! 
! //
! // General
! //
  $lang['target_block'] = 'Target Block';
  $lang['target_block_explain'] = '- links, data etc are refering with this block';
  
! //
! // Split column
! //
  $lang['block_ids'] = 'Source Blocks';
  $lang['block_ids_explain'] = '- to be placed left to right';
--- 454,466 ----
  $lang['AUTH_ANONYMOUS'] = 'ANONYMOUS';
  
! /* -----------------------------------
!  BlockCP - Block Parameter Specific 
!  ----------------------------------- */
!  
! /*  General */ 
  $lang['target_block'] = 'Target Block';
  $lang['target_block_explain'] = '- links, data etc are refering with this block';
  
! /*  Split column */ 
  $lang['block_ids'] = 'Source Blocks';
  $lang['block_ids_explain'] = '- to be placed left to right';
***************
*** 521,527 ****
  $lang['space_between'] = 'Space between Blocks';
  
! //
! // Sitelog
! //
  $lang['log_filter_date'] = 'Filter by time';
  $lang['log_filter_date_explain'] = '- Show logs from last week, month, year...';
--- 469,473 ----
  $lang['space_between'] = 'Space between Blocks';
  
! /*  Sitelog */ 
  $lang['log_filter_date'] = 'Filter by time';
  $lang['log_filter_date_explain'] = '- Show logs from last week, month, year...';
***************
*** 529,535 ****
  $lang['numOfEvents_explain'] = '- Number of events to show';
  
! //
! // IncludeX
! //
  $lang['x_listen'] = 'Listen (GET)';
  $lang['x_iframe'] = 'IFrame';
--- 475,479 ----
  $lang['numOfEvents_explain'] = '- Number of events to show';
  
! /*  IncludeX */ 
  $lang['x_listen'] = 'Listen (GET)';
  $lang['x_iframe'] = 'IFrame';
***************
*** 547,559 ****
  $lang['x_3_explain'] = '- <i>Multimedia:</i> height (pixles)';
  
! //
! // Dynamic Block
! //
  $lang['default_block_id'] = 'Default Block';
  $lang['default_block_id_explain'] = '- This is the default or first block to display, unless a dynamic block is set';
  
! //
! // Menu Navigation
! //
  $lang['menu_display_mode'] = 'Layout mode';
  $lang['menu_display_mode_explain '] = 'Horizonal or Vertical layout mode';
--- 491,499 ----
  $lang['x_3_explain'] = '- <i>Multimedia:</i> height (pixles)';
  
! /*  Dynamic Block */ 
  $lang['default_block_id'] = 'Default Block';
  $lang['default_block_id_explain'] = '- This is the default or first block to display, unless a dynamic block is set';
  
! /*  Menu Navigation */ 
  $lang['menu_display_mode'] = 'Layout mode';
  $lang['menu_display_mode_explain '] = 'Horizonal or Vertical layout mode';
***************
*** 563,577 ****
  $lang['menu_page_parent_explain ']		= "Navigation from this parent page";
  
! //
! // Version Checker
! //
! $lang['mxBB_Version_up_to_date'] = 'Your MX-Publisher installation is up to date. No updates are available for your version of MX-Publisher.';
! $lang['mxBB_Version_outdated'] = 'Your MX-Publisher installation does <b>not</b> seem to be up to date. Updates are available for your version of MX-Publisher. Please visit <a href="http://www.mx-publisher.com/download" target="_new">the MX-Publisher Core package download</a> to obtain the latest version.';
! $lang['mxBB_Latest_version_info'] = 'The latest available version is <b>MX-Publisher %s</b>. ';
! $lang['mxBB_Current_version_info'] = 'You are running <b>MX-Publisher %s</b>.';
! $lang['mxBB_Mailing_list_subscribe_reminder'] = 'For the latest information on news and updates to MX-Publisher, why not <a href="http://lists.sourceforge.net/lists/listinfo/mxbb-news" target="_new">subscribe to our mailing list</a>?';
  
! //
! // That's all Folks!
! // -------------------------------------------------
  ?>
\ No newline at end of file
--- 503,515 ----
  $lang['menu_page_parent_explain ']		= "Navigation from this parent page";
  
! /*  Version Checker */ 
! $lang['MXP_Version_up_to_date'] = 'Your MX-Publisher installation is up to date. No updates are available for your version of MX-Publisher.';
! $lang['MXP_Version_outdated'] = 'Your MX-Publisher installation does <b>not</b> seem to be up to date. Updates are available for your version of MX-Publisher. Please visit <a href="http://mxpcms.sourceforge.net//download" target="_new">the MX-Publisher Core package download</a> to obtain the latest version.';
! $lang['MXP_Latest_version_info'] = 'The latest available version is <b>MX-Publisher %s</b>. ';
! $lang['MXP_Current_version_info'] = 'You are running <b>MX-Publisher %s</b>.';
! $lang['MXP_Mailing_list_subscribe_reminder'] = 'For the latest information on news and updates to MX-Publisher, why not <a href="http://lists.sourceforge.net/lists/listinfo/mxbb-news" target="_new">subscribe to our mailing list</a>?';
  
! /*
! * That's all Folks!
! * -------------------------------------------------*/
  ?>
\ No newline at end of file

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_italian/lang_main.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lang_main.php	21 Oct 2012 00:04:02 -0000	1.1
--- lang_main.php	28 Jun 2013 15:34:32 -0000	1.2
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */
***************
*** 252,256 ****
  // along with our copyright message indicating you are the translator
  // please add it here.
! //$lang['TRANSLATION_INFO_MXBB'] = 'English Language by <a href="http://www.mx-publisher.com" target="_blank">MX-Publisher Development Team</a>';
  
  //
--- 252,256 ----
  // along with our copyright message indicating you are the translator
  // please add it here.
! //$lang['TRANSLATION_INFO_MXBB'] = 'English Language by <a href="http://mxpcms.sourceforge.net/" target="_blank">MX-Publisher Development Team</a>';
  
  //

[mxbb-commits] core/language/lang_french lang_admin.php, 1.3, 1.4 lang_main.php, 1.3, 1.4

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/language/lang_french
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1530/lang_french

Modified Files:
	lang_admin.php lang_main.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_french/lang_main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lang_main.php	23 Oct 2009 07:46:38 -0000	1.3
--- lang_main.php	28 Jun 2013 15:34:31 -0000	1.4
***************
*** 142,146 ****
  // along with our copyright message indicating you are the translator 
  // please add it here. 
! $lang['TRANSLATION_INFO_MXBB'] = 'Traduction vers le français par <a href="http://www.mx-publisher.com/phpBB2/profile.php?mode=viewprofile&u=7879" target="_blank">sturmy</a>';
  
  
--- 142,146 ----
  // along with our copyright message indicating you are the translator 
  // please add it here. 
! $lang['TRANSLATION_INFO_MXBB'] = 'Traduction vers le français par <a href="http://mxpcms.sourceforge.net//phpBB2/profile.php?mode=viewprofile&u=7879" target="_blank">sturmy</a>';
  
  

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_french/lang_admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lang_admin.php	17 Jun 2013 00:33:30 -0000	1.3
--- lang_admin.php	28 Jun 2013 15:34:31 -0000	1.4
***************
*** 6,23 ****
  * @copyright (c) 2002-2006 MXP Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  *
  */
  
! //
! // Editor Settings: Please set Tabsize to 4 ;-)
! // 
! 
! //
! // The format of this file is:
! //
! // ---> $lang["message"] = 'text';
! //
! // Specify your language character encoding... [optional]
! //
  setlocale(LC_ALL, "fr");
  
--- 6,17 ----
  * @copyright (c) 2002-2006 MXP Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
+ * @link http://mxpcms.sourceforge.net/
  *
  */
  
! /*  Editor Settings: Please set Tabsize to 4 ;-)  */ 
!  
! /*  The format of this file is:  ---> $lang['message'] = 'text';
! /*  Specify your language character encoding... [optional] */
  setlocale(LC_ALL, "fr");
  
***************
*** 32,38 ****
  $lang['Portal_Desc'] = 'A little text to describe your website.';
  
! // 
! // Left AdminCP Panel 
! // 
  $lang['1_General_admin'] = 'Général'; 
  $lang['1_1_Management'] = 'Configuration'; 
--- 26,30 ----
  $lang['Portal_Desc'] = 'A little text to describe your website.';
  
! /* Left AdminCP Panel */
  $lang['1_General_admin'] = 'Général'; 
  $lang['1_1_Management'] = 'Configuration'; 
***************
*** 56,68 ****
  $lang['4_1_PHPinfo'] = 'phpInfo()'; 
  
! // 
! // Index 
! // 
  $lang['Welcome_Mx-Publisher'] = 'Bienvenue dans MX-Publisher'; 
  $lang['Admin_intro_Mx-Publisher'] = 'Merci d\'avoir choisi MX-Publisher comme solution de portail/cms et phpBB comme solution de forum. Cet écran vous donnera un aperçu rapide de diverses statistiques de votre site. Vous pouvez revenir à cette page en cliquant sur le lien <span>Index d\'Administration</span> dans le panneau de gauche. Pour revenir à l\'index de votre portail, cliquez sur le logo qui est aussi dans le panneau de gauche. Les autres liens de la partie gauche de cet écran vous permettent de contrôler tous les aspects de votre utilisation du portail et du forum. Chaque écran comporte des instructions quant à comment utiliser les outils fournis.'; 
  
! // 
! // General 
! // 
  $lang['Yes'] = 'Oui'; 
  $lang['No'] = 'Non'; 
--- 48,56 ----
  $lang['4_1_PHPinfo'] = 'phpInfo()'; 
  
! /* Index */
  $lang['Welcome_Mx-Publisher'] = 'Bienvenue dans MX-Publisher'; 
  $lang['Admin_intro_Mx-Publisher'] = 'Merci d\'avoir choisi MX-Publisher comme solution de portail/cms et phpBB comme solution de forum. Cet écran vous donnera un aperçu rapide de diverses statistiques de votre site. Vous pouvez revenir à cette page en cliquant sur le lien <span>Index d\'Administration</span> dans le panneau de gauche. Pour revenir à l\'index de votre portail, cliquez sur le logo qui est aussi dans le panneau de gauche. Les autres liens de la partie gauche de cet écran vous permettent de contrôler tous les aspects de votre utilisation du portail et du forum. Chaque écran comporte des instructions quant à comment utiliser les outils fournis.'; 
  
! /* General */
  $lang['Yes'] = 'Oui'; 
  $lang['No'] = 'Non'; 
***************
*** 109,115 ****
  $lang['error_no_field'] = 'Il manque un champ. Veuillez remplir tous les champs requis.'; 
  
! // 
! // Configuration 
! // 
  $lang['Portal_admin'] = 'Administration du portail'; 
  $lang['Portal_admin_explain'] = 'Utilisez ce formulaire pour personnaliser votre portail'; 
--- 97,101 ----
  $lang['error_no_field'] = 'Il manque un champ. Veuillez remplir tous les champs requis.'; 
  
! /* Configuration */
  $lang['Portal_admin'] = 'Administration du portail'; 
  $lang['Portal_admin_explain'] = 'Utilisez ce formulaire pour personnaliser votre portail'; 
***************
*** 164,170 ****
  $lang['Portal_config_valid_false'] = '<b><font>Mauvaise Installation. Soit le chemin relatif phpBB est faux soit phpBB n\'est pas installé (votre base de données phpBB est indisponible). Ainsi, le backend \'interne\' est utilisé.</font></b>'; 
  
! // 
! // Module Management 
! // 
  $lang['Module_admin'] = 'Administration des Modules'; 
  $lang['Module_admin_explain'] = 'Utiliser ce formulaire pour gérer les modules: installation, mise à jour et développement.<br><b>Pour utiliser ce panneau, JavaScript et les cookies doivent être activés dans votre navigateur!</b>'; 
--- 150,154 ----
  $lang['Portal_config_valid_false'] = '<b><font>Mauvaise Installation. Soit le chemin relatif phpBB est faux soit phpBB n\'est pas installé (votre base de données phpBB est indisponible). Ainsi, le backend \'interne\' est utilisé.</font></b>'; 
  
! /* Module Management */
  $lang['Module_admin'] = 'Administration des Modules'; 
  $lang['Module_admin_explain'] = 'Utiliser ce formulaire pour gérer les modules: installation, mise à jour et développement.<br><b>Pour utiliser ce panneau, JavaScript et les cookies doivent être activés dans votre navigateur!</b>'; 
***************
*** 182,188 ****
  $lang['Module_include_admin'] = 'Inclure ce module dans la navigation du Panneau Administrateur'; 
  
! // 
! // Module Installation 
! // 
  $lang['Module_delete_db'] = 'Etes-vous sur de vouloir désinstaller ce mondule? Attention: Vous perdrez toutes les données du module. Songez plutôt à mettre à jour.'; 
  $lang['Click_module_delete_yes'] = 'Cliquer %sIci%s pour désinstaller ce module'; 
--- 166,170 ----
  $lang['Module_include_admin'] = 'Inclure ce module dans la navigation du Panneau Administrateur'; 
  
! /*Module Installation */
  $lang['Module_delete_db'] = 'Etes-vous sur de vouloir désinstaller ce mondule? Attention: Vous perdrez toutes les données du module. Songez plutôt à mettre à jour.'; 
  $lang['Click_module_delete_yes'] = 'Cliquer %sIci%s pour désinstaller ce module'; 
***************
*** 217,223 ****
  $lang['module_install_info'] = 'Information Installation/Mise à Jour/Désinstallation de Mod - tables de BdD spécifiques'; 
  
! // 
! // Functions & Parameters Administration 
! // 
  $lang['Function_admin'] = 'Aministration de Fonctions de Bloc'; 
  $lang['Function_admin_explain'] = 'Les modules ont une ou plus fonction de bloc. Utilisez ce formulaire pour éditer, ajouter ou supprimer une fonction de bloc'; 
--- 199,203 ----
  $lang['module_install_info'] = 'Information Installation/Mise à Jour/Désinstallation de Mod - tables de BdD spécifiques'; 
  
! /* Functions & Parameters Administration */
  $lang['Function_admin'] = 'Aministration de Fonctions de Bloc'; 
  $lang['Function_admin_explain'] = 'Les modules ont une ou plus fonction de bloc. Utilisez ce formulaire pour éditer, ajouter ou supprimer une fonction de bloc'; 
***************
*** 250,256 ****
  $lang['Click_parameter_delete_yes'] = 'Cliquer %sIci%s pour supprimer le Paramètre'; 
  
! // 
! // Parameter Types 
! // 
  $lang['ParType_BBText'] = 'Bloc Texte BBCode Simple'; 
  $lang['ParType_BBText_info'] = 'Ceci est un Bloc Texte simple qui interprète le BBCode'; 
--- 230,234 ----
  $lang['Click_parameter_delete_yes'] = 'Cliquer %sIci%s pour supprimer le Paramètre'; 
  
! /* Parameter Types */
  $lang['ParType_BBText'] = 'Bloc Texte BBCode Simple'; 
  $lang['ParType_BBText_info'] = 'Ceci est un Bloc Texte simple qui interprète le BBCode'; 
***************
*** 276,283 ****
  $lang['ParType_Checkbox_multiple_select'] = 'Cases à cocher Multiples'; 
  $lang['ParType_Checkbox_multiple_select_info'] = ''; 
! 
! // 
! // Blocks Administration 
! // 
  $lang['Block_admin'] = 'Panneau de Contrôle de Bloc'; 
  $lang['Block_admin_explain'] = 'Utiliser ce formulaire pour gérer les blocs de portail.<br><b>Pour utiliser ce panneau, JavaScript et les cookies doivent être activés dans votre navigateur!</b>'; 
--- 254,258 ----
  $lang['ParType_Checkbox_multiple_select'] = 'Cases à cocher Multiples'; 
  $lang['ParType_Checkbox_multiple_select_info'] = ''; 
! /* Blocks Administration */
  $lang['Block_admin'] = 'Panneau de Contrôle de Bloc'; 
  $lang['Block_admin_explain'] = 'Utiliser ce formulaire pour gérer les blocs de portail.<br><b>Pour utiliser ce panneau, JavaScript et les cookies doivent être activés dans votre navigateur!</b>'; 
***************
*** 289,295 ****
  $lang['Show_stats'] = 'Afficher Statistiques?'; 
  $lang['Show_stats_explain'] = '- Si \'oui\', \'modifié par...\' sera affiché sous le bloc'; 
! //***** TBC 
  $lang['Show_blocks'] = 'Voir les Blocs Fonction'; 
! //***** TBC 
  $lang['Block_delete'] = 'Supprimer un Bloc'; 
  $lang['Block_delete_explain'] = 'Utiliser ce formulaire pour suppromer un bloc (ou une colonne)'; 
--- 264,270 ----
  $lang['Show_stats'] = 'Afficher Statistiques?'; 
  $lang['Show_stats_explain'] = '- Si \'oui\', \'modifié par...\' sera affiché sous le bloc'; 
! /***** TBC */ 
  $lang['Show_blocks'] = 'Voir les Blocs Fonction'; 
! /***** TBC */
  $lang['Block_delete'] = 'Supprimer un Bloc'; 
  $lang['Block_delete_explain'] = 'Utiliser ce formulaire pour suppromer un bloc (ou une colonne)'; 
***************
*** 304,320 ****
  $lang['Delete_block'] = 'Supprimer un Bloc Portail'; 
  $lang['Delete_block_explain'] = 'Ceci va supprimer le bloc et mettre a jour toutes les Pages Portail associées. Attention: cette opération ne peut être annulée!'; 
! $lang['Click_block_delete_yes'] = 'Cliquer %sIci%s pour supprimer le Bloc'; 
! 
! // 
! // BlockCP Administration 
! // 
  $lang['Block_cp'] = 'Panneau de Contrôle de Bloc'; 
  $lang['Click_return_blockCP_admin'] = 'Cliquer %sIci%s pour revenir au Panneau de Contrôle de Bloc'; 
  $lang['Click_return_portalpage_admin'] = 'Cliquer %sIci%s pour revenir a la Page Portail'; 
! $lang['BlockCP_Config_updated'] = 'Ce bloc a été mis à jour.'; 
! 
! // 
! // Pages Administration 
! // 
  $lang['Page_admin'] = 'Administration de Page'; 
  $lang['Page_admin_explain'] = 'Utiliser ce formulaire pour ajouter, supprimer et changer les paramètres des Pages Portail et Modèles de Pages.<br><b>Pour utiliser ce panneau, JavaScript et les cookies doivent être activés dans votre navigateur!</b>'; 
--- 279,291 ----
  $lang['Delete_block'] = 'Supprimer un Bloc Portail'; 
  $lang['Delete_block_explain'] = 'Ceci va supprimer le bloc et mettre a jour toutes les Pages Portail associées. Attention: cette opération ne peut être annulée!'; 
! $lang['Click_block_delete_yes'] = 'Cliquer %sIci%s pour supprimer le Bloc';
!  
! /** BlockCP Administration */
  $lang['Block_cp'] = 'Panneau de Contrôle de Bloc'; 
  $lang['Click_return_blockCP_admin'] = 'Cliquer %sIci%s pour revenir au Panneau de Contrôle de Bloc'; 
  $lang['Click_return_portalpage_admin'] = 'Cliquer %sIci%s pour revenir a la Page Portail'; 
! $lang['BlockCP_Config_updated'] = 'Ce bloc a été mis à jour.';
!  
! /** Pages Administration */
  $lang['Page_admin'] = 'Administration de Page'; 
  $lang['Page_admin_explain'] = 'Utiliser ce formulaire pour ajouter, supprimer et changer les paramètres des Pages Portail et Modèles de Pages.<br><b>Pour utiliser ce panneau, JavaScript et les cookies doivent être activés dans votre navigateur!</b>'; 
***************
*** 388,394 ****
  $lang['Add_Virtual_Block_explain']    = 'Ce bloc transforme cette Page en une page virtuelle (blog)'; 
  
! // 
! // Page templates 
! // 
  $lang['Page_templates_admin'] = 'Administration des Modèles de Page'; 
  $lang['Page_templates_admin_explain'] = 'Utiliser cette page pour créer, éditer ou supprimer des Modèles de Page'; 
--- 359,363 ----
  $lang['Add_Virtual_Block_explain']    = 'Ce bloc transforme cette Page en une page virtuelle (blog)'; 
  
! /** Page templates */
  $lang['Page_templates_admin'] = 'Administration des Modèles de Page'; 
  $lang['Page_templates_admin_explain'] = 'Utiliser cette page pour créer, éditer ou supprimer des Modèles de Page'; 
***************
*** 410,416 ****
  $lang['Click_page_template_column_delete_yes'] = 'Cliquer %sIci%s pour supprimer le Modèle de Page'; 
  
! // 
! // Cache 
! // 
  $lang['Cache_dir_write_protect'] = 'Votre répertoire de cache est protégé en écriture. MX-Publisher ne peut générer le fichier cache. Veuillez rendre votre répertoire cache autorisé en écriture pour poursuivre.'; 
  $lang['Cache_generate'] = 'Vos fichiers cache ont été générés.'; 
--- 379,383 ----
  $lang['Click_page_template_column_delete_yes'] = 'Cliquer %sIci%s pour supprimer le Modèle de Page'; 
  
! /** Cache */
  $lang['Cache_dir_write_protect'] = 'Votre répertoire de cache est protégé en écriture. MX-Publisher ne peut générer le fichier cache. Veuillez rendre votre répertoire cache autorisé en écriture pour poursuivre.'; 
  $lang['Cache_generate'] = 'Vos fichiers cache ont été générés.'; 
***************
*** 419,435 ****
  $lang['Generate_mx_cache'] = 'Générer le Cache de Blocs'; 
  
! // 
! // These are displayed in the drop down boxes for advanced 
! // mode Module auth, try and keep them short! 
! // 
  $lang['Menu_Navigation'] = 'Menu de Navigation'; 
  $lang['Portal_index'] = 'Index du Portail'; 
  $lang['Save_Settings'] = 'Sauver Paramètres'; 
  $lang['Translation_Tools'] = 'Outils de Traduction'; 
! $lang['Preview_portal'] = 'Aperçu du Portail'; 
! 
! // 
! // META 
! // 
  $lang['Meta_admin'] = 'Administration des Tags META'; 
  $lang['Mega_admin_explain'] = 'Utiliser ce formulaire pour personnaliser vos tags META'; 
--- 386,398 ----
  $lang['Generate_mx_cache'] = 'Générer le Cache de Blocs'; 
  
! /** These are displayed in the drop down boxes for advanced 
! mode Module auth, try and keep them short! */
  $lang['Menu_Navigation'] = 'Menu de Navigation'; 
  $lang['Portal_index'] = 'Index du Portail'; 
  $lang['Save_Settings'] = 'Sauver Paramètres'; 
  $lang['Translation_Tools'] = 'Outils de Traduction'; 
! $lang['Preview_portal'] = 'Aperçu du Portail';
!  
! /** META */
  $lang['Meta_admin'] = 'Administration des Tags META'; 
  $lang['Mega_admin_explain'] = 'Utiliser ce formulaire pour personnaliser vos tags META'; 
***************
*** 452,458 ****
  $lang['Meta_data_ioerror'] = 'Impossible d\'ouvrir mx_meta.inc. Vérifier que le fichier est autorisé en écriture (chmod 777).'; 
  
! // 
! // Portal permissons 
! // 
  $lang['Mx_Block_Auth_Title'] = 'Permissions Privées de Bloc' ; 
  $lang['Mx_Block_Auth_Explain'] = 'Ici, vous pouvez configurer des Permissions Privées de Bloc'; 
--- 415,419 ----
  $lang['Meta_data_ioerror'] = 'Impossible d\'ouvrir mx_meta.inc. Vérifier que le fichier est autorisé en écriture (chmod 777).'; 
  
! /** Portal permissons */
  $lang['Mx_Block_Auth_Title'] = 'Permissions Privées de Bloc' ; 
  $lang['Mx_Block_Auth_Explain'] = 'Ici, vous pouvez configurer des Permissions Privées de Bloc'; 
***************
*** 470,495 ****
  $lang['AUTH_ANONYMOUS'] = 'ANONYME'; 
  
! // ----------------------------------- 
! // BlockCP - Block Parameter Specific 
! // ----------------------------------- 
! 
! // 
! // General 
! // 
  $lang['target_block'] = 'Bloc Cible'; 
  $lang['target_block_explain'] = '- liens, données etc... referant à ce bloc'; 
  
! // 
! // Split column 
! // 
  $lang['block_ids'] = 'Blocs Source'; 
  $lang['block_ids_explain'] = '- à placer de gauche à droite'; 
  $lang['block_sizes'] = 'Tailles de Blocs (séparées par des virgules)'; 
  $lang['block_sizes_explain'] = '- Vous pouvez spécifier des tailles en chiffres (pixels), pourcentages (tailles relatives, ie. \'40%\') ou \'*\' pour le reste.'; 
! $lang['space_between'] = 'Espace entre les Blocs'; 
! 
! // 
! // Sitelog 
! // 
  $lang['log_filter_date'] = 'Filtrer par Date'; 
  $lang['log_filter_date_explain'] = '- Montre les logs de la semaine, du mois, de l\'année précédents...'; 
--- 431,450 ----
  $lang['AUTH_ANONYMOUS'] = 'ANONYME'; 
  
! /* -----------------------------------
!  BlockCP - Block Parameter Specific 
!  ----------------------------------- */
!  
! /** General */
  $lang['target_block'] = 'Bloc Cible'; 
  $lang['target_block_explain'] = '- liens, données etc... referant à ce bloc'; 
  
! /** Split column */
  $lang['block_ids'] = 'Blocs Source'; 
  $lang['block_ids_explain'] = '- à placer de gauche à droite'; 
  $lang['block_sizes'] = 'Tailles de Blocs (séparées par des virgules)'; 
  $lang['block_sizes_explain'] = '- Vous pouvez spécifier des tailles en chiffres (pixels), pourcentages (tailles relatives, ie. \'40%\') ou \'*\' pour le reste.'; 
! $lang['space_between'] = 'Espace entre les Blocs';
!  
! /** Sitelog */
  $lang['log_filter_date'] = 'Filtrer par Date'; 
  $lang['log_filter_date_explain'] = '- Montre les logs de la semaine, du mois, de l\'année précédents...'; 
***************
*** 497,503 ****
  $lang['numOfEvents_explain'] = '- Nombre d\'évènements à afficher'; 
  
! // 
! // IncludeX 
! // 
  $lang['x_listen'] = 'Listen (GET)'; 
  $lang['x_iframe'] = 'IFrame'; 
--- 452,456 ----
  $lang['numOfEvents_explain'] = '- Nombre d\'évènements à afficher'; 
  
! /** IncludeX */
  $lang['x_listen'] = 'Listen (GET)'; 
  $lang['x_iframe'] = 'IFrame'; 
***************
*** 513,527 ****
  $lang['x_2_explain'] = '- <i>IFrame:</i> hauteur du cadre (pixels)<br><i>Multimedia:</i> largeur (pixels)'; 
  $lang['x_3'] = 'Variable 3:'; 
! $lang['x_3_explain'] = '- <i>Multimedia:</i> hauteur (pixels)'; 
! 
! // 
! // Dynamic Block 
! // 
  $lang['default_block_id'] = 'Bloc par Défaut'; 
  $lang['default_block_id_explain'] = '- Ceci est le bloc par défaut ou le premier bloc à afficher, a moins qu\'un bloc dynamique soit défini'; 
  
! // 
! // Menu Navigation 
! // 
  $lang['menu_display_mode'] = 'Mode de Disposition'; 
  $lang['menu_display_mode_explain '] = 'Mode de disposition Horizonale ou Verticale'; 
--- 466,476 ----
  $lang['x_2_explain'] = '- <i>IFrame:</i> hauteur du cadre (pixels)<br><i>Multimedia:</i> largeur (pixels)'; 
  $lang['x_3'] = 'Variable 3:'; 
! $lang['x_3_explain'] = '- <i>Multimedia:</i> hauteur (pixels)';
!  
! /** Dynamic Block */
  $lang['default_block_id'] = 'Bloc par Défaut'; 
  $lang['default_block_id_explain'] = '- Ceci est le bloc par défaut ou le premier bloc à afficher, a moins qu\'un bloc dynamique soit défini'; 
  
! /** Menu Navigation */
  $lang['menu_display_mode'] = 'Mode de Disposition'; 
  $lang['menu_display_mode_explain '] = 'Mode de disposition Horizonale ou Verticale'; 
***************
*** 531,545 ****
  $lang['menu_page_parent_explain ']      = "Navigation depuis cette Page Parente"; 
  
! // 
! // Version Checker 
! // 
! $lang['Mx-Publisher_Version_up_to_date'] = 'Votre installation de MX-Publisher est à jour. Aucune mise à jour n\'est disponible pour votre version de MX-Publisher.'; 
! $lang['Mx-Publisher_Version_outdated'] = 'Votre installation de MX-Publisher ne semble <b>pas</b> être à jour. Des mises à jour sont disponibles pour votre version de MX-Publisher. Merci de visiter <a href="http://www.mx-publisher.com/download" target="_new">the MX-Publisher Core package download</a> pour obtenir la dernière version.'; 
! $lang['Mx-Publisher_Latest_version_info'] = 'The latest available version is <b>MX-Publisher %s</b>. '; 
! $lang['Mx-Publisher_Current_version_info'] = 'Vous utilisez <b>MX-Publisher %s</b>.'; 
! $lang['Mx-Publisher_Mailing_list_subscribe_reminder'] = 'Pour toutes les dernières informations sur la vie et les mises à jour de MX-Publisher, pourquoi ne pas <a href="http://lists.sourceforge.net/lists/listinfo/mxbb-news" target="_new">vous abonner à notre mailing list</a>?'; 
  
! // 
! // That's all Folks! 
! // ------------------------------------------------- 
  ?>
\ No newline at end of file
--- 480,492 ----
  $lang['menu_page_parent_explain ']      = "Navigation depuis cette Page Parente"; 
  
! /** Version Checker */
! $lang['MXP_Version_up_to_date'] = 'Votre installation de MX-Publisher est à jour. Aucune mise à jour n\'est disponible pour votre version de MX-Publisher.'; 
! $lang['MXP_Version_outdated'] = 'Votre installation de MX-Publisher ne semble <b>pas</b> être à jour. Des mises à jour sont disponibles pour votre version de MX-Publisher. Merci de visiter <a href="http://mxpcms.sourceforge.net//download" target="_new">the MX-Publisher Core package download</a> pour obtenir la dernière version.'; 
! $lang['MXP_Latest_version_info'] = 'The latest available version is <b>MX-Publisher %s</b>. '; 
! $lang['MXP_Current_version_info'] = 'Vous utilisez <b>MX-Publisher %s</b>.'; 
! $lang['MXP_Mailing_list_subscribe_reminder'] = 'Pour toutes les dernières informations sur la vie et les mises à jour de MX-Publisher, pourquoi ne pas <a href="http://lists.sourceforge.net/lists/listinfo/mxbb-news" target="_new">vous abonner à notre mailing list</a>?'; 
  
! /*
! * That's all Folks!
! * -------------------------------------------------*/
  ?>
\ No newline at end of file

[mxbb-commits] core/includes/shared/phpbb3/includes functions_hook.php, 1.21, 1.22 message_parser.php, 1.9, 1.10

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1506

Modified Files:
	functions_hook.php message_parser.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: message_parser.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/message_parser.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** message_parser.php	31 Oct 2008 18:55:14 -0000	1.9
--- message_parser.php	28 Jun 2013 15:34:11 -0000	1.10
***************
*** 6,10 ****
   * @copyright (c) 2002-2008 MX-Publisher Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
!  * @link http://www.mx-publisher.com
   */
  
--- 6,10 ----
   * @copyright (c) 2002-2008 MX-Publisher Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
!  * @link http://mxpcms.sourceforge.net/
   */
  

Index: functions_hook.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** functions_hook.php	31 Oct 2008 18:55:14 -0000	1.21
--- functions_hook.php	28 Jun 2013 15:34:11 -0000	1.22
***************
*** 6,10 ****
   * @copyright (c) 2002-2008 MX-Publisher Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
!  * @link http://www.mx-publisher.com
   */
  
--- 6,10 ----
   * @copyright (c) 2002-2008 MX-Publisher Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
!  * @link http://mxpcms.sourceforge.net/
   */
  

[mxbb-commits] core/includes/shared/phpbb2/language/lang_swedish lang_main.php, 1.2, 1.3

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_swedish
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1458

Modified Files:
	lang_main.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_swedish/lang_main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lang_main.php	16 Feb 2008 21:41:57 -0000	1.2
--- lang_main.php	28 Jun 2013 15:34:00 -0000	1.3
***************
*** 75,79 ****
  // along with our copyright message indicating you are the translator
  // please add it here.
! $lang['TRANSLATION_INFO'] = '<a href="http://www.mx-publisher.com" target="_blank" class="gensmall">Swedish</a> translation by <a href="mailto:jon...@mx..." title="Jon Ohlsson" class="gensmall">Jon Ohlsson</a> &copy; 2004-2008';
  
  //
--- 75,79 ----
  // along with our copyright message indicating you are the translator
  // please add it here.
! $lang['TRANSLATION_INFO'] = '<a href="http://mxpcms.sourceforge.net/" target="_blank" class="gensmall">Swedish</a> translation by <a href="mailto:jon...@mx..." title="Jon Ohlsson" class="gensmall">Jon Ohlsson</a> &copy; 2004-2008';
  
  //

[mxbb-commits] core/includes/sessions/phpbb2 auth.php, 1.3, 1.4 bbcode.php, 1.3, 1.4 constants.php, 1.5, 1.6 core.php, 1.26, 1.27 functions.php, 1.1, 1.2 login.php, 1.8, 1.9 session.php, 1.16, 1.17

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/phpbb2
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1402/phpbb2

Modified Files:
	auth.php bbcode.php constants.php core.php functions.php 
	login.php session.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: login.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/login.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** login.php	31 Oct 2008 18:54:23 -0000	1.8
--- login.php	28 Jun 2013 15:33:47 -0000	1.9
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** functions.php	15 Jul 2008 22:03:30 -0000	1.1
--- functions.php	28 Jun 2013 15:33:47 -0000	1.2
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** core.php	30 Dec 2011 04:29:27 -0000	1.26
--- core.php	28 Jun 2013 15:33:47 -0000	1.27
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: constants.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/constants.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** constants.php	23 Apr 2010 19:39:53 -0000	1.5
--- constants.php	28 Jun 2013 15:33:47 -0000	1.6
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/bbcode.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bbcode.php	25 Jun 2013 18:15:06 -0000	1.3
--- bbcode.php	28 Jun 2013 15:33:47 -0000	1.4
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/session.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** session.php	21 Feb 2011 09:36:45 -0000	1.16
--- session.php	28 Jun 2013 15:33:47 -0000	1.17
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2001 The phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2001 The phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: auth.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/auth.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** auth.php	5 Feb 2008 18:37:20 -0000	1.3
--- auth.php	28 Jun 2013 15:33:47 -0000	1.4
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

[mxbb-commits] core/includes/sessions/internal bbcode.php, 1.2, 1.3 constants.php, 1.3, 1.4 core.php, 1.16, 1.17 login.php, 1.8, 1.9 session.php, 1.18, 1.19

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/internal
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1402/internal

Modified Files:
	bbcode.php constants.php core.php login.php session.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: login.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/login.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** login.php	31 Oct 2008 18:54:23 -0000	1.8
--- login.php	28 Jun 2013 15:33:47 -0000	1.9
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/core.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** core.php	30 Mar 2011 10:03:55 -0000	1.16
--- core.php	28 Jun 2013 15:33:47 -0000	1.17
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: constants.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/constants.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** constants.php	15 Jun 2008 09:15:43 -0000	1.3
--- constants.php	28 Jun 2013 15:33:47 -0000	1.4
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** session.php	21 Feb 2011 09:36:45 -0000	1.18
--- session.php	28 Jun 2013 15:33:47 -0000	1.19
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2001 The phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2001 The phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/bbcode.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bbcode.php	31 Oct 2008 18:54:23 -0000	1.2
--- bbcode.php	28 Jun 2013 15:33:47 -0000	1.3
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

[mxbb-commits] core/includes/db dbal.php, 1.16, 1.17 firebird.php, 1.16, 1.17 mssql.php, 1.20, 1.21 mssql_odbc.php, 1.17, 1.18 mysql.php, 1.25, 1.26 mysql4.php, 1.23, 1.24 mysqli.php, 1.26, 1.27 oracle.php, 1.17, 1.18 postgres.php, 1.18, 1.19 sqlite.php, 1.17, 1.18

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/db
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1366/db

Modified Files:
	dbal.php firebird.php mssql.php mssql_odbc.php mysql.php 
	mysql4.php mysqli.php oracle.php postgres.php sqlite.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: mysqli.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/mysqli.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** mysqli.php	16 Jun 2013 23:36:08 -0000	1.26
--- mysqli.php	28 Jun 2013 15:33:26 -0000	1.27
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: sqlite.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/sqlite.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sqlite.php	1 Nov 2008 11:34:54 -0000	1.17
--- sqlite.php	28 Jun 2013 15:33:26 -0000	1.18
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: postgres.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/postgres.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** postgres.php	1 Nov 2008 11:34:54 -0000	1.18
--- postgres.php	28 Jun 2013 15:33:26 -0000	1.19
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: mysql4.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/mysql4.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mysql4.php	18 Oct 2009 04:15:32 -0000	1.23
--- mysql4.php	28 Jun 2013 15:33:26 -0000	1.24
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: firebird.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/firebird.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** firebird.php	31 Oct 2008 18:53:49 -0000	1.16
--- firebird.php	28 Jun 2013 15:33:26 -0000	1.17
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: mssql.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/mssql.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mssql.php	18 Oct 2009 04:15:32 -0000	1.20
--- mssql.php	28 Jun 2013 15:33:26 -0000	1.21
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: mysql.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/mysql.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** mysql.php	18 Oct 2009 04:15:32 -0000	1.25
--- mysql.php	28 Jun 2013 15:33:26 -0000	1.26
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: dbal.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/dbal.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dbal.php	16 Jun 2013 16:45:55 -0000	1.16
--- dbal.php	28 Jun 2013 15:33:26 -0000	1.17
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: oracle.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/oracle.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** oracle.php	1 Nov 2008 11:34:54 -0000	1.17
--- oracle.php	28 Jun 2013 15:33:26 -0000	1.18
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: mssql_odbc.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/mssql_odbc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** mssql_odbc.php	1 Nov 2008 11:34:54 -0000	1.17
--- mssql_odbc.php	28 Jun 2013 15:33:26 -0000	1.18
***************
*** 7,11 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://www.mx-publisher.com
  *
  */
--- 7,11 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
! * @link http://mxpcms.sourceforge.net/
  *
  */

[mxbb-commits] core/includes mx_class_loader.php, 1.1, 1.2 mx_constants.php, 1.34, 1.35 mx_functions.php, 1.120, 1.121 mx_functions_admincp.php, 1.72, 1.73 mx_functions_bbcode.php, 1.20, 1.21 mx_functions_blockcp.php, 1.31, 1.32 mx_functions_ch.php, 1.15, 1.16 mx_functions_core.php, 1.136, 1.137 mx_functions_emailer.php, 1.3, 1.4 mx_functions_smtp.php, 1.1, 1.2 mx_functions_style.php, 1.134, 1.135 mx_functions_tools.php, 1.64, 1.65 page_header.php, 1.75, 1.76 page_tail.php, 1.45, 1.46 template.php, 1.40, 1.41

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1281/includes

Modified Files:
	mx_class_loader.php mx_constants.php mx_functions.php 
	mx_functions_admincp.php mx_functions_bbcode.php 
	mx_functions_blockcp.php mx_functions_ch.php 
	mx_functions_core.php mx_functions_emailer.php 
	mx_functions_smtp.php mx_functions_style.php 
	mx_functions_tools.php page_header.php page_tail.php 
	template.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: mx_functions_ch.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_ch.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mx_functions_ch.php	30 Mar 2011 10:03:55 -0000	1.15
--- mx_functions_ch.php	28 Jun 2013 15:32:38 -0000	1.16
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  * @internal
  *
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  * @internal
  *

Index: mx_functions_smtp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_smtp.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_functions_smtp.php	7 Oct 2008 00:10:14 -0000	1.1
--- mx_functions_smtp.php	28 Jun 2013 15:32:38 -0000	1.2
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team & ( C) 2001 The phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
   
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team & ( C) 2001 The phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
   

Index: page_tail.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** page_tail.php	16 Jun 2013 01:10:13 -0000	1.45
--- page_tail.php	28 Jun 2013 15:32:38 -0000	1.46
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  * @internal
  *
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  * @internal
  *

Index: mx_functions_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** mx_functions_blockcp.php	25 Jun 2013 17:14:48 -0000	1.31
--- mx_functions_blockcp.php	28 Jun 2013 15:32:38 -0000	1.32
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: mx_class_loader.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_class_loader.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_class_loader.php	26 Jun 2013 09:19:29 -0000	1.1
--- mx_class_loader.php	28 Jun 2013 15:32:38 -0000	1.2
***************
*** 31,38 ****
  class mx_class_loader
  {
! 	private $prefix;
! 	private $path;
! 	private $php_ext;
! 	private $mx_cache;
  
  	/**
--- 31,38 ----
  class mx_class_loader
  {
! 	//private $prefix;
! 	//private $path;
! 	//private $php_ext;
! 	//private $mx_cache;
  
  	/**
***************
*** 42,46 ****
  	* @var array
  	*/
! 	private $cached_paths = array();
  
  	/**
--- 42,46 ----
  	* @var array
  	*/
! 	//private $cached_paths = array();
  
  	/**
***************
*** 53,57 ****
  	* @param MX_cache_driver_interface $cache An implementation of the MX cache interface.
  	*/
! 	public function __construct($prefix, $path, $php_ext = 'php', mx_cache_driver_interface $mx_cache = null)
  	{
  		$this->prefix = $prefix;
--- 53,57 ----
  	* @param MX_cache_driver_interface $cache An implementation of the MX cache interface.
  	*/
! 	public function __construct($prefix, $path, $php_ext = 'php', $mx_cache = null)
  	{
  		$this->prefix = $prefix;

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** mx_functions_core.php	26 Jun 2013 09:15:23 -0000	1.136
--- mx_functions_core.php	28 Jun 2013 15:32:38 -0000	1.137
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
[...1572 lines suppressed...]
  		return empty($_GET[$var]) ? 1 : 0 ;
--- 4433,4437 ----
  	 * @return boolean
  	 */
! 	public function is_empty_get($var)
  	{
  		return empty($_GET[$var]) ? 1 : 0 ;
***************
*** 4460,4464 ****
  	 * @return boolean
  	 */
! 	function is_empty_request($var)
  	{
  		return ($this->is_empty_get($var) && $this->is_empty_post($var)) ? 1 : 0;
--- 4447,4451 ----
  	 * @return boolean
  	 */
! 	public function is_empty_request($var)
  	{
  		return ($this->is_empty_get($var) && $this->is_empty_post($var)) ? 1 : 0;

Index: mx_constants.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_constants.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** mx_constants.php	25 Oct 2012 12:58:23 -0000	1.34
--- mx_constants.php	28 Jun 2013 15:32:38 -0000	1.35
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: mx_functions_bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mx_functions_bbcode.php	12 Sep 2012 22:10:20 -0000	1.20
--- mx_functions_bbcode.php	28 Jun 2013 15:32:38 -0000	1.21
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: mx_functions_emailer.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_emailer.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mx_functions_emailer.php	6 Jan 2010 19:40:37 -0000	1.3
--- mx_functions_emailer.php	28 Jun 2013 15:32:38 -0000	1.4
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team & ( C) 2001 The phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
   
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team & ( C) 2001 The phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
   

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** mx_functions_tools.php	5 Apr 2013 06:21:58 -0000	1.64
--- mx_functions_tools.php	28 Jun 2013 15:32:38 -0000	1.65
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: template.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/template.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** template.php	16 Jun 2013 01:10:13 -0000	1.40
--- template.php	28 Jun 2013 15:32:39 -0000	1.41
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 [CyberAlien, OryNider] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 [CyberAlien, OryNider] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** page_header.php	25 Jun 2013 17:14:48 -0000	1.75
--- page_header.php	28 Jun 2013 15:32:38 -0000	1.76
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  * @internal
  *
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  * @internal
  *

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** mx_functions_style.php	26 Jun 2013 09:15:23 -0000	1.134
--- mx_functions_style.php	28 Jun 2013 15:32:38 -0000	1.135
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** mx_functions_admincp.php	26 Jun 2013 09:15:23 -0000	1.72
--- mx_functions_admincp.php	28 Jun 2013 15:32:38 -0000	1.73
***************
*** 6,10 ****
  * @copyright (c) 2002-2006 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2006 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** mx_functions.php	26 Jun 2013 09:15:22 -0000	1.120
--- mx_functions.php	28 Jun 2013 15:32:38 -0000	1.121
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

[mxbb-commits] core common.php, 1.118, 1.119 config.php, 1.15, 1.16 login.php, 1.33, 1.34

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1281

Modified Files:
	common.php config.php login.php 
Log Message:
mxpcms since mx-publisher domain is out

Index: login.php
===================================================================
RCS file: /cvsroot/mxbb/core/login.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** login.php	30 Mar 2011 10:05:23 -0000	1.33
--- login.php	28 Jun 2013 15:32:38 -0000	1.34
***************
*** 6,10 ****
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://www.mx-publisher.com
  *
  */
--- 6,10 ----
  * @copyright (c) 2002-2008 MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
! * @link http://mxpcms.sourceforge.net/
  *
  */

Index: config.php
===================================================================
RCS file: /cvsroot/mxbb/core/config.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** config.php	16 Jun 2013 16:15:59 -0000	1.15
--- config.php	28 Jun 2013 15:32:37 -0000	1.16
***************
*** 6,9 ****
--- 6,21 ----
  // This file must be put into the MX-Publisher Modular System directory, not into the phpBB directory.
  
+ $dbms = 'mysql4';
+ 
+ $dbhost = 'localhost';
+ $dbname = 'caleacrestina_uv_ro01';
+ $dbuser = 'caleacrestina_01';
+ $dbpasswd = 'tZDvL7A2';
+ 
+ $mx_table_prefix = 'ms_';
+ 
+ define('UTF_STATUS', 'phpbb3');
+ 
+ define('MX_INSTALLED', true);
  
  ?>
\ No newline at end of file

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** common.php	26 Jun 2013 09:15:22 -0000	1.118
--- common.php	28 Jun 2013 15:32:37 -0000	1.119
***************
*** 200,204 ****
  * MX-Publisher CORE Includes
  */
! //require($mx_root_path . INCLUDES . 'mx_class_loader.' . $phpEx);
  require($mx_root_path . INCLUDES . 'mx_constants.' . $phpEx); // Also includes phpBB constants
  require($mx_root_path . INCLUDES . 'db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class
--- 200,204 ----
  * MX-Publisher CORE Includes
  */
! require($mx_root_path . INCLUDES . 'mx_class_loader.' . $phpEx);
  require($mx_root_path . INCLUDES . 'mx_constants.' . $phpEx); // Also includes phpBB constants
  require($mx_root_path . INCLUDES . 'db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class
***************
*** 209,216 ****
  if (@phpversion() >= '5.1.2')
  {
! 	//$mx_class_loader = new mx_class_loader('mx_', "{$mx_root_path}includes/", $phpEx);
! 	//$mx_class_loader->register();
! 	//$mx_class_loader_ext = new mx_class_loader('mx_ext_', "{$mx_root_path}ext/", $phpEx);
! 	//$mx_class_loader_ext->register();
  }
  
--- 209,216 ----
  if (@phpversion() >= '5.1.2')
  {
! 	$mx_class_loader = new mx_class_loader('mx_', "{$mx_root_path}includes/", $phpEx);
! 	$mx_class_loader->register();
! 	$mx_class_loader_ext = new mx_class_loader('mx_ext_', "{$mx_root_path}ext/", $phpEx);
! 	$mx_class_loader_ext->register();
  }
  

[mxbb-commits] core/includes/lock db.php, NONE, 1.1 flock.php, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/lock
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25562/lock

Added Files:
	db.php flock.php 
Log Message:


--- NEW FILE: flock.php ---
<?php
/**
*
* @package MXP3
* @copyright (c) 2012 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/

/**
* @ignore
*/
if (!defined('IN_PORTAL'))
{
	exit;
}

/**
* File locking class
* @package MXP3
*/
class mx_lock_flock
{
	/**
	* Path to the file to which access is controlled
	*
	* @var string
	*/
	private $path;

	/**
	* File pointer for the lock file
	* @var string
	*/
	private $lock_fp;

	/**
	* Constructor.
	*
	* You have to call acquire() to actually acquire the lock.
	*
	* @param	string	$path	Path to the file to which access is controlled
	*/
	public function __construct($path)
	{
		$this->path = $path;
		$this->lock_fp = null;
	}

	/**
	* Tries to acquire the lock.
	*
	* If the lock is already held by another process, this call will block
	* until the other process releases the lock. If a lock is acquired and
	* is not released before script finishes but the process continues to
	* live (apache/fastcgi) then subsequent processes trying to acquire
	* the same lock will be blocked forever.
	*
	* If the lock is already held by the same process via another instance
	* of this class, this call will block forever.
	*
	* If flock function is disabled in php or fails to work, lock
	* acquisition will fail and false will be returned.
	*
	* @return	bool			true if lock was acquired
	*							false otherwise
	*/
	public function acquire()
	{
		if ($this->lock_fp)
		{
			return false;
		}

		// For systems that can't have two processes opening
		// one file for writing simultaneously
		if (file_exists($this->path . '.lock'))
		{
			$mode = 'rb';
		}
		else
		{
			$mode = 'wb';
		}

		$this->lock_fp = @fopen($this->path . '.lock', $mode);

		if ($mode == 'wb')
		{
			if (!$this->lock_fp)
			{
				// Two processes may attempt to create lock file at the same time.
				// Have the losing process try opening the lock file again for reading
				// on the assumption that the winning process created it
				$mode = 'rb';
				$this->lock_fp = @fopen($this->path . '.lock', $mode);
			}
			else
			{
				// Only need to set mode when the lock file is written
				@chmod($this->path . '.lock', 0666);
			}
		}

		if ($this->lock_fp)
		{
			@flock($this->lock_fp, LOCK_EX);
		}

		return (bool) $this->lock_fp;
	}

	/**
	* Does this process own the lock?
	*
	* @return	bool			true if lock is owned
	*							false otherwise
	*/
	public function owns_lock()
	{
		return (bool) $this->lock_fp;
	}

	/**
	* Releases the lock.
	*
	* The lock must have been previously obtained, that is, acquire() call
	* was issued and returned true.
	*
	* Note: Attempting to release a lock that is already released,
	* that is, calling release() multiple times, is harmless.
	*
	* @return null
	*/
	public function release()
	{
		if ($this->lock_fp)
		{
			@flock($this->lock_fp, LOCK_UN);
			fclose($this->lock_fp);
			$this->lock_fp = null;
		}
	}
}

--- NEW FILE: db.php ---
<?php
/**
*
* @package MXP3
* @copyright (c) 2010 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/

/**
* @ignore
*/
if (!defined('IN_PORTAL'))
{
	exit;
}

/**
* Database locking class
* @package MXP3
*/
class mx_lock_db
{
	/**
	* Name of the config variable this lock uses
	* @var string
	*/
	private $config_name;

	/**
	* Unique identifier for this lock.
	*
	* @var string
	*/
	private $unique_id;

	/**
	* Stores the state of this lock
	* @var bool
	*/
	private $locked;

	/**
	* The MXP configuration
	* @var phpbb_config
	*/
	private $portal_config;

	/**
	* A database connection
	* @var mx_db_driver
	*/
	private $db;

	/**
	* Creates a named released instance of the lock.
	*
	* You have to call acquire() to actually create the lock.
	*
	* @param	string	$config_name	A config variable to be used for locking
	* @param	array	$config			The phpBB configuration
	* @param	phpbb_db_driver	$db				A database connection
	*/
	public function __construct($config_name, mx_config $portal_config, mx_db_driver $db)
	{
		$this->portal_config_name = $config_name;
		$this->portal_config = $portal_config;
		$this->db = $db;
	}

	/**
	* Tries to acquire the lock by updating
	* the configuration variable in the database.
	*
	* As a lock may only be held by one process at a time, lock
	* acquisition may fail if another process is holding the lock
	* or if another process obtained the lock but never released it.
	* Locks are forcibly released after a timeout of 1 hour.
	*
	* @return	bool			true if lock was acquired
	*							false otherwise
	*/
	public function acquire()
	{
		if ($this->locked)
		{
			return false;
		}

		if (!isset($this->portal_config[$this->portal_config_name]))
		{
			$this->portal_config->set($this->portal_config_name, '0', false);
		}
		$lock_value = $this->portal_config[$this->portal_config_name];

		// make sure lock cannot be acquired by multiple processes
		if ($lock_value)
		{
			// if the other process is running more than an hour already we have to assume it
			// aborted without cleaning the lock
			$time = explode(' ', $lock_value);
			$time = $time[0];

			if ($time + 3600 >= time())
			{
				return false;
			}
		}

		$this->unique_id = time() . ' ' . unique_id();

		// try to update the config value, if it was already modified by another
		// process we failed to acquire the lock.
		$this->locked = $this->portal_config->set_atomic($this->portal_config_name, $lock_value, $this->unique_id, false);

		return $this->locked;
	}

	/**
	* Does this process own the lock?
	*
	* @return	bool			true if lock is owned
	*							false otherwise
	*/
	public function owns_lock()
	{
		return (bool) $this->locked;
	}

	/**
	* Releases the lock.
	*
	* The lock must have been previously obtained, that is, acquire() call
	* was issued and returned true.
	*
	* Note: Attempting to release a lock that is already released,
	* that is, calling release() multiple times, is harmless.
	*
	* @return null
	*/
	public function release()
	{
		if ($this->locked)
		{
			$this->portal_config->set_atomic($this->portal_config_name, $this->unique_id, '0', false);
			$this->locked = false;
		}
	}
}

[mxbb-commits] core/includes/lock - New directory

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/lock
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25533/lock

Log Message:
Directory /cvsroot/mxbb/core/includes/lock added to the repository

[mxbb-commits] core/includes/sessions/phpbb3 session.php, 1.57, 1.58

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25033

Modified Files:
	session.php 
Log Message:


Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** session.php	19 Jun 2013 12:22:41 -0000	1.57
--- session.php	26 Jun 2013 09:15:37 -0000	1.58
***************
*** 1855,1866 ****
  			// that the config file contains
  			$sql_ary = array();
! 
  			$db->sql_transaction('begin');
! 
  			$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . '
  				WHERE imageset_id = ' . $this->theme['imageset_id'] . '
  					AND image_lang = \'' . $db->sql_escape($this->img_lang) . '\'';
  			$result = $db->sql_query($sql);
! 
  			if (@file_exists("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"))
  			{
--- 1855,1866 ----
  			// that the config file contains
  			$sql_ary = array();
! 			
  			$db->sql_transaction('begin');
! 			
  			$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . '
  				WHERE imageset_id = ' . $this->theme['imageset_id'] . '
  					AND image_lang = \'' . $db->sql_escape($this->img_lang) . '\'';
  			$result = $db->sql_query($sql);
! 			
  			if (@file_exists("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"))
  			{

[mxbb-commits] core/includes mx_functions.php, 1.119, 1.120 mx_functions_admincp.php, 1.71, 1.72 mx_functions_core.php, 1.135, 1.136 mx_functions_style.php, 1.133, 1.134

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24985/includes

Modified Files:
	mx_functions.php mx_functions_admincp.php 
	mx_functions_core.php mx_functions_style.php 
Log Message:


Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** mx_functions_core.php	25 Jun 2013 20:05:03 -0000	1.135
--- mx_functions_core.php	26 Jun 2013 09:15:23 -0000	1.136
***************
*** 180,186 ****
  		global $db;
  
! 		if ( ($config = $this->get('mxbb_config')) && ($use_cache) )
  		{
! 			return $config;
  		}
  		else
--- 180,186 ----
  		global $db;
  
! 		if ( ($portal_config = $this->get('mx_config')) && ($use_cache) )
  		{
! 			return $portal_config;
  		}
  		else
***************
*** 204,213 ****
  			foreach ($row as $config_name => $config_value)
  			{
! 				$config[$config_name] = trim($config_value);
  			}
  			$db->sql_freeresult($result);
! 			$this->put('mxbb_config', $config);
  
! 			return ($config);
  		}
  	}
--- 204,213 ----
  			foreach ($row as $config_name => $config_value)
  			{
! 				$portal_config[$config_name] = trim($config_value);
  			}
  			$db->sql_freeresult($result);
! 			$this->put('mx_config', $portal_config);
  
! 			return ($portal_config);
  		}
  	}
***************
*** 634,638 ****
  			WHERE portal_id = 1";
  
! 		if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) )
  		{
  			mx_message_die( GENERAL_ERROR, "Could not update portal cache time.", "", __LINE__, __FILE__, $sql );
--- 634,638 ----
  			WHERE portal_id = 1";
  
! 		if (!($result = $db->sql_query($sql, BEGIN_TRANSACTION)))
  		{
  			mx_message_die( GENERAL_ERROR, "Could not update portal cache time.", "", __LINE__, __FILE__, $sql );
***************
*** 781,785 ****
  		@closedir($dir);
  	}
! }
  
  /**
--- 781,1066 ----
  		@closedir($dir);
  	}
! 	/**
! 	* Read cached data from a specified file
! 	*
! 	* @access private
! 	* @param string $filename Filename to write
! 	* @return mixed False if an error was encountered, otherwise the data type of the cached data
! 	*/
! 	function _read($filename)
! 	{
! 		global $phpEx;
! 
! 		$file = "{$this->cache_dir}$filename.$phpEx";
! 
! 		$type = substr($filename, 0, strpos($filename, '_'));
! 
! 		if (!file_exists($file))
! 		{
! 			return false;
! 		}
! 
! 		if (!($handle = @fopen($file, 'rb')))
! 		{
! 			return false;
! 		}
! 
! 		// Skip the PHP header
! 		fgets($handle);
! 
! 		if ($filename == 'data_global')
! 		{
! 			$this->vars = $this->var_expires = array();
! 
! 			$time = time();
! 
! 			while (($expires = (int) fgets($handle)) && !feof($handle))
! 			{
! 				// Number of bytes of data
! 				$bytes = substr(fgets($handle), 0, -1);
! 
! 				if (!is_numeric($bytes) || ($bytes = (int) $bytes) === 0)
! 				{
! 					// We cannot process the file without a valid number of bytes
! 					// so we discard it
! 					fclose($handle);
! 
! 					$this->vars = $this->var_expires = array();
! 					$this->is_modified = false;
! 
! 					$this->remove_file($file);
! 
! 					return false;
! 				}
! 
! 				if ($time >= $expires)
! 				{
! 					fseek($handle, $bytes, SEEK_CUR);
! 
! 					continue;
! 				}
! 
! 				$var_name = substr(fgets($handle), 0, -1);
! 
! 				// Read the length of bytes that consists of data.
! 				$data = fread($handle, $bytes - strlen($var_name));
! 				$data = @unserialize($data);
! 
! 				// Don't use the data if it was invalid
! 				if ($data !== false)
! 				{
! 					$this->vars[$var_name] = $data;
! 					$this->var_expires[$var_name] = $expires;
! 				}
! 
! 				// Absorb the LF
! 				fgets($handle);
! 			}
! 
! 			fclose($handle);
! 
! 			$this->is_modified = false;
! 
! 			return true;
! 		}
! 		else
! 		{
! 			$data = false;
! 			$line = 0;
! 
! 			while (($buffer = fgets($handle)) && !feof($handle))
! 			{
! 				$buffer = substr($buffer, 0, -1); // Remove the LF
! 
! 				// $buffer is only used to read integers
! 				// if it is non numeric we have an invalid
! 				// cache file, which we will now remove.
! 				if (!is_numeric($buffer))
! 				{
! 					break;
! 				}
! 
! 				if ($line == 0)
! 				{
! 					$expires = (int) $buffer;
! 
! 					if (time() >= $expires)
! 					{
! 						break;
! 					}
! 
! 					if ($type == 'sql')
! 					{
! 						// Skip the query
! 						fgets($handle);
! 					}
! 				}
! 				else if ($line == 1)
! 				{
! 					$bytes = (int) $buffer;
! 
! 					// Never should have 0 bytes
! 					if (!$bytes)
! 					{
! 						break;
! 					}
! 
! 					// Grab the serialized data
! 					$data = fread($handle, $bytes);
! 
! 					// Read 1 byte, to trigger EOF
! 					fread($handle, 1);
! 
! 					if (!feof($handle))
! 					{
! 						// Somebody tampered with our data
! 						$data = false;
! 					}
! 					break;
! 				}
! 				else
! 				{
! 					// Something went wrong
! 					break;
! 				}
! 				$line++;
! 			}
! 			fclose($handle);
! 
! 			// unserialize if we got some data
! 			$data = ($data !== false) ? @unserialize($data) : $data;
! 
! 			if ($data === false)
! 			{
! 				$this->remove_file($file);
! 				return false;
! 			}
! 
! 			return $data;
! 		}
! 	}
! 
! 	/**
! 	* Write cache data to a specified file
! 	*
! 	* 'data_global' is a special case and the generated format is different for this file:
! 	* <code>
! 	* <?php exit; ?>
! 	* (expiration)
! 	* (length of var and serialised data)
! 	* (var)
! 	* (serialised data)
! 	* ... (repeat)
! 	* </code>
! 	*
! 	* The other files have a similar format:
! 	* <code>
! 	* <?php exit; ?>
! 	* (expiration)
! 	* (query) [SQL files only]
! 	* (length of serialised data)
! 	* (serialised data)
! 	* </code>
! 	*
! 	* @access private
! 	* @param string $filename Filename to write
! 	* @param mixed $data Data to store
! 	* @param int $expires Timestamp when the data expires
! 	* @param string $query Query when caching SQL queries
! 	* @return bool True if the file was successfully created, otherwise false
! 	*/
! 	function _write($filename, $data = null, $expires = 0, $query = '')
! 	{
! 		global $phpEx;
! 
! 		$file = "{$this->cache_dir}$filename.$phpEx";
! 
! 		$lock = new mx_lock_flock($file);
! 		$lock->acquire();
! 
! 		if ($handle = @fopen($file, 'wb'))
! 		{
! 			// File header
! 			fwrite($handle, '<' . '?php exit; ?' . '>');
! 
! 			if ($filename == 'data_global')
! 			{
! 				// Global data is a different format
! 				foreach ($this->vars as $var => $data)
! 				{
! 					if (strpos($var, "\r") !== false || strpos($var, "\n") !== false)
! 					{
! 						// CR/LF would cause fgets() to read the cache file incorrectly
! 						// do not cache test entries, they probably won't be read back
! 						// the cache keys should really be alphanumeric with a few symbols.
! 						continue;
! 					}
! 					$data = serialize($data);
! 
! 					// Write out the expiration time
! 					fwrite($handle, "\n" . $this->var_expires[$var] . "\n");
! 
! 					// Length of the remaining data for this var (ignoring two LF's)
! 					fwrite($handle, strlen($data . $var) . "\n");
! 					fwrite($handle, $var . "\n");
! 					fwrite($handle, $data);
! 				}
! 			}
! 			else
! 			{
! 				fwrite($handle, "\n" . $expires . "\n");
! 
! 				if (strpos($filename, 'sql_') === 0)
! 				{
! 					fwrite($handle, $query . "\n");
! 				}
! 				$data = serialize($data);
! 
! 				fwrite($handle, strlen($data) . "\n");
! 				fwrite($handle, $data);
! 			}
! 
! 			fclose($handle);
! 
! 			if (!function_exists('mx_chmod'))
! 			{
! 				global $mx_root_path;
! 				include($mx_root_path . 'includes/mx_functions.' . $phpEx);
! 			}
! 
! 			mx_chmod($file, CHMOD_READ | CHMOD_WRITE);
! 
! 			$return_value = true;
! 		}
! 		else
! 		{
! 			$return_value = false;
! 		}
! 
! 		$lock->release();
! 
! 		return $return_value;
! 	}
! 
! 	/**
! 	* Removes/unlinks file
! 	*/
! 	function remove_file($filename, $check = false)
! 	{
! 		if (!function_exists('phpbb_is_writable'))
! 		{
! 			global $phpbb_root_path, $phpEx;
! 			include($phpbb_root_path . 'includes/functions.' . $phpEx);
! 		}
! 
! 		if ($check && !phpbb_is_writable($this->cache_dir))
! 		{
! 			// E_USER_ERROR - not using language entry - intended.
! 			trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);
! 		}
! 
! 		return @unlink($filename);
! 	}
! }	
  
  /**
***************
*** 813,816 ****
--- 1094,1122 ----
  	var $is_modified = false;
  	var $sql_rowset = array('1' => '1'); // Cache fix. Now also FIRST query can be cached. Unsolved phpBB bug...i think ;)
+ 	
+ 	/**
+ 	* Cache driver.
+ 	*
+ 	* @var mx_cache_driver_interface
+ 	*/
+ 	var $driver = true;	
+ 	
+ 	/** @var mx_page */
+ 	protected $mx_page;	
+ 
+ 	/**
+ 	* Root path.
+ 	*
+ 	* @var string
+ 	*/
+ 	protected $mx_root_path;
+ 
+ 	/**
+ 	* PHP extension.
+ 	*
+ 	* @var string
+ 	*/
+ 	protected $phpEx;	
+ 	
  	/**#@-*/
  
***************
*** 818,835 ****
  	// Private Methods
  	//
! 	//
  
  	/**
! 	 * Constructor.
! 	 *
! 	 * @return cache
! 	 */
! 	function cache()
  	{
! 		global $mx_root_path;
  		$this->cache_dir = $mx_root_path . 'cache/';
  	}
  
  	/**
  	 * Load.
  	 *
--- 1124,1164 ----
  	// Private Methods
  	//
! 	//	
  
  	/**
! 	* Creates a cache service around a cache driver
! 	*
! 	 * @return cache	
! 	*/
! 	public function cache()
  	{
! 		global $mx_root_path, $phpEx;
! 		
! 		$this->mx_root_path = $mx_root_path;
! 		$this->php_ext = $phpEx;		
  		$this->cache_dir = $mx_root_path . 'cache/';
  	}
  
  	/**
+ 	* Returns the cache driver used by this cache service.
+ 	*
+ 	* @return mx_cache_driver_interface The cache driver
+ 	*/
+ 	public function get_driver()
+ 	{
+ 		return $this->driver;
+ 	}
+ 
+ 	/**
+ 	* Replaces the cache driver used by this cache service.
+ 	*
+ 	* @param mx_cache_driver_interface $driver The cache driver
+ 	*/
+ 	public function set_driver($driver)
+ 	{
+ 		$this->driver = $driver;
+ 	}	
+ 
+ 	/**
  	 * Load.
  	 *
***************
*** 952,956 ****
  		// Remove extra spaces and tabs
  		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
! 		$query_id = sizeof($this->sql_rowset);
  
  		if (!file_exists($this->cache_dir . 'sql_' . md5($query) . ".$phpEx"))
--- 1281,1285 ----
  		// Remove extra spaces and tabs
  		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
! 		$query_id = isset($this->sql_rowset) ? sizeof($this->sql_rowset) : 0;
  
  		if (!file_exists($this->cache_dir . 'sql_' . md5($query) . ".$phpEx"))
***************
*** 972,975 ****
--- 1301,1393 ----
  		return $query_id;
  	}
+ 	
+ 	/**
+ 	* {@inheritDoc}.
+ 	 *
+ 	 * @access private
+ 	 * @param unknown_type $query
+ 	 * @param unknown_type $query_result
+ 	 * @param unknown_type $ttl
+ 	 */
+ 	function sql_save($query, &$query_result, $ttl)
+ 	{
+ 		global $db, $phpEx;
+ 		
+ 		// Remove extra spaces and tabs
+ 		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);		
+ 		$hash = md5($query);
+ 		
+ 		// determine which tables this query belongs to
+ 		// Some queries use backticks, namely the get_database_size() query
+ 		// don't check for conformity, the SQL would error and not reach here.
+ 		if (!preg_match('/FROM \\(?(`?\\w+`?(?: \\w+)?(?:, ?`?\\w+`?(?: \\w+)?)*)\\)?/', $query, $regs))
+ 		{
+ 			// Bail out if the match fails.
+ 			return $query_result;
+ 		}
+ 		$tables = array_map('trim', explode(',', $regs[1]));
+ 		
+ 		$fp = @fopen($this->cache_dir . 'sql_' . md5($query) . '.' . $phpEx, 'wb');
+ 		@flock($fp, LOCK_EX);
+ 		foreach ($tables as $table_name)
+ 		{
+ 			// Remove backticks
+ 			$table_name = ($table_name[0] == '`') ? substr($table_name, 1, -1) : $table_name;
+ 
+ 			if (($pos = strpos($table_name, ' ')) !== false)
+ 			{
+ 				$table_name = substr($table_name, 0, $pos);
+ 			}
+ 
+ 			$temp = $this->_read('sql_' . $table_name);
+ 
+ 			if ($temp === false)
+ 			{
+ 				$temp = array();
+ 			}
+ 
+ 			$temp[$hash] = true;
+ 
+ 			// This must never expire
+ 			if ($fp === false)
+ 			{
+ 				$this->_write('sql_' . $table_name, $temp, 0);
+ 			}
+ 			else
+ 			{
+ 				fwrite($fp, "<?php\n\n/*\n$query\n*/\n\n\$temp[\$hash] = " . true . "; ?>");
+ 				@flock($fp, LOCK_UN);
+ 				fclose($fp);
+ 			}						
+ 		}		
+ 		
+ 		// store them in the right place
+ 		$lines = array();
+ 		$query_id = sizeof($this->sql_rowset);
+ 		$query_id = !empty($query_id) ? $query_id : 1;
+ 		$this->sql_rowset[$query_id] = array();
+ 		$this->sql_row_pointer[$query_id] = 0;
+ 
+ 		while ($row = $db->sql_fetchrow($query_result))
+ 		{
+ 			$this->sql_rowset[$query_id][] = $row;
+ 			$lines[] = "unserialize('" . str_replace("'", "\\'", str_replace('\\', '\\\\', serialize($row))) . "')";
+ 		}
+ 		$db->sql_freeresult($query_result);
+ 		
+ 		if ($fp === false)
+ 		{
+ 			$this->_write('sql_' . $hash, $this->sql_rowset[$query_id], $ttl);
+ 		}
+ 		else
+ 		{
+ 			@fwrite($fp, "<?php\n\n/*\n$query\n*/\n\n\$expired = (time() > " . (time() + $ttl) . ") ? true : false;\nif (\$expired) { return; }\n\n\$this->sql_rowset[\$query_id] = array(" . implode(',', $lines) . '); ?>');
+ 			@flock($fp, LOCK_UN);
+ 			@fclose($fp);		
+ 		}		
+ 		$query_result = $query_id;
+ 		
+ 		return $query_id;
+ 	}	
  
  	/**
***************
*** 981,985 ****
  	 * @param unknown_type $ttl
  	 */
! 	function sql_save($query, &$query_result, $ttl)
  	{
  		global $db, $phpEx;
--- 1399,1403 ----
  	 * @param unknown_type $ttl
  	 */
! 	function sql_save2($query, &$query_result, $ttl)
  	{
  		global $db, $phpEx;
***************
*** 987,990 ****
--- 1405,1409 ----
  		// Remove extra spaces and tabs
  		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
+ 		$hash = md5($query);
  
  		if ($fp = @fopen($this->cache_dir . 'sql_' . md5($query) . '.' . $phpEx, 'wb'))
***************
*** 994,997 ****
--- 1413,1417 ----
  			$lines = array();
  			$query_id = sizeof($this->sql_rowset);
+ 			$query_id = !empty($query_id) ? $query_id : 1;
  			$this->sql_rowset[$query_id] = array();
  
***************
*** 1225,1229 ****
  
  				$fp = fopen($this->cache_dir . $entry, 'rb');
! 				$file = fread($fp, filesize($this->cache_dir . $entry));
  				@fclose($fp);
  
--- 1645,1649 ----
  
  				$fp = fopen($this->cache_dir . $entry, 'rb');
! 				$file = @fread($fp, @filesize($this->cache_dir . $entry));
  				@fclose($fp);
  

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** mx_functions_style.php	25 Jun 2013 17:14:48 -0000	1.133
--- mx_functions_style.php	26 Jun 2013 09:15:23 -0000	1.134
***************
*** 1193,1197 ****
  		$this->theme['fontcolor2'] = $theme['fontcolor2'];
  		*/
! 		$this->theme = is_array($this->theme) ? array_merge($this->theme, $theme) : $theme;
  		
  		/* Removed since in 3.0.x+ our default template is no style
--- 1193,1197 ----
  		$this->theme['fontcolor2'] = $theme['fontcolor2'];
  		*/
! 		$this->theme = is_array($this->theme) ? array_merge($this->theme, @$theme) : @$theme;
  		
  		/* Removed since in 3.0.x+ our default template is no style
***************
*** 1453,1464 ****
  
  				@define('TEMPLATE_CONFIG', TRUE);
! 				// We include common temlate config file here to not load it every time a module template config file is included		
! 				$this->theme = &$theme;				
  
  			break;
  		}
! 		//
! 		// We have no template to use - die
! 		//
  		if ( !defined('TEMPLATE_CONFIG') )
  		{
--- 1453,1465 ----
  
  				@define('TEMPLATE_CONFIG', TRUE);
! 				// We include common temlate config file here to not load it every time a module template config file is included
! 				//$this->theme = is_array($this->theme) ? array_merge($this->theme, $theme) : $theme;				
! 				//$this->theme = &$theme;				
  
  			break;
  		}
! 		/*
! 		* We have no template to use - die
! 		*/
  		if ( !defined('TEMPLATE_CONFIG') )
  		{
***************
*** 1468,1474 ****
  		$img_lang = ( file_exists($phpbb_root_path . $this->current_template_path . '/images/lang_' . $this->encode_lang($this->lang['default_lang'])) ) ? $this->encode_lang($this->lang['default_lang']) : 'english';
  
! 		//
! 		// Import phpBB Graphics, prefix with PHPBB_URL, and apply LANG info
! 		//
  		while( list($key, $value) = @each($images) )
  		{
--- 1469,1475 ----
  		$img_lang = ( file_exists($phpbb_root_path . $this->current_template_path . '/images/lang_' . $this->encode_lang($this->lang['default_lang'])) ) ? $this->encode_lang($this->lang['default_lang']) : 'english';
  
! 		/*
! 		* Import phpBB Graphics, prefix with PHPBB_URL, and apply LANG info
! 		*/
  		while( list($key, $value) = @each($images) )
  		{
***************
*** 1762,1768 ****
  		}
  
! 		//
! 		// If use default template intead
! 		//
  		if (!$mx_template_config)
  		{
--- 1763,1769 ----
  		}
  
! 		/*
! 		* If use default template intead
! 		*/
  		if (!$mx_template_config)
  		{
***************
*** 1794,1800 ****
  		}
  		
! 		//
! 		// We have no template to use - die
! 		//
  		if (!$mx_template_config)
  		{
--- 1795,1801 ----
  		}
  		
! 		/*
! 		* We have no template to use - die
! 		*/
  		if (!$mx_template_config)
  		{
***************
*** 1829,1834 ****
  		
  		// We include common temlate config file here to not load it every time a module template config file is included
! 		$this->theme = is_array($this->theme) ? array_merge($this->theme, $theme) : $theme;		
! 		//$this->theme = &$theme;
  		unset($mx_images);		
  	}
--- 1830,1835 ----
  		
  		// We include common temlate config file here to not load it every time a module template config file is included
! 		//$this->theme = is_array($this->theme) ? array_merge($this->theme, $theme) : $theme;		
! 		$this->theme = &$theme;
  		unset($mx_images);		
  	}

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** mx_functions_admincp.php	25 Jun 2013 20:05:03 -0000	1.71
--- mx_functions_admincp.php	26 Jun 2013 09:15:23 -0000	1.72
***************
*** 3925,3929 ****
  				
  				$i = ($j > 0) ? abs($j - 1) : 0;		
! 				if( $row[$j]['module_id'] != $row[$k]['module_id'] )
  				{
  					$module_desc_tmp = str_replace("\n", '', $row[$j]['module_desc']);
--- 3925,3929 ----
  				
  				$i = ($j > 0) ? abs($j - 1) : 0;		
! 				if( $row[$j]['module_id'] != $row[$i]['module_id'] )
  				{
  					$module_desc_tmp = str_replace("\n", '', $row[$j]['module_desc']);

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** mx_functions.php	25 Jun 2013 20:05:03 -0000	1.119
--- mx_functions.php	26 Jun 2013 09:15:22 -0000	1.120
***************
*** 668,671 ****
--- 668,906 ----
  
  /**
+ * Global function for chmodding directories and files for internal use
+ *
+ * This function determines owner and group whom the file belongs to and user and group of PHP and then set safest possible file permissions.
+ * The function determines owner and group from common.php file and sets the same to the provided file.
+ * The function uses bit fields to build the permissions.
+ * The function sets the appropiate execute bit on directories.
+ *
+ * Supported constants representing bit fields are:
+ *
+ * CHMOD_ALL - all permissions (7)
+ * CHMOD_READ - read permission (4)
+ * CHMOD_WRITE - write permission (2)
+ * CHMOD_EXECUTE - execute permission (1)
+ *
+ * NOTE: The function uses POSIX extension and fileowner()/filegroup() functions. If any of them is disabled, this function tries to build proper permissions, by calling is_readable() and is_writable() functions.
+ *
+ * @param string	$filename	The file/directory to be chmodded
+ * @param int	$perms		Permissions to set
+ *
+ * @return bool	true on success, otherwise false
+ * @author faw, phpBB Group
+ */
+ function mx_chmod($filename, $perms = CHMOD_READ)
+ {
+ 	static $_chmod_info;
+ 
+ 	// Return if the file no longer exists.
+ 	if (!file_exists($filename))
+ 	{
+ 		return false;
+ 	}
+ 
+ 	// Determine some common vars
+ 	if (empty($_chmod_info))
+ 	{
+ 		if (!function_exists('fileowner') || !function_exists('filegroup'))
+ 		{
+ 			// No need to further determine owner/group - it is unknown
+ 			$_chmod_info['process'] = false;
+ 		}
+ 		else
+ 		{
+ 			global $mx_root_path, $phpEx;
+ 
+ 			// Determine owner/group of common.php file and the filename we want to change here
+ 			$common_php_owner = @fileowner($mx_root_path . 'common.' . $phpEx);
+ 			$common_php_group = @filegroup($mx_root_path . 'common.' . $phpEx);
+ 
+ 			// And the owner and the groups PHP is running under.
+ 			$php_uid = (function_exists('posix_getuid')) ? @posix_getuid() : false;
+ 			$php_gids = (function_exists('posix_getgroups')) ? @posix_getgroups() : false;
+ 
+ 			// If we are unable to get owner/group, then do not try to set them by guessing
+ 			if (!$php_uid || empty($php_gids) || !$common_php_owner || !$common_php_group)
+ 			{
+ 				$_chmod_info['process'] = false;
+ 			}
+ 			else
+ 			{
+ 				$_chmod_info = array(
+ 					'process'		=> true,
+ 					'common_owner'	=> $common_php_owner,
+ 					'common_group'	=> $common_php_group,
+ 					'php_uid'		=> $php_uid,
+ 					'php_gids'		=> $php_gids,
+ 				);
+ 			}
+ 		}
+ 	}
+ 
+ 	if ($_chmod_info['process'])
+ 	{
+ 		$file_uid = @fileowner($filename);
+ 		$file_gid = @filegroup($filename);
+ 
+ 		// Change owner
+ 		if (@chown($filename, $_chmod_info['common_owner']))
+ 		{
+ 			clearstatcache();
+ 			$file_uid = @fileowner($filename);
+ 		}
+ 
+ 		// Change group
+ 		if (@chgrp($filename, $_chmod_info['common_group']))
+ 		{
+ 			clearstatcache();
+ 			$file_gid = @filegroup($filename);
+ 		}
+ 
+ 		// If the file_uid/gid now match the one from common.php we can process further, else we are not able to change something
+ 		if ($file_uid != $_chmod_info['common_owner'] || $file_gid != $_chmod_info['common_group'])
+ 		{
+ 			$_chmod_info['process'] = false;
+ 		}
+ 	}
+ 
+ 	// Still able to process?
+ 	if ($_chmod_info['process'])
+ 	{
+ 		if ($file_uid == $_chmod_info['php_uid'])
+ 		{
+ 			$php = 'owner';
+ 		}
+ 		else if (in_array($file_gid, $_chmod_info['php_gids']))
+ 		{
+ 			$php = 'group';
+ 		}
+ 		else
+ 		{
+ 			// Since we are setting the everyone bit anyway, no need to do expensive operations
+ 			$_chmod_info['process'] = false;
+ 		}
+ 	}
+ 
+ 	// We are not able to determine or change something
+ 	if (!$_chmod_info['process'])
+ 	{
+ 		$php = 'other';
+ 	}
+ 
+ 	// Owner always has read/write permission
+ 	$owner = CHMOD_READ | CHMOD_WRITE;
+ 	if (is_dir($filename))
+ 	{
+ 		$owner |= CHMOD_EXECUTE;
+ 
+ 		// Only add execute bit to the permission if the dir needs to be readable
+ 		if ($perms & CHMOD_READ)
+ 		{
+ 			$perms |= CHMOD_EXECUTE;
+ 		}
+ 	}
+ 
+ 	switch ($php)
+ 	{
+ 		case 'owner':
+ 			$result = @chmod($filename, ($owner << 6) + (0 << 3) + (0 << 0));
+ 
+ 			clearstatcache();
+ 
+ 			if (is_readable($filename) && mx_is_writable($filename))
+ 			{
+ 				break;
+ 			}
+ 
+ 		case 'group':
+ 			$result = @chmod($filename, ($owner << 6) + ($perms << 3) + (0 << 0));
+ 
+ 			clearstatcache();
+ 
+ 			if ((!($perms & CHMOD_READ) || is_readable($filename)) && (!($perms & CHMOD_WRITE) || mx_is_writable($filename)))
+ 			{
+ 				break;
+ 			}
+ 
+ 		case 'other':
+ 			$result = @chmod($filename, ($owner << 6) + ($perms << 3) + ($perms << 0));
+ 
+ 			clearstatcache();
+ 
+ 			if ((!($perms & CHMOD_READ) || is_readable($filename)) && (!($perms & CHMOD_WRITE) || mx_is_writable($filename)))
+ 			{
+ 				break;
+ 			}
+ 
+ 		default:
+ 			return false;
+ 		break;
+ 	}
+ 
+ 	return $result;
+ }
+ 
+ /**
+ * Test if a file/directory is writable
+ *
+ * This function calls the native is_writable() when not running under
+ * Windows and it is not disabled.
+ *
+ * @param string $file Path to perform write test on
+ * @return bool True when the path is writable, otherwise false.
+ */
+ function mx_is_writable($file)
+ {
+ 	if (strtolower(substr(PHP_OS, 0, 3)) === 'win' || !function_exists('is_writable'))
+ 	{
+ 		if (file_exists($file))
+ 		{
+ 			// Canonicalise path to absolute path
+ 			$file = mx_realpath($file);
+ 
+ 			if (is_dir($file))
+ 			{
+ 				// Test directory by creating a file inside the directory
+ 				$result = @tempnam($file, 'i_w');
+ 
+ 				if (is_string($result) && file_exists($result))
+ 				{
+ 					unlink($result);
+ 
+ 					// Ensure the file is actually in the directory (returned realpathed)
+ 					return (strpos($result, $file) === 0) ? true : false;
+ 				}
+ 			}
+ 			else
+ 			{
+ 				$handle = @fopen($file, 'r+');
+ 
+ 				if (is_resource($handle))
+ 				{
+ 					fclose($handle);
+ 					return true;
+ 				}
+ 			}
+ 		}
+ 		else
+ 		{
+ 			// file does not exist test if we can write to the directory
+ 			$dir = dirname($file);
+ 
+ 			if (file_exists($dir) && is_dir($dir) && mx_is_writable($dir))
+ 			{
+ 				return true;
+ 			}
+ 		}
+ 
+ 		return false;
+ 	}
+ 	else
+ 	{
+ 		return is_writable($file);
+ 	}
+ }
+ 
+ /**
  * Generate portal url (example: http://www.example.com/phpBB)
  * @param bool $without_script_path if set to true the script path gets not appended (example: http://www.example.com)
***************
*** 2080,2084 ****
  			$page_id_array['page_name'] = $p_row['page_name'];
  			$page_id_array['page_desc'] = $p_row['page_desc'];
! 			$page_id_array['block_id'] = $p_row['block_id'];
  		}
  		unset($p_row);
--- 2315,2319 ----
  			$page_id_array['page_name'] = $p_row['page_name'];
  			$page_id_array['page_desc'] = $p_row['page_desc'];
! 			$page_id_array['block_id'] = isset($p_row['block_id']) ? $p_row['block_id'] : 0;
  		}
  		unset($p_row);
***************
*** 2500,2511 ****
  
  /**
   * Borrowed from phpBB
   *
  */
  function mx_phpbb_realpath($path)
  {
  	global $mx_root_path, $phpEx;
  
! 	return (!@function_exists('realpath') || !@realpath($mx_root_path . 'includes/mx_functions.'.$phpEx)) ? $path : @realpath($path);
  }
  
--- 2735,2953 ----
  
  /**
+ * Checks if a path ($path) is absolute or relative
+ *
+ * @param string $path Path to check absoluteness of
+ * @return boolean
+ */
+ function mx_is_absolute($path)
+ {
+ 	return (isset($path[0]) && $path[0] == '/' || preg_match('#^[a-z]:[/\\\]#i', $path)) ? true : false;
+ }
+ 
+ /**
   * Borrowed from phpBB
   *
+ * @author Chris Smith <ch...@pr...>
+ * @copyright 2006 Project Minerva Team
+ * @param string $path The path which we should attempt to resolve.
+ * @return mixed
  */
+ function mx_own_realpath($path)
+ {
+ 	global $request;
+ 
+ 	// Now to perform funky shizzle
+ 
+ 	// Switch to use UNIX slashes
+ 	$path = str_replace(DIRECTORY_SEPARATOR, '/', $path);
+ 	$path_prefix = '';
+ 
+ 	// Determine what sort of path we have
+ 	if (mx_is_absolute($path))
+ 	{
+ 		$absolute = true;
+ 
+ 		if ($path[0] == '/')
+ 		{
+ 			// Absolute path, *NIX style
+ 			$path_prefix = '';
+ 		}
+ 		else
+ 		{
+ 			// Absolute path, Windows style
+ 			// Remove the drive letter and colon
+ 			$path_prefix = $path[0] . ':';
+ 			$path = substr($path, 2);
+ 		}
+ 	}
+ 	else
+ 	{
+ 		// Relative Path
+ 		// Prepend the current working directory
+ 		if (function_exists('getcwd'))
+ 		{
+ 			// This is the best method, hopefully it is enabled!
+ 			$path = str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . '/' . $path;
+ 			$absolute = true;
+ 			if (preg_match('#^[a-z]:#i', $path))
+ 			{
+ 				$path_prefix = $path[0] . ':';
+ 				$path = substr($path, 2);
+ 			}
+ 			else
+ 			{
+ 				$path_prefix = '';
+ 			}
+ 		}
+ 		else if ($request->server('SCRIPT_FILENAME'))
+ 		{
+ 			// Warning: If chdir() has been used this will lie!
+ 			// Warning: This has some problems sometime (CLI can create them easily)
+ 			$filename = htmlspecialchars_decode($request->server('SCRIPT_FILENAME'));
+ 			$path = str_replace(DIRECTORY_SEPARATOR, '/', dirname($filename)) . '/' . $path;
+ 			$absolute = true;
+ 			$path_prefix = '';
+ 		}
+ 		else
+ 		{
+ 			// We have no way of getting the absolute path, just run on using relative ones.
+ 			$absolute = false;
+ 			$path_prefix = '.';
+ 		}
+ 	}
+ 
+ 	// Remove any repeated slashes
+ 	$path = preg_replace('#/{2,}#', '/', $path);
+ 
+ 	// Remove the slashes from the start and end of the path
+ 	$path = trim($path, '/');
+ 
+ 	// Break the string into little bits for us to nibble on
+ 	$bits = explode('/', $path);
+ 
+ 	// Remove any . in the path, renumber array for the loop below
+ 	$bits = array_values(array_diff($bits, array('.')));
+ 
+ 	// Lets get looping, run over and resolve any .. (up directory)
+ 	for ($i = 0, $max = sizeof($bits); $i < $max; $i++)
+ 	{
+ 		// @todo Optimise
+ 		if ($bits[$i] == '..' )
+ 		{
+ 			if (isset($bits[$i - 1]))
+ 			{
+ 				if ($bits[$i - 1] != '..')
+ 				{
+ 					// We found a .. and we are able to traverse upwards, lets do it!
+ 					unset($bits[$i]);
+ 					unset($bits[$i - 1]);
+ 					$i -= 2;
+ 					$max -= 2;
+ 					$bits = array_values($bits);
+ 				}
+ 			}
+ 			else if ($absolute) // ie. !isset($bits[$i - 1]) && $absolute
+ 			{
+ 				// We have an absolute path trying to descend above the root of the filesystem
+ 				// ... Error!
+ 				return false;
+ 			}
+ 		}
+ 	}
+ 
+ 	// Prepend the path prefix
+ 	array_unshift($bits, $path_prefix);
+ 
+ 	$resolved = '';
+ 
+ 	$max = sizeof($bits) - 1;
+ 
+ 	// Check if we are able to resolve symlinks, Windows cannot.
+ 	$symlink_resolve = (function_exists('readlink')) ? true : false;
+ 
+ 	foreach ($bits as $i => $bit)
+ 	{
+ 		if (@is_dir("$resolved/$bit") || ($i == $max && @is_file("$resolved/$bit")))
+ 		{
+ 			// Path Exists
+ 			if ($symlink_resolve && is_link("$resolved/$bit") && ($link = readlink("$resolved/$bit")))
+ 			{
+ 				// Resolved a symlink.
+ 				$resolved = $link . (($i == $max) ? '' : '/');
+ 				continue;
+ 			}
+ 		}
+ 		else
+ 		{
+ 			// Something doesn't exist here!
+ 			// This is correct realpath() behaviour but sadly open_basedir and safe_mode make this problematic
+ 			// return false;
+ 		}
+ 		$resolved .= $bit . (($i == $max) ? '' : '/');
+ 	}
+ 
+ 	// @todo If the file exists fine and open_basedir only has one path we should be able to prepend it
+ 	// because we must be inside that basedir, the question is where...
+ 	// @internal The slash in is_dir() gets around an open_basedir restriction
+ 	if (!@file_exists($resolved) || (!@is_dir($resolved . '/') && !is_file($resolved)))
+ 	{
+ 		return false;
+ 	}
+ 
+ 	// Put the slashes back to the native operating systems slashes
+ 	$resolved = str_replace('/', DIRECTORY_SEPARATOR, $resolved);
+ 
+ 	// Check for DIRECTORY_SEPARATOR at the end (and remove it!)
+ 	if (substr($resolved, -1) == DIRECTORY_SEPARATOR)
+ 	{
+ 		return substr($resolved, 0, -1);
+ 	}
+ 
+ 	return $resolved; // We got here, in the end!
+ }
+ 
+ 
  function mx_phpbb_realpath($path)
  {
  	global $mx_root_path, $phpEx;
+ 	
+ 	return mx_realpath($path);
+ }
  
! if (!function_exists('realpath'))
! {
! 	/**
! 	* A wrapper for realpath
! 	* @ignore
! 	*/
! 	function mx_realpath($path)
! 	{
! 		return mx_own_realpath($path);
! 	}
! }
! else
! {
! 	/**
! 	* A wrapper for realpath
! 	*/
! 	function mx_realpath($path)
! 	{
! 		$realpath = realpath($path);
! 
! 		// Strangely there are provider not disabling realpath but returning strange values. :o
! 		// We at least try to cope with them.
! 		if ($realpath === $path || $realpath === false)
! 		{
! 			return mx_own_realpath($path);
! 		}
! 
! 		// Check for DIRECTORY_SEPARATOR at the end (and remove it!)
! 		if (substr($realpath, -1) == DIRECTORY_SEPARATOR)
! 		{
! 			$realpath = substr($realpath, 0, -1);
! 		}
! 
! 		return $realpath;
! 	}
  }
  

[mxbb-commits] core/admin admin_mx_smilies.php,1.24,1.25

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24985/admin

Modified Files:
	admin_mx_smilies.php 
Log Message:


Index: admin_mx_smilies.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** admin_mx_smilies.php	17 Jun 2013 02:53:26 -0000	1.24
--- admin_mx_smilies.php	26 Jun 2013 09:15:22 -0000	1.25
***************
*** 40,44 ****
  	return;
  }
! 
  /*
  * Load default header
--- 40,44 ----
  	return;
  }
! $no_page_header = false;
  /*
  * Load default header
***************
*** 56,63 ****
  require('./pagestart.' . $phpEx);
  
- //
  // Load default header
! //
! if ($no_page_header === false)
  {
  	include_once('./page_header_admin.' . $phpEx);
--- 56,61 ----
  require('./pagestart.' . $phpEx);
  
  // Load default header
! if ($no_page_header !== true)
  {
  	include_once('./page_header_admin.' . $phpEx);
***************
*** 784,787 ****
--- 782,786 ----
  
  	$smilies = $db->sql_fetchrowset($result);
+ 	$s_hidden_fields = '<input type="hidden" name="mode" value="savenew" />';
  
  	$template->set_filenames(array(

[mxbb-commits] mx_weather/templates/_core _core.cfg, 1.2, 1.3 objectTools.js, 1.2, 1.3

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/mx_weather/templates/_core
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24477/_core

Modified Files:
	_core.cfg objectTools.js 
Log Message:

[mxbb-commits] mx_weather/cache cur_weather.php,1.2,1.3

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/mx_weather/cache
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24387/cache

Modified Files:
	cur_weather.php 
Log Message:

[mxbb-commits] core/admin admin_mx_module_cp.php, 1.28, 1.29 admin_mx_page_cp.php, 1.38, 1.39

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28338

Modified Files:
	admin_mx_module_cp.php admin_mx_page_cp.php 
Log Message:


Index: admin_mx_module_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** admin_mx_module_cp.php	25 Jun 2013 17:15:34 -0000	1.28
--- admin_mx_module_cp.php	25 Jun 2013 21:49:10 -0000	1.29
***************
*** 22,26 ****
  $mx_root_path = './../';
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
! $no_page_header = TRUE;
  require('./pagestart.' . $phpEx);
  
--- 22,26 ----
  $mx_root_path = './../';
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
! $no_page_header = true;
  require('./pagestart.' . $phpEx);
  

Index: admin_mx_page_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** admin_mx_page_cp.php	17 Jun 2013 02:53:26 -0000	1.38
--- admin_mx_page_cp.php	25 Jun 2013 21:49:10 -0000	1.39
***************
*** 150,154 ****
  	'L_CHANGE_NOW' 				=> $lang['Change'],
  	'S_SUBMIT' 					=> $lang['Update'],
! 	'RESULT_MESSAGE'			=> !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">' . $result_message  . '<br/> -::-</span></div>': '',
  
  	//
--- 150,154 ----
  	'L_CHANGE_NOW' 				=> $lang['Change'],
  	'S_SUBMIT' 					=> $lang['Update'],
! 	'RESULT_MESSAGE'			=> isset($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">' . $result_message  . '<br/> -::-</span></div>': '',
  
  	//
***************
*** 156,160 ****
  	//
  	'S_ACTION'					=> mx_append_sid(PORTAL_URL . "admin/admin_mx_page_cp.$phpEx"),
! 	'BLOCK_SIZE'				=> ( !empty($block_size) ? $block_size : '100%' ),
  	'L_TITLE'					=> $lang['Page_admin'],
  	'L_COLUMN'					=> $lang['Column'],
--- 156,160 ----
  	//
  	'S_ACTION'					=> mx_append_sid(PORTAL_URL . "admin/admin_mx_page_cp.$phpEx"),
! 	'BLOCK_SIZE'				=> (isset($block_size) ? $block_size : '100%'),
  	'L_TITLE'					=> $lang['Page_admin'],
  	'L_COLUMN'					=> $lang['Column'],
***************
*** 178,183 ****
  	'L_RESYNC' 					=> $lang['Resync'],
  	'L_RESET' 					=> $lang['Reset'],
! 	'L_MOVE_UP' 				=> $new_column ? '' : $lang['Move_up'],
! 	'L_MOVE_DOWN' 				=> $new_column ? '' : $lang['Move_down'],
  
  	//
--- 178,183 ----
  	'L_RESYNC' 					=> $lang['Resync'],
  	'L_RESET' 					=> $lang['Reset'],
! 	'L_MOVE_UP' 				=> $new_column ? 'up' : $lang['Move_up'],
! 	'L_MOVE_DOWN' 				=> $new_column ? 'down' : $lang['Move_down'],
  
  	//
***************
*** 187,203 ****
  	'L_PAGE_DESC'				=> $lang['Page_desc'],
  	'L_PAGE_PARENT'				=> $lang['Page_parent'],
! 	'L_PAGE_ID'					=> empty($lang['Page_Id']) ? "Page Id" : $lang['Page_Id'],
! 	'L_PAGE_ICON'				=> empty($lang['Page_icon']) ? "Page Icon" : $lang['Page_icon'],
! 	'L_PAGE_ALT_ICON'			=> empty($lang['Page_alt_icon']) ? "Page Alt Icon" : $lang['Page_alt_icon'],
! 	"L_DEFAULT_STYLE" 			=> empty($lang['Default_page_style']) ? "Default page style" : $lang['Default_page_style'],
! 	"L_OVERRIDE_STYLE" 			=> empty($lang['Override_page_style']) ? "Override page style" : $lang['Override_page_style'],
! 	"L_OVERRIDE_STYLE_EXPLAIN" 	=> empty($lang['Override_page_style_explain']) ? "Override page style explain" : $lang['Override_page_style_explain'],
! 	'L_PAGE_HEADER'				=> empty($lang['Page_header']) ? "Page header file" : $lang['Page_header'],
! 	'L_PAGE_FOOTER'				=> empty($lang['Page_footer']) ? "Page footer file" : $lang['Page_footer'],
! 	'L_PAGE_MAIN_LAYOUT'		=> empty($lang['Page_main_layout']) ? "Page main_layout file" : $lang['Page_main_layout'],
  	"L_NAVIGATION_BLOCK" 		=> $lang['Page_Navigation_block'],
  	"L_NAVIGATION_BLOCK_EXPLAIN" => $lang['Page_Navigation_block_explain'],
  
! 	'L_AUTH_TITLE'				=> empty($lang['Auth_Page']) ? "Permission" : $lang['Auth_Page'],
  	'L_PRIVATE_AUTH_TITLE' 		=> $lang['Mx_Page_Auth_Title'],
  	'L_PRIVATE_AUTH_EXPLAIN' 	=> $lang['Mx_Page_Auth_Explain'],
--- 187,203 ----
  	'L_PAGE_DESC'				=> $lang['Page_desc'],
  	'L_PAGE_PARENT'				=> $lang['Page_parent'],
! 	'L_PAGE_ID'					=> t('Page_Id'),
! 	'L_PAGE_ICON'				=> t('Page_icon'),
! 	'L_PAGE_ALT_ICON'			=> t('Page_alt_icon'),
! 	"L_DEFAULT_STYLE" 			=> t('Default_page_style'),
! 	"L_OVERRIDE_STYLE" 			=> t('Override_page_style'),
! 	"L_OVERRIDE_STYLE_EXPLAIN" 	=> t('Override_page_style_explain'),
! 	'L_PAGE_HEADER'				=> !isset($lang['Page_header']) ? "Page header file" : $lang['Page_header'],
! 	'L_PAGE_FOOTER'				=> !isset($lang['Page_footer']) ? "Page footer file" : $lang['Page_footer'],
! 	'L_PAGE_MAIN_LAYOUT'		=> !isset($lang['Page_main_layout']) ? "Page main_layout file" : $lang['Page_main_layout'],
  	"L_NAVIGATION_BLOCK" 		=> $lang['Page_Navigation_block'],
  	"L_NAVIGATION_BLOCK_EXPLAIN" => $lang['Page_Navigation_block_explain'],
  
! 	'L_AUTH_TITLE'				=> !isset($lang['Auth_Page']) ? "Permission" : $lang['Auth_Page'],
  	'L_PRIVATE_AUTH_TITLE' 		=> $lang['Mx_Page_Auth_Title'],
  	'L_PRIVATE_AUTH_EXPLAIN' 	=> $lang['Mx_Page_Auth_Explain'],
***************
*** 208,215 ****
  	"L_PHPBB_STATS" => $lang['Mx_phpBB_stats'],
  	"L_PHPBB_STATS_EXPLAIN" => $lang['Mx_phpBB_stats_explain'],
! 
! 	//
  	// Graphics
- 	//
  	'IMG_URL_CONTRACT' => $admin_icon['contract'],
  	'IMG_URL_EXPAND' => $admin_icon['expand'],
--- 208,213 ----
  	"L_PHPBB_STATS" => $lang['Mx_phpBB_stats'],
  	"L_PHPBB_STATS_EXPLAIN" => $lang['Mx_phpBB_stats_explain'],
! 	
  	// Graphics
  	'IMG_URL_CONTRACT' => $admin_icon['contract'],
  	'IMG_URL_EXPAND' => $admin_icon['expand'],
***************
*** 221,235 ****
  	'IMG_ICON_BLOCK' => $admin_icon['block'],
  	'IMG_ICON_EDIT_BLOCK' => $admin_icon['edit_block'],
! 	//
  	// Cookies
- 	//
  	'COOKIE_NAME'	=> $board_config['cookie_name'],
  	'COOKIE_PATH'	=> $board_config['cookie_path'],
  	'COOKIE_DOMAIN'	=> $board_config['cookie_domain'],
  	'COOKIE_SECURE'	=> $board_config['cookie_secure'],
! 
! 	//
  	// Sorting
- 	//
  	'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'],
  	'L_ORDER' => $lang['Order'],
--- 219,230 ----
  	'IMG_ICON_BLOCK' => $admin_icon['block'],
  	'IMG_ICON_EDIT_BLOCK' => $admin_icon['edit_block'],
! 	
  	// Cookies
  	'COOKIE_NAME'	=> $board_config['cookie_name'],
  	'COOKIE_PATH'	=> $board_config['cookie_path'],
  	'COOKIE_DOMAIN'	=> $board_config['cookie_domain'],
  	'COOKIE_SECURE'	=> $board_config['cookie_secure'],
! 	
  	// Sorting
  	'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'],
  	'L_ORDER' => $lang['Order'],
***************
*** 258,264 ****
  ));
  
- //
  // Start Page Template
- //
  $sql = "SELECT * FROM " . PAGE_TEMPLATES . " WHERE page_template_id <> 1 ORDER BY page_template_id";
  
--- 253,257 ----
***************
*** 269,273 ****
  
  $template_rows = array();
! if( $total_templates = $db->sql_numrows($q_templates) )
  {
  	$template_rows = $db->sql_fetchrowset($q_templates);
--- 262,266 ----
  
  $template_rows = array();
! if($total_templates = $db->sql_numrows($q_templates))
  {
  	$template_rows = $db->sql_fetchrowset($q_templates);
***************
*** 276,280 ****
  $db->sql_freeresult($result);
  
! if ( $total_templates == 0 )
  {
  	$template->assign_block_vars('notemplate', array(
--- 269,273 ----
  $db->sql_freeresult($result);
  
! if ($total_templates == 0)
  {
  	$template->assign_block_vars('notemplate', array(
***************
*** 283,289 ****
  }
  
- //
  // Templates loop
- //
  for( $template_count = 0; $template_count < $total_templates + 1; $template_count++ )
  {
--- 276,280 ----
***************
*** 295,302 ****
  	$action = $new_template ? MX_DO_INSERT : MX_DO_UPDATE;
  	$deletemode = '?mode=' . $mode . '&amp;action=' . MX_DO_DELETE . '&amp;id=' . $page_template_id;
! 
! 	//
  	// Hidden fields
- 	//
  	$s_hidden_template_fields = 	'<input type="hidden" name="mode" value="' . $mode . '" />
  								<input type="hidden" name="action" value="' . $action . '" />
--- 286,291 ----
  	$action = $new_template ? MX_DO_INSERT : MX_DO_UPDATE;
  	$deletemode = '?mode=' . $mode . '&amp;action=' . MX_DO_DELETE . '&amp;id=' . $page_template_id;
! 	
  	// Hidden fields
  	$s_hidden_template_fields = 	'<input type="hidden" name="mode" value="' . $mode . '" />
  								<input type="hidden" name="action" value="' . $action . '" />
***************
*** 310,320 ****
  			. '<br /><br />' . sprintf($lang['Click_page_template_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>')
  			. '<br /><br />';
! 
! 	//
  	// Templates subpanel - edit
- 	//
  	$visible_template = in_array('adminTemplateEdit_' . $page_template_id, $cookie_states);
  	$visible_template_delete = in_array('adminTemplateDelete_' . $page_template_id, $cookie_states);
! 
  	$template->assign_block_vars('templates', array(
  		'L_TITLE' 					=> $lang['Page_templates_admin'],
--- 299,307 ----
  			. '<br /><br />' . sprintf($lang['Click_page_template_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>')
  			. '<br /><br />';
! 			
  	// Templates subpanel - edit
  	$visible_template = in_array('adminTemplateEdit_' . $page_template_id, $cookie_states);
  	$visible_template_delete = in_array('adminTemplateDelete_' . $page_template_id, $cookie_states);
! 	
  	$template->assign_block_vars('templates', array(
  		'L_TITLE' 					=> $lang['Page_templates_admin'],
***************
*** 334,364 ****
  		'L_TEMPLATE_DELETE' 		=> $lang['Page_template_delete'],
  		'U_TEMPLATE_DELETE' 		=> mx_append_sid("admin_mx_page_cp_template_setting.$phpEx?mode=deletetemplate&amp;page_template_id=$page_template_id"),
! 
  		'L_CREATE_TEMPLATE' 		=> $lang['Add_Template'],
  		'L_TEMPLATE' 				=> $lang['Template'],
  		'L_TEMPLATE_NAME' 			=> $lang['Template_name'],
! 
! 		//
  		// Page subpanel - edit
- 		//
  		'E_TEMPLATE_TITLE'			=> $template_title,
! 
! 		//
  		// Main
- 		//
  		'U_PHPBB_ROOT_PATH' 		=> PHPBB_URL,
  		'TEMPLATE_ROOT_PATH' 		=> TEMPLATE_ROOT_PATH,
! 
! 		//
  		// Quick Panels
- 		//
  		'MESSAGE_DELETE' 			=> $message_delete,
- 
  		'S_HIDDEN_FIELDS'			=> $s_hidden_template_fields,
- 
  		'S_SUBMIT' 					=> $new_template ? $lang['Add_Template'] : $lang['Update']
  	));
  
! 	if ( !$new_template )
  	{
  		$template->assign_block_vars('templates.edit', array());
--- 321,343 ----
  		'L_TEMPLATE_DELETE' 		=> $lang['Page_template_delete'],
  		'U_TEMPLATE_DELETE' 		=> mx_append_sid("admin_mx_page_cp_template_setting.$phpEx?mode=deletetemplate&amp;page_template_id=$page_template_id"),
! 		
  		'L_CREATE_TEMPLATE' 		=> $lang['Add_Template'],
  		'L_TEMPLATE' 				=> $lang['Template'],
  		'L_TEMPLATE_NAME' 			=> $lang['Template_name'],
! 		
  		// Page subpanel - edit
  		'E_TEMPLATE_TITLE'			=> $template_title,
! 		
  		// Main
  		'U_PHPBB_ROOT_PATH' 		=> PHPBB_URL,
  		'TEMPLATE_ROOT_PATH' 		=> TEMPLATE_ROOT_PATH,
! 		
  		// Quick Panels
  		'MESSAGE_DELETE' 			=> $message_delete,
  		'S_HIDDEN_FIELDS'			=> $s_hidden_template_fields,
  		'S_SUBMIT' 					=> $new_template ? $lang['Add_Template'] : $lang['Update']
  	));
  
! 	if (!$new_template)
  	{
  		$template->assign_block_vars('templates.edit', array());
***************
*** 374,392 ****
  		$template->assign_block_vars('templates.current_template', array());
  	}
! 
  	if ( $new_template )
  	{
  		continue;
  	}
! 
  	$sql = "SELECT *
  		FROM " . COLUMN_TEMPLATES . "
  		WHERE page_template_id = $page_template_id
  		ORDER BY page_template_id, column_order";
! 
  	if( !($q_column = $db->sql_query($sql)) )
  	{
  		mx_message_die(GENERAL_ERROR, "Could not query column list", "", __LINE__, __FILE__, $sql);
  	}
  	$q_columns = false;
  	$column_rows = array();
--- 353,372 ----
  		$template->assign_block_vars('templates.current_template', array());
  	}
! 	
  	if ( $new_template )
  	{
  		continue;
  	}
! 	
  	$sql = "SELECT *
  		FROM " . COLUMN_TEMPLATES . "
  		WHERE page_template_id = $page_template_id
  		ORDER BY page_template_id, column_order";
! 		
  	if( !($q_column = $db->sql_query($sql)) )
  	{
  		mx_message_die(GENERAL_ERROR, "Could not query column list", "", __LINE__, __FILE__, $sql);
  	}
+ 	
  	$q_columns = false;
  	$column_rows = array();
***************
*** 395,410 ****
  		$column_rows = $db->sql_fetchrowset($q_columns);
  	}
! 
  	$db->sql_freeresult($result);
! 
! 	//
  	// Okay, let's build the index
- 	//
  	for( $column = 0; $column < $total_column + 1; $column++ )
  	{
  		$new_column = $column == $total_column;
! 
  		$column_template_id = $new_column ? $page_template_id . '_0'  : $column_rows[$column]['column_template_id'];
! 
  		$mode = MX_PAGE_TEMPLATE_COLUMN_TYPE;
  		$action = $new_column ? MX_DO_INSERT : MX_DO_UPDATE;
--- 375,388 ----
  		$column_rows = $db->sql_fetchrowset($q_columns);
  	}
! 	
  	$db->sql_freeresult($result);
! 	
  	// Okay, let's build the index
  	for( $column = 0; $column < $total_column + 1; $column++ )
  	{
  		$new_column = $column == $total_column;
! 		
  		$column_template_id = $new_column ? $page_template_id . '_0'  : $column_rows[$column]['column_template_id'];
! 		
  		$mode = MX_PAGE_TEMPLATE_COLUMN_TYPE;
  		$action = $new_column ? MX_DO_INSERT : MX_DO_UPDATE;
***************
*** 412,419 ****
  		$upmode = '?mode=' . $mode . '&amp;action=' . MX_DO_MOVE . '&amp;id=' . $column_template_id . '&amp;page_template_id=' . $page_template_id . '&amp;move=-15';
  		$downmode = '?mode=' . $mode . '&amp;action=' . MX_DO_MOVE . '&amp;id=' . $column_template_id . '&amp;page_template_id=' . $page_template_id . '&amp;move=15';
! 
! 		//
  		// Hidden fields
- 		//
  		$s_hidden_column_fields = 	'<input type="hidden" name="mode" value="' . $mode . '" />
  									<input type="hidden" name="action" value="' . $action . '" />
--- 390,395 ----
  		$upmode = '?mode=' . $mode . '&amp;action=' . MX_DO_MOVE . '&amp;id=' . $column_template_id . '&amp;page_template_id=' . $page_template_id . '&amp;move=-15';
  		$downmode = '?mode=' . $mode . '&amp;action=' . MX_DO_MOVE . '&amp;id=' . $column_template_id . '&amp;page_template_id=' . $page_template_id . '&amp;move=15';
! 		
  		// Hidden fields
  		$s_hidden_column_fields = 	'<input type="hidden" name="mode" value="' . $mode . '" />
  									<input type="hidden" name="action" value="' . $action . '" />
***************
*** 421,428 ****
  									<input type="hidden" name="id" value="' . $column_template_id . '" />
  									<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 
! 		//
  		// Subpanel - column edit
- 		//
  		$column_title = $new_column ? '' : $column_rows[$column]['column_title'];
  		$column_size = $new_column ? '100%' : $column_rows[$column]['column_size'];
--- 397,402 ----
  									<input type="hidden" name="id" value="' . $column_template_id . '" />
  									<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 									
  		// Subpanel - column edit
  		$column_title = $new_column ? '' : $column_rows[$column]['column_title'];
  		$column_size = $new_column ? '100%' : $column_rows[$column]['column_size'];
***************
*** 432,436 ****
  				. '<br /><br />' . sprintf($lang['Click_page_template_column_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>')
  				. '<br /><br />';
! 
  		$visible_column_edit = in_array('adminTemplateColumnEdit_' . $page_template_id . '_' . $column_template_id, $cookie_states);
  		$visible_column_delete = in_array('adminTemplateColumnDelete_' . $page_template_id . '_' . $column_template_id, $cookie_states);
--- 406,410 ----
  				. '<br /><br />' . sprintf($lang['Click_page_template_column_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>')
  				. '<br /><br />';
! 				
  		$visible_column_edit = in_array('adminTemplateColumnEdit_' . $page_template_id . '_' . $column_template_id, $cookie_states);
  		$visible_column_delete = in_array('adminTemplateColumnDelete_' . $page_template_id . '_' . $column_template_id, $cookie_states);
***************
*** 440,488 ****
  			'IMG_URL' 				=> $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'],
  			'IMG_URL_DELETE' 		=> $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'],
! 
  			'COLUMN_ID' 			=> $column_template_id,
  			'COLUMN_TITLE' 			=> $new_column ? $lang['Create_column'] : $column_title,
! 
  			'U_COLUMN_DELETE' 		=> mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode),
  			'U_COLUMN_MOVE_UP' 		=> mx_append_sid("admin_mx_page_cp.$phpEx" . $upmode),
  			'U_COLUMN_MOVE_DOWN' 	=> mx_append_sid("admin_mx_page_cp.$phpEx" . $downmode),
! 
! 			//
  			// Column Edit
- 			//
  			'L_DELETE'				=> $new_column ? '' : $lang['Delete'],
  			'L_MOVE_UP' 			=> $new_column ? '' : $lang['Move_up'],
  			'L_MOVE_DOWN' 			=> $new_column ? '' : $lang['Move_down'],
! 
  			'L_COLUMN' 				=> $lang['Column'],
  			'L_COLUMN_NAME' 		=> $lang['Column_name'],
  			'L_COLUMN_SIZE' 		=> $lang['Column_Size'],
! 
  			'VISIBLE' 				=> $visible_column_edit ? 'block' : 'none',
  			'IMG_URL_EDIT' 			=> $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'],
! 
  			'E_COLUMN_TITLE' 		=> $column_title,
  			'E_COLUMN_SIZE' 		=> $column_size,
! 
  			'S_SUBMIT' 				=> $new_column ? $lang['Create_column'] : $lang['Update'],
! 
! 			//
  			// Quick Panels
- 			//
  			'MESSAGE_DELETE' 		=> $message_delete,
! 
  			'S_HIDDEN_FIELDS' 		=> $s_hidden_column_fields
- 
  		));
  	} // for ... column
  }
  
! //
! // Start Page Admin
! //
  
- //
  // Get the list of phpBB usergroups
- //
  $sql = $mx_backend->generate_group_select_sql();
  
--- 414,455 ----
  			'IMG_URL' 				=> $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'],
  			'IMG_URL_DELETE' 		=> $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'],
! 			
  			'COLUMN_ID' 			=> $column_template_id,
  			'COLUMN_TITLE' 			=> $new_column ? $lang['Create_column'] : $column_title,
! 			
  			'U_COLUMN_DELETE' 		=> mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode),
  			'U_COLUMN_MOVE_UP' 		=> mx_append_sid("admin_mx_page_cp.$phpEx" . $upmode),
  			'U_COLUMN_MOVE_DOWN' 	=> mx_append_sid("admin_mx_page_cp.$phpEx" . $downmode),
! 			
  			// Column Edit
  			'L_DELETE'				=> $new_column ? '' : $lang['Delete'],
  			'L_MOVE_UP' 			=> $new_column ? '' : $lang['Move_up'],
  			'L_MOVE_DOWN' 			=> $new_column ? '' : $lang['Move_down'],
! 			
  			'L_COLUMN' 				=> $lang['Column'],
  			'L_COLUMN_NAME' 		=> $lang['Column_name'],
  			'L_COLUMN_SIZE' 		=> $lang['Column_Size'],
! 			
  			'VISIBLE' 				=> $visible_column_edit ? 'block' : 'none',
  			'IMG_URL_EDIT' 			=> $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'],
! 			
  			'E_COLUMN_TITLE' 		=> $column_title,
  			'E_COLUMN_SIZE' 		=> $column_size,
! 			
  			'S_SUBMIT' 				=> $new_column ? $lang['Create_column'] : $lang['Update'],
! 			
  			// Quick Panels
  			'MESSAGE_DELETE' 		=> $message_delete,
! 			
  			'S_HIDDEN_FIELDS' 		=> $s_hidden_column_fields
  		));
  	} // for ... column
  }
  
! /*
! * Start Page Admin
! */
  
  // Get the list of phpBB usergroups
  $sql = $mx_backend->generate_group_select_sql();
  
***************
*** 571,578 ****
  $total_pages = $total_pages + $total_pages_current;
  
! //
! // Pages loop
! //
! for( $page_count = -1; $page_count < $total_pages; $page_count++ )
  {
  	$new_page = $page_count == -1;
--- 538,545 ----
  $total_pages = $total_pages + $total_pages_current;
  
! /*
! * Pages loop
! */
! for($page_count = -1; $page_count < $total_pages; $page_count++)
  {
  	$new_page = $page_count == -1;
***************
*** 589,618 ****
  	$action = $new_page ? MX_DO_INSERT : MX_DO_UPDATE;
  	$deletemode = '?mode=' . $mode . '&amp;action=' . MX_DO_DELETE . '&amp;id=' . $page_id;
! 
! 	//
  	// Hidden fields
- 	//
  	$s_hidden_page_fields = 	'<input type="hidden" name="mode" value="' . $mode . '" />
  								<input type="hidden" name="action" value="' . $action . '" />
  								<input type="hidden" name="id" value="' . $page_id . '" />
  								<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 
  	$s_hidden_private_fields = 	'<input type="hidden" name="mode" value="' . MX_PAGE_PRIVATE_TYPE . '" />
  								<input type="hidden" name="action" value="' . MX_DO_UPDATE . '" />
  								<input type="hidden" name="id" value="' . $page_id . '" />
  								<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 
! 
  	$page_title = !$new_page ? $page_rows[$page_count]['page_name'] : '';
  	$page_desc = !$new_page ? $page_rows[$page_count]['page_desc'] : '';
  	$page_parent = !$new_page ? $page_rows[$page_count]['page_parent'] : '';
! 	$page_icon = !$new_page ? $page_rows[$page_count]['page_icon'] : '';
  	$page_alt_icon = !$new_page ? $page_rows[$page_count]['page_alt_icon'] : '';
! 	$page_header = $page_rows[$page_count]['page_header'];
! 	$page_footer = $page_rows[$page_count]['page_footer'];
! 	$page_main_layout = $page_rows[$page_count]['page_main_layout'];
! 	$navigation_block_list = get_list_formatted('block_list', $page_rows[$page_count]['navigation_block'], 'navigation_block', 'mx_menu_nav.' . $phpEx);
! 
! 	$style_select = mx_style_select($page_rows[$page_count]['default_style'], 'mx_default_style', 'templates', true);
  
  	$override_user_style_yes = !$new_page ? ( $page_rows[$page_count]['override_user_style'] == 1 ? "checked=\"checked\"" : "" ) : "";
--- 556,582 ----
  	$action = $new_page ? MX_DO_INSERT : MX_DO_UPDATE;
  	$deletemode = '?mode=' . $mode . '&amp;action=' . MX_DO_DELETE . '&amp;id=' . $page_id;
! 	
  	// Hidden fields
  	$s_hidden_page_fields = 	'<input type="hidden" name="mode" value="' . $mode . '" />
  								<input type="hidden" name="action" value="' . $action . '" />
  								<input type="hidden" name="id" value="' . $page_id . '" />
  								<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 								
  	$s_hidden_private_fields = 	'<input type="hidden" name="mode" value="' . MX_PAGE_PRIVATE_TYPE . '" />
  								<input type="hidden" name="action" value="' . MX_DO_UPDATE . '" />
  								<input type="hidden" name="id" value="' . $page_id . '" />
  								<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 								
  	$page_title = !$new_page ? $page_rows[$page_count]['page_name'] : '';
  	$page_desc = !$new_page ? $page_rows[$page_count]['page_desc'] : '';
  	$page_parent = !$new_page ? $page_rows[$page_count]['page_parent'] : '';
! 	$page_icon = !$new_page ? $page_rows[$page_count]['page_icon'] : 'default.gif';
  	$page_alt_icon = !$new_page ? $page_rows[$page_count]['page_alt_icon'] : '';
! 	$page_header = !$new_page ? $page_rows[$page_count]['page_header'] : 'overall_header_navigation.html';
! 	$page_footer = !$new_page ? $page_rows[$page_count]['page_footer'] : 'overall_footer.html';
! 	$page_main_layout = !$new_page ? $page_rows[$page_count]['page_main_layout'] : 'mx_main_layout.html';
! 	$navigation_block_list = get_list_formatted('block_list', $page_main_layout, 'navigation_block', 'mx_menu_nav.' . $phpEx);
! 	$default_style = !$new_page ? $page_rows[$page_count]['default_style'] : '_core';
! 	$style_select = mx_style_select($default_style, 'mx_default_style', 'templates', true);
  
  	$override_user_style_yes = !$new_page ? ( $page_rows[$page_count]['override_user_style'] == 1 ? "checked=\"checked\"" : "" ) : "";
***************
*** 628,634 ****
  	$phpbb_stats_default = !$new_page ? ( $page_rows[$page_count]['phpbb_stats'] == -1 ? "checked=\"checked\"" : "" ) : "checked=\"checked\"";
  
- 	//
  	// Page subpanel - edit
- 	//
  	$visible_page = in_array('adminPage_' . $page_id, $cookie_states);
  	$visible_page_delete = in_array('adminPageDelete_' . $page_id, $cookie_states);
--- 592,596 ----
***************
*** 641,648 ****
  			. '<br /><br />' . sprintf($lang['Click_page_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>')
  			. '<br /><br />';
! 
! 	//
  	// Make the settings panel default when switching pages
- 	//
  	if ($is_current_page && !$visible_page && !$visible_page_edit && !$visible_page_settings && !$visible_page_private)
  	{
--- 603,608 ----
  			. '<br /><br />' . sprintf($lang['Click_page_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>')
  			. '<br /><br />';
! 			
  	// Make the settings panel default when switching pages
  	if ($is_current_page && !$visible_page && !$visible_page_edit && !$visible_page_settings && !$visible_page_private)
  	{
***************
*** 651,658 ****
  
  	$page_icon = post_icons('page_icons/', $page_icon);
! 
! 	//
  	// Page templates dropdown
- 	//
  	$template_list = !$new_page ? '' : mx_get_list('use_template', PAGE_TEMPLATES, 'page_template_id', 'template_name', 1, true);
  	$l_choose_page_template = !$new_page ? '' : empty($lang['Choose_page_template']) ? "Choose page template" : $lang['Choose_page_template'];
--- 611,616 ----
  
  	$page_icon = post_icons('page_icons/', $page_icon);
! 	
  	// Page templates dropdown
  	$template_list = !$new_page ? '' : mx_get_list('use_template', PAGE_TEMPLATES, 'page_template_id', 'template_name', 1, true);
  	$l_choose_page_template = !$new_page ? '' : empty($lang['Choose_page_template']) ? "Choose page template" : $lang['Choose_page_template'];
***************
*** 687,696 ****
  		'U_DELETE'					=> mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode),
  		'U_PREVIEW'					=> mx_append_sid($mx_root_path . "index.$phpEx" . '?page=' . $page_id),
! 
! 		//
  		// Page subpanel - edit
- 		//
  		'L_CHOOSE_PAGE_TEMPLATE'	=> $l_choose_page_template,
! 
  		'E_PAGE_TITLE'				=> $page_title,
  		'E_PAGE_DESC'				=> $page_desc,
--- 645,652 ----
  		'U_DELETE'					=> mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode),
  		'U_PREVIEW'					=> mx_append_sid($mx_root_path . "index.$phpEx" . '?page=' . $page_id),
! 		
  		// Page subpanel - edit
  		'L_CHOOSE_PAGE_TEMPLATE'	=> $l_choose_page_template,
! 		
  		'E_PAGE_TITLE'				=> $page_title,
  		'E_PAGE_DESC'				=> $page_desc,
***************
*** 703,741 ****
  		"E_NAVIGATION_BLOCK" 		=> $navigation_block_list,
  		'S_TEMPLATE_LIST'			=> $template_list,
! 
! 		//
  		// Style
- 		//
  		"STYLE_SELECT" => $style_select,
  		"OVERRIDE_STYLE_YES" => $override_user_style_yes,
  		"OVERRIDE_STYLE_NO" => $override_user_style_no,
  		"OVERRIDE_STYLE_DEFAULT" => $override_user_style_default,
! 
! 		//
  		// IP filter
- 		//
  		"IP_FILTER" => $ip_filter,
! 
  		'S_PHPBB_STATS_YES' 		=> $phpbb_stats_yes,
  		'S_PHPBB_STATS_NO' 			=> $phpbb_stats_no,
  		'S_PHPBB_STATS_DEFAULT' 	=> $phpbb_stats_default,
! 
! 		//
  		// Main
- 		//
  		'U_PHPBB_ROOT_PATH' 		=> PHPBB_URL,
  		'TEMPLATE_ROOT_PATH' 		=> TEMPLATE_ROOT_PATH,
  		'PAGELIST' 					=> $page_list,
! 
! 		//
  		// Quick Panels
- 		//
  		'MESSAGE_DELETE' 			=> $message_delete,
! 
  		'S_HIDDEN_FIELDS'			=> $s_hidden_page_fields,
  		'S_HIDDEN_PRIVATE_FIELDS'	=> $s_hidden_private_fields,
! 
  		'S_SUBMIT' 					=> $new_page ? $lang['Add_Page'] : $lang['Update']
- 
  	));
  
--- 659,688 ----
  		"E_NAVIGATION_BLOCK" 		=> $navigation_block_list,
  		'S_TEMPLATE_LIST'			=> $template_list,
! 		
  		// Style
  		"STYLE_SELECT" => $style_select,
  		"OVERRIDE_STYLE_YES" => $override_user_style_yes,
  		"OVERRIDE_STYLE_NO" => $override_user_style_no,
  		"OVERRIDE_STYLE_DEFAULT" => $override_user_style_default,
! 		
  		// IP filter
  		"IP_FILTER" => $ip_filter,
! 		
  		'S_PHPBB_STATS_YES' 		=> $phpbb_stats_yes,
  		'S_PHPBB_STATS_NO' 			=> $phpbb_stats_no,
  		'S_PHPBB_STATS_DEFAULT' 	=> $phpbb_stats_default,
! 		
  		// Main
  		'U_PHPBB_ROOT_PATH' 		=> PHPBB_URL,
  		'TEMPLATE_ROOT_PATH' 		=> TEMPLATE_ROOT_PATH,
  		'PAGELIST' 					=> $page_list,
! 		
  		// Quick Panels
  		'MESSAGE_DELETE' 			=> $message_delete,
! 		
  		'S_HIDDEN_FIELDS'			=> $s_hidden_page_fields,
  		'S_HIDDEN_PRIVATE_FIELDS'	=> $s_hidden_private_fields,
! 		
  		'S_SUBMIT' 					=> $new_page ? $lang['Add_Page'] : $lang['Update']
  	));
  
***************
*** 744,759 ****
  		$template->assign_block_vars('pages.template', array());
  	}
! 
! 	//
  	// Auth
- 	//
  	$s_column_span = 0;
! 	for( $j = 0; $j < count($auth_fields); $j++ )
  	{
  		$custom_auth[$j] = '&nbsp;<select name="' . $auth_fields[$j] . '">';
  
! 		for( $k = 0; $k < count($auth_levels); $k++ )
  		{
! 			$selected = ( $page_rows[$page_count][$auth_fields[$j]] == $auth_const[$k] ) ? ' selected="selected"' : '';
  			$custom_auth[$j] .= '<option value="' . $auth_const[$k] . '"' . $selected . '>' . $lang['AUTH_' . $auth_levels[$k]] . '</option>';
  		}
--- 691,705 ----
  		$template->assign_block_vars('pages.template', array());
  	}
! 	
  	// Auth
  	$s_column_span = 0;
! 	for($j = 0; $j < count($auth_fields); $j++)
  	{
  		$custom_auth[$j] = '&nbsp;<select name="' . $auth_fields[$j] . '">';
  
! 		for($k = 0; $k < count($auth_levels); $k++)
  		{
! 			$auth_var = ($j > 0) ? $page_rows[$page_count][$auth_fields[$j]] : '';
! 			$selected = ($auth_var == $auth_const[$k]) ? ' selected="selected"' : '';
  			$custom_auth[$j] .= '<option value="' . $auth_const[$k] . '"' . $selected . '>' . $lang['AUTH_' . $auth_levels[$k]] . '</option>';
  		}
***************
*** 962,974 ****
  			'S_HIDDEN_FIELDS' => $s_hidden_column_fields
  		));
- 
- 		//
  		// Add up radioboxes for block to column form
- 		//
  		if (!$new_column)
  		{
  			$radio_column_list .= '<input type="radio" name="id" value="'.$column_id.'" '.$radio_column_checked.' /><span class="gensmall">'.$column_title.'&nbsp;&nbsp;</span><br />';
  		}
! 
  		$sql = "SELECT cbl.*, blk.*, fnc.function_file, function_admin
  			FROM " . COLUMN_BLOCK_TABLE . " cbl,
--- 908,917 ----
  			'S_HIDDEN_FIELDS' => $s_hidden_column_fields
  		));
  		// Add up radioboxes for block to column form
  		if (!$new_column)
  		{
  			$radio_column_list .= '<input type="radio" name="id" value="'.$column_id.'" '.$radio_column_checked.' /><span class="gensmall">'.$column_title.'&nbsp;&nbsp;</span><br />';
  		}
! 		$column_id = isset($column_rows[$column]['column_id']) ? $column_rows[$column]['column_id'] : 0;
  		$sql = "SELECT cbl.*, blk.*, fnc.function_file, function_admin
  			FROM " . COLUMN_BLOCK_TABLE . " cbl,
***************
*** 977,981 ****
  			WHERE blk.function_id = fnc.function_id
  				AND blk.block_id = cbl.block_id
! 				AND cbl.column_id = '" . $column_rows[$column]['column_id'] . "'
  			ORDER BY column_id, block_order";
  
--- 920,924 ----
  			WHERE blk.function_id = fnc.function_id
  				AND blk.block_id = cbl.block_id
! 				AND cbl.column_id = '" . $column_id . "'
  			ORDER BY column_id, block_order";
  

[mxbb-commits] core/includes/sessions/phpbb3 constants.php, 1.8, 1.9

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21789/sessions/phpbb3

Modified Files:
	constants.php 
Log Message:


Index: constants.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/constants.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** constants.php	16 Jun 2013 01:44:39 -0000	1.8
--- constants.php	25 Jun 2013 20:05:03 -0000	1.9
***************
*** 55,58 ****
--- 55,62 ----
  @define('LOGIN_ERROR_PASSWORD_CONVERT', 15);
  
+ // SQL codes phpBB2
+ @define('BEGIN_TRANSACTION', 1);
+ @define('END_TRANSACTION', 2);
+ 
  // Error codes (from phpbb2)
  @define('GENERAL_MESSAGE', 200);

[mxbb-commits] mx_counter/admin admin_counter_cfg.php,1.4,1.5

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/mx_counter/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17057

Modified Files:
	admin_counter_cfg.php 
Log Message:


Index: admin_counter_cfg.php
===================================================================
RCS file: /cvsroot/mxbb/mx_counter/admin/admin_counter_cfg.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_counter_cfg.php	17 Jun 2013 18:24:41 -0000	1.4
--- admin_counter_cfg.php	25 Jun 2013 18:28:00 -0000	1.5
***************
*** 29,33 ****
  $mx_root_path = '../../../';
  $module_root_path = "../";
! 
  //
  // Security and page header...
--- 29,33 ----
  $mx_root_path = '../../../';
  $module_root_path = "../";
! @define('IN_PORTAL', 1);
  //
  // Security and page header...
***************
*** 114,131 ****
  		$file = readdir($direct);
  		$filetype = filetype($dir . $file);
! 
!                 if ($file == ".." OR $file == "." OR $file == "")
!                 {
  			$pagelist_digitpath = "";
!                 }
!                 elseif ($filetype == "dir")
!                 {
  			$pagelist_digitpath = "<OPTION value=\"$file\" > $file \n";
!                 }
! 
! 		$array = "$array;$file";
  		$template->assign_block_vars('digitpagelist', array('DIGITPATH' => $pagelist_digitpath));
! 
!     	}
  
  $s_hidden_fields = '<input type="hidden" name="config_name" value="' . htmlspecialchars($new[$config_name]) . '" />';
--- 114,127 ----
  		$file = readdir($direct);
  		$filetype = filetype($dir . $file);
! 		if ($file == ".." OR $file == "." OR $file == "")
! 		{
  			$pagelist_digitpath = "";
! 		}
! 		elseif ($filetype == "dir")
! 		{
  			$pagelist_digitpath = "<OPTION value=\"$file\" > $file \n";
! 		}
  		$template->assign_block_vars('digitpagelist', array('DIGITPATH' => $pagelist_digitpath));
!     }
  
  $s_hidden_fields = '<input type="hidden" name="config_name" value="' . htmlspecialchars($new[$config_name]) . '" />';

[mxbb-commits] core/modules/mx_users/admin admin_groupcp.php, 1.9, 1.10 admin_groups.php, 1.5, 1.6 admin_prune_user_posts.php, 1.7, 1.8 admin_prune_users.php, 1.7, 1.8 admin_userlist.php, 1.7, 1.8 admin_users.php, 1.11, 1.12

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_users/admin
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16523

Modified Files:
	admin_groupcp.php admin_groups.php admin_prune_user_posts.php 
	admin_prune_users.php admin_userlist.php admin_users.php 
Log Message:


Index: admin_prune_user_posts.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_prune_user_posts.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** admin_prune_user_posts.php	17 Jun 2013 18:14:28 -0000	1.7
--- admin_prune_user_posts.php	25 Jun 2013 18:24:07 -0000	1.8
***************
*** 19,23 ****
  	return;
  }
! 
  $mx_root_path = './../../../';
  $module_root_path = "./../";
--- 19,23 ----
  	return;
  }
! @define('IN_PORTAL', 1);
  $mx_root_path = './../../../';
  $module_root_path = "./../";

Index: admin_users.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_users.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** admin_users.php	17 Jun 2013 18:14:28 -0000	1.11
--- admin_users.php	25 Jun 2013 18:24:07 -0000	1.12
***************
*** 26,30 ****
  	return;
  }
! 
  $mx_root_path = './../../../';
  $module_root_path = "./../";
--- 26,30 ----
  	return;
  }
! @define('IN_PORTAL', 1);
  $mx_root_path = './../../../';
  $module_root_path = "./../";

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_groups.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_groups.php	17 Jun 2013 18:14:28 -0000	1.5
--- admin_groups.php	25 Jun 2013 18:24:07 -0000	1.6
***************
*** 28,32 ****
  	return;
  }
! 
  $mx_root_path = './../../../';
  $module_root_path = "./../";
--- 28,32 ----
  	return;
  }
! @define('IN_PORTAL', 1);
  $mx_root_path = './../../../';
  $module_root_path = "./../";

Index: admin_prune_users.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_prune_users.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** admin_prune_users.php	17 Jun 2013 18:14:28 -0000	1.7
--- admin_prune_users.php	25 Jun 2013 18:24:07 -0000	1.8
***************
*** 19,23 ****
  	return;
  }
! 
  $mx_root_path = './../../../';
  $module_root_path = "./../";
--- 19,23 ----
  	return;
  }
! @define('IN_PORTAL', 1);
  $mx_root_path = './../../../';
  $module_root_path = "./../";

Index: admin_userlist.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_userlist.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** admin_userlist.php	17 Jun 2013 18:14:28 -0000	1.7
--- admin_userlist.php	25 Jun 2013 18:24:07 -0000	1.8
***************
*** 16,20 ****
  	return;
  }
! 
  $mx_root_path = './../../../';
  $module_root_path = "./../";
--- 16,20 ----
  	return;
  }
! @define('IN_PORTAL', 1);
  $mx_root_path = './../../../';
  $module_root_path = "./../";

Index: admin_groupcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_groupcp.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** admin_groupcp.php	17 Jun 2013 18:14:28 -0000	1.9
--- admin_groupcp.php	25 Jun 2013 18:24:06 -0000	1.10
***************
*** 10,13 ****
--- 10,23 ----
  */
  
+ /**
+ *
+ * @package MX-Publisher Module - mx_users
+ * @version $Id$
+ * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
+ * @link http://www.mx-publisher.com/
+ *
+ */
+ 
  /***************************************************************************
   *
***************
*** 19,23 ****
   ***************************************************************************/
  
- 
  if ( !empty( $setmodules ) )
  {
--- 29,32 ----
***************
*** 25,29 ****
  	return;
  }
! 
  $mx_root_path = './../../../';
  $module_root_path = "./../";
--- 34,38 ----
  	return;
  }
! @define('IN_PORTAL', 1);
  $mx_root_path = './../../../';
  $module_root_path = "./../";

[mxbb-commits] core/modules/mx_phpbb3blocks/templates/subsilver2 mx_activity_stats.html, NONE, 1.1 mx_announce.html, NONE, 1.1 mx_forum.html, 1.2, 1.3 mx_last_msg.html, NONE, 1.1 mx_vieforum.html, NONE, 1.1 subsilver2.cfg, 1.2, 1.3

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/templates/subsilver2
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15857

Added Files:
	mx_activity_stats.html mx_announce.html mx_forum.html 
	mx_last_msg.html mx_vieforum.html subsilver2.cfg 
Log Message:


--- NEW FILE: mx_vieforum.html ---
<!-- IF U_MCP --><p>[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>

<!-- IF FORUM_DESC or MODERATORS or U_MCP -->
<p>
	<!-- NOTE: remove the style="display: none" when you wnat to have the forum description on the forum body -->
	<!-- IF FORUM_DESC --><span style="display: none">{FORUM_DESC}<br /></span><!-- ENDIF -->
	<!-- IF MODERATORS --><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}<!-- ENDIF -->
</p>
<!-- ENDIF -->

<!-- IF S_FORUM_RULES -->
	<div class="rules">
		<div class="inner"><span class="corners-top"><span></span></span>

		<!-- IF U_FORUM_RULES -->
			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a>
		<!-- ELSE -->
			<strong>{L_FORUM_RULES}</strong><br />
			{FORUM_RULES}
		<!-- ENDIF -->

		<span class="corners-bottom"><span></span></span></div>
	</div>
<!-- ENDIF -->

<!-- IF S_HAS_SUBFORUM -->
<!-- IF not S_IS_BOT and U_MARK_FORUMS -->
<ul class="linklist">
	<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a></li>
</ul>
<!-- ENDIF -->
	<!-- INCLUDE forumlist_body.html -->
<!-- ENDIF -->

<!-- IF S_DISPLAY_POST_INFO or PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
	<div class="topic-actions" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->>

	<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
		<div class="buttons">
			<div class="post-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n"><span>{L_POST_TOPIC}</span></a></div>
		</div>
	<!-- ENDIF -->

	<!-- IF S_DISPLAY_SEARCHBOX -->
		<div class="search-box">
			<form method="post" id="forum-search" action="{S_SEARCHBOX_ACTION}">	
			<fieldset>
				<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{L_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{L_SEARCH_FORUM}';" />
				<input class="button2" type="submit" value="{L_SEARCH}" />	
				<input type="hidden" value="{FORUM_ID}" name="fid[]" />
			</fieldset>
			</form>
		</div>
	<!-- ENDIF -->

	<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
		<div class="pagination">
			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF --><!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
			<!-- IF PAGE_NUMBER -->
				<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
			<!-- ENDIF -->
		</div>
	<!-- ENDIF -->

	</div>
<!-- ENDIF -->

<!-- IF S_NO_READ_ACCESS -->

	<div class="panel">
		<div class="inner"><span class="corners-top"><span></span></span>
		<strong>{L_NO_READ_ACCESS}</strong>
		<span class="corners-bottom"><span></span></span></div>
	</div>

	<!-- IF not S_USER_LOGGED_IN -->

		<form action="{S_LOGIN_ACTION}" method="post">

		<div class="panel">
			<div class="inner"><span class="corners-top"><span></span></span>

			<div class="content">
				<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a>&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a></h3>
		
				<fieldset class="fields1">
				<dl>
					<dt><label for="username">{L_USERNAME}:</label></dt>
					<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
				</dl>
				<dl>
					<dt><label for="password">{L_PASSWORD}:</label></dt>
					<dd><input type="password" tabindex="2" id="password" name="password" size="25" class="inputbox autowidth" /></dd>
					<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="3" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
					<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4" /> {L_HIDE_ME}</label></dd>
				</dl>
				<dl>
					<dt>&nbsp;</dt>
					<dd><input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd>
				</dl>
				</fieldset>
			</div>

			<span class="corners-bottom"><span></span></span></div>
		</div>

	<!-- ENDIF -->

<!-- ENDIF -->

<!-- BEGIN topicrow -->
	
	<!-- IF not topicrow.S_TOPIC_TYPE_SWITCH and not topicrow.S_FIRST_ROW -->
		</ul>
		<span class="corners-bottom"><span></span></span></div>
	</div>
	<!-- ENDIF -->

	<!-- IF topicrow.S_FIRST_ROW or not topicrow.S_TOPIC_TYPE_SWITCH -->
		<div class="forumbg<!-- IF topicrow.S_TOPIC_TYPE_SWITCH --> announcement<!-- ENDIF -->">
		<div class="inner"><span class="corners-top"><span></span></span>
		<ul class="topiclist">
			<li class="header">
				<dl class="icon">
					<dt><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and topicrow.S_TOPIC_TYPE gt 1 -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></dt>
					<dd class="posts">{L_REPLIES}</dd>
					<dd class="views">{L_VIEWS}</dd>
					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
				</dl>
			</li>
		</ul>
		<ul class="topiclist topics">
	<!-- ENDIF -->
	
		<li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
				<dt style="<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS -->background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;<!-- ENDIF -->" title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} 
				</dt>
				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>
				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}</span>
				</dd>
			</dl>
		</li>

	<!-- IF topicrow.S_LAST_ROW -->
			</ul>
		<span class="corners-bottom"><span></span></span></div>
	</div>
	<!-- ENDIF -->

<!-- BEGINELSE -->
	<div class="panel">
		<div class="inner"><span class="corners-top"><span></span></span>
		<strong>{L_NO_TOPICS}</strong>
		<span class="corners-bottom"><span></span></span></div>
	</div>
<!-- END topicrow -->

<!-- IF S_SELECT_SORT_DAYS and not S_DISPLAY_ACTIVE -->
	<form method="post" action="{S_FORUM_ACTION}">
		<fieldset class="display-options">
			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
			<label>{L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS}</label> 
			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> 
			<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
		</fieldset>
	</form>
	<hr />
<!-- ENDIF -->

<!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
	<div class="topic-actions">
		<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
		<div class="buttons">
			<div class="post-icon"><a href="{U_POST_NEW_TOPIC}"><span>{L_POST_TOPIC}</span></a></div>
		</div>
		<!-- ENDIF -->
	
		<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
		<div class="pagination">
			<!-- IF TOTAL_TOPICS and not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a> &bull;  <!-- ENDIF -->
			<!-- IF TOTAL_POSTS and not NEWEST_USER --> {TOTAL_POSTS}<!-- ELSEIF TOTAL_TOPICS and not NEWEST_USER --> {TOTAL_TOPICS}<!-- ENDIF -->
			<!-- IF TOTAL_USERS -->{TOTAL_USERS}<!-- ENDIF -->
			<!-- IF PAGINATION --> &bull;  <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a>
			 &bull;  <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
		</div>
		<!-- ENDIF -->
	</div>
<!-- ENDIF -->

<!-- INCLUDE jumpbox.html -->

<!-- IF S_DISPLAY_ONLINE_LIST -->
	<h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3>
	<p>{LOGGED_IN_USER_LIST}</p>
<!-- ENDIF -->

<!-- IF S_DISPLAY_POST_INFO -->
	<h3>{L_FORUM_PERMISSIONS}</h3>
	<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p>
<!-- ENDIF -->
--- NEW FILE: mx_forum.html ---
<!-- IF S_HAS_SUBFORUM -->
	<!-- INCLUDE forumlist_body.html -->
	<br clear="all" />
<!-- ENDIF -->

<div id="pagecontent">

		<table class="tablebg" width="100%" cellspacing="1">
		<tr>
			<td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->">
				<table width="100%" cellspacing="0">
				<tr class="nav">
					<td valign="middle">&nbsp;<!-- IF S_WATCH_FORUM_LINK and not S_IS_BOT --><a href="{S_WATCH_FORUM_LINK}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF --></td>
					<td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a><!-- ENDIF -->&nbsp;</td>
				</tr>
				</table>
			</td>
		</tr>

		<tr>
			<!-- IF S_TOPIC_ICONS -->
				<th colspan="3">&nbsp;{L_TOPICS}&nbsp;</th>
			<!-- ELSE -->
				<th colspan="2">&nbsp;{L_TOPICS}&nbsp;</th>
			<!-- ENDIF -->
			<th>&nbsp;{L_AUTHOR}&nbsp;</th>
			<th>&nbsp;{L_REPLIES}&nbsp;</th>
			<th>&nbsp;{L_VIEWS}&nbsp;</th>
			<th>&nbsp;{L_LAST_POST}&nbsp;</th>
		</tr>

		<!-- BEGIN topicrow -->

			<!-- IF topicrow.S_TOPIC_TYPE_SWITCH eq 1 -->
				<tr>
					<td class="row3" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><b class="gensmall">{L_ANNOUNCEMENTS}</b></td>
				</tr>
			<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH eq 0 -->
				<tr>
					<td class="row3" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><b class="gensmall">{L_TOPICS}</b></td>
				</tr>
			<!-- ENDIF -->

			<tr>
				<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
				<!-- IF S_TOPIC_ICONS -->
					<td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
				<!-- ENDIF -->
				<td class="row1">
					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF -->
					{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}: {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
						<a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a>&nbsp;
					<!-- ENDIF -->
					<!-- IF topicrow.S_TOPIC_REPORTED -->
						<a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
					<!-- ENDIF -->
					<!-- IF topicrow.PAGINATION -->
						<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p>
					<!-- ENDIF -->
				</td>
				<td class="row2" width="130" align="center"><p class="topicauthor">{topicrow.TOPIC_AUTHOR_FULL}</p></td>
				<td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td>
				<td class="row2" width="50" align="center"><p class="topicdetails">{topicrow.VIEWS}</p></td>
				<td class="row1" width="140" align="center">
					<p class="topicdetails" style="white-space: nowrap;">{topicrow.LAST_POST_TIME}</p>
					<p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL}
						<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a>
					</p>
				</td>
			</tr>

		<!-- BEGINELSE -->

			<tr>
				<!-- IF S_TOPIC_ICONS -->
					<td class="row1" colspan="7" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
				<!-- ELSE -->
					<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
				<!-- ENDIF -->
			</tr>
		<!-- END topicrow -->

		<br clear="all" />
</div>


<br clear="all" />
--- NEW FILE: mx_announce.html ---
<!-- BEGIN postrow -->
<div class="clear"></div>
<div class="forabg block">
	<div id="p1" class="post bg2 online">
		<div class="inner"><span class="corners-top"><span></span></span>
			<dl class="textbody">
				<dt>
					<p>
						<a href="{postrow.U_TOPIC_URL}">
						<img src="{postrow.IMAGE}" align="right" hspace="5" vspace="5" border="1" title="{postrow.TITLE}" alt="{postrow.TITLE}" />
						</a>
						<a href="{postrow.U_LAST_POST_URL}" class="topictitle">
						<img src="{postrow.FOLDER_IMG}" alt="{postrow.L_TOPIC_FOLDER_ALT}" title="{postrow.L_TOPIC_FOLDER_ALT}" border="0" align="absmiddle" /></a>
						<a href="{postrow.U_TOPIC_URL}" class="topictitle">{postrow.TITLE}</a>
					</p>
					<span class="postbody">{postrow.MESSAGE}</span>
				</dt>
			</dl>
		</div>
	</div>
	<div id="p1" class="post bg2 online">
		<div class="inner"><span class="corners-top"><span></span></span>	
		<ul class="topiclist">
			<li class="header"></li>
		</ul>
			<dl class="textbody">
				<dt style="vertical-align:middle; text-align:center;"><span class="gensmall">{postrow.L_AUTHOR}:&nbsp;{postrow.POSTER_FULL}</span></dt>
				<dt style="vertical-align:middle; text-align:center;"><span class="gensmall">{postrow.L_POSTED}:<br />{postrow.FIRST_POST_TIME}</span></dt>
				<dt style="vertical-align:middle; text-align:center;"><span class="postdetails">{postrow.L_REPLIES}:<br />{postrow.REPLIES}</span></dt>
				<dt style="vertical-align:middle; text-align:center;"><span class="postdetails">{postrow.L_VIEWS}:<br />{postrow.VIEWS}</span></dt>
				<dt style="vertical-align:middle; text-align:center;"><span class="postdetails">{postrow.L_LASTPOST}:<br />{postrow.LAST_POST_TIME}&nbsp;{postrow.LAST_POST_AUTHOR}&nbsp;{postrow.LAST_POST_IMG}</span></dt>
			</dl>
		</div>
	</div>
	<span class="corners-bottom"><span></span></span>
</div>
<br clear="all" />
<!-- END postrow -->
--- NEW FILE: mx_activity_stats.html ---

	
<!-- IF S_DISPLAY_ONLINE_LIST -->
	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
	<p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
	<!-- IF not S_IS_BOT --><br /><br />
	{USERS_24HOUR_TOTAL}: <!-- BEGIN lastvisit -->{lastvisit.USERNAME_FULL}<!-- IF not lastvisit.S_LAST_ROW -->, <!-- ENDIF --><!-- END lastvisit -->
	<!-- ENDIF -->	
	<!-- IF LEGEND --><br /><em>{L_LEGEND}: {LEGEND}</em><!-- ENDIF --></p>
<!-- ENDIF -->

<!-- IF S_DISPLAY_BIRTHDAY_LIST and BIRTHDAY_LIST -->
	<h3>{L_BIRTHDAYS}</h3>
	<p><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <strong>{BIRTHDAY_LIST}</strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p>
<!-- ENDIF -->

<!-- IF NEWEST_USER -->
	<h3>{L_STATISTICS}</h3>
	<p>{TOTAL_POSTS} &bull; {TOTAL_TOPICS} &bull; {TOTAL_USERS} &bull; {NEWEST_USER}</p>
	<!-- IF not S_IS_BOT -->
	<h3 id="24hour_stats">{L_24HOUR_STATS}</h3>
	<p>{24HOUR_POSTS} &bull; {24HOUR_TOPICS} &bull; {24HOUR_USERS}</p>
	<!-- ENDIF -->	
<!-- ENDIF -->	

--- NEW FILE: mx_last_msg.html ---
<div class="forabg block">
	<div class="inner">
		<ul class="topiclist forums">
		<!-- BEGIN no_row -->
			<li class="row bg1">{no_row.L_NO_ITEMS}</li>
		<!-- END no_row -->
		<!-- BEGIN msg_row -->
			<li class="row<!-- IF msg_row.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF msg_row.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF msg_row.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF msg_row.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
				<dl class="icon" style="width:100%">
					<dt  style="background: transparent url('{msg_row.FOLDER_IMG}') no-repeat 3px 50%;padding-left: 40px;width:75%">
						<a href="{msg_row.U_LAST_MSG}" class="topictitle">{msg_row.LAST_MSG}</a>
						<br />
						<span class="gensmall"><a href="{msg_row.U_FORUM}" title="{msg_row.FORUM_NAME_ALT}" class="gensmall">{msg_row.FORUM_NAME}</a></span>
					</dt>
					<dd class="lastpost" nowrap="nowrap" style=" white-space:nowrap;clear:both;width:99%;text-align:right;padding-right:5px;border-left: none">
						{msg_row.LAST_MSG_DATE}
						<br />
						{msg_row.TOPIC_AUTHOR_FULL} {msg_row.LAST_POSTER_FULL}
					</dd>
				</dl>
			</li>
		<!-- END msg_row -->
		</ul>
	</div>
	<div class="bg1">{PAGINATION}</div>
	<span class="corners-bottom"><span></span></span>
</div>

--- NEW FILE: subsilver2.cfg ---
<?php
/**
*
* @package MX-Publisher Module - mx_phpbb3blocks
* @version $Id: subsilver2.cfg,v 1.3 2013/06/25 18:16:57 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

//
// **      Configuration file for subSilver template       **
//
// **         copyright (C) 2001 The phpBB Group           **
// **             Created by subBlue design                **
// **                  www.subBlue.com                     **
//
// **    subSilver dev. forum: www.subSky.com/phpBB2/      **
//
// $Id: subsilver2.cfg,v 1.3 2013/06/25 18:16:57 orynider Exp $
//
// Please note that to enable support of different languages
// the {LANG} place holder is available. This will be replaced
// with xxx where xxx is the users selected language. If
// that language isn't available it will default to english.
// Therefore you MUST ensure you have at least a english
// directory if you choose to localise your template
//

//
// Do not alter this line!
//
define(MX_TEMPLATE_CONFIG, TRUE);
$mx_template_config = true;

// -------------------------------------------------------------------------
// Do some checks
// -------------------------------------------------------------------------
$current_template_path = file_exists($mx_root_path . $current_template_path . "/images" ) ? $current_template_path : ( file_exists( $mx_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path : $default_template_path);
$current_template_root_path = str_replace($module_root_path, "", $current_template_path);

// -------------------------------------------------------------------------
// Prefix with PORTAL_URL
// -------------------------------------------------------------------------
$current_template_images = PORTAL_URL . $current_template_path . "/images";
$current_template_theme_images	= !empty($current_template_root_path) && file_exists($mx_root_path . $current_template_root_path . "/images") ? PORTAL_URL . $current_template_root_path . "/images" : ( !empty($cloned_template_path) && file_exists( $mx_root_path . $cloned_template_path . "/images" ) ? PORTAL_URL . cloned_template_path . "/images" :  PORTAL_URL . "templates/_core/images");
$current_module_images = !empty($current_template_root_path) && file_exists($module_root_path . $current_template_root_path ."/images") ? PORTAL_URL . $module_root_path . $current_template_root_path ."/images" : $current_template_theme_images . "/phpbb2";

// -------------------------------------------------------------------------
// (Re)Define images
// -------------------------------------------------------------------------

//
// Last Message block
//
$mx_images['last_msg_folder'] 				= $images['folder'];
$mx_images['last_msg_folder_new'] 			= $images['folder_new'];
$mx_images['last_msg_folder_announce'] 		= $images['folder_announce'];
$mx_images['last_msg_folder_announce_new'] 	= $images['folder_announce_new'];
$mx_images['last_msg_folder_sticky'] 		= $images['folder_sticky'];
$mx_images['last_msg_folder_sticky_new'] 	= $images['folder_sticky_new'];
$mx_images['last_msg_folder_locked'] 		= $images['folder_locked'];
$mx_images['last_msg_folder_locked_new'] 	= $images['folder_locked_new'];
$mx_images['last_msg_folder_hot'] 			= $images['folder_hot'];
$mx_images['last_msg_folder_hot_new'] 		= $images['folder_hot_new'];
$mx_images['last_msg_icon_newest_reply'] 	= $images['icon_newest_reply'];
$mx_images['last_msg_icon_latest_reply'] 	= $images['icon_latest_reply'];

//
// Announcement Block
//
$mx_images['mx_folder'] = $images['folder'];
$mx_images['mx_folder_new'] = $images['folder_new'];
$mx_images['mx_folder_announce'] = $images['folder_announce'];
$mx_images['mx_folder_announce_new'] = $images['folder_announce_new'];
$mx_images['mx_folder_sticky'] = $images['folder_sticky'];
$mx_images['mx_folder_sticky_new'] = $images['folder_sticky_new'];
$mx_images['mx_folder_locked'] = $images['folder_locked'];
$mx_images['mx_folder_locked_new'] = $images['folder_locked_new'];
$mx_images['mx_folder_hot'] = $images['folder_hot'];
$mx_images['mx_folder_hot_new'] = $images['folder_hot_new'];
$mx_images['mx_icon_newest_reply'] = $images['icon_newest_reply'];
$mx_images['mx_icon_latest_reply'] = $images['icon_latest_reply'];

//
// Forum Block
//
$mx_images['mx_forum'] = $images['forum'];
$mx_images['mx_forum_new'] = $images['forum_new'];
$mx_images['mx_forum_locked'] = $images['forum_locked'];

// Announce Pics
$mx_images['mx_reply'] = "$current_module_images/post_comment.png";
$mx_images['mx_post_print'] = "$current_module_images/post_print.png";
$mx_images['mx_view'] = "$current_module_images/post_view.png";

//
// Poll/Statistics Block
//
$mx_images['voting_graphic'][0] = "$current_template_theme_images/phpbb2/voting_bar.gif";
$mx_images['voting_graphic'][1] = "$current_template_theme_images/phpbb2/voting_bar.gif";
$mx_images['voting_graphic'][2] = "$current_template_theme_images/phpbb2/voting_bar.gif";
$mx_images['voting_graphic'][3] = "$current_template_theme_images/phpbb2/voting_bar.gif";
$mx_images['voting_graphic'][4] = "$current_template_theme_images/phpbb2/voting_bar.gif";

$mx_images['mx_voting_graphic'] =  $mx_images['voting_graphic']; // Array()
$mx_images['mx_vote_bar'] = ($current_module_images) ? "$current_module_images/voting_bar.gif" : "$current_template_theme_images/phpbb2/voting_bar.gif";
$mx_images['mx_vote_lcap'] = ($current_module_images) ? "$current_module_images/vote_lcap.gif" : "$current_template_theme_images/phpbb2/vote_lcap.gif";
$mx_images['mx_vote_rcap'] = ($current_module_images) ? "$current_module_images/vote_rcap.gif" : "$current_template_theme_images/phpbb2/vote_rcap.gif";
?>

[mxbb-commits] core/modules/mx_phpbb3blocks/templates/subsilver2/images index.htm, NONE, 1.1 spacer.gif, NONE, 1.1 thumb_globe.gif, NONE, 1.1 thumb_news.gif, NONE, 1.1 vote_lcap.gif, NONE, 1.1 vote_rcap.gif, NONE, 1.1 voting_bar.gif, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/templates/subsilver2/images
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15857/images

Added Files:
	index.htm spacer.gif thumb_globe.gif thumb_news.gif 
	vote_lcap.gif vote_rcap.gif voting_bar.gif 
Log Message:


--- NEW FILE: spacer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: thumb_globe.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: vote_rcap.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: voting_bar.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: vote_lcap.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: thumb_news.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

[mxbb-commits] core/language/lang_english lang_admin.php, 1.92, 1.93

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/language/lang_english
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15831/lang_english

Modified Files:
	lang_admin.php 
Log Message:


Index: lang_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** lang_admin.php	17 Jun 2013 21:29:08 -0000	1.92
--- lang_admin.php	25 Jun 2013 18:16:21 -0000	1.93
***************
*** 109,116 ****
  
  $lang['error_no_field'] = 'There is a missing field. Please fill out all the required fields.';
  
! //
! // Configuration
! //
  $lang['Portal_admin'] = 'Portal Administration';
  $lang['Portal_admin_explain'] = 'Use this form to customize your portal';
--- 109,118 ----
  
  $lang['error_no_field'] = 'There is a missing field. Please fill out all the required fields.';
+ $lang['Cookie_settings_mxp'] = 'Cookie/session settings';
+ $lang['Cookie_settings_explain_mxp'] = 'These details define how cookies/sessions are sent to your users\' browsers. In most cases the default values for the cookie settings should be sufficient, but if you need to change them do so with care -- incorrect settings can prevent users from logging in.';
  
! /*
! * Configuration
! */
  $lang['Portal_admin'] = 'Portal Administration';
  $lang['Portal_admin_explain'] = 'Use this form to customize your portal';
***************
*** 164,167 ****
--- 166,176 ----
  $lang['Portal_config_valid_true'] = '<b><font color="green">Valid</font></b>';
  $lang['Portal_config_valid_false'] = '<b><font color="red">Bad Setup. Either your phpBB relative path is wrong or phpBB is uninstalled (your phpBB database is unavailable). Thus, \'internal\' backend is used.</font></b>';
+ $lang['Phpbb_path'] = 'phpBB relative path';
+ $lang['Phpbb_path_explain'] = 'Relative path to phpBB, ex. phpBB/ or ../phpBB/<br />Note the slashes "/", they are important!';
+ $lang['Phpbb_url'] = 'Full phpBB URL';
+ $lang['Phpbb_url_explain'] = 'Full phpBB URL, ex. <br />http://www.example.com/phpBB/';
+ $lang['Portal_url'] = 'Full Portal URL';
+ $lang['Portal_backend'] = 'Portal Backend';
+ $lang['Portal_url_explain'] = 'Full Portal URL, ex. <br />http://www.example.com/';
  
  //
***************
*** 238,241 ****
--- 247,251 ----
  $lang['Parameter_name'] = '<b>Parameter Name</b><br />- to be used to access the parameter';
  $lang['Parameter_type'] = '<b>Parameter Type</b>';
+ $lang['Parameter_desc'] = "<b>Parameter Description</b>";
  $lang['Parameter_default'] = '<b>Default Value</b>';
  $lang['Parameter_function'] = '<b>Function/Options</b>';