mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-23 14:44:29 +02:00
Code Issues Releases Wiki Activity

Issue #1109, Fixes #830, Fixes #731, Fixes #710, Fixes #608, Fixes #1012 : v1 -> v2 Upgrade-Routine fixes (including forum plugin)

Browse Source
This commit is contained in:
Cameron
2015-08-24 17:39:28 -07:00
parent 29b405d31d
commit cffb369751
18 changed files with 265 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
e107_plugins/forum/forum_setup.php
View File

@@ -64,23 +64,39 @@ class forum_setup
{
e107::getDb()->gen("ALTER TABLE `#forum_thread` DROP `thread_sef` ");
}
return false;
}
function upgrade_pre($var)
{
//Redirect upgrade to customized upgrade routine
e107::getRedirect()->redirect(e_PLUGIN_ABS.'forum/forum_update.php');
$sql = e107::getDb();
if(!$sql->isTable('forum_t')) // no table, so run a default plugin install procedure.
{
return false;
// e107::getSingleton('e107plugin')->refresh('forum');
}
else
{
e107::getRedirect()->go(e_PLUGIN_ABS.'forum/forum_update.php'); //Redirect upgrade to customized upgrade routine
}
//header('Location: '.e_PLUGIN.'forum/forum_update.php');
}
// After Automatic Upgrade Routine has completed.. run this. ;-)
function upgrade_post($var)
{
$mes = e107::getMessage();
$mes->addSuccess("Migration is required. Please click 'Continue'.<br /><a class='btn btn-primary' href='".e_PLUGIN."forum/forum_update.php'>Continue</a>");
{
$sql = e107::getDb();
if($sql->isEmpty('forum_thread') === true && $sql->isTable('forum_t') && $sql->isEmpty('forum_t') === false)
{
$mes = e107::getMessage();
$mes->addSuccess("Migration is required. Please click 'Continue'.<br /><a class='btn btn-primary' href='".e_PLUGIN."forum/forum_update.php'>Continue</a>");
}
}
}

31
e107_plugins/forum/forum_update.php
View File

@@ -250,15 +250,17 @@ function step3()
$fieldList = array(
'plugin_forum_posts' => EUF_INTEGER,
'plugin_forum_viewed' => EUF_TEXTAREA
'plugin_forum_posts' => 'integer',
'plugin_forum_viewed' => 'radio'
);
$failed = false;
$ext = e107::getUserExt();
foreach ($fieldList as $fieldName => $fieldType)
{
$result = e107::getUserExt()->user_extended_add_system($fieldName, $fieldType);
$result = $ext->user_extended_add_system($fieldName, $fieldType);
if ($result === true)
{
@@ -267,6 +269,7 @@ function step3()
else
{
$mes -> addError('Creating extended user field user_' . $fieldName);
$mes->addDebug(print_a($result,true));
$failed = true;
}
}
@@ -550,7 +553,7 @@ function renderProgress($caption, $step)
<div class="row-fluid">
<div class="span9 well">
<div class="progress progress-success progress-striped active" id="progressouter">
<div class="bar" id="progress"></div>
<div class="progress-bar bar" role="progressbar" id="progress"></div>
</div>
<a id="'.$thisStep.'" data-loading-text="Please wait..." data-progress="' . e_SELF . '" data-progress-target="progress" data-progress-mode="'.$step.'" data-progress-show="'.$nextStep.'" data-progress-hide="'.$thisStep.'" class="btn btn-primary e-progress" >'.$caption.'</a>
@@ -1355,12 +1358,11 @@ class forumUpgrade
function setNewVersion()
{
$pref = e107::getPref();
$sql = e107::getDb();
$sql -> update('plugin', "plugin_version = '{$this->newVersion}' WHERE plugin_name='Forum'");
$pref['plug_installed']['forum'] = $this -> newVersion;
save_prefs();
e107::getConfig()->setPref('plug_installed/forum', $this->newVersion)->save(false,true,false);
return "Forum Version updated to version: {$this->newVersion} <br />";
}
@@ -1740,14 +1742,17 @@ function forum_update_adminmenu()
$var[14]['text'] = 'Reset';
$var[14]['link'] = e_SELF . "?reset";
$var[15]['text'] = 'Reset to 6';
$var[15]['link'] = e_SELF . "?step=6&reset=6";
$var[15]['text'] = 'Reset to 3';
$var[15]['link'] = e_SELF . "?step=3&reset=3";
$var[16]['text'] = 'Reset to 7';
$var[16]['link'] = e_SELF . "?step=7&reset=7";
$var[16]['text'] = 'Reset to 6';
$var[16]['link'] = e_SELF . "?step=6&reset=6";
$var[17]['text'] = 'Reset to 7';
$var[17]['link'] = e_SELF . "?step=7&reset=7";
$var[17]['text'] = 'Reset to 10';
$var[17]['link'] = e_SELF . "?step=10&reset=10";
$var[18]['text'] = 'Reset to 10';
$var[18]['link'] = e_SELF . "?step=10&reset=10";
}