mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] core/includes mx_functions_phpbb.php, 1.50, 1.51 mx_functions_tools.php, 1.23, 1.24

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23747

Modified Files:
	mx_functions_phpbb.php mx_functions_tools.php 
Log Message:
This will make awaylable phpbb3 backend again. some funtions are added as temporary solution for now till we find someting else for phpbb3 backend.

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** mx_functions_phpbb.php	23 Feb 2008 19:36:12 -0000	1.50
--- mx_functions_phpbb.php	29 Feb 2008 00:54:10 -0000	1.51
***************
*** 217,221 ****
  		if (count($smilies))
  		{
! 			usort($smilies, 'smiley_sort');
  		}
  
--- 217,221 ----
  		if (count($smilies))
  		{
! 			@usort($smilies, 'smiley_sort');
  		}
  
***************
*** 264,267 ****
--- 264,579 ----
  }
  
+ //phpBB Temporary code start
+ 
+ /**
+  * Loads bbcode templates from the bbcode.tpl file of the current template set.
+  * Creates an array, keys are bbcode names like "b_open" or "url", values
+  * are the associated template.
+  * Probably pukes all over the place if there's something really screwed
+  * with the bbcode.tpl file.
+  *
+  * Nathan Codding, Sept 26 2001.
+   * This a temporary function
+  */
+ function mx_load_bbcode_template()
+ {
+ 	global $template;
+ 	$tpl_filename = $template->make_filename('bbcode.tpl');
+ 	$tpl = fread(fopen($tpl_filename, 'r'), filesize($tpl_filename));
+ 
+ 	// replace \ with \\ and then ' with \'.
+ 	$tpl = str_replace('\\', '\\\\', $tpl);
+ 	$tpl  = str_replace('\'', '\\\'', $tpl);
+ 
+ 	// strip newlines.
+ 	$tpl  = str_replace("\n", '', $tpl);
+ 
+ 	// Turn template blocks into PHP assignment statements for the values of $bbcode_tpls..
+ 	$tpl = preg_replace('#<!-- BEGIN (.*?) -->(.*?)<!-- END (.*?) -->#', "\n" . '$bbcode_tpls[\'\\1\'] = \'\\2\';', $tpl);
+ 
+ 	$bbcode_tpls = array();
+ 
+ 	eval($tpl);
+ 
+ 	return $bbcode_tpls;
+ }
+ 
+ /**
+  * Prepares the loaded bbcode templates for insertion into preg_replace()
+  * or str_replace() calls in the bbencode_second_pass functions. This
+  * means replacing template placeholders with the appropriate preg backrefs
+  * or with language vars. NOTE: If you change how the regexps work in
+  * bbencode_second_pass(), you MUST change this function.
+  *
+  * Nathan Codding, Sept 26 2001
+  *
+   * This a temporary function
+  */
+ function mx_prepare_bbcode_template($bbcode_tpl)
+ {
+ 	global $lang;
+ 
+ 	$bbcode_tpl['olist_open'] = str_replace('{LIST_TYPE}', '\\1', $bbcode_tpl['olist_open']);
+ 
+ 	$bbcode_tpl['color_open'] = str_replace('{COLOR}', '\\1', $bbcode_tpl['color_open']);
+ 
+ 	$bbcode_tpl['size_open'] = str_replace('{SIZE}', '\\1', $bbcode_tpl['size_open']);
+ 
+ 	$bbcode_tpl['quote_open'] = str_replace('{L_QUOTE}', $lang['Quote'], $bbcode_tpl['quote_open']);
+ 
+ 	$bbcode_tpl['quote_username_open'] = str_replace('{L_QUOTE}', $lang['Quote'], $bbcode_tpl['quote_username_open']);
+ 	$bbcode_tpl['quote_username_open'] = str_replace('{L_WROTE}', $lang['wrote'], $bbcode_tpl['quote_username_open']);
+ 	$bbcode_tpl['quote_username_open'] = str_replace('{USERNAME}', '\\1', $bbcode_tpl['quote_username_open']);
+ 
+ 	$bbcode_tpl['code_open'] = str_replace('{L_CODE}', $lang['Code'], $bbcode_tpl['code_open']);
+ 
+ 	$bbcode_tpl['img'] = str_replace('{URL}', '\\1', $bbcode_tpl['img']);
+ 
+ 	// We do URLs in several different ways..
+ 	$bbcode_tpl['url1'] = str_replace('{URL}', '\\1', $bbcode_tpl['url']);
+ 	$bbcode_tpl['url1'] = str_replace('{DESCRIPTION}', '\\1', $bbcode_tpl['url1']);
+ 
+ 	$bbcode_tpl['url2'] = str_replace('{URL}', 'http://\\1', $bbcode_tpl['url']);
+ 	$bbcode_tpl['url2'] = str_replace('{DESCRIPTION}', '\\1', $bbcode_tpl['url2']);
+ 
+ 	$bbcode_tpl['url3'] = str_replace('{URL}', '\\1', $bbcode_tpl['url']);
+ 	$bbcode_tpl['url3'] = str_replace('{DESCRIPTION}', '\\2', $bbcode_tpl['url3']);
+ 
+ 	$bbcode_tpl['url4'] = str_replace('{URL}', 'http://\\1', $bbcode_tpl['url']);
+ 	$bbcode_tpl['url4'] = str_replace('{DESCRIPTION}', '\\3', $bbcode_tpl['url4']);
+ 
+ 	$bbcode_tpl['email'] = str_replace('{EMAIL}', '\\1', $bbcode_tpl['email']);
+ 
+ 	define("BBCODE_TPL_READY", true);
+ 
+ 	return $bbcode_tpl;
+ }
+ 
+ /**
+  * Does second-pass bbencoding. This should be used before displaying the message in
+  * a thread. Assumes the message is already first-pass encoded, and we are given the
+  * correct UID as used in first-pass encoding.
+  * This a temporary function
+  */
+ function mx_bbencode_second_pass($text, $uid)
+ {
+ 	global $lang, $bbcode_tpl;
+ 
+ 	$text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1&#058;", $text);
+ 
+ 	// pad it with a space so we can distinguish between FALSE and matching the 1st char (index 0).
+ 	// This is important; bbencode_quote(), bbencode_list(), and bbencode_code() all depend on it.
+ 	$text = " " . $text;
+ 
+ 	// First: If there isn't a "[" and a "]" in the message, don't bother.
+ 	if (! (strpos($text, "[") && strpos($text, "]")) )
+ 	{
+ 		// Remove padding, return.
+ 		$text = substr($text, 1);
+ 		return $text;
+ 	}
+ 
+ 	// Only load the templates ONCE..
+ 	if (!defined("BBCODE_TPL_READY"))
+ 	{
+ 		// load templates from file into array.
+ 		$bbcode_tpl = mx_load_bbcode_template();
+ 
+ 		// prepare array for use in regexps.
+ 		$bbcode_tpl = mx_prepare_bbcode_template($bbcode_tpl);
+ 	}
+ 
+ 	// [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts.
+ 	$text = mx_bbencode_second_pass_code($text, $uid, $bbcode_tpl);
+ 
+ 	// [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff.
+ 	$text = str_replace("[quote:$uid]", $bbcode_tpl['quote_open'], $text);
+ 	$text = str_replace("[/quote:$uid]", $bbcode_tpl['quote_close'], $text);
+ 
+ 	// New one liner to deal with opening quotes with usernames...
+ 	// replaces the two line version that I had here before..
+ 	$text = preg_replace("/\[quote:$uid=\"(.*?)\"\]/si", $bbcode_tpl['quote_username_open'], $text);
+ 
+ 	// [list] and [list=x] for (un)ordered lists.
+ 	// unordered lists
+ 	$text = str_replace("[list:$uid]", $bbcode_tpl['ulist_open'], $text);
+ 	// li tags
+ 	$text = str_replace("[*:$uid]", $bbcode_tpl['listitem'], $text);
+ 	// ending tags
+ 	$text = str_replace("[/list:u:$uid]", $bbcode_tpl['ulist_close'], $text);
+ 	$text = str_replace("[/list:o:$uid]", $bbcode_tpl['olist_close'], $text);
+ 	// Ordered lists
+ 	$text = preg_replace("/\[list=([a1]):$uid\]/si", $bbcode_tpl['olist_open'], $text);
+ 
+ 	// colours
+ 	$text = preg_replace("/\[color=(\#[0-9A-F]{6}|[a-z]+):$uid\]/si", $bbcode_tpl['color_open'], $text);
+ 	$text = str_replace("[/color:$uid]", $bbcode_tpl['color_close'], $text);
+ 
+ 	// size
+ 	$text = preg_replace("/\[size=([1-2]?[0-9]):$uid\]/si", $bbcode_tpl['size_open'], $text);
+ 	$text = str_replace("[/size:$uid]", $bbcode_tpl['size_close'], $text);
+ 
+ 	// [b] and [/b] for bolding text.
+ 	$text = str_replace("[b:$uid]", $bbcode_tpl['b_open'], $text);
+ 	$text = str_replace("[/b:$uid]", $bbcode_tpl['b_close'], $text);
+ 
+ 	// [u] and [/u] for underlining text.
+ 	$text = str_replace("[u:$uid]", $bbcode_tpl['u_open'], $text);
+ 	$text = str_replace("[/u:$uid]", $bbcode_tpl['u_close'], $text);
+ 
+ 	// [i] and [/i] for italicizing text.
+ 	$text = str_replace("[i:$uid]", $bbcode_tpl['i_open'], $text);
+ 	$text = str_replace("[/i:$uid]", $bbcode_tpl['i_close'], $text);
+ 
+ 	// Patterns and replacements for URL and email tags..
+ 	$patterns = array();
+ 	$replacements = array();
+ 
+ 	// [img]image_url_here[/img] code..
+ 	// This one gets first-passed..
+ 	$patterns[] = "#\[img:$uid\]([^?](?:[^\[]+|\[(?!url))*?)\[/img:$uid\]#i";
+ 	$replacements[] = $bbcode_tpl['img'];
+ 
+ 	// matches a [url]xxxx://www.phpbb.com[/url] code..
+ 	$patterns[] = "#\[url\]([\w]+?://([\w\#$%&~/.\-;:=,?@\]+]+|\[(?!url=))*?)\[/url\]#is";
+ 	$replacements[] = $bbcode_tpl['url1'];
+ 
+ 	// [url]www.phpbb.com[/url] code.. (no xxxx:// prefix).
+ 	$patterns[] = "#\[url\]((www|ftp)\.([\w\#$%&~/.\-;:=,?@\]+]+|\[(?!url=))*?)\[/url\]#is";
+ 	$replacements[] = $bbcode_tpl['url2'];
+ 
+ 	// [url=xxxx://www.phpbb.com]phpBB[/url] code..
+ 	$patterns[] = "#\[url=([\w]+?://[\w\#$%&~/.\-;:=,?@\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#is";
+ 	$replacements[] = $bbcode_tpl['url3'];
+ 
+ 	// [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix).
+ 	$patterns[] = "#\[url=((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#is";
+ 	$replacements[] = $bbcode_tpl['url4'];
+ 
+ 	// [email]us...@do...[/email] code..
+ 	$patterns[] = "#\[email\]([a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+)\[/email\]#si";
+ 	$replacements[] = $bbcode_tpl['email'];
+ 
+ 	$text = preg_replace($patterns, $replacements, $text);
+ 
+ 	// Remove our padding from the string..
+ 	$text = substr($text, 1);
+ 
+ 	return $text;
+ 
+ } // bbencode_second_pass()
+ 
+ /**
+  * Does second-pass bbencoding of the [code] tags. This includes
+  * running htmlspecialchars() over the text contained between
+  * any pair of [code] tags that are at the first level of
+  * nesting. Tags at the first level of nesting are indicated
+  * by this format: [code:1:$uid] ... [/code:1:$uid]
+  * Other tags are in this format: [code:$uid] ... [/code:$uid]
+   * This a temporary function
+  */
+ function mx_bbencode_second_pass_code($text, $uid, $bbcode_tpl)
+ {
+ 	global $lang;
+ 
+ 	$code_start_html = $bbcode_tpl['code_open'];
+ 	$code_end_html =  $bbcode_tpl['code_close'];
+ 
+ 	// First, do all the 1st-level matches. These need an htmlspecialchars() run,
+ 	// so they have to be handled differently.
+ 	$match_count = preg_match_all("#\[code:1:$uid\](.*?)\[/code:1:$uid\]#si", $text, $matches);
+ 
+ 	for ($i = 0; $i < $match_count; $i++)
+ 	{
+ 		$before_replace = $matches[1][$i];
+ 		$after_replace = $matches[1][$i];
+ 
+ 		// Replace 2 spaces with "&nbsp; " so non-tabbed code indents without making huge long lines.
+ 		$after_replace = str_replace("  ", "&nbsp; ", $after_replace);
+ 		// now Replace 2 spaces with " &nbsp;" to catch odd #s of spaces.
+ 		$after_replace = str_replace("  ", " &nbsp;", $after_replace);
+ 
+ 		// Replace tabs with "&nbsp; &nbsp;" so tabbed code indents sorta right without making huge long lines.
+ 		$after_replace = str_replace("\t", "&nbsp; &nbsp;", $after_replace);
+ 
+ 		// now Replace space occurring at the beginning of a line
+ 		$after_replace = preg_replace("/^ {1}/m", '&nbsp;', $after_replace);
+ 
+ 		$str_to_match = "[code:1:$uid]" . $before_replace . "[/code:1:$uid]";
+ 
+ 		$replacement = $code_start_html;
+ 		$replacement .= $after_replace;
+ 		$replacement .= $code_end_html;
+ 
+ 		$text = str_replace($str_to_match, $replacement, $text);
+ 	}
+ 
+ 	// Now, do all the non-first-level matches. These are simple.
+ 	$text = str_replace("[code:$uid]", $code_start_html, $text);
+ 	$text = str_replace("[/code:$uid]", $code_end_html, $text);
+ 
+ 	return $text;
+ 
+ } // bbencode_second_pass_code()
+ 
+ //phpBB Temporary code ends
+ 
+ /**
+  * Rewritten by Nathan Codding - Feb 6, 2001.
+  * - Goes through the given string, and replaces xxxx://yyyy with an HTML <a> tag linking
+  * 	to that URL
+  * - Goes through the given string, and replaces www.xxxx.yyyy[zzzz] with an HTML <a> tag linking
+  * 	to http://www.xxxx.yyyy[/zzzz]
+  * - Goes through the given string, and replaces xxxx@yyyy with an HTML mailto: tag linking
+  *		to that email address
+  * - Only matches these 2 patterns either after a space, or at the beginning of a line
+  *
+  * Notes: the email one might get annoying - it's easy to make it more restrictive, though.. maybe
+  * have it require something like xx...@yy... or such. We'll see.
+  * We can add here more phpBB3 stuff in time - Ory
+  */
+ function mx_make_clickable($text)
+ {
+ 	$text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1&#058;", $text);
+ 
+ 	// pad it with a space so we can match things at the start of the 1st line.
+ 	$ret = ' ' . $text;
+ 
+ 	// matches an "xxxx://yyyy" URL at the start of a line, or after a space.
+ 	// xxxx can only be alpha characters.
+ 	// yyyy is anything up to the first space, newline, comma, double quote or <
+ 	$ret = preg_replace("#(^|[\n ])([\w]+?://[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1<a href=\"\\2\" target=\"_blank\">\\2</a>", $ret);
+ 
+ 	// matches a "www|ftp.xxxx.yyyy[/zzzz]" kinda lazy URL thing
+ 	// Must contain at least 2 dots. xxxx contains either alphanum, or "-"
+ 	// zzzz is optional.. will contain everything up to the first space, newline,
+ 	// comma, double quote or <.
+ 	$ret = preg_replace("#(^|[\n ])((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1<a href=\"http://\\2\" target=\"_blank\">\\2</a>", $ret);
+ 
+ 	// matches an email@domain type address at the start of a line, or after a space.
+ 	// Note: Only the followed chars are valid; alphanums, "-", "_" and or ".".
+ 	$ret = preg_replace("#(^|[\n ])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret);
+ 
+ 	// Remove our padding..
+ 	$ret = substr($ret, 1);
+ 
+ 	return($ret);
+ }
+ 
+ /**
+  * Nathan Codding - Feb 6, 2001
+  * Reverses the effects of make_clickable(), for use in editpost.
+  * - Does not distinguish between "www.xxxx.yyyy" and "http://aaaa.bbbb" type URLs.
+  *
+  */
+ function mx_undo_make_clickable($text)
+ {
+ 	$text = preg_replace("#<!-- BBCode auto-link start --><a href=\"(.*?)\" target=\"_blank\">.*?</a><!-- BBCode auto-link end -->#i", "\\1", $text);
+ 	$text = preg_replace("#<!-- BBcode auto-mailto start --><a href=\"mailto:(.*?)\">.*?</a><!-- BBCode auto-mailto end -->#i", "\\1", $text);
+ 
+ 	return $text;
+ 
+ }
+ 
  /**
   * bbcode to html.
***************
*** 278,284 ****
  	global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page;
  
! 	if( !function_exists('bbencode_second_pass') )
! 	{
! 		mx_page::load_file('bbcode');
  	}
  
--- 590,613 ----
  	global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page;
  
! 	if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass'))
! 	{ 
! 		mx_page::load_file('bbcode'); 
! 	}
! 	
! 	if (PORTAL_BACKEND == 'phpbb3')
! 	{ 
! 		/*
! 		if (!class_exists('bbcode'))
! 		{ 
! 			mx_page::load_file('bbcode');
! 		}
! 
! 		if( !is_object($bbcode))
! 		{
! 			$bbcode = new bbcode();
! 		}
! 		*/
! 		//Temporary solutution
! 		//require($mx_root_path . 'includes/shared/phpbb2/includes/bbcode.'.$phpEx);
  	}
  
***************
*** 286,290 ****
  	if (!empty($bbcode_uid))
  	{
! 		$mytext = bbencode_second_pass($mytext, $bbcode_uid);
  	}
  	if ($smilies_on)
--- 615,619 ----
  	if (!empty($bbcode_uid))
  	{
! 		$mytext = mx_bbencode_second_pass($mytext, $bbcode_uid);
  	}
  	if ($smilies_on)
***************
*** 293,297 ****
  	}
  	$mytext = str_replace("\n", "\n<br />\n", $mytext);
! 	return make_clickable($mytext);
  }
  
--- 622,626 ----
  	}
  	$mytext = str_replace("\n", "\n<br />\n", $mytext);
! 	return mx_make_clickable($mytext);
  }
  

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mx_functions_tools.php	22 Feb 2008 23:02:49 -0000	1.23
--- mx_functions_tools.php	29 Feb 2008 00:54:10 -0000	1.24
***************
*** 18,24 ****
  // This 'include' is needed for the mx_text class
  //
! if( !function_exists('bbencode_second_pass') )
! {
! 	mx_page::load_file('bbcode');
  }
  
--- 18,24 ----
  // This 'include' is needed for the mx_text class
  //
! if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass'))
! { 
! 	mx_page::load_file('bbcode'); 
  }
  
