mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] core/includes mx_functions_admincp.php,1.56,1.57

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

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

Modified Files:
	mx_functions_admincp.php 
Log Message:
fix for mysql 5.0.2 and later

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** mx_functions_admincp.php	15 Jul 2008 22:02:44 -0000	1.56
--- mx_functions_admincp.php	20 Jul 2008 03:50:05 -0000	1.57
***************
*** 2754,2760 ****
  					$fldkey = 'parameter_id';
  					$key = $module_data[2];
! 
! 					$sql_add = "INSERT INTO " . PARAMETER_TABLE . " (function_id, parameter_id, parameter_name, parameter_type, parameter_default, parameter_function, parameter_auth, parameter_order)
! 						VALUES ( '" . intval($module_data[1]) . "', '" . intval($module_data[2]) . "', '" . str_replace("\'", "''", $module_data[3]) . "', '" . str_replace("\'", "''",$module_data[4]) . "', '" . str_replace("\'", "''", $module_data[5]) . "', '" . str_replace("\'", "''", $module_data[6]) . "', '" . str_replace("\'", "''", $module_data[7]) . "', '" . str_replace("\'", "''", $module_data[8]) . "' ) ";
  
  					$sql_update = "UPDATE " . PARAMETER_TABLE . "
--- 2754,2769 ----
  					$fldkey = 'parameter_id';
  					$key = $module_data[2];
! 					
! 					$sql = array(
! 						'function_id'        	=> (int) $module_data[1],
! 						'parameter_id'  		=> (int) $module_data[2],						
! 						'parameter_name'     	=> str_replace("\'", "''",$module_data[3]),
! 						'parameter_type'     	=> str_replace("\'", "''",$module_data[4]),
! 						'parameter_default'  	=> str_replace("\'", "''", $module_data[5]),
! 						'parameter_function' 	=> str_replace("\'", "''",$module_data[6]),
! 						'parameter_auth' 		=> str_replace("\'", "''",$module_data[7]),
! 						'parameter_order' 		=> (int)  $module_data[8],
! 					);
! 					$sql_add = "INSERT INTO $table " . $db->sql_build_array('INSERT', $sql);					
  
  					$sql_update = "UPDATE " . PARAMETER_TABLE . "

[mxbb-commits] mx_glance mx_glance.pak,1.4,1.5

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

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

Modified Files:
	mx_glance.pak 
Log Message:
fix

Index: mx_glance.pak
===================================================================
RCS file: /cvsroot/mxbb/mx_glance/mx_glance.pak,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mx_glance.pak	12 Aug 2007 18:46:00 -0000	1.4
--- mx_glance.pak	20 Jul 2008 03:06:17 -0000	1.5
***************
*** 3,11 ****
  function=+:62=+:73=+:Last News and Topics=+:Last News and Topics=+:mx_glance.php=+:
  parameter=+:73=+:137=+:Glance_news_forum_id=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE)=+:0=+:0
! parameter=+:73=+:138=+:Glance_num_news=+:Number=+:1=+:=+:0
  parameter=+:73=+:139=+:Glance_recent_ignore=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE)=+:0=+:0
! parameter=+:73=+:140=+:Glance_num_recent=+:Number=+:5=+:=+:0
! parameter=+:73=+:141=+:Glance_table_width=+:Number=+:200=+:=+:0
! parameter=+:73=+:142=+:Glance_title_length=+:Number=+:0=+:=+:0
  parameter=+:73=+:143=+:Glance_show_new_bullets=+:Boolean=+:TRUE=+:=+:0=+:0
  parameter=+:73=+:143=+:Glance_show_user_color=+:Boolean=+:TRUE=+:=+:0=+:0
--- 3,11 ----
  function=+:62=+:73=+:Last News and Topics=+:Last News and Topics=+:mx_glance.php=+:
  parameter=+:73=+:137=+:Glance_news_forum_id=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE)=+:0=+:0
! parameter=+:73=+:138=+:Glance_num_news=+:Number=+:1=+:1=+:0
  parameter=+:73=+:139=+:Glance_recent_ignore=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE)=+:0=+:0
! parameter=+:73=+:140=+:Glance_num_recent=+:Number=+:5=+:1=+:0
! parameter=+:73=+:141=+:Glance_table_width=+:Number=+:200=+:1=+:0
! parameter=+:73=+:142=+:Glance_title_length=+:Number=+:0=+:1=+:0
  parameter=+:73=+:143=+:Glance_show_new_bullets=+:Boolean=+:TRUE=+:=+:0=+:0
  parameter=+:73=+:143=+:Glance_show_user_color=+:Boolean=+:TRUE=+:=+:0=+:0

[mxbb-commits] core/includes/db mysql.php, 1.15, 1.16 mysql4.php, 1.15, 1.16 mysqli.php, 1.15, 1.16 postgres.php, 1.15, 1.16

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

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

Modified Files:
	mysql.php mysql4.php mysqli.php postgres.php 
Log Message:
upgrade for utf-8 languages support like greek and romanian

Index: mysql.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/mysql.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mysql.php	7 Mar 2008 00:59:02 -0000	1.15
--- mysql.php	20 Jul 2008 02:41:41 -0000	1.16
***************
*** 37,45 ****
  	var $mysql_version;
  	var $multi_insert = true;
  	/**
  	* Connect to server
! 	* @public
  	*/
