Version 3.4.6

Documentation/START_HERE.html

@@ -17,17 +17,17 @@
 		<div id='content'>
 			
 			<div class='message'>
-				<a href='http://external.ipslink.com/ipboard30/landing/?p=installation-guide'>Installing &rarr;
+				<a href='http://anonym.to/?http://external.ipslink.com/ipboard30/landing/?p=installation-guide'>Installing &rarr;
 			</div>
 			<br />
 			
 			<div class='message'>
-				<a href='http://external.ipslink.com/ipboard30/landing/?p=upgrade-guide'>Upgrading &rarr;
+				<a href='http://anonym.to/?http://external.ipslink.com/ipboard30/landing/?p=upgrade-guide'>Upgrading &rarr;
 			</div>
 			<br />
 			
 			<div class='message'>
-				<a href='http://external.ipslink.com/ipboard30/landing/?p=convert-guide'>Converting &rarr;
+				<a href='http://anonym.to/?http://external.ipslink.com/ipboard30/landing/?p=convert-guide'>Converting &rarr;
 			</div>
 			<br />
 		

Documentation/data/images/index.html

@@ -1 +1 @@
-<html>␍<head><title>Invision Power Board - Bulletin Board System</title></head>␍<body>␍<h1>403: Invision Power Board -&gt; Forbidden</h1>␍<hr>␍You have reached this Page in error, please use␍your back button to return to Invision Board.␍<hr>␍<a href="http://www.invisionpower.com">Invision Power Board</a>␍</body>␍</html>␍
+<html>␍<head><title>Invision Power Board - Bulletin Board System</title></head>␍<body>␍<h1>403: Invision Power Board -&gt; Forbidden</h1>␍<hr>␍You have reached this Page in error, please use␍your back button to return to Invision Board.␍<hr>␍Invision Power Board␍</body>␍</html>␍

Documentation/data/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

Tools/331_archive_update_php.php

