From 69c4a00dae2048dc685c6b1328f1a9e24335ce1f Mon Sep 17 00:00:00 2001 From: flop25 Date: Tue, 15 Jul 2014 18:03:00 +0000 Subject: Take A Tour: -only 2 files per tour.tpl -allow external tours -absolute url when ending the tour -better code, commented wiki updated (2.7 technical changes) git-svn-id: http://piwigo.org/svn/trunk@29046 68402e56-0260-453c-a942-63ccdbb3a9ee --- plugins/TakeATour/main.inc.php | 32 ++--- plugins/TakeATour/tours/2_7_0/config.inc.php | 39 ++++++ .../TakeATour/tours/2_7_0/config_preparse.inc.php | 31 ----- plugins/TakeATour/tours/2_7_0/tour.tpl | 2 +- .../TakeATour/tours/first_contact/config.inc.php | 68 +++++++++++ .../tours/first_contact/config_preparse.inc.php | 59 --------- plugins/TakeATour/tours/first_contact/tour.tpl | 2 +- plugins/TakeATour/tours/privacy/config.inc.php | 134 ++++++++++----------- .../tours/privacy/config_preparse.inc.php | 59 --------- plugins/TakeATour/tours/privacy/tour.tpl | 2 +- plugins/TakeATour/tpl/admin.tpl | 4 +- 11 files changed, 195 insertions(+), 237 deletions(-) delete mode 100644 plugins/TakeATour/tours/2_7_0/config_preparse.inc.php delete mode 100644 plugins/TakeATour/tours/first_contact/config_preparse.inc.php delete mode 100644 plugins/TakeATour/tours/privacy/config_preparse.inc.php diff --git a/plugins/TakeATour/main.inc.php b/plugins/TakeATour/main.inc.php index f5f2d91d7..c0d2a00fd 100644 --- a/plugins/TakeATour/main.inc.php +++ b/plugins/TakeATour/main.inc.php @@ -13,10 +13,10 @@ if (!defined('PHPWG_ROOT_PATH')) } /** Tour sended via $_POST or $_GET**/ -if ( isset($_REQUEST['submited_tour']) and defined('IN_ADMIN') and IN_ADMIN ) +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']); + pwg_set_session_var('tour_to_launch', $_REQUEST['submited_tour_path']); global $TAT_restart; $TAT_restart=true; } @@ -27,16 +27,17 @@ elseif ( isset($_GET['tour_ended']) and defined('IN_ADMIN') and IN_ADMIN ) /** Setup the tour **/ /* - * REMOVE FOR RELEASE -$version_=str_replace('.','_',PHPWG_VERSION); -if (pwg_get_session_var('tour_to_launch')!=$version_ and isset($_GET['page']) and $_GET['page']=="plugin-TakeATour") + * 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'); } -else*/if ( pwg_get_session_var('tour_to_launch') ) +elseif ( pwg_get_session_var('tour_to_launch') ) { add_event_handler('init', 'TAT_tour_setup'); - include('tours/'.pwg_get_session_var('tour_to_launch').'/config.inc.php'); } function TAT_tour_setup() @@ -44,13 +45,11 @@ 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')); + $template->set_filename('TAT_js_css', PHPWG_PLUGINS_PATH.'TakeATour/tpl/js_css.tpl'); - $template->assign( - array( - 'ADMIN_THEME' => $conf['admin_theme'], - ) - ); + $template->assign('ADMIN_THEME', $conf['admin_theme']); $template->parse('TAT_js_css'); + if (isset($TAT_restart) and $TAT_restart) { $TAT_restart=false; @@ -58,8 +57,9 @@ function TAT_tour_setup() } $tat_path=str_replace(basename($_SERVER['SCRIPT_NAME']),'', $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']); $template->assign('TAT_path', $tat_path); - @include('tours/'.$tour_to_launch.'/config_preparse.inc.php'); - $template->set_filename('TAT_tour_tpl', PHPWG_PLUGINS_PATH.'TakeATour/tours/'.$tour_to_launch.'/tour.tpl'); + $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'); } @@ -101,7 +101,7 @@ function TAT_no_photo_yet() function TAT_no_photo_yet_prefilter($content, &$smarty) { $search = '
{\'I want to add photos\'|@translate}
'; - $replacement = '
{\'I want to discover my gallery and add photos\'|@translate}
+ $replacement = '
{\'I want to discover my gallery and add photos\'|@translate}
{\'I want to add photos\'|@translate}
'; return(str_replace($search, $replacement, $content)); } @@ -114,7 +114,7 @@ function TAT_prompt($c13y) $version_=str_replace('.','_',PHPWG_VERSION); if (file_exists('tours/'.$version_.'/config.inc.php')) { - $page['infos'][] = ''.l10n('Discover what is new in the version %s of Piwigo', PHPWG_VERSION).''; + $page['infos'][] = ''.l10n('Discover what is new in the version %s of Piwigo', PHPWG_VERSION).''; } } diff --git a/plugins/TakeATour/tours/2_7_0/config.inc.php b/plugins/TakeATour/tours/2_7_0/config.inc.php index 0165eb215..76b671632 100644 --- a/plugins/TakeATour/tours/2_7_0/config.inc.php +++ b/plugins/TakeATour/tours/2_7_0/config.inc.php @@ -1,3 +1,42 @@ assign('TAT_index', make_index_url(array('section' => 'categories'))); + $template->assign('TAT_search', get_root_url().'search.php'); + + //picture id + if (isset($_GET['page']) and preg_match('/^photo-(\d+)(?:-(.*))?$/', $_GET['page'], $matches)) + { + $_GET['image_id'] = $matches[1]; + } + check_input_parameter('image_id', $_GET, false, PATTERN_ID); + if (isset($_GET['image_id']) and pwg_get_session_var('TAT_image_id')==null) + { + $template->assign('TAT_image_id', $_GET['image_id']); + pwg_set_session_var('TAT_image_id', $_GET['image_id']); + } + elseif (is_numeric(pwg_get_session_var('TAT_image_id'))) + { + $template->assign('TAT_image_id', pwg_get_session_var('TAT_image_id')); + } + else + { + $query = ' + SELECT id + FROM '.IMAGES_TABLE.' + ORDER BY RAND() + LIMIT 1 + ;'; + $row = pwg_db_fetch_assoc(pwg_query($query)); + $template->assign('TAT_image_id', $row['id']); + } ?> \ No newline at end of file diff --git a/plugins/TakeATour/tours/2_7_0/config_preparse.inc.php b/plugins/TakeATour/tours/2_7_0/config_preparse.inc.php deleted file mode 100644 index 87aa6227b..000000000 --- a/plugins/TakeATour/tours/2_7_0/config_preparse.inc.php +++ /dev/null @@ -1,31 +0,0 @@ -assign('TAT_index', make_index_url(array('section' => 'categories'))); - $template->assign('TAT_search', get_root_url().'search.php'); - - //picture id - if (isset($_GET['page']) and preg_match('/^photo-(\d+)(?:-(.*))?$/', $_GET['page'], $matches)) - { - $_GET['image_id'] = $matches[1]; - } - check_input_parameter('image_id', $_GET, false, PATTERN_ID); - if (isset($_GET['image_id']) and pwg_get_session_var('TAT_image_id')==null) - { - $template->assign('TAT_image_id', $_GET['image_id']); - pwg_set_session_var('TAT_image_id', $_GET['image_id']); - } - elseif (is_numeric(pwg_get_session_var('TAT_image_id'))) - { - $template->assign('TAT_image_id', pwg_get_session_var('TAT_image_id')); - } - else - { - $query = ' - SELECT id - FROM '.IMAGES_TABLE.' - ORDER BY RAND() - LIMIT 1 - ;'; - $row = pwg_db_fetch_assoc(pwg_query($query)); - $template->assign('TAT_image_id', $row['id']); - } -?> \ No newline at end of file diff --git a/plugins/TakeATour/tours/2_7_0/tour.tpl b/plugins/TakeATour/tours/2_7_0/tour.tpl index e62390f57..eea93b55e 100644 --- a/plugins/TakeATour/tours/2_7_0/tour.tpl +++ b/plugins/TakeATour/tours/2_7_0/tour.tpl @@ -3,7 +3,7 @@ var tour = new Tour({ name: "2_7_0", orphan: true, - onEnd: function (tour) {window.location = "admin.php?page=plugin-TakeATour&tour_ended=2_7_0"}, + onEnd: function (tour) {window.location = "{/literal}{$ABS_U_ADMIN}{literal}admin.php?page=plugin-TakeATour&tour_ended=2_7_0"}, template: "

", }); {/literal}{if $TAT_restart}tour.restart();{/if}{literal} diff --git a/plugins/TakeATour/tours/first_contact/config.inc.php b/plugins/TakeATour/tours/first_contact/config.inc.php index 74bad9eda..30f797c66 100644 --- a/plugins/TakeATour/tours/first_contact/config.inc.php +++ b/plugins/TakeATour/tours/first_contact/config.inc.php @@ -1,4 +1,11 @@ assign('TAT_image_id', $_GET['image_id']); + pwg_set_session_var('TAT_image_id', $_GET['image_id']); + } + elseif (is_numeric(pwg_get_session_var('TAT_image_id'))) + { + $template->assign('TAT_image_id', pwg_get_session_var('TAT_image_id')); + } + else + { + $query = ' + SELECT id + FROM '.IMAGES_TABLE.' + ORDER BY RAND() + LIMIT 1 + ;'; + $row = pwg_db_fetch_assoc(pwg_query($query)); + $template->assign('TAT_image_id', $row['id']); + } + //album id + if (isset($_GET['page']) and preg_match('/^album-(\d+)(?:-(.*))?$/', $_GET['page'], $matches)) + { + $_GET['cat_id'] = $matches[1]; + } + check_input_parameter('cat_id', $_GET, false, PATTERN_ID); + if (isset($_GET['cat_id']) and pwg_get_session_var('TAT_cat_id')==null) + { + $template->assign('TAT_cat_id', $_GET['cat_id']); + pwg_set_session_var('TAT_cat_id', $_GET['cat_id']); + } + elseif (is_numeric(pwg_get_session_var('TAT_cat_id'))) + { + $template->assign('TAT_cat_id', pwg_get_session_var('TAT_cat_id')); + } + else + { + $query = ' + SELECT id + FROM '.CATEGORIES_TABLE.' + ORDER BY RAND() + LIMIT 1 + ;'; + $row = pwg_db_fetch_assoc(pwg_query($query)); + $template->assign('TAT_cat_id', $row['id']); + } + global $conf; + if ( isset($conf['enable_synchronization']) ) + { + $template->assign('TAT_FTP', $conf['enable_synchronization']); + } + ?> \ No newline at end of file diff --git a/plugins/TakeATour/tours/first_contact/config_preparse.inc.php b/plugins/TakeATour/tours/first_contact/config_preparse.inc.php deleted file mode 100644 index 711dfe349..000000000 --- a/plugins/TakeATour/tours/first_contact/config_preparse.inc.php +++ /dev/null @@ -1,59 +0,0 @@ -assign('TAT_image_id', $_GET['image_id']); - pwg_set_session_var('TAT_image_id', $_GET['image_id']); - } - elseif (is_numeric(pwg_get_session_var('TAT_image_id'))) - { - $template->assign('TAT_image_id', pwg_get_session_var('TAT_image_id')); - } - else - { - $query = ' - SELECT id - FROM '.IMAGES_TABLE.' - ORDER BY RAND() - LIMIT 1 - ;'; - $row = pwg_db_fetch_assoc(pwg_query($query)); - $template->assign('TAT_image_id', $row['id']); - } - //album id - if (isset($_GET['page']) and preg_match('/^album-(\d+)(?:-(.*))?$/', $_GET['page'], $matches)) - { - $_GET['cat_id'] = $matches[1]; - } - check_input_parameter('cat_id', $_GET, false, PATTERN_ID); - if (isset($_GET['cat_id']) and pwg_get_session_var('TAT_cat_id')==null) - { - $template->assign('TAT_cat_id', $_GET['cat_id']); - pwg_set_session_var('TAT_cat_id', $_GET['cat_id']); - } - elseif (is_numeric(pwg_get_session_var('TAT_cat_id'))) - { - $template->assign('TAT_cat_id', pwg_get_session_var('TAT_cat_id')); - } - else - { - $query = ' - SELECT id - FROM '.CATEGORIES_TABLE.' - ORDER BY RAND() - LIMIT 1 - ;'; - $row = pwg_db_fetch_assoc(pwg_query($query)); - $template->assign('TAT_cat_id', $row['id']); - } - global $conf; - if ( isset($conf['enable_synchronization']) ) - { - $template->assign('TAT_FTP', $conf['enable_synchronization']); - } -?> \ No newline at end of file diff --git a/plugins/TakeATour/tours/first_contact/tour.tpl b/plugins/TakeATour/tours/first_contact/tour.tpl index 48acd5927..92b934c54 100644 --- a/plugins/TakeATour/tours/first_contact/tour.tpl +++ b/plugins/TakeATour/tours/first_contact/tour.tpl @@ -3,7 +3,7 @@ var tour = new Tour({ name: "first_contact", orphan: true, - onEnd: function (tour) {window.location = "admin.php?page=plugin-TakeATour&tour_ended=first_contact"}, + onEnd: function (tour) {window.location = "{/literal}{$ABS_U_ADMIN}{literal}admin.php?page=plugin-TakeATour&tour_ended=first_contact"}, template: "

", }); {/literal}{if $TAT_restart}tour.restart();{/if}{literal} diff --git a/plugins/TakeATour/tours/privacy/config.inc.php b/plugins/TakeATour/tours/privacy/config.inc.php index 74bad9eda..446e94f3f 100644 --- a/plugins/TakeATour/tours/privacy/config.inc.php +++ b/plugins/TakeATour/tours/privacy/config.inc.php @@ -1,71 +1,71 @@ set_prefilter('batch_manager_global', 'TAT_FC_14_prefilter'); -} -function TAT_FC_14_prefilter ($content, &$smarty) -{ - $search = '{\'Edit\''; - $replacement = '>{\'Edit\''; - return str_replace($search, $replacement, $content); -} -function TAT_FC_16() -{ - global $template; - $template->set_prefilter('picture_modify', 'TAT_FC_16_prefilter'); -} -function TAT_FC_16_prefilter ($content, &$smarty) -{ - $search = '{\'Linked albums\'|@translate}'; - $replacement = '{\'Linked albums\'|@translate}'; - return str_replace($search, $replacement, $content); -} -function TAT_FC_17() -{ - global $template; - $template->set_prefilter('picture_modify', 'TAT_FC_17_prefilter'); -} -function TAT_FC_17_prefilter ($content, &$smarty) -{ - $search = '{\'Representation of albums\'|@translate}'; - $replacement = '{\'Representation of albums\'|@translate}'; - return str_replace($search, $replacement, $content); -} -function TAT_FC_23() -{ - global $template; - $template->set_prefilter('album_properties', 'TAT_FC_23_prefilter'); -} -function TAT_FC_23_prefilter ($content, &$smarty) -{ - $search = '{\'Lock\'|@translate}'; - $replacement = '{\'Lock\'|@translate}'; - return str_replace($search, $replacement, $content); -} -function TAT_FC_35() -{ - global $template; - $template->set_prefilter('themes', 'TAT_FC_35_prefilter'); -} -function TAT_FC_35_prefilter ($content, &$smarty) -{ - $search = 'assign('TAT_image_id', $_GET['image_id']); + pwg_set_session_var('TAT_image_id', $_GET['image_id']); + } + elseif (is_numeric(pwg_get_session_var('TAT_image_id'))) + { + $template->assign('TAT_image_id', pwg_get_session_var('TAT_image_id')); + } + else + { + $query = ' + SELECT id + FROM '.IMAGES_TABLE.' + ORDER BY RAND() + LIMIT 1 + ;'; + $row = pwg_db_fetch_assoc(pwg_query($query)); + $template->assign('TAT_image_id', $row['id']); + } + //album id + if (isset($_GET['page']) and preg_match('/^album-(\d+)(?:-(.*))?$/', $_GET['page'], $matches)) + { + $_GET['cat_id'] = $matches[1]; + } + check_input_parameter('cat_id', $_GET, false, PATTERN_ID); + if (isset($_GET['cat_id']) and pwg_get_session_var('TAT_cat_id')==null) + { + $template->assign('TAT_cat_id', $_GET['cat_id']); + pwg_set_session_var('TAT_cat_id', $_GET['cat_id']); + } + elseif (is_numeric(pwg_get_session_var('TAT_cat_id'))) + { + $template->assign('TAT_cat_id', pwg_get_session_var('TAT_cat_id')); + } + else + { + $query = ' + SELECT id + FROM '.CATEGORIES_TABLE.' + ORDER BY RAND() + LIMIT 1 + ;'; + $row = pwg_db_fetch_assoc(pwg_query($query)); + $template->assign('TAT_cat_id', $row['id']); + } + global $conf; + if ( isset($conf['enable_synchronization']) ) + { + $template->assign('TAT_FTP', $conf['enable_synchronization']); + } ?> \ No newline at end of file diff --git a/plugins/TakeATour/tours/privacy/config_preparse.inc.php b/plugins/TakeATour/tours/privacy/config_preparse.inc.php deleted file mode 100644 index 711dfe349..000000000 --- a/plugins/TakeATour/tours/privacy/config_preparse.inc.php +++ /dev/null @@ -1,59 +0,0 @@ -assign('TAT_image_id', $_GET['image_id']); - pwg_set_session_var('TAT_image_id', $_GET['image_id']); - } - elseif (is_numeric(pwg_get_session_var('TAT_image_id'))) - { - $template->assign('TAT_image_id', pwg_get_session_var('TAT_image_id')); - } - else - { - $query = ' - SELECT id - FROM '.IMAGES_TABLE.' - ORDER BY RAND() - LIMIT 1 - ;'; - $row = pwg_db_fetch_assoc(pwg_query($query)); - $template->assign('TAT_image_id', $row['id']); - } - //album id - if (isset($_GET['page']) and preg_match('/^album-(\d+)(?:-(.*))?$/', $_GET['page'], $matches)) - { - $_GET['cat_id'] = $matches[1]; - } - check_input_parameter('cat_id', $_GET, false, PATTERN_ID); - if (isset($_GET['cat_id']) and pwg_get_session_var('TAT_cat_id')==null) - { - $template->assign('TAT_cat_id', $_GET['cat_id']); - pwg_set_session_var('TAT_cat_id', $_GET['cat_id']); - } - elseif (is_numeric(pwg_get_session_var('TAT_cat_id'))) - { - $template->assign('TAT_cat_id', pwg_get_session_var('TAT_cat_id')); - } - else - { - $query = ' - SELECT id - FROM '.CATEGORIES_TABLE.' - ORDER BY RAND() - LIMIT 1 - ;'; - $row = pwg_db_fetch_assoc(pwg_query($query)); - $template->assign('TAT_cat_id', $row['id']); - } - global $conf; - if ( isset($conf['enable_synchronization']) ) - { - $template->assign('TAT_FTP', $conf['enable_synchronization']); - } -?> \ No newline at end of file diff --git a/plugins/TakeATour/tours/privacy/tour.tpl b/plugins/TakeATour/tours/privacy/tour.tpl index 52ae96a5d..fa2270f51 100644 --- a/plugins/TakeATour/tours/privacy/tour.tpl +++ b/plugins/TakeATour/tours/privacy/tour.tpl @@ -3,7 +3,7 @@ var tour = new Tour({ name: "privacy", orphan: true, - onEnd: function (tour) {window.location = "admin.php?tour_ended=privacy";}, + onEnd: function (tour) {window.location = "{/literal}{$ABS_U_ADMIN}{literal}admin.php?tour_ended=privacy";}, template: "

diff --git a/plugins/TakeATour/tpl/admin.tpl b/plugins/TakeATour/tpl/admin.tpl index e79f8db08..8da067aeb 100644 --- a/plugins/TakeATour/tpl/admin.tpl +++ b/plugins/TakeATour/tpl/admin.tpl @@ -8,7 +8,7 @@ {'First Contact'|@translate}
{'first_contact_descrp'|@translate}
- +
@@ -19,7 +19,7 @@ {'2.7 Tour'|@translate}
{'2_7_0_descrp'|@translate}
- +
-- cgit v1.2.3