! 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
  	{
  		$this->persistency = $persistency;
--- 37,46 ----
  	var $mysql_version;
  	var $multi_insert = true;
+ 	
  	/**
  	* Connect to server
! 	* @access public
  	*/
! 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
  	{
  		$this->persistency = $persistency;
***************
*** 48,57 ****
  		$this->dbname = $database;
  
! 		$this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword) : @mysql_connect($this->server, $this->user, $sqlpassword);
  
  		if ($this->db_connect_id && $this->dbname != '')
  		{
! 			if (@mysql_select_db($this->dbname))
  			{
  				return $this->db_connect_id;
  			}
--- 49,97 ----
  		$this->dbname = $database;
  
! 		$this->sql_layer = 'mysql4';
! 
! 		$this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link);
  
  		if ($this->db_connect_id && $this->dbname != '')
  		{
! 			if (@mysql_select_db($this->dbname, $this->db_connect_id))
  			{
+ 				// Determine what version we are using and if it natively supports UNICODE
+ 				$this->mysql_version = mysql_get_server_info($this->db_connect_id);
+ 
+ 				if (version_compare($this->mysql_version, '4.1.3', '>='))
+ 				{
+ 					@mysql_query("SET NAMES 'utf8'", $this->db_connect_id);
+ 					// enforce strict mode on databases that support it
+ 					if (version_compare($this->mysql_version, '5.0.2', '>='))
+ 					{
+ 						$result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id);
+ 						$row = @mysql_fetch_assoc($result);
+ 						@mysql_free_result($result);
+ 						$modes = array_map('trim', explode(',', $row['sql_mode']));
+ 
+ 						// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
+ 						if (!in_array('TRADITIONAL', $modes))
+ 						{
+ 							if (!in_array('STRICT_ALL_TABLES', $modes))
+ 							{
+ 								$modes[] = 'STRICT_ALL_TABLES';
+ 							}
+ 
+ 							if (!in_array('STRICT_TRANS_TABLES', $modes))
+ 							{
+ 								$modes[] = 'STRICT_TRANS_TABLES';
+ 							}
+ 						}
+ 
+ 						$mode = implode(',', $modes);
+ 						@mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id);
+ 					}
+ 				}
+ 				else if (version_compare($this->mysql_version, '4.0.0', '<'))
+ 				{
+ 					$this->sql_layer = 'mysql';
+ 				}
+ 
  				return $this->db_connect_id;
  			}
***************
*** 61,64 ****
--- 101,105 ----
  	}
  
+ 
  	/**
  	* Version information about used database

Index: mysql4.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/mysql4.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mysql4.php	7 Mar 2008 00:59:03 -0000	1.15
--- mysql4.php	20 Jul 2008 02:41:41 -0000	1.16
***************
*** 43,47 ****
  	* Connect to server
  	*/
! 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
  	{
  		$this->persistency = $persistency;
--- 43,51 ----
  	* Connect to server
  	*/
! 	/**
! 	* Connect to server
! 	* @access public
! 	*/
! 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
  	{
  		$this->persistency = $persistency;
***************
*** 50,59 ****
  		$this->dbname = $database;
  
! 		$this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword) : @mysql_connect($this->server, $this->user, $sqlpassword);
  
  		if ($this->db_connect_id && $this->dbname != '')
  		{
! 			if (@mysql_select_db($this->dbname))
  			{
  				return $this->db_connect_id;
  			}
--- 54,102 ----
  		$this->dbname = $database;
  
! 		$this->sql_layer = 'mysql4';
! 
! 		$this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link);
  
  		if ($this->db_connect_id && $this->dbname != '')
  		{
! 			if (@mysql_select_db($this->dbname, $this->db_connect_id))
  			{
+ 				// Determine what version we are using and if it natively supports UNICODE
+ 				$this->mysql_version = mysql_get_server_info($this->db_connect_id);
+ 
+ 				if (version_compare($this->mysql_version, '4.1.3', '>='))
+ 				{
+ 					@mysql_query("SET NAMES 'utf8'", $this->db_connect_id);
+ 					// enforce strict mode on databases that support it
+ 					if (version_compare($this->mysql_version, '5.0.2', '>='))
+ 					{
+ 						$result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id);
+ 						$row = @mysql_fetch_assoc($result);
+ 						@mysql_free_result($result);
+ 						$modes = array_map('trim', explode(',', $row['sql_mode']));
+ 
+ 						// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
+ 						if (!in_array('TRADITIONAL', $modes))
+ 						{
+ 							if (!in_array('STRICT_ALL_TABLES', $modes))
+ 							{
+ 								$modes[] = 'STRICT_ALL_TABLES';
+ 							}
+ 
+ 							if (!in_array('STRICT_TRANS_TABLES', $modes))
+ 							{
+ 								$modes[] = 'STRICT_TRANS_TABLES';
+ 							}
+ 						}
+ 
+ 						$mode = implode(',', $modes);
+ 						@mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id);
+ 					}
+ 				}
+ 				else if (version_compare($this->mysql_version, '4.0.0', '<'))
+ 				{
+ 					$this->sql_layer = 'mysql';
+ 				}
+ 
  				return $this->db_connect_id;
  			}

