Feature Issue ID 0000496: Integrate MOD add_index on PWG with plugin.lang.php

Change name of news triggers.
Replace & by &
Improve a little add_index plugin implementation.
Add parameters pages (under construction) for add_index plugin


git-svn-id: http://piwigo.org/svn/trunk@1704 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 118 insertions, 26 deletions

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 @@
+<?php

+// +-----------------------------------------------------------------------+

+// | PhpWebGallery - a PHP based picture gallery                           |

+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |

+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |

+// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net              |

+// +-----------------------------------------------------------------------+

+// | branch        : BSF (Best So Far)

+// | file          : $RCSfile$

+// | last update   : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $

+// | last modifier : $Author: rub $

+// | revision      : $Revision: 1481 $

+// +-----------------------------------------------------------------------+

+// | This program is free software; you can redistribute it and/or modify  |

+// | it under the terms of the GNU General Public License as published by  |

+// | the Free Software Foundation                                          |

+// |                                                                       |

+// | This program is distributed in the hope that it will be useful, but   |

+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |

+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |

+// | General Public License for more details.                              |

+// |                                                                       |

+// | You should have received a copy of the GNU General Public License     |

+// | along with this program; if not, write to the Free Software           |

+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |

+// | USA.                                                                  |

+// +-----------------------------------------------------------------------+

+

+if ((!defined('PHPWG_ROOT_PATH')) or (!(defined('IN_ADMIN') and IN_ADMIN)))

+{

+  die('Hacking attempt!');

+}

+

+// +-----------------------------------------------------------------------+

+// | Check Access and exit when user status is not ok                      |

+// +-----------------------------------------------------------------------+

+check_status(ACCESS_ADMINISTRATOR);

+

+// +-----------------------------------------------------------------------+

+// | Main                                                                  |

+// +-----------------------------------------------------------------------+

+global $template, $conf;

+

+// +-----------------------------------------------------------------------+

+// | template initialization                                               |

+// +-----------------------------------------------------------------------+

+$template->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 @@
+<!-- $Id: admin_menu.tpl Ruben ARNAUD -->

+<p>{lang:add_index_Description_1}</p>

+<p>{lang:add_index_Description_2}</p>

+

+<form method="post" name="admin_menu" id="admin_menu" action="{F_ACTION}">

+  <fieldset>

+    <legend>{lang:add_index_Parameters}</legend>

+    <table>

+      <tr>

+        <td>

+          <label for="filename">{lang:add_index_filename}</label>

+        </td>

+        <td><input type="text" maxlength="35" size="35" name="add_index_filename" id="filename" value="{filename}"/></td>

+      </tr>

+      <tr>

+        <td>

+          <label for="source_directory_path">{lang:add_index_source_directory_path}</label>

+        </td>

+        <td><input type="text" maxlength="35" size="35" name="add_index_source_directory_path" id="source_directory_path" value="{source_directory_path}"/></td>

+      </tr>

+    </table>

+  </fieldset>

+

+  <p>

+    <!--<input type="submit" value="{lang:Submit}" name="param_submit" {TAG_INPUT_ENABLED}/>-->

+    <input type="reset" value="{lang:Reset}" name="param_reset"/>

+  </p>

+

+</form>

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']))

-{

-  $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']))

+if ((!defined('PHPWG_ROOT_PATH')) or (!(defined('IN_ADMIN') and IN_ADMIN)))

 {

-  // 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.'<BR>';
         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',