***************
*** 130,133 ****
--- 130,134 ----
  	function display($text, $bbcode_uid = '')
  	{
+ 		global $mx_root_path;
  		//
  		// strip html if reqd
***************
*** 141,155 ****
  		}
  
  		//
  		// BBCode if reqd
! 		//
  		if ($text != '' && $bbcode_uid != '')
  		{
! 			$text = ($this->bbcode_on) ? bbencode_second_pass($text, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $text);
  		}
  
  		if ( $text != '' )
  		{
! 			$text = make_clickable($text);
  		}
  
--- 142,177 ----
  		}
  
+ 		if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass'))
+ 		{ 
+ 			mx_page::load_file('bbcode'); 
+ 		}
+ 
  		//
  		// BBCode if reqd
! 		//	
! 		if (PORTAL_BACKEND == 'phpbb3')
! 		{ 
! 			/*
! 			if (!class_exists('bbcode'))
! 			{ 
! 				mx_page::load_file('bbcode');
! 			}
! 
! 			if( !is_object($bbcode))
! 			{
! 				$bbcode = new bbcode();
! 			}
! 			*/
! 			//require($mx_root_path . 'includes/shared/phpbb2/includes/bbcode.'.$phpEx);
! 		}
! 
  		if ($text != '' && $bbcode_uid != '')
  		{
! 			$text = ($this->bbcode_on) ? mx_bbencode_second_pass($text, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $text);
  		}
  
  		if ( $text != '' )
  		{
! 			$text = mx_make_clickable($text);
  		}
  

[mxbb-commits] mx_langtools/includes translator.php,1.1,1.2

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1725/mx_langtools/includes

Modified Files:
	translator.php 
Log Message:
CVS update update fix

Index: translator.php
===================================================================
RCS file: /cvsroot/mxbb/mx_langtools/includes/translator.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** translator.php	28 Feb 2008 20:38:19 -0000	1.1
--- translator.php	28 Feb 2008 21:35:19 -0000	1.2
***************
*** 432,436 ****
  							 * @package language
  							 * @author " . $userdata['username'] . "
! 							 * @version $Id$this->module_file . ",v 1.-1 " . date( 'Y/m/d H:i:s') ." " . $userdata['username'] . " Exp $
  							 * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  							 * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
--- 432,436 ----
  							 * @package language
  							 * @author " . $userdata['username'] . "
! 							 * @" ."version $I" . "d: " . $this->module_file . ",v 1.-1 " . date( 'Y/m/d H:i:s') ." " . $userdata['username'] . " Exp $
  							 * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  							 * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2

[mxbb-commits] mx_langtools LanguageTools.pak,1.1,1.2

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_langtools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32410

Modified Files:
	LanguageTools.pak 
Log Message:
extra thing removed :2.0 after admin option

Index: LanguageTools.pak
===================================================================
RCS file: /cvsroot/mxbb/mx_langtools/LanguageTools.pak,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LanguageTools.pak	28 Feb 2008 20:38:18 -0000	1.1
--- LanguageTools.pak	28 Feb 2008 21:31:23 -0000	1.2
***************
*** 1,2 ****
! module=+:52=+:Language Tools=+:modules/mx_langtools/=+:Change installed language packs=+:1=+:2.0.0
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0
--- 1,2 ----
! module=+:52=+:Language Tools=+:modules/mx_langtools/=+:Change installed language packs=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0

[mxbb-commits] mx_langtools .project,1.1,NONE

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27784/mx_langtools

Removed Files:
	.project 
Log Message:


--- .project DELETED ---

[mxbb-commits] mx_langtools/language index.htm,NONE,1.1

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/language
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8405/language

Added Files:
	index.htm 
Log Message:


--- 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] mx_langtools/templates index.htm,NONE,1.1

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/templates
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8405/templates

Added Files:
	index.htm 
Log Message:


--- 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] mx_langtools/language/lang_english lang_admin.php, NONE, 1.1 index.htm, NONE, 1.1

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/language/lang_english
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8405/language/lang_english

Added Files:
	lang_admin.php index.htm 
Log Message:


--- NEW FILE: lang_admin.php ---
<?php

