diff --git a/admin/advanced_feature.php b/admin/advanced_feature.php index f8991ff07..b1614b488 100644 --- a/admin/advanced_feature.php +++ b/admin/advanced_feature.php @@ -71,19 +71,19 @@ array_push($advanced_features, array ( 'CAPTION' => l10n('Elements_not_linked'), - 'URL' => get_root_url().'admin.php?page=element_set&cat=not_linked' + 'URL' => get_root_url().'admin.php?page=element_set&cat=not_linked' )); array_push($advanced_features, array ( 'CAPTION' => l10n('Duplicates'), - 'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates' + 'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates' )); //$advanced_features is array of array composed of CAPTION & URL $advanced_features = - trigger_event('array_advanced_features', $advanced_features); + trigger_event('get_admin_advanced_features_links', $advanced_features); // +-----------------------------------------------------------------------+ // | Template init | diff --git a/admin/site_manager.php b/admin/site_manager.php index 53330d7f9..375f92349 100644 --- a/admin/site_manager.php +++ b/admin/site_manager.php @@ -297,7 +297,7 @@ while ($row = mysql_fetch_array($result)) $plugin_links = array(); //$plugin_links is array of array composed of U_HREF, U_HINT & U_CAPTION $plugin_links = - trigger_event('array_site_manager_plugin_links', + trigger_event('get_admins_site_links', $plugin_links, $row['id'], $is_remote); // plugin_links diff --git a/plugins/add_index/admin/admin_menu.php b/plugins/add_index/admin/admin_menu.php new file mode 100644 index 000000000..2ab250119 --- /dev/null +++ b/plugins/add_index/admin/admin_menu.php @@ -0,0 +1,76 @@ +set_filenames(array('plugin_admin_content' => dirname(__FILE__).'/admin_menu.tpl')); + +/* +if ( isset($_POST['eventTracer_filters']) ) +{ + $v = $_POST['eventTracer_filters']; + $v = str_replace( "\r\n", "\n", $v ); + $v = str_replace( "\n\n", "\n", $v ); + $v = stripslashes($v); + if (!empty($v)) + $this->my_config['filters'] = explode("\n", $v); + else + $this->my_config['filters'] = array(); + $this->my_config['show_args'] = isset($_POST['eventTracer_show_args']); + $this->save_config(); + global $page; + array_push($page['infos'], 'event tracer options saved'); +} +$template->assign_var('EVENT_TRACER_FILTERS', implode("\n", $this->my_config['filters'] ) ); +$template->assign_var('EVENT_TRACER_SHOW_ARGS', $this->my_config['show_args'] ? 'checked="checked"' : '' );*/ +$template->assign_var('filename', $conf['add_index_filename']); +$template->assign_var('source_directory_path', $conf['add_index_source_directory_path']); +$template->assign_var('F_ACTION', $my_url); + +// +-----------------------------------------------------------------------+ +// | Sending html code | +// +-----------------------------------------------------------------------+ +$template->assign_var_from_handle('PLUGIN_ADMIN_CONTENT', 'plugin_admin_content'); + +?> \ No newline at end of file diff --git a/plugins/add_index/admin/admin_menu.tpl b/plugins/add_index/admin/admin_menu.tpl new file mode 100644 index 000000000..b365e312f --- /dev/null +++ b/plugins/add_index/admin/admin_menu.tpl @@ -0,0 +1,29 @@ + +

{lang:add_index_Description_1}

+

{lang:add_index_Description_2}

+ +
+
+ {lang:add_index_Parameters} + + + + + + + + + +
+ +
+ +
+
+ +

+ + +

+ +
diff --git a/plugins/add_index/admin/main_page.php b/plugins/add_index/admin/main_page.php index 488e0bb85..a99eefa90 100644 --- a/plugins/add_index/admin/main_page.php +++ b/plugins/add_index/admin/main_page.php @@ -3,7 +3,7 @@ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net | -// | Copyright (C) 2006 Ruben ARNAUD - team@phpwebgallery.net | +// | Copyright (C) 2006-2007 Ruben ARNAUD - team@phpwebgallery.net | // +-----------------------------------------------------------------------+ // | last modifier : $Author: rub $ // | revision : $Revision: 1.0.2.0 $ @@ -23,30 +23,14 @@ // | USA. | // +-----------------------------------------------------------------------+ -// +-----------------------------------------------------------------------+ -// | Here before to modify by user | -// +-----------------------------------------------------------------------+ -// Name of index file (index.php or index.htm or index.html) -if (!isset($conf['index']['file_name'])) +if ((!defined('PHPWG_ROOT_PATH')) or (!(defined('IN_ADMIN') and IN_ADMIN))) { - $conf['index']['file_name'] = 'index.php'; -} -// Name of index file (index.php or index.htm or index.html) -if (!isset($conf['index']['source_directory_name'])) -{ - // Name of the directoty use in order to copy index file - $conf['index']['source_directory_name'] = 'include/index.php'; + die('Hacking attempt!'); } -// +-----------------------------------------------------------------------+ -// | include | -// +-----------------------------------------------------------------------+ - -if (!defined('PHPWG_ROOT_PATH')) -{ - die ("Hacking attempt!"); -} - +// +-----------------------------------------------------------------------+ +// | include | +// +-----------------------------------------------------------------------+ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); include_once(PHPWG_ROOT_PATH.'include/common.inc.php'); @@ -100,13 +84,15 @@ function get_add_index_directories($path, $recursive = true) // +-----------------------------------------------------------------------+ // | Main | -// +-----------------------------------------------------------------------+ -$index_file_src=PHPWG_ROOT_PATH.$conf['index']['source_directory_name']; +// +-----------------------------------------------------------------------+ +// Compute values +$index_file_src=$conf['add_index_source_directory_path'].$conf['add_index_filename']; $overwrite_file=isset($_GET['overwrite']); $site_id = (isset($_GET['site_id']) and is_numeric($_GET['site_id']) ? $_GET['site_id'] : 0); +// Init values $add_index_results = array(); $count_copy = 0; $count_skip = 0; @@ -140,7 +126,7 @@ order by //echo $galleries_url.'
'; foreach (get_add_index_directories($galleries_url) as $dir_galleries) { - $file_dest = $dir_galleries.'/'.$conf['index']['file_name']; + $file_dest = $dir_galleries.'/'.$conf['add_index_filename']; if ($overwrite_file or !@file_exists($file_dest)) { if (copy($index_file_src, $file_dest)) @@ -174,7 +160,8 @@ order by } } - if ($count_copy != 0) + // Show always an result, defaut (0 copy, $count_copy == $count_skip == 0) + if (($count_copy != 0) or ($count_skip == 0)) { array_push($add_index_results, l10n_dec('add_index_nb_copied_file', 'add_index_nb_copied_files', diff --git a/plugins/add_index/language/en_UK.iso-8859-1/help/advanced_feature.html b/plugins/add_index/language/en_UK.iso-8859-1/help/advanced_feature.html index 46eae4b61..5724d5d1b 100644 --- a/plugins/add_index/language/en_UK.iso-8859-1/help/advanced_feature.html +++ b/plugins/add_index/language/en_UK.iso-8859-1/help/advanced_feature.html @@ -2,6 +2,6 @@