@@ -2,7 +2,7 @@
 
 /*
 +---------------------------------------------------------------------------
-|   IP.Board v3.4.5
+|   IP.Board v3.4.6
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2008 Invision Power Services

Tools/333_archive_update_php.php

@@ -2,7 +2,7 @@
 
 /*
 +---------------------------------------------------------------------------
-|   IP.Board v3.4.5
+|   IP.Board v3.4.6
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2008 Invision Power Services

Tools/34x_fix_posts_php.php

@@ -2,7 +2,7 @@
 
 /*
 +---------------------------------------------------------------------------
-|   IP.Board v3.4.5
+|   IP.Board v3.4.6
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2008 Invision Power Services

Tools/_postUpdateRebuild.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Main public executable wrapper.
  * Set-up and load module to run
  * Last Updated: $Date: 2011-03-31 11:17:44 +0100 (Thu, 31 Mar 2011) $

Tools/build4release.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Main public executable wrapper.
  * Set-up and load module to run
  * Last Updated: $Date: 2012-06-06 15:26:34 -0400 (Wed, 06 Jun 2012) $

Tools/buildInDev.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Rebuilds stuff from XML
  * Last Updated: $Date: 2012-06-06 15:26:34 -0400 (Wed, 06 Jun 2012) $
  * </pre>

Tools/check_requirements.php

@@ -58,7 +58,6 @@ define( 'IPB_VERSION', '3.4' );
 	<h1>IP.Board <?php print IPB_VERSION; ?> Requirements Checker</h1>
 
 <?php
-
 $extensions	= get_loaded_extensions();
 $version	= phpversion();
 $minVersion	= '5.2.0';
@@ -68,7 +67,7 @@ $minVersion	= '5.2.0';
 //-----------------------------------------
 
 $checkRequiredVersion	= version_compare( $minVersion, $version, '<=' );
-flushOutput( "Проверка версии PHP (минимум - {$minVersion})...", $checkRequiredVersion, "Вы должны установить PHP версии {$minVersion} или выше для запуска IP.Board " . IPB_VERSION . ".  Сейчас работает версия {$version}.  Пожалуйста, свяжитесь с вашим хостинг-провайдером для обновления PHP до версии {$minVersion} или выше." );
+flushOutput( "Checking minimum version ({$minVersion})...", $checkRequiredVersion, "You must be running PHP v{$minVersion} or greater to use IP.Board " . IPB_VERSION . ".  You are currently running version {$version}.  Please ask your host to move you to a server running PHP v{$minVersion} or greater." );
 
 print "<p>You are running PHP <strong>{$version}</strong></p>";
 
@@ -76,7 +75,8 @@ print "<p>You are running PHP <strong>{$version}</strong></p>";
 // Check for zend guard
 //-----------------------------------------
 
-$hasZend = false;
+$hasZend		= false;
+$hasIoncube		= false;
 
 if ( function_exists( 'zend_loader_enabled' ) )
 {
@@ -86,7 +86,16 @@ if ( function_exists( 'zend_loader_enabled' ) )
 	}
 }
 
-flushOutput( "Только для IP.Nexus: Проверка обработки скриптов, закодированных Zend Guard...", $hasZend, "Ваш сервер не может обрабатывать закодированные скрипты IP.Nexus. Это не влияет на IP.Board, IP.Downloads. IP.Blog, IP.Gallery, IP.Content, IP.Chat" );
+if ( extension_loaded( 'ionCube Loader' ) )
+{
+	$hasIoncube = true;
+}
+
+flushOutput( "IP.Nexus Only: Checking for ability to load Zend Guard encoded files...", $hasZend, "Not able to run the Zend encoded files for IP.Nexus." );
+
+flushOutput( "IP.Nexus Only: Checking for ability to load Ioncube encoded files...", $hasIoncube, "Not able to run the Ioncube encoded files for IP.Nexus." );
+
+flushOutput( "IP.Nexus Only: Can run IP.Nexus...", $hasZend or $hasIoncube, "Not able to run either Ioncube or Zend Encoded IP.Nexus files. You can still use IP.Board, IP.Downloads. IP.Blog, IP.Gallery, IP.Content, IP.Chat" );
 
 //-----------------------------------------
 // Memory limit
@@ -126,16 +135,16 @@ if( $_memLimit )
 	
 	if( $_intLimit >= $_intRec )
 	{
-		flushOutput( "Проверка выделения памяти ({$_recLimit}M или больше рекомендуется)...", true, "Ваш сервер ограничивает объем выделяемой памяти(memory_limit): {$_memLimit}" );
+		flushOutput( "Checking memory limit ({$_recLimit}M or better recommended)...", true, "Your memory limit: {$_memLimit}" );
 	}
 	else
 	{
-		flushOutput( "Проверка выделения памяти ({$_recLimit}M или больше рекомендуется)...", 2, "Ваш сервер ограничивает объем выделяемой памяти(memory_limit): {$_memLimit}. Вы можете использовать IP.Board, но свяжитесь с вашим хостинг-провайдером и попросите его увеличить memory_limit до {$_recLimit}M, чтобы избежать ошибок в будущем. Возможно прекращение работы скриптов при обработке больших объемов данных" );
+		flushOutput( "Checking memory limit ({$_recLimit}M or better recommended)...", 2, "Your memory limit: {$_memLimit}. You can still proceed but we recommend you contact your host and request the memory limit be raised to {$_recLimit}M to prevent possible issues." );
 	}
 }
 else
 {
-	flushOutput( "Проверка выделения памяти ({$_recLimit}M или больше рекомендуется)...", 2, "Не удалось получить значение переменной memory_limit" );
+	flushOutput( "Checking memory limit ({$_recLimit}M or better recommended)...", 2, "Could not determine your memory limit" );
 }
 
 //-----------------------------------------
@@ -143,21 +152,21 @@ else
 //-----------------------------------------
 
 $splExists	= in_array( 'SPL', $extensions );
-flushOutput( "Проверка SPL...", $splExists, "IP.Board " . IPB_VERSION . "  требуется расширение PHP SPL. Пожалуйста, свяжитесь с вашим хостинг-провайдером для установки <a href='http://www.php.net/manual/ru/spl.setup.php'>библиотеки SPL</a>." );
+flushOutput( "Checking for SPL...", $splExists, "The PHP SPL extension is required for IP.Board " . IPB_VERSION . ".  Please ask your host to install the <a href='http://www.php.net/manual/en/spl.setup.php'>SPL library</a>." );
 
 //-----------------------------------------
 // Checking for DOM XML
 //-----------------------------------------
 
 $domXML	= in_array( 'dom', $extensions );
-flushOutput( "Проверка обработки DOM XML...", $domXML, "IP.Board " . IPB_VERSION . " требуется расширение обработчика DOM XML.  Пожалуйста, свяжитесь с вашим хостинг-провайдером для установки <a href='http://www.php.net/manual/ru/dom.setup.php'>библиотеки libxml2</a>." );
+flushOutput( "Checking for DOM XML Handling...", $domXML, "The DOM XML Handling extension is required for IP.Board " . IPB_VERSION . ".  Please ask your host to install the <a href='http://www.php.net/manual/en/dom.setup.php'>libxml2 library</a>." );
 
 //-----------------------------------------
 // Check for GD2
 //-----------------------------------------
 
 $gd2	= in_array( 'gd', $extensions );
-flushOutput( "Проверка библиотеки GD...", $gd2, "IP.Board " . IPB_VERSION . " требуется библиотека GD2.  Пожалуйста, свяжитесь с вашим хостинг-провайдером для установки <a href='http://us.php.net/manual/ru/image.setup.php'>библиотеки libgd</a>." );
+flushOutput( "Checking for GD library...", $gd2, "The GD2 library is required for IP.Board " . IPB_VERSION . ".  Please ask your host to install the <a href='http://us.php.net/manual/en/image.setup.php'>libgd library</a>." );
 
 if( function_exists( 'gd_info' ) )
 {
@@ -179,7 +188,7 @@ if( function_exists( 'gd_info' ) )
 		}
 	}
 
-	flushOutput( "Проверка GD2...", $fail, "Библиотека GD установлена, но IP.Board " . IPB_VERSION . " требуется библиотека GD версии 2.  Версия переданная вашим сервером '{$gdInfo['GD Version']}'.  Пожалуйста убедитесь, что используете GD версии 2, и обновите <a href='http://us.php.net/manual/ru/image.setup.php'>библиотеку libgd</a> при необходимости." );
+	flushOutput( "Checking for GD2...", $fail, "While the GD library is installed, GD library version 2 is required for IP.Board " . IPB_VERSION . ".  The version reported (if at all) by your server is '{$gdInfo['GD Version']}'.  Please verify you are running GD version 2, and upgrade the <a href='http://us.php.net/manual/en/image.setup.php'>libgd library</a> if necessary." );
 }
 
 //-----------------------------------------
@@ -188,11 +197,11 @@ if( function_exists( 'gd_info' ) )
 
 $mysql	= in_array( 'mysql', $extensions );
 $mysqli	= in_array( 'mysqli', $extensions );
-flushOutput( "Проверка mysql...", ( $mysql OR $mysqli ), "Ваш сервер не имеет библиотеки mysql, попросите хостера установить поддержку <a href='http://us.php.net/manual/ru/mysqli.setup.php'>mysqli</a>." );
+flushOutput( "Checking for mysql support...", ( $mysql OR $mysqli ), "Your server does not appear to have a mysql library available, please ask your host to install the <a href='http://us.php.net/manual/en/mysqli.setup.php'>mysqli extension</a>." );
 
 if( $mysql AND !$mysqli )
 {
-	flushOutput( "Проверка поддержки mysqli...", false, "Расширение mysqli рекомендуется вместо стандартного интерфейса mysql.  Форум может обойтись и без него, но, если возможно, установите <a href='http://us.php.net/manual/ru/mysqli.setup.php'>его</a> для улучшения скорости и безопасности работы." );
+	flushOutput( "Checking for mysqli support...", false, "The mysqli extension is preferred over the original mysql extension.  This is not a requirement, but if possible we recommend you to install the <a href='http://us.php.net/manual/en/mysqli.setup.php'>mysqli extension</a> for better performance." );
 }
 
 
@@ -201,14 +210,14 @@ if( $mysql AND !$mysqli )
 //-----------------------------------------
 
 $json	= in_array( 'json', $extensions );
-flushOutput( "Проверка JSON...", $json, "Расширение PHP JSON необходимо для функционирования форума. Узнайте как установить <a href='http://us.php.net/manual/ru/json.setup.php'>расширение json</a>." );
+flushOutput( "Checking for JSON...", $json, "While not required, the PHP JSON extension is recommended.  The JSON extensions provides for improved efficiency in handling some functionality in IP.Board.  If possible, we recommend you to install the <a href='http://us.php.net/manual/en/json.setup.php'>json extension</a>." );
 
 //-----------------------------------------
 // Checking for openSSL
 //-----------------------------------------
 
 $openssl	= in_array( 'openssl', $extensions ) ? true : 2;
-flushOutput( "Проверка openSSL...", $openssl, "OpenSSL необходим для модулей связи с Facebook, Twitter, и модуля Subscription Manager.  Если вы не используете ни один из этих модулей, то можно обойтись без этого расширения, иначе вам необходимо установить<a href='http://us2.php.net/manual/ru/openssl.installation.php'> расширение openssl</a>." );
+flushOutput( "Checking for openSSL...", $openssl, "OpenSSL is required for some Facebook, Twitter, and Subscription Manager functionality.  If you do not use any of these modules, you do not need this module, otherwise we recommend you to install the <a href='http://us2.php.net/manual/en/openssl.installation.php'>openssl extension</a>." );
 
 //-----------------------------------------
 // Suhosin
@@ -238,12 +247,6 @@ if( extension_loaded( 'suhosin' ) )
 	flushOutput( "suhosin.request.max_varname_length (350 or better recommended)...", $_indRMVL, "Your value: {$_reqMaxVar}. Can prevent long friendly URLs from loading correctly." );
 }
 
-$testtext="тестовый текст в кодировке utf-8";
-$pcre=($testtext == preg_replace( '/(^|\W)дир(\W|$)/iu', "\\1замена\\2", $testtext ))?true:false;
-flushOutput( "Проверка расширения PCRE на правильную работу со строками в формате UTF-8...", $pcre, "Библиотека PCRE неправильно обрабатывает регулярные выражения в кодировке UTF-8, обратитесь к хостинг-провайдеру для исправления этой ошибки. Неправильная работа этой функции может привести к ошикам при работе с русскими именами пользователей, ошибкам фильтра нецензурных слов и т.д." );
-
-
-flushOutput( 'Проверка функции filter_var()...', function_exists ( 'filter_var' ), 'Функция отсутствует, это может привести к фатальным ошибкам php и остановке выполнения скриптов' );
 //-----------------------------------------
 // Flush output function
 //-----------------------------------------
@@ -254,27 +257,27 @@ function flushOutput( $checking, $result, $errorText )
 	
 	if( $result === 2 )
 	{
-		print "<span class='warn'>ВНИМАНИЕ</span><br /><span class='what-you-should-do'>{$errorText}</span>";
+		print "<span class='warn'>WARNING</span><br /><span class='what-you-should-do'>{$errorText}</span>";
 	}
 	else if( !$result )
 	{
-		print "<span class='fail'>ОШИБКА</span><br /><span class='what-you-should-do'>{$errorText}</span>";
+		print "<span class='fail'>FAIL</span><br /><span class='what-you-should-do'>{$errorText}</span>";
 	}
 	else
 	{
-		print "<span class='pass'>ОК</span>";
+		print "<span class='pass'>Pass</span>";
 	}
 	
 	print "</p>";
 	
 	flush();
-	@ob_flush();
+	ob_flush();
 	
 	return true;
 }
 
 ?>
 
-	<p class='final'>Имейте в виду, что MySQL версии 4.1 или выше (MySQL 5.0 рекомендуется) необходим IP.Board <?php print IPB_VERSION; ?>.  Попросите администратора вашего сервера проверить версию MySQL если не уверены.</p>
+	<p class='final'>Please also remember that MySQL 4.1 or higher (MySQL 5.0 or higher preferred) is required for IP.Board <?php print IPB_VERSION; ?>.  Ask your server administrator to check the version of MySQL on your server if you are unsure.</p>
 </body>
 </html>

Tools/groupBitwiseEdit_php.php

@@ -2,7 +2,7 @@
 
 /*
 +---------------------------------------------------------------------------
-|   IP.Board v3.4.5
+|   IP.Board v3.4.6
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2008 Invision Power Services

Tools/readme.txt

@@ -0,0 +1,56 @@
+
+===============================================================
+
+Ñêà÷àíî ñ ñàéòà www.Skripter.info
+
+===============================================================
+
+Ó íàñ íà ñàéòå Âû íàéäåòå:
+
+Datalife Engine
+Wordpress
+Joomla
+phpBB
+IPB
+vBulletin
+Èãðîâûå CMS  .....è ò.ä.
+
+Âñå îò ìîäóëåé è øàáëîíîâ äî óðîêîâ ïî èíòåðåñóþùèì âàñ âîïðîñàì.
+
+----------------------------------------------------------------
+
+Äîáðî ïîæàëîâàòü íà íàø ñàéò !!!
+
+----------------------------------------------------------------
+
+Àäìèíèñòðàöèÿ ñàéòà  Skripter.info
+
+==============================================
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+===============================================================
+
+Download from www.Skripter.info
+
+===============================================================
+
+At our site you will find:
+
+Datalife Engine
+Wordpress
+Joomla
+phpBB
+IPB
+vBulletin
+Gaming CMS ..... etc.
+
+All of the modules and templates to lessons on your questions.
+
+----------------------------------------------------------------
+
+Welcome to our site!
+
+----------------------------------------------------------------
+
+The website administration Skripter.info
+
+==============================================

Tools/rebuildFromXml.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Rebuilds stuff from XML
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

Tools/rebuildGallery4.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Main public executable wrapper.
  * Set-up and load module to run
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $

Tools/rebuildGalleryImages.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Main public executable wrapper.
  * Set-up and load module to run
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $

Tools/rebuildPms.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Main public executable wrapper.
  * Set-up and load module to run
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $

Tools/rebuildPosts.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Main public executable wrapper.
  * Set-up and load module to run
  * Last Updated: $Date: 2013-02-05 06:22:45 -0500 (Tue, 05 Feb 2013) $

Tools/seoFiles.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Main public executable wrapper.
  * Set-up and load module to run
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $

Tools/seoGalleryAlbums.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Main public executable wrapper.
  * Set-up and load module to run
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $

Tools/seoMemberNames.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Main public executable wrapper.
  * Set-up and load module to run
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $

Tools/seoTopicTitles.php

@@ -4,7 +4,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Main public executable wrapper.
  * Set-up and load module to run
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $

Tools/skinchange.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Simple skin change script
  * Place in your site root directory to send a user to a specified skin
  * Last Updated: $Date: 2012-05-16 10:43:54 -0400 (Wed, 16 May 2012) $

Tools/ssi_templates/index.html

@@ -1 +1 @@
-<html>␍<head><title>Invision Power Board - Bulletin Board System</title></head>␍<body>␍<h1>403: Invision Power Board -&gt; Forbidden</h1>␍<hr>␍You have reached this Page in error, please use␍your back button to return to Invision Board.␍<hr>␍<a href="http://www.invisionpower.com">Invision Power Board</a>␍</body>␍</html>␍
+<html>␍<head><title>Invision Power Board - Bulletin Board System</title></head>␍<body>␍<h1>403: Invision Power Board -&gt; Forbidden</h1>␍<hr>␍You have reached this Page in error, please use␍your back button to return to Invision Board.␍<hr>␍Invision Power Board␍</body>␍</html>␍

Tools/upgradeFinish/index.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Installer: Upgrader core file
  * Last Updated: $LastChangedDate: 2013-01-29 14:15:42 -0500 (Tue, 29 Jan 2013) $
  * </pre>

upload/admin/api/api_core.php

@@ -7,7 +7,7 @@
  * $Author: ips_terabyte $
  * @since		-
  * $LastChangedDate: 2011-03-18 17:34:15 -0400 (Fri, 18 Mar 2011) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 8129 $
  */
 

