mirror of
https://github.com/Piwigo/Piwigo.git
synced 2025-04-26 19:29:58 +03:00
* feature 3142: upgrade script to Piwigo 2.7
* link to Tour 2_7_0 at the end of upgrade * activate plugin Take a Tour by default git-svn-id: http://piwigo.org/svn/trunk@29665 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
parent
4e612f3e59
commit
b0cc8f1bc2
7 changed files with 194 additions and 15 deletions
|
|
@ -87,6 +87,24 @@ function activate_core_themes()
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Automatically activate some core plugins
|
||||
*/
|
||||
function activate_core_plugins()
|
||||
{
|
||||
include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php');
|
||||
|
||||
$plugins = new plugins();
|
||||
|
||||
foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
|
||||
{
|
||||
if (in_array($plugin_id, array('TakeATour')))
|
||||
{
|
||||
$plugins->perform_action('activate', $plugin_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Connect to database during installation. Uses $_POST.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ body {
|
|||
#content {
|
||||
min-height:0;
|
||||
border:none;
|
||||
margin:1em auto;
|
||||
}
|
||||
|
||||
#theHeader {
|
||||
|
|
@ -103,6 +104,7 @@ input[type="submit"], input[type="button"], a.bigButton {
|
|||
input[type="submit"]:hover, input[type="button"]:hover, a.bigButton:hover {
|
||||
background-color:#ff7700;
|
||||
color:white;
|
||||
text-decoration:none;
|
||||
}
|
||||
|
||||
input[type="text"], input[type="password"], select {
|
||||
|
|
@ -214,7 +216,7 @@ input[type="text"]:focus, input[type="password"]:focus, select:focus {
|
|||
</fieldset>
|
||||
|
||||
<p>
|
||||
<a class="bigButton" href="index.php">{'Home'|@translate}</a>
|
||||
<a class="bigButton" href="{$button_link}">{$button_label}</a>
|
||||
</p>
|
||||
{/if}
|
||||
|
||||
|
|
|
|||
|
|
@ -1512,7 +1512,7 @@ function load_language($filename, $dirname = '', $options = array())
|
|||
}
|
||||
$dirname .= 'language/';
|
||||
|
||||
$default_language = defined('PHPWG_INSTALLED') ?
|
||||
$default_language = defined('PHPWG_INSTALLED') and !defined('UPGRADES_PATH') ?
|
||||
get_default_language() : PHPWG_DEFAULT_LANGUAGE;
|
||||
|
||||
// construct list of potential languages
|
||||
|
|
|
|||
|
|
@ -366,6 +366,7 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
|
|||
define('PWG_CHARSET', 'utf-8');
|
||||
}
|
||||
activate_core_themes();
|
||||
activate_core_plugins();
|
||||
|
||||
$insert = array(
|
||||
'id' => 1,
|
||||
|
|
|
|||
|
|
@ -121,5 +121,5 @@ echo '</pre>';
|
|||
ob_end_clean();
|
||||
|
||||
// now we upgrade from 2.6.0
|
||||
// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.6.0.php');
|
||||
include_once(PHPWG_ROOT_PATH.'install/upgrade_2.6.0.php');
|
||||
?>
|
||||
|
|
|
|||
125
install/upgrade_2.6.0.php
Normal file
125
install/upgrade_2.6.0.php
Normal file
|
|
@ -0,0 +1,125 @@
|
|||
<?php
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | Piwigo - a PHP based photo gallery |
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org |
|
||||
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
|
||||
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | This program is free software; you can redistribute it and/or modify |
|
||||
// | it under the terms of the GNU General Public License as published by |
|
||||
// | the Free Software Foundation |
|
||||
// | |
|
||||
// | This program is distributed in the hope that it will be useful, but |
|
||||
// | WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
||||
// | General Public License for more details. |
|
||||
// | |
|
||||
// | You should have received a copy of the GNU General Public License |
|
||||
// | along with this program; if not, write to the Free Software |
|
||||
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
|
||||
// | USA. |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
if (!defined('PHPWG_ROOT_PATH'))
|
||||
{
|
||||
die ('This page cannot be loaded directly, load upgrade.php');
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE)
|
||||
{
|
||||
die ('Hacking attempt!');
|
||||
}
|
||||
}
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | Fill upgrade table without applying upgrade |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
// retrieve already applied upgrades
|
||||
$query = '
|
||||
SELECT id
|
||||
FROM '.PREFIX_TABLE.'upgrade
|
||||
;';
|
||||
$applied = array_from_query($query, 'id');
|
||||
|
||||
// retrieve existing upgrades
|
||||
$existing = get_available_upgrade_ids();
|
||||
|
||||
// which upgrades need to be applied?
|
||||
$to_apply = array_diff($existing, $applied);
|
||||
$inserts = array();
|
||||
foreach ($to_apply as $upgrade_id)
|
||||
{
|
||||
if ($upgrade_id >= 140) // TODO change on each release
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
array_push(
|
||||
$inserts,
|
||||
array(
|
||||
'id' => $upgrade_id,
|
||||
'applied' => CURRENT_DATE,
|
||||
'description' => '[migration from 2.6.0 to '.PHPWG_VERSION.'] not applied', // TODO change on each release
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (!empty($inserts))
|
||||
{
|
||||
mass_inserts(
|
||||
'`'.UPGRADE_TABLE.'`',
|
||||
array_keys($inserts[0]),
|
||||
$inserts
|
||||
);
|
||||
}
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | Perform upgrades |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
ob_start();
|
||||
echo '<pre>';
|
||||
|
||||
for ($upgrade_id = 140; $upgrade_id <= 144; $upgrade_id++) // TODO change on each release
|
||||
{
|
||||
if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// maybe the upgrade task has already been applied in a previous and
|
||||
// incomplete upgrade
|
||||
if (in_array($upgrade_id, $applied))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
unset($upgrade_description);
|
||||
|
||||
echo "\n\n";
|
||||
echo '=== upgrade '.$upgrade_id."\n";
|
||||
|
||||
// include & execute upgrade script. Each upgrade script must contain
|
||||
// $upgrade_description variable which describe briefly what the upgrade
|
||||
// script does.
|
||||
include(UPGRADES_PATH.'/'.$upgrade_id.'-database.php');
|
||||
|
||||
// notify upgrade (TODO change on each release)
|
||||
$query = '
|
||||
INSERT INTO `'.PREFIX_TABLE.'upgrade`
|
||||
(id, applied, description)
|
||||
VALUES
|
||||
(\''.$upgrade_id.'\', NOW(), \'[migration from 2.6.0 to '.PHPWG_VERSION.'] '.$upgrade_description.'\')
|
||||
;';
|
||||
pwg_query($query);
|
||||
}
|
||||
|
||||
echo '</pre>';
|
||||
ob_end_clean();
|
||||
|
||||
// now we upgrade from 2.7.0
|
||||
// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.7.0.php');
|
||||
?>
|
||||
57
upgrade.php
57
upgrade.php
|
|
@ -138,7 +138,6 @@ function print_time($message)
|
|||
// +-----------------------------------------------------------------------+
|
||||
include(PHPWG_ROOT_PATH . 'admin/include/languages.class.php');
|
||||
$languages = new languages('utf-8');
|
||||
|
||||
if (isset($_GET['language']))
|
||||
{
|
||||
$language = strip_tags($_GET['language']);
|
||||
|
|
@ -207,7 +206,6 @@ load_language( 'common.lang', '', array('language'=>$language, 'target_charset'=
|
|||
load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
|
||||
load_language( 'install.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
|
||||
load_language( 'upgrade.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
|
||||
|
||||
// check php version
|
||||
if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<'))
|
||||
{
|
||||
|
|
@ -339,6 +337,10 @@ else if (!in_array('website_url', $columns_of[PREFIX_TABLE.'comments']))
|
|||
{
|
||||
$current_release = '2.4.0';
|
||||
}
|
||||
else if (!in_array('nb_available_tags', $columns_of[PREFIX_TABLE.'user_cache']))
|
||||
{
|
||||
$current_release = '2.5.0';
|
||||
}
|
||||
else
|
||||
{
|
||||
// retrieve already applied upgrades
|
||||
|
|
@ -348,9 +350,9 @@ SELECT id
|
|||
;';
|
||||
$applied_upgrades = array_from_query($query, 'id');
|
||||
|
||||
if (!in_array(139, $applied_upgrades))
|
||||
if (!in_array(144, $applied_upgrades))
|
||||
{
|
||||
$current_release = '2.5.0';
|
||||
$current_release = '2.6.0';
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -379,6 +381,10 @@ if ((isset($_POST['submit']) or isset($_GET['now']))
|
|||
$upgrade_file = PHPWG_ROOT_PATH.'install/upgrade_'.$current_release.'.php';
|
||||
if (is_file($upgrade_file))
|
||||
{
|
||||
// reset SQL counters
|
||||
$page['queries_time'] = 0;
|
||||
$page['count_queries'] = 0;
|
||||
|
||||
$page['upgrade_start'] = get_moment();
|
||||
$conf['die_on_sql_error'] = false;
|
||||
include($upgrade_file);
|
||||
|
|
@ -438,14 +444,6 @@ if ((isset($_POST['submit']) or isset($_GET['now']))
|
|||
$page['infos_sav'] = $page['infos'];
|
||||
$page['infos'] = array();
|
||||
|
||||
/* might be usefull when we will have a real integrity checker
|
||||
$query = '
|
||||
REPLACE INTO '.PLUGINS_TABLE.'
|
||||
(id, state)
|
||||
VALUES (\'c13y_upgrade\', \'active\')
|
||||
;';
|
||||
pwg_query($query);*/
|
||||
|
||||
$query = '
|
||||
REPLACE INTO '.PLUGINS_TABLE.'
|
||||
(id, state)
|
||||
|
|
@ -453,6 +451,41 @@ REPLACE INTO '.PLUGINS_TABLE.'
|
|||
;';
|
||||
pwg_query($query);
|
||||
|
||||
$template->assign(
|
||||
array(
|
||||
'button_label' => l10n('Home'),
|
||||
'button_link' => 'index.php',
|
||||
)
|
||||
);
|
||||
|
||||
// if the webmaster has a session, let's give a link to discover new features
|
||||
if (!empty($_SESSION['pwg_uid']))
|
||||
{
|
||||
$version_ = str_replace('.', '_', get_branch_from_version(PHPWG_VERSION).'.0');
|
||||
|
||||
if (file_exists(PHPWG_PLUGINS_PATH .'TakeATour/tours/'.$version_.'/config.inc.php'))
|
||||
{
|
||||
load_language(
|
||||
'plugin.lang',
|
||||
PHPWG_PLUGINS_PATH.'TakeATour/',
|
||||
array(
|
||||
'language' => $language,
|
||||
'force_fallback'=>'en_UK',
|
||||
)
|
||||
);
|
||||
|
||||
// we need the secret key for get_pwg_token()
|
||||
load_conf_from_db();
|
||||
|
||||
$template->assign(
|
||||
array(
|
||||
'button_label' => l10n('2_7_0_descrp'), // TODO avoid to update it on each release
|
||||
'button_link' => 'admin.php?submited_tour_path=tours/'.$version_.'&pwg_token='.get_pwg_token(),
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Delete cache data
|
||||
invalidate_user_cache(true);
|
||||
$template->delete_compiled_templates();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue