From 335b2eda52b83d9fe500dfe46fde9d3ff6adefe9 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Wed, 24 Sep 2014 10:57:57 +0000
Subject: merge r29770 from trunk to branch 2.7

bug 3145: generate the pwg_token at the right time, not at prefilter time


git-svn-id: http://piwigo.org/svn/branches/2.7@29771 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 plugins/TakeATour/main.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/TakeATour/main.inc.php')

diff --git a/plugins/TakeATour/main.inc.php b/plugins/TakeATour/main.inc.php
index 54fabd1c4..406e93780 100644
--- a/plugins/TakeATour/main.inc.php
+++ b/plugins/TakeATour/main.inc.php
@@ -104,7 +104,7 @@ function TAT_no_photo_yet()
 function TAT_no_photo_yet_prefilter($content, &$smarty)
 {
   $search = '<div class="bigButton"><a href="{$next_step_url}">{\'I want to add photos\'|@translate}</a></div>';
-  $replacement = '<div class="bigButton"><a href="'.get_root_url().'admin.php?submited_tour_path=tours/first_contact&pwg_token='.get_pwg_token().'">{\'Start the Tour\'|@translate}</a></div>';
+  $replacement = '<div class="bigButton"><a href="{$F_ACTION}?submited_tour_path=tours/first_contact&pwg_token={$pwg_token}">{\'Start the Tour\'|@translate}</a></div>';
   return(str_replace($search, $replacement, $content));
 }
 
-- 
cgit v1.2.3


From 5d666f8566e7c8d57591369261921eb7c8894a18 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Wed, 24 Sep 2014 21:54:53 +0000
Subject: merge r29776 from trunk to branch 2.7

update Take a Tour version number to 2.7.1 (like on piwigo.org/ext)


git-svn-id: http://piwigo.org/svn/branches/2.7@29777 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 plugins/TakeATour/main.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/TakeATour/main.inc.php')

diff --git a/plugins/TakeATour/main.inc.php b/plugins/TakeATour/main.inc.php
index 406e93780..e41f2e5de 100644
--- a/plugins/TakeATour/main.inc.php
+++ b/plugins/TakeATour/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Take A Tour of Your Piwigo
-Version: 2.7.0
+Version: 2.7.1
 Description: Visit your Piwigo to discover its features. This plugin has multiple thematic tours for beginners and advanced users.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=776
 Author:Piwigo Team
-- 
cgit v1.2.3


From 0f80a888a20b89e8df99ce14cad773e5c63b4b10 Mon Sep 17 00:00:00 2001
From: ddtddt <ddtddt@piwigo.org>
Date: Sun, 12 Oct 2014 06:24:58 +0000
Subject: [2.7] - plugin - language - prepare 2.7.1

git-svn-id: http://piwigo.org/svn/branches/2.7@30013 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 plugins/TakeATour/main.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/TakeATour/main.inc.php')

diff --git a/plugins/TakeATour/main.inc.php b/plugins/TakeATour/main.inc.php
index e41f2e5de..70ad19bf9 100644
--- a/plugins/TakeATour/main.inc.php
+++ b/plugins/TakeATour/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Take A Tour of Your Piwigo
-Version: 2.7.1
+Version: 2.7.2
 Description: Visit your Piwigo to discover its features. This plugin has multiple thematic tours for beginners and advanced users.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=776
 Author:Piwigo Team
-- 
cgit v1.2.3


From 443775f1bbec825947479e76739cb784178ec94e Mon Sep 17 00:00:00 2001
From: ddtddt <ddtddt@piwigo.org>
Date: Fri, 21 Nov 2014 12:03:26 +0000
Subject: [2.7] Language - plugin - prepare piwigo 2.7.2

git-svn-id: http://piwigo.org/svn/branches/2.7@30562 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 plugins/TakeATour/main.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/TakeATour/main.inc.php')

diff --git a/plugins/TakeATour/main.inc.php b/plugins/TakeATour/main.inc.php
index 70ad19bf9..3db7b5fce 100644
--- a/plugins/TakeATour/main.inc.php
+++ b/plugins/TakeATour/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Take A Tour of Your Piwigo
-Version: 2.7.2
+Version: 2.7.3
 Description: Visit your Piwigo to discover its features. This plugin has multiple thematic tours for beginners and advanced users.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=776
 Author:Piwigo Team
-- 
cgit v1.2.3


From 3f7d3658d49a1250c8735bfc4a003bca2e54573f Mon Sep 17 00:00:00 2001
From: ddtddt <ddtddt@piwigo.org>
Date: Sun, 15 Feb 2015 08:44:57 +0000
Subject: [2.7.4] - plugin - Language - update prepare 2.7.4

git-svn-id: http://piwigo.org/svn/branches/2.7@30964 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 plugins/TakeATour/main.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/TakeATour/main.inc.php')

diff --git a/plugins/TakeATour/main.inc.php b/plugins/TakeATour/main.inc.php
index 3db7b5fce..c71b89b1f 100644
--- a/plugins/TakeATour/main.inc.php
+++ b/plugins/TakeATour/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Take A Tour of Your Piwigo
-Version: 2.7.3
+Version: 2.7.4
 Description: Visit your Piwigo to discover its features. This plugin has multiple thematic tours for beginners and advanced users.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=776
 Author:Piwigo Team
-- 
cgit v1.2.3


From 4e71ba9d3ea40cd2d817965e5eed4a2fe1b876b3 Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@strangeplanet.fr>
Date: Fri, 24 Jul 2015 22:44:39 +0200
Subject: Remove core plugins from core repository

---
 plugins/TakeATour/main.inc.php | 122 -----------------------------------------
 1 file changed, 122 deletions(-)
 delete mode 100644 plugins/TakeATour/main.inc.php