upload/admin/api/forums/api_topic_view.php

@@ -7,7 +7,7 @@
  * $Author: AndyMillne $
  * @since		2.2.0
  * $LastChangedDate: 2013-03-21 17:38:09 -0400 (Thu, 21 Mar 2013) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 12109 $
  */
 

upload/admin/api/forums/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/api/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/extensions/admin/group_form.php

@@ -7,7 +7,7 @@
  * $Author: bfarber $
  * @since		-
  * $LastChangedDate: 2011-07-20 20:19:22 -0400 (Wed, 20 Jul 2011) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 9296 $
  */
 

upload/admin/applications/core/extensions/admin/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/extensions/admin/member_form.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Member property updater (AJAX)
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/extensions/comments/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/extensions/coreExtensions.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Core Sessions
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
@@ -28,7 +28,7 @@ if ( ! defined( 'IN_IPB' ) )
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Item Marking
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/extensions/coreVariables.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Core registered caches, redirect resets and bitwise settings
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/extensions/dashboardNotifications.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Dashboard Notifications
  * Last Updated: $Date
  *
@@ -51,94 +51,6 @@ class dashboardNotifications__core
 		/* INIT */
 		$entries = array();
 		
-		if( ! $this->settings['ipb_reg_number'] )
-		{
-			$entries[] = array( $this->lang->words['lc_title_nokey'], sprintf( $this->lang->words['lc_msg_nokey'], "{$this->settings['base_url']}module=tools&amp;section=licensekey" ) );
-		}
-		else
-		{
-			/* Is the Spam Service Working? */
-			if ( $this->settings['spam_service_enabled'] )
-			{
-				$GOT_SPAM_ERROR = false;
-				
-				/* Are we entitled to it? */
-				$licenseData = $this->cache->getCache( 'licenseData' );
-				
-				if ( is_array( $licenseData['ipbMain'] ) && count( $licenseData['ipbMain'] ) )
-				{
-					foreach ( $licenseData['ipbMain'] as $data )
-					{
-						if ( $data['name'] == 'Spam Monitoring Service' && $data['status'] != 'Ok' )
-						{
-							$disableLink = $this->settings['base_url'] . "app=core&amp;module=settings&amp;section=settings&amp;do=findsetting&amp;key=spamservice";
-							
-							if ( is_numeric( $data['_expires'] ) && time() > $data['_expires'] )
-							{
-								$entries[] = array( $this->lang->words['spam_service_error'], sprintf( $this->lang->words['spam_service_expired'], $disableLink ) );
-							}
-							else
-							{
-								$entries[] = array( $this->lang->words['spam_service_error'], sprintf( $this->lang->words['spam_service_unavailable'], $disableLink ) );
-							}
-							
-							$GOT_SPAM_ERROR = true;
-							
-							break;
-						}
-					}
-				}
-				
-				if ( ! $GOT_SPAM_ERROR )
-				{
-					/* Get last 5 logs, and if all 5 are errors, show message */
-					$_errors	= 0;
-					$_entries	= 0;
-					$_lastError	= '';
-					
-					$this->DB->build( array( 'select' => 'log_code, log_msg', 'from' => 'spam_service_log', 'order' => 'id DESC', 'limit' => 5 ) );
-					$this->DB->execute();
-					
-					while( $_r = $this->DB->fetch() )
-					{
-						$_entries++;
-						
-						if( $_r['log_code'] === '0' )
-						{
-							$_errors++;
-							
-							if( !$_lastError )
-							{
-								$_lastError	= $_r['log_msg'];
-							}
-						}
-					}
-					
-					if( $_entries > 0 && $_errors == $_entries )
-					{
-						$entries[] = array( $this->lang->words['spam_service_error'], sprintf( $this->lang->words['spam_service_error_msg'], $_lastError ) );
-					}
-				}
-			}
-			/* If it's disabled, are we entitiled to it? */
-			else
-			{
-				$licenseData = $this->cache->getCache( 'licenseData' );
-				
-				if ( is_array( $licenseData['ipbMain'] ) && count( $licenseData['ipbMain'] ) )
-				{
-					foreach ( $licenseData['ipbMain'] as $data )
-					{
-						if ( $data['name'] == 'Spam Monitoring Service' && $data['status'] == 'Ok' )
-						{
-							$entries[] = array( $this->lang->words['spam_service_disabled'], $this->lang->words['spam_service_disabled_msg'] );
-							break;
-						}
-					}
-				}
-			}
-		}
-		
 		/* FURL cache OOD? */
 		if ( is_file( FURL_CACHE_PATH ) )
 		{
@@ -147,19 +59,9 @@ class dashboardNotifications__core
 			/* Check mtimes on extensions.. */
 			foreach( ipsRegistry::$applications as $app_dir => $application )
 			{
-				$furltemplatesfile = IPSLib::getAppDir( $app_dir );
+				if ( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/furlTemplates.php' ) )
-				if(IPB_USE_ONLY_ID_FURL && is_file( $furltemplatesfile.'/extensions/furlTemplatesID.php'))
 				{
-					$furltemplatesfile.='/extensions/furlTemplatesID.php';
+					$_mtime = intval( @filemtime( IPSLib::getAppDir( $app_dir ) . '/extensions/furlTemplates.php' ) );
-				}
-				else
-				{
-					$furltemplatesfile.='/extensions/furlTemplates.php';
-				}
-			
-				if ( is_file( $furltemplatesfile ) )
-				{
-					$_mtime = intval( @filemtime( $furltemplatesfile ) );
 
 					if ( $_mtime > $mtime )
 					{

upload/admin/applications/core/extensions/editorSections.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * BBCode Management : Determines if bbcode can be used in this section
  * Last Updated: $LastChangedDate: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/extensions/enhancements/facebook.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		24 July 2012
  * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 10952 $
  */
 
@@ -33,6 +33,6 @@ class enhancements_core_facebook
 		$this->title = $registry->getClass('class_localization')->words['enhancements_facebook'];
 		$this->description = $registry->getClass('class_localization')->words['enhancements_facebook_desc'];
 		$this->enabled = ipsRegistry::$settings['fbc_enable'];
-		$this->message = '<a href="http://external.ipslink.com/ipboard30/landing/?p=facebook" target="_blank">' . ipsRegistry::getClass('class_localization')->words['enhancements_facebook_help'] . '</a>';
+		$this->message = '<a href="http://anonym.to/?http://external.ipslink.com/ipboard30/landing/?p=facebook" target="_blank">' . ipsRegistry::getClass('class_localization')->words['enhancements_facebook_help'] . '</a>';
 	}
 }

upload/admin/applications/core/extensions/enhancements/googleanalytics.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		24 July 2012
  * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 10952 $
  */
 

upload/admin/applications/core/extensions/enhancements/ipsbackup.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		24 July 2012
  * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 10952 $
  */
 

upload/admin/applications/core/extensions/enhancements/ipscdn.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		24 July 2012
  * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 10952 $
  */
 
@@ -90,9 +90,9 @@ class enhancements_core_ipscdn
 			ipsRegistry::getClass('output')->showError( sprintf( ipsRegistry::getClass('class_localization')->words['enhancements_ipscdn_error_nokey'], ipsRegistry::getClass('output')->buildUrl('app=core&module=tools&section=licensekey', 'admin') ) );
 		}
 				
-		$classToLoad	= IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+		/* $classToLoad	= IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
 		$file			= new $classToLoad();
-		$return         = NULL;
+		$ping			= $file->getFileContents( "http://license.invisionpower.com/?a=cdn&key=" . ipsRegistry::$settings['ipb_reg_number'] ); */
 		
 		if ( $json = @json_decode( $ping, TRUE ) )
 		{

upload/admin/applications/core/extensions/enhancements/twitter.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		24 July 2012
  * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 10952 $
  */
 
@@ -33,6 +33,6 @@ class enhancements_core_twitter
 		$this->title = $registry->getClass('class_localization')->words['enhancements_twitter'];
 		$this->description = $registry->getClass('class_localization')->words['enhancements_twitter_desc'];
 		$this->enabled = ipsRegistry::$settings['tc_enabled'];
-		$this->message = '<a href="http://external.ipslink.com/ipboard30/landing/?p=twitter" target="_blank">' . ipsRegistry::getClass('class_localization')->words['enhancements_twitter_help'] . '</a>';
+		$this->message = '<a href="http://anonym.to/?http://external.ipslink.com/ipboard30/landing/?p=twitter" target="_blank">' . ipsRegistry::getClass('class_localization')->words['enhancements_twitter_help'] . '</a>';
 	}
 }

upload/admin/applications/core/extensions/enhancements/viglink.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		24 July 2012
  * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 10952 $
  */
 
@@ -99,9 +99,9 @@ class enhancements_core_viglink
 			}
 		}
 			