if ( !isset( $lang) || !is_array( $lang) )
{
	$lang = array();
}

$lang = array_merge( $lang, array( // #
	'LANGUAGES_TOOLS'				=> 'Language tools',

	'TRANSLATE_DESCRIPTION'			=> 'Here you are able to change existing language pack entries or not already translated ones.<br/>
<b>Note:</b> you need to have JavaScript and cookies enabled in your browser',
	/**
	 * LANG SELECT & FILE SELECT
	 */

	'WHAT_TRANSLATE'				=> 'What will be translated',
	'LANGUAGE_SELECT'				=> 'Language select',
	'LANGUAGE_FROM'					=> 'From language',
	'LANGUAGE_INTO'					=> 'Into language',
	'FILE_SELECT'					=> 'Select file to translate',
	
	/**
	 * TRANSLATE
	 */
	'TRANSLATE'						=> 'Language entries',
	'TRANSLATE_KEY'					=> 'Language key',
	'TRANSLATE_VALUE'				=> 'Language variable',
	'FILE'							=> 'File',
	
	'FILE_IS_WRITABLE'				=> 'writable',
	'FILE_IS_UNWRITABLE'			=> 'unwritable',
	'FILE_CHARSET'					=> 'encoding',
	
	'SAVE'							=> 'Save',
));


return; 
$lang['Language_tools'] = 'Language tools';
$lang['MX_Module_2_Translate'] = 'Translator';
$lang['MX_Module_1_Block_Titles'] = 'Block Titles';
$lang['MX_Module_3_Page_Names'] = 'Page Names';


//
// Translate Control Panel
//
$lang['Trans_title']				= 'Translate to your Language';
$lang['Trans_description']			= 'Use Translate Control Panel to translate portal to your language<br/>
ljsdflgjdlkgjdslkgjsdlkg';
$lang['Trans_which_core']			= 'Which Part';
$lang['Trans_select_file']			= 'Select file to translate';
$lang['Trans_from_desc']			= 'Default language to translate from';
$lang['Trans_leave_orig']			= 'If not translated <b>leave original</b> text';
$lang['Trans_selected_file']		= 'Selected File';
$lang['Trans_lang_source']			= 'Source Language';
$lang['Trans_lang_dest']			= 'Destination Language';
$lang['Trans_lang_block']			= 'Language block';
$lang['Trans_save_file']			= 'Save language file';
$lang['Trans_preview_file']			= 'Preview language file';

//
// Multilingual Block Titles
//
$lang['Trans_MultiLingual']			= 'Multilingual %s Control Panel';
$lang['Trans_Language']				= 'Language';
$lang['Trans2_description']		= 'Use Multilingual Control Panel to make your %s for all languages';
$lang['Trans_blockTitle']			= 'Block Titles';
$lang['Trans_pageTitle']			= 'Page Names';
$lang['Trans_save_single']			= 'Save this language';
$lang['Trans_save_all']				= 'Save all languages';
//
// That's all Folks!
// -------------------------------------------------
?>
--- 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] mx_langtools/templates/_core selects.html, NONE, 1.1 lang_translate.html, NONE, 1.1

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8405/templates/_core

Added Files:
	selects.html lang_translate.html 
Log Message:


--- NEW FILE: lang_translate.html ---
<style type="text/css">
	.trans_info {
		margin-top:1px;
		margin-left:0px;
		padding:4px;
		position:absolute;
		background-color: #fff;
		border:solid 1px #000;
		z-index: 1000;
	}
</style>
<h1>{L_LANGUAGES_TOOLS}</h1>
<p class="genmed">{L_TRANSLATE_DESCRIPTION}</p>
<!-- INCLUDE selects.html -->
<div id="translate_file">
<form action="{S_ACTION}" method="POST">
<!-- IF FILE_FULL_ROOT_PATH_ORIGINAL -->
<h2 style="margin-bottom:0px;padding-bottom:0px;">{L_TRANSLATE}</h2>
<p style="margin-top:0px;margin-bottom:3px;"><strong>{L_FILE}:</strong> {FILE_FULL_ROOT_PATH_TRANSLATE} &bull;
<!-- IF FILE_IS_WRITABLE --><span style="color:Green">{L_FILE_IS_WRITABLE}</span>
<!-- ELSE --><span style="color:Red">{L_FILE_IS_UNWRITABLE}</span><!-- ENDIF -->
 &bull; {L_FILE_CHARSET}: {L_ENCODING}
</p>
<input type="hidden" name="language[into]" value="{I_LANGUAGE}" />
<input type="hidden" name="translate[module]" value="{I_MODULE}" />
<input type="hidden" name="translate[file]" value="{I_FILE}" />
<table border="0" cellspacing="1" cellpadding="4" width="100%" class="forumline">
	<thead>
		<tr>
			<th class="thCornerL" width="25%">{L_TRANSLATE_KEY}</th>
			<th class="thCornerR" width="75%">{L_TRANSLATE_VALUE}</th>
		</tr>
	</thead>
	<tbody>
		<!-- BEGIN language_item -->
		<tr>
			<td class="row1" valign="top">
				<span style="float:right"
				 onmouseover="getObj('l_row_info_{language_item.COUNTER}').style.display='';"
				 onmouseout="getObj('l_row_info_{language_item.COUNTER}').style.display='none';">
				 	<img src="{IMG_INFO}" class="mx_icon">
				</span>
				<span>{language_item.U_KEY}</span>
			</td>
			<td class="row2" valign="top">
				<div id="l_row_info_{language_item.COUNTER}" class="trans_info" style="display:none">{language_item.ORIGINAL_VALUE}</div>
				<textarea name="l[{language_item.KEY}]" style="width:100%" rows="3">{language_item.TRANSLATE_VALUE}</textarea>
			</td>
		</tr>
		<!-- END language_item -->
	</tbody>
	<tfoot>
		<tr>
			<td colspan="2" align="right" class="row2">
			<input type="hidden" name="set_file" value="{L_SUBMIT}" />
			<!-- IF FILE_IS_WRITABLE -->
			<input type="submit" name="save" value="{L_SAVE}" />
			<!-- ENDIF -->
			<input type="submit" name="download" value="{L_DOWNLOAD}" />
			<input type="reset" value="{L_RESET}" />
			</td>
		</tr>
	</tfoot>
</table>
<!-- ENDIF -->
</form>
</div>
<p></p>


--- NEW FILE: selects.html ---
<!-- BEGIN ajax_select -->
<select name="{ajax_select.NAME}" id="{ajax_select.ID" style="{ajax_select.STYLE}">
	{ajax_select.OPTIONS}
</select>
<!-- END ajax_select -->
<!-- BEGIN file_to_translate_select -->
<script type="text/javascript">
    <!--
	/**
	 * get Object
	 */
	function getObj( obj)
	{
		return ( document.getElementById ? document.getElementById(obj) : ( document.all ? document.all[obj] : null ) );
	}
	/**
	 * Create xmlHTTP Object
	 */
	function getHTMLObject()
	{
        var xmlHttp;
        try { // Firefox, Opera 8.0+, Safari
            xmlHttp = new XMLHttpRequest();
        } 
        catch (e) { // Internet Explorer
            try {
                xmlHttp = new ActiveXObject("Msxml2.XMLHTTP");
            } 
            catch (e) {
                try {
                    xmlHttp = new ActiveXObject("Microsoft.XMLHTTP");
                } 
                catch (e) {
                    alert("Your browser does not support AJAX!");
                    return false;
                }
            }
        }
		return xmlHttp;
	}
	
	var regExp_Lang = /(\<select[^>]*\>).*?(\<\/select\>)/mi;
    function ajaxLangFunction( selL){
		var xmlHttp;
		xmlHttp = getHTMLObject();
        xmlHttp.onreadystatechange = function(){
            if (xmlHttp.readyState == 4) {
				
                into_obj = getObj('f_lang_into');
				responseTEXT = xmlHttp.responseText;
				into_obj.innerHTML = responseTEXT;
            }
        }
		send_string = 'language[from]=' + selL + '&language[into]=' + getObj('lang_into').value + '&into=language';

        xmlHttp.open("POST", "{S_ACTION_AJAX}", true);
        xmlHttp.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");
		xmlHttp.send(send_string);
    }
    
	function ajaxModuleLangList( selL)
	{
		var xmlHttp;
		xmlHttp = getHTMLObject();
        xmlHttp.onreadystatechange = function(){
            if (xmlHttp.readyState == 4) {
				
                into_obj = getObj('f_select_file');
                //into_obj = getObj('main');
				responseTEXT = xmlHttp.responseText;
				into_obj.innerHTML = responseTEXT.replace( /^\s*|\s*$/g, '');
                getObj('translate_file').innerHTML = '';
            }
        }
		
		send_string='translate[module]=' + selL + '&into=files';
        xmlHttp.open("POST", "{S_ACTION_AJAX}", true);
        xmlHttp.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");
		xmlHttp.send(send_string);
	}
	
    // -->    