Index: mysqli.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/mysqli.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mysqli.php	7 Mar 2008 00:59:03 -0000	1.15
--- mysqli.php	20 Jul 2008 02:41:41 -0000	1.16
***************
*** 37,58 ****
  {
  	var $multi_insert = true;
  	/**
  	* Connect to server
  	*/
! 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
  	{
  		$this->persistency = $persistency;
  		$this->user = $sqluser;
! 		$this->server = $sqlserver . (($port) ? ':' . $port : '');
  		$this->dbname = $database;
  
! 		$this->db_connect_id = ($this->persistency) ? @mysqli_pconnect($this->server, $this->user, $sqlpassword) : @mysqli_connect($this->server, $this->user, $sqlpassword);
  
  		if ($this->db_connect_id && $this->dbname != '')
  		{
! 			if (@mysqli_select_db($this->db_connect_id, $this->dbname))
  			{
! 				return $this->db_connect_id;
  			}
  		}
  
--- 37,84 ----
  {
  	var $multi_insert = true;
+ 	
  	/**
  	* Connect to server
  	*/
! 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false)
  	{
  		$this->persistency = $persistency;
  		$this->user = $sqluser;
! 		$this->server = $sqlserver;
  		$this->dbname = $database;
+ 		$port = (!$port) ? NULL : $port;
  
! 		// Persistant connections not supported by the mysqli extension?
! 		$this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port);
  
  		if ($this->db_connect_id && $this->dbname != '')
  		{
! 			@mysqli_query($this->db_connect_id, "SET NAMES 'utf8'");
! 			// enforce strict mode on databases that support it
! 			if (mysqli_get_server_version($this->db_connect_id) >= 50002)
  			{
! 				$result = @mysqli_query($this->db_connect_id, 'SELECT @@session.sql_mode AS sql_mode');
! 				$row = @mysqli_fetch_assoc($result);
! 				@mysqli_free_result($result);
! 				$modes = array_map('trim', explode(',', $row['sql_mode']));
! 
! 				// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
! 				if (!in_array('TRADITIONAL', $modes))
! 				{
! 					if (!in_array('STRICT_ALL_TABLES', $modes))
! 					{
! 						$modes[] = 'STRICT_ALL_TABLES';
! 					}
! 
! 					if (!in_array('STRICT_TRANS_TABLES', $modes))
! 					{
! 						$modes[] = 'STRICT_TRANS_TABLES';
! 					}
! 				}
! 
! 				$mode = implode(',', $modes);
! 				@mysqli_query($this->db_connect_id, "SET SESSION sql_mode='{$mode}'");
  			}
+ 			return $this->db_connect_id;
  		}
  

Index: postgres.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/postgres.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** postgres.php	7 Mar 2008 00:59:03 -0000	1.15
--- postgres.php	20 Jul 2008 02:41:41 -0000	1.16
***************
*** 41,56 ****
  	* Connect to server
  	*/
! 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
  	{
! 		$this->connect_string = '';
  
  		if ($sqluser)
  		{
! 			$this->connect_string .= "user=$sqluser ";
  		}
  
  		if ($sqlpassword)
  		{
! 			$this->connect_string .= "password=$sqlpassword ";
  		}
  
--- 41,56 ----
  	* Connect to server
  	*/
! 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
  	{
! 		$connect_string = '';
  
  		if ($sqluser)
  		{
! 			$connect_string .= "user=$sqluser ";
  		}
  
  		if ($sqlpassword)
  		{
! 			$connect_string .= "password=$sqlpassword ";
  		}
  
***************
*** 59,90 ****
  			if (strpos($sqlserver, ':') !== false)
  			{
! 				list($sqlserver, $sqlport) = explode(':', $sqlserver);
! 				$this->connect_string .= "host=$sqlserver port=$sqlport ";
  			}
- 			else
- 			{
- 				if ($sqlserver != "localhost")
- 				{
- 					$this->connect_string .= "host=$sqlserver ";
- 				}
  
! 				if ($port)
! 				{
! 					$this->connect_string .= "port=$port ";
! 				}
  			}
  		}
  
  		if ($database)
  		{
  			$this->dbname = $database;
! 			$this->connect_string .= "dbname=$database";
  		}
  
  		$this->persistency = $persistency;
  
! 		$this->db_connect_id = ($this->persistency) ? @pg_pconnect($this->connect_string) : @pg_connect($this->connect_string);
  
! 		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
  	}
  
--- 59,124 ----
  			if (strpos($sqlserver, ':') !== false)
  			{
! 				list($sqlserver, $port) = explode(':', $sqlserver);
  			}
  
! 			if ($sqlserver !== 'localhost')
! 			{
! 				$connect_string .= "host=$sqlserver ";
! 			}
! 		
! 			if ($port)
! 			{
! 				$connect_string .= "port=$port ";
  			}
  		}
  
+ 		$schema = '';
+ 
  		if ($database)
  		{
  			$this->dbname = $database;
! 			if (strpos($database, '.') !== false)
! 			{
! 				list($database, $schema) = explode('.', $database);
! 			}
! 			$connect_string .= "dbname=$database";
  		}
  
  		$this->persistency = $persistency;
  
! 		$this->db_connect_id = ($this->persistency) ? @pg_pconnect($connect_string, $new_link) : @pg_connect($connect_string, $new_link);
  
! 		if ($this->db_connect_id)
! 		{
! 			// determine what version of PostgreSQL is running, we can be more efficient if they are running 8.2+
! 			if (version_compare(PHP_VERSION, '5.0.0', '>='))
! 			{
! 				$this->pgsql_version = @pg_parameter_status($this->db_connect_id, 'server_version');
! 			}
! 			else
! 			{
! 				$query_id = @pg_query($this->db_connect_id, 'SELECT VERSION()');
! 				$row = @pg_fetch_assoc($query_id, null);
! 				@pg_free_result($query_id);
! 
! 				if (!empty($row['version']))
! 				{
! 					$this->pgsql_version = substr($row['version'], 10);
! 				}
! 			}
! 
! 			if (!empty($this->pgsql_version) && $this->pgsql_version[0] >= '8' && $this->pgsql_version[2] >= '2')
! 			{
! 				$this->multi_insert = true;
! 			}
! 
! 			if ($schema !== '')
! 			{
! 				@pg_query($this->db_connect_id, 'SET search_path TO ' . $schema);
! 			}
! 			return $this->db_connect_id;
! 		}
! 
! 		return $this->sql_error('');
  	}
  

[mxbb-commits] core/includes/sessions/phpbb3 session.php, 1.28, 1.29

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

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

Modified Files:
	session.php 
Log Message:
this fix is great 4 loading phpbb3 common language

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** session.php	15 Jul 2008 22:53:58 -0000	1.28
--- session.php	20 Jul 2008 02:06:16 -0000	1.29
***************
*** 1307,1327 ****
  			$this->dst = $board_config['board_dst'] * 3600;
  		}
  
  		//
  		// We include common language file here to not load it every time a custom language file is included
  		//
  		$lang = &$this->lang;
! 
! 		if ((@include $this->lang_path . "common.$phpEx") === false)
! 		{
! 			//this will fix the path for anonymouse users
! 			if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false)
! 			{
! 				die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.');
! 			}
! 		}
! 
  		$this->add_lang($lang_set);
- 
  		unset($lang_set);
  	}
--- 1307,1331 ----
  			$this->dst = $board_config['board_dst'] * 3600;
  		}
+ 		
  
+ 		if (empty($lang['USER_LANG']))
+ 		{		
+ 			if ((@include $this->lang_path . "common.$phpEx") === false)
+ 			{
+ 				//this will fix the path for anonymouse users
+ 				if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false)
+ 				{
+ 					die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.');
+ 				}
+ 			}
+ 			$this->lang = &$lang;
+ 		}
+ 		
  		//
  		// We include common language file here to not load it every time a custom language file is included
  		//
  		$lang = &$this->lang;
! 		
  		$this->add_lang($lang_set);
  		unset($lang_set);
  	}
***************
*** 1740,1744 ****
  
  		// We include common language file here to not load it every time a custom language file is included
! 		$lang = &$this->lang;
  	}
  
--- 1744,1748 ----
  
  		// We include common language file here to not load it every time a custom language file is included
! 		$this->lang = &$lang;
  	}
  

[mxbb-commits] core/includes page_header.php,1.56,1.57

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

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

Modified Files:
	page_header.php 
Log Message:
$this->

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** page_header.php	11 Jul 2008 21:23:17 -0000	1.56
--- page_header.php	20 Jul 2008 01:45:01 -0000	1.57
***************
*** 236,240 ****
  	'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
  	'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
! 	'S_USER_LANG' => $mx_user->lang['default_lang'],
  	'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone),
  	'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL . 'login.'.$phpEx),