-		require_once IPS_KERNEL_PATH . 'classFileManagement.php';
+		/* require_once IPS_KERNEL_PATH . 'classFileManagement.php';
 		$cfm = new classFileManagement();
-		$return = NULL;
+		$return = $cfm->getFileContents( "http://license.invisionpower.com/viglink/?subId=" . urlencode( $subId ) ); */
 		if ( $return and $json = @json_decode( $return, TRUE ) and $json['SUCCESS'] == TRUE )
 		{	
 			return $json;

upload/admin/applications/core/extensions/enhancements/windowslive.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		24 July 2012
  * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 10952 $
  */
 

upload/admin/applications/core/extensions/furlTemplates.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Sets up SEO templates
  * Last Updated: $Date: 2013-03-12 09:54:04 -0400 (Tue, 12 Mar 2013) $
  * </pre>
@@ -52,18 +52,6 @@ $_SEOTEMPLATES = array(
 						     'in'            => array( 'regex'   => "#/register(/|$|\?)#i",
 							 'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'register' ) ) ) ),
 
-'section=lostpass' => array( 'app'		     => 'core',
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=lostpass(&amp;|&|$)#i', 'lostpass/$3' ),
-						     'in'            => array( 'regex'   => "#/lostpass(/|$|\?)#i",
-							 'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'lostpass' ) ) ) ),
-
-'section=login' => array( 'app'		     => 'core',
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=login(&amp;|&|$)#i', 'login/$3' ),
-						     'in'            => array( 'regex'   => "#/login(/|$|\?)#i",
-							 'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'login' ) ) ) ),
-
 'tags'			   => array( 'app'		     => 'core',
 							 'isPagesMode'   => true,
 							 'allowRedirect' => 0,
@@ -96,7 +84,7 @@ $_SEOTEMPLATES = array(
 'section=rss2'     => array( 'app'		     => 'core',
 							 'allowRedirect' => 0,
 							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=rss(&amp;|&)type=(\w+?)(&amp;|&)id=(\w+?)$#i', 'rss/$4/$6-#{__title__}/' ),
-						     'in'            => array( 'regex'   => "#/rss/(\w+?)/(\w+?)(?:-|/|$)#i",
+						     'in'            => array( 'regex'   => "#/rss/(\w+?)/(\w+?)-#i",
 											           'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'rss' ), array( 'type', '$1' ), array( 'id', '$2' ) ) ) ),
 
 # Changed section=rss2 id matching to use \w for more flexibility

upload/admin/applications/core/extensions/furlTemplatesID.php

@@ -1,106 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.4.5
- * Sets up SEO templates
- * Last Updated: $Date: 2013-03-12 09:54:04 -0400 (Tue, 12 Mar 2013) $
- * </pre>
- *
- * @author 		$Author: mmecham $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/company/standards.php#license
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		20th February 2002
- * @version		$Rev: 12072 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
- * SEO templates
- *
- * 'allowRedirect' is a flag to tell IP.Board whether to check the incoming link and if not formatted correctly, redirect the correct one
- *
- * OUT FORMAT REGEX:
- * First array element is a regex to run to see if we've a match for the URL
- * The second array element is the template to use the results of the parenthesis capture
- *
- * Special variable #{__title__} is replaced with the $title data passed to output->formatUrl( $url, $title)
- *
- * IMPORTANT: Remember that when these regex are used, the output has not been fully parsed so you will get:
- * showuser={$data['member_id']} NOT showuser=1 so do not try and match numerics only!
- *
- * IN FORMAT REGEX
- *
- * This allows the registry to piece back together a URL based on the template regex
- * So, for example: "/user/(\d+?)/", 'matches' => array(  array( 'showuser' => '$1' ) )tells IP.Board to populate 'showuser' with the result
- * of the parenthesis capture #1
- */
-$_SEOTEMPLATES = array(
-	
-'section=register' => array( 'app'		     => 'core',
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=register(&amp;|&|$)#i', 'register/$3' ),
-						     'in'            => array( 'regex'   => "#/register(/|$|\?)#i",
-							 'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'register' ) ) ) ),
-							 
-'section=lostpass' => array( 'app'		     => 'core',
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=lostpass(&amp;|&|$)#i', 'lostpass/$3' ),
-						     'in'            => array( 'regex'   => "#/lostpass(/|$|\?)#i",
-							 'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'lostpass' ) ) ) ),
-
-'section=login' => array( 'app'		     => 'core',
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=login(&amp;|&|$)#i', 'login/$3' ),
-						     'in'            => array( 'regex'   => "#/login(/|$|\?)#i",
-							 'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'login' ) ) ) ),
-
-'tags'			   => array( 'app'		     => 'core',
-							 'isPagesMode'   => true,
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=search(&amp;|&)do=search(&amp;|&)search_tags=(\S+?)(&amp;|&)search_app=(\S+?)(&amp;|&|$)#i', 'tags/$6/$4/$7' ),
-						     'in'            => array( 'regex'   => "#/tags/(\S+?)/(\S+?)/#i",
-											           'matches' => array( array( 'app', 'core' ), array( 'module', 'search' ), array( 'do', 'search' ), array( 'search_tags', '$2' ), array( 'search_app', '$1' ) ) ) ),
-
-'privacy'		   => array( 'app'		     => 'core',
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=privacy(&amp;|&|$)#i', 'privacypolicy/$4/' ),
-						     'in'            => array( 'regex'   => "#/privacypolicy/#i",
-											           'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'privacy' ) ) ) ),
-
-'likeunsubscribe'  => array( 'app'		     => 'core',
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=like(&amp;|&)do=unsubscribe(&amp;|&)key=(\S+?)(&amp;|&|$)#i', 'unsubscribe/$5/' ),
-						     'in'            => array( 'regex'   => "#/unsubscribe/(\S+?)/$#i",
-											           'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'like' ), array( 'do', 'unsubscribe' ), array( 'key', '$1' ) ) ) ),
-'findcomment'  	   => array( 'app'		     => 'core',
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=comments(&amp;|&)do=findComment(&amp;|&)fromApp=(\S+?)(&amp;|&)parentId=(\d+?)(&amp;|&)commentId=(\d+?)(&amp;|&|$)#i', 'findComment/$5/$7-$9' ),
-						     'in'            => array( 'regex'   => "#/findComment/(\S+?-\S+?)/(\d+?)-(\d+?)$#i",
-											           'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'comments' ), array( 'do', 'findComment' ), array( 'fromApp', '$1' ), array( 'parentId', '$2' ), array( 'commentId', '$3' ) ) ) ),											
-'section=rss'      => array( 'app'		     => 'core',
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=rss(&amp;|&)type=(\w+?)$#i', 'rss/$4/' ),
-						     'in'            => array( 'regex'   => "#/rss/(\w+?)/$#i",
-											           'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'rss' ), array( 'type', '$1' ) ) ) ),
-											
-'section=rss2'     => array( 'app'		     => 'core',
-							 'allowRedirect' => 0,
-							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=rss(&amp;|&)type=(\w+?)(&amp;|&)id=(\w+?)$#i', 'rss/$4/$6/' ),
-						     'in'            => array( 'regex'   => "#/rss/(\w+?)/(\w+?)(?:-|/|$)#i",
-											           'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'rss' ), array( 'type', '$1' ), array( 'id', '$2' ) ) ) ),
-
-
-# Changed section=rss2 id matching to use \w for more flexibility
-
-);
-	

upload/admin/applications/core/extensions/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/extensions/like/default.php

@@ -6,7 +6,7 @@
  * $License: http://www.invisionpower.com/company/standards.php#license$
  * $Author: mark $
  * $LastChangedDate: 2011-12-08 16:43:34 +0000 (Thu, 08 Dec 2011) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 9971 $
  */
 

upload/admin/applications/core/extensions/navigation/generate.php

@@ -6,9 +6,9 @@
  * $License: http://www.invisionpower.com/company/standards.php#license$
  * $Author: AndyMillne $
  * @since		3/8/2011
- * $LastChangedDate: 2013-03-12 15:04:05 -0400 (Tue, 12 Mar 2013) $
+ * $LastChangedDate: 2013-10-14 15:30:19 -0400 (Mon, 14 Oct 2013) $
- * @version		v3.4.5
+ * @version		v3.4.6
- * $Revision: 12074 $
+ * $Revision: 12376 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -93,7 +93,11 @@ class navigation_core
 		}
 		
 		$links[] = array( 'title' => $this->lang->words['registered_users_link'], 'url' => $this->registry->output->buildSEOUrl( 'app=members&module=list', 'public', 'false', 'members_list' ) );
-		$links[] = array( 'title' => $this->lang->words['status_updates_link']  , 'url' => $this->registry->output->buildSEOUrl( 'app=members&module=profile&section=status', 'public', 'false', 'members_status_all' ) );
+		
+		if( $this->settings['su_enabled'] )
+		{
+			$links[] = array( 'title' => $this->lang->words['status_updates_link']  , 'url' => $this->registry->output->buildSEOUrl( 'app=members&module=profile&section=status', 'public', 'false', 'members_status_all' ) );
+		}
 		
 		/* Add to blocks */
 		$blocks[] = array( 'title' => '', 'links' => $links );

upload/admin/applications/core/extensions/navigation/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com/">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/extensions/notifications.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Define the core notification types
  * Last Updated: $Date: 2013-05-21 20:51:17 -0400 (Tue, 21 May 2013) $
  * </pre>

upload/admin/applications/core/extensions/reportPlugins/default.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Report Center :: Default plugin
  * Last Updated: $LastChangedDate: 2012-12-10 11:06:25 -0500 (Mon, 10 Dec 2012) $
  * </pre>

upload/admin/applications/core/extensions/reportPlugins/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/extensions/rssOutput.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * RSS output plugin :: report center
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/extensions/search/config.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Config file
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/extensions/search/engines/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/extensions/search/engines/sql.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Basic Forum Search
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/extensions/search/form.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Returns HTML for the form (optional class, not required)
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/extensions/search/format.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Formats forum search results
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/extensions/search/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/extensions/sharedmedia/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/extensions/sharedmedia/plugin_attachments.php

@@ -6,7 +6,7 @@
  * $Author: mmecham $
  * @since		3/8/2011
  * $LastChangedDate: 2013-04-03 08:07:11 -0400 (Wed, 03 Apr 2013) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 12145 $
  */
 

upload/admin/applications/core/extensions/sitemapPlugins/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/extensions/sphinxTemplate.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Sphinx template file
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
@@ -74,7 +74,7 @@ index <!--SPHINX_CONF_PREFIX-->core_tags_search_main
 	mlock			= 0
 	morphology		= none
 	min_word_len	= 2
-	charset_type    = utf-8
+	charset_type	= sbcs
 	html_strip		= 0
 	#infix_fields    = tag_text
 	#min_infix_len   = 3

upload/admin/applications/core/extensions/usercpForms.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Core user control panel plugin
- * Last Updated: $Date: 2013-05-02 17:05:35 -0400 (Thu, 02 May 2013) $
+ * Last Updated: $Date: 2013-10-24 08:12:23 -0400 (Thu, 24 Oct 2013) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: AndyMillne $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/company/standards.php#license
  * @package		IP.Board
  * @subpackage	Core
  * @link		http://www.invisionpower.com
  * @since		20th February 2002
- * @version		$Rev: 12216 $
+ * @version		$Rev: 12391 $
  *
  */
 
@@ -34,7 +34,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 	 *
 	 * @var		string
 	 */
-	public $tab_name = "Настройки";
+	public $tab_name = "Settings";
 
 	/**
 	 * Default area code
@@ -189,15 +189,6 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 							 );
 		}
 		
-		if ( IPSLib::vkontakte_enabled() === TRUE )
-		{
-			$array[] = array( 'url'    => 'area=vkontakte',
-							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_vkontakte'],
-							  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'vkontakte' ? 1 : 0,
-							  'area'   => 'vkontakte'
-							 );
-		}
-		
 		if ( $this->memberData['g_attach_max'] != -1 )
 		{
 			$array[] = array(
@@ -265,9 +256,6 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 			case 'facebookRemove':
 				$html = $this->customEvent_facebookRemove();
 			break;
-			case 'vkontakteRemove':
-				$html = $this->customEvent_vkontakteRemove();
-			break;
 			case 'twitterRemove':
 				$html = $this->customEvent_twitterRemove();
 			break;
@@ -623,39 +611,6 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&module=global&section=login&do=logout&k=" . $this->member->form_hash );
 	}
 	
-	/**
-	 * Custom Event: Remove vk link
-	 *
-	 * @return	@e void  
-	 */
-	public function customEvent_vkontakteRemove()
-	{
-		//-----------------------------------------
-		// Check secure hash...
-		//-----------------------------------------
-		
-		if ( $this->request['secure_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
-		}
-		
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php', 'vkontakte_connect' );
-		$vkontakte    = new $classToLoad( $this->registry );
-			
-		//-----------------------------------------
-		// Okay...
-		//-----------------------------------------
-		
-		if ( $this->memberData['vk_uid'] )
-		{
-			/* Remove the link */
-			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'vk_uid' => 0, 'vk_token' => '' ) ) );
-		}
-		
-		/* Log the user out */
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&module=global&section=login&do=logout&k=" . $this->member->form_hash );
-	}
-	
 	/**
 	 * Custom Event: Create facebook link
 	 *
@@ -897,9 +852,6 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 			case 'twitter':
 				return $this->formTwitter();
 			break;
-			case 'vkontakte':
-				return $this->formVkontakte();
-			break;
 			case 'customize':
 				return $this->formCustomize();
 			break;
@@ -963,64 +915,6 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		return $this->registry->getClass('output')->getTemplate('ucp')->membersProfileCustomize( $options, $input, $inlineMsg );
 	}
 	
-	/**
-	 * Show the vkontakte form
-	 *
-	 * @author	Matt Mecham
-	 * @param	string		Any inline message to show
-	 * @return	string		Processed HTML
-	 */
-	public function formVkontakte( $inlineMsg='' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		if( !IPSLib::vkontakte_enabled() )
-		{		
-			$this->registry->getClass('output')->showError( 'twitter_disabled', 1005.1 );
-		}
-		
-		//-----------------------------------------
-		// Twitter user logged in?
-		//-----------------------------------------
-		
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php', 'vkontakte_connect' );
-		$vkontakte	 = new $classToLoad( $this->registry, $this->memberData['vk_token'], $this->memberData['vk_uid'] );
-		
-		//-----------------------------------------
-		// Thaw bitfield options
-		//-----------------------------------------
-		
-		$bwOptions = IPSBWOptions::thaw( $this->memberData['vk_bwoptions'], 'vkontakte' );
-		
-		//-----------------------------------------
-		// Merge..
-		//-----------------------------------------
-		
-		if ( is_array( $bwOptions ) )
-		{
-			foreach( $bwOptions as $k => $v )
-			{
-				$this->memberData[ $k ] = $v;
-			}
-		}
-		
-		$this->hide_form_and_save_button = 1;
-
-		$userData = $vkontakte->fetchUserData();
-		
-		if ( isset( $userData['status']['text'] ) )
-		{	
-			if ( IPS_DOC_CHAR_SET != 'UTF-8' )
-			{
-				$userData['status']['text'] = IPSText::utf8ToEntities( $userData['status']['text'] );
-			}
-		}
-		
-		return $this->registry->getClass('output')->getTemplate('vkontakte')->membersVkontakteConnect( $this->memberData['vk_uid'], $userData );
-	}
-	
 	/**
 	 * Show the twitter form
 	 *
@@ -2416,7 +2310,8 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		{
 			$this->lang->loadLanguageFile( array( 'public_post' ), 'forums' );
 				
-			$_error	= array_pop( $parser->getErrors() );
+			$_errors = $parser->getErrors();
+			$_error	= array_pop( $_errors );
 			$this->registry->getClass('output')->showError( $_error, 10210 );
 		}
 		
@@ -3264,9 +3159,9 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 	
 				IPSText::getTextClass( 'email' )->buildMessage( array(
 													'NAME'         => $this->memberData['members_display_name'],
-													'THE_LINK'     => $this->registry->getClass('output')->buildSEOUrl("app=core&module=global&section=register&do=auto_validate&type=newemail&uid=".$this->memberData['member_id']."&aid=".$validate_key, 'publicNoSession', 'false' ),
+													'THE_LINK'     => $this->settings['base_url']."app=core&module=global&section=register&do=auto_validate&type=newemail&uid=".$this->memberData['member_id']."&aid=".$validate_key,
 													'ID'           => $this->memberData['member_id'],
-													'MAN_LINK'     => $this->registry->getClass('output')->buildSEOUrl("app=core&module=global&section=register&do=07", 'publicNoSession', 'false'),
+													'MAN_LINK'     => $this->settings['base_url']."app=core&module=global&section=register&do=07",
 													'CODE'         => $validate_key,
 												  ) );
 	

upload/admin/applications/core/extensions/warnings.php

@@ -7,7 +7,7 @@
  * $Author: bfarber $ (Original: Mark)
  * @since		-
  * $LastChangedDate: 2013-05-01 17:35:09 -0400 (Wed, 01 May 2013) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 12211 $
  */
 

upload/admin/applications/core/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/js/acp.homepage.js

@@ -20,7 +20,7 @@ ACPHomepage = {
 	{
 		if ( $('members_display_name').value == "" )
 		{
-			alert("Нужно ввести имя пользователя!");
+			alert("You must enter a username!");
 			return false;
 		}
 		

upload/admin/applications/core/js/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/js/ipb3CSS.js

@@ -85,11 +85,11 @@ function IPBCSS()
 								}
 								else
 								{
-									alert( "Похоже у нас проблемы: " + t.responseText );
+									alert( "Ooops. Something went wrong. Does this help?: " + t.responseText );
 								}
 							},
-							onException: function( f,e ){ alert( "Исключение: " + e ); },
+							onException: function( f,e ){ alert( "Exception: " + e ); },
-							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); }
+							onFailure: function( t ){ alert( "Failure: " + t.responseText ); }
 						  } );
 	};
 	
@@ -143,7 +143,7 @@ function IPBCSS()
 								}
 								else
 								{
-									alert( "Похоже у нас проблемы: " + t.responseText );
+									alert( "Ooops. Something went wrong. Does this help?: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },
@@ -159,14 +159,14 @@ function IPBCSS()
 		/* Make sure we're mean it... */
 		if ( $('tplate_cssRow_' + css_id ).hasClassName( 'tplateRow_new')  )
 		{
-			if ( ! confirm( "Удалить CSS файл ?\nФайл будет удален из ВСЕХ стилей!" ) )
+			if ( ! confirm( "REMOVE CSS file?\n This will remove this template bit in ALL skins!" ) )
 			{
 				return false;
 			}
 		}
 		else
 		{
-			if ( ! confirm( "Отменить изменения в CSS файле ?\nВсе изменения будут утеряны!" ) )
+			if ( ! confirm( "Revert CSS file?\n All changes WILL be lost!" ) )
 			{
 				return false;
 			}
@@ -202,7 +202,7 @@ function IPBCSS()
 								}
 								else
 								{
-									alert( "Похоже у нас проблемы: " + t.responseText );
+									alert( "Ooops. Something went wrong. Does this help?: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },
@@ -239,7 +239,7 @@ function IPBCSS()
 								}
 								else
 								{
-									alert( "Похоже у нас проблемы: " + t.responseText );
+									alert( "Ooops. Something went wrong. Does this help?: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },

upload/admin/applications/core/js/ipb3TemplateDiff.js

@@ -217,14 +217,14 @@ function IPBTemplateDiff()
 	*/
 	this.timeOutAjax = function( t )
 	{
-		if ( confirm( "Нет ответа от сервера.\nХотите подождать?" ) )
+		if ( confirm( "No response from the webserver.\nDo you wish to continue waiting?" ) )
 		{
 			return true;
 		}
 		else
 		{
 			t.transport.abort();
-			alert( "Запрос отменен" );
+			alert( "Request Cancelled" );
 		}
 	};
 	
@@ -265,7 +265,7 @@ function IPBTemplateDiff()
 		
 		if ( json['error'] )
 		{
-			alert( "Ошибка: " . json['error'] );
+			alert( "An error occurred: " . json['error'] );
 			return false;
 		}
 		

upload/admin/applications/core/js/ipb3TemplateSandR.js

@@ -166,7 +166,7 @@ function IPBTemplateSandR()
 										else
 										{
 											$('replaceButton').disabled = false;
-											$('replaceButton').value = "Заменить выбранные";
+											$('replaceButton').value = "Replace Selected";
 										}
 									}
 								}

upload/admin/applications/core/js/ipb3Templates.js

@@ -103,7 +103,7 @@ function IPBTemplates()
 								}
 								else
 								{
-									alert( "Ошибка: " + t.responseText );
+									alert( "Ooops. Something went wrong. Does this help?: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },
@@ -169,7 +169,7 @@ function IPBTemplates()
 								}
 								else
 								{
-									alert( "Ошибка: " + t.responseText );
+									alert( "Ooops. Something went wrong. Does this help?: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },
@@ -222,7 +222,7 @@ function IPBTemplates()
 										if ( json['errors'] )
 										{
 											/* Something inline would be very nice here.. rather than this ugly alert */
-											alert("Ошибка: " + json['errors'] );
+											alert("Error:: " + json['errors'] );
 										}
 										else
 										{
@@ -232,7 +232,7 @@ function IPBTemplates()
 								}
 								else
 								{
-									alert( "Ошибка: " + t.responseText );
+									alert( "Ooops. Something went wrong. Does this help?: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },
@@ -248,14 +248,14 @@ function IPBTemplates()
 		/* Make sure we're mean it... */
 		if ( $('tplate_templaterow_' + template_id ).hasClassName( 'tplateRow_new')  )
 		{
-			if ( ! confirm( "Удалить шаблон?\n Произойдет удаление шаблона из ВСЕХ стилей!" ) )
+			if ( ! confirm( "REMOVE template bit?\n This will remove this template bit in ALL skins!" ) )
 			{
 				return false;
 			}
 		}
 		else
 		{
-			if ( ! confirm( "Откатить изменения?\n Все изменения БУДУТ УТРАЧЕНЫ!" ) )
+			if ( ! confirm( "Revert template bit?\n All changes WILL be lost!" ) )
 			{
 				return false;
 			}
@@ -301,7 +301,7 @@ function IPBTemplates()
 								}
 								else
 								{
-									alert( "Ошибка: " + t.responseText );
+									alert( "Ooops. Something went wrong. Does this help?: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },
@@ -338,7 +338,7 @@ function IPBTemplates()
 								}
 								else
 								{
-									alert( "Ошибка: " + t.responseText );
+									alert( "Ooops. Something went wrong. Does this help?: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },

upload/admin/applications/core/modules_admin/ajax/bookmarks.php

@@ -7,7 +7,7 @@
  * $Author: bfarber $
  * @since		7th August 2012
  * $LastChangedDate: 2011-03-10 21:00:38 +0000 (Thu, 10 Mar 2011) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 8021 $
  */
 

upload/admin/applications/core/modules_admin/ajax/compare.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Template comparison
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/modules_admin/ajax/css.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * AJAX Functions For applications/core/js/ipb3CSS.js file
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/modules_admin/ajax/editor.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Handles Admin ajax functions for IP.Board Text Editor
  * Author: Matt "Matt Mecham" Mecham
  * Last Updated: $LastChangedDate: 2012-05-29 14:05:10 +0100 (Tue, 29 May 2012) $

upload/admin/applications/core/modules_admin/ajax/findnames.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Login handler abstraction : AJAX Find Names functions
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
@@ -73,7 +73,7 @@ class admin_core_ajax_findnames extends ipsAjaxCommand
 
     	$this->DB->build( array( 'select'	=> 'm.members_display_name, m.name, m.member_id, m.member_group_id',
     							 'from'	    => array( 'members' => 'm' ),
-    							 'where'	=> "m.members_l_display_name LIKE '" . $this->DB->addSlashes( mb_strtolower( $name ) ) . "%'",
+    							 'where'	=> "m.members_l_display_name LIKE '" . $this->DB->addSlashes( strtolower( $name ) ) . "%'",
     							 'order'	=> $this->DB->buildLength( 'm.members_display_name' ) . ' ASC',
     							 'limit'	=> array( 0, 15 ),
  								 'add_join' => array( array( 'select' => 'p.*',

upload/admin/applications/core/modules_admin/ajax/hooks.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Hooks (AJAX)
  * Last Updated: $Date: 2013-02-15 17:36:04 -0500 (Fri, 15 Feb 2013) $
  * </pre>

upload/admin/applications/core/modules_admin/ajax/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/modules_admin/ajax/livesearch.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Live Search
  * Last Updated: $Date: 2012-12-06 10:19:49 -0500 (Thu, 06 Dec 2012) $
  * </pre>
@@ -106,7 +106,7 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 			return $results;
 		}
 		
-		$term	= mb_strtolower($term);
+		$term	= strtolower($term);
 		
 		$this->DB->build( array('select'	=> 'm.*, pp.*, g.g_title',
 								'from'		=> array('members' => 'm'),
@@ -128,11 +128,11 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 			$member     = $r = IPSMember::buildProfilePhoto( $member );
 			$r			= array();
 			
-			if( $member['members_l_display_name'] AND mb_strpos( $term, $member['members_l_display_name'] ) !== false )
+			if( $member['members_l_display_name'] AND strpos( $term, $member['members_l_display_name'] ) !== false )
 			{
 				$r['_matched']	= 'members_display_name';
 			}
-			else if( $member['members_l_username'] AND mb_strpos( $term, $member['members_l_username'] ) !== false )
+			else if( $member['members_l_username'] AND strpos( $term, $member['members_l_username'] ) !== false )
 			{
 				$r['_matched']	= 'name';
 			}
@@ -169,7 +169,7 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 			return $results;
 		}
 	
-		$term = mb_strtolower($term);
+		$term = strtolower($term);
 		
 		$this->registry->class_localization->loadLanguageFile( array( 'admin_groups' ), 'members' );
 		$this->registry->class_localization->loadLanguageFile( array( 'admin_forums' ), 'forums' );
@@ -179,7 +179,7 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 		
 		foreach( $this->lang->words as $k => $v )
 		{
-			if( strpos( $k, 'gf_' ) !== false AND mb_strpos( $v, $term ) !== false )
+			if( strpos( $k, 'gf_' ) !== false AND strpos( $v, $term ) !== false )
 			{
 				IPSDebug::fireBug( 'info', array( 'Group key found: ' . $k . ': ' . $v ) );
 				
@@ -197,7 +197,7 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 			{
 				$_term = preg_quote( $term, '#' );
 				
-				if ( preg_match( "#" . $_term . "#iu", $data['g_title'] ) )
+				if ( preg_match( "#" . $_term . "#i", $data['g_title'] ) )
 				{
 					$results['groups'][] = array(
 												'name'	=> IPSMember::makeNameFormatted( $data['g_title'], $data['g_id'] ),
@@ -225,7 +225,7 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 			return $results;
 		}
 		
-		$term				= mb_strtolower($term);
+		$term				= strtolower($term);
 		$results['forums']	= false;
 		
 		/* Fetch forums lib */
@@ -239,9 +239,9 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 		{
 			$_term = preg_quote( $term, '#' );
 			
-			if ( preg_match( "#" . $_term . "#iu", $data['name'] ) )
+			if ( preg_match( "#" . $_term . "#i", $data['name'] ) )
 			{
-				$data['extra'] = ( ( $data['posts'] == null ) ? 0 : $data['posts'] ) . " сообщений";
+				$data['extra'] = ( ( $data['posts'] == null ) ? 0 : $data['posts'] ) . " posts";
 				$data['url'] = $this->settings['_base_url']."&amp;app=forums&amp;module=forums&amp;section=forums&amp;do=edit&amp;f=".$data['id'];
 				$results['forums'][] = $data; 
 			}
@@ -265,7 +265,7 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 			return $results;
 		}
 		
-		$term	= mb_strtolower($term);
+		$term	= strtolower($term);
 		
 		if( !IN_DEV )
 		{
@@ -313,7 +313,7 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 			return $results;
 		}
 		
-		$textTerm		= $this->DB->addSlashes( mb_strtolower( $term ) );
+		$textTerm		= $this->DB->addSlashes( strtolower( $term ) );
 		$intTerm		= intval( $term );
 		$encodedTerm	= urlencode( $encodedTerm );
 		
@@ -542,13 +542,13 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 									$item['url']	= "section={$item['section']}&amp;" . $item['url'];
 								}
 		
-							if( isset($item['keywords']) AND mb_stripos( $item['keywords'], $term ) !== false )
+								if( isset($item['keywords']) AND stripos( $item['keywords'], $term ) !== false )
 								{
 									$item['name'] = $item['title'];
 									$item['url'] = $this->settings['_base_url']."&amp;app={$app}&amp;module={$item['module']}&amp;{$item['url']}";
 									$results['location'][] = $item;
 								}
-							else if( mb_stripos( $item['title'], $term ) !== false )
+								else if( stripos( $item['title'], $term ) !== false )
 								{
 									$item['name'] = $item['title'];
 									$item['url'] = $this->settings['_base_url']."&amp;app={$app}&amp;module={$item['module']}&amp;{$item['url']}";

upload/admin/applications/core/modules_admin/ajax/replacements.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * AJAX Functions For applications/core/js/ipb3CSS.js file
  * Last Updated: $Date: 2012-05-24 16:20:59 -0400 (Thu, 24 May 2012) $
  * </pre>

upload/admin/applications/core/modules_admin/ajax/skinsets.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * AJAX Functions For applications/core/js/ipb3CSS.js file
  * Last Updated: $Date: 2011-05-05 12:03:47 +0100 (Thu, 05 May 2011) $
  * </pre>

upload/admin/applications/core/modules_admin/ajax/tabs.php

@@ -7,7 +7,7 @@
  * $Author: bfarber $
  * @since		8th Feb 2011
  * $LastChangedDate: 2011-03-10 16:00:38 -0500 (Thu, 10 Mar 2011) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 8021 $
  */
 

upload/admin/applications/core/modules_admin/ajax/templatediff.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * AJAX Functions For applications/core/js/ipb3Templates.js file
  * Last Updated: $Date: 2012-11-30 10:02:12 -0500 (Fri, 30 Nov 2012) $
  * </pre>

upload/admin/applications/core/modules_admin/ajax/templates.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * AJAX Functions For applications/core/js/ipb3Templates.js file
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/modules_admin/ajax/templatesandr.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * AJAX Functions For applications/core/js/ipb3Templates.js file
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/modules_admin/ajax/uagents.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * AJAX Functions For applications/core/js/ipb3CSS.js file
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/modules_admin/applications/applications.php

@@ -7,7 +7,7 @@
  * $Author: bfarber $
  * @since		15 January 2007
  * $LastChangedDate: 2013-05-07 22:02:49 -0400 (Tue, 07 May 2013) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 12236 $
  */
 

upload/admin/applications/core/modules_admin/applications/blog.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Blog Application
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
@@ -37,6 +37,6 @@ class admin_core_applications_blog extends ipsCommand
 	{
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'purchase_app' );
 				
-		$this->registry->output->showInsideIframe("http://external.ipslink.com/ipboard30/landing/?p=blog");
+		$this->registry->output->showInsideIframe("http://anonym.to/?http://external.ipslink.com/ipboard30/landing/?p=blog");
 	}
 }

upload/admin/applications/core/modules_admin/applications/ccs.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Blog Application
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
@@ -34,6 +34,6 @@ class admin_core_applications_ccs extends ipsCommand
 	{
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'purchase_app' );
 				
-		$this->registry->output->showInsideIframe("http://www.invisionpower.com/products/content/");
+		$this->registry->output->showInsideIframe("http://anonym.to/?http://www.invisionpower.com/products/content/");
 	}
 }

upload/admin/applications/core/modules_admin/applications/copyright.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Download Manager Application
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>

upload/admin/applications/core/modules_admin/applications/defaultSection.php

@@ -7,7 +7,7 @@
  * $Author: ips_terabyte $
  * @since		20th February 2002
  * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 8655 $
  */
 

upload/admin/applications/core/modules_admin/applications/downloads.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Download Manager Application
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
@@ -37,6 +37,6 @@ class admin_core_applications_downloads extends ipsCommand
 	{
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'purchase_app' );
 				
-		$this->registry->output->showInsideIframe("http://www.invisionpower.com/products/downloads/");
+		$this->registry->output->showInsideIframe("http://anonym.to/?http://www.invisionpower.com/products/downloads/");
 	}
 }

upload/admin/applications/core/modules_admin/applications/enhancements.php

@@ -7,7 +7,7 @@
  * $Author: mark $
  * @since		24 July 2012
  * $LastChangedDate: 2012-06-20 10:50:23 +0100 (Wed, 20 Jun 2012) $
- * @version		v3.4.5
+ * @version		v3.4.6
  * $Revision: 10952 $
  */
 

upload/admin/applications/core/modules_admin/applications/gallery.php

@@ -3,7 +3,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Gallery Application
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
@@ -37,6 +37,6 @@ class admin_core_applications_gallery extends ipsCommand
 	{
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'purchase_app' );
 				
-		$this->registry->output->showInsideIframe("http://www.invisionpower.com/products/gallery/");
+		$this->registry->output->showInsideIframe("http://anonym.to/?http://www.invisionpower.com/products/gallery/");
 	}
 }

upload/admin/applications/core/modules_admin/applications/hooks.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Hooks Management
  * Last Updated: $Date: 2013-05-20 16:38:23 -0400 (Mon, 20 May 2013) $
  * </pre>
@@ -794,7 +794,6 @@ class admin_core_applications_hooks extends ipsCommand
 				$replacements[]	= array(
 									'replacement_key'		=> $_r['replacement_key'],
 									'replacement_content'	=> $_r['replacement_content'],
-									'replacement_master_key' => $_r['replacement_master_key'],
 									);
 			}
 		}
@@ -1407,7 +1406,7 @@ class admin_core_applications_hooks extends ipsCommand
 			
 			foreach( $replacements as $entry )
 			{
-				if ( !isset( $entry['replacement_master_key']  ) or !isset( $bits[ $entry['replacement_master_key'] ]  ) )
+				if ( !isset( $bits[ $entry['replacement_master_key'] ] ) )
 				{
 					$entry['replacement_master_key'] = 'root';
 				}

upload/admin/applications/core/modules_admin/applications/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>

upload/admin/applications/core/modules_admin/applications/nexus.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Nexus Application
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
@@ -34,6 +34,6 @@ class admin_core_applications_nexus extends ipsCommand
 	{
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'purchase_app' );
 				
-		$this->registry->output->showInsideIframe("http://www.invisionpower.com/products/nexus/");
+		$this->registry->output->showInsideIframe("http://anonym.to/?http://www.invisionpower.com/products/nexus/");
 	}
 }

upload/admin/applications/core/modules_admin/applications/setup.php

@@ -2,7 +2,7 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Application Installation
  * Last Updated: $Date: 2012-05-10 16:10:13 -0400 (Thu, 10 May 2012) $
  * </pre>
@@ -233,16 +233,7 @@ class admin_core_applications_setup extends ipsCommand
 		}
 		
 		/* Rebuild FURLs */
-		 $furltemplatesfile = $this->app_full_path;
+		if( is_file( $this->app_full_path . 'extensions/furlTemplates.php' ) )
-			if(IPB_USE_ONLY_ID_FURL && is_file( $furltemplatesfile.'/extensions/furlTemplatesID.php'))
-			{
-				$furltemplatesfile.='/extensions/furlTemplatesID.php';
-			}
-			else
-			{
-				$furltemplatesfile.='/extensions/furlTemplates.php';
-			}
-		if( is_file( $furltemplatesfile ) )
 		{
 			try
 			{
@@ -607,7 +598,7 @@ class admin_core_applications_setup extends ipsCommand
 				if( preg_match( "#(.+?)_language_pack.xml#", $f->getFileName() ) )
 				{
 					$this->request['file_location'] = $_PATH . $f->getFileName();
-					$lang->imprtFromXML( true, true, true, $vars['app_directory'], false, 1 );				
+					$lang->imprtFromXML( true, true, true, $vars['app_directory'] );				
 				}
 			}
 		} catch ( Exception $e ) {}

upload/admin/applications/core/modules_admin/applications/xml/index.html

@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
+IP.Board
 </body>
 </html>