</script>
<h2 style="margin-bottom:0px;padding-bottom:0px;">{L_WHAT_TRANSLATE}</h2>
<form action="{S_ACTION}" method="post" style="margin:0px;padding:0px;">
    <table border="0" cellspacing="1" cellpadding="4" width="100%" class="forumline" style="border-collapse:collapse">
        <thead>
            <tr>
                <th class="thCornerL">
                    {L_LANGUAGE_INTO}
                </th>
                <!-- BEGIN modules -->
                <th class="thCornerR" width="30%">
                    {L_MX_MODULES}
                </th>
                <!-- END modules -->
                <th class="thCornerR">
                    {L_FILE_SELECT}
                </th>
                <th class="thCornerR">
                    &laquo;
                </th>
            </tr>
        </thead>
        <tbody>
            <tr>
                <td class="row1" align="center" id="f_lang_into">
                    <select name="language[into]" id="lang_into" style="width:100%"onchange="getObj('translate_file').innerHTML='';">
                    	{S_LANGUAGE_INTO}
                    </select>
                </td>
				<!-- BEGIN modules -->
                <td class="row1" width="30%">
                    <select name="translate[module]" style="width:100%" onchange="ajaxModuleLangList( this.value)"{MODULE_DISABLED}>
                        {S_MODULE_LIST}
                    </select>
                </td>
				<!-- END modules -->
                <td class="row1" align="center" id="f_select_file">
                    <select name="translate[file]" id="file" style="width:100%" onchange="getObj('translate_file').innerHTML='';"{MODULE_DISABLED}>
                        {S_FILE_LIST}
                    </select>
                </td>
                <td class="row1" width="5%">
                    <input type="submit" name="set_file" value="{L_SUBMIT}"{MODULE_DISABLED}>
                </td>
            </tr>
        </tbody>
    </table>
</form>
<!-- END file_to_translate_select -->

[mxbb-commits] mx_langtools/admin index.htm, NONE, 1.1 admin_langtools.php, NONE, 1.1

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8405/admin

Added Files:
	index.htm admin_langtools.php 
Log Message:


--- NEW FILE: admin_langtools.php ---
<?php

$basename = basename( __FILE__);
$mx_root_path = './../../../';
$module_root_path = $mx_root_path . 'modules/mx_langtools/';
$admin_module_root_path = $module_root_path . 'admin/';

if ( !empty( $setmodules))
{
	$lang['0_MX_Portal'] = $lang['MX_Portal'];
	$lang['1_MX_Modules'] = $lang['MX_Modules'];
	$module['Language_tools']['0_MX_Portal'] = mx_append_sid( $admin_module_root_path . $basename . '?s=MXP');
	$module['Language_tools']['1_MX_Modules'] = mx_append_sid( $admin_module_root_path . $basename . '?s=MODS');
	return;
}
$phpEx = substr( __FILE__, strrpos( __FILE__, '.')+1);

define( 'IN_AJAX', (isset( $_GET['ajax']) && $_GET['ajax'] == 1 && $_SERVER['HTTP_SEREFER'] = $_SERVER['PHP_SELF'])?1:0);
define( 'IN_PORTAL', 1);
define( 'IN_ADMIN', 1);
$no_page_header = 'no_page_header';
require_once( $mx_root_path . 'admin/pagestart.' . $phpEx);

include_once( $module_root_path . 'includes/translator.' . $phpEx);


error_reporting( E_ALL || !E_NOTICE);
$mxp_translator = new mxp_translator();

if ( IN_AJAX == 0)
{
	$lang['ENCODING'] = $mxp_translator->file_encoding;
	if ( isset( $_POST['save']) || isset( $_POST['download']) )
	{
		$mxp_translator->file_preparesave();
	}
	if ( isset( $_POST['save']) )
	{
		$mxp_translator->file_save();
	}
	else if ( isset( $_POST['download']) )
	{
		$mxp_translator->file_download();
	}


	require_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx);

	$template->set_filenames( array('body' => 'lang_translate.html'));

	$template->assign_block_vars( 'file_to_translate_select', array());
	$s_action = $admin_module_root_path . $basename;
	$params = $_SERVER['QUERY_STRING'];

	if ( file_exists( $mx_root_path . TEMPLATE_ROOT_PATH . 'images/menu_icons/icon_info.gif') )
	{
		$img_info = PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/menu_icons/icon_info.gif';
	}
	else
	{
		$img_info = PORTAL_URL . 'templates/_core/images/menu_icons/icon_info.gif';
	}
	
	$template->assign_vars( array( // #
		'TH_COLOR2' => $theme['th_color2'],
	
		'S_ACTION' => $s_action . '?' . str_replace( '&amp;', '&',$params),
		'S_ACTION_AJAX' => $s_action . '?' . str_replace( '&amp;', '&',$params) . '&ajax=1',
		'S_LANGUAGE_INTO' => $mxp_translator->gen_select_list( 'html', 'language', $mxp_translator->language_into, $mxp_translator->language_from),
		'S_MODULE_LIST' => $mxp_translator->gen_select_list( 'html', 'modules', $mxp_translator->module_select),
		'S_FILE_LIST' => $mxp_translator->gen_select_list( 'html', 'files', $mxp_translator->module_file),
		'L_RESET' => $lang['Reset'],
		'IMG_INFO' => $img_info,

		'I_LANGUAGE' => $mxp_translator->language_into,
		'I_MODULE' => $mxp_translator->module_select,
		'I_FILE' => $mxp_translator->module_file,
	
		));

	$mxp_translator->assign_template_vars( $template);
	
	$template->assign_vars( array( // #
		'L_MX_MODULES' => $lang['MX_Modules'],
	));
	
	if ( $_GET['s'] == 'MODS')
	{
		$template->assign_block_vars( 'file_to_translate_select.modules', array());
		$template->assign_block_vars( 'modules', array());
	}
	
	$mxp_translator->file_translate();
	
	$template->pparse( 'body');
	require_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx);


}
else
{ // AJAX
	$template->set_filenames( array('body' => 'selects.html'));

	$style = "width:100%;"; 

	if ( $_POST['into'] == 'language')
	{
		$option_list = $mxp_translator->gen_select_list( 'html', 'language', $mxp_translator->language_into, $mxp_translator->language_from);
		$name = 'language[into]';
		$id = 'f_lang_into';
	}
	if ( $_POST['into'] == 'files')
	{
		
		$option_list = $mxp_translator->gen_select_list( 'html', 'files', $mxp_translator->module_file);
		$name = 'translate[file]';
		$id = 'f_select_file';
	}

	$template->assign_block_vars( 'ajax_select', array(
		'NAME'		=> $name,
		'ID'		=> $id,
		'STYLE'		=> $style,
		'OPTIONS'	=> $option_list,
		));
	$template->pparse( 'body' );
}