--- 236,240 ----
  	'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
  	'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
! 	'S_USER_LANG' => (PORTAL_BACKEND === 'phpbb3') ? $lang['USER_LANG'] : $mx_user->encode_lang($board_config['default_lang']),
  	'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone),
  	'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL . 'login.'.$phpEx),

[mxbb-commits] core common.php,1.100,1.101

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

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

Modified Files:
	common.php 
Log Message:
users don't know how to disable this forced error output, please enable this only when debuging

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** common.php	15 Jul 2008 22:53:56 -0000	1.100
--- common.php	20 Jul 2008 01:33:47 -0000	1.101
***************
*** 32,38 ****
  //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php
  //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only.
! error_reporting(E_ALL & ~E_NOTICE);
  @ini_set( 'display_errors', '1' );
! //error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
  include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output
  
--- 32,38 ----
  //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php
  //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only.
! //error_reporting(E_ALL & ~E_NOTICE);
  @ini_set( 'display_errors', '1' );
! error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
  include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output
  

[mxbb-commits] mx_glance mx_glance.php,1.19,1.20

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

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

Modified Files:
	mx_glance.php 
Log Message:
???????????????????????

Index: mx_glance.php
===================================================================
RCS file: /cvsroot/mxbb/mx_glance/mx_glance.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** mx_glance.php	19 Jul 2008 22:57:31 -0000	1.19
--- mx_glance.php	20 Jul 2008 00:58:38 -0000	1.20
***************
*** 350,353 ****
--- 350,355 ----
  	}
  	
+ 	//$recent_auth_level = false; //fix this after class is working
+ 	
  	$recentforumsignore = $phpbb_auth->acl_getfignore($recent_auth_level, $recent_news_forum_id);
  	$recentforumsignore .= ($recentforumsignore && $recent_forums_ignore) ? ',' : '';

[mxbb-commits] core/includes/sessions/phpbb2 core.php,1.13,1.14

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

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

Modified Files:
	core.php 
Log Message:
$phpbb_auth->acl_getfignore() not working, class not working...

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** core.php	19 Jul 2008 22:49:44 -0000	1.13
--- core.php	20 Jul 2008 00:50:23 -0000	1.14
***************
*** 103,107 ****
  		global $phpbb_root_path, $mx_user;
  
! 		$ignore_forum_ids = ($ignore_forum_ids) ? $ignore_forum_ids : '';
  
  		$auth_user = array();
--- 103,107 ----
  		global $phpbb_root_path, $mx_user;
  
! 		$ignore_forum_ids = ($ignore_forum_ids) ? $ignore_forum_ids : -1;
  
  		$auth_user = array();
***************
*** 119,127 ****
  						$unauthed = false;
  
! 						if (!$auth_mod[$auth_level] && ( strstr($ignore_forum_ids,$auth_mod['forum_id']) === FALSE))
! 						{
! 							$unauthed = true;
! 						}
! 
  						if ($unauthed)
  						{
--- 119,130 ----
  						$unauthed = false;
  
! 						if (!$auth_mod[$auth_level] && (strstr($ignore_forum_ids,$auth_mod['forum_id']) === FALSE)) 
! 						{ 
! 							$unauthed = true; 
! 						} 
! 						if (!$auth_level && !$auth_mod['auth_read'] && (strstr($ignore_forum_ids,$auth_mod['forum_id']) === FALSE)) 
! 						{ 
! 		   					$unauthed = true; 
! 						} 
  						if ($unauthed)
  						{
***************
*** 133,160 ****
  			}
  		}
! 		elseif ($auth_level_read)
  		{
  			$auth_user = $this->auth($auth_level_read, AUTH_LIST_ALL, $mx_user->data);
  
! 			if ($num_forums = count($auth_user))
  			{
! 				while ( list($forum_id, $auth_mod) = each($auth_user) )
  				{
  					$unauthed = false;
  
! 					if (!$auth_mod[$auth_level] && ( strstr($ignore_forum_ids,$auth_mod['forum_id']) === FALSE))
! 					{
! 						$unauthed = true;
! 					}
! 
! 					if ($unauthed)
! 					{
! 						$ignore_forum_ids .= ($ignore_forum_ids) ? ',' . $forum_id : $forum_id;
! 					}
  				}
  			}
- 
  		}
! 		$ignore_forum_ids = ($ignore_forum_ids) ? $ignore_forum_ids : 0;
  		return $ignore_forum_ids;
  	}
--- 136,165 ----
  			}
  		}
! 		else
  		{
  			$auth_user = $this->auth($auth_level_read, AUTH_LIST_ALL, $mx_user->data);
  
! 			foreach($auth_user as $forum_id => $is_auth_row)
  			{
! 				$unauthed = true;
! 				
! 				if($auth_level_read && ($is_auth_row[$auth_level_read]))
  				{
  					$unauthed = false;
+ 				}
+ 				
+ 				if(strstr($ignore_forum_ids, $forum_id))
+ 				{
+ 					$unauthed = false;
+ 				}				
  
! 				if ($unauthed)
! 				{
! 					$ignore_forum_ids .= ($ignore_forum_ids) ? ',' . $forum_id : $forum_id;
  				}
+ 				
  			}
  		}
! 		$ignore_forum_ids = ($ignore_forum_ids) ? $ignore_forum_ids : -1;
  		return $ignore_forum_ids;
  	}

[mxbb-commits] mx_phpbb/includes forum_hack.php,1.61,1.62

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

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

Modified Files:
	forum_hack.php 
Log Message:
fix for new bbcode class

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** forum_hack.php	15 Jul 2008 22:07:15 -0000	1.61
--- forum_hack.php	19 Jul 2008 23:06:33 -0000	1.62
***************
*** 1117,1121 ****
  		//$smilies_path = $board_config['smilies_path'];
  		//$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];
! 		$message = $mx_bbcode->smilies_pass( $message );
  		//$board_config['smilies_path'] = $smilies_path;
  		return $message;
--- 1117,1121 ----
  		//$smilies_path = $board_config['smilies_path'];
  		//$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];
! 		$message = $mx_bbcode->smilies_pass($message);
  		//$board_config['smilies_path'] = $smilies_path;
  		return $message;
***************
*** 1125,1129 ****
  	// Replaces same function in functions_post.php
  	// --------------------------------------------------------------------------------
