sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 3.2.3

Browse Source
This commit is contained in:
Neo committed 2025-12-19 00:34:03 -08:00
1 parent ae5c01cc78
commit 78706903a2
2641 files changed
+228363 -201264
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

upload/admin/setup/applications/index.html
+1 -1
View File
@@ -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.invisionboard.com/">IP.Board</a>
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/setup/applications/install/index.html
+1 -1
View File
@@ -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.invisionboard.com/">IP.Board</a>
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/setup/applications/install/sections/address.php
+7 -7
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: EULA file
* Last Updated: $LastChangedDate: 2010-06-16 11:21:04 -0400 (Wed, 16 Jun 2010) $
* Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
* </pre>
*
* @author $Author: mark $
* @author $Author: ips_terabyte $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6541 $
* @link http://hatynka.in
* @version $Rev: 8644 $
*
*/
@@ -24,7 +24,7 @@ class install_address extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
upload/admin/setup/applications/install/sections/admin.php
+7 -7
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: ADMIN file
* Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
* Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: ips_terabyte $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 5713 $
* @link http://hatynka.in
* @version $Rev: 8644 $
*
*/
@@ -24,7 +24,7 @@ class install_admin extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
upload/admin/setup/applications/install/sections/apps.php
+8 -8
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: EULA file
* Last Updated: $LastChangedDate: 2010-04-09 21:23:51 -0400 (Fri, 09 Apr 2010) $
* Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: ips_terabyte $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6094 $
* @link http://hatynka.in
* @version $Rev: 8644 $
*
*/
@@ -24,7 +24,7 @@ class install_apps extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
@@ -101,7 +101,7 @@ class install_apps extends ipsCommand
// Get it!
//-----------------------------------------
if ( ! file_exists( IPS_ROOT_PATH . $_pBit . '/' . $file . '/xml/information.xml' ) )
if ( ! is_file( IPS_ROOT_PATH . $_pBit . '/' . $file . '/xml/information.xml' ) )
{
continue;
}
upload/admin/setup/applications/install/sections/db.php
+28 -11
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: EULA file
* Last Updated: $LastChangedDate: 2010-05-03 19:34:02 -0400 (Mon, 03 May 2010) $
* Last Updated: $LastChangedDate: 2011-09-16 15:32:18 -0400 (Fri, 16 Sep 2011) $
* </pre>
*
* @author $Author: bfarber $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6205 $
* @link http://hatynka.in
* @version $Rev: 9503 $
*
*/
@@ -24,7 +24,7 @@ class install_db extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
@@ -43,11 +43,28 @@ class install_db extends ipsCommand
}
else
{
//-----------------------------------------
// Quick basic check for extensions
//-----------------------------------------
if( strtolower(IPSSetUp::getSavedData('sql_driver')) == 'mysql' )
{
if( !function_exists('mysqli_connect') AND !function_exists('mysql_connect') )
{
$this->registry->output->setTitle( "Databases: Error" );
$this->registry->output->setNextAction( 'db&do=check' );
$this->registry->output->addWarning( "You do not have the mysql or mysqli PHP extension installed. You must install one of these PHP extensions before you can continue." );
$this->registry->output->addContent( $this->fetchContent() );
$this->registry->output->sendOutput();
return;
}
}
//-----------------------------------------
// Load DB driver..
//-----------------------------------------
require_once( IPS_KERNEL_PATH . 'classDb' . ucwords( IPSSetUp::getSavedData('sql_driver') ) . '.php' );
require_once( IPS_KERNEL_PATH . 'classDb' . ucwords( IPSSetUp::getSavedData('sql_driver') ) . '.php' );/*noLibHook*/
$classname = "db_driver_".IPSSetUp::getSavedData('sql_driver');
@@ -63,9 +80,9 @@ class install_db extends ipsCommand
// Any "extra" configs required for this driver?
//--------------------------------------------------
if ( file_exists( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' ) )
if ( is_file( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' ) )
{
require_once( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' );
require_once( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' );/*noLibHook*/
$extra_install = new install_extra( $this->registry );
@@ -251,9 +268,9 @@ class install_db extends ipsCommand
$content = ( $check === FALSE ) ? $this->registry->output->template()->page_db() : $this->registry->output->template()->page_dbOverride();
/* Driver extras? */
if ( file_exists( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' ) )
if ( is_file( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' ) )
{
require_once( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' );
require_once( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' );/*noLibHook*/
$extra_install = new install_extra( $this->registry );
$content = str_replace( '<!--{EXTRA.SQL}-->', $extra_install->install_form_extra(), $content );
upload/admin/setup/applications/install/sections/done.php
+7 -7
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: EULA file
* Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
* Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: ips_terabyte $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 5713 $
* @link http://hatynka.in
* @version $Rev: 8644 $
*
*/
@@ -24,7 +24,7 @@ class install_done extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
upload/admin/setup/applications/install/sections/eula.php
+7 -7
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: EULA file
* Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
* Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: ips_terabyte $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 5713 $
* @link http://hatynka.in
* @version $Rev: 8644 $
*
*/
@@ -24,7 +24,7 @@ class install_eula extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
upload/admin/setup/applications/install/sections/index.html
+1 -1
View File
@@ -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.invisionboard.com/">IP.Board</a>
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/setup/applications/install/sections/index.php
+13 -13
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: Index file
* Last Updated: $LastChangedDate: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
* Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
* </pre>
*
* @author $Author: terabyte $
* @author $Author: ips_terabyte $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6881 $
* @link http://hatynka.in
* @version $Rev: 8644 $
*
*/
@@ -24,7 +24,7 @@ class install_index extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
@@ -36,7 +36,7 @@ class install_index extends ipsCommand
/* Test Extensions */
$INSTALLDATA = array();
include( IPS_ROOT_PATH . 'setup/xml/requiredextensions.php' );
include( IPS_ROOT_PATH . 'setup/xml/requiredextensions.php' );/*noLibHook*/
if ( is_array( $INSTALLDATA ) && count( $INSTALLDATA ) )
{
@@ -69,7 +69,7 @@ class install_index extends ipsCommand
}
/* Check for conf_global.dist.php */
if ( file_exists( DOC_IPS_ROOT_PATH . 'conf_global.dist.php') AND ! file_exists( DOC_IPS_ROOT_PATH.'conf_global.php') )
if ( is_file( DOC_IPS_ROOT_PATH . 'conf_global.dist.php') AND ! is_file( DOC_IPS_ROOT_PATH.'conf_global.php') )
{
if ( ! @rename( DOC_IPS_ROOT_PATH.'conf_global.dist.php', DOC_IPS_ROOT_PATH.'conf_global.php' ) )
{
@@ -85,7 +85,7 @@ class install_index extends ipsCommand
$filesOK = FALSE;
/* Fetch core writeable files */
require_once( IPS_KERNEL_PATH . 'classXML.php' );
require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
$xml = new classXML( IPSSetUp::charSet );
try
@@ -104,7 +104,7 @@ class install_index extends ipsCommand
{
if ( $data['dir'] )
{
if ( ! @mkdir( $_path, 0777, TRUE ) )
if ( ! @mkdir( $_path, IPS_FOLDER_PERMISSION, TRUE ) )
{
$this->registry->output->addError( 'Директория "' . $data['path'] . '" не существует, создайте ее' );
}
@@ -117,7 +117,7 @@ class install_index extends ipsCommand
if ( ! is_writeable( $_path ) )
{
if ( ! @chmod( $_path, 0777 ) )
if ( ! @chmod( $_path, is_dir( $_path ) ? IPS_FOLDER_PERMISSION : IPS_FILE_PERMISSION ) )
{
if ( is_dir( $_path ) )
{
@@ -156,4 +156,4 @@ class install_index extends ipsCommand
$this->registry->output->addContent( $this->registry->output->template()->page_requirements( $filesOK, $extensionsOK, $extensionData ) );
$this->registry->output->sendOutput();
}
}
}
upload/admin/setup/applications/install/sections/install.php
+123 -79
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: EULA file
* Last Updated: $LastChangedDate: 2010-10-25 11:09:26 -0400 (Mon, 25 Oct 2010) $
* Last Updated: $LastChangedDate: 2011-09-26 16:02:02 -0400 (Mon, 26 Sep 2011) $
* </pre>
*
* @author $Author: mmecham $
* @author $Author: ips_terabyte $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 7035 $
* @link http://hatynka.in
* @version $Rev: 9551 $
*
*/
@@ -52,7 +52,7 @@ class install_install extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
@@ -178,7 +178,7 @@ class install_install extends ipsCommand
// Check that it wrote
//-----------------------------------
if ( ! file_exists( IPSSetUp::getSavedData('install_dir') . '/conf_global.php' ) )
if ( ! is_file( IPSSetUp::getSavedData('install_dir') . '/conf_global.php' ) )
{
$this->registry->output->setTitle( "Установка: Ошибка" );
$this->registry->output->setNextAction( 'install&do=sql' );
@@ -191,9 +191,9 @@ class install_install extends ipsCommand
}
else
{
unset($INFO);
$INFO = array();
require( IPSSetUp::getSavedData('install_dir') . '/conf_global.php' );
require( IPSSetUp::getSavedData('install_dir') . '/conf_global.php' );/*noLibHook*/
if( ! $INFO['sql_driver'] )
{
@@ -231,10 +231,10 @@ class install_install extends ipsCommand
// Tables
//-----------------------------------------
if ( file_exists( $_FILE . '_tables.php' ) )
if ( is_file( $_FILE . '_tables.php' ) )
{
$TABLE = array();
include( $_FILE . '_tables.php' );
include( $_FILE . '_tables.php' );/*noLibHook*/
if ( is_array( $TABLE ) and count( $TABLE ) )
{
@@ -273,10 +273,10 @@ class install_install extends ipsCommand
if ( $this->DB->checkFulltextSupport() )
{
if ( file_exists( $_FILE . '_fulltext.php' ) )
if ( is_file( $_FILE . '_fulltext.php' ) )
{
$INDEX = array();
include( $_FILE . '_fulltext.php' );
include( $_FILE . '_fulltext.php' );/*noLibHook*/
$output[] = $next['title'] . ": Создание индексов";
@@ -317,10 +317,10 @@ class install_install extends ipsCommand
// INSERTS
//-----------------------------------------
if ( file_exists( $_FILE . '_inserts.php' ) )
if ( is_file( $_FILE . '_inserts.php' ) )
{
$INSERT = array();
include( $_FILE . '_inserts.php' );
include( $_FILE . '_inserts.php' );/*noLibHook*/
if ( is_array($INSERT) && count($INSERT) )
{
@@ -363,7 +363,7 @@ class install_install extends ipsCommand
if ( $next['key'] == 'core' )
{
$output[] = "Inserting groups information...";
$output[] = "Добавление информации о группах...";
$xml = new classXML( IPSSetUp::charSet );
if ( $extra_install AND method_exists( $extra_install, 'before_inserts_run' ) )
@@ -393,7 +393,7 @@ class install_install extends ipsCommand
$output = ( is_array( $output ) AND count( $output ) ) ? $output : array( 0 => $next['title'] . ": Наполнение таблиц завершено" );
$this->_finishStep( $output, "Install: SQL", 'install&do=sql&previous=' . $next['key'] );
$this->_finishStep( $output, "Установка: SQL", 'install&do=sql&previous=' . $next['key'] );
}
else
{
@@ -443,7 +443,7 @@ class install_install extends ipsCommand
$path = IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install';
$id = ( $id < 1 ) ? 1 : $id;
if ( file_exists( $path . '/sql/' .$next['key'] . '_' . strtolower( IPSSetUp::getSavedData('sql_driver') ) . '_sql_' . $id .'.php' ) )
if ( is_file( $path . '/sql/' .$next['key'] . '_' . strtolower( IPSSetUp::getSavedData('sql_driver') ) . '_sql_' . $id .'.php' ) )
{
/* Set up DB driver */
$extra_install = $this->_setUpDBDriver( FALSE );
@@ -548,9 +548,9 @@ class install_install extends ipsCommand
$long_version = '10000';
$_versions = array();
if ( file_exists( $_PATH . 'versions.xml' ) )
if ( is_file( $_PATH . 'versions.xml' ) )
{
require_once( IPS_KERNEL_PATH . 'classXML.php' );
require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
$xml = new classXML( IPSSetUp::charSet );
$xml->load( $_PATH . 'versions.xml' );
@@ -569,7 +569,7 @@ class install_install extends ipsCommand
$long_version = $_this_version['long'];
}
if ( file_exists( $_PATH . 'information.xml' ) )
if ( is_file( $_PATH . 'information.xml' ) )
{
//-----------------------------------------
// Adjust the table?
@@ -590,22 +590,25 @@ class install_install extends ipsCommand
// Insert...
//-----------------------------------------
$this->DB->insert( 'core_applications', array( 'app_title' => $appData['name'],
'app_public_title' => ( $appData['public_name'] ) ? $appData['public_name'] : '', // Allow blank in case it's an admin-only app
'app_description' => $appData['description'],
'app_author' => $appData['author'],
'app_hide_tab' => intval($appData['hide_tab']),
'app_version' => $version,
'app_long_version' => $long_version,
'app_directory' => $next['key'],
'app_added' => time(),
'app_position' => $num,
'app_protected' => $_protected,
'app_location' => IPSLib::extractAppLocationKey( $next['key'] ),
'app_enabled' => ( $appData['disabledatinstall'] ) ? 0 : 1 ) );
$this->DB->insert( 'core_applications', array( 'app_title' => $appData['name'],
'app_public_title' => ( $appData['public_name'] ) ? $appData['public_name'] : '', // Allow blank in case it's an admin-only app
'app_description' => $appData['description'],
'app_author' => $appData['author'],
'app_hide_tab' => intval($appData['hide_tab']),
'app_version' => $version,
'app_long_version' => $long_version,
'app_directory' => $next['key'],
'app_added' => time(),
'app_position' => $num,
'app_protected' => $_protected,
'app_location' => IPSLib::extractAppLocationKey( $next['key'] ),
'app_enabled' => $appData['disabledatinstall'] ? 0 : 1,
'app_website' => $appData['website'],
'app_update_check' => $appData['update_check'],
'app_global_caches' => $appData['global_caches'],
) );
$this->DB->insert( 'upgrade_history', array(
'upgrade_version_id' => $long_version,
$this->DB->insert( 'upgrade_history', array('upgrade_version_id' => $long_version,
'upgrade_version_human' => $version,
'upgrade_date' => 0,
'upgrade_mid' => 0,
@@ -644,7 +647,7 @@ class install_install extends ipsCommand
/**
* Install Modules
*
* @return void
* @return @e void
*/
public function install_modules()
{
@@ -751,7 +754,7 @@ class install_install extends ipsCommand
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
$knownSettings = array();
if ( file_exists( $_PATH . $next['key'] . '_settings.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_settings.xml' ) )
{
//-----------------------------------------
// Adjust the table?
@@ -766,8 +769,8 @@ class install_install extends ipsCommand
// Continue
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/settings.php' );
$settings = new admin_core_tools_settings();
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/settings/settings.php' );/*noLibHook*/
$settings = new admin_core_settings_settings();
$settings->makeRegistryShortcuts( $this->registry );
$this->request['app_dir'] = $next['key'];
@@ -787,9 +790,9 @@ class install_install extends ipsCommand
}
/* Fetch known settings */
if ( file_exists( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' ) )
if ( is_file( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' ) )
{
require( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' );
require( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' );/*noLibHook*/
}
$this->request['app_dir'] = $next['key'];
@@ -857,7 +860,7 @@ class install_install extends ipsCommand
$output[] = "Добавление шаблонов стилей";
require_once( IPS_KERNEL_PATH . 'classXML.php' );
require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
$xml = new classXML( IPSSetUp::charSet );
//-----------------------------------------
@@ -870,7 +873,7 @@ class install_install extends ipsCommand
}
/* Skin Set Data */
$xml->load( IPS_PUBLIC_PATH . 'resources/skins/setsData.xml' );
$xml->load( IPS_ROOT_PATH . 'setup/xml/skins/setsData.xml' );
foreach( $xml->fetchElements( 'set' ) as $xmlelement )
{
@@ -893,9 +896,9 @@ class install_install extends ipsCommand
}
/* Load skin classes */
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
$skinFunctions = new skinImportExport( $this->registry );
@@ -929,7 +932,7 @@ class install_install extends ipsCommand
$output[] = $next['title'] . ": Добавлены шаблоны {$skinData['set_name']}";
if ( file_exists( $_PATH . $next['key'] . '_' . $skinKey . '_templates.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_' . $skinKey . '_templates.xml' ) )
{
//-----------------------------------------
// Adjust the table?
@@ -958,7 +961,7 @@ class install_install extends ipsCommand
}
}
if ( file_exists( $_PATH . $next['key'] . '_' . $skinKey . '_css.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_' . $skinKey . '_css.xml' ) )
{
//-----------------------------------------
// Adjust the table?
@@ -1005,7 +1008,7 @@ class install_install extends ipsCommand
foreach( $skinSets as $skinKey => $skinData )
{
/* Replacements */
$skinFunctions->importReplacementsXMLArchive( file_get_contents( IPS_PUBLIC_PATH . 'resources/skins/replacements_' . $skinKey . '.xml' ), $skinKey );
$skinFunctions->importReplacementsXMLArchive( file_get_contents( IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $skinKey . '.xml' ), $skinKey );
}
$skinFunctions->rebuildSkinSetsCache();
@@ -1048,7 +1051,7 @@ class install_install extends ipsCommand
$output[] = $next['title'] . ": Добавление задач";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . $next['key'] . '_tasks.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_tasks.xml' ) )
{
//-----------------------------------------
// Adjust the table?
@@ -1063,7 +1066,7 @@ class install_install extends ipsCommand
// Continue
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/system/taskmanager.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/system/taskmanager.php' );/*noLibHook*/
$tasks = new admin_core_system_taskmanager();
$tasks->makeRegistryShortcuts( $this->registry );
@@ -1132,7 +1135,7 @@ class install_install extends ipsCommand
// Get the language stuff
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );/*noLibHook*/
$lang = new admin_core_languages_manage_languages();
$lang->makeRegistryShortcuts( $this->registry );
@@ -1224,7 +1227,7 @@ class install_install extends ipsCommand
// Get the language stuff
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );/*noLibHook*/
$lang = new admin_core_languages_manage_languages();
$lang->makeRegistryShortcuts( $this->registry );
@@ -1312,7 +1315,7 @@ class install_install extends ipsCommand
$output[] = $next['title'] . ": Добавление BB-кодов";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . $next['key'] . '_bbcode.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_bbcode.xml' ) )
{
//-----------------------------------------
// Adjust the table?
@@ -1327,11 +1330,16 @@ class install_install extends ipsCommand
// Continue
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php' );/*noLibHook*/
$bbcode = new admin_core_posts_bbcode();
$bbcode->makeRegistryShortcuts( $this->registry );
$bbcode->bbcodeImportDo( file_get_contents( $_PATH . $next['key'] . '_bbcode.xml' ) );
$_contents = file_get_contents( $_PATH . $next['key'] . '_bbcode.xml' );
if( $_contents )
{
$bbcode->bbcodeImportDo( $_contents );
}
//-----------------------------------------
// Adjust the table?
@@ -1346,7 +1354,7 @@ class install_install extends ipsCommand
$output[] = $next['title'] . ": Добавление медиа тегов";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . $next['key'] . '_mediatag.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_mediatag.xml' ) )
{
//-----------------------------------------
// Adjust the table?
@@ -1361,7 +1369,7 @@ class install_install extends ipsCommand
// Continue
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php' );/*noLibHook*/
$bbcode = new admin_core_posts_media();
$bbcode->makeRegistryShortcuts( $this->registry );
@@ -1417,7 +1425,7 @@ class install_install extends ipsCommand
/* Set up DB driver */
$extra_install = $this->_setUpDBDriver( FALSE );
require_once( IPS_KERNEL_PATH . 'classXML.php' );
require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
$xml = new classXML( IPSSetUp::charSet );
//-----------------------------------------
@@ -1429,7 +1437,7 @@ class install_install extends ipsCommand
$output[] = $next['title'] . ": Добавление разделов помощи";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . $next['key'] . '_help.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_help.xml' ) )
{
//-----------------------------------------
// Adjust the table?
@@ -1444,7 +1452,7 @@ class install_install extends ipsCommand
// Do it..
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/help.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/help.php' );/*noLibHook*/
$help = new admin_core_tools_help();
$help->makeRegistryShortcuts( $this->registry );
@@ -1511,7 +1519,7 @@ class install_install extends ipsCommand
$output[] = $next['title'] . ": Добавление модификаций";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . 'hooks.xml' ) )
if ( is_file( $_PATH . 'hooks.xml' ) )
{
//-----------------------------------------
// Adjust the table?
@@ -1526,7 +1534,7 @@ class install_install extends ipsCommand
// Continue
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/hooks.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/hooks.php' );/*noLibHook*/
$hooks = new admin_core_applications_hooks();
$hooks->makeRegistryShortcuts( $this->registry );
@@ -1552,7 +1560,7 @@ class install_install extends ipsCommand
}
else
{
require_once( IPS_KERNEL_PATH . 'classXML.php' );
require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
//-----------------------------------------
// ****** LOG IN MODULES
@@ -1607,7 +1615,7 @@ class install_install extends ipsCommand
$q = $extra_install->before_inserts_run( 'useragents' );
}
require_once( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php' );/*noLibHook*/
$userAgentFunctions = new userAgentFunctions( $this->registry );
$userAgentFunctions->rebuildMasterUserAgents();
@@ -1652,7 +1660,7 @@ class install_install extends ipsCommand
if( IPSLib::appIsInstalled('calendar') )
{
require_once( IPSLib::getAppDir('calendar') . '/modules_admin/calendar/calendars.php' );
require_once( IPSLib::getAppDir('calendar') . '/modules_admin/calendar/calendars.php' );/*noLibHook*/
$cal = new admin_calendar_calendar_calendars();
$cal->makeRegistryShortcuts( $this->registry );
@@ -1714,7 +1722,7 @@ class install_install extends ipsCommand
//-----------------------------------------
# Grab cache master file
require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );
require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );/*noLibHook*/
/* Add handle */
$_tmp = new coreVariables();
@@ -1755,6 +1763,41 @@ class install_install extends ipsCommand
ipsRegistry::cache()->setCache( 'systemvars', $cache, array( 'array' => 1 ) );
//-------------------------------------------------------------
// License Key
//-------------------------------------------------------------
if( ipsRegistry::$settings['ipb_reg_number'] )
{
$output[] = "Обновление информации о ключе лицензии...";
require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );/*noLibHook*/
$this->classFileManagement = new classFileManagement();
/* Query the api */
$response = $this->classFileManagement->getFileContents( "http://myipb.in/license.php?lk=" . ipsRegistry::$settings['ipb_reg_number'] . "&url=" . ipsRegistry::$settings['board_url'] . "&flush=1" );
/* Get License Data */
$licenseData = json_decode( $response, true );
/* Copyright Removal? */
if ( $licenseData['cr'] )
{
IPSLib::updateSettings( array( 'ipb_copy_number' => $licenseData['cr'], 'ips_cp_purchase' => 1 ) );
}
elseif ( $this->settings['ips_cp_purchase'] )
{
IPSLib::updateSettings( array( 'ips_cp_purchase' => 0 ) );
}
/* Save to cache */
$licenseData['_cached_date'] = time();
$licenseData['key']['_expires'] = $licenseData['key']['_expires'] ? $licenseData['key']['_expires'] : 9999999999;
$licenseData['key']['expires'] = $licenseData['key']['expires'] ? $licenseData['key']['expires'] : 9999999999;
ipsRegistry::cache()->setCache( 'licenseData', $licenseData, array( 'array' => 1 ) );
}
//-------------------------------------------------------------
// Stats
//-------------------------------------------------------------
@@ -1787,9 +1830,9 @@ class install_install extends ipsCommand
//-----------------------------------------
/* Load skin classes */
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
$skinFunctions = new skinImportExport( $this->registry );
@@ -1847,10 +1890,11 @@ class install_install extends ipsCommand
$output[] = "Кеш стиля обновлен";
/* Rebuild FURL cache */
/* Rebuild FURL & GLOBAL caches */
try
{
IPSLib::cacheFurlTemplates();
IPSLib::cacheGlobalCaches();
}
catch( Exception $error )
{
@@ -1865,7 +1909,7 @@ class install_install extends ipsCommand
{
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/extensions/';
if ( file_exists( $_PATH . 'coreVariables.php' ) )
if ( is_file( $_PATH . 'coreVariables.php' ) )
{
//-----------------------------------------
// Adjust the table?
@@ -1877,7 +1921,7 @@ class install_install extends ipsCommand
}
# Grab cache master file
require_once( $_PATH . 'coreVariables.php' );
require_once( $_PATH . 'coreVariables.php' );/*noLibHook*/
if ( is_array( $CACHE ) )
{
@@ -1924,7 +1968,7 @@ class install_install extends ipsCommand
*
* @access private
* @param bool Whether the DB driver returns with an error or not
* @return void
* @return @e void
*/
private function _setUpDBDriver( $returnDie=TRUE )
{
@@ -1934,9 +1978,9 @@ class install_install extends ipsCommand
// Any "extra" configs required for this driver?
//--------------------------------------------------
if ( file_exists( IPS_ROOT_PATH .'setup/sql/' . strtolower( IPSSetUp::getSavedData('sql_driver') ) . '_install.php' ) )
if ( is_file( IPS_ROOT_PATH .'setup/sql/' . strtolower( IPSSetUp::getSavedData('sql_driver') ) . '_install.php' ) )
{
require_once( IPS_ROOT_PATH .'setup/sql/' . strtolower( IPSSetUp::getSavedData('sql_driver') ) . '_install.php' );
require_once( IPS_ROOT_PATH .'setup/sql/' . strtolower( IPSSetUp::getSavedData('sql_driver') ) . '_install.php' );/*noLibHook*/
$extra_install = new install_extra( $this->registry );
}
@@ -1966,7 +2010,7 @@ class install_install extends ipsCommand
* @param string output
* @param string title
* @param string next step
* @return void
* @return @e void
*/
private function _finishStep( $output, $title, $nextStep )
{
upload/admin/setup/applications/install/sections/license.php
+29 -9
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: License Key
* Last Updated: $LastChangedDate: 2010-06-16 11:21:04 -0400 (Wed, 16 Jun 2010) $
* Last Updated: $LastChangedDate: 2011-08-30 20:24:16 -0400 (Tue, 30 Aug 2011) $
* </pre>
*
* @author $Author: mark $
* @author $Author: bfarber $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6541 $
* @link http://hatynka.in
* @version $Rev: 9434 $
*
*/
@@ -24,20 +24,24 @@ class install_license extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
$lcheck = '';
if ( $this->request['do'] == 'check' )
{
$lcheck = $this->check();
if ( $lcheck === TRUE )
{
$this->registry->autoLoadNextAction( 'db' );
return;
}
}
$this->registry->output->setTitle( "Ключ лицензии" );
$this->registry->output->setNextAction( "license&do=check" );
$this->registry->output->addContent( $this->registry->output->template()->page_license( $lcheck ) );
$this->registry->output->sendOutput();
}
@@ -49,6 +53,22 @@ class install_license extends ipsCommand
*/
private function check()
{
return true;
$this->request['lkey'] = trim( $this->request['lkey'] );
// License key is optional
if( ! $this->request['lkey'] )
{
return true;
}
$url = IPSSetup::getSavedData( 'install_url' );
require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );
$query = new classFileManagement();
$query->use_sockets = 1;
$response = $query->getFileContents( "http://myipb.in/license.php?api=activateKey&lk={$this->request['lkey']}&domain=".urlencode($url) );
$response = json_decode( $response, true );
IPSSetup::setSavedData( 'lkey', $this->request['lkey'] );
return TRUE;
}
}
upload/admin/setup/applications/upgrade/index.html
+1 -1
View File
@@ -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.invisionboard.com/">IP.Board</a>
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/setup/applications/upgrade/sections/apps.php
+25 -25
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: EULA file
* Last Updated: $LastChangedDate: 2010-10-19 11:43:08 -0400 (Tue, 19 Oct 2010) $
* Last Updated: $LastChangedDate: 2011-05-24 22:52:26 -0400 (Tue, 24 May 2011) $
* </pre>
*
* @author $Author: mark $
* @author $Author: bfarber $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6996 $
* @link http://hatynka.in
* @version $Rev: 8886 $
*
*/
@@ -24,7 +24,7 @@ class upgrade_apps extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
@@ -95,10 +95,10 @@ class upgrade_apps extends ipsCommand
{
foreach( $data as $num )
{
if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
if ( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
{
$_class = 'version_class_' . $num;
require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );
$_class = 'version_class_' . $app . '_' . $num;
require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );/*noLibHook*/
$_tmp = new $_class( $this->registry );
@@ -138,7 +138,7 @@ class upgrade_apps extends ipsCommand
/* Check Directory */
if ( ! is_array( $_POST['apps'] ) OR ! count( $_POST['apps'] ) )
{
$this->registry->output->addError( 'Необходмо выбрать приложения для обновления.' );
$this->registry->output->addWarning( 'Необходмо выбрать приложения для обновления.' );
}
else
{
@@ -148,8 +148,7 @@ class upgrade_apps extends ipsCommand
$_POST['apps']['forums'] = 1;
$_POST['apps']['members'] = 1;
$_POST['apps']['calendar'] = 1;
$_POST['apps']['portal'] = 1;
//$_POST['apps']['subscriptions'] = 1;
$_POST['apps']['chat'] = 1;
}
else
{
@@ -189,10 +188,10 @@ class upgrade_apps extends ipsCommand
{
foreach( $appClasses as $app => $data )
{
if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/upgradeCheck.php' ) )
if ( is_file( IPSLib::getAppDir( $app ) . '/setup/upgradeCheck.php' ) )
{
$_class = $app . '_upgradeCheck';
require_once( IPSLib::getAppDir( $app ) . '/setup/upgradeCheck.php' );
require_once( IPSLib::getAppDir( $app ) . '/setup/upgradeCheck.php' );/*noLibHook*/
$requirements_class = new $_class();
if ( method_exists( $requirements_class, 'checkForProblems' ) )
@@ -208,10 +207,10 @@ class upgrade_apps extends ipsCommand
foreach( $data as $num )
{
if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
if ( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
{
$_class = 'version_class_' . $num;
require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );
$_class = 'version_class_' . $app . '_' . $num;
require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );/*noLibHook*/
$_tmp = new $_class( $this->registry );
@@ -269,7 +268,7 @@ class upgrade_apps extends ipsCommand
// Get it!
//-----------------------------------------
if ( ! file_exists( IPS_ROOT_PATH . $_pBit . '/' . $file . '/xml/information.xml' ) )
if ( ! is_file( IPS_ROOT_PATH . $_pBit . '/' . $file . '/xml/information.xml' ) )
{
continue;
}
@@ -337,12 +336,14 @@ class upgrade_apps extends ipsCommand
{
foreach( $appClasses as $app => $data )
{
$notices[ $app ] = array();
foreach( $data as $num )
{
if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
if ( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
{
$_class = 'version_class_' . $num;
require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );
$_class = 'version_class_' . $app . '_' . $num;
require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );/*noLibHook*/
$_tmp = new $_class( $this->registry );
@@ -352,7 +353,7 @@ class upgrade_apps extends ipsCommand
if ( $_t )
{
$notices[ $app ] = $_t;
$notices[ $app ] = array_merge( $_t, $notices[ $app ] );
}
}
}
@@ -364,8 +365,7 @@ class upgrade_apps extends ipsCommand
if ( IPSSetUp::is300plus() !== TRUE )
{
unset( $apps['ips']['calendar'] );
unset( $apps['ips']['portal'] );
unset( $apps['other']['subscriptions'] );
unset( $apps['ips']['chat'] );
}
/* Page Output */
upload/admin/setup/applications/upgrade/sections/convert.php
+2 -3
View File
@@ -5,10 +5,9 @@
* Upgrader: Database Convertion
*
* @author Tony
* @copyright (c) 2009 IBResource.ru
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package Invision Power Board
* @link http://www.invisionpower.com
* @link http://hatynka.in
*
*/
upload/admin/setup/applications/upgrade/sections/done.php
+9 -9
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: DONE file
* Last Updated: $LastChangedDate: 2010-04-09 21:23:51 -0400 (Fri, 09 Apr 2010) $
* Last Updated: $LastChangedDate: 2011-05-24 15:40:20 -0400 (Tue, 24 May 2011) $
* </pre>
*
* @author $Author: bfarber $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6094 $
* @link http://hatynka.in
* @version $Rev: 8884 $
*
*/
@@ -24,7 +24,7 @@ class upgrade_done extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
@@ -59,10 +59,10 @@ class upgrade_done extends ipsCommand
{
foreach( $data as $num )
{
if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
if ( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
{
$_class = 'version_class_' . $num;
require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );
$_class = 'version_class_' . $app . '_' . $num;
require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );/*noLibHook*/
$_tmp = new $_class( $this->registry );
upload/admin/setup/applications/upgrade/sections/index.html
+1 -1
View File
@@ -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.invisionboard.com/">IP.Board</a>
<a href="http://www.invisionpower.com">IP.Board</a>
</body>
</html>
upload/admin/setup/applications/upgrade/sections/index.php
+7 -7
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Upgrader: Index file - Shows log in page
* Last Updated: $LastChangedDate: 2010-07-07 11:51:43 -0400 (Wed, 07 Jul 2010) $
* Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
* </pre>
*
* @author $Author: matt $
* @author $Author: ips_terabyte $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6613 $
* @link http://hatynka.in
* @version $Rev: 8644 $
*
*/
@@ -23,7 +23,7 @@ class upgrade_index extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
upload/admin/setup/applications/upgrade/sections/license.php
+37 -9
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: License Key
* Last Updated: $LastChangedDate: 2010-08-03 04:16:45 -0400 (Tue, 03 Aug 2010) $
* Last Updated: $LastChangedDate: 2011-05-26 15:04:51 -0400 (Thu, 26 May 2011) $
* </pre>
*
* @author $Author: mark $
* @author $Author: bfarber $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6720 $
* @link http://hatynka.in
* @version $Rev: 8903 $
*
*/
@@ -24,7 +24,7 @@ class upgrade_license extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
@@ -35,15 +35,28 @@ class upgrade_license extends ipsCommand
return;
}
if ( $this->request['do'] == 'check' )
{
$lcheck = $this->check();
if ( $lcheck === TRUE )
{
$this->registry->autoLoadNextAction( 'upgrade' );
return;
}
}
else
{
$lcheck = $this->check( TRUE );
if ( $lcheck === TRUE )
{
$this->registry->autoLoadNextAction( 'upgrade' );
return;
}
}
$this->registry->output->setTitle( "Ключ лицензии" );
$this->registry->output->setNextAction( "license&do=check" );
$this->registry->output->addContent( $this->registry->output->template()->page_license( $lcheck ) );
$this->registry->output->sendOutput();
}
@@ -53,8 +66,23 @@ class upgrade_license extends ipsCommand
* @access public
* @return bool
*/
private function check()
private function check( $init=FALSE )
{
return true;
$this->request['lkey'] = ( $init ) ? ipsRegistry::$settings['ipb_reg_number'] : trim( $this->request['lkey'] );
if ( !$this->request['lkey'] and !$init )
{
return true;
}
$url = ipsRegistry::$settings['board_url'] ? ipsRegistry::$settings['board_url'] : ipsRegistry::$settings['base_url'];
require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );/*noLibHook*/
$query = new classFileManagement();
$query->use_sockets = 1;
$response = $query->getFileContents( "http://myipb.in/license.php?api=activateKey&lk={$this->request['lkey']}&domain=".urlencode($url) );
$response = json_decode( $response, true );
IPSLib::updateSettings( array( 'ipb_reg_number' => $this->request['lkey'] ) );
return TRUE;
}
}
upload/admin/setup/applications/upgrade/sections/overview.php
+11 -11
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Upgrader: Index file - Shows log in page
* Last Updated: $LastChangedDate: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
* Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
* </pre>
*
* @author $Author: terabyte $
* @author $Author: ips_terabyte $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6881 $
* @link http://hatynka.in
* @version $Rev: 8644 $
*
*/
@@ -23,7 +23,7 @@ class upgrade_overview extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
@@ -42,7 +42,7 @@ class upgrade_overview extends ipsCommand
/* Test Extensions */
$INSTALLDATA = array();
include( IPS_ROOT_PATH . 'setup/xml/requiredextensions.php' );
include( IPS_ROOT_PATH . 'setup/xml/requiredextensions.php' );/*noLibHook*/
if ( is_array( $INSTALLDATA ) && count( $INSTALLDATA ) )
{
@@ -80,7 +80,7 @@ class upgrade_overview extends ipsCommand
$filesOK = FALSE;
/* Fetch core writeable files */
require_once( IPS_KERNEL_PATH . 'classXML.php' );
require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
$xml = new classXML( IPSSetUp::charSet );
try
@@ -99,7 +99,7 @@ class upgrade_overview extends ipsCommand
{
if ( $data['dir'] )
{
if ( ! @mkdir( $_path, 0777, TRUE ) )
if ( ! @mkdir( $_path, IPS_FOLDER_PERMISSION, TRUE ) )
{
$this->registry->output->addError( 'Директория не существует: "' . $data['path'] . '". Пожалуйста, создайте ее' );
}
@@ -122,7 +122,7 @@ class upgrade_overview extends ipsCommand
continue;
}
if ( ! @chmod( $_path, 0777 ) )
if ( ! @chmod( $_path, is_dir( $_path ) ? IPS_FOLDER_PERMISSION : IPS_FILE_PERMISSION ) )
{
if ( is_dir( $_path ) )
{
upload/admin/setup/applications/upgrade/sections/upgrade.php
+113 -77
View File
@@ -2,17 +2,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.1.4
* IP.Board v3.2.3
* Installer: Upgrader core file
* Last Updated: $LastChangedDate: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
* Last Updated: $LastChangedDate: 2011-09-27 21:33:45 -0400 (Tue, 27 Sep 2011) $
* </pre>
*
* @author $Author: terabyte $
* @author $Author: bfarber $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/community/board/license.html
* @license This is NULLED!
* @package IP.Board
* @link http://www.invisionpower.com
* @version $Rev: 6881 $
* @link http://hatynka.in
* @version $Rev: 9556 $
*
*/
@@ -83,7 +83,7 @@ class upgrade_upgrade extends ipsCommand
*
* @access public
* @param object Registry object
* @return void
* @return @e void
*/
public function doExecute( ipsRegistry $registry )
{
@@ -262,9 +262,9 @@ class upgrade_upgrade extends ipsCommand
$file = IPSLib::getAppDir( $this->_currentApp ) . '/setup/versions/upg_' . $this->_uipLong . '/' . $this->_dbDriver . '_updates.php';
/* Get file */
if ( file_exists( $file ) )
if ( is_file( $file ) )
{
require( $file );
require( $file );/*noLibHook*/
if ( is_array( $SQL ) AND count( $SQL ) > 0 )
{
@@ -284,7 +284,7 @@ class upgrade_upgrade extends ipsCommand
{
if ( preg_match( "/^create table(.+?)/i", $q ) )
{
$q = preg_replace( "/^(.+?)\);$/is", "\\1) TYPE={$this->settings['mysql_tbl_type']};", $q );
$q = preg_replace( "/^(.+?)\);$/is", "\\1) ENGINE={$this->settings['mysql_tbl_type']};", $q );
}
}
@@ -386,11 +386,11 @@ class upgrade_upgrade extends ipsCommand
$fileLegacy = IPSLib::getAppDir( $this->_currentApp ) . '/setup/versions/upg_' . $this->_uipLong . '/version_upgrade_' . $this->_dbDriver . '.php';
/* Got any file? */
if ( file_exists( $fileNewer ) )
if ( is_file( $fileNewer ) )
{
$file = $fileNewer;
}
else if ( file_exists( $fileLegacy ) )
else if ( is_file( $fileLegacy ) )
{
$file = $fileLegacy;
}
@@ -398,7 +398,7 @@ class upgrade_upgrade extends ipsCommand
/* Do we have a file? */
if ( $file )
{
require_once( $file );
require_once( $file );/*noLibHook*/
$upgrade = new version_upgrade();
$result = $upgrade->doExecute( $this->registry );
@@ -454,7 +454,9 @@ class upgrade_upgrade extends ipsCommand
$_in = ( $this->_currentApp == 'core' ) ? "'core', 'forums', 'members'" : "'" . $this->_currentApp . "'";
$this->DB->update( 'core_applications', array( 'app_long_version' => $this->_uipLong,
'app_version' => $this->_uipHuman ), 'app_directory IN (' . $_in . ')' );
'app_version' => $this->_uipHuman,
'app_website' => $this->_appData['website'],
'app_update_check' => $this->_appData['update_check'] ), 'app_directory IN (' . $_in . ')' );
}
else
{
@@ -507,7 +509,9 @@ class upgrade_upgrade extends ipsCommand
$_in = ( $this->_currentApp == 'core' ) ? "'core', 'forums', 'members'" : "'" . $this->_currentApp . "'";
$this->DB->update( 'core_applications', array( 'app_long_version' => $this->_uipLong,
'app_version' => $this->_uipHuman ), 'app_directory IN (' . $_in . ')' );
'app_version' => $this->_uipHuman,
'app_website' => $this->_appData['website'],
'app_update_check' => $this->_appData['update_check'] ), 'app_directory IN (' . $_in . ')' );
}
else
{
@@ -612,9 +616,9 @@ class upgrade_upgrade extends ipsCommand
$output[] = $next['title'] . ": Обновление модулей";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . $next['key'] . '_modules.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_modules.xml' ) )
{
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/applications.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/applications.php' );/*noLibHook*/
$apps = new admin_core_applications_applications();
$apps->makeRegistryShortcuts( $this->registry );
@@ -668,14 +672,14 @@ class upgrade_upgrade extends ipsCommand
$output[] = $next['title'] . ": Обновление настроек";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . $next['key'] . '_settings.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_settings.xml' ) )
{
//-----------------------------------------
// Continue
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/settings.php' );
$settings = new admin_core_tools_settings();
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/settings/settings.php' );/*noLibHook*/
$settings = new admin_core_settings_settings();
$settings->makeRegistryShortcuts( $this->registry );
$this->request['app_dir'] = $next['key'];
@@ -696,9 +700,9 @@ class upgrade_upgrade extends ipsCommand
/* Fetch known settings */
$knownSettings = array();
if ( file_exists( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' ) )
if ( is_file( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' ) )
{
require( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' );
require( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' );/*noLibHook*/
}
$settings->importAllSettings( 1, 1, $knownSettings );
@@ -737,9 +741,9 @@ class upgrade_upgrade extends ipsCommand
$previous = $_REQUEST['previous'];
if ( file_exists( IPS_ROOT_PATH .'setup/sql/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . '_install.php' ) )
if ( is_file( IPS_ROOT_PATH .'setup/sql/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . '_install.php' ) )
{
require_once( IPS_ROOT_PATH .'setup/sql/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . '_install.php' );
require_once( IPS_ROOT_PATH .'setup/sql/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . '_install.php' );/*noLibHook*/
$extra_install = new install_extra( $this->registry );
}
@@ -762,7 +766,7 @@ class upgrade_upgrade extends ipsCommand
$output[] = "Добавление шаблонов";
require_once( IPS_KERNEL_PATH . 'classXML.php' );
require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
$xml = new classXML( IPSSetUp::charSet );
//-----------------------------------------
@@ -775,7 +779,7 @@ class upgrade_upgrade extends ipsCommand
}
/* Skin Set Data */
$xml->load( IPS_PUBLIC_PATH . 'resources/skins/setsData.xml' );
$xml->load( IPS_ROOT_PATH . 'setup/xml/skins/setsData.xml' );
foreach( $xml->fetchElements( 'set' ) as $xmlelement )
{
@@ -795,9 +799,9 @@ class upgrade_upgrade extends ipsCommand
}
/* Load skin classes */
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
$skinFunctions = new skinImportExport( $this->registry );
@@ -831,7 +835,7 @@ class upgrade_upgrade extends ipsCommand
$output[] = $next['title'] . ": Обновление шаблонов {$skinData['set_name']}";
if ( file_exists( $_PATH . $next['key'] . '_' . $skinKey . '_templates.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_' . $skinKey . '_templates.xml' ) )
{
//-----------------------------------------
// Install
@@ -842,7 +846,7 @@ class upgrade_upgrade extends ipsCommand
$output[] = $next['title'] . ": " . intval( $return['insertCount'] ) . " шаблонов добавлено";
}
if ( file_exists( $_PATH . $next['key'] . '_' . $skinKey . '_css.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_' . $skinKey . '_css.xml' ) )
{
//-----------------------------------------
// Install
@@ -871,12 +875,14 @@ class upgrade_upgrade extends ipsCommand
foreach( $skinSets as $skinKey => $skinData )
{
/* Replacements */
if ( file_exists( IPS_PUBLIC_PATH . 'resources/skins/replacements_' . $skinKey . '.xml' ) )
if ( is_file( IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $skinKey . '.xml' ) )
{
$skinFunctions->importReplacementsXMLArchive( file_get_contents( IPS_PUBLIC_PATH . 'resources/skins/replacements_' . $skinKey . '.xml' ), $skinKey );
$skinFunctions->importReplacementsXMLArchive( file_get_contents( IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $skinKey . '.xml' ), $skinKey );
}
}
$skinFunctions->rebuildMobileSkinUserAgentsFromSetDataXml();
$skinFunctions->rebuildSkinSetsCache();
$output[] = "Все шаблоны обновлены";
@@ -914,13 +920,13 @@ class upgrade_upgrade extends ipsCommand
$output[] = $next['title'] . ": Обновление задач";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . $next['key'] . '_tasks.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_tasks.xml' ) )
{
//-----------------------------------------
// Continue
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/system/taskmanager.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/system/taskmanager.php' );/*noLibHook*/
$tasks = new admin_core_system_taskmanager();
$tasks->makeRegistryShortcuts( $this->registry );
@@ -977,7 +983,7 @@ class upgrade_upgrade extends ipsCommand
// Get the language stuff
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );/*noLibHook*/
$lang = new admin_core_languages_manage_languages();
$lang->makeRegistryShortcuts( $this->registry );
@@ -1054,7 +1060,7 @@ class upgrade_upgrade extends ipsCommand
// Get the language stuff
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );/*noLibHook*/
$lang = new admin_core_languages_manage_languages();
$lang->makeRegistryShortcuts( $this->registry );
@@ -1076,7 +1082,7 @@ class upgrade_upgrade extends ipsCommand
//-----------------------------------------
$this->request['file_location'] = $_PATH . $f->getFileName();
$lang->imprtFromXML( true, true, true, $next['key'], false, 1 );
$lang->imprtFromXML( true, true, true, $next['key'], true, 1 );
}
}
} catch ( Exception $e ) {}
@@ -1127,29 +1133,34 @@ class upgrade_upgrade extends ipsCommand
$output[] = $next['title'] . ": Обновление BB-кодов";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . $next['key'] . '_bbcode.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_bbcode.xml' ) )
{
//-----------------------------------------
// Continue
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php' );/*noLibHook*/
$bbcode = new admin_core_posts_bbcode();
$bbcode->makeRegistryShortcuts( $this->registry );
$bbcode->bbcodeImportDo( file_get_contents( $_PATH . $next['key'] . '_bbcode.xml' ) );
$_contents = file_get_contents( $_PATH . $next['key'] . '_bbcode.xml' );
if( $_contents )
{
$bbcode->bbcodeImportDo( $_contents );
}
}
$output[] = $next['title'] . ": Обновление медиа тегов";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . $next['key'] . '_mediatag.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_mediatag.xml' ) )
{
//-----------------------------------------
// Continue
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php' );/*noLibHook*/
$bbcode = new admin_core_posts_media();
$bbcode->makeRegistryShortcuts( $this->registry );
@@ -1193,7 +1204,7 @@ class upgrade_upgrade extends ipsCommand
$next = IPSSetUp::fetchNextApplication( $previous, '{app}_help.xml', $this->settings['gb_char_set'] );
require_once( IPS_KERNEL_PATH . 'classXML.php' );
require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
$xml = new classXML( IPSSetUp::charSet );
//-----------------------------------------
@@ -1202,15 +1213,17 @@ class upgrade_upgrade extends ipsCommand
if ( $next['key'] )
{
$output[] = $next['title'] . ": Обновление разделов помощи";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
$output[] = $next['title'] . ": Upgrading Public Help...";
if ( file_exists( $_PATH . $next['key'] . '_help.xml' ) )
if ( is_file( $_PATH . $next['key'] . '_help.xml' ) )
{
//-----------------------------------------
// Do it..
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/help.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/help.php' );/*noLibHook*/
$help = new admin_core_tools_help();
$help->makeRegistryShortcuts( $this->registry );
@@ -1267,13 +1280,13 @@ class upgrade_upgrade extends ipsCommand
$output[] = $next['title'] . ": Обновление модификаций";
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/xml/';
if ( file_exists( $_PATH . 'hooks.xml' ) )
if ( is_file( $_PATH . 'hooks.xml' ) )
{
//-----------------------------------------
// Continue
//-----------------------------------------
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/hooks.php' );
require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/hooks.php' );/*noLibHook*/
$hooks = new admin_core_applications_hooks();
$hooks->makeRegistryShortcuts( $this->registry );
@@ -1290,32 +1303,17 @@ class upgrade_upgrade extends ipsCommand
}
else
{
//-----------------------------------------
// ****** USER AGENTS
//-----------------------------------------
$output[] = "Добавление user-agent`ов по-умолчанию";
require_once( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php' );/*noLibHook*/
$userAgentFunctions = new userAgentFunctions( $this->registry );
$userAgentFunctions->rebuildMasterUserAgents();
//-----------------------------------------
// Build Calendar RSS
//-----------------------------------------
if( IPSLib::appIsInstalled('calendar') )
{
require_once( IPSLib::getAppDir('calendar') . '/modules_admin/calendar/calendars.php' );
$cal = new admin_calendar_calendar_calendars();
$cal->makeRegistryShortcuts( $this->registry );
$output[] = "Обновление RSS календаря";
$cal->calendarRSSCache();
}
//-----------------------------------------
// Next...
//-----------------------------------------
@@ -1353,11 +1351,11 @@ class upgrade_upgrade extends ipsCommand
{
$_PATH = IPSLib::getAppDir( $next['key'] ) . '/extensions/';
if ( file_exists( $_PATH . 'coreVariables.php' ) )
if ( is_file( $_PATH . 'coreVariables.php' ) )
{
# Grab cache master file
$CACHE = array();
require_once( $_PATH . 'coreVariables.php' );
require_once( $_PATH . 'coreVariables.php' );/*noLibHook*/
if ( is_array( $CACHE ) && count( $CACHE ) )
{
@@ -1396,7 +1394,7 @@ class upgrade_upgrade extends ipsCommand
//-----------------------------------------
# Grab cache master file
require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );
require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );/*noLibHook*/
/* Add handle */
$_tmp = new coreVariables();
@@ -1427,12 +1425,49 @@ class upgrade_upgrade extends ipsCommand
//-------------------------------------------------------------
$output[] = "Обновление кеша системных переменных";
$cache = array( 'mail_queue' => 0,
'task_next_run' => time() + 3600 );
$cache = ipsRegistry::cache()->getCache( 'systemvars' );
$cache['task_next_run'] = time() + 3600;
$cache['mail_queue'] = 0;
ipsRegistry::cache()->setCache( 'systemvars', $cache, array( 'array' => 1 ) );
//-------------------------------------------------------------
// License Key
//-------------------------------------------------------------
if( ipsRegistry::$settings['ipb_reg_number'] )
{
$output[] = "Обновление данных о лицензии...";
require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );/*noLibHook*/
$this->classFileManagement = new classFileManagement();
/* Query the api */
$response = $this->classFileManagement->getFileContents( "http://myipb.in/license.php?lk=" . ipsRegistry::$settings['ipb_reg_number'] . "&url=" . ipsRegistry::$settings['board_url'] . "&flush=1" );
/* Get License Data */
$licenseData = json_decode( $response, true );
/* Copyright Removal? */
if ( $licenseData['cr'] )
{
IPSLib::updateSettings( array( 'ipb_copy_number' => $licenseData['cr'], 'ips_cp_purchase' => 1 ) );
}
elseif ( $this->settings['ips_cp_purchase'] )
{
IPSLib::updateSettings( array( 'ips_cp_purchase' => 0 ) );
}
/* Save to cache */
$licenseData['_cached_date'] = time();
$licenseData['key']['_expires'] = $licenseData['key']['_expires'] ? $licenseData['key']['_expires'] : 9999999999;
$licenseData['key']['expires'] = $licenseData['key']['expires'] ? $licenseData['key']['expires'] : 9999999999;
ipsRegistry::cache()->setCache( 'licenseData', $licenseData, array( 'array' => 1 ) );
}
$output[] = "Весь кеш обновлен";
$this->_finishStep( $output, "Обновление: Кеш", 'upgrade&do=templatecache' );
@@ -1468,9 +1503,9 @@ class upgrade_upgrade extends ipsCommand
//-----------------------------------------
/* Load skin classes */
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
$skinFunctions = new skinImportExport( $this->registry );
@@ -1519,10 +1554,11 @@ class upgrade_upgrade extends ipsCommand
$skinFunctions->rebuildSkinSetsCache();
/* Rebuild FURL cache */
/* Rebuild FURL & GLOBAL caches */
try
{
IPSLib::cacheFurlTemplates();
IPSLib::cacheGlobalCaches();
}
catch( Exception $error )
{
@@ -1551,7 +1587,7 @@ class upgrade_upgrade extends ipsCommand
* @param string output
* @param string title
* @param string next step
* @return void
* @return @e void
*/
private function _finishStep( $output, $title, $nextStep )
{