Changeset 29665

Timestamp:

Sep 20, 2014, 1:43:01 PM (10 years ago)

Author:

plg

Message:

• 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

Location:

trunk

Files:

• admin/include/functions_install.inc.php (modified) (1 diff)
• admin/themes/default/template/upgrade.tpl (modified) (3 diffs)
• include/functions.inc.php (modified) (1 diff)
• install.php (modified) (1 diff)
• install/upgrade_2.5.0.php (modified) (1 diff)
• install/upgrade_2.6.0.php (added)
• upgrade.php (modified) (7 diffs)

trunk/admin/include/functions_install.inc.php

@@ -89 +89 @@
 
 /**
+ * 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.
  *

trunk/admin/themes/default/template/upgrade.tpl

@@ -41 +41 @@
   min-height:0;
   border:none;
+  margin:1em auto;
 }
 
@@ -104 +105 @@
   background-color:#ff7700;
   color:white;
+  text-decoration:none;
 }
 
@@ -215 +217 @@
 
 <p>
-  <a class="bigButton" href="index.php">{'Home'|@translate}</a>
+  <a class="bigButton" href="{$button_link}">{$button_label}</a>
 </p>
 {/if}

trunk/include/functions.inc.php

@@ -1513 +1513 @@
   $dirname .= 'language/';
 
-  $default_language = defined('PHPWG_INSTALLED') ?
+  $default_language = defined('PHPWG_INSTALLED') and !defined('UPGRADES_PATH') ?
       get_default_language() : PHPWG_DEFAULT_LANGUAGE;
 

trunk/install.php

@@ -367 +367 @@
     }
     activate_core_themes();
+    activate_core_plugins();
 
     $insert = array(

trunk/install/upgrade_2.5.0.php

@@ -122 +122 @@
 
 // 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');
 ?>

trunk/upgrade.php

@@ -139 +139 @@
 include(PHPWG_ROOT_PATH . 'admin/include/languages.class.php');
 $languages = new languages('utf-8');
-
 if (isset($_GET['language']))
 {
@@ -208 +207 @@
 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, '<'))
@@ -340 +338 @@
   $current_release = '2.4.0';
 }
+else if (!in_array('nb_available_tags', $columns_of[PREFIX_TABLE.'user_cache']))
+{
+  $current_release = '2.5.0';
+}
 else
 {
@@ -349 +351 @@
   $applied_upgrades = array_from_query($query, 'id');
 
-  if (!in_array(139, $applied_upgrades))
-  {
-    $current_release = '2.5.0';
+  if (!in_array(144, $applied_upgrades))
+  {
+    $current_release = '2.6.0';
   }
   else
@@ -380 +382 @@
   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;
@@ -439 +445 @@
     $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.'
@@ -454 +452 @@
     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_.'&amp;pwg_token='.get_pwg_token(),
+            )
+          );
+      }
+    }
+
     // Delete cache data
     invalidate_user_cache(true);