! 	function generate_smilies( $mode, $page_id )
  	{
  		//
--- 1125,1129 ----
  	// Replaces same function in functions_post.php
  	// --------------------------------------------------------------------------------
! 	function generate_smilies($mode, $page_id)
  	{
  		//
***************
*** 1134,1140 ****
  		//$smilies_path = $board_config['smilies_path'];
  		//$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];
! 		$mx_bbcode->generate_smilies( $mode, $page_id );
  		//$board_config['smilies_path'] = $smilies_path;
! 		$template->assign_vars( array( 'U_MORE_SMILIES' => $this->append_sid( "posting.$phpEx?mode=smilies" ) ) );
  	}
  
--- 1134,1140 ----
  		//$smilies_path = $board_config['smilies_path'];
  		//$board_config['smilies_path'] = $this->phpbb_url . $board_config['smilies_path'];
! 		$mx_bbcode->generate_smilies($mode, $page_id);
  		//$board_config['smilies_path'] = $smilies_path;
! 		$template->assign_vars( array( 'U_MORE_SMILIES' => $this->append_sid("posting.$phpEx?mode=smilies") ) );
  	}
  

[mxbb-commits] mx_glance mx_glance.php,1.18,1.19

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

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

Modified Files:
	mx_glance.php 
Log Message:
fix ?

Index: mx_glance.php
===================================================================
RCS file: /cvsroot/mxbb/mx_glance/mx_glance.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** mx_glance.php	25 Jun 2008 12:41:19 -0000	1.18
--- mx_glance.php	19 Jul 2008 22:57:31 -0000	1.19
***************
*** 350,354 ****
  	}
  	
! 	$recentforumsignore = mx_acl_getfignore($recent_auth_level, $recent_news_forum_id);
  	$recentforumsignore .= ($recentforumsignore && $recent_forums_ignore) ? ',' : '';
  
--- 350,354 ----
  	}
  	
! 	$recentforumsignore = $phpbb_auth->acl_getfignore($recent_auth_level, $recent_news_forum_id);
  	$recentforumsignore .= ($recentforumsignore && $recent_forums_ignore) ? ',' : '';
  

[mxbb-commits] core/includes/sessions/phpbb3 core.php,1.10,1.11

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

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

Modified Files:
	core.php 
Log Message:
acl_getfignore() mx: droped in clases

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** core.php	15 Jul 2008 22:53:57 -0000	1.10
--- core.php	19 Jul 2008 22:49:45 -0000	1.11
***************
*** 94,103 ****
  
  	/**
! 	* function mx_acl_getfignore()
  	* $auth_level_read can be a value or array;
  	* $ignore_forum_ids can have this sintax: forum_id(1), forum_id(2), ..., forum_is(n);
  	* 1st test 25.06.2008 by FlorinCB
  	 */
! 	function mx_acl_getfignore($auth_level_read, $ignore_forum_ids)
  	{
  		global $phpbb_root_path, $mx_user;
--- 94,103 ----
  
  	/**
! 	* function acl_getfignore()
  	* $auth_level_read can be a value or array;
  	* $ignore_forum_ids can have this sintax: forum_id(1), forum_id(2), ..., forum_is(n);
  	* 1st test 25.06.2008 by FlorinCB
  	 */
! 	function acl_getfignore($auth_level_read, $ignore_forum_ids)
  	{
  		global $phpbb_root_path, $mx_user;

[mxbb-commits] core/includes/sessions/phpbb2 core.php,1.12,1.13

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

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

Modified Files:
	core.php 
Log Message:
acl_getfignore() mx: droped in clases

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** core.php	15 Jul 2008 23:28:33 -0000	1.12
--- core.php	19 Jul 2008 22:49:44 -0000	1.13
***************
*** 94,103 ****
  
  	/**
! 	* function mx_acl_getfignore()
  	* $auth_level_read can be a value or array;
  	* $ignore_forum_ids can have this sintax: forum_id(1), forum_id(2), ..., forum_is(n);
  	* 1st test 25.06.2008 by FlorinCB
  	 */
! 	function mx_acl_getfignore($auth_level_read, $ignore_forum_ids)
  	{
  		global $phpbb_root_path, $mx_user;
--- 94,103 ----
  
  	/**
! 	* function acl_getfignore()
  	* $auth_level_read can be a value or array;
  	* $ignore_forum_ids can have this sintax: forum_id(1), forum_id(2), ..., forum_is(n);
  	* 1st test 25.06.2008 by FlorinCB
  	 */
! 	function acl_getfignore($auth_level_read, $ignore_forum_ids)
  	{
  		global $phpbb_root_path, $mx_user;

[mxbb-commits] mx_ggsitemaps_adv/includes google_forum.php, 1.4, 1.5

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

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

Modified Files:
	google_forum.php 
Log Message:
fix

Index: google_forum.php
===================================================================
RCS file: /cvsroot/mxbb/mx_ggsitemaps_adv/includes/google_forum.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** google_forum.php	26 Jun 2008 18:06:17 -0000	1.4
--- google_forum.php	19 Jul 2008 22:25:19 -0000	1.5
***************
*** 36,40 ****
  }
  */
- $phpbb_auth->acl($mx_user->data); // Do only once, in user_init // Move later
  
  $forumsallow = $phpbb_auth->get_auth_forum();
--- 36,39 ----

[mxbb-commits] mx_pjirc/includes common.php,1.5,1.6

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

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

Modified Files:
	common.php 
Log Message:
decode_lang

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/includes/common.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** common.php	4 Jun 2008 00:09:10 -0000	1.5
--- common.php	19 Jul 2008 21:25:36 -0000	1.6
***************
*** 41,45 ****
  include_once($module_root_path . 'includes/functions.'.$phpEx);
  
! $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'];
  
  //
--- 41,45 ----
  include_once($module_root_path . 'includes/functions.'.$phpEx);
  
! $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->decode_lang($mx_user->lang['default_lang']) : $board_config['default_lang'];
  
  //

[mxbb-commits] mx_pjirc index.php,1.5,1.6 pjirc_chat.php,1.8,1.9

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

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

Modified Files:
	index.php pjirc_chat.php 
Log Message:
decode_lang

Index: pjirc_chat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_chat.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pjirc_chat.php	12 Jun 2008 05:20:15 -0000	1.8
--- pjirc_chat.php	19 Jul 2008 21:25:37 -0000	1.9
***************
*** 137,144 ****
  	'S_CONTENT_DIR_LEFT'	=> $lang['LEFT'],
  	'S_CONTENT_DIR_RIGHT'	=> $lang['RIGHT'],
! 	'S_USER_LANG'			=> ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'],
  	'S_TIMEZONE'			=> sprintf($lang['All_times'], $l_timezone),
  	'S_LOGIN_ACTION'	=> mx_append_sid(PORTAL_URL . 'login.'.$phpEx),
! 	'LANG'				=> ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'],
  	'HELP' 				=> $help,
  	
--- 137,144 ----
  	'S_CONTENT_DIR_LEFT'	=> $lang['LEFT'],
  	'S_CONTENT_DIR_RIGHT'	=> $lang['RIGHT'],
! 	'S_USER_LANG'			=> ($mx_user->lang['default_lang']) ? $mx_user->decode_lang($mx_user->lang['default_lang']) : $board_config['default_lang'],
  	'S_TIMEZONE'			=> sprintf($lang['All_times'], $l_timezone),
  	'S_LOGIN_ACTION'	=> mx_append_sid(PORTAL_URL . 'login.'.$phpEx),
! 	'LANG'				=> ($mx_user->lang['default_lang']) ? $mx_user->decode_lang($mx_user->lang['default_lang']) : $board_config['default_lang'],
  	'HELP' 				=> $help,
  	

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** index.php	4 Jun 2008 00:09:08 -0000	1.5
--- index.php	19 Jul 2008 21:25:37 -0000	1.6
***************
*** 88,95 ****
  	'S_CONTENT_DIR_LEFT'	=> $lang['LEFT'],
  	'S_CONTENT_DIR_RIGHT'	=> $lang['RIGHT'],
! 	'S_USER_LANG'			=> ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'],
  	'S_TIMEZONE'			=> sprintf($lang['All_times'], $l_timezone),
  	'S_LOGIN_ACTION'	=> mx_append_sid(PORTAL_URL . 'login.'.$phpEx),
! 	'LANG'				=> ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'],
  	'HELP' 				=> $help,
  	
--- 88,95 ----
  	'S_CONTENT_DIR_LEFT'	=> $lang['LEFT'],
  	'S_CONTENT_DIR_RIGHT'	=> $lang['RIGHT'],
! 	'S_USER_LANG'			=> ($mx_user->lang['default_lang']) ? $mx_user->decode_lang($mx_user->lang['default_lang']) : $board_config['default_lang'],
  	'S_TIMEZONE'			=> sprintf($lang['All_times'], $l_timezone),
  	'S_LOGIN_ACTION'	=> mx_append_sid(PORTAL_URL . 'login.'.$phpEx),
! 	'LANG'				=> ($mx_user->lang['default_lang']) ? $mx_user->decode_lang($mx_user->lang['default_lang']) : $board_config['default_lang'],
  	'HELP' 				=> $help,
  	

[mxbb-commits] mx_pjirc/templates/_core pjirc_front.tpl, 1.2, 1.3 pjirc_index.tpl, 1.3, 1.4

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

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

Modified Files:
	pjirc_front.tpl pjirc_index.tpl 
Log Message:
witdh

Index: pjirc_index.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/templates/_core/pjirc_index.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pjirc_index.tpl	19 Jul 2008 20:20:57 -0000	1.3
--- pjirc_index.tpl	19 Jul 2008 20:32:15 -0000	1.4
***************
*** 28,32 ****
  	<td class="row1" align="left">
  	<!-- frames -->
! 		<iframe width="100%" height="900" noresize scrolling="yes" frameborder="no" src="{S_MAIN_CHAT}" name="chat"></iframe>
  		<iframe width="100%" height="2" noresize scrolling="no" frameborder="no" src="{S_UPDATE_CHAT}" name="update" noresize></iframe>
  	<!-- frames end -->
--- 28,32 ----
  	<td class="row1" align="left">
  	<!-- frames -->
! 		<iframe width="100%" height="605" noresize scrolling="no" frameborder="no" src="{S_MAIN_CHAT}" name="chat"></iframe>
  		<iframe width="100%" height="2" noresize scrolling="no" frameborder="no" src="{S_UPDATE_CHAT}" name="update" noresize></iframe>
  	<!-- frames end -->

Index: pjirc_front.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/templates/_core/pjirc_front.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pjirc_front.tpl	19 Jul 2008 20:20:57 -0000	1.2
--- pjirc_front.tpl	19 Jul 2008 20:32:15 -0000	1.3
***************
*** 24,28 ****
  			<span class="gensmall">
  				<!-- BEGIN switch_user_logged_out_show_chat_yes -->
! 					[ <a href="javascript:void(0);" onClick="window.open('{S_JOIN_CHAT}','','scrollbars=no,resizable=no,width=100%,height=800')">{L_CLICK_TO_JOIN_CHAT}</a> ]
  				<!-- END switch_user_logged_out_show_chat_yes -->
  				<!-- BEGIN switch_user_logged_out_show_chat_no -->
--- 24,28 ----
  			<span class="gensmall">
  				<!-- BEGIN switch_user_logged_out_show_chat_yes -->
! 					[ <a href="javascript:void(0);" onClick="window.open('{S_JOIN_CHAT}','','scrollbars=no,resizable=no,width=860,height=600')">{L_CLICK_TO_JOIN_CHAT}</a> ]
  				<!-- END switch_user_logged_out_show_chat_yes -->
  				<!-- BEGIN switch_user_logged_out_show_chat_no -->
***************
*** 30,34 ****
  				<!-- END switch_user_logged_out_show_chat_no -->
  				<!-- BEGIN switch_user_logged_in -->
! 				[ <a href="javascript:void(0);" onClick="window.open('{S_JOIN_CHAT}','','scrollbars=no,resizable=no,width=100%,height=800')">{L_CLICK_TO_JOIN_CHAT}</a> ]
  				<!-- END switch_user_logged_in -->
  				<!-- BEGIN switch_user_chatting -->
--- 30,34 ----
  				<!-- END switch_user_logged_out_show_chat_no -->
  				<!-- BEGIN switch_user_logged_in -->
! 				[ <a href="javascript:void(0);" onClick="window.open('{S_JOIN_CHAT}','','scrollbars=no,resizable=no,width=860,height=600')">{L_CLICK_TO_JOIN_CHAT}</a> ]
  				<!-- END switch_user_logged_in -->
  				<!-- BEGIN switch_user_chatting -->

[mxbb-commits] mx_pjirc/templates/_core pjirc_front.tpl, 1.1, 1.2 pjirc_index.tpl, 1.2, 1.3

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

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

Modified Files:
	pjirc_front.tpl pjirc_index.tpl 
Log Message:
witdh

Index: pjirc_index.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/templates/_core/pjirc_index.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pjirc_index.tpl	4 Jun 2008 00:09:11 -0000	1.2
--- pjirc_index.tpl	19 Jul 2008 20:20:57 -0000	1.3
***************
*** 28,32 ****
  	<td class="row1" align="left">
  	<!-- frames -->
! 		<iframe width="100%" height="605" noresize scrolling="no" frameborder="no" src="{S_MAIN_CHAT}" name="chat"></iframe>
  		<iframe width="100%" height="2" noresize scrolling="no" frameborder="no" src="{S_UPDATE_CHAT}" name="update" noresize></iframe>
  	<!-- frames end -->
--- 28,32 ----
  	<td class="row1" align="left">
  	<!-- frames -->
! 		<iframe width="100%" height="900" noresize scrolling="yes" frameborder="no" src="{S_MAIN_CHAT}" name="chat"></iframe>
  		<iframe width="100%" height="2" noresize scrolling="no" frameborder="no" src="{S_UPDATE_CHAT}" name="update" noresize></iframe>
  	<!-- frames end -->

Index: pjirc_front.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pjirc/templates/_core/pjirc_front.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pjirc_front.tpl	9 Feb 2008 11:34:06 -0000	1.1
--- pjirc_front.tpl	19 Jul 2008 20:20:57 -0000	1.2
***************
*** 24,28 ****
  			<span class="gensmall">
  				<!-- BEGIN switch_user_logged_out_show_chat_yes -->
! 					[ <a href="javascript:void(0);" onClick="window.open('{S_JOIN_CHAT}','','scrollbars=no,resizable=no,width=800,height=540')">{L_CLICK_TO_JOIN_CHAT}</a> ]
  				<!-- END switch_user_logged_out_show_chat_yes -->
  				<!-- BEGIN switch_user_logged_out_show_chat_no -->
--- 24,28 ----
  			<span class="gensmall">
  				<!-- BEGIN switch_user_logged_out_show_chat_yes -->
! 					[ <a href="javascript:void(0);" onClick="window.open('{S_JOIN_CHAT}','','scrollbars=no,resizable=no,width=100%,height=800')">{L_CLICK_TO_JOIN_CHAT}</a> ]
  				<!-- END switch_user_logged_out_show_chat_yes -->
  				<!-- BEGIN switch_user_logged_out_show_chat_no -->
***************
*** 30,34 ****
  				<!-- END switch_user_logged_out_show_chat_no -->
  				<!-- BEGIN switch_user_logged_in -->
! 				[ <a href="javascript:void(0);" onClick="window.open('{S_JOIN_CHAT}','','scrollbars=no,resizable=no,width=800,height=540')">{L_CLICK_TO_JOIN_CHAT}</a> ]
  				<!-- END switch_user_logged_in -->
  				<!-- BEGIN switch_user_chatting -->
--- 30,34 ----
  				<!-- END switch_user_logged_out_show_chat_no -->
  				<!-- BEGIN switch_user_logged_in -->
! 				[ <a href="javascript:void(0);" onClick="window.open('{S_JOIN_CHAT}','','scrollbars=no,resizable=no,width=100%,height=800')">{L_CLICK_TO_JOIN_CHAT}</a> ]
  				<!-- END switch_user_logged_in -->
  				<!-- BEGIN switch_user_chatting -->

[mxbb-commits] core/modules/mx_textblocks/admin mx_module_defs.php, 1.23.2.3, 1.23.2.4

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

Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2556

Modified Files:
      Tag: core28x
	mx_module_defs.php 
Log Message:
fix

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -C2 -d -r1.23.2.3 -r1.23.2.4
*** mx_module_defs.php	3 Jun 2008 21:04:05 -0000	1.23.2.3
--- mx_module_defs.php	18 Jul 2008 00:51:14 -0000	1.23.2.4
***************
*** 534,538 ****
        	// either remove this section or delete the modules/tinymce folder
        	//
!       	if ( file_exists( $mx_root_path . 'modules/mx_shared/tinymce/jscripts/tiny_mce/blank.htm' ) )
        	{
           	$langcode = mx_get_langcode();
--- 534,538 ----
        	// either remove this section or delete the modules/tinymce folder
        	//
!       	if ( file_exists($mx_root_path . 'modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js') )
        	{
           	$langcode = mx_get_langcode();

[mxbb-commits] core/modules/mx_textblocks/admin mx_module_defs.php, 1.30, 1.31

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

Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1627

Modified Files:
	mx_module_defs.php 
Log Message:
fix

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** mx_module_defs.php	13 Jul 2008 19:31:43 -0000	1.30
--- mx_module_defs.php	18 Jul 2008 00:49:54 -0000	1.31
***************
*** 552,556 ****
        	// either remove this section or delete the modules/tinymce folder
        	//
!       	if ( file_exists( $mx_root_path . 'modules/mx_shared/tinymce/jscripts/tiny_mce/blank.htm' ) )
        	{
           	$langcode = mx_get_langcode();
--- 552,556 ----
        	// either remove this section or delete the modules/tinymce folder
        	//
!       	if ( file_exists($mx_root_path . 'modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js') )
        	{
           	$langcode = mx_get_langcode();

[mxbb-commits] core/includes/sessions/phpbb2 core.php,1.11,1.12

[Jon O. <jon...@us...>]

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

Modified Files:
	core.php 
Log Message:
more

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** core.php	15 Jul 2008 22:03:29 -0000	1.11
--- core.php	15 Jul 2008 23:28:33 -0000	1.12
***************
*** 724,728 ****
  
  	/**
! 	 * Enter description here...
  	 *
  	 * @access public
--- 724,728 ----
  
  	/**
! 	 * obtain_phpbb_config
  	 *
  	 * @access public

[mxbb-commits] core/includes/sessions/phpbb3 core.php, 1.9, 1.10 session.php, 1.27, 1.28

[Jon O. <jon...@us...>]

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

Modified Files:
	core.php session.php 
Log Message:
A couple of fixes

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** core.php	15 Jul 2008 22:03:31 -0000	1.9
--- core.php	15 Jul 2008 22:53:57 -0000	1.10
***************
*** 253,261 ****
  		//
  		$this->sync_configs();
- 
- 		//
- 		// Dummy include, to make all original phpBB functions available
- 		//
- 		include_once($phpbb_root_path . 'includes/functions.' . $phpEx); // In case we need old functions...
  	}
  
--- 253,256 ----

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** session.php	11 Jul 2008 22:00:24 -0000	1.27
--- session.php	15 Jul 2008 22:53:58 -0000	1.28
***************
*** 1346,1362 ****
  		else
  		{
! 			//Workaround by OryNider in this "else"
! 			$sql = "SELECT bbt.*
! 				FROM " . MX_THEMES_TABLE . " mxt, " . STYLES_TABLE . " bbt
! 				WHERE mxt.style_name = bbt.style_name
! 				AND mxt.portal_backend = 'phpbb3'
! 				AND mxt.themes_id = " . (int) $this->style;
! 			if ( !($result = $db->sql_query($sql, 120)) )
! 			{
! 				mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
! 			}
! 			$this->phpbb_style = $db->sql_fetchrow($result);
! 			$db->sql_freeresult($result);
! 
  			// Set up style
  			$style = ($style) ? $style : ((!$board_config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $this->phpbb_style['style_id']);
--- 1346,1350 ----
  		else
  		{
! 			$style = $this->style;
  			// Set up style
  			$style = ($style) ? $style : ((!$board_config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $this->phpbb_style['style_id']);
***************
*** 1369,1372 ****
--- 1357,1361 ----
  				AND c.theme_id = s.theme_id
  				AND i.imageset_id = s.imageset_id";
+ 
  		if ( !($result = $db->sql_query($sql, 3600)) )
  		{

[mxbb-commits] core/includes mx_functions_style.php,1.82,1.83

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_functions_style.php 
Log Message:
A couple of fixes

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** mx_functions_style.php	10 Jul 2008 23:40:53 -0000	1.82
--- mx_functions_style.php	15 Jul 2008 22:53:57 -0000	1.83
***************
*** 767,773 ****
--- 767,775 ----
  			case 'phpbb2':
  				$this->template_name = $row['template_name'];
+ 				$style = $row['themes_id'];
  				break;
  			case 'phpbb3':
  				$this->template_name = $row['style_name'];
+ 				$style = $row['style_id'];
  				break;
  		}

[mxbb-commits] core common.php,1.99,1.100

[Jon O. <jon...@us...>]

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

Modified Files:
	common.php 
Log Message:
A couple of fixes

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** common.php	15 Jul 2008 22:02:43 -0000	1.99
--- common.php	15 Jul 2008 22:53:56 -0000	1.100
***************
*** 32,38 ****
  //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php
  //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only.
! //error_reporting(E_ALL & ~E_NOTICE);
  @ini_set( 'display_errors', '1' );
! error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
  include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output
  
--- 32,38 ----
  //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php
  //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only.
! error_reporting(E_ALL & ~E_NOTICE);
  @ini_set( 'display_errors', '1' );
! //error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
  include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output
  

[mxbb-commits] core/includes/sessions/phpbb3 functions.php, 1.1, 1.2

[Jon O. <jon...@us...>]

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

Modified Files:
	functions.php 
Log Message:
orys update

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/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:31 -0000	1.1
--- functions.php	15 Jul 2008 22:22:24 -0000	1.2
***************
*** 266,311 ****
  	}
  }
- 
- /**
- * For display of custom parsed text on user-facing pages
- * Expects $text to be the value directly from the database (stored value)
- */
- function mx_generate_text_for_display($text, $uid, $bitfield, $flags)
- {
- 	static $bbcode, $mx_bbcode;
- 
- 	if (!$text)
- 	{
- 		return '';
- 	}
- 
- 	$text = phpbb3::censor_text($text);
- 
- 	// Parse bbcode if bbcode uid stored and bbcode enabled
- 	if ($uid && ($flags & OPTION_FLAG_BBCODE))
- 	{
- 		if (!class_exists('bbcode'))
- 		{
- 			global $phpbb_root_path, $phpEx;
- 			mx_cache::load_file('bbcode', 'phpbb3');
- 		}
- 
- 		if (empty($bbcode))
- 		{
- 			$bbcode = new bbcode($bitfield);
- 		}
- 		else
- 		{
- 			$bbcode->bbcode($bitfield);
- 		}
- 
- 		$bbcode->bbcode_second_pass($text, $uid);
- 	}
- 
- 	$text = str_replace("\n", '<br />', $text);
- 
- 	$text = $mx_bbcode->smilies_pass($text, !($flags & OPTION_FLAG_SMILIES));
- 
- 	return $text;
- }
  ?>
\ No newline at end of file
--- 266,268 ----

[mxbb-commits] core/includes mx_functions.php,1.86,1.87

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_functions.php 
Log Message:
orys update

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** mx_functions.php	13 Jul 2008 20:24:49 -0000	1.86
--- mx_functions.php	15 Jul 2008 22:22:23 -0000	1.87
***************
*** 1046,1049 ****
--- 1046,1092 ----
  
  /**
+ * For display of custom parsed text on user-facing pages
+ * Expects $text to be the value directly from the database (stored value)
+ */
+ function mx_generate_text_for_display($text, $uid, $bitfield, $flags)
+ {
+ 	global $bbcode, $mx_bbcode;
+ 
+ 	if (!$text)
+ 	{
+ 		return '';
+ 	}
+ 
+ 	$text = phpbb3::censor_text($text);
+ 
+ 	// Parse bbcode if bbcode uid stored and bbcode enabled
+ 	if ($uid && ($flags & OPTION_FLAG_BBCODE))
+ 	{
+ 		if (!class_exists('bbcode'))
+ 		{
+ 			global $phpbb_root_path, $phpEx;
+ 			mx_cache::load_file('bbcode', 'phpbb3');
+ 		}
+ 
+ 		if (empty($bbcode))
+ 		{
+ 			$bbcode = new bbcode($bitfield);
+ 		}
+ 		else
+ 		{
+ 			$bbcode->bbcode($bitfield);
+ 		}
+ 
+ 		$bbcode->bbcode_second_pass($text, $uid);
+ 	}
+ 
+ 	$text = str_replace("\n", '<br />', $text);
+ 
+ 	$text = $mx_bbcode->smilies_pass($text, !($flags & OPTION_FLAG_SMILIES));
+ 
+ 	return $text;
+ }
+ 
+ /**
   * Return data from table.
   *