Version 2.2.0 RC-1
This commit is contained in:
1 parent
f73f8bff6d
commit
22f1b963ee
1034 files changed
+178610
-70897
No files matched your search
@@ -2,23 +2,17 @@
|
||||
|
||||
/*
|
||||
+--------------------------------------------------------------------------
|
||||
| Invision Power Board 2.1.7
|
||||
| =============================================
|
||||
| Invision Power Board v<{%dyn.down.var.human.version%}>
|
||||
| ========================================
|
||||
| by Matthew Mecham
|
||||
| (c) 2001 - 2005 Invision Power Services, Inc.
|
||||
| (c) 2001 - 2004 Invision Power Services
|
||||
| http://www.invisionpower.com
|
||||
| =============================================
|
||||
| ========================================
|
||||
| Web: http://www.invisionboard.com
|
||||
| http://www.ibresource.ru/products/invisionpowerboard/
|
||||
| Time: Tuesday 18th of July 2006 05:56:00 PM
|
||||
| Release: 52f408a29988b02f45b5e6f4ba5af0ae
|
||||
| Time: <{%dyn.down.var.time%}>
|
||||
| Release: <{%dyn.down.var.md5%}>
|
||||
| Email: matt@invisionpower.com
|
||||
| Licence Info: http://www.invisionboard.com/?license
|
||||
| http://www.ibresource.ru/license
|
||||
+---------------------------------------------------------------------------
|
||||
| INVISION POWER BOARD IS NOT FREE / OPEN SOURCE!
|
||||
+---------------------------------------------------------------------------
|
||||
| INVISION POWER BOARD ÍÅ ßÂËßÅÒÑß ÁÅÑÏËÀÒÍÛÌ ÏÐÎÃÐÀÌÌÍÛÌ ÎÁÅÑÏÅ×ÅÍÈÅÌ!
|
||||
| Ïðàâà íà ÏÎ ïðèíàäëåæàò Invision Power Services
|
||||
+---------------------------------------------------------------------------
|
||||
|
|
||||
| > IPB UPGRADE MODULE:: IPB 2.1.2 -> 2.1.3
|
||||
@@ -31,18 +25,19 @@
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
{
|
||||
print "<h1>Íåêîððåêòíûé àäðåñ</h1>Âû íå èìååòå äîñòóïà ê ýòîìó ôàéëó íàïðÿìóþ. Åñëè âû íåäàâíî îáíîâëÿëè ôîðóì, âû äîëæíû îáíîâèòü âñå ñîîòâåòñòâóþùèå ôàéëû.";
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
class version_upgrade
|
||||
{
|
||||
var $this_version = '21010';
|
||||
var $upgrade_from = '21009';
|
||||
var $first_step = 'îáíîâèò âàøó áàçó äàííûõ äëÿ âñòàâêè íîâûõ ïîëåé è òàáëèö';
|
||||
var $first_step = 'update your database to include the new schematic';
|
||||
var $md5_check = '';
|
||||
var $base_url = '';
|
||||
var $mod_to_run = '';
|
||||
var $error = array();
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
// CONSTRUCTOR
|
||||
@@ -109,170 +104,8 @@ class version_upgrade
|
||||
if ( file_exists( THIS_PATH . 'upg_' . $this->ipsclass->current_upgrade . '/' . strtolower($this->ipsclass->vars['sql_driver']) . $file ) )
|
||||
{
|
||||
require_once( THIS_PATH . 'upg_' . $this->ipsclass->current_upgrade . '/' . strtolower($this->ipsclass->vars['sql_driver']) . $file );
|
||||
|
||||
|
||||
// IBR Fix Portal Settings
|
||||
|
||||
$query1 = $this->ipsclass->DB->query("SELECT conf_title_id FROM ibf_conf_settings_titles WHERE conf_title_keyword = 'portal_poll' LIMIT 0,1");
|
||||
if ( $portal_poll = $this->ipsclass->DB->fetch_row( $query1 ) )
|
||||
{
|
||||
$this->ipsclass->DB->build_query( array( 'select' => 'conf_id',
|
||||
'from' => 'conf_settings',
|
||||
'where' => 'conf_key=\'poll_poll_url\'',
|
||||
'limit' => array( 0, 1 ) ) );
|
||||
$this->ipsclass->DB->exec_query();
|
||||
|
||||
if ( $opt01 = $this->ipsclass->DB->fetch_row() )
|
||||
{
|
||||
$this->ipsclass->DB->do_update( 'conf_settings', array( 'conf_group' => $portal_poll['conf_title_id'] ), 'conf_key=\'poll_poll_url\'' );
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->DB->do_insert( 'conf_settings', array( 'conf_title' => 'Ââåäèòå URL òåìû ñ èìïîðòèðóåìûì îïðîñîì', 'conf_group' => $portal_poll['conf_title_id'], 'conf_description' => 'Îñòàâüòå ïóñòûì, åñëè íå õîòèòå, ÷òîáû îòîáðàæàëñÿ áëîê ñ îïðîñîì', 'conf_type' => 'input', 'conf_key' => 'poll_poll_url', 'conf_protected' => '1', 'conf_position' => '17', 'conf_end_group' => '0', 'conf_add_cache' => '0' ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->DB->do_insert( 'conf_settings_titles', array( 'conf_title_keyword' => 'portal_poll', 'conf_title_title' => 'Ïîðòàë: Îïðîñ', 'conf_title_desc' => 'Íàñòðîéêè âûâîäà îïðîñà â ïîðòàë.', 'conf_title_noshow' => '1' ) );
|
||||
$fix1 = $this->ipsclass->DB->query("SELECT conf_title_id FROM ibf_conf_settings_titles WHERE conf_title_keyword = 'portal_poll' LIMIT 0,1");
|
||||
if ( $pix1 = $this->ipsclass->DB->fetch_row( $fix1 ) )
|
||||
{
|
||||
|
||||
|
||||
$this->ipsclass->DB->build_query( array( 'select' => 'conf_id',
|
||||
'from' => 'conf_settings',
|
||||
'where' => 'conf_key=\'poll_poll_url\'',
|
||||
'limit' => array( 0, 1 ) ) );
|
||||
$this->ipsclass->DB->exec_query();
|
||||
|
||||
if ( $pixopt01 = $this->ipsclass->DB->fetch_row() )
|
||||
{
|
||||
$this->ipsclass->DB->do_update( 'conf_settings', array( 'conf_group' => $pix1['conf_title_id'] ), 'conf_key=\'poll_poll_url\'' );
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->DB->do_insert( 'conf_settings', array( 'conf_title' => 'Ââåäèòå URL òåìû ñ èìïîðòèðóåìûì îïðîñîì', 'conf_group' => $pix1['conf_title_id'], 'conf_description' => 'Îñòàâüòå ïóñòûì, åñëè íå õîòèòå, ÷òîáû îòîáðàæàëñÿ áëîê ñ îïðîñîì', 'conf_type' => 'input', 'conf_key' => 'poll_poll_url', 'conf_protected' => '1', 'conf_position' => '17', 'conf_end_group' => '0', 'conf_add_cache' => '0' ) );
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$query2 = $this->ipsclass->DB->query("SELECT conf_title_id FROM ibf_conf_settings_titles WHERE conf_title_keyword = 'portal_recent_topics' LIMIT 0,1");
|
||||
if ( $portal_recent = $this->ipsclass->DB->fetch_row( $query2 ) )
|
||||
{
|
||||
// 1
|
||||
$this->ipsclass->DB->build_query( array( 'select' => 'conf_id',
|
||||
'from' => 'conf_settings',
|
||||
'where' => 'conf_key=\'recent_topics_discuss_number\'',
|
||||
'limit' => array( 0, 1 ) ) );
|
||||
$this->ipsclass->DB->exec_query();
|
||||
|
||||
if ( $opt02 = $this->ipsclass->DB->fetch_row() )
|
||||
{
|
||||
$this->ipsclass->DB->do_update( 'conf_settings', array( 'conf_group' => $portal_recent['conf_title_id'] ), 'conf_key=\'recent_topics_discuss_number\'' );
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->DB->do_insert( 'conf_settings', array( 'conf_title' => 'Êîëè÷åñòâî îòîáðàæàåìûõ òåì', 'conf_group' => $portal_recent['conf_title_id'], 'conf_description' => 'Êîëè÷åñòâî îòîáðàæàåìûõ çàãîëîâêîâ òåì äëÿ ïîðòàëüíîãî òýãà recent_discussions_last_x', 'conf_type' => 'input', 'conf_key' => 'recent_topics_discuss_number', 'conf_default' => '1','conf_protected' => '1', 'conf_position' => '9', 'conf_start_group' => 'Ïîñëåäíèå îáñóæäåíèÿ', 'conf_end_group' => '0', 'conf_add_cache' => '0' ) );
|
||||
}
|
||||
|
||||
// 2
|
||||
$this->ipsclass->DB->build_query( array( 'select' => 'conf_id',
|
||||
'from' => 'conf_settings',
|
||||
'where' => 'conf_key=\'recent_topics_article_forum\'',
|
||||
'limit' => array( 0, 1 ) ) );
|
||||
$this->ipsclass->DB->exec_query();
|
||||
|
||||
if ( $opt03 = $this->ipsclass->DB->fetch_row() )
|
||||
{
|
||||
$this->ipsclass->DB->do_update( 'conf_settings', array( 'conf_group' => $portal_recent['conf_title_id'] ), 'conf_key=\'recent_topics_article_forum\'' );
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->DB->do_insert( 'conf_settings', array( 'conf_title' => 'Èç êàêèõ ôîðóìîâ ýêñïîðòèðîâàòü íîâîñòè?', 'conf_group' => $portal_recent['conf_title_id'], 'conf_description' => 'Âû ìîæåòå âûáèðàòü íåñêîëüêî ôîðóìîâ.', 'conf_type' => 'multi', 'conf_key' => 'recent_topics_article_forum', 'conf_extra' => '#show_forums#', 'conf_evalphp' => 'if ( $save == 1){ if ( is_array($_POST[\'recent_topics_article_forum\']) ) { $_POST[\'recent_topics_article_forum\'] = implode(\",\",$_POST[\'recent_topics_article_forum\']); } else { $_POST[\'recent_topics_article_forum\'] = \"\"; } $key = \'recent_topics_article_forum\';}if ( $show == 1 ){$key = \'recent_topics_article_forum[]\';}', 'conf_protected' => '1', 'conf_position' => '3', 'conf_end_group' => '0', 'conf_add_cache' => '0' ) );
|
||||
}
|
||||
|
||||
// 3
|
||||
$this->ipsclass->DB->build_query( array( 'select' => 'conf_id',
|
||||
'from' => 'conf_settings',
|
||||
'where' => 'conf_key=\'recent_topics_article_max\'',
|
||||
'limit' => array( 0, 1 ) ) );
|
||||
$this->ipsclass->DB->exec_query();
|
||||
|
||||
if ( $opt04 = $this->ipsclass->DB->fetch_row() )
|
||||
{
|
||||
$this->ipsclass->DB->do_update( 'conf_settings', array( 'conf_group' => $portal_recent['conf_title_id'] ), 'conf_key=\'recent_topics_article_max\'' );
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->DB->do_insert( 'conf_settings', array( 'conf_title' => 'Êîëè÷åñòâî íîâîñòåé äëÿ îòîáðàæåíèÿ', 'conf_group' => $portal_recent['conf_title_id'], 'conf_description' => 'Êîëè÷åñòâî òåì, îòîáðàæàåìûõ â ïîðòàëüíîì òýãå recent_topics_last_x', 'conf_type' => 'input', 'conf_key' => 'recent_topics_article_max', 'conf_default' => '15','conf_protected' => '1', 'conf_position' => '4', 'conf_start_group' => 'Ïîñëåäíèå íîâîñòè', 'conf_end_group' => '1', 'conf_add_cache' => '0' ) );
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
|
||||
$this->ipsclass->DB->do_insert( 'conf_settings_titles', array( 'conf_title_keyword' => 'portal_recent_topics', 'conf_title_title' => 'Ïîðòàë: Ïîñëåäíèå îáñóæäåíèÿ', 'conf_title_desc' => 'Íàñòðîéêè âûâîäà ïîñëåäíèõ îáñóæäåíèé â ïîðòàë', 'conf_title_noshow' => '1' ) );
|
||||
$fix2 = $this->ipsclass->DB->query("SELECT conf_title_id FROM ibf_conf_settings_titles WHERE conf_title_keyword = 'portal_recent_topics' LIMIT 0,1");
|
||||
if ( $pix2 = $this->ipsclass->DB->fetch_row( $fix2 ) )
|
||||
{
|
||||
// 1
|
||||
$this->ipsclass->DB->build_query( array( 'select' => 'conf_id',
|
||||
'from' => 'conf_settings',
|
||||
'where' => 'conf_key=\'recent_topics_discuss_number\'',
|
||||
'limit' => array( 0, 1 ) ) );
|
||||
$this->ipsclass->DB->exec_query();
|
||||
|
||||
if ( $opt02 = $this->ipsclass->DB->fetch_row() )
|
||||
{
|
||||
$this->ipsclass->DB->do_update( 'conf_settings', array( 'conf_group' => $pix2['conf_title_id'] ), 'conf_key=\'recent_topics_discuss_number\'' );
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->DB->do_insert( 'conf_settings', array( 'conf_title' => 'Êîëè÷åñòâî îòîáðàæàåìûõ òåì', 'conf_group' => $pix2['conf_title_id'], 'conf_description' => 'Êîëè÷åñòâî îòîáðàæàåìûõ çàãîëîâêîâ òåì äëÿ ïîðòàëüíîãî òýãà recent_discussions_last_x', 'conf_type' => 'input', 'conf_key' => 'recent_topics_discuss_number', 'conf_default' => '1','conf_protected' => '1', 'conf_position' => '9', 'conf_start_group' => 'Ïîñëåäíèå îáñóæäåíèÿ', 'conf_end_group' => '0', 'conf_add_cache' => '0' ) );
|
||||
}
|
||||
|
||||
// 2
|
||||
$this->ipsclass->DB->build_query( array( 'select' => 'conf_id',
|
||||
'from' => 'conf_settings',
|
||||
'where' => 'conf_key=\'recent_topics_article_forum\'',
|
||||
'limit' => array( 0, 1 ) ) );
|
||||
$this->ipsclass->DB->exec_query();
|
||||
|
||||
if ( $opt03 = $this->ipsclass->DB->fetch_row() )
|
||||
{
|
||||
$this->ipsclass->DB->do_update( 'conf_settings', array( 'conf_group' => $pix2['conf_title_id'] ), 'conf_key=\'recent_topics_article_forum\'' );
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->DB->do_insert( 'conf_settings', array( 'conf_title' => 'Èç êàêèõ ôîðóìîâ ýêñïîðòèðîâàòü íîâîñòè?', 'conf_group' => $pix2['conf_title_id'], 'conf_description' => 'Âû ìîæåòå âûáèðàòü íåñêîëüêî ôîðóìîâ.', 'conf_type' => 'multi', 'conf_key' => 'recent_topics_article_forum', 'conf_extra' => '#show_forums#', 'conf_evalphp' => 'if ( $save == 1){ if ( is_array($_POST[\'recent_topics_article_forum\']) ) { $_POST[\'recent_topics_article_forum\'] = implode(\",\",$_POST[\'recent_topics_article_forum\']); } else { $_POST[\'recent_topics_article_forum\'] = \"\"; } $key = \'recent_topics_article_forum\';}if ( $show == 1 ){$key = \'recent_topics_article_forum[]\';}', 'conf_protected' => '1', 'conf_position' => '3', 'conf_end_group' => '0', 'conf_add_cache' => '0' ) );
|
||||
}
|
||||
|
||||
// 3
|
||||
$this->ipsclass->DB->build_query( array( 'select' => 'conf_id',
|
||||
'from' => 'conf_settings',
|
||||
'where' => 'conf_key=\'recent_topics_article_max\'',
|
||||
'limit' => array( 0, 1 ) ) );
|
||||
$this->ipsclass->DB->exec_query();
|
||||
|
||||
if ( $opt04 = $this->ipsclass->DB->fetch_row() )
|
||||
{
|
||||
$this->ipsclass->DB->do_update( 'conf_settings', array( 'conf_group' => $pix2['conf_title_id'] ), 'conf_key=\'recent_topics_article_max\'' );
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->DB->do_insert( 'conf_settings', array( 'conf_title' => 'Êîëè÷åñòâî íîâîñòåé äëÿ îòîáðàæåíèÿ', 'conf_group' => $pix2['conf_title_id'], 'conf_description' => 'Êîëè÷åñòâî òåì, îòîáðàæàåìûõ â ïîðòàëüíîì òýãå recent_topics_last_x', 'conf_type' => 'input', 'conf_key' => 'recent_topics_article_max', 'conf_default' => '15','conf_protected' => '1', 'conf_position' => '4', 'conf_start_group' => 'Ïîñëåäíèå íîâîñòè', 'conf_end_group' => '1', 'conf_add_cache' => '0' ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// IBR Fix end
|
||||
|
||||
$this->ipsclass->DB->return_die = 1;
|
||||
|
||||
foreach( $SQL as $q )
|
||||
{
|
||||
@@ -280,14 +113,30 @@ class version_upgrade
|
||||
|
||||
$this->ipsclass->DB->query( $q );
|
||||
|
||||
$cnt++;
|
||||
if ( $this->ipsclass->DB->error )
|
||||
{
|
||||
$this->error[] = $this->ipsclass->DB->error;
|
||||
}
|
||||
else
|
||||
{
|
||||
$cnt++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$this->ipsclass->core->redirect( "index.php?act=done&loginkey={$this->ipsclass->input['loginkey']}&securekey={$this->ipsclass->input['securekey']}&mid={$this->ipsclass->input['mid']}",
|
||||
"$cnt çàïðîñîâ âûïîëíåíî...." );
|
||||
if ( count($this->error) )
|
||||
{
|
||||
$this->ipsclass->core->show_error( implode( "<br />", $this->error ), "done" );
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->core->redirect( "index.php?act=done&loginkey={$this->ipsclass->input['loginkey']}&securekey={$this->ipsclass->input['securekey']}&mid={$this->ipsclass->input['mid']}",
|
||||
"$cnt queries run...." );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
// INTRO
|
||||
/*-------------------------------------------------------------------------*/
|
||||
@@ -296,25 +145,25 @@ class version_upgrade
|
||||
{
|
||||
$this->ipsclass->template->content .= "
|
||||
<div class='tableborder'>
|
||||
<div class='maintitle'>Äîáðî ïîæàëîâàòü â ñèñòåìó îáíîâëåíèÿ IPB</div>
|
||||
<div class='tdrow1' style='padding:6px'>Ýòîò ìîäóëü îáíîâèò âàø ôîðóì ñ <b>{$this->ipsclass->versions[$this->upgrade_from]}</b> äî <b>{$this->ipsclass->versions[$this->this_version]}</b>
|
||||
<br /><br />Ýòîò ïåðâûé ýòàï {$this->first_step}
|
||||
<div class='maintitle'>Welcome to the IPB Upgrade System</div>
|
||||
<div class='tdrow1' style='padding:6px'>This upgrade module will upgrade you from <b>{$this->ipsclass->versions[$this->upgrade_from]}</b> to <b>{$this->ipsclass->versions[$this->this_version]}</b>
|
||||
<br /><br />This first step will {$this->first_step}
|
||||
<br />
|
||||
";
|
||||
|
||||
if ( ! is_writeable( CACHE_PATH . 'cache/skin_cache' ) )
|
||||
{
|
||||
$this->ipsclass->template->content .= "<div class='warnbox'><strong>ÂÍÈÌÀÍÈÅ: Ïàïêà cache/skin_cache íåäîñòóïíà äëÿ çàïèñè</strong><br />
|
||||
Ïîæàëóéñòà, ïðîâåðüòå CHMOD äëÿ ýòîé ïàïêè. Åñëè âû ïðîèãíîðèðóåòå ýòî ïðåäóïðåæäåíèå, òî ôàéëû ñòèëåé
|
||||
ìîãóò íåêîððåêòíî óñòàíîâèòüñÿ.</div>";
|
||||
$this->ipsclass->template->content .= "<div class='warnbox'><strong>WARNING: cache/skin_cache is not writeable</strong><br />
|
||||
Please check the CHMOD value on this folder before continuing. Failure to do so could mean that
|
||||
your skin files will not be installed correctly.</div>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->ipsclass->template->content .= "<div align='center'><span style='font-weight:bold;font-size:14px'>» <a href='{$this->base_url}&workact=sql'>Äàëåå ...</a></span></div>
|
||||
$this->ipsclass->template->content .= "<div align='center'><span style='font-weight:bold;font-size:14px'>» <a href='{$this->base_url}&workact=sql'>Proceed ...</a></span></div>
|
||||
</div>
|
||||
</div>
|
||||
<br />
|
||||
<div align='center'>Ïîñëå ýòîãî ìîäóëÿ áóäåò çàïóùåíî: {$this->mod_to_run}</div>";
|
||||
<div align='center'>Modules to run after this module: {$this->mod_to_run}</div>";
|
||||
}
|
||||
|
||||
$this->ipsclass->template->output();
|
||||
|
||||
Reference in new issue
Block a user