Changeset 28060

Timestamp:

Apr 2, 2014, 11:27:36 PM (10 years ago)

Author:

flop25

Message:

modular tour
tours can be disabled with conf

Location:

extensions/TakeATour

Files:

• admin.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• tpl (modified) (1 prop)
• tpl/admin.tpl (deleted)

extensions/TakeATour/admin.php

@@ -17 +17 @@
 );
 
+if (isset($conf['TakeATour_tour_ignored']) and is_array($conf['TakeATour_tour_ignored']))
+{
+  $template->assign('TAT_tour_ignored', $conf['TakeATour_tour_ignored']);
+}
 $template->set_filename('plugin_admin_content', dirname(__FILE__) .'/tpl/admin.tpl');
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');

extensions/TakeATour/main.inc.php

@@ -28 +28 @@
 if ( pwg_get_session_var('tour_to_launch') and defined('IN_ADMIN') and IN_ADMIN  )
 {
-  if !in_array(pwg_get_session_var('tour_to_launch'), $conf['TakeATour_tour_ignored']) or !isset($conf['TakeATour_tour_ignored']))
+  global $conf;
+  if ((isset($conf['TakeATour_tour_ignored']) and !in_array(pwg_get_session_var('tour_to_launch'), $conf['TakeATour_tour_ignored'])) or !isset($conf['TakeATour_tour_ignored']))
   {
-    add_event_handler('init', 'TAT_add_js_css');
-    include('tours/'.pwg_get_session_var('tour_to_launch').'/config.inc.php');
+      add_event_handler('init', 'TAT_add_js_css');
+      include('tours/'.pwg_get_session_var('tour_to_launch').'/config.inc.php');
   }
 }
@@ -49 +50 @@
   //$tat_path=$_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/tpl/'.$tour_to_launch.'.tpl');
+  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->parse('TAT_tour_tpl');
 }