?>

--- 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] mx_langtools/.settings org.eclipse.php.core.projectOptions.prefs, NONE, 1.1

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/.settings
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8405/.settings

Added Files:
	org.eclipse.php.core.projectOptions.prefs 
Log Message:


--- NEW FILE: org.eclipse.php.core.projectOptions.prefs ---
#Thu Feb 28 21:39:07 CET 2008
eclipse.preferences.version=1
org.eclipse.php.core.contextRoot=
org.eclipse.php.core.defaultEncoding=
org.eclipse.php.core.includePath=<?xml version\="1.0" encoding\="UTF-8"?>\n<includepath>\n</includepath>\n

[mxbb-commits] mx_langtools/language/lang_czech index.htm, NONE, 1.1 lang_admin.php, NONE, 1.1

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/language/lang_czech
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8405/language/lang_czech

Added Files:
	index.htm lang_admin.php 
Log Message:


--- NEW FILE: lang_admin.php ---
<?php
/**
 * Language file [lang_admin.php]
 * 
 * @package language
 * @author Culprit
 * @version : lang_admin.php,v 1.5 2008/02/27 16:12:56 Culprit Exp $
 * @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
 * Encoding: UTF-8
 * 1 tab = 4 spaces
 */

if ( !isset($lang) )
{
	$lang = array();
}

$lang = array_merge( $lang, array( // #
	'LANGUAGES_TOOLS'		=> 'Jazykové nástroje',
	'TRANSLATE_DESCRIPTION'	=> 'Popis jazykových nástrojů',
	'WHAT_TRANSLATE'		=> 'Co bude přeloženo',
	'LANGUAGE_SELECT'		=> 'Výběr jazyka',
	'LANGUAGE_FROM'			=> 'Zdrojový jazyk',
	'LANGUAGE_INTO'			=> 'Výstupní jazyk',
	'FILE_SELECT'			=> 'Výběr souboru',
	'TRANSLATE'				=> 'Překlad',
	'TRANSLATE_KEY'			=> 'Klíč',
	'TRANSLATE_VALUE'		=> 'Překlad',
	'FILE'					=> 'Soubor',
	'FILE_IS_WRITABLE'		=> 'zapisovatelný',
	'FILE_IS_UNWRITABLE'	=> 'nezapisovatelný',
	'FILE_CHARSET'			=> 'kódování souboru',
	'SAVE'					=> 'Uložit',
));
?>
--- 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] mx_langtools/includes translator.php, NONE, 1.1 index.htm, NONE, 1.1

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8405/includes

Added Files:
	translator.php index.htm 
Log Message:


--- 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>

--- NEW FILE: translator.php ---
<?php

if (!defined('IN_PORTAL'))
{
	exit;
}


define( 'MXP_LANG_TOOLS_COOKIE_NAME', 'lT_');

/**
 * mxp_translator
 * 
 * @package Translator
 * @author culprit_cz
 * @copyright Copyright (c) 2008
 * @version $Id: translator.php,v 1.1 2008/02/28 20:38:19 culprit_cz Exp $
 * @access public
 */
class mxp_translator
{
	var $language_list = array();
	var $module_list = array();
	var $language_file_list = array();
	var $lang = array();

	var $orig_ary = array();
	var $tran_ary = array();

	var $language_from = 'lang_english';
	var $langauge_into = '';
	var $module_select = '';
	var $module_file   = '';
	
	var $file_encoding = 'UTF-8';
	
	var $file_save_path = '';
	var $file_save_content = '';

	/**
	 * Constructor
	 * 
	 * @return 
	 */
	function mxp_translator()
	{
		global $mx_root_path, $phpEx, $lang;
		$this->language_into = $this->__cookie( MXP_LANG_TOOLS_COOKIE_NAME . 'language_into', @$_POST['language']['into'] );
		$this->module_select = $this->__cookie( MXP_LANG_TOOLS_COOKIE_NAME . 'module_select', @$_POST['translate']['module']);
		$this->module_file = $this->__cookie( MXP_LANG_TOOLS_COOKIE_NAME . 'module_file'  , @$_POST['translate']['file']);


		$this->get_lang_list();
		$this->get_module_list();
		$this->get_file_list();
		
		/**
		 * SELECT encoding of language file
		 */
		$lang_enc = $this->_load_file_to_translate( $mx_root_path . 'includes/shared/phpbb2/language/' . $this->language_from . '/lang_main.' . $phpEx);
		$lang_enc = $this->_load_file_to_translate( $mx_root_path . 'includes/shared/phpbb2/language/' . $this->language_into . '/lang_main.' . $phpEx);
		if ( isset( $lang_enc['ENCODING']) && $lang_enc != '')
		{
			$this->file_encoding = $lang_enc['ENCODING'];
		}
		
		
		
		$this->file_save_path = $mx_root_path . ( $_GET['s']=='MODS'? $this->module_select:'') . 'language/' . $this->language_into . '/' . $this->module_file;
	}	

	/**
	 * Set and get value from posted or cookie
	 * @return mixed value generated from posted, geted or cookie
	 * @param $name string cookie name of the value
	 * @param $value mixed value which should be setted for cookie
	 */
	function __cookie( $name, $value = '')
	{
		global $board_config;
		$cookie_board_name = $name;
		$return = '';
		if ( $value != '')
		{
			$return = $value;
			// Currently not working under linux machines [Ubuntu GG]
			//setcookie( $cookie_board_name, $value, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
			setcookie( $cookie_board_name, $value, (time()+21600), $board_config['cookie_path']);
			
			$_COOKIE[ $cookie_board_name] = $value;
			
		}
		else if( isset( $_COOKIE[ $cookie_board_name]) && $_COOKIE[ $cookie_board_name] != '')
		{
			$value = $_COOKIE[ $cookie_board_name];
			// Currently not working under linux machines [Ubuntu GG]
			//setcookie( $cookie_board_name, $_COOKIE[ $cookie_board_name], (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
			setcookie( $cookie_board_name, $_COOKIE[ $cookie_board_name], (time()+21600), $board_config['cookie_path']);
			
		}
		$_COOKIE['test' . $name] = $value;		
		return $value;
	}

	/**
	 * Load available languages list
	 *
	 * @return array available languages list: KEY = folder name
	 */
	function get_lang_list()
	{
		global $mx_root_path;

		if ( count( $this->language_list) )
		{
			return $this->language_list;
		}

		$dir = opendir( $mx_root_path . 'language/');

		while( $f = readdir( $dir))
		{
			if ( ( $f == '.' || $f == '..') || !is_dir( $mx_root_path . 'language/' . $f) || strpos( $f, 'lang_') === false || $f == $this->language_from)
			{
				continue;
			}
			if ( $this->language_from == '')
			{
				$this->language_from = $this->__cookie( MXP_LANG_TOOLS_COOKIE_NAME . 'language_from', $f );
			}
			$this->language_list[$f] = ucfirst(str_replace( 'lang_', '', $f));
		}
		closedir( $dir);
		return $this->language_list;
	}
	
	function get_file_list( $module = '')
	{
		$file_list =array();
		switch ( $_GET['s'])
		{
			case 'MXP':
				$file_list = $this->__load_lang_files( '', $this->language_from);
				$this->language_file_list['MXP'] = $file_list;
				break;
			case 'MODS':
				if (  $this->module_select == '')
				{
					return array();
				}
				$file_list = $this->__load_lang_files( $module, $this->language_from);
				$this->language_file_list[$module] = $file_list;
				
				break;
			default:
				break;
		}
		
		return $file_list;
	}
	
	function __load_lang_files( $path, $language, $add_path = '')
	{
		global $mx_root_path, $phpEx;
		
		if ( $this->language_from == '')
		{
			return null;
		}
		
		$lang_files = array();
		$folder_path = $mx_root_path . $path . 'language/' . $language . $add_path;

		if ( !file_exists( $folder_path))
		{
			return array();
		}
		$dir = opendir( $folder_path);

		while( $file = readdir( $dir))
		{
			if ( $file == '.' || $file == '..' || $file == 'CVS' || eregi( '\.' . $phpEx . '$', $file) == false)
			{
				continue;
			}
			if ( is_dir( $folder_path . '/' . $file))
			{
				$sub_files = $this->__load_lang_files( $path, $language, $add_path . '/'. $file );
				$lang_files = array_merge( $lang_files, $sub_files);
			}
			else if( is_file( $folder_path . '/' . $file))
			{
				$lang_files[$add_path . $file] = $add_path . $file;
			}
		}
		closedir( $dir);
		return $lang_files;
	}
	
	function get_module_list()
	{
		global $mx_root_path, $db;
		
		$sql = "SELECT module_path, module_name FROM " . MODULE_TABLE . " ORDER BY module_name";
		
		if ( !($rs = $db->sql_query( $sql)))
		{
			mx_message_die( GENERAL_ERROR, 'Could not obtain module list', __LINE__, __FILE__, $sql);
		}
		
		while( $row = $db->sql_fetchrow( $rs))
		{
			$file_list = $this->__load_lang_files( $row['module_path'], $this->language_from);
			if ( count( $file_list) == 0)
			{
				continue;
			}
			if ( $this->module_select == '')
			{
				$this->module_select = $this->__cookie( MXP_LANG_TOOLS_COOKIE_NAME . 'module_select', $row['module_path']);
				
			}			
			$this->module_list[$row['module_path']] = $row['module_name'];
			$this->language_file_list[$row['module_path']] = $file_list;
		}
		
		return $this->module_list;
	}
	
	/**
	 * Generate option list
	 * @return HMTML option list
	 * @param $html string generate option list in HTML or JS format /now available only HTML/
	 * @param $which_list string which option list should be generated /'
	 * @param $selected string key of selected item
	 * @param $disabled mixed list of disabed key items
	 * @param $from_select boolean is the list initial?
	 */
	function gen_select_list( $html, $which_list, $selected = '', $disabled = '' )
	{
		switch ( $which_list)
		{
			case 'language':
				$list_ary = $this->language_list;
				break;
			case 'modules':
				$list_ary = $this->module_list;
				break;
			case 'core':
				$list_ary = $this->language_file_list['MXP'];
				break;
			case 'files':
				switch( $_GET['s'])
				{
					case 'MXP':
						$list_ary = $this->language_file_list['MXP'];
						break;
					case 'MODS':
						$list_ary = $this->language_file_list[$this->module_select];
						break;
				}
				break;
			default:
				return '';
				break;
		}
		if ( count( $list_ary) < 1)
		{
			return '';
		}
		asort( $list_ary);
		reset( $list_ary);
		$option_list = '';
		$num_args = func_num_args();
		
		
		switch ( $html)
		{
			case 'html':

				foreach( $list_ary as $key => $value)
				{
					if ( ( is_array( $disabled) && in_array( $key, $disabled)) || (!is_array( $disabled) && $key == $disabled))
					{
						continue;
					}
					$option_list .= '<option value="' . $key . '"';
					if ( $selected == $key )
					{
						$option_list .= ' selected';
					}
					
					$option_list .= '>' . $value . '</option>';
				}
				break;
		}
		return $option_list;
	}

	function _load_lang( $path, $filename, $require = true)
	{
		global $phpEx, $board_config, $mx_user, $userdata;

		$mx_user_path = $path . 'language/lang_' . $userdata['user_lang'] . '/' . $filename . '.' . $phpEx;
		$mx_board_path = $path . 'language/lang_' . $board_config['default_lang'] . '/' . $filename . '.' . $phpEx;
		$mx_default_path = $path . 'language/lang_english/' . $filename . '.' . $phpEx;

		$lang = array();
		if ( file_exists( $mx_user_path))
		{
			include_once( $mx_user_path);
		}
		else if ( $require)
		{
			if ( file_exists( $mx_board_path))
			{
				include_once( $mx_board_path);
			}
			else if ( file_exists( $mx_default_path))
			{
				include_once( $mx_default_path);
			}
		}
		$this->lang = array_merge( $this->lang, $lang);
	}

	function assign_template_vars( &$template)
	{
		global $module_root_path;
		$this->_load_lang( $module_root_path, 'lang_admin');
		reset( $this->lang);
		
		foreach( $this->lang as $key => $value)
		{
			$template->assign_var( 'L_' . strtoupper( $key), $value);
		}
	}

	function file_translate()
	{
		global $lang, $mx_root_path, $template;
		if ( !isset( $_POST['set_file']) || $_POST['set_file'] != $lang['Submit'])
		{
			return;
		}
		
		
		$original_file_path = ( $_GET['s']=='MODS'? $this->module_select:'') . 'language/' . $this->language_from . '/' . $this->module_file;
		
		$translate_file_path = ( $_GET['s']=='MODS'? $this->module_select:'') . 'language/' . $this->language_into . '/' . $this->module_file;
		//$original_file_content = file_get_contents( ) 

		//print $this->_get_file_perms($mx_root_path . $translate_file_path);
		
		$template->assign_vars( array( //#
			'FILE_FULL_ROOT_PATH_ORIGINAL' => '/' . $original_file_path,
			'FILE_FULL_ROOT_PATH_TRANSLATE' => '/' . $translate_file_path,
			'FILE_IS_WRITABLE' => $this->__is_writable( $mx_root_path . $translate_file_path )? '1': '0',
			));
			
		

		$this->orig_ary = $this->_load_file_to_translate($mx_root_path . $original_file_path);
		$this->tran_ary = $this->_load_file_to_translate($mx_root_path . $translate_file_path);
		
		if ( count( $this->orig_ary) == 0)
		{
			//nic neni v souboru
			die( 'v souboryu nic neni');
			return;
		}
		else
		{
			$counter = 0;
			foreach( $this->orig_ary as $l_key => $l_value )
			{
				$template->assign_block_vars( 'language_item', array( //#
					'U_KEY'				=> strtoupper( $l_key),
					'KEY'				=> $l_key,
					'ORIGINAL_VALUE'	=> htmlentities(preg_replace( '#<br[^>]*>#i', '\0'. "\n", $l_value)),
					'TRANSLATE_VALUE'	=> preg_replace( '#<br[^>]*>#i', '\0'. "\n",$this->tran_ary[$l_key]),
					'COUNTER'			=> $counter,
				));
				$counter++;
			}
		}
		
	}

	function __is_writable( $file)
	{
		if ( file_exists( $file) )
		{
			return is_writable( $file);
		}
		else if ( file_exists( dirname( $file) ) )
		{
			return is_writable( dirname(  $file));
		}
		else
		{
			return is_writable( dirname( dirname( $file)));
		}

	}

	function _load_file_to_translate( $filename)
	{
		if ( !file_exists( $filename))
		{
			return array();
		}
		include( $filename);
		return $lang;
	}

	function file_preparesave()
	{
		global $userdata, $mx_user;
		if ( file_exists( $this->file_save_path ) && !isset( $_POST['resetheader']) )
		{
			$file_content = file_get_contents( $this->file_save_path);
			$file_content = substr( $file_content, 0, strpos( $file_content, '*/'));
			$file_content = substr( $file_content, strpos( $file_content, '/*'));
			
		}
		else
		{
			$file_content = "/**
							 * Language file [" . $this->module_file . "]
							 * 
							 * @package language
							 * @author " . $userdata['username'] . "
							 * @version $Id: translator.php,v 1.1 2008/02/28 20:38:19 culprit_cz Exp $this->module_file . ",v 1.-1 " . date( 'Y/m/d H:i:s') ." " . $userdata['username'] . " Exp $
							 * @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
							 ";
		}
		$file_content = preg_replace( '#\* (Encoding|1 tab).*'. "\n" . '#', '', $file_content);
		$file_content .= '* Encoding: ' . $this->file_encoding . "\n* 1 tab = 4 spaces\n */";
 		$file_content = preg_replace( "#\n[^*]*\*#i", "\n *", $file_content);
		$v_cnt = preg_match_all( '#(@version[^,]*,v [0-9]*\.)([^ ]*)#', $file_content, $version);
		$version[2][0]++;
		$file_content = preg_replace( '#(@version[^,]*,v [0-9]*)\.([^ ]*)#', '\1.'. $version[2][0], $file_content);
		
		$file_key = array_keys( $_POST['l']);
		
		$key_m_len = 0;
		foreach( $file_key as $key => $value)
		{
			$key_m_len = ( strlen($value)>$key_m_len ) ? strlen($value):$key_m_len;
		}
		$file_content_values = '';	
		foreach( $_POST['l'] as $key => $value)
		{
			if ( !empty($value) )
			{
				$value = preg_replace( "#(<br[^>]*>)\r?\n#si", '\1', $value);
				$value = preg_replace( '#\\\\"#si', '"', $value);
				$file_content_values .= "\t'" . $key . "'" . str_repeat( " ", $key_m_len - strlen( $key)+2) . "=> '" . $value . "',\n";
			}
		}

		if ( $file_content_values != '' )
		{
			$file_content .= "\n\nif ( !isset(\$lang) )\n{\n\t\$lang = array();\n}\n\n\$lang = array_merge( \$lang, array( // #\n";
			
			$file_content .= str_replace( ' =>', '=>',preg_replace( '# [ ]{1,3}#', "\t", $file_content_values));

			$file_content .= '));';
		}
		else
		{
			$file_content .= "\n\n// Nothing translated\n\n";
		}
		
		$this->file_save_content = "<" . "?php\n" . $file_content . "\n\n//\n// That's all Folks!\n// -------------------------------------------------\n?" . ">";
	}
	
	function file_save()
	{
			// Control path id exists
		function __control_folder( $folder)
		{
			if ( !file_exists( $folder) )
			{
				__control_folder( dirname( $folder));

				mkdir( $folder);
				@chmod( $folder, 0755);
				$fp = fopen( $folder . '/index.htm', 'w');
				fwrite( $fp, "<html>\n<head>\n<title></title>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\n</head>\n\n<body bgcolor=\"#FFFFFF\" text=\"#000000\">\n\n</body>\n</html>");
				fclose( $fp); 
				@chmod( $folder. '/index.htm', 0644);
			}
		}
		__control_folder( dirname( $this->file_save_path));
		
		$fp = fopen( $this->file_save_path, 'w');
		fwrite( $fp, $this->file_save_content);
		fclose( $fp);
		@chmod( $this->file_save_path, 0644);
		
	}
	
	function file_download()
	{
		header('Content-Type: application/x-download; name="' . $this->module_file . '"');
		header('Content-Disposition: inline; filename="' . $this->module_file . '"');
		header('Content-length: ' . strlen($this->file_save_content));
		header('Content-encoding: ' . $this->file_encoding);
		print $this->file_save_content;
		die();
	}
}

?>

[mxbb-commits] mx_langtools .project, NONE, 1.1 LanguageTools.pak, NONE, 1.1 index.htm, NONE, 1.1

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8405

Added Files:
	.project LanguageTools.pak index.htm 
Log Message:


--- NEW FILE: .project ---
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>mx_langtools</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.php.core.PhpIncrementalProjectBuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>org.eclipse.wst.validation.validationbuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.php.core.PHPNature</nature>
	</natures>
</projectDescription>

--- NEW FILE: LanguageTools.pak ---
module=+:52=+:Language Tools=+:modules/mx_langtools/=+:Change installed language packs=+:1=+:2.0.0
function=+:0=+:0=+:0=+:endoflist=+:0=+:0

--- 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] mx_langtools/templates - New directory

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/templates
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7947/templates

Log Message:
Directory /cvsroot/mxbb/mx_langtools/templates added to the repository

[mxbb-commits] mx_langtools/language/lang_czech - New directory

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/language/lang_czech
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7947/language/lang_czech

Log Message:
Directory /cvsroot/mxbb/mx_langtools/language/lang_czech added to the repository

[mxbb-commits] mx_langtools/templates/_core - New directory

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7947/templates/_core

Log Message:
Directory /cvsroot/mxbb/mx_langtools/templates/_core added to the repository

[mxbb-commits] mx_langtools/admin - New directory

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7947/admin

Log Message:
Directory /cvsroot/mxbb/mx_langtools/admin added to the repository

[mxbb-commits] mx_langtools/language - New directory

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/language
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7947/language

Log Message:
Directory /cvsroot/mxbb/mx_langtools/language added to the repository

[mxbb-commits] mx_langtools/language/lang_english - New directory

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/language/lang_english
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7947/language/lang_english

Log Message:
Directory /cvsroot/mxbb/mx_langtools/language/lang_english added to the repository

[mxbb-commits] mx_langtools/.cache - New directory

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/.cache
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7947/.cache

Log Message:
Directory /cvsroot/mxbb/mx_langtools/.cache added to the repository

[mxbb-commits] mx_langtools/includes - New directory

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7947/includes

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

[mxbb-commits] mx_langtools/.settings - New directory

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools/.settings
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7947/.settings

Log Message:
Directory /cvsroot/mxbb/mx_langtools/.settings added to the repository

[mxbb-commits] mx_langtools - New directory

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/mx_langtools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7473/mx_langtools

Log Message:
Directory /cvsroot/mxbb/mx_langtools added to the repository

[mxbb-commits] core/templates/subsilver2/admin subsilver2.css, NONE, 1.1 page_header.tpl, NONE, 1.1

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/core/templates/subsilver2/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6741/templates/subsilver2/admin

Added Files:
	subsilver2.css page_header.tpl 
Log Message:
font-size fix

--- NEW FILE: page_header.tpl ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html dir="{S_CONTENT_DIRECTION}">
<head>
{META}
<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
<title>{SITENAME} - {L_MX_ADMIN}</title>
<!-- IF PHPBB -->
<!-- First load standard template *.css definition, located in the the phpbb template folder -->
<link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_PHPBB_STYLESHEET}" type="text/css" >
<!-- ENDIF -->
<!-- Then load MX-Publisher template *.css definition for mx, located in the the portal template folder -->
<link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" type="text/css" >
<link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}admin/{T_MXBB_STYLESHEET}" type="text/css" >
<!-- Optionally, redefine some defintions for gecko browsers -->
<!-- IF GECKO -->
<!-- Optionally, redefine some defintions for gecko browsers -->
<link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
<!-- ENDIF -->
{MX_ADDITIONAL_CSS}
{MX_ICON_CSS}

<script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Common.js"></script>
<script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>

</head>
<body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}">
<a name="top"></a>
--- NEW FILE: subsilver2.css ---
@CHARSET "UTF-8";

BODY {
	margin:5px;
}
TH, TD {
	font-size: 68.5%;
}

.gen {
	font-size: 1.1em;
}

[mxbb-commits] core/templates/subsilver2 subsilver2.css,1.6,1.7

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/core/templates/subsilver2
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6741/templates/subsilver2

Modified Files:
	subsilver2.css 
Log Message:
font-size fix

Index: subsilver2.css
===================================================================
RCS file: /cvsroot/mxbb/core/templates/subsilver2/subsilver2.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** subsilver2.css	4 Feb 2008 16:02:07 -0000	1.6
--- subsilver2.css	28 Feb 2008 14:58:27 -0000	1.7
***************
*** 29,32 ****
--- 29,33 ----
  /* This is the main table round all portal contents, use with .bodyline */
  .mx_main_table	{
+ 	align:center;
  }