(limited to 'plugins/TakeATour/main.inc.php')

diff --git a/plugins/TakeATour/main.inc.php b/plugins/TakeATour/main.inc.php
deleted file mode 100644
index c71b89b1f..000000000
--- a/plugins/TakeATour/main.inc.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/*
-Plugin Name: Take A Tour of Your Piwigo
-Version: 2.7.4
-Description: Visit your Piwigo to discover its features. This plugin has multiple thematic tours for beginners and advanced users.
-Plugin URI: http://piwigo.org/ext/extension_view.php?eid=776
-Author:Piwigo Team
-Author URI: http://piwigo.org
-*/
-if (!defined('PHPWG_ROOT_PATH'))
-{
-  die('Hacking attempt!');
-}
-
-/** Tour sended via $_POST or $_GET**/
-if ( isset($_REQUEST['submited_tour_path']) and defined('IN_ADMIN') and IN_ADMIN )
-{
-  check_pwg_token();
-  pwg_set_session_var('tour_to_launch', $_REQUEST['submited_tour_path']);
-  global $TAT_restart;
-  $TAT_restart=true;
-}
-elseif ( isset($_GET['tour_ended']) and defined('IN_ADMIN') and IN_ADMIN )
-{
-  pwg_unset_session_var('tour_to_launch');
-}
-
-/** Setup the tour **/
-/*
- * CHANGE FOR RELEASE
-$version_=str_replace('.','_',PHPWG_VERSION);*/
-$version_="2_7_0";
-/***/
-if (pwg_get_session_var('tour_to_launch')!='tours/'.$version_ and isset($_GET['page']) and $_GET['page']=="plugin-TakeATour")
-{ 
-  pwg_unset_session_var('tour_to_launch');
-}
-elseif ( pwg_get_session_var('tour_to_launch') )
-{
-  add_event_handler('init', 'TAT_tour_setup');
-}
-
-function TAT_tour_setup()
-{
-  global $template, $TAT_restart, $conf;
-  $tour_to_launch=pwg_get_session_var('tour_to_launch');
-  load_language('plugin.lang', PHPWG_PLUGINS_PATH .'TakeATour/', array('force_fallback'=>'en_UK'));
-  
-  list(, $tour_name) = explode('/', $tour_to_launch);
-  load_language('tour_'.$tour_name.'.lang', PHPWG_PLUGINS_PATH .'TakeATour/', array('force_fallback'=>'en_UK'));
-
-  $template->set_filename('TAT_js_css', PHPWG_PLUGINS_PATH.'TakeATour/tpl/js_css.tpl');
-  $template->assign('ADMIN_THEME', $conf['admin_theme']);
-  $template->parse('TAT_js_css');
-
-  if (isset($TAT_restart) and $TAT_restart)
-  {
-    $TAT_restart=false;
-    $template->assign('TAT_restart',true);
-  }
-  $tat_path=str_replace(basename($_SERVER['SCRIPT_NAME']),'', $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']);
-  $template->assign('TAT_path', $tat_path);
-  $template->assign('ABS_U_ADMIN', get_absolute_root_url());// absolute one due to public pages and $conf['question_mark_in_urls'] = false+$conf['php_extension_in_urls'] = false;
-  include($tour_to_launch.'/config.inc.php');
-  $template->set_filename('TAT_tour_tpl', $TOUR_PATH);
-  $template->parse('TAT_tour_tpl');
-}
-
-/** Add link in Help pages **/
-add_event_handler('loc_end_help','TAT_help');
-function TAT_help()
-{
-  global $template;
-  load_language('plugin.lang', PHPWG_PLUGINS_PATH .'TakeATour/');
-  $template->set_prefilter('help', 'TAT_help_prefilter');
-}
-function TAT_help_prefilter($content, &$smarty)
-{
-  
-  $search = '<div id="helpContent">';
-  $replacement = '<div id="helpContent">
-<fieldset>
-<legend>{\'Visit your Piwigo!\'|@translate}</legend>
-<p class="nextStepLink"><a href="admin.php?page=plugin-TakeATour">{\'Take a tour and discover the features of your Piwigo gallery » Go to the available tours\'|@translate}</a></p>
-</fieldset>';
-  return(str_replace($search, $replacement, $content));
-
-}
-
-/** Add link in no_photo_yet **/
-add_event_handler('loc_end_no_photo_yet','TAT_no_photo_yet');
-function TAT_no_photo_yet()
-{
-  global $template;
-  load_language('plugin.lang', PHPWG_PLUGINS_PATH .'TakeATour/');
-  $template->set_prefilter('no_photo_yet', 'TAT_no_photo_yet_prefilter');
-  $template->assign(
-  array(
-    'F_ACTION' => get_root_url().'admin.php',
-    'pwg_token' => get_pwg_token()
-    )
-  );
-}
-function TAT_no_photo_yet_prefilter($content, &$smarty)
-{
-  $search = '<div class="bigButton"><a href="{$next_step_url}">{\'I want to add photos\'|@translate}</a></div>';
-  $replacement = '<div class="bigButton"><a href="{$F_ACTION}?submited_tour_path=tours/first_contact&pwg_token={$pwg_token}">{\'Start the Tour\'|@translate}</a></div>';
-  return(str_replace($search, $replacement, $content));
-}
-
-/** Add admin menu link **/
-add_event_handler('get_admin_plugin_menu_links', 'TAT_admin_menu' );
-function TAT_admin_menu($menu)
-{
-  array_push($menu, array(
-    'NAME' => 'Take a Tour',
-    'URL' => get_root_url().'admin.php?page=plugin-TakeATour'
-    )
-  );
-  return $menu;
-}
-?>
\ No newline at end of file
-- 
cgit v1.2.3