Index: /extensions/ContactForm/admin.php
===================================================================
--- /extensions/ContactForm/admin.php	(revision 17483)
+++ /extensions/ContactForm/admin.php	(revision 17483)
@@ -0,0 +1,32 @@
+<?php
+if (!defined('CONTACT_FORM_PATH')) die('Hacking attempt!');
+
+global $template, $page;
+
+$page['tab'] = (isset($_GET['tab'])) ? $_GET['tab'] : 'config';
+
+// tabsheet
+include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');    
+$tabsheet = new tabsheet();
+$tabsheet->add('config', l10n('Configuration'), CONTACT_FORM_ADMIN . '-config');
+$tabsheet->add('emails', l10n('E-mails'), CONTACT_FORM_ADMIN . '-emails');
+$tabsheet->select($page['tab']);
+$tabsheet->assign();
+
+// include page
+include(CONTACT_FORM_PATH . 'admin/' . $page['tab'] . '.php');
+
+if (!count(get_contact_emails()))
+{
+  array_push($page['errors'], l10n('No active email address'));
+}
+
+// template
+$template->assign(array(
+  'CONTACT_FORM_PATH' => CONTACT_FORM_PATH,
+  'CONTACT_FORM_ADMIN' => CONTACT_FORM_ADMIN,
+  ));
+
+$template->assign_var_from_handle('ADMIN_CONTENT', 'contact_form');
+
+?>
Index: tensions/ContactForm/admin/cf_config.php
===================================================================
--- /extensions/ContactForm/admin/cf_config.php	(revision 17482)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-check_status(ACCESS_ADMINISTRATOR);
-
-global $template, $page;
-// Include language advices
-load_language('plugin.lang', CF_PATH);
-
-$cf_plugin = get_plugin_data($plugin_id);
-$cf_config = $cf_plugin->get_config();
-
-if (isset($_POST['submit'])) {
-  global $page;
-  // Allow guest
-  $new_value = false;
-  if (isset($_POST['cf_guest_allowed'])) {
-      if ('1' == $_POST['cf_guest_allowed']) {
-          $new_value = true;
-      }
-  }
-  $cf_config->set_value(CF_CFG_ALLOW_GUEST, $new_value);
-
-  // Mandatory name
-  $new_value = false;
-  if (isset($_POST['cf_mandatory_name'])) {
-      if ('1' == $_POST['cf_mandatory_name']) {
-          $new_value = true;
-      }
-  }
-  $cf_config->set_value(CF_CFG_NAME_MANDATORY, $new_value);
-  
-  // Mandatory mail
-  $new_value = false;
-  if (isset($_POST['cf_mandatory_mail'])) {
-      if ('1' == $_POST['cf_mandatory_mail']) {
-          $new_value = true;
-      }
-  }
-  $cf_config->set_value(CF_CFG_MAIL_MANDATORY, $new_value);
-  
-  // Prefix
-  $new_value = '';
-  if (isset($_POST['cf_mail_prefix'])) {
-    $new_value = trim(stripslashes($_POST['cf_mail_prefix']));
-    $cf_config->set_value(CF_CFG_SUBJECT_PREFIX, $new_value);
-  }
-
-  // Separator
-  $new_value = '';
-  if (isset($_POST['cf_separator'])) {
-    $new_value = trim(stripslashes($_POST['cf_separator']));
-    $cf_config->set_value(CF_CFG_SEPARATOR, $new_value);
-  }
-  if (isset($_POST['cf_separator_length'])) {
-    $new_value = trim(stripslashes($_POST['cf_separator_length']));
-    if (ctype_digit($new_value)) {
-      $cf_config->set_value(CF_CFG_SEPARATOR_LEN, $new_value);
-    } else {
-      array_push($page['errors'], l10n('cf_length_not_integer'));
-    }
-  }
-  
-  // Redirect delay
-  if (isset($_POST['cf_redirect_delay'])) {
-    $new_value = trim(stripslashes($_POST['cf_redirect_delay']));
-    if (ctype_digit($new_value)) {
-      $cf_config->set_value(CF_CFG_REDIRECT_DELAY, $new_value);
-    } else {
-      array_push($page['errors'], l10n('cf_delay_not_integer'));
-    }
-  }
-  
-  // Save config
-  $cf_config->save_config();
-  $saved = $cf_config->save_config();
-  if ($saved) {
-      array_push($page['infos'], l10n('cf_config_saved'));
-  } else {
-      array_push($page['errors'], l10n('cf_config_saved_with_errors'));
-  }
-  
-}
-
-// Define template file
-$template->set_filenames(array(
-    'plugin_admin_content' => realpath(cf_get_template('cf_config.tpl',
-                                                       CF_AMDIN_TPL))
-  ));
-
-$cf = array(
-    'TITLE'     => $cf_plugin->get_title(),
-    'F_ACTION'  => '',
-  );
-
-$config_values = array(
-    'GUEST'             => $cf_config->get_value(CF_CFG_ALLOW_GUEST)?
-                              CF_CHECKED:'',
-    'NEED_NAME'         => $cf_config->get_value(CF_CFG_NAME_MANDATORY)?
-                              CF_CHECKED:'',
-    'NEED_MAIL'         => $cf_config->get_value(CF_CFG_MAIL_MANDATORY)?
-                              CF_CHECKED:'',
-    'PREFIX'            => $cf_config->get_value(CF_CFG_SUBJECT_PREFIX),
-    'SEPARATOR'         => $cf_config->get_value(CF_CFG_SEPARATOR),
-    'SEPARATOR_LENGTH'  => $cf_config->get_value(CF_CFG_SEPARATOR_LEN),
-    'REDIRECT_DELAY'    => $cf_config->get_value(CF_CFG_REDIRECT_DELAY),
-  );
-$template->assign('CF', $cf);  
-$template->assign('CF_CONFIG', $config_values);  
-$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
-
-?>
Index: tensions/ContactForm/admin/cf_config.tab.php
===================================================================
--- /extensions/ContactForm/admin/cf_config.tab.php	(revision 17482)
+++ 	(revision )
@@ -1,104 +1,0 @@
-<?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-check_status(ACCESS_ADMINISTRATOR);
-
-
-if (isset($_POST['submit'])) {
-
-  // Menu link
-  $new_value = false;
-  if (isset($_POST['cf_menu_link'])) {
-    if ('1' == $_POST['cf_menu_link']) {
-      $new_value = true;
-    }
-  }
-  $cf_config->set_value(CF_CFG_MENU_LINK, $new_value);
-  
-  // Allow guest
-  $new_value = false;
-  if (isset($_POST['cf_guest_allowed'])) {
-    if ('1' == $_POST['cf_guest_allowed']) {
-      $new_value = true;
-    }
-  }
-  $cf_config->set_value(CF_CFG_ALLOW_GUEST, $new_value);
-
-  // Mandatory name
-  $new_value = false;
-  if (isset($_POST['cf_mandatory_name'])) {
-    if ('1' == $_POST['cf_mandatory_name']) {
-      $new_value = true;
-    }
-  }
-  $cf_config->set_value(CF_CFG_NAME_MANDATORY, $new_value);
-  
-  // Mandatory mail
-  $new_value = false;
-  if (isset($_POST['cf_mandatory_mail'])) {
-    if ('1' == $_POST['cf_mandatory_mail']) {
-      $new_value = true;
-    }
-  }
-  $cf_config->set_value(CF_CFG_MAIL_MANDATORY, $new_value);
-  
-  // Prefix
-  $new_value = '';
-  if (isset($_POST['cf_mail_prefix'])) {
-    $new_value = trim(stripslashes($_POST['cf_mail_prefix']));
-    $cf_config->set_value(CF_CFG_SUBJECT_PREFIX, $new_value);
-  }
-
-  // Separator
-  $new_value = '';
-  if (isset($_POST['cf_separator'])) {
-    $new_value = trim(stripslashes($_POST['cf_separator']));
-    $cf_config->set_value(CF_CFG_SEPARATOR, $new_value);
-  }
-  if (isset($_POST['cf_separator_length'])) {
-    $new_value = trim(stripslashes($_POST['cf_separator_length']));
-    if (ctype_digit($new_value)) {
-      $cf_config->set_value(CF_CFG_SEPARATOR_LEN, $new_value);
-    } else {
-      CF_Log::add_error(l10n('cf_length_not_integer'));
-    }
-  }
-  
-  // Redirect delay
-  if (isset($_POST['cf_redirect_delay'])) {
-    $new_value = trim(stripslashes($_POST['cf_redirect_delay']));
-    if (ctype_digit($new_value)) {
-      $cf_config->set_value(CF_CFG_REDIRECT_DELAY, $new_value);
-    } else {
-      CF_Log::add_error(l10n('cf_delay_not_integer'));
-    }
-  }
-  
-  // Save config
-  $cf_config->save_config();
-  $saved = $cf_config->save_config();
-  if ($saved) {
-    CF_Log::add_message(l10n('cf_config_saved'));
-  } else {
-    CF_Log::add_error(l10n('cf_config_saved_with_errors'));
-  }
-  
-}
-
-$config_values = array(
-    'MENU_LINK'         => $cf_config->get_value(CF_CFG_MENU_LINK)?
-                              CF_CHECKED:'',
-    'GUEST'             => $cf_config->get_value(CF_CFG_ALLOW_GUEST)?
-                              CF_CHECKED:'',
-    'NEED_NAME'         => $cf_config->get_value(CF_CFG_NAME_MANDATORY)?
-                              CF_CHECKED:'',
-    'NEED_MAIL'         => $cf_config->get_value(CF_CFG_MAIL_MANDATORY)?
-                              CF_CHECKED:'',
-    'PREFIX'            => $cf_config->get_value(CF_CFG_SUBJECT_PREFIX),
-    'SEPARATOR'         => $cf_config->get_value(CF_CFG_SEPARATOR),
-    'SEPARATOR_LENGTH'  => $cf_config->get_value(CF_CFG_SEPARATOR_LEN),
-    'REDIRECT_DELAY'    => $cf_config->get_value(CF_CFG_REDIRECT_DELAY),
-  );
-
-$template->assign('CF_CONFIG', $config_values);  
-
-?>
Index: tensions/ContactForm/admin/cf_emails.tab.php
===================================================================
--- /extensions/ContactForm/admin/cf_emails.tab.php	(revision 17482)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-check_status(ACCESS_ADMINISTRATOR);
-
-$cf_emails = $cf_config->get_value(CF_CFG_ADMIN_MAILS);
-$save = false;
-if (isset($_POST['refresh'])) {
-  $cf_emails = cf_get_admins_contacts();
-  
-  $cf_config->set_value(CF_CFG_ADMIN_MAILS, $cf_emails);
-  $save = true;
-}
-if (isset($_POST['submit'])) {
-  $webmaster = trim(stripslashes($_POST['webmaster']));
-  if (isset($_POST['active']) and (is_array($_POST['active']))) {
-    foreach($_POST['active'] as $email => $active) {
-      $email = trim(stripslashes($email));
-      $active = (1 == $active)?1:0;
-      $cf_emails[$email]['ACTIVE'] = $active;
-      if (0 == strcmp($webmaster, $email)) {
-        $cf_emails[$email]['WEBMASTER'] = 1;
-      } else {
-        $cf_emails[$email]['WEBMASTER'] = 0;
-      }
-    }
-    $cf_config->set_value(CF_CFG_ADMIN_MAILS, $cf_emails);
-    $save = true;
-  }
-}
-if ($save) {
-  // Save config
-  $cf_config->save_config();
-  $saved = $cf_config->save_config();
-  if ($saved) {
-    CF_Log::add_message(l10n('cf_config_saved'));
-  } else {
-    CF_Log::add_error(l10n('cf_config_saved_with_errors'));
-  }
-}
-$template->assign('CF_OPTIONS', array(
-    '1' => l10n('Yes'),
-    '0' => l10n('No'),
-   ));
-$template->assign('CF_EMAILS', $cf_emails);
-?>
Index: tensions/ContactForm/admin/cf_persoform.tab.php
===================================================================
--- /extensions/ContactForm/admin/cf_persoform.tab.php	(revision 17482)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
-check_status(ACCESS_ADMINISTRATOR);
-
-global $template, $conf, $user;
-
-if (isset($_POST['submitpersoform']))
-{
-  conf_update_param('persoformtop', $_POST['persoform_top']);
-  conf_update_param('persoformbottom', $_POST['persoform_bottom']);
-
-  // reload configuration
-  load_conf_from_db();
-}
-
-//charge Persoform
-$template->assign(
-  array(
-    'PERSOFORMTOP' => @$conf['persoformtop'],
-    'PERSOFORMBOTTOM' => @$conf['persoformbottom'],
-    )
-  );
-?>
Index: /extensions/ContactForm/admin/config.php
===================================================================
--- /extensions/ContactForm/admin/config.php	(revision 17483)
+++ /extensions/ContactForm/admin/config.php	(revision 17483)
@@ -0,0 +1,38 @@
+<?php
+if (!defined('CONTACT_FORM_PATH')) die('Hacking attempt!');
+
+// save config
+if (isset($_POST['save_config']))
+{
+  $conf['ContactForm'] = array(
+    'cf_must_initialize' =>   false,
+    'cf_menu_link' =>         isset($_POST['cf_menu_link']),
+    'cf_subject_prefix' =>    trim($_POST['cf_subject_prefix']),
+    'cf_default_subject' =>   trim($_POST['cf_default_subject']),
+    'cf_allow_guest' =>       isset($_POST['cf_allow_guest']),
+    'cf_mandatory_mail' =>    isset($_POST['cf_mandatory_mail']),
+    'cf_mandatory_name' =>    isset($_POST['cf_mandatory_name']),
+    'cf_mail_type' =>         $_POST['cf_mail_type'],
+    'cf_admin_mails' =>       $conf['ContactForm']['cf_admin_mails'],
+    );
+  $conf['ContactForm_before'] = $_POST['cf_before'];
+  $conf['ContactForm_after'] = $_POST['cf_after'];
+  
+  conf_update_param('ContactForm', serialize($conf['ContactForm']));
+  conf_update_param('ContactForm_before', $conf['ContactForm_before']);
+  conf_update_param('ContactForm_after', $conf['ContactForm_after']);
+  
+  array_push($page['infos'], l10n('Information data registered in database'));
+}
+
+
+// display config
+$template->assign($conf['ContactForm']);
+$template->assign(array(
+  'cf_before' => stripslashes($conf['ContactForm_before']),
+  'cf_after' => stripslashes($conf['ContactForm_after']),
+  ));
+
+$template->set_filename('contact_form', dirname(__FILE__).'/template/config.tpl');
+
+?>
Index: /extensions/ContactForm/admin/emails.php
===================================================================
--- /extensions/ContactForm/admin/emails.php	(revision 17483)
+++ /extensions/ContactForm/admin/emails.php	(revision 17483)
@@ -0,0 +1,37 @@
+<?php
+if (!defined('CONTACT_FORM_PATH')) die('Hacking attempt!');
+
+// save emails
+if (isset($_POST['save_emails']))
+{
+  $emails = array();
+  foreach ($_POST['emails'] as $entry)
+  {
+    if (isset($entry['delete'])) continue;
+    
+    if ( empty($entry['email']) or !check_email_validity($entry['email']) )
+    {
+      array_push($page['errors'], l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)'));
+    }
+    else
+    {
+      array_push($emails, array(
+        'name' => $entry['name'],
+        'email' => $entry['email'],
+        'active' => isset($entry['active']),
+        ));
+    }
+  }
+  
+  $conf['ContactForm']['cf_admin_mails'] = $emails;
+  conf_update_param('ContactForm', serialize($conf['ContactForm']));
+  array_push($page['infos'], l10n('Information data registered in database'));
+}
+
+
+// display emails
+$template->assign('EMAILS', $conf['ContactForm']['cf_admin_mails']);
+
+$template->set_filename('contact_form', dirname(__FILE__).'/template/emails.tpl');
+
+?>
Index: /extensions/ContactForm/admin/index.php
===================================================================
--- /extensions/ContactForm/admin/index.php	(revision 17482)
+++ /extensions/ContactForm/admin/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php,v 1.1 2009/08/13 15:45:14 Criss Exp $
-// | last update   : $Date: 2009/08/13 15:45:14 $
-// | last modifier : $Author: Criss $
-// | revision      : $Revision: 1.1 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/admin/template/config.tpl
===================================================================
--- /extensions/ContactForm/admin/template/config.tpl	(revision 17483)
+++ /extensions/ContactForm/admin/template/config.tpl	(revision 17483)
@@ -0,0 +1,78 @@
+{combine_css path=$CONTACT_FORM_PATH|@cat:"admin/template/style.css"}
+
+<div class="titrePage">
+	<h2>Contact Form</h2>
+</div>
+
+<form method="post" action="{$CONTACT_FORM_ADMIN}-config" class="properties">
+  <fieldset>
+    <legend>{'General configuration'|@translate}</legend>
+    <ul>
+      <li>
+        <label>
+          <input type="checkbox" name="cf_menu_link" value="1" {if $cf_menu_link}checked="checked"{/if}>
+          {'Add link in menu'|@translate}
+        </label>
+      </li>
+      <li>
+        <label>
+          <input type="checkbox" name="cf_allow_guest" value="1" {if $cf_allow_guest}checked="checked"{/if}>
+          {'Allow guests to see the form'|@translate}
+        </label>
+      </li>
+      <li>
+        <label>
+          <input type="checkbox" name="cf_mandatory_mail" value="1" {if $cf_mandatory_mail}checked="checked"{/if}>
+          {'E-mail address is mandatory'|@translate}
+        </label>
+      </li>
+      <li>
+        <label>
+          <input type="checkbox" name="cf_mandatory_name" value="1" {if $cf_mandatory_name}checked="checked"{/if}>
+          {'Name is mandatory'|@translate}
+        </label>
+      </li>
+    </ul>
+  </fieldset>
+  
+  <fieldset>
+    <legend>{'E-mail configuration'|@translate}</legend>
+    <ul>
+      <li>
+        {'E-mail format :'|@translate}
+        <label>
+          <input type="radio" name="cf_mail_type" value="text/html" {if $cf_mail_type == 'text/html'}checked="checked"{/if}>
+          HTML
+        </label>
+        <label>
+          <input type="radio" name="cf_mail_type" value="text/plain" {if $cf_mail_type == 'text/plain'}checked="checked"{/if}>
+          {'Plain text'|@translate}
+        </label>
+      </li>
+      <li>
+        <label>
+          <input type="text" name="cf_default_subject" value="{$cf_default_subject}" size="50">
+          {'Default e-mail subject'|@translate}
+        </label>
+      </li>
+      <li>
+        <label>
+          <input type="text" name="cf_subject_prefix" value="{$cf_subject_prefix}" size="50">
+          {'Prefix of the sent e-mail subject (you can use "%gallery_title%")'|@translate}
+        </label>
+      </li>
+    </ul>
+  </fieldset>
+  
+  <fieldset>
+    <legend>{'Text before the contact form'|@translate}</legend>
+    <textarea rows="4" cols="80" class="description" name="cf_before">{$cf_before}</textarea>
+  </fieldset>
+
+  <fieldset>
+    <legend>{'Text after the contact form'|@translate}</legend>
+    <textarea rows="4" cols="80" class="description" name="cf_after">{$cf_after}</textarea>
+  </fieldset>
+
+  <p style="text-align:left;"><input type="submit" name="save_config" value="{'Submit'|@translate}" class="submit"></p>
+</form>
Index: /extensions/ContactForm/admin/template/emails.tpl
===================================================================
--- /extensions/ContactForm/admin/template/emails.tpl	(revision 17483)
+++ /extensions/ContactForm/admin/template/emails.tpl	(revision 17483)
@@ -0,0 +1,81 @@
+{combine_css path=$CONTACT_FORM_PATH|@cat:"admin/template/style.css"}
+
+{footer_script}{literal}
+jQuery(document).on('change', '.delete', function() {
+  if ($(this).is(':checked')) {
+    $(this).parents('tr').addClass('delete');
+  } else {
+    $(this).parents('tr').removeClass('delete');
+  }
+});
+{/literal}{/footer_script}
+
+<div class="titrePage">
+	<h2>Contact Form</h2>
+</div>
+
+<form method="post" action="{$CONTACT_FORM_ADMIN}-emails" class="properties">
+  <table class="table2" id="emails">
+    <tr class="throw">
+      <th>{'Name'|@translate}</th>
+      <th>{'Email address'|@translate}</th>
+      <th>{'Active'|@translate}</th>
+      <th>{'Delete'|@translate}</th>
+    </tr>
+  {counter start=0 assign=i}
+  {foreach from=$EMAILS item=entry}
+    <tr class="{if $i is odd}row1{else}row2{/if}">
+      <td>
+        <input type="text" name="emails[{$i}][name]" value="{$entry.name}" size="20">
+      </td>
+      <td>
+        <input type="text" name="emails[{$i}][email]" value="{$entry.email}" size="30">
+      </td>
+      <td style="text-align:center;">
+        <input type="checkbox" name="emails[{$i}][active]" value="1" {if $entry.active}checked="checked"{/if}>
+      </td>
+      <td style="text-align:center;">
+        <input type="checkbox" name="emails[{$i}][delete]" value="1" class="delete">
+      </td>
+    </tr>
+    {counter}
+  {/foreach}
+    <tr class="{if $i is odd}row1{else}row2{/if}" id="addEntryContainer">
+      <td colspan="4">
+        <a id="addEntry">{'+ Add an email'|@translate}</a>
+      </td>
+    </tr>
+  </table>
+  {footer_script}var entry = {$i};{/footer_script}
+
+  <p><input type="submit" name="save_emails" value="{'Submit'|@translate}" class="submit"></p>
+</form>
+
+{footer_script}{literal}
+jQuery('#addEntry').click(function() {
+  entry++;
+  i = entry;
+  
+  $('#emails').append(
+    '<tr class="row'+ (i%2+1) +'">'+
+      '<td>'+
+        '<input type="text" name="emails['+ i +'][name]" size="20">'+
+      '</td>'+
+      '<td>'+
+        '<input type="text" name="emails['+ i +'][email]" size="30">'+
+      '</td>'+
+      '<td style="text-align:center;">'+
+        '<input type="checkbox" name="emails['+ i +'][active]" value="1" checked="checked">'+
+      '</td>'+
+      '<td style="text-align:center;">'+
+        '<input type="checkbox" name="emails['+ i +'][delete]" value="1" class="delete">'+
+      '</td>'+
+    '</tr>'
+    );
+    
+  $('#addEntryContainer')
+    .removeClass('row1 row2')
+    .addClass('row'+ Math.abs(i%2-2))
+    .appendTo($('#emails'));
+});
+{/literal}{/footer_script}
Index: /extensions/ContactForm/admin/template/index.php
===================================================================
--- /extensions/ContactForm/admin/template/index.php	(revision 17483)
+++ /extensions/ContactForm/admin/template/index.php	(revision 17483)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/ContactForm/admin/template/style.css
===================================================================
--- /extensions/ContactForm/admin/template/style.css	(revision 17483)
+++ /extensions/ContactForm/admin/template/style.css	(revision 17483)
@@ -0,0 +1,7 @@
+#emails input[type="text"] {
+  margin:2px 10px !important;
+}
+
+tr.delete input {
+  opacity:0.5;
+}
Index: tensions/ContactForm/config.php
===================================================================
--- /extensions/ContactForm/config.php	(revision 17482)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-check_status(ACCESS_ADMINISTRATOR);
-include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
-
-CF_Log::reset_messages();
-
-$config_tabs[]='config';
-$config_tabs[]='emails';
-$config_tabs[]='persoform';
-
-global $template, $page;
-// Include language advices
-load_language('plugin.lang', CF_PATH);
-
-$cf_plugin = get_plugin_data($plugin_id);
-$cf_config = $cf_plugin->get_config();
-
-// Tabs management
-if (!isset($_GET['tab'])) {
-    $page['tab'] = $config_tabs[0];
-} else {
-    $page['tab'] = $_GET['tab'];
-}
-
-if (!in_array($page['tab'], $config_tabs)) {
-    $page['tab'] = $config_tabs[0];
-}
-$base_admin_url = get_admin_plugin_menu_link(__FILE__);
-
-$tabsheet = new tabsheet();
-
-foreach ($config_tabs as $current_tab) {
-    $tab_name = 'cf_tab_'.$current_tab;
-    $tabsheet->add($current_tab,
-                   l10n($tab_name),
-                   $base_admin_url.'&amp;tab='.$current_tab);
-}
-$tabsheet->select($page['tab']);
-$tabsheet->assign();
-
-// Define template file
-$template->block_html_head( '',
-          '<link rel="stylesheet" type="text/css" '.
-          'href="' . CF_INCLUDE . 'contactform.css' . '">');
-$admin_css = cf_get_template('contactform_admin.css', CF_AMDIN_TPL, 'admin_');
-$template->block_html_head( '',
-          '<link rel="stylesheet" type="text/css" '.
-          'href="' . $admin_css . '">');
-$template->block_html_head( '',
-          '<script type="text/javascript" '.
-          'src="' . CF_INCLUDE . 'contactform.js' . '">'.
-          '</script>');
-$template->set_filenames(array(
-    'plugin_admin_content' => realpath(cf_get_template('cf_'.
-                                                       $page['tab'].
-                                                       '.tab.tpl',
-                                                       CF_AMDIN_TPL))
-  ));
-
-$cf = array(
-    'TITLE'     => $cf_plugin->get_title(),
-    'F_ACTION'  => '',
-  );
-$template->assign('CF', $cf);
-
-// Include specific tab
-include_once (CF_ADMIN . 'cf_' . $page['tab'] . '.tab.php');
-
-$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
-CF_Log::show_messages();
-?>
Index: tensions/ContactForm/include/cf_common.inc.php
===================================================================
--- /extensions/ContactForm/include/cf_common.inc.php	(revision 17482)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
-/* ************************** */
-/* ** Constants            ** */
-/* ************************** */
-
-define('CF_TITLE',              'cf_plugin_name');
-
-// Directories
-define('CF_INCLUDE_DIR',        'include/');
-define('CF_CLASSES_DIR',        'classes/');
-define('CF_IMAGES_DIR',         'images/');
-define('CF_TEMPLATE_DIR',       'themes/');
-define('CF_ADMIN_DIR',          'admin/');
-define('CF_LANGUAGE_DIR',       'language/');
-// Path
-define('CF_CLASSES',            CF_PATH.CF_CLASSES_DIR);
-define('CF_INCLUDE',            CF_PATH.CF_INCLUDE_DIR);
-define('CF_TEMPLATE',           CF_PATH.CF_TEMPLATE_DIR);
-define('CF_LANGUAGE',           CF_PATH.CF_LANGUAGE_DIR);
-define('CF_ADMIN',              CF_PATH.CF_ADMIN_DIR);
-define('CF_AMDIN_TPL',          CF_PATH.CF_ADMIN_DIR.CF_TEMPLATE_DIR);
-// Files
-define('CF_OBSOLETE',           'obsolete.list');
-// Constants
-define('CF_DEBUG_ACTIVE',       false);
-define('CF_MENUBAR_KEY',        'contact_form');
-define('CF_URL_PARAMETER',      'contact');
-define('CF_SEPARATOR_PATTERN',  '||SEPARATOR HERE||');
-define('CF_CHECKED',            'checked="checked"');
-define('CF_SEPARATOR',          '=');
-define('CF_SEPARATOR_LENGTH',   20);
-define('CF_DEFAULT_PREFIX',     'Piwigo ContactForm');
-define('CF_REDIRECT_DELAY',     5);
-define('CF_LANG_DEFAULT',       'default');
-// Config keys
-if (isset($plugin)) {
-  define('CF_CFG_DB_KEY',       $plugin['id']);
-}
-define('CF_CFG_DB_FACTORY',     'Factory settings for plugin %s [%s]');
-define('CF_CFG_DB_COMMENT',     'Configuration of plugin %s');
-define('CF_CFG_COMMENT',        'comment');
-
-define('CF_CFG_MENU_LINK',      'cf_menu_link');
-define('CF_CFG_SUBJECT_PREFIX', 'cf_subject_prefix');
-define('CF_CFG_SEPARATOR_LEN',  'cf_separator_length');
-define('CF_CFG_SEPARATOR',      'cf_separator');
-define('CF_CFG_ALLOW_GUEST',    'cf_allow_guest');
-define('CF_CFG_MAIL_MANDATORY', 'cf_mandatory_mail');
-define('CF_CFG_NAME_MANDATORY', 'cf_mandatory_name');
-define('CF_CFG_REDIRECT_DELAY', 'cf_redirect_delay');
-define('CF_CFG_ADMIN_MAILS',    'cf_admin_mails');
-
-/* ************************** */
-/* ** Includes             ** */
-/* ************************** */
-
-// Include plugin functions
-@include_once(CF_INCLUDE.'cf_functions.inc.php');
-
-// Load class files
-cf_require_class("CF_Log");
-cf_require_class("CF_Config");
-cf_require_class("CF_Plugin");
-
-/* ************************** */
-/* ** Variable definitions ** */
-/* ************************** */
-global $conf;
-$cf_config_default = array();
-$cf_config_default[CF_CFG_MENU_LINK] = true;
-$cf_config_default[CF_CFG_SUBJECT_PREFIX] = CF_DEFAULT_PREFIX;
-$cf_config_default[CF_CFG_SEPARATOR_LEN] = CF_SEPARATOR_LENGTH;
-$cf_config_default[CF_CFG_SEPARATOR] = CF_SEPARATOR;
-$cf_config_default[CF_CFG_ALLOW_GUEST] = true;
-$cf_config_default[CF_CFG_MAIL_MANDATORY] = true;
-$cf_config_default[CF_CFG_NAME_MANDATORY] = true;
-$cf_config_default[CF_CFG_REDIRECT_DELAY] = CF_REDIRECT_DELAY;
-$cf_config_default[CF_CFG_ADMIN_MAILS] = cf_get_admins_contacts();
-$cf_config_default[CF_CFG_ADMIN_MAILS] = array();
-CF_Config::$default_config = $cf_config_default;
-?>
Index: tensions/ContactForm/include/cf_functions.inc.php
===================================================================
--- /extensions/ContactForm/include/cf_functions.inc.php	(revision 17482)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
-// Include language advices
-load_language('plugin.lang', CF_PATH);
-
-/**
- * Include class file
- * @param $aClassName
- */
-function cf_require_class($aClassName) {
-  require_once CF_CLASSES .strtolower($aClassName) . '.class.php';
-}
-
-include_once(PHPWG_ROOT_PATH . 'include/functions_mail.inc.php');
-
-function cf_switch_to_default_lang() {
-  global $switch_lang,$user;
-  if (!isset($switch_lang['stack']) or
-      !in_array($user['language'], $switch_lang['stack'])) {
-    $switch_lang['stack'][] = $user['language'];
-  }
-  switch_lang_to(get_default_language());
-  // Include language advices
-  load_language('plugin.lang', CF_PATH);
-}
-function cf_switch_back_to_user_lang() {
-  switch_lang_back();
-}
-function cf_validate_mail_format($email) {
-  $atom   = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';   // before  arobase
-  $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
-  $regex  = '/^' . $atom . '+' . '(\.' . $atom . '+)*';
-  $regex .= '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i';
-  if ( !preg_match( $regex, $email ) ) {
-    return l10n('cf_mail_format_error');
-  }
-  return null;
-}
-
-function cf_get_admins_emails($webmaster_email) {
-  global $conf, $user;
-  $admins = array();
-
-  $query = '
-select
-  U.'.$conf['user_fields']['username'].' as username,
-  U.'.$conf['user_fields']['email'].' as mail_address
-from
-  '.USERS_TABLE.' as U,
-  '.USER_INFOS_TABLE.' as I
-where
-  I.user_id =  U.'.$conf['user_fields']['id'].' and
-  I.status in (\'webmaster\',  \'admin\') and
-  '.$conf['user_fields']['email'].' is not null and
-  I.user_id <> '.$user['id'].'
-order by
-  username
-';
-
-  $datas = pwg_query($query);
-  if (!empty($datas)) {
-    while ($admin = mysql_fetch_array($datas)) {
-      if (!empty($admin['mail_address']) and
-          (0!=strcasecmp($admin['mail_address'], $webmaster_email))) {
-        array_push( $admins,
-                    format_email($admin['username'], $admin['mail_address'])
-                  );
-      }
-    }
-  }
-  return $admins;
-}
-
-function cf_get_admins_contacts() {
-  global $conf, $user;
-  $admins = array();
-
-  $query = '
-select
-  U.'.$conf['user_fields']['username'].' as username,
-  U.'.$conf['user_fields']['email'].' as mail_address
-from
-  '.USERS_TABLE.' as U,
-  '.USER_INFOS_TABLE.' as I
-where
-  I.user_id =  U.'.$conf['user_fields']['id'].' and
-  I.status in (\'webmaster\',  \'admin\') and
-  '.$conf['user_fields']['email'].' is not null 
-order by
-  username
-';
-  
-  $webmaster_mail = get_webmaster_mail_address();
-  $datas = pwg_query($query);
-  if (!empty($datas)) {
-    while ($admin = mysql_fetch_array($datas)) {
-      if (!empty($admin['mail_address'])) {
-        $name = $admin['username'];
-        $webmaster = 0;
-        if (0 == strcasecmp($webmaster_mail, $admin['mail_address'])) {
-          $name = l10n('Webmaster');
-          $webmaster = 1;
-        }
-        $admins[$admin['mail_address']] = array(
-            'NAME'     => $name,
-            'EMAILSTR' => format_email($name,
-                                       $admin['mail_address']),
-            'ACTIVE'   => 1,
-            'WEBMASTER'=> $webmaster,
-          );
-      }
-    }
-  }
-  return $admins;
-  
-}
-
-/* Return template for user template/theme */
-function cf_get_template($file, $dir=CF_TEMPLATE, $prefix='') {
-  global $user, $template;
-
-  $theme_file = $dir.
-                //$user[$prefix.'template'].'/'.
-                $user['theme'].'/'.
-                $file;
-  $template_file = $dir.
-                   //$user[$prefix.'template'].'/'.
-                   $file;
-
-  if (file_exists($theme_file))
-  {
-    return $theme_file;
-  }
-  else
-  {
-    return $dir.$file;
-  }
-}
-
-function contactForm_prefilter($content, &$smarty) {
-  $search = '#{if\s+isset\s*\(\s*\$CONTACT_MAIL\s*\)\s*}.*?{/if}#s';
-  $replacement = '{if isset($ContactFormLink)}{$ContactFormLink}{/if}';
-
-  return preg_replace($search, $replacement, $content);
-}
-  
-function cf_clean_obsolete_files($obsolete_file_list) {
-  if (!file_exists(CF_PATH.$obsolete_file_list)) {
-    return TRUE;
-  }
-  $obsolete = file(CF_PATH.$obsolete_file_list);
-  array_push($obsolete, $obsolete_file_list);
-  return cf_clean_obsolete_list($obsolete);
-}
-
-function cf_clean_obsolete_list($file_list = array(), &$errors = array()) {
-  // Include language advices
-  load_language('plugin.lang', CF_PATH);
-  
-  if (!function_exists('unlink')) {
-      // No unlink available...
-      array_push($errors, l10n('cf_no_unlink'));
-      return FALSE;
-  }
-  $success = TRUE;
-  foreach ($file_list as $file) {
-    $file = CF_PATH . $file;
-    if (file_exists($file)) {
-      // Remove obsolete file
-      $success &= unlink($file);
-    }
-  }
-  if (!$success) {
-      array_push($errors, l10n('cf_unlink_errors'));
-  }
-  return $success;
-}
-
-function cf_format_date($year, $month, $day, $format='%M %D, %Y') {
-  $format = str_ireplace('%Y', $year, $format);
-  $format = str_ireplace('%M', $month, $format);
-  $format = str_ireplace('%D', $day, $format);
-  return $format;
-}
-
-?>
Index: /extensions/ContactForm/include/contact_form.inc.php
===================================================================
--- /extensions/ContactForm/include/contact_form.inc.php	(revision 17483)
+++ /extensions/ContactForm/include/contact_form.inc.php	(revision 17483)
@@ -0,0 +1,81 @@
+<?php
+if (!defined('CONTACT_FORM_PATH')) die('Hacking attempt!');
+
+global $template, $user, $conf, $page, $pwg_loaded_plugins;
+
+if ( (!is_classic_user() and !$conf['ContactForm']['cf_allow_guest']) or !count(get_contact_emails()) )
+{
+  redirect(get_root_url());
+}
+
+// +-----------------------------------------------------------------------+
+// |                                send email                             |
+// +-----------------------------------------------------------------------+
+if (isset($_POST['send_mail']))
+{
+  $contact = array(
+    'author' => trim($_POST['author']),
+    'email' => trim($_POST['email']),
+    'subject' =>   trim($_POST['subject']),
+    'content' =>   $_POST['content'],
+   );
+  
+  $comment_action = send_contact_form($contact, @$_POST['key']);
+
+  switch ($comment_action)
+  {
+    case 'validate':
+      array_push($page['infos'], l10n('E-mail sent successfully'));
+      unset($contact);
+      break;
+    case 'moderate':
+    case 'reject':
+      break;
+    default:
+      trigger_error('Invalid comment action '.$comment_action, E_USER_WARNING);
+  }
+}
+
+// +-----------------------------------------------------------------------+
+// |                                template                               |
+// +-----------------------------------------------------------------------+
+if (is_classic_user())
+{
+  if (!isset($contact))
+  {
+    $contact = array(
+      'author' => $user['username'],
+      'email' => $user['email'],
+      'subject' => l10n($conf['ContactForm']['cf_default_subject']),
+      'content' => null,
+      );
+  }
+  $contact['is_logged'] = true;
+}
+if ($conf['ContactForm']['cf_mandatory_mail'])
+{
+  $contact['mandatory_mail'] = true;
+}
+if ($conf['ContactForm']['cf_mandatory_name'])
+{
+  $contact['mandatory_name'] = true;
+}
+
+if (!empty($pwg_loaded_plugins['ExtendedDescription']))
+{
+  add_event_handler('render_contact_form', 'get_user_language_desc');
+}
+
+$template->assign(array(
+  'contact' => $contact,
+  'ContactForm_before' => trigger_event('render_contact_form', $conf['ContactForm_before']),
+  'ContactForm_after' => trigger_event('render_contact_form', $conf['ContactForm_after']),
+  'KEY' => get_ephemeral_key(3),
+  'CONTACT_FORM_PATH' => CONTACT_FORM_PATH,
+  'CONTACT_FORM_ABS_PATH'=> dirname(__FILE__).'/../',
+  'F_ACTION' => CONTACT_FORM_PUBLIC,
+  ));
+
+$template->set_filename('index', dirname(__FILE__).'/../template/contact_form.tpl');
+
+?>
Index: tensions/ContactForm/include/contactform.css
===================================================================
--- /extensions/ContactForm/include/contactform.css	(revision 17482)
+++ 	(revision )
@@ -1,42 +1,0 @@
-div.contact-form {
-	padding-top: 10px;
-	padding-bottom: 10px;
-}
-div.contact-form-content {
-  border-width: 0px;
-  border-style: solid;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  margin-left: 20px;
-  margin-right: 20px;
-  padding: 10px;
-}
-.cf-input-disabled {
-  position: relative;
-}
-td.contact-form-left {
-	padding-right: 5px;
-	text-align: right;
-	vertical-align: middle;
-}
-td.contact-form-left#cf_message_label {
-  vertical-align: top;
-  padding-top: 5px;
-}
-td.contact-form-right {
-  padding-left: 5px;
-  text-align: left;
-}
-#cf-redirect {
-	margin-left: 10em;
-	margin-right: 10em;
-  padding: 5px;
-}
-.cf-log-infos, .cf-log-errors {
-	font-weight: bold;
-}
-div.cf-button {
-	margin-left: 5px;
-}
-
-#cf_message {width:400px;height:200px;}
Index: tensions/ContactForm/include/contactform.js
===================================================================
--- /extensions/ContactForm/include/contactform.js	(revision 17482)
+++ 	(revision )
@@ -1,27 +1,0 @@
-function cf_check_content(item, is_mail) {
-  if (null == item) {
-    return false;
-  }
-  var value = item.value;
-  if (null == value || 0 == value.length || '' == value) {
-    return false;
-  }
-  if (is_mail) {
-    return cf_check_mail_content(value);
-  }
-  return true;
-}
-
-function cf_check_mail_content(value) {
-  var atom = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';     // before  arobase
-  var domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
-  var regex; 
-  regex  = '^' + atom + '+' + '(\.' + atom + '+)*';
-  regex += '@' + '(' + domain + '{1,63}\.)+' + domain + '{2,63}$';
-  var reg = new RegExp(regex, 'i');
-  if(reg.test(value)) {
-    return true;
-  } else {
-    return false;
-  }
-}
Index: /extensions/ContactForm/include/functions.inc.php
===================================================================
--- /extensions/ContactForm/include/functions.inc.php	(revision 17483)
+++ /extensions/ContactForm/include/functions.inc.php	(revision 17483)
@@ -0,0 +1,326 @@
+<?php
+if (!defined('CONTACT_FORM_PATH')) die('Hacking attempt!');
+
+/**
+ * define page section from url
+ */
+function contact_form_section_init()
+{
+  global $tokens, $page, $conf;
+  
+  define('CONTACT_FORM_PUBLIC', make_index_url(array('section' => 'contact')) . '/');
+
+  if ($tokens[0] == 'contact')
+  {
+    $page['section'] = 'contact';
+    $page['title'] = '<a href="'.get_absolute_root_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.CONTACT_FORM_PUBLIC.'">'.l10n('Contact').'</a>';
+  }
+}
+
+/**
+ * contact page 
+ */
+function contact_form_page()
+{
+  global $page;
+
+  if (isset($page['section']) and $page['section'] == 'contact')
+  {
+    include(CONTACT_FORM_PATH . '/include/contact_form.inc.php');
+  }
+}
+
+/** 
+ * public menu link 
+ */
+function contact_form_applymenu($menu_ref_arr)
+{
+  global $conf;
+  
+  if ( !$conf['ContactForm']['cf_menu_link'] ) return;
+  if ( !is_classic_user() and !$conf['ContactForm']['cf_allow_guest'] ) return;
+  if ( !count(get_contact_emails()) ) return;
+  
+  if (!defined('CONTACT_FORM_PUBLIC')) define('CONTACT_FORM_PUBLIC', make_index_url(array('section' => 'contact2')) . '/');
+
+  $menu = &$menu_ref_arr[0];
+  if (($block = $menu->get_block('mbMenu')) != null)
+  {
+    array_push($block->data, array(
+      'URL' => CONTACT_FORM_PUBLIC,
+      'NAME' => l10n('Contact'),
+    ));
+  }
+}
+
+/**
+ * admin plugins menu link 
+ */
+function contact_form_admin_menu($menu) 
+{
+  array_push($menu, array(
+    'URL' => CONTACT_FORM_ADMIN,
+    'NAME' => 'Contact Form',
+  ));
+  return $menu;
+}
+
+/**
+ * init emails list
+ */
+function contact_form_initialize_emails()
+{
+  global $conf;
+  
+  $query = '
+SELECT
+    u.'.$conf['user_fields']['username'].' AS username,
+    u.'.$conf['user_fields']['email'].' AS email
+  FROM '.USERS_TABLE.' AS u
+    JOIN '.USER_INFOS_TABLE.' AS i
+    ON i.user_id =  u.'.$conf['user_fields']['id'].'
+  WHERE i.status in (\'webmaster\',  \'admin\')
+    AND '.$conf['user_fields']['email'].' IS NOT NULL
+  ORDER BY username
+;';
+  $result = pwg_query($query);
+  
+  $emails = array();
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    array_push($emails, array(
+      'name' => $row['username'],
+      'email' => $row['email'],
+      'active' => true,
+      ));
+  }
+  
+  $conf['ContactForm']['cf_admin_mails'] = $emails;
+  $conf['ContactForm']['cf_must_initialize'] = false;
+  conf_update_param('ContactForm', serialize($conf['ContactForm']));
+}
+
+
+/**
+ * Send comment to subscribers
+ */
+function send_contact_form(&$comm, $key)
+{
+  global $conf, $page, $template, $conf_mail;
+  
+  if (!isset($conf_mail))
+  {
+    $conf_mail = get_mail_configuration();
+  }
+  
+  $comm = array_merge($comm,
+    array(
+      'ip' => $_SERVER['REMOTE_ADDR'],
+      'agent' => $_SERVER['HTTP_USER_AGENT']
+    )
+   );
+
+  $comment_action='validate';
+  
+  // check key
+  if (!verify_ephemeral_key(@$key))
+  {
+    $comment_action='reject';
+  }
+
+  // check author
+  if ( $conf['ContactForm']['cf_mandatory_name'] and empty($comm['author']) )
+  {
+    array_push($page['errors'], l10n('Please enter a name'));
+    $comment_action='reject';
+  }
+  
+  // check email
+  if ( $conf['ContactForm']['cf_mandatory_mail'] and empty($comm['email']) )
+  {
+    array_push($page['errors'], l10n('Please enter an e-mail'));
+    $comment_action='reject';
+  }
+  else if ( !empty($comm['email']) and !check_email_validity($comm['email']) )
+  {
+    array_push($page['errors'], l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)'));
+    $comment_action='reject';
+  }
+
+  // check subject
+  if (empty($comm['subject']))
+  {
+    array_push($page['errors'], l10n('Please enter a subject'));
+    $comment_action='reject';
+  }
+  else if (strlen($comm['subject']) < 4)
+  {
+    array_push($page['errors'], sprintf(l10n('%s must not be less than %d characters long'), l10n('Subject'), 4));
+    $comment_action='reject';
+  }
+  else if (strlen($comm['subject']) > 100)
+  {
+    array_push($page['errors'], sprintf(l10n('%s must not be more than %d characters long'), l10n('Subject'), 100));
+    $comment_action='reject';
+  }
+  
+  // check content
+  if (empty($comm['content']))
+  {
+    array_push($page['errors'], l10n('Please enter a message'));
+    $comment_action='reject';
+  }
+  else if (strlen($comm['content']) < 20)
+  {
+    array_push($page['errors'], sprintf(l10n('%s must not be less than %d characters long'), l10n('Message'), 20));
+    $comment_action='reject';
+  }
+  else if (strlen($comm['subject']) > 2000)
+  {
+    array_push($page['errors'], sprintf(l10n('%s must not be more than %d characters long'), l10n('Message'), 2000));
+    $comment_action='reject';
+  }
+  
+  include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
+  include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+  
+  add_event_handler('contact_form_check', 'user_comment_check',
+    EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
+  
+  // perform more spam check
+  $comment_action = trigger_event('contact_form_check', $comment_action, $comm);
+  
+  // get admin emails
+  $emails = get_contact_emails();
+  if (!count($emails))
+  {
+    array_push($page['errors'], l10n('Error while sending e-mail'));
+    $comment_action='reject';
+  }
+
+  if ($comment_action == 'validate')
+  {
+    // format subject
+    $prefix = str_replace('%gallery_title%', $conf['gallery_title'], $conf['ContactForm']['cf_subject_prefix']);
+    $subject = '['.$prefix.'] '.$comm['subject'];
+    $subject = trim(preg_replace('#[\n\r]+#s', '', $subject));
+    $subject = encode_mime_header($subject);
+    
+    // format content
+    if ($conf['ContactForm']['cf_mail_type'] == 'text/html')
+    {
+      $comm['content'] = nl2br($comm['content']);
+    }
+    
+    // format expeditor
+    if (empty($comm['email']))
+    {
+      $args['from'] = $conf_mail['formated_email_webmaster'];
+    }
+    else
+    {
+      $args['from'] = format_email($comm['author'], $comm['email']);
+    }
+    
+    // hearders
+    $headers = 'From: '.$args['from']."\n";  
+    $headers.= 'MIME-Version: 1.0'."\n";
+    $headers.= 'X-Mailer: Piwigo Mailer'."\n";
+    $headers.= 'Content-Transfer-Encoding: 8bit'."\n";
+    $headers.= 'Content-Type: '.$conf['ContactForm']['cf_mail_type'].'; charset="'.get_pwg_charset().'";'."\n";
+    
+    set_make_full_url();
+    switch_lang_to(get_default_language());
+    load_language('plugin.lang', CONTACT_FORM_PATH);
+    
+    // template
+    if ($conf['ContactForm']['cf_mail_type'] == 'text/html')
+    {
+      $mail_css = file_get_contents(dirname(__FILE__).'/../template/mail/style.css');
+      $template->set_filename('contact_mail', dirname(__FILE__).'/../template/mail/content_html.tpl');
+    }
+    else
+    {
+      $mail_css = null;
+      $template->set_filename('contact_mail', dirname(__FILE__).'/../template/mail/content_plain.tpl');
+    }
+    
+    $template->assign(array(
+      'cf_prefix' => $prefix,
+      'contact' => $comm,
+      'GALLERY_URL' => get_gallery_home_url(),
+      'PHPWG_URL' => PHPWG_URL,
+      'CONTACT_MAIL_CSS' => $mail_css,
+      ));
+    
+    // mail content
+    $content = $template->parse('contact_mail', true);
+    $content = wordwrap($content, 70, "\n", true);
+    
+    // send mail
+    $result =
+      trigger_event('send_mail',
+        false, /* Result */
+        trigger_event('send_mail_to', implode(';', $emails)),
+        trigger_event('send_mail_subject', $subject),
+        trigger_event('send_mail_content', $content),
+        trigger_event('send_mail_headers', $headers),
+        $args
+      );
+    
+    unset_make_full_url();
+    switch_lang_back();
+    load_language('plugin.lang', CONTACT_FORM_PATH);
+    
+    if ($result == false)
+    {
+      array_push($page['errors'], l10n('Error while sending e-mail'));
+      $comment_action='reject';
+    }
+  }
+  
+  return $comment_action;
+}
+
+/**
+ * get contact emails
+ */
+function get_contact_emails()
+{
+  global $conf;
+  
+  include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+  
+  $emails = array();
+  foreach ($conf['ContactForm']['cf_admin_mails'] as $data)
+  {
+    if ($data['active'])
+    {
+      array_push($emails, format_email($data['name'], $data['email']));
+    }
+  }
+  
+  return $emails;
+}
+
+
+/**
+ * check if email is valid 
+ */
+function check_email_validity($mail_address)
+{
+  if (version_compare(PHP_VERSION, '5.2.0') >= 0)
+  {
+    return filter_var($mail_address, FILTER_VALIDATE_EMAIL)!==false;
+  }
+  else
+  {
+    $atom   = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';   // before  arobase
+    $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
+    $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i';
+
+    return (bool)preg_match($regex, $mail_address);
+  }
+}
+
+?>
Index: /extensions/ContactForm/include/index.php
===================================================================
--- /extensions/ContactForm/include/index.php	(revision 17482)
+++ /extensions/ContactForm/include/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php,v 1.1 2009/08/13 12:39:51 Criss Exp $
-// | last update   : $Date: 2009/08/13 12:39:51 $
-// | last modifier : $Author: Criss $
-// | revision      : $Revision: 1.1 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/index.php
===================================================================
--- /extensions/ContactForm/index.php	(revision 17482)
+++ /extensions/ContactForm/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php,v 1.1 2009/08/13 12:39:52 Criss Exp $
-// | last update   : $Date: 2009/08/13 12:39:52 $
-// | last modifier : $Author: Criss $
-// | revision      : $Revision: 1.1 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/ar_SA/index.php
===================================================================
--- /extensions/ContactForm/language/ar_SA/index.php	(revision 17482)
+++ /extensions/ContactForm/language/ar_SA/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/ar_SA/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/ar_SA/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/ar_SA/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'نموذج الاتصال';
-$lang['contact_form_debug'] = 'عرض تصحيح المعلومات';
+$lang['A comment on the site'] = 'تعليق على الموقع';
+$lang['Contact'] = 'اتصل بنا';
+$lang['Your name'] = 'اسمك';
+$lang['Your e-mail'] = 'بريدك الالكتروني';
+$lang['Subject'] = 'العنوان';
+$lang['Message'] = 'الرسالة';
+$lang['General configuration'] = 'الاعدادات العامة';
+$lang['Add link in menu'] = 'اضف رابط في القائمة';
+$lang['Allow guests to see the form'] = 'السماح للضيوف برؤية النموذج';
+$lang['E-mail address is mandatory'] = 'البريد الالكتروني اجباري';
+$lang['Name is mandatory'] = 'الاسم اجباري';
+$lang['E-mail configuration'] = 'اعدادات البريد الالكتروني';
+$lang['Text before the contact form'] = 'النص قبل نموذج الاتصال';
+$lang['Text after the contact form'] = 'النص بعد نموذج الاتصال';
+$lang['E-mail sent successfully'] = 'تم الارسال بنجاح';
+$lang['Please enter a name'] = 'من فضلك ادخل الاسم';
+$lang['Please enter a subject'] = 'من فضلك ادخل العنوان';
+$lang['Please enter a message'] = 'من فضلك ادخل رسالة';
+$lang['Error while sending e-mail'] = 'حدث خطأ أثناء الارسال';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'نموذج الاتصال';
-$lang['contact_form'] = 'اتصل بنا';
-$lang['contact_form_link'] = 'اتصل بمدير الموقع';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'ارسل رسالة حالة';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'اسمك';
-$lang['cf_from_mail'] = 'بريدك الالكتروني';
-$lang['cf_subject'] = 'العنوان';
-$lang['cf_message'] = 'الرسالة';
-$lang['cf_submit'] = 'ارسل';
-$lang['title_send_mail'] = 'تعليق على الموقع';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'من فضلك ادخل الاسم';
-$lang['cf_mail_format_error'] = 'يجب ان يكون البريد بهذه الكيفيةxxx@yyy.eee (مثلا : jack@altern.org)';
-$lang['cf_subject_error'] = 'من فضلك ادخل العنوان';
-$lang['cf_message_error'] = 'من فضلك ادخل رسالة';
-$lang['cf_error_sending_mail'] = 'حدث خطأ أثناء الارسال';
-$lang['cf_sending_mail_successful'] = 'تم الارسال بنجاح';
-$lang['cf_form_error'] = 'معلومات غير صحيحة';
-$lang['cf_no_unlink'] = 'الوظيفة "unlink" غير متوفرة';
-$lang['cf_unlink_errors'] = 'خطأ اثناء حذف الملف';
-$lang['cf_config_saved'] = 'الاعدادات حفظت بنجاح';
-$lang['cf_config_saved_with_errors'] = 'الاعدادات حفظت مع وجود أخطاء';
-$lang['cf_length_not_integer'] = 'الحجم يجب ان يكون عدد صحيح';
-$lang['cf_delay_not_integer'] = 'التأخير يجب ان يكون عدد صحيح';
-$lang['cf_link_error'] = 'المتغير لايمكن ان يحوي مسافات';
-$lang['cf_hide'] = 'اخفاء';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'ادخل';
-// Configuration tab
-$lang['cf_tab_config'] = 'الاعدادات';
-$lang['cf_config'] = 'الاعدادات';
-$lang['cf_config_desc'] = 'الاعدادت الرئيسة للأداة';
-$lang['cf_label_config'] = 'الاعدادات العامة';
-$lang['cf_label_mail'] = 'اعدادات البريد الالكتروني';
-$lang['cf_menu_link'] = 'اضف رابط في القائمة';
-$lang['cf_guest_allowed'] = 'السماح للضيوف برؤية النموذج';
-$lang['cf_mail_prefix'] = 'البداية المعرفة للبريد المرسل';
-$lang['cf_separator'] = 'احرف التي تستخدم لتحديد شريط الفاصل في تنسيق نص البريد الإلكتروني';
-$lang['cf_separator_length'] = 'حجم الشريط';
-$lang['cf_mandatory_name'] = 'الاسم اجباري';
-$lang['cf_mandatory_mail'] = 'البريد الالكتروني اجباري';
-$lang['cf_redirect_delay'] = 'ايقاف مؤقت التأخير في التحويل';
-// Emails tab
-$lang['cf_tab_emails'] = 'البريد الالكتروني';
-$lang['cf_emails'] = 'البريد الالكتروني';
-$lang['cf_emails_desc'] = 'تنظيم البريد الالكتروني المستهدفة';
-$lang['cf_active'] = 'البريد الالكتروني النشطة';
-$lang['cf_no_mail'] = 'لايوجد عنوان بريد الكتروني متاح';
-$lang['cf_refresh'] = 'اعادة توليد قوائم البريد الالكتروني';
-$lang['Text after the contact form'] = 'النص بعد نموذج الاتصال';
-$lang['Text before the contact form'] = 'النص قبل نموذج الاتصال';
-$lang['cf_tab_persoform'] = 'اضف نص اختياري';
 ?>
Index: /extensions/ContactForm/language/bg_BG/index.php
===================================================================
--- /extensions/ContactForm/language/bg_BG/index.php	(revision 17482)
+++ /extensions/ContactForm/language/bg_BG/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php,v 1.1 2009/08/13 12:39:52 Criss Exp $
-// | last update   : $Date: 2009/08/13 12:39:52 $
-// | last modifier : $Author: Criss $
-// | revision      : $Revision: 1.1 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/bg_BG/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/bg_BG/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/bg_BG/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Формуляр за контакт';
-$lang['contact_form_debug'] = 'Покажи информацията за дебъгване';
+$lang['A comment on the site'] = 'Коментар на сайта';
+$lang['Contact'] = 'Контакт';
+$lang['Your name'] = 'Вашето Име';
+$lang['Your e-mail'] = 'Вашият e-mail';
+$lang['Subject'] = 'Тема';
+$lang['Message'] = 'Съобщение';
+$lang['General configuration'] = 'Обща конфигурация';
+$lang['Add link in menu'] = 'Добави линк в менюто';
+$lang['Allow guests to see the form'] = 'Позволи на гостите да виждат формата';
+$lang['E-mail address is mandatory'] = 'Е-мейл адресът е задължителен';
+$lang['Name is mandatory'] = 'Името е задължително';
+$lang['E-mail configuration'] = 'E-mail configuration';
+$lang['Text before the contact form'] = 'Текст пред формуляра "За контакт"';
+$lang['Text after the contact form'] = 'Текст след формуляра "За контакт"';
+$lang['E-mail sent successfully'] = 'E-mail е изпратен успешно';
+$lang['Please enter a name'] = 'Моля въведете име';
+$lang['Please enter a subject'] = 'Моля въведете тема';
+$lang['Please enter a message'] = 'Моля въведете съобщение';
+$lang['Error while sending e-mail'] = 'Грешка при изпращане на e-mail';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Формуляр за контакт';
-$lang['contact_form'] = 'Контакт';
-$lang['contact_form_link'] = 'Контакт Уебмастър';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Изпрати съобщение за състоянието';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Вашето Име';
-$lang['cf_from_mail'] = 'Вашият e-mail';
-$lang['cf_subject'] = 'Тема';
-$lang['cf_message'] = 'Съобщение';
-$lang['cf_submit'] = 'Изпрати';
-$lang['title_send_mail'] = 'Коментар на сайта';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Моля въведете име';
-$lang['cf_mail_format_error'] = 'мейл адресът трябва да бъде подобно на xxx@yyy.eee (пример : jack@altern.org)';
-$lang['cf_subject_error'] = 'Моля въведете тема';
-$lang['cf_message_error'] = 'Моля въведете съобщение';
-$lang['cf_error_sending_mail'] = 'Грешка при изпращане на e-mail';
-$lang['cf_sending_mail_successful'] = 'E-mail е изпратен успешно';
-$lang['cf_form_error'] = 'Невалидна информация';
-$lang['cf_no_unlink'] = 'Функцията \'unlink\' не е налична...';
-$lang['cf_unlink_errors'] = 'Възникна грешка при изтриването на файла';
-$lang['cf_config_saved'] = 'Конфигурацията е записана успешно';
-$lang['cf_config_saved_with_errors'] = 'Конфигурацията е записана с грешки';
-$lang['cf_length_not_integer'] = 'Размерът трябва да бъде цяло число';
-$lang['cf_delay_not_integer'] = 'Закъснението трябва да бъде цяло число';
-$lang['cf_link_error'] = 'Променливата неможе да съдържа интервали';
-$lang['cf_hide'] = 'Скрий';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Изпрати';
-// Configuration tab
-$lang['cf_tab_config'] = 'Конфигурация';
-$lang['cf_config'] = 'Конфигурация';
-$lang['cf_config_desc'] = 'Плъгин за основната конфигурация';
-$lang['cf_label_config'] = 'Обща конфигурация';
-$lang['cf_label_mail'] = 'Е-мейл конфигурация';
-$lang['cf_menu_link'] = 'Добави линк в менюто';
-$lang['cf_guest_allowed'] = 'Позволи на гостите да виждат формата';
-$lang['cf_mail_prefix'] = 'Префикс на изпратен е-майл обект';
-$lang['cf_separator'] = 'Синвол(и) използван за дефиниране на разграничител в е-майл в текстов формат ';
-$lang['cf_separator_length'] = 'Размер на бара';
-$lang['cf_mandatory_name'] = 'Името е задължително';
-$lang['cf_mandatory_mail'] = 'Е-мейл адресът е задължителен';
-$lang['cf_redirect_delay'] = 'Пауза на забавяне от пренасочване';
-// Emails tab
-$lang['cf_tab_emails'] = 'Е-мейли';
-$lang['cf_emails'] = 'Е-мейли';
-$lang['cf_emails_desc'] = 'Управление на местоназначение на е-майли';
-$lang['cf_active'] = 'Активен е-майл';
-$lang['cf_no_mail'] = 'Няма наличен е-мейл адрес';
-$lang['cf_refresh'] = 'Регенериране на списъка с е-мейл адреси';
-$lang['Text after the contact form'] = 'Текст след формуляра "За контакт"';
-$lang['Text before the contact form'] = 'Текст пред формуляра "За контакт"';
-$lang['cf_tab_persoform'] = 'Вмъкване на още инфо...';
 ?>
Index: /extensions/ContactForm/language/ca_ES/index.php
===================================================================
--- /extensions/ContactForm/language/ca_ES/index.php	(revision 17483)
+++ /extensions/ContactForm/language/ca_ES/index.php	(revision 17483)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/ContactForm/language/ca_ES/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/ca_ES/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/ca_ES/plugin.lang.php	(revision 17483)
@@ -21,53 +21,24 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-$lang['cf_active'] = 'Correu electrònic actiu';
-$lang['cf_config_desc'] = 'Configuració general del complement';
-$lang['cf_config_saved_with_errors'] = 'Configuració desada però amb errors';
-$lang['cf_config_saved'] = 'Configuració desada correctament';
-$lang['cf_config'] = 'Configuració';
-$lang['cf_delay_not_integer'] = 'El retard ha de ser un nombre enter';
-$lang['cf_emails_desc'] = 'Gestió de destinacions dels missatges de correu electrònic';
-$lang['cf_emails'] = 'Correus electrònics';
-$lang['cf_error_sending_mail'] = 'Error a l\'enviar el correu electrònic';
-$lang['cf_form_error'] = 'Dades no vàlides';
-$lang['cf_from_mail'] = 'Correu electrònic';
-$lang['cf_from_name_error'] = 'Si us plau, introdueix un nom';
-$lang['cf_from_name'] = 'Nom';
-$lang['cf_guest_allowed'] = 'Permetre que els convidats vegin el formulari';
-$lang['cf_hide'] = 'Ocultar';
-$lang['cf_label_config'] = 'Configuració general';
-$lang['cf_label_mail'] = 'Configuració del correu electrònic';
-$lang['cf_length_not_integer'] = 'La mida ha de ser un nombre enter';
-$lang['cf_link_error'] = 'La variable no pot contenir espais';
-$lang['cf_mail_format_error'] = 'adreça electrònica ha de ser xxx@yyy.eee (exemple: jack@altern.org)';
-$lang['cf_mail_prefix'] = 'Prefix de l\'assumpte del correu electrònic enviat';
-$lang['cf_mandatory_mail'] = 'El correu electrònic és obligatori';
-$lang['cf_mandatory_name'] = 'El nom és obligatori';
-$lang['cf_menu_link'] = 'Afegeix un enllaç al menú';
-$lang['cf_message_error'] = 'Si us plau, escribiu el missatge';
-$lang['cf_message'] = 'Missatge';
-$lang['cf_no_mail'] = 'No hi ha cap adreça de correu electrònic disponible';
-$lang['cf_no_unlink'] = 'La funció \'desenllaçar\' no està disponible ...';
-$lang['cf_plugin_name'] = 'Formulari de contacte';
-$lang['cf_redirect_delay'] = 'Pausar el retard de la redirecció';
-$lang['cf_refresh'] = 'Generar llista d\'adreces de correu electrònic';
-$lang['cf_sending_mail_successful'] = 'El correu electrònic s\'ha enviat correctament';
-$lang['cf_separator_length'] = 'Mida de la barra';
-$lang['cf_separator'] = 'Caràcter(s) utilitzat per definir una barra de separació en el correu electrònic en format de text';
-$lang['cf_subject_error'] = 'Si us plau, introdueix l\'assumpte';
-$lang['cf_subject'] = 'Assumpte';
-$lang['cf_submit'] = 'Enviar';
-$lang['cf_tab_config'] = 'Configuració';
-$lang['cf_tab_emails'] = 'Correus electrònics';
-$lang['cf_tab_persoform'] = 'Afegeix formulari de text';
-$lang['cf_unlink_errors'] = 'S\'ha produït un error durant l\'eliminació d\'arxius';
-$lang['cf_validate'] = 'Enviar';
-$lang['contact_form_debug'] = 'Visualitzar informació de depuració';
-$lang['contact_form_link'] = 'Contactar amb el webmaster';
-$lang['contact_form_title'] = 'Formulari de contacte';
-$lang['contact_form'] = 'Contacte';
-$lang['contact_redirect_title'] = 'Enviar missatge d\'estat';
-$lang['title_send_mail'] = 'Un comentari respecte al web';
+
+$lang['A comment on the site'] = 'Un comentari respecte al web';
+$lang['Contact'] = 'Contacte';
+$lang['Your name'] = 'Nom';
+$lang['Your e-mail'] = 'Correu electrònic';
+$lang['Subject'] = 'Assumpte';
+$lang['Message'] = 'Missatge';
+$lang['General configuration'] = 'Configuració general';
+$lang['Add link in menu'] = 'Afegeix un enllaç al menú';
+$lang['Allow guests to see the form'] = 'Permetre que els convidats vegin el formulari';
+$lang['E-mail address is mandatory'] = 'E-mail address is mandatory';
+$lang['Name is mandatory'] = 'El nom és obligatori';
+$lang['E-mail configuration'] = 'El correu electrònic és obligatori';
+$lang['Text before the contact form'] = 'Texte abans del formulari de contacte';
 $lang['Text after the contact form'] = 'Texte després del formulari de contacte';
-$lang['Text before the contact form'] = 'Texte abans del formulari de contacte';
+$lang['E-mail sent successfully'] = 'El correu electrònic s\'ha enviat correctament';
+$lang['Please enter a name'] = 'Si us plau, introdueix un nom';
+$lang['Please enter a subject'] = 'Si us plau, introdueix l\'assumpte';
+$lang['Please enter a message'] = 'Si us plau, escribiu el missatge';
+$lang['Error while sending e-mail'] = 'Error a l\'enviar el correu electrònic';
+
 ?>
Index: /extensions/ContactForm/language/cs_CZ/index.php
===================================================================
--- /extensions/ContactForm/language/cs_CZ/index.php	(revision 17482)
+++ /extensions/ContactForm/language/cs_CZ/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/cs_CZ/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/cs_CZ/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/cs_CZ/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Kontaktní formulář';
-$lang['contact_form_debug'] = 'Zobrazí případně chyby k odladění';
+$lang['A comment on the site'] = 'Komentář na webu';
+$lang['Contact'] = 'Kontakt';
+$lang['Your name'] = 'Vaše jméno';
+$lang['Your e-mail'] = 'Váš e-mail';
+$lang['Subject'] = 'Předmět';
+$lang['Message'] = 'Zpráva';
+$lang['General configuration'] = 'Hlavní konfigurace';
+$lang['Add link in menu'] = 'Vložit odkaz do menu';
+$lang['Allow guests to see the form'] = 'Povol návštěvníkům vidět formulář';
+$lang['E-mail address is mandatory'] = 'E-mail addresa je povinná';
+$lang['Name is mandatory'] = 'Jméno je povinné';
+$lang['E-mail configuration'] = 'E-mail konfigurace';
+$lang['Text before the contact form'] = 'Text před kontaktním formulářem';
+$lang['Text after the contact form'] = 'Text za kontaktním formulářem';
+$lang['E-mail sent successfully'] = 'E-mail odeslán';
+$lang['Please enter a name'] = 'Prosím zadejte Vaše jméno';
+$lang['Please enter a subject'] = 'Prosím zadejte předmět zprávy';
+$lang['Please enter a message'] = 'Prosím zadejte zprávu';
+$lang['Error while sending e-mail'] = 'Nastala chyba při odeslání zprávy';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Kontaktní formulář';
-$lang['contact_form'] = 'Kontakt';
-$lang['contact_form_link'] = 'Kontakt správce webu';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Stav odesílané zprávy';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Vaše jméno';
-$lang['cf_from_mail'] = 'Váš e-mail';
-$lang['cf_subject'] = 'Předmět';
-$lang['cf_message'] = 'Zpráva';
-$lang['cf_submit'] = 'Odeslat';
-$lang['title_send_mail'] = 'Komentář na webu';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Prosím zadejte Vaše jméno';
-$lang['cf_mail_format_error'] = 'E-mail musí být ve formátu xxx@yyy.eee (například : novak@seznam.cz)';
-$lang['cf_subject_error'] = 'Prosím zadejte předmět zprávy';
-$lang['cf_message_error'] = 'Prosím zadejte zprávu';
-$lang['cf_error_sending_mail'] = 'Nastala chyba při odeslání zprávy';
-$lang['cf_sending_mail_successful'] = 'E-mail odeslán';
-$lang['cf_form_error'] = 'Nesprávná data';
-$lang['cf_no_unlink'] = 'Funkce \'unlink\' není k dispozici...';
-$lang['cf_unlink_errors'] = 'Chyba nastala při mazání souboru';
-$lang['cf_config_saved'] = 'Konfigurace uložena';
-$lang['cf_config_saved_with_errors'] = 'Konfigurace uložena s chybami';
-$lang['cf_length_not_integer'] = 'Velikost musí být celé číslo';
-$lang['cf_delay_not_integer'] = 'Zpoždění musí být celé číslo';
-$lang['cf_link_error'] = 'Proměnná ne\může obsahovat mezery';
-$lang['cf_hide'] = 'Skrýt';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Potvrdit';
-// Configuration tab
-$lang['cf_tab_config'] = 'Konfigurace';
-$lang['cf_config'] = 'Konfigurace';
-$lang['cf_config_desc'] = 'Hlavní konfigurace pluginu';
-$lang['cf_label_config'] = 'Hlavní konfigurace';
-$lang['cf_label_mail'] = 'E-mail konfigurace';
-$lang['cf_menu_link'] = 'Vložit odkaz do menu';
-$lang['cf_guest_allowed'] = 'Povol návštěvníkům vidět formulář';
-$lang['cf_mail_prefix'] = 'Prefix pro předmět zpráv';
-$lang['cf_separator'] = 'Znak(y) sloužící k definování oddělení polí v e-mailu v textovém formátu';
-$lang['cf_separator_length'] = 'Velikost pole';
-$lang['cf_mandatory_name'] = 'Jméno je povinné';
-$lang['cf_mandatory_mail'] = 'E-mail addresa je povinná';
-$lang['cf_redirect_delay'] = 'Zpoždění přesměrování';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-maily';
-$lang['cf_emails'] = 'E-maily';
-$lang['cf_emails_desc'] = 'Řízení cílové destinace e-mailů ';
-$lang['cf_active'] = 'Aktivuj e-mail';
-$lang['cf_no_mail'] = 'Žádná mail adresa k dispozici';
-$lang['cf_refresh'] = 'Regenerace seznamu e-mail adres';
-$lang['Text after the contact form'] = 'Text za kontaktním formulářem';
-$lang['Text before the contact form'] = 'Text před kontaktním formulářem';
-$lang['cf_tab_persoform'] = 'Přidejte zakázkový text';
 ?>
Index: /extensions/ContactForm/language/da_DK/index.php
===================================================================
--- /extensions/ContactForm/language/da_DK/index.php	(revision 17482)
+++ /extensions/ContactForm/language/da_DK/index.php	(revision 17483)
@@ -1,3 +1,26 @@
 <?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
 $url = '../';
 header( 'Request-URI: '.$url );
Index: /extensions/ContactForm/language/da_DK/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/da_DK/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/da_DK/plugin.lang.php	(revision 17483)
@@ -21,53 +21,24 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
+
+$lang['A comment on the site'] = 'En kommentar på sitet';
+$lang['Contact'] = 'Kontakt';
+$lang['Your name'] = 'Dit navn';
+$lang['Your e-mail'] = 'Din e-mail';
+$lang['Subject'] = 'Emne';
+$lang['Message'] = 'Besked';
+$lang['General configuration'] = 'Generelle indstillinger';
+$lang['Add link in menu'] = 'Tilføj link i menu';
+$lang['Allow guests to see the form'] = 'Tillad gæster at se formular';
+$lang['E-mail address is mandatory'] = 'E-mail address is mandatory';
+$lang['Name is mandatory'] = 'Navn er påkrævet';
+$lang['E-mail configuration'] = 'E-mail adresse er påkrævet';
+$lang['Text before the contact form'] = 'Tekst før kontakt formular';
 $lang['Text after the contact form'] = 'Tekst efter kontakt formular';
-$lang['Text before the contact form'] = 'Tekst før kontakt formular';
-$lang['cf_active'] = 'Aktiv e-mail adresse';
-$lang['cf_config_desc'] = 'Grundindstillinger for plugin';
-$lang['cf_config_saved_with_errors'] = 'Indstillinger gemt, men med fejl';
-$lang['cf_config_saved'] = 'Indstillinger gemt';
-$lang['cf_config'] = 'Indstillinger';
-$lang['cf_delay_not_integer'] = 'Forsinkelse skal angives som et heltal';
-$lang['cf_emails_desc'] = 'Administration af modtager e-mails';
-$lang['cf_emails'] = 'E-mails';
-$lang['cf_error_sending_mail'] = 'Fejl ved afsendelse af e-mail';
-$lang['cf_form_error'] = 'Fejl i data';
-$lang['cf_from_mail'] = 'Din e-mail';
-$lang['cf_from_name_error'] = 'Angiv et navn';
-$lang['cf_from_name'] = 'Dit navn';
-$lang['cf_guest_allowed'] = 'Tillad gæster at se formular';
-$lang['cf_hide'] = 'Skjul';
-$lang['cf_label_config'] = 'Generelle indstillinger';
-$lang['cf_label_mail'] = 'Indstillinger for e-mail';
-$lang['cf_length_not_integer'] = 'Størrelse skal angives som et heltal';
-$lang['cf_link_error'] = 'Variabel kan ikke indeholde mellemrum';
-$lang['cf_mail_format_error'] = 'E-mail adresse skal angives som xxx@yyy.zz (fx jens@jensen.dk)';
-$lang['cf_mail_prefix'] = 'Præfix for emnefeltet i den sendte e-mail';
-$lang['cf_mandatory_mail'] = 'E-mail adresse er påkrævet';
-$lang['cf_mandatory_name'] = 'Navn er påkrævet';
-$lang['cf_menu_link'] = 'Tilføj link i menu';
-$lang['cf_message_error'] = 'Angiv en beskred';
-$lang['cf_message'] = 'Besked';
-$lang['cf_no_mail'] = 'Ingen e-mail adresse er tilgængelig';
-$lang['cf_no_unlink'] = 'Funktionen "unlink" er ikke tilgængelig';
-$lang['cf_plugin_name'] = 'Kontakt Formular';
-$lang['cf_redirect_delay'] = 'Stop forsinkelse på viderestilling';
-$lang['cf_refresh'] = 'Opdater e-mail adresseliste ';
-$lang['cf_sending_mail_successful'] = 'E-mail sendt';
-$lang['cf_separator_length'] = 'Længde på separatorlinie';
-$lang['cf_separator'] = 'Karakter(er) der anvendes som separatorlinie for e-mails i tekst format';
-$lang['cf_subject_error'] = 'Angiv et emne';
-$lang['cf_subject'] = 'Emne';
-$lang['cf_submit'] = 'Send';
-$lang['cf_tab_config'] = 'Indstillinger';
-$lang['cf_tab_emails'] = 'E-mails';
-$lang['cf_tab_persoform'] = 'Tilføj speciel tekst';
-$lang['cf_unlink_errors'] = 'Fejl ved sletning af fil';
-$lang['cf_validate'] = 'Send';
-$lang['contact_form_debug'] = 'Vis debug information';
-$lang['contact_form_link'] = 'Kontakt webmaster';
-$lang['contact_form_title'] = 'Kontakt formular';
-$lang['contact_form'] = 'Kontakt';
-$lang['contact_redirect_title'] = 'Status for send besked';
-$lang['title_send_mail'] = 'En kommentar på sitet';
+$lang['E-mail sent successfully'] = 'E-mail sendt';
+$lang['Please enter a name'] = 'Angiv et navn';
+$lang['Please enter a subject'] = 'Angiv et emne';
+$lang['Please enter a message'] = 'Angiv en beskred';
+$lang['Error while sending e-mail'] = 'Fejl ved afsendelse af e-mail';
+
 ?>
Index: /extensions/ContactForm/language/de_DE/index.php
===================================================================
--- /extensions/ContactForm/language/de_DE/index.php	(revision 17482)
+++ /extensions/ContactForm/language/de_DE/index.php	(revision 17483)
@@ -1,66 +1,30 @@
 <?php
-
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
 // +-----------------------------------------------------------------------+
 
-// | 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 |
-
-// +-----------------------------------------------------------------------+
-
-// | file          : $Id: index.php,v 1.1 2009/08/13 12:39:52 Criss Exp $
-
-// | last update   : $Date: 2009/08/13 12:39:52 $
-
-// | last modifier : $Author: Criss $
-
-// | revision      : $Revision: 1.1 $
-
-// +-----------------------------------------------------------------------+
-
-// | 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.                                                                  |
-
-// +-----------------------------------------------------------------------+
-
-
-
 // Recursive call
-
 $url = '../';
-
 header( 'Request-URI: '.$url );
-
 header( 'Content-Location: '.$url );
-
 header( 'Location: '.$url );
-
 exit();
-
 ?>
-
Index: /extensions/ContactForm/language/de_DE/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/de_DE/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/de_DE/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Kontaktformular';
-$lang['contact_form_debug'] = 'Anzeige von Debug-Informationen';
+$lang['A comment on the site'] = 'Ein Kommentar auf der Seite';
+$lang['Contact'] = 'Kontaktieren';
+$lang['Your name'] = 'Ihr Name';
+$lang['Your e-mail'] = 'Ihre E-Mail';
+$lang['Subject'] = 'Betreff';
+$lang['Message'] = 'Mitteilung';
+$lang['General configuration'] = 'Algemeine Konfiguration';
+$lang['Add link in menu'] = 'Füge einen Link im Menü hinzu';
+$lang['Allow guests to see the form'] = 'Erlaube den Gästen die Benutzung des Kontaktformulars';
+$lang['E-mail address is mandatory'] = 'Die E-Mail ist obligatorisch';
+$lang['Name is mandatory'] = 'Der Name ist obligatorisch';
+$lang['E-mail configuration'] = 'E-mail Konfiguration';
+$lang['Text before the contact form'] = 'Text vor dem Kontaktformular';
+$lang['Text after the contact form'] = 'Text nach dem Kontaktformular';
+$lang['E-mail sent successfully'] = 'Die E-Mail wurde erfolgreich versendet';
+$lang['Please enter a name'] = 'Bitte fügen Sie Ihren Namen ein';
+$lang['Please enter a subject'] = 'Bitte fügen Sie den Betreff ein';
+$lang['Please enter a message'] = 'Bitte fügen Sie eine Mitteilung hinzu';
+$lang['Error while sending e-mail'] = 'Es ist ein Fehler beim Versand der E-Mail aufgetreten'; 
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Kontaktformular';
-$lang['contact_form'] = 'Kontaktieren';
-$lang['contact_form_link'] = 'Den Webmaster kontaktieren';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Status der Nachricht';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Ihr Name';
-$lang['cf_from_mail'] = 'Ihre E-Mail';
-$lang['cf_subject'] = 'Betreff';
-$lang['cf_message'] = 'Mitteilung';
-$lang['cf_submit'] = 'senden';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Bitte fügen Sie Ihren Namen ein';
-$lang['cf_mail_format_error'] = 'E-Mail-Adresse muss in der Form xxx@yyy.eee (Beispiel: jack@altern.org) sein';
-$lang['cf_subject_error'] = 'Bitte fügen Sie den Betreff ein';
-$lang['cf_message_error'] = 'Bitte fügen Sie eine Mitteilung hinzu';
-$lang['cf_error_sending_mail'] = 'Es ist ein Fehler beim Versand der E-Mail aufgetreten'; 
-$lang['cf_sending_mail_successful'] = 'Die E-Mail wurde erfolgreich versendet';
-$lang['cf_form_error'] = 'Ungültige Daten'; 
-$lang['cf_no_unlink'] = 'Die Funktion \'unlink\' ist nicht verfügbar...';
-$lang['cf_unlink_errors'] = 'Es ist ein Fehler während der Löschung der Datei entstanden';
-$lang['cf_config_saved'] = 'Die Konfiguration wurde erfolgreich gespeichert werden';
-$lang['cf_config_saved_with_errors'] = 'Die Konfiguration wurde mit Fehlern gespeichert';
-$lang['cf_length_not_integer'] = 'Die Grössen müssen Integer zahlen sein';
-$lang['cf_delay_not_integer'] = 'Die Verzögerung muss eine Integer zahl sein';
-$lang['cf_link_error'] = 'Die Variabel darf keine Lehrzeichen enthalten';
-$lang['cf_hide'] = 'Verstecken';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Einstellung speichern';
-// Configuration tab
-$lang['cf_tab_config'] = 'Konfiguration';
-$lang['cf_config'] = 'Konfiguration';
-$lang['cf_config_desc'] = 'Hauptkonfiguration des Plug-in\'s';
-$lang['cf_label_config'] = 'Algemeine Konfiguration';
-$lang['cf_label_mail'] = 'E-mail Konfiguration';
-$lang['cf_menu_link'] = 'Füge einen Link im Menü hinzu';
-$lang['cf_guest_allowed'] = 'Erlaube den Gästen die Benutzung des Kontaktformulars';
-$lang['cf_mail_prefix'] = 'Präfix des Betreffs der gesendeten E-Mail';
-$lang['cf_separator'] = 'Benutzter Charakter, welcher eine Trennleiste in der E-Mail im Textformat definiert';
-$lang['cf_separator_length'] = 'Grösse der Trennleiste';
-$lang['cf_mandatory_name'] = 'Der Name ist obligatorisch';
-$lang['cf_mandatory_mail'] = 'Die E-Mail ist obligatorisch';
-$lang['cf_redirect_delay'] = 'Wartezeit bis zur Weiterleitung (s) ';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-Mails';
-$lang['cf_emails'] = 'E-Mails';
-$lang['cf_emails_desc'] = 'Verwaltung des E-Mail Bestimmungsortes';
-$lang['cf_active'] = 'Aktive E-Mail';
-$lang['cf_no_mail'] = 'Keine E-Mail Adresse verfügbar';
-$lang['cf_refresh'] = 'Regeneriere die E-Mail Adressenliste';
-$lang['Text after the contact form'] = 'Text nach dem Kontaktformular';
-$lang['Text before the contact form'] = 'Text vor dem Kontaktformular';
-$lang['cf_tab_persoform'] = 'Benutzerdefinierten Text hinzufügen';
-$lang['title_send_mail'] = 'Ein Kommentar auf der Seite';
 ?>
Index: /extensions/ContactForm/language/el_GR/index.php
===================================================================
--- /extensions/ContactForm/language/el_GR/index.php	(revision 17482)
+++ /extensions/ContactForm/language/el_GR/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php,v 1.1 2009/08/13 12:39:51 Criss Exp $
-// | last update   : $Date: 2009/08/13 12:39:51 $
-// | last modifier : $Author: Criss $
-// | revision      : $Revision: 1.1 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/el_GR/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/el_GR/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/el_GR/plugin.lang.php	(revision 17483)
@@ -1,63 +1,38 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['contact_form_title'] = 'Φόρμα επαφής';
-$lang['contact_form'] = 'Επαφή';
-$lang['contact_form_link'] = 'Επαφή με τον webmaster';
+$lang['A comment on the site'] = 'Ένα σχόλιο για την ιστοσελίδα';
+$lang['Contact'] = 'Επαφή';
+$lang['Your name'] = 'Το όνομά σου';
+$lang['Your e-mail'] = 'Το e-mail σου';
+$lang['Subject'] = 'Θέμα';
+$lang['Message'] = 'Μήνυμα';
+$lang['Text before the contact form'] = 'Κείμενο πριν από τη φόρμα επικοινωνίας';
+$lang['Text after the contact form'] = 'Κείμενο μετά από τη φόρμα επικοινωνίας';
+$lang['E-mail sent successfully'] = 'Το e-mail στάλθηκε με επιτυχία';
+$lang['Please enter a name'] = 'Παρακαλώ εισάγετε ένα όνομα';
+$lang['Please enter a subject'] = 'Παρακαλώ εισάγετε ένα θέμα';
+$lang['Please enter a message'] = 'Παρακαλώ εισάγετε ένα μήνυμα';
+$lang['Error while sending e-mail'] = 'Λάθος κατά την απόστολή e-mail';
 
-
-$lang['contact_redirect_title'] = 'Κατάσταση απεσταλμένου μηνύματος';
-
-$lang['cf_from_name'] = 'Το όνομά σου';
-$lang['cf_from_mail'] = 'Το e-mail σου';
-$lang['cf_subject'] = 'Θέμα';
-$lang['cf_message'] = 'Μήνυμα';
-$lang['cf_submit'] = 'Αποστολή';
-$lang['title_send_mail'] = 'Ένα σχόλιο για την ιστοσελίδα';
-
-$lang['cf_from_name_error'] = 'Παρακαλώ εισάγετε ένα όνομα';
-$lang['cf_mail_format_error'] = 'η διεύθυνση ηλεκτρονικού ταχυδρομείου πρέπει να είναι της μορφής xxx@yyy.eee (παράδειγμα: jack@altern.org)';
-$lang['cf_subject_error'] = 'Παρακαλώ εισάγετε ένα θέμα';
-$lang['cf_message_error'] = 'Παρακαλώ εισάγετε ένα μήνυμα';
-$lang['cf_error_sending_mail'] = 'Λάθος κατά την απόστολή e-mail';
-$lang['cf_sending_mail_successful'] = 'Το e-mail στάλθηκε με επιτυχία';
-$lang['cf_form_error'] = 'Άκυρα δεδομένα';
-$lang['cf_no_unlink'] = 'Function \'unlink\' not available...';
-$lang['cf_unlink_errors'] = 'Λάθη συνέβησαν κατά την διαγραφή του αρχείου';
-$lang['cf_config_saved'] = 'Η παραμετροποίηση αποθηκεύτηκε επιτυχημένα';
-$lang['cf_config_saved_with_errors'] = 'Η παραμετροποίηση αποθηκεύτηκε με λάθη';
-$lang['cf_length_not_integer'] = 'Το μέγεθος πρέπει να είναι ακέραιος αριθμός';
-$lang['cf_delay_not_integer'] = 'Η καθυστέρηση πρέπει να είναι ακέραιος αριθμός';
-$lang['cf_link_error'] = 'Η μεταβλητή δεν μπορεί να περιέχει κενά';
-$lang['cf_hide'] = 'Απόκρυψη'; 
-
-
-$lang['cf_plugin_name'] = 'Contact Form';
-$lang['contact_form_debug'] = 'Display of debug information';
-$lang['cf_validate'] = 'Submit';
-$lang['cf_tab_config'] = 'Configuration';
-$lang['cf_config'] = 'Configuration';
-$lang['cf_config_desc'] = 'Plugin main configuration';
-$lang['cf_label_config'] = 'General configuration';
-$lang['cf_label_mail'] = 'E-mail configuration';
-$lang['cf_menu_link'] = 'Add link in menu';
-$lang['cf_guest_allowed'] = 'Allow guests to see the form';
-$lang['cf_mail_prefix'] = 'Prefix of the sent e-mail subject';
-$lang['cf_separator'] = 'Character(s) used to define a separation bar in the e-mail in text format';
-$lang['cf_separator_length'] = 'Size of the bar';
-$lang['cf_mandatory_name'] = 'Name is mandatory';
-$lang['cf_mandatory_mail'] = 'E-mail address is mandatory';
-$lang['cf_redirect_delay'] = 'Pause delay of redirection';
-$lang['cf_tab_emails'] = 'E-mails';
-$lang['cf_emails'] = 'E-mails';
-$lang['cf_emails_desc'] = 'Destination e-mails management';
-$lang['cf_active'] = 'Active e-mail';
-$lang['cf_no_mail'] = 'No e-mail address available';
-$lang['cf_refresh'] = 'Regenerate e-mail list address';
-
-
-
-$lang['Text after the contact form'] = 'Κείμενο μετά από τη φόρμα επικοινωνίας';
-$lang['Text before the contact form'] = 'Κείμενο πριν από τη φόρμα επικοινωνίας';
-$lang['cf_tab_persoform'] = 'Προσθήκη προσαρμοσμένου κειμένου';
 ?>
Index: /extensions/ContactForm/language/en_UK/index.php
===================================================================
--- /extensions/ContactForm/language/en_UK/index.php	(revision 17482)
+++ /extensions/ContactForm/language/en_UK/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php,v 1.1 2009/08/13 12:39:52 Criss Exp $
-// | last update   : $Date: 2009/08/13 12:39:52 $
-// | last modifier : $Author: Criss $
-// | revision      : $Revision: 1.1 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/en_UK/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/en_UK/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/en_UK/plugin.lang.php	(revision 17483)
@@ -1,72 +1,55 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Contact Form';
-$lang['contact_form_debug'] = 'Display of debug information';
-
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Contact form';
-$lang['contact_form'] = 'Contact';
-$lang['contact_form_link'] = 'Contact webmaster';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Send message status';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Your name';
-$lang['cf_from_mail'] = 'Your e-mail';
-$lang['cf_subject'] = 'Subject';
-$lang['cf_message'] = 'Message';
-$lang['cf_submit'] = 'Send';
-$lang['title_send_mail'] = 'A comment on the site';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Please enter a name';
-$lang['cf_mail_format_error'] = 'mail address must be like xxx@yyy.eee (example : jack@altern.org)';
-$lang['cf_subject_error'] = 'Please enter a subject';
-$lang['cf_message_error'] = 'Please enter a message';
-$lang['cf_error_sending_mail'] = 'Error while sending e-mail';
-$lang['cf_sending_mail_successful'] = 'E-mail sent successfully';
-$lang['cf_form_error'] = 'Invalid data';
-$lang['cf_no_unlink'] = 'Function \'unlink\' not available...';
-$lang['cf_unlink_errors'] = 'Error occured during file deletion';
-$lang['cf_config_saved'] = 'Configuration successfully saved';
-$lang['cf_config_saved_with_errors'] = 'Configuration saved with errors';
-$lang['cf_length_not_integer'] = 'Size must be an integer';
-$lang['cf_delay_not_integer'] = 'Delay must be an integer';
-$lang['cf_link_error'] = 'Variable can\'t contain spaces';
-$lang['cf_hide'] = 'Hide';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Submit';
-// Configuration tab
-$lang['cf_tab_config'] = 'Configuration';
-$lang['cf_config'] = 'Configuration';
-$lang['cf_config_desc'] = 'Plugin main configuration';
-$lang['cf_label_config'] = 'General configuration';
-$lang['cf_label_mail'] = 'E-mail configuration';
-$lang['cf_menu_link'] = 'Add link in menu';
-$lang['cf_guest_allowed'] = 'Allow guests to see the form';
-$lang['cf_mail_prefix'] = 'Prefix of the sent e-mail subject';
-$lang['cf_separator'] = 'Character(s) used to define a separation bar in the e-mail in text format';
-$lang['cf_separator_length'] = 'Size of the bar';
-$lang['cf_mandatory_name'] = 'Name is mandatory';
-$lang['cf_mandatory_mail'] = 'E-mail address is mandatory';
-$lang['cf_redirect_delay'] = 'Pause delay of redirection';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-mails';
-$lang['cf_emails'] = 'E-mails';
-$lang['cf_emails_desc'] = 'Destination e-mails management';
-$lang['cf_active'] = 'Active e-mail';
-$lang['cf_no_mail'] = 'No e-mail address available';
-$lang['cf_refresh'] = 'Regenerate e-mail list address';
-// persoformtab
-$lang['cf_tab_persoform'] = 'Add custom text';
+$lang['A comment on the site'] = 'A comment on the site';
+$lang['Contact'] = 'Contact';
+$lang['Your name'] = 'Your name';
+$lang['Your e-mail'] = 'Your e-mail';
+$lang['Subject'] = 'Subject';
+$lang['Message'] = 'Message';
+$lang['General configuration'] = 'General configuration';
+$lang['Add link in menu'] = 'Add link in menu';
+$lang['Allow guests to see the form'] = 'Allow guests to see the form';
+$lang['E-mail address is mandatory'] = 'E-mail address is mandatory';
+$lang['Name is mandatory'] = 'Name is mandatory';
+$lang['E-mail configuration'] = 'E-mail configuration';
+$lang['E-mail format :'] = 'E-mail format :';
+$lang['Plain text'] = 'Plain text';
+$lang['Default e-mail subject'] = 'Default e-mail subject';
+$lang['Prefix of the sent e-mail subject (you can use "%gallery_title%")'] = 'Prefix of the sent e-mail subject (you can use "%gallery_title%")';
 $lang['Text before the contact form'] = 'Text before the contact form';
 $lang['Text after the contact form'] = 'Text after the contact form';
+$lang['Active'] = 'Active';
+$lang['+ Add an email'] = '+ Add an email';
+$lang['E-mail: %s'] = 'E-mail: %s';
+$lang['No active email address'] = 'No active email address';
+$lang['E-mail sent successfully'] = 'E-mail sent successfully';
+$lang['Please enter a name'] = 'Please enter a name';
+$lang['Please enter an e-mail'] = 'Please enter an e-mail';
+$lang['Please enter a subject'] = 'Please enter a subject';
+$lang['Please enter a message'] = 'Please enter a message';
+$lang['%s must not be less than %d characters long'] = '%s must not be less than %d characters long';
+$lang['%s must not be more than %d characters long'] = '%s must not be more than %d characters long';
+$lang['Error while sending e-mail'] = 'Error while sending e-mail';
+
 ?>
Index: /extensions/ContactForm/language/es_ES/index.php
===================================================================
--- /extensions/ContactForm/language/es_ES/index.php	(revision 17482)
+++ /extensions/ContactForm/language/es_ES/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 3865 2009-09-17 22:56:05Z ddtddt $
-// | last update   : $Date: 2009-09-18 00:56:05 +0200 (Fri, 18 Sep 2009) $
-// | last modifier : $Author: ddtddt $
-// | revision      : $Revision: 3865 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/es_ES/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/es_ES/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/es_ES/plugin.lang.php	(revision 17483)
@@ -1,71 +1,43 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Contact Form';
-$lang['contact_form_debug'] = 'Fijación de las informaciones de debug';
+$lang['A comment on the site'] = 'Un comentario en el sitio';
+$lang['Contact'] = 'Contactar';
+$lang['Your name'] = 'Su nombre';
+$lang['Your e-mail'] = 'Su e-mail';
+$lang['Subject'] = 'Sujeto';
+$lang['Message'] = 'Mensaje';
+$lang['General configuration'] = 'Configuración general';
+$lang['Add link in menu'] = 'Añadir el lazo en el menú';
+$lang['Allow guests to see the form'] = 'Autorizar a los invitados a tener el formulario';
+$lang['E-mail address is mandatory'] = 'Presencia del e-mail obligatorio';
+$lang['Name is mandatory'] = 'Presencia del nombre obligatorio';
+$lang['Text before the contact form'] = 'Texto antes del formulario de contacto';
+$lang['Text after the contact form'] = 'Texto después del formulario de contacto';
+$lang['E-mail sent successfully'] = 'E-mail enviado con éxito';
+$lang['Please enter a name'] = 'Por favor, entre un nombre';
+$lang['Please enter a subject'] = 'Por favor, entre un sujeto';
+$lang['Please enter a message'] = 'Por favor, entre un mensaje';
+$lang['Error while sending e-mail'] = 'Error en el momento del envío del e-mail';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Formulario de contacto';
-$lang['contact_form'] = 'Contactar';
-$lang['contact_form_link'] = 'Contactar webmestre';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Estatuto del envío del mensaje';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Su nombre';
-$lang['cf_from_mail'] = 'Su e-mail';
-$lang['cf_subject'] = 'Sujeto';
-$lang['cf_message'] = 'Mensaje';
-$lang['cf_submit'] = 'Enviar';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Por favor, entre un nombre';
-$lang['cf_mail_format_error'] = 'El formato de la dirección e-mail debe ser xxx@yyy.eee (ejemplo: jack@altern.org)';
-$lang['cf_subject_error'] = 'Por favor, entre un sujeto';
-$lang['cf_message_error'] = 'Por favor, entre un mensaje';
-$lang['cf_error_sending_mail'] = 'Error en el momento del envío del e-mail';
-$lang['cf_sending_mail_successful'] = 'E-mail enviado con éxito';
-$lang['cf_form_error'] = 'Datos incorrectos';
-$lang['cf_no_unlink'] = 'La función \'unlink \' no está disponible';
-$lang['cf_unlink_errors'] = 'Errores se efectuaron en el momento de la supresión de ficheros';
-$lang['cf_config_saved'] = 'Configuración salvada con éxito';
-$lang['cf_config_saved_with_errors'] = 'Configuración salvada pero con errores';
-$lang['cf_length_not_integer'] = 'La talla debe ser un entero';
-$lang['cf_delay_not_integer'] = 'El plazo debe ser un entero';
-$lang['cf_link_error'] = 'La variable no puede contener de espacios';
-$lang['cf_hide'] = 'Enmascarar';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Validar';
-// Configuration tab
-$lang['cf_tab_config'] = 'Configuración';
-$lang['cf_config'] = 'Configuración';
-$lang['cf_config_desc'] = 'Configuración principal del plugin';
-$lang['cf_label_config'] = 'Configuración general';
-$lang['cf_label_mail'] = 'Configuración del e-mail';
-$lang['cf_menu_link'] = 'Añadir el lazo en el menú';
-$lang['cf_guest_allowed'] = 'Autorizar a los invitados a tener el formulario';
-$lang['cf_mail_prefix'] = 'Prefijo del sujeto del e-mail enviado';
-$lang['cf_separator'] = 'Carácter utilizado para definir una barra de separación en el e-mail al tamaño texto';
-$lang['cf_separator_length'] = 'Talla de la barra de separación';
-$lang['cf_mandatory_name'] = 'Presencia del nombre obligatorio';
-$lang['cf_mandatory_mail'] = 'Presencia del e-mail obligatorio';
-$lang['cf_redirect_delay'] = 'Plazo de pausa del redirection';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-mail';
-$lang['cf_emails'] = 'E-mail';
-$lang['cf_emails_desc'] = 'Gestión de los e-mails de destino';
-$lang['cf_active'] = 'E-mail activo';
-$lang['cf_no_mail'] = 'Ningún correo electrónico disponible';
-$lang['cf_refresh'] = 'Regenerar la lista de las direcciones';
-$lang['Text after the contact form'] = 'Texto después del formulario de contacto';
-$lang['Text before the contact form'] = 'Texto antes del formulario de contacto';
-$lang['cf_tab_persoform'] = 'Añadir texto personalizado';
-$lang['title_send_mail'] = 'Un comentario en el sitio';
 ?>
Index: /extensions/ContactForm/language/fr_FR/description.txt
===================================================================
--- /extensions/ContactForm/language/fr_FR/description.txt	(revision 17482)
+++ /extensions/ContactForm/language/fr_FR/description.txt	(revision 17483)
@@ -1,1 +1,1 @@
-Ajoute un élément "Contacter" dans le bloc Menu afin d'offrir un formulaire de contact aux utilisateurs
+Ajoute un lien "Contact" dans le bloc Menu afin d'offrir un formulaire de contact aux utilisateurs
Index: /extensions/ContactForm/language/fr_FR/index.php
===================================================================
--- /extensions/ContactForm/language/fr_FR/index.php	(revision 17482)
+++ /extensions/ContactForm/language/fr_FR/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php,v 1.1 2009/08/13 12:39:51 Criss Exp $
-// | last update   : $Date: 2009/08/13 12:39:51 $
-// | last modifier : $Author: Criss $
-// | revision      : $Revision: 1.1 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/fr_FR/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/fr_FR/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/fr_FR/plugin.lang.php	(revision 17483)
@@ -1,72 +1,55 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Contact Form';
-$lang['contact_form_debug'] = 'Affichage des informations de debug';
+$lang['A comment on the site'] = 'Un commentaire sur le site';
+$lang['Contact'] = 'Contact';
+$lang['Your name'] = 'Votre nom';
+$lang['Your e-mail'] = 'Votre e-mail';
+$lang['Subject'] = 'Sujet';
+$lang['Message'] = 'Message';
+$lang['General configuration'] = 'Configuration générale';
+$lang['Add link in menu'] = 'Ajouter le lien dans le menu';
+$lang['Allow guests to see the form'] = 'Autoriser les invités à avoir le formulaire';
+$lang['E-mail address is mandatory'] = 'Présence de l\'e-mail obligatoire';
+$lang['Name is mandatory'] = 'Présence du nom obligatoire';
+$lang['E-mail configuration'] = 'E-mail configuration';
+$lang['E-mail format :'] = 'Format des e-mails :';
+$lang['Plain text'] = 'Texte brut';
+$lang['Default e-mail subject'] = 'Sujet par défaut';
+$lang['Prefix of the sent e-mail subject (you can use "%gallery_title%")'] = 'Préfixe du sujet de l\'e-mail envoyé (vous pouvez utiliser "%gallery_title%")';
+$lang['Text before the contact form'] = 'Texte au-dessus du formulaire de contact';
+$lang['Text after the contact form'] = 'Texte au-dessous du formulaire de contact';
+$lang['E-mails'] = 'E-mails';
+$lang['Active'] = 'Actif';
+$lang['+ Add an email'] = '+ Ajouter un email';
+$lang['No active email address'] = 'Aucune adresse email active';
+$lang['E-mail sent successfully'] = 'E-mail envoyé avec succès';
+$lang['Please enter a name'] = 'Veuillez entrer un nom';
+$lang['Please enter an e-mail'] = 'Veuillez entrer un e-mail';
+$lang['Please enter a subject'] = 'Veuillez entrer un sujet';
+$lang['Please enter a message'] = 'Veuillez entrer un message';
+$lang['%s must not be less than %d characters long'] = '%s ne doit pas faire moins de %d caractères';
+$lang['%s must not be more than %d characters long'] = '%s ne doit pas faire plus de %d caractères';
+$lang['Error while sending e-mail'] = 'Erreur lors de l\'envoi de l\'e-mail';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Formulaire de contact';
-$lang['contact_form'] = 'Formulaire de contact';
-$lang['contact_form_link'] = 'Contacter le webmestre';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Statut de l\'envoi du message';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Votre nom';
-$lang['cf_from_mail'] = 'Votre e-mail';
-$lang['cf_subject'] = 'Sujet';
-$lang['cf_message'] = 'Message';
-$lang['cf_submit'] = 'Envoyer';
-$lang['title_send_mail'] = 'Un commentaire sur le site';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Veuillez entrer un nom';
-$lang['cf_mail_format_error'] = 'l\'adresse e-mail doit être de la forme xxx@yyy.eee (exemple : jack@altern.org)';
-$lang['cf_subject_error'] = 'Veuillez entrer un sujet';
-$lang['cf_message_error'] = 'Veuillez entrer un message';
-$lang['cf_error_sending_mail'] = 'Erreur lors de l\'envoi de l\'e-mail';
-$lang['cf_sending_mail_successful'] = 'E-mail envoyé avec succès';
-$lang['cf_form_error'] = 'Données incorrectes';
-$lang['cf_no_unlink'] = 'La fonction \'unlink\' n\'est pas disponible';
-$lang['cf_unlink_errors'] = 'Des erreurs ont eu lieu lors de la suppression de fichiers';
-$lang['cf_config_saved'] = 'Configuration sauvée avec succès';
-$lang['cf_config_saved_with_errors'] = 'Configuration sauvée mais avec des erreurs';
-$lang['cf_length_not_integer'] = 'La taille doit être un entier';
-$lang['cf_delay_not_integer'] = 'Le délai doit être un entier';
-$lang['cf_link_error'] = 'La variable ne peut pas contenir d\'espaces';
-$lang['cf_hide'] = 'Masquer';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Valider';
-// Configuration tab
-$lang['cf_tab_config'] = 'Configuration';
-$lang['cf_config'] = 'Configuration';
-$lang['cf_config_desc'] = 'Configuration principale du plugin';
-$lang['cf_label_config'] = 'Configuration générale';
-$lang['cf_label_mail'] = 'Configuration de l\'e-mail';
-$lang['cf_menu_link'] = 'Ajouter le lien dans le menu';
-$lang['cf_guest_allowed'] = 'Autoriser les invités à avoir le formulaire';
-$lang['cf_mail_prefix'] = 'Préfixe du sujet de l\'e-mail envoyé';
-$lang['cf_separator'] = 'Caractère(s) utilisé(s) pour définir une barre de séparation dans l\'e-mail au format texte';
-$lang['cf_separator_length'] = 'Taille de la barre de séparation';
-$lang['cf_mandatory_name'] = 'Présence du nom obligatoire';
-$lang['cf_mandatory_mail'] = 'Présence de l\'e-mail obligatoire';
-$lang['cf_redirect_delay'] = 'Délai de pause de la redirection';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-mails';
-$lang['cf_emails'] = 'E-mails';
-$lang['cf_emails_desc'] = 'Gestion des e-mails de destination';
-$lang['cf_active'] = 'E-mail actif';
-$lang['cf_no_mail'] = 'Aucune adresse e-mail disponible';
-$lang['cf_refresh'] = 'Regénérer la liste des adresses';
-// persoformtab
-$lang['cf_tab_persoform'] = 'Ajouter du texte personnel';
-$lang['Text before the contact form'] = 'Texte au-dessus du formulaire de contact';
-$lang['Text after the contact form'] = 'Texte en-dessous du formulaire de contact';
 ?>
Index: /extensions/ContactForm/language/hu_HU/index.php
===================================================================
--- /extensions/ContactForm/language/hu_HU/index.php	(revision 17482)
+++ /extensions/ContactForm/language/hu_HU/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php,v 1.1 2009/08/13 12:39:52 Criss Exp $
-// | last update   : $Date: 2009/08/13 12:39:52 $
-// | last modifier : $Author: Criss $
-// | revision      : $Revision: 1.1 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/hu_HU/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/hu_HU/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/hu_HU/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Kapcsolati űrlap';
-$lang['contact_form_debug'] = 'Hibakeresési adatok megjelenítése';
+$lang['A comment on the site'] = 'Egyéni szöveg hozzáadása';
+$lang['Contact'] = 'Kapcsolat';
+$lang['Your name'] = 'Neve';
+$lang['Your e-mail'] = 'E-mail címe';
+$lang['Subject'] = 'Tárgy';
+$lang['Message'] = 'Üzenete';
+$lang['General configuration'] = 'Általános beállítások';
+$lang['Add link in menu'] = 'Kapcsolat elem hozzáadása a menühöz';
+$lang['Allow guests to see the form'] = 'Vendégek is használhatják az űrlapot';
+$lang['E-mail address is mandatory'] = 'E-mail cím kötelező';
+$lang['Name is mandatory'] = 'Név kötelező';
+$lang['E-mail configuration'] = 'E-mail beállítások';
+$lang['Text before the contact form'] = 'Szöveg a kapcsolati űrlap előtt';
+$lang['Text after the contact form'] = 'Szöveg a kapcsolati űrlap után';
+$lang['E-mail sent successfully'] = 'A levelet sikeresen elküldtük';
+$lang['Please enter a name'] = 'Írjon be egy nevet';
+$lang['Please enter a subject'] = 'Írja be a levél tárgyát';
+$lang['Please enter a message'] = 'Írja be az üzenetét';
+$lang['Error while sending e-mail'] = 'Hiba történt a levél küldése közben';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Kapcsolati űrlap';
-$lang['contact_form'] = 'Kapcsolat';
-$lang['contact_form_link'] = 'Webmester kapcsolat';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Üzenet küldés állapot';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Neve';
-$lang['cf_from_mail'] = 'E-mail címe';
-$lang['cf_subject'] = 'Tárgy';
-$lang['cf_message'] = 'Üzenete';
-$lang['cf_submit'] = 'Küldés';
-$lang['title_send_mail'] = 'Üzenet az oldalról';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Írjon be egy nevet';
-$lang['cf_mail_format_error'] = 'Az e-mail cím formátuma hibás';
-$lang['cf_message_error'] = 'Írja be az üzenetét';
-$lang['cf_error_sending_mail'] = 'Hiba történt a levél küldése közben';
-$lang['cf_sending_mail_successful'] = 'A levelet sikeresen elküldtük';
-$lang['cf_form_error'] = 'Érvénytelen adat';
-$lang['cf_no_unlink'] = 'Csatolás megszüntetése \'unlink\' lehetőség nem elérhető...';
-$lang['cf_unlink_errors'] = 'Hiba történt a fájl törlésekor';
-$lang['cf_config_saved'] = 'A beállítások mentése sikeres';
-$lang['cf_config_saved_with_errors'] = 'Hiba történt a beállítások mentésekor';
-$lang['cf_length_not_integer'] = 'A méretnek egész számnak kell lennie';
-$lang['cf_delay_not_integer'] = 'Az időnek egész számnak kell lennie';
-$lang['cf_link_error'] = 'A változó nem tartalmazhat szóközt';
-$lang['cf_hide'] = 'Vissza';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Küldés';
-// Configuration tab
-$lang['cf_tab_config'] = 'Beállítások';
-$lang['cf_config'] = 'Beállítások';
-$lang['cf_config_desc'] = 'Bővítmény alap konfigurációja';
-$lang['cf_label_config'] = 'Általános beállítások';
-$lang['cf_label_mail'] = 'E-mail beállítások';
-$lang['cf_menu_link'] = 'Kapcsolat elem hozzáadása a menühöz';
-$lang['cf_guest_allowed'] = 'Vendégek is használhatják az űrlapot ';
-$lang['cf_mail_prefix'] = 'A levél tárgyának előtagja';
-$lang['cf_separator'] = 'Szöveg formátumú e-mail esetén az elválasztó sávhoz használt karakter';
-$lang['cf_separator_length'] = 'Elválasztó sáv hossza';
-$lang['cf_mandatory_name'] = 'Név kötelező';
-$lang['cf_mandatory_mail'] = 'E-mail cím kötelező';
-$lang['cf_redirect_delay'] = 'Átirányítás késleltetésének ideje';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-mail címek';
-$lang['cf_emails'] = 'E-mail címek';
-$lang['cf_emails_desc'] = 'Cél e-mail címek kezelése';
-$lang['cf_active'] = 'Aktív e-mail';
-$lang['cf_no_mail'] = 'Nincs e-mail cím';
-$lang['cf_refresh'] = 'E-mail címlista frissítése';
-$lang['cf_subject_error'] = 'Írja be a levél tárgyát';
-$lang['Text after the contact form'] = 'Szöveg a kapcsolati űrlap után';
-$lang['Text before the contact form'] = 'Szöveg a kapcsolati űrlap előtt';
-$lang['cf_tab_persoform'] = 'Egyéni szöveg hozzáadása';
 ?>
Index: /extensions/ContactForm/language/index.php
===================================================================
--- /extensions/ContactForm/language/index.php	(revision 17482)
+++ /extensions/ContactForm/language/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php,v 1.1 2009/08/13 12:39:52 Criss Exp $
-// | last update   : $Date: 2009/08/13 12:39:52 $
-// | last modifier : $Author: Criss $
-// | revision      : $Revision: 1.1 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/it_IT/index.php
===================================================================
--- /extensions/ContactForm/language/it_IT/index.php	(revision 17482)
+++ /extensions/ContactForm/language/it_IT/index.php	(revision 17483)
@@ -3,5 +3,5 @@
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
Index: /extensions/ContactForm/language/it_IT/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/it_IT/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/it_IT/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Contact Form';
-$lang['contact_form_debug'] = 'Visualizzare le informazioni di debug';
+$lang['A comment on the site'] = 'Un commento sul sito';
+$lang['Contact'] = 'Contattare';
+$lang['Your name'] = 'Il vostro nome';
+$lang['Your e-mail'] = 'La vostra E-mail';
+$lang['Subject'] = 'Soggetto';
+$lang['Message'] = 'Messaggio';
+$lang['General configuration'] = 'Configurazione generale';
+$lang['Add link in menu'] = 'Aggiungere un link nel menu';
+$lang['Allow guests to see the form'] = 'Autorizzare gli ospiti ad accedere al formulario';
+$lang['E-mail address is mandatory'] = 'E-mail obbligatoria';
+$lang['Name is mandatory'] = 'Nome obbligatorio';
+$lang['E-mail configuration'] = 'Configurazione dell\'E-mail';
+$lang['Text before the contact form'] = 'Testo prima del modulo di contatto';
+$lang['Text after the contact form'] = 'Testo dopo il modulo di contatto';
+$lang['E-mail sent successfully'] = 'Invio dell\'E-mail riuscito';
+$lang['Please enter a name'] = 'Entrare un nome';
+$lang['Please enter a subject'] = 'Entrare un soggetto';
+$lang['Please enter a message'] = 'Entrare un messaggio';
+$lang['Error while sending e-mail'] = 'Errore durante l\'invio dell\'E-mail'
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Formulario di contatto';
-$lang['contact_form'] = 'Contattare';
-$lang['contact_form_link'] = 'Contattare il webmaster';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Stato d\'invio messaggio';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Il vostro nome';
-$lang['cf_from_mail'] = 'La vostra E-mail';
-$lang['cf_subject'] = 'Soggetto';
-$lang['cf_message'] = 'Messaggio';
-$lang['cf_submit'] = 'Inviare';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Entrare un nome';
-$lang['cf_mail_format_error'] = 'l\'indirizzo email deve essere del tipo xxx@yyy.eee (ad esempio: cippalippa@libero.rio)';
-$lang['cf_subject_error'] = 'Entrare un soggetto';
-$lang['cf_message_error'] = 'Entrare un messaggio';
-$lang['cf_error_sending_mail'] = 'Errore durante l\'invio dell\'E-mail'; 
-$lang['cf_sending_mail_successful'] = 'Invio dell\'E-mail riuscito';
-$lang['cf_form_error'] = 'Dati errati'; 
-$lang['cf_no_unlink'] = 'La funzione \'unlink\' non è disponibile';
-$lang['cf_unlink_errors'] = 'Errori durante la sopressione dei file';
-$lang['cf_config_saved'] = 'Configurazione salvata con successo';
-$lang['cf_config_saved_with_errors'] = 'Configurazione salvata con errori';
-$lang['cf_length_not_integer'] = 'Le dimensioni devono essere un numero intero';
-$lang['cf_delay_not_integer'] = 'Il limite deve essere un numero intero';
-$lang['cf_link_error'] = 'La variabile non può contenere degli spazi';
-$lang['cf_hide'] = 'Nascondere';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Confermare';
-// Configuration tab
-$lang['cf_tab_config'] = 'Configurazione';
-$lang['cf_config'] = 'Configurazione';
-$lang['cf_config_desc'] = 'Configurazione principale del plugin';
-$lang['cf_label_config'] = 'Configurazione generale';
-$lang['cf_label_mail'] = 'Configurazione dell\'E-mail';
-$lang['cf_menu_link'] = 'Aggiungere un link nel menu';
-$lang['cf_guest_allowed'] = 'Autorizzare gli ospiti ad accedere al formulario';
-$lang['cf_mail_prefix'] = 'Prefisso dell\'E-mail inviata';
-$lang['cf_separator'] = 'Carattere(i) usato(i) per definire una barra di separazione nella E-mail al formato testo';
-$lang['cf_separator_length'] = 'Dimenzioni della barra di separazione';
-$lang['cf_mandatory_name'] = 'Nome obbligatorio';
-$lang['cf_mandatory_mail'] = 'E-mail obbligatoria';
-$lang['cf_redirect_delay'] = 'Limite d\'attesa ';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-mails';
-$lang['cf_emails'] = 'E-mails';
-$lang['cf_emails_desc'] = 'Gestione delle e-mail di destinazione';
-$lang['cf_active'] = 'E-mail attiva';
-$lang['cf_no_mail'] = 'Nessun\'indirizzo e-mail disponibile';
-$lang['cf_refresh'] = 'Rigenerare la lista degli indirizzi';
-$lang['Text after the contact form'] = 'Testo dopo il modulo di contatto';
-$lang['Text before the contact form'] = 'Testo prima del modulo di contatto';
-$lang['cf_tab_persoform'] = 'Aggiungi testo personalizzato';
-$lang['title_send_mail'] = 'Un commento sul sito';
 ?>
Index: /extensions/ContactForm/language/lv_LV/index.php
===================================================================
--- /extensions/ContactForm/language/lv_LV/index.php	(revision 17482)
+++ /extensions/ContactForm/language/lv_LV/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/lv_LV/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/lv_LV/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/lv_LV/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Kontaktforma';
-$lang['contact_form_debug'] = 'Atkļūdošanas informācijas attējojumsn';
+$lang['A comment on the site'] = 'Pievienot savu tekstu';
+$lang['Contact'] = 'Kontaktēt';
+$lang['Your name'] = 'Jūsu vārds';
+$lang['Your e-mail'] = 'Jūsu e-pasts';
+$lang['Subject'] = 'Temats';
+$lang['Message'] = 'Ziņojums';
+$lang['General configuration'] = 'Vispārējā konfigurācija';
+$lang['Add link in menu'] = 'Pievienot saiti izvēlnē';
+$lang['Allow guests to see the form'] = 'Atļaut viesiem redzēt formu';
+$lang['E-mail address is mandatory'] = 'E-pasta adrese ir obligāta';
+$lang['Name is mandatory'] = 'Vārds ir obligāts';
+$lang['E-mail configuration'] = 'E-pasta konfigurācija';
+$lang['Text before the contact form'] = 'Text before the contact form';
+$lang['Text after the contact form'] = 'Text after the contact form';
+$lang['E-mail sent successfully'] = 'E-pasts nosūtīts veiksmīgi';
+$lang['Please enter a name'] = 'Lūdzu ievadiet vārdu';
+$lang['Please enter a subject'] = 'Lūdzu ievadiet tematu';
+$lang['Please enter a message'] = 'Lūdzu ievadiet ziņojumu';
+$lang['Error while sending e-mail'] = 'Kļūda sūtot e-pastu';
 
-// ==================================================================
-// Vērtības pēc noklusējuma, ja nav veiktas izmaiņas
-$lang['contact_form_title'] = 'Kontaktforma';
-$lang['contact_form'] = 'Kontaktēt';
-$lang['contact_form_link'] = 'Kontaktēt ar webmāsteru';
-
-// ==================================================================
-// Pāradresē lapu
-$lang['contact_redirect_title'] = 'Sūta pziņojuma statusu';
-
-// ==================================================================
-// Izvēlnes bloks
-$lang['cf_from_name'] = 'Jūsu vārds';
-$lang['cf_from_mail'] = 'Jūsu e-pasts';
-$lang['cf_subject'] = 'Temats';
-$lang['cf_message'] = 'Ziņojums';
-$lang['cf_submit'] = 'Sūtīt';
-$lang['title_send_mail'] = 'Komentārs web lapā';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Lūdzu ievadiet vārdu';
-$lang['cf_mail_format_error'] = 'e-pasta adresei jāizskatās xxx@yyy.eee (piemēram : jack@altern.org)';
-$lang['cf_subject_error'] = 'Lūdzu ievadiet tematu';
-$lang['cf_message_error'] = 'Lūdzu ievadiet ziņojumu';
-$lang['cf_error_sending_mail'] = 'Kļūda sūtot e-pastu';
-$lang['cf_sending_mail_successful'] = 'E-pasts nosūtīts veiksmīgi';
-$lang['cf_form_error'] = 'Kļūdaini dati';
-$lang['cf_no_unlink'] = 'Funkcija \'unlink\' nav pieejama...';
-$lang['cf_unlink_errors'] = 'Kļūda dzēšot failu';
-$lang['cf_config_saved'] = 'Konfigurācija veiksmīgi saglabāta';
-$lang['cf_config_saved_with_errors'] = 'Konfigurācija saglabāta ar kļūdām';
-$lang['cf_length_not_integer'] = 'Izmēram jābūt veselam skaitlim (integer)';
-$lang['cf_delay_not_integer'] = 'Kavējuma laikam jābūt veselam skaitlim';
-$lang['cf_link_error'] = 'Mainīgais nedrīkst saturēt tukšumus (spaces)';
-$lang['cf_hide'] = 'Paslēpt';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Apstiprināt';
-// Konfigurācijas iezīme (tab)
-$lang['cf_tab_config'] = 'Konfigurācija';
-$lang['cf_config'] = 'Konfigurācija';
-$lang['cf_config_desc'] = 'Spraudņa (plugin) galvenā konfigurācija';
-$lang['cf_label_config'] = 'Vispārējā konfigurācija';
-$lang['cf_label_mail'] = 'E-pasta konfigurācija';
-$lang['cf_menu_link'] = 'Pievienot saiti izvēlnē';
-$lang['cf_guest_allowed'] = 'Atļaut viesiem redzēt formu';
-$lang['cf_mail_prefix'] = 'Aizsūtītā e-pasta tēmas prefikss';
-$lang['cf_separator'] = 'Simbols(i), kas lietoti, lai definētu  atdalītājjoslu e-pastā teksta formā';
-$lang['cf_separator_length'] = 'Joslas izmērs';
-$lang['cf_mandatory_name'] = 'Vārds ir obligāts';
-$lang['cf_mandatory_mail'] = 'E-pasta adrese ir obligāta';
-$lang['cf_redirect_delay'] = 'Pāradresācijas kavējuma laiks';
-// Epasta iezīme (tab)
-$lang['cf_tab_emails'] = 'E-pasti';
-$lang['cf_emails'] = 'E-pasti';
-$lang['cf_emails_desc'] = 'e-pastu galamērķu pārvaldība';
-$lang['cf_active'] = 'Aktīvs e-pasts';
-$lang['cf_no_mail'] = 'Nav pieejama e-pasta adrese';
-$lang['cf_refresh'] = 'Atjaunot e-pasta saraksta adresi';
-$lang['Text after the contact form'] = 'Teksts pēc kontaktformas';
-$lang['Text before the contact form'] = 'Teksts pirms kontaktformas';
-$lang['cf_tab_persoform'] = 'Pievienot savu tekstu';
 ?>
Index: /extensions/ContactForm/language/nb_NO/index.php
===================================================================
--- /extensions/ContactForm/language/nb_NO/index.php	(revision 17482)
+++ /extensions/ContactForm/language/nb_NO/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php,v 1.1 2009/08/13 12:39:52 Criss Exp $
-// | last update   : $Date: 2009/08/13 12:39:52 $
-// | last modifier : $Author: Criss $
-// | revision      : $Revision: 1.1 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/nb_NO/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/nb_NO/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/nb_NO/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Kontakt Skjema';
-$lang['contact_form_debug'] = 'Vis testkjørings informasjon';
+$lang['A comment on the site'] = 'Legg til valgfri tekst';
+$lang['Contact'] = 'Kontakt';
+$lang['Your name'] = 'Ditt navn';
+$lang['Your e-mail'] = 'Din e-mail';
+$lang['Subject'] = 'Emne';
+$lang['Message'] = 'Beskjed';
+$lang['General configuration'] = 'Generell konfigurasjon';
+$lang['Add link in menu'] = 'Legg til link i menyen';
+$lang['Allow guests to see the form'] = 'La gjester se dette skjemaet';
+$lang['E-mail address is mandatory'] = 'E-mail addresse er påkrevd';
+$lang['Name is mandatory'] = 'Navn er påkrevd';
+$lang['E-mail configuration'] = 'E-mail konfigurasjon';
+$lang['Text before the contact form'] = 'Tekst før kontaktskjema';
+$lang['Text after the contact form'] = 'Tekst etter kontaktskjema';
+$lang['E-mail sent successfully'] = 'E-mail ble sendt';
+$lang['Please enter a name'] = 'Vennligst fyll inn navn';
+$lang['Please enter a subject'] = 'Vennligst fyll inn emne';
+$lang['Please enter a message'] = 'Vennligst fyll inn en beskjed';
+$lang['Error while sending e-mail'] = 'Feil ved sending av e-mail';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Kontakt skjema';
-$lang['contact_form'] = 'Kontakt';
-$lang['contact_form_link'] = 'Kontakt webmaster';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Send beskjed status';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Ditt navn';
-$lang['cf_from_mail'] = 'Din e-mail';
-$lang['cf_subject'] = 'Emne';
-$lang['cf_message'] = 'Beskjed';
-$lang['cf_submit'] = 'Send';
-$lang['title_send_mail'] = 'En kommentar til siden';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Vennligst fyll inn navn';
-$lang['cf_mail_format_error'] = 'mail addresse må være tilsvarende xxx@yyy.eee (eksempel : jack@altern.org)';
-$lang['cf_subject_error'] = 'Vennligst fyll inn emne';
-$lang['cf_message_error'] = 'Vennligst fyll inn en beskjed';
-$lang['cf_error_sending_mail'] = 'Feil ved sending av e-mail';
-$lang['cf_sending_mail_successful'] = 'E-mail ble sendt';
-$lang['cf_form_error'] = 'Invalide data';
-$lang['cf_no_unlink'] = 'Funksjonen \'fjern link\' ikke tilgjengelig...';
-$lang['cf_unlink_errors'] = 'En feil oppstod ved sletting av filer';
-$lang['cf_config_saved'] = 'Konfigurasjon lagret';
-$lang['cf_config_saved_with_errors'] = 'Konfigurasjon lagret med feil';
-$lang['cf_length_not_integer'] = 'Størrelse må være en variabel';
-$lang['cf_delay_not_integer'] = 'Forsinkelse må være en variabel';
-$lang['cf_link_error'] = 'Variabler kan\kan ikke inneholde mellomrom';
-$lang['cf_hide'] = 'Hide';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Lagre';
-// Configuration tab
-$lang['cf_tab_config'] = 'Konfigurasjon';
-$lang['cf_config'] = 'Konfigurasjon';
-$lang['cf_config_desc'] = 'Pluggin hoved konfigurasjon';
-$lang['cf_label_config'] = 'Generell konfigurasjon';
-$lang['cf_label_mail'] = 'E-mail konfigurasjon';
-$lang['cf_menu_link'] = 'Legg til link i menyen';
-$lang['cf_guest_allowed'] = 'La gjester se dette skjemaet';
-$lang['cf_mail_prefix'] = 'Prefikset til den sendte e-mail´ens emne';
-$lang['cf_separator'] = 'Karakterer brukt til å definere en mellomroms linje i e-mailen i tekst format';
-$lang['cf_separator_length'] = 'Størrelse på mellomrommet';
-$lang['cf_mandatory_name'] = 'Navn er påkrevd';
-$lang['cf_mandatory_mail'] = 'E-mail addresse er påkrevd';
-$lang['cf_redirect_delay'] = 'Sett forsinkelsen ved videresending på pause';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-mailer';
-$lang['cf_emails'] = 'E-mail';
-$lang['cf_emails_desc'] = 'mål for e-mail behandling';
-$lang['cf_active'] = 'Aktive e-mail';
-$lang['cf_no_mail'] = 'INgen e-mail addresse tilgjengelig';
-$lang['cf_refresh'] = 'Oppdater e-mail adresse liste';
-$lang['Text after the contact form'] = 'Tekst etter kontaktskjema';
-$lang['Text before the contact form'] = 'Tekst før kontaktskjema';
-$lang['cf_tab_persoform'] = 'Legg til valgfri tekst';
 ?>
Index: /extensions/ContactForm/language/nl_NL/index.php
===================================================================
--- /extensions/ContactForm/language/nl_NL/index.php	(revision 17482)
+++ /extensions/ContactForm/language/nl_NL/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/nl_NL/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/nl_NL/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/nl_NL/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Contact Formulier';
-$lang['contact_form_debug'] = 'Toon debug informatie';
+$lang['A comment on the site'] = 'Voeg eigen tekst toe';
+$lang['Contact'] = 'Contact';
+$lang['Your name'] = 'Je naam';
+$lang['Your e-mail'] = 'Je e-mail';
+$lang['Subject'] = 'Onderwerp';
+$lang['Message'] = 'Bericht';
+$lang['General configuration'] = 'Algemene configuratie';
+$lang['Add link in menu'] = 'Voeg link aan menu toe';
+$lang['Allow guests to see the form'] = 'Sta gasten toe om het formulier te zien';
+$lang['E-mail address is mandatory'] = 'E-mail adres is verplicht';
+$lang['Name is mandatory'] = 'Naam is verplicht';
+$lang['E-mail configuration'] = 'E-mail configuratie';
+$lang['Text before the contact form'] = 'Tekst vóór het contactformulier';
+$lang['Text after the contact form'] = 'Tekst na het contactformulier';
+$lang['E-mail sent successfully'] = 'E-mail succesvol verzonden';
+$lang['Please enter a name'] = 'Vul een naam in';
+$lang['Please enter a subject'] = 'Vul een onderwerp in';
+$lang['Please enter a message'] = 'Vul een berichttekst in';
+$lang['Error while sending e-mail'] = 'Fout tijdens versturen van e-mail';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Contact formulier';
-$lang['contact_form'] = 'Contact';
-$lang['contact_form_link'] = 'Contact webmaster';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Verzonden bericht status';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Je naam';
-$lang['cf_from_mail'] = 'Je e-mail';
-$lang['cf_subject'] = 'Onderwerp';
-$lang['cf_message'] = 'Bericht';
-$lang['cf_submit'] = 'Verstuur';
-$lang['title_send_mail'] = 'Een commentaar op de site';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Vul een naam in';
-$lang['cf_mail_format_error'] = 'email-adres moet zijn xxx@yyy.eee (bijvoorbeeld : jack@altern.org)';
-$lang['cf_subject_error'] = 'Vul een onderwerp in';
-$lang['cf_message_error'] = 'Vul een berichttekst in ';
-$lang['cf_error_sending_mail'] = 'Fout tijdens versturen van e-mail';
-$lang['cf_sending_mail_successful'] = 'E-mail succesvol verzonden';
-$lang['cf_form_error'] = 'Onjuiste gegevens';
-$lang['cf_no_unlink'] = 'Functie \'unlink\' nie beschikbaar...';
-$lang['cf_unlink_errors'] = 'Fout opgetreden tijdens verwijderen van bestand';
-$lang['cf_config_saved'] = 'Configuratie successvol opgeslagen';
-$lang['cf_config_saved_with_errors'] = 'Configuratie opgeslagen met fouten';
-$lang['cf_length_not_integer'] = 'grootte moet een geheel getal zijn';
-$lang['cf_delay_not_integer'] = 'Vertraging moet een geheel getal zijn';
-$lang['cf_link_error'] = 'Variabele kan geen spaties bevatten';
-$lang['cf_hide'] = 'Verberg';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Verzenden';
-// Configuration tab
-$lang['cf_tab_config'] = 'Configuratie';
-$lang['cf_config'] = 'Configuratie';
-$lang['cf_config_desc'] = 'Plugin hoofd configuratie';
-$lang['cf_label_config'] = 'Algemene configuratie';
-$lang['cf_label_mail'] = 'E-mail configuratie';
-$lang['cf_menu_link'] = 'Voeg link aan menu toe';
-$lang['cf_guest_allowed'] = 'Sta gasten toe om het formulier te zien';
-$lang['cf_mail_prefix'] = 'Voorvoegsel van het email onderwerp';
-$lang['cf_separator'] = 'Teken(s) gebruikt voor de scheidingsbalk in de e-mail, in tekst formaat';
-$lang['cf_separator_length'] = 'Grote van de balk';
-$lang['cf_mandatory_name'] = 'Naam is verplicht';
-$lang['cf_mandatory_mail'] = 'E-mail adres is verplicht';
-$lang['cf_redirect_delay'] = 'wachttijd voor opnieuw versturen';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-mails';
-$lang['cf_emails'] = 'E-mails';
-$lang['cf_emails_desc'] = 'Bestemming van e-mail beheer';
-$lang['cf_active'] = 'Actieve e-mail';
-$lang['cf_no_mail'] = 'Geen e-mail adres beschikbaar';
-$lang['cf_refresh'] = 'Regenereer e-mail lijst adres';
-$lang['Text after the contact form'] = 'Tekst na het contactformulier';
-$lang['Text before the contact form'] = 'Tekst vóór het contactformulier';
-$lang['cf_tab_persoform'] = 'Voeg eigen tekst toe';
 ?>
Index: /extensions/ContactForm/language/pl_PL/index.php
===================================================================
--- /extensions/ContactForm/language/pl_PL/index.php	(revision 17482)
+++ /extensions/ContactForm/language/pl_PL/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 3864 2009-09-17 22:55:20Z ddtddt $
-// | last update   : $Date: 2009-09-18 00:55:20 +0200 (Fri, 18 Sep 2009) $
-// | last modifier : $Author: ddtddt $
-// | revision      : $Revision: 3864 $
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/pl_PL/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/pl_PL/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/pl_PL/plugin.lang.php	(revision 17483)
@@ -1,72 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Formularz kontaktu';
-$lang['contact_form_debug'] = 'Wyświetl informacje śledzące proces';
+$lang['A comment on the site'] = 'Dodaj własny tekst';
+$lang['Contact'] = 'Kontakt';
+$lang['Your name'] = 'Twoje nazwisko';
+$lang['Your e-mail'] = 'Twój e-mail';
+$lang['Subject'] = 'Temat';
+$lang['Message'] = 'Wiadomość';
+$lang['General configuration'] = 'Konfiguracja ogólna';
+$lang['Add link in menu'] = 'Dodaj link do menu';
+$lang['Allow guests to see the form'] = 'Zezwalaj gościom na wysyłanie formularza';
+$lang['E-mail address is mandatory'] = 'Adres e-mail jest wymagany';
+$lang['Name is mandatory'] = 'Nazwisko jest wymagane';
+$lang['E-mail configuration'] = 'Konfiguracja e-mail';
+$lang['Text before the contact form'] = 'Tekst przed formularzem';
+$lang['Text after the contact form'] = 'Tekst pod formularzem';
+$lang['E-mail sent successfully'] = 'Wiadomość wysłana poprawnie';
+$lang['Please enter a name'] = 'Proszę podać nazwisko';
+$lang['Please enter a subject'] = 'Proszę podać temat';
+$lang['Please enter a message'] = 'Proszę wpisać wiadomość';
+$lang['Error while sending e-mail'] = 'Błąd podczas wysyłania wiadomości';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Formularz kontaktu';
-$lang['contact_form'] = 'Kontakt';
-$lang['contact_form_link'] = 'Kontakt do webmastera';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Wyślij status wiadomości';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Twoje nazwisko';
-$lang['cf_from_mail'] = 'Twój e-mail';
-$lang['cf_subject'] = 'Temat';
-$lang['cf_message'] = 'Wiadomość';
-$lang['cf_submit'] = 'Wyślij';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Proszę podać nazwisko';
-$lang['cf_mail_format_error'] = 'mail musi być w postaci xxx@yyy.eee (przykład : jack@altern.org)';
-$lang['cf_subject_error'] = 'Proszę podać temat';
-$lang['cf_message_error'] = 'Proszę wpisać wiadomość';
-$lang['cf_error_sending_mail'] = 'Błąd podczas wysyłania wiadomości';
-$lang['cf_sending_mail_successful'] = 'Wiadomość wysłana poprawnie';
-$lang['cf_form_error'] = 'Nieprawidłowe dane';
-$lang['cf_no_unlink'] = 'Funkcja \'unlink\' niedostępna...';
-$lang['cf_unlink_errors'] = 'Wystąpił błąd podczas kasowania pliku';
-$lang['cf_config_saved'] = 'Konfiguracja zapisana poprawnie';
-$lang['cf_config_saved_with_errors'] = 'Konfiguracja zapisana z błędami';
-$lang['cf_length_not_integer'] = 'Rozmiar musi być liczbą';
-$lang['cf_delay_not_integer'] = 'Opóźnienie musi być liczbą';
-$lang['cf_link_error'] = 'Zmienna nie może zawierać spacji';
-$lang['cf_hide'] = 'Ukryj';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Potwierdź';
-// Configuration tab
-$lang['cf_tab_config'] = 'Konfiguracja';
-$lang['cf_config'] = 'Konfiguracja';
-$lang['cf_config_desc'] = 'Konfiguracja podstawowa wtyczki';
-$lang['cf_label_config'] = 'Konfiguracja ogólna';
-$lang['cf_label_mail'] = 'Konfiguracja e-mail';
-$lang['cf_menu_link'] = 'Dodaj link do menu';
-$lang['cf_guest_allowed'] = 'Zezwalaj gościom na wysyłanie formularza';
-$lang['cf_mail_prefix'] = 'Przedrostek tematu wysłanej wiadomości e-mail';
-$lang['cf_separator'] = 'Znak separatora w formacie tekstowym wiadomości e-mail';
-$lang['cf_separator_length'] = 'Wielkość paska menu';
-$lang['cf_mandatory_name'] = 'Nazwisko jest wymagane';
-$lang['cf_mandatory_mail'] = 'Adres e-mail jest wymagany';
-$lang['cf_redirect_delay'] = 'Wstrzymaj opóźnienie przekierowania';
-// Emails tab
-$lang['cf_tab_emails'] = 'Adresy';
-$lang['cf_emails'] = 'Adresy';
-$lang['cf_emails_desc'] = 'Zarządzanie adresami e-mail do kontaktu';
-$lang['cf_active'] = 'Aktywny e-mail';
-$lang['cf_no_mail'] = 'Brak dostępnych adresów e-mail';
-$lang['cf_refresh'] = 'Ponowne tworzenie listy adresów e-mail';
-// translated by emcek
-$lang['title_send_mail'] = 'Komentarz na temat strony';
-$lang['Text after the contact form'] = 'Tekst pod formularzem';
-$lang['Text before the contact form'] = 'Tekst przed formularzem';
-$lang['cf_tab_persoform'] = 'Dodaj własny tekst';
 ?>
Index: /extensions/ContactForm/language/pt_PT/index.php
===================================================================
--- /extensions/ContactForm/language/pt_PT/index.php	(revision 17483)
+++ /extensions/ContactForm/language/pt_PT/index.php	(revision 17483)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/ContactForm/language/pt_PT/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/pt_PT/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/pt_PT/plugin.lang.php	(revision 17483)
@@ -21,53 +21,24 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-$lang['cf_active'] = 'Activar email';
-$lang['cf_config'] = 'Configuração';
-$lang['cf_config_desc'] = 'Configuração principal da extensão';
-$lang['cf_config_saved'] = 'Configuração salva com sucesso';
-$lang['cf_config_saved_with_errors'] = 'Configuração salva com erros';
-$lang['cf_delay_not_integer'] = 'Atraso deve ser um valor integer';
-$lang['cf_emails'] = 'Emails';
-$lang['cf_emails_desc'] = 'Gestão de emails de destino';
-$lang['cf_error_sending_mail'] = 'Erro ao enviar email';
-$lang['cf_form_error'] = 'Dados inválidos';
-$lang['cf_from_mail'] = 'O seu email';
-$lang['cf_from_name'] = 'O seu nome';
-$lang['cf_from_name_error'] = 'Por favor escreva um nome';
-$lang['cf_guest_allowed'] = 'Permitir visualização do formulário por convidados';
-$lang['cf_hide'] = 'Ocultar';
-$lang['cf_label_config'] = 'Configuração Geral';
-$lang['cf_label_mail'] = 'Configuração de email';
-$lang['cf_length_not_integer'] = 'Tamanho deve ser um valor integer';
-$lang['cf_link_error'] = 'Variáveis não podem conter espaços';
-$lang['cf_mail_format_error'] = 'Por favor, a direcção deve ser do género xxx@yyy.eee (example : jack@altern.org)';
-$lang['cf_mail_prefix'] = 'Prefixo do assunto de emails enviados';
-$lang['cf_mandatory_mail'] = 'Endereço de email é obrigatório';
-$lang['cf_mandatory_name'] = 'Nome é obrigatório';
-$lang['cf_menu_link'] = 'Adicionar ligação no menú';
-$lang['cf_message'] = 'Mensagem';
-$lang['cf_message_error'] = 'Por favor escreva uma mensagem';
-$lang['cf_no_mail'] = 'Nenhum endereço de email disponível';
-$lang['cf_no_unlink'] = 'Função \'unlink\' não disponível';
-$lang['cf_plugin_name'] = 'Formulário de Contacto';
-$lang['cf_redirect_delay'] = 'Atraso da pausa de redireccionamento';
-$lang['cf_refresh'] = 'Regenerar lista de endereços de email';
-$lang['cf_sending_mail_successful'] = 'Email enviado com sucesso';
-$lang['cf_separator'] = 'Caractére(s) usado(s) para definir a bara de separação no email em formato de texto';
-$lang['cf_separator_length'] = 'Tamanho da barra';
-$lang['cf_subject'] = 'Assunto';
-$lang['cf_subject_error'] = 'Por favor escreva um assunto';
-$lang['cf_submit'] = 'Enviar';
-$lang['cf_tab_config'] = 'Configuração';
-$lang['cf_tab_emails'] = 'Emails';
-$lang['cf_unlink_errors'] = 'Ocorreu um erro ao apagar ficheiro';
-$lang['cf_validate'] = 'Submeter';
-$lang['contact_form'] = 'Contactar';
-$lang['contact_form_debug'] = 'Mostrar informação de depuração';
-$lang['contact_form_link'] = 'Contactar Webmaster';
-$lang['contact_form_title'] = 'Formulário de Contacto';
-$lang['contact_redirect_title'] = 'Estado de envio de mensagem';
-$lang['title_send_mail'] = 'Um comentário sobre o site';
-$lang['cf_tab_persoform'] = 'Adicionar formulário de texto';
+
+$lang['A comment on the site'] = 'Um comentário sobre o site';
+$lang['Contact'] = 'Contactar';
+$lang['Your name'] = 'O seu nome';
+$lang['Your e-mail'] = 'O seu email';
+$lang['Subject'] = 'Assunto';
+$lang['Message'] = 'Mensagem';
+$lang['General configuration'] = 'Configuração Geral';
+$lang['Add link in menu'] = 'Adicionar ligação no menú';
+$lang['Allow guests to see the form'] = 'Permitir visualização do formulário por convidados';
+$lang['E-mail address is mandatory'] = 'Endereço de email é obrigatório';
+$lang['Name is mandatory'] = 'Nome é obrigatório';
+$lang['E-mail configuration'] = 'Configuração de email';
+$lang['Text before the contact form'] = 'Texto depois do formulário de contacto';
 $lang['Text after the contact form'] = 'Texto antes do formulário de contacto';
-$lang['Text before the contact form'] = 'Texto depois do formulário de contacto';
+$lang['E-mail sent successfully'] = 'Email enviado com sucesso';
+$lang['Please enter a name'] = 'Por favor escreva um nome';
+$lang['Please enter a subject'] = 'Por favor escreva um assunto';
+$lang['Please enter a message'] = 'Por favor escreva uma mensagem';
+$lang['Error while sending e-mail'] = 'Erro ao enviar email';
+
 ?>
Index: /extensions/ContactForm/language/ru_RU/index.php
===================================================================
--- /extensions/ContactForm/language/ru_RU/index.php	(revision 17482)
+++ /extensions/ContactForm/language/ru_RU/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/ru_RU/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/ru_RU/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/ru_RU/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Контактная информация';
-$lang['contact_form_debug'] = 'Показывать отладочные сообщения';
+$lang['A comment on the site'] = 'Комментарий на странице';
+$lang['Contact'] = 'Контакты';
+$lang['Your name'] = 'Имя';
+$lang['Your e-mail'] = 'e-mail';
+$lang['Subject'] = 'Тема';
+$lang['Message'] = 'Сообщение';
+$lang['General configuration'] = 'Основные настройки';
+$lang['Add link in menu'] = 'Добавить ссылку в меню';
+$lang['Allow guests to see the form'] = 'Показывать форму гостевым пользователям';
+$lang['E-mail address is mandatory'] = 'Адрес email обязателен';
+$lang['Name is mandatory'] = 'Имя обязательно';
+$lang['E-mail configuration'] = 'Настройки e-mail';
+$lang['Text before the contact form'] = 'Текст перед формой обратной связи';
+$lang['Text after the contact form'] = 'Текст после формы обратной связи';
+$lang['E-mail sent successfully'] = 'Сообщение успешно отправлено';
+$lang['Please enter a name'] = 'Пожалуйста, введите имя';
+$lang['Please enter a subject'] = 'Пожалуйста, укажите тему сообщения';
+$lang['Please enter a message'] = 'Пожалуйста, введите сообщение';
+$lang['Error while sending e-mail'] = 'Ошибка при отправке сообщения';
 
-// ==================================================================
-// Значения по умолчанию
-$lang['contact_form_title'] = 'Контактная информация';
-$lang['contact_form'] = 'Контакты';
-$lang['contact_form_link'] = 'Contact webmaster';
-
-// ==================================================================
-// Страница переадресации
-$lang['contact_redirect_title'] = 'Отсылать статус сообщения';
-
-// ==================================================================
-// Блок меню
-$lang['cf_from_name'] = 'Имя';
-$lang['cf_from_mail'] = 'e-mail';
-$lang['cf_subject'] = 'Тема';
-$lang['cf_message'] = 'Сообщение';
-$lang['cf_submit'] = 'Отправить';
-$lang['title_send_mail'] = 'Комментарий на странице';
-
-// ==================================================================
-// Сообщения
-$lang['cf_from_name_error'] = 'Пожалуйста, введите имя';
-$lang['cf_mail_format_error'] = 'адрес электронной почты должен выглядеть как-то типа xxx@yyy.eee (например: jack@altern.org)';
-$lang['cf_subject_error'] = 'Пожалуйста, укажите тему сообщения';
-$lang['cf_message_error'] = 'Пожалуйста, введите сообщение';
-$lang['cf_error_sending_mail'] = 'Ошибка при отправке сообщения';
-$lang['cf_sending_mail_successful'] = 'Сообщение успешно отправлено';
-$lang['cf_form_error'] = 'Ошибка при подготовке сообщения к отправке';
-$lang['cf_no_unlink'] = 'Функция \'unlink\' недоступна...';
-$lang['cf_unlink_errors'] = 'Ошибка при удалении файла';
-$lang['cf_config_saved'] = 'Настройки успешно сохранены';
-$lang['cf_config_saved_with_errors'] = 'Ошибка при сохранении настроек';
-$lang['cf_length_not_integer'] = 'Размер должен быть указан как целое число';
-$lang['cf_delay_not_integer'] = 'Задержка должна быть указана как целое число';
-$lang['cf_link_error'] = 'Значение переменной не может содержать пробелов';
-$lang['cf_hide'] = 'Скрыть';
-
-// ==================================================================
-// Страница администратора
-$lang['cf_validate'] = 'Отправить';
-// Вкладка "Настройки"
-$lang['cf_tab_config'] = 'Настройки';
-$lang['cf_config'] = 'Настройки';
-$lang['cf_config_desc'] = 'Настройки модуля';
-$lang['cf_label_config'] = 'Основные настройки';
-$lang['cf_label_mail'] = 'Настройки e-mail';
-$lang['cf_menu_link'] = 'Добавить ссылку в меню';
-$lang['cf_guest_allowed'] = 'Показывать форму гостевым пользователям';
-$lang['cf_mail_prefix'] = 'Префикс темы email';
-$lang['cf_separator'] = 'Символ(ы)-разделители в письме текстового формата';
-$lang['cf_separator_length'] = 'Ширина страницы';
-$lang['cf_mandatory_name'] = 'Имя обязательно';
-$lang['cf_mandatory_mail'] = 'Адрес email обязателен';
-$lang['cf_redirect_delay'] = 'Время задержки при перенаправлении';
-// Вкладка "E-mail"
-$lang['cf_tab_emails'] = 'E-mail';
-$lang['cf_emails'] = 'E-mail';
-$lang['cf_emails_desc'] = 'Получатели e-mail';
-$lang['cf_active'] = 'Активный адрес e-mail';
-$lang['cf_no_mail'] = 'Нет доступных адресов e-mail';
-$lang['cf_refresh'] = 'Сформировать список адресов e-mail снова';
-$lang['Text after the contact form'] = 'Текст после формы обратной связи';
-$lang['Text before the contact form'] = 'Текст перед формой обратной связи';
-$lang['cf_tab_persoform'] = 'Добавить произвольный текст';
 ?>
Index: /extensions/ContactForm/language/sh_RS/index.php
===================================================================
--- /extensions/ContactForm/language/sh_RS/index.php	(revision 17483)
+++ /extensions/ContactForm/language/sh_RS/index.php	(revision 17483)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/ContactForm/language/sh_RS/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/sh_RS/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/sh_RS/plugin.lang.php	(revision 17483)
@@ -21,50 +21,22 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-$lang['cf_active'] = 'Aktivni e-mejl';
-$lang['cf_config'] = 'Podešavanje';
-$lang['cf_config_desc'] = 'Glavno podešavanje dodatka';
-$lang['cf_config_saved'] = 'Podešavanje uspešno sačuvano';
-$lang['cf_config_saved_with_errors'] = 'Podešavanje sačuvano sa greškama';
-$lang['cf_delay_not_integer'] = 'Kašnjenje mora biti ceo broj';
-$lang['cf_emails'] = 'E-mejlovi';
-$lang['cf_emails_desc'] = 'Upravljanje odredišnim e-mejlovima';
-$lang['cf_error_sending_mail'] = 'Greška prilikom slanja e-mejla';
-$lang['cf_form_error'] = 'Nepravilni podaci';
-$lang['cf_from_mail'] = 'Vaš e-mejl';
-$lang['cf_from_name'] = 'Vaše ime';
-$lang['cf_from_name_error'] = 'Molim unesite ime';
-$lang['cf_guest_allowed'] = 'Dozvoli gostima da vide formu';
-$lang['cf_hide'] = 'Sakrij';
-$lang['cf_label_config'] = 'Opšte podešavanje';
-$lang['cf_label_mail'] = 'Podešavanje e-mejla';
-$lang['cf_length_not_integer'] = 'Veličina mora biti ceo broj';
-$lang['cf_link_error'] = 'Promenljiva ne sme sadržati razmake';
-$lang['cf_mail_format_error'] = 'Pogrešan format e-mejla';
-$lang['cf_mail_prefix'] = 'Prefiks naslova poslatih e-mejlova';
-$lang['cf_mandatory_mail'] = 'E-mejl adresa je obavezna';
-$lang['cf_mandatory_name'] = 'Ime je obavezno';
-$lang['cf_menu_link'] = 'Dodaj vezu u meni';
-$lang['cf_message'] = 'Poruka';
-$lang['cf_message_error'] = 'Molim unesite poruku';
-$lang['cf_no_mail'] = 'Nema dostupnih e-mejl adresa';
-$lang['cf_no_unlink'] = 'Funkcija \'razveži\' nije dostupna';
-$lang['cf_plugin_name'] = 'Kontakt forma';
-$lang['cf_redirect_delay'] = 'Pauziraj kašnjenje preusmeravanja';
-$lang['cf_refresh'] = 'Regeneriši listu e-mejl adresa';
-$lang['cf_sending_mail_successful'] = 'E-mail uspešno poslat ';
-$lang['cf_separator'] = 'Karakter(i) korišćeni za definisanje linije odvajanja u formatu teksta e-maila';
-$lang['cf_separator_length'] = 'Veličina linije';
-$lang['cf_subject'] = 'Naslov';
-$lang['cf_subject_error'] = 'Molim unesite naslov';
-$lang['cf_submit'] = 'Pošalji';
-$lang['cf_tab_config'] = 'Podešavanje';
-$lang['cf_tab_emails'] = 'E-mejlovi';
-$lang['cf_unlink_errors'] = 'Greška prilikom brisanja fajla';
-$lang['cf_validate'] = 'Pošalji';
-$lang['contact_form'] = 'Kontakt';
-$lang['contact_form_debug'] = 'Prikaži debag informacije';
-$lang['contact_form_link'] = 'Kontakt vebmaster';
-$lang['contact_form_title'] = 'Kontakt forma';
-$lang['contact_redirect_title'] = 'Pošalji poruku statusa';
-$lang['title_send_mail'] = 'Komentar sajta';
+
+$lang['A comment on the site'] = 'Komentar sajta';
+$lang['Contact'] = 'Kontakt';
+$lang['Your name'] = 'Vaše ime';
+$lang['Your e-mail'] = 'Vaš e-mejl';
+$lang['Subject'] = 'Naslov';
+$lang['Message'] = 'Poruka';
+$lang['General configuration'] = 'Opšte podešavanje';
+$lang['Add link in menu'] = 'Dodaj vezu u meni';
+$lang['Allow guests to see the form'] = 'Dozvoli gostima da vide formu';
+$lang['E-mail address is mandatory'] = 'E-mejl adresa je obavezna';
+$lang['Name is mandatory'] = 'Ime je obavezno';
+$lang['E-mail configuration'] = 'Podešavanje e-mejla';
+$lang['E-mail sent successfully'] = 'E-mail uspešno poslat ';
+$lang['Please enter a name'] = 'Molim unesite ime';
+$lang['Please enter a subject'] = 'Molim unesite naslov';
+$lang['Please enter a message'] = 'Molim unesite poruku';
+$lang['Error while sending e-mail'] = 'Greška prilikom slanja e-mejla';
+
 ?>
Index: /extensions/ContactForm/language/sk_SK/index.php
===================================================================
--- /extensions/ContactForm/language/sk_SK/index.php	(revision 17482)
+++ /extensions/ContactForm/language/sk_SK/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/sk_SK/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/sk_SK/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/sk_SK/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Kontaktný formulár';
-$lang['contact_form_debug'] = 'Zobrazenie opravených informácií';
+$lang['A comment on the site'] = 'Komentár na stránku';
+$lang['Contact'] = 'Kontakt';
+$lang['Your name'] = 'Vaše meno';
+$lang['Your e-mail'] = 'Váš e-mail';
+$lang['Subject'] = 'Predmet';
+$lang['Message'] = 'Správa';
+$lang['General configuration'] = 'Hlavná konfigurácia';
+$lang['Add link in menu'] = 'Pridať link do menu';
+$lang['Allow guests to see the form'] = 'Povoliť hosťom vidieť formulár';
+$lang['E-mail address is mandatory'] = 'E-mailová adresa je povinná';
+$lang['Name is mandatory'] = 'Meno je povinné';
+$lang['E-mail configuration'] = 'Konfigurácia e-mailu';
+$lang['Text before the contact form'] = 'Text pred kontaktným formulárom';
+$lang['Text after the contact form'] = 'Text za kontaktným formulárom';
+$lang['E-mail sent successfully'] = 'E-mail bol úspešne odoslaný';
+$lang['Please enter a name'] = 'Prosím zadajte meno';
+$lang['Please enter a subject'] = 'Prosím zadajte predmet';
+$lang['Please enter a message'] = 'Prosím zadajte správu';
+$lang['Error while sending e-mail'] = 'Chyba počas posielania e-mailu';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Kontaktný formulár';
-$lang['contact_form'] = 'Kontakt';
-$lang['contact_form_link'] = 'Kontaktovanie webmastera';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Poslať stav správy';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Vaše meno';
-$lang['cf_from_mail'] = 'Váš e-mail';
-$lang['cf_subject'] = 'Predmet';
-$lang['cf_message'] = 'Správa';
-$lang['cf_submit'] = 'Poslať';
-$lang['title_send_mail'] = 'Komentár na stránku';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Prosím zadajte meno';
-$lang['cf_mail_format_error'] = 'E-mail musí byť vo formáte xxx@yyy.eee (napríklad: kovac@zoznam.sk)';
-$lang['cf_subject_error'] = 'Prosím zadajte predmet';
-$lang['cf_message_error'] = 'Prosím zadajte správu';
-$lang['cf_error_sending_mail'] = 'Chyba počas posielania e-mailu';
-$lang['cf_sending_mail_successful'] = 'E-mail bol úspešne odoslaný';
-$lang['cf_form_error'] = 'Neplatné údaje';
-$lang['cf_no_unlink'] = 'Funkcia \'unlink\' nie je prístupná...';
-$lang['cf_unlink_errors'] = 'Vyskytla sa chyba v priebehu mazania súboru';
-$lang['cf_config_saved'] = 'Konfigurácia bola úspešne uložená';
-$lang['cf_config_saved_with_errors'] = 'Konfigurácia uložená s chybami';
-$lang['cf_length_not_integer'] = 'Veľkosť musí byť celé číslo';
-$lang['cf_delay_not_integer'] = 'Odklad musí byť celé číslo';
-$lang['cf_link_error'] = 'Parameter nesmie obsahovať medzeru';
-$lang['cf_hide'] = 'Schovať';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Doručiť';
-// Configuration tab
-$lang['cf_tab_config'] = 'Konfigurácia';
-$lang['cf_config'] = 'Konfigurácia';
-$lang['cf_config_desc'] = 'Konfigurácia pluginu';
-$lang['cf_label_config'] = 'Hlavná konfigurácia';
-$lang['cf_label_mail'] = 'Konfigurácia e-mailu';
-$lang['cf_menu_link'] = 'Pridať link do menu';
-$lang['cf_guest_allowed'] = 'Povoliť hosťom vidieť formulár';
-$lang['cf_mail_prefix'] = 'Predpona predmetu poslaného e-mailu';
-$lang['cf_separator'] = 'Znak(y) použité na definovanie oddelenia stĺpca v maili v textovom formáte';
-$lang['cf_separator_length'] = 'Veľkosť stĺpca';
-$lang['cf_mandatory_name'] = 'Meno je povinné';
-$lang['cf_mandatory_mail'] = 'E-mailová adresa je povinná';
-$lang['cf_redirect_delay'] = 'Dĺžka pauzy pri presmerovaní';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-maily';
-$lang['cf_emails'] = 'E-maily';
-$lang['cf_emails_desc'] = 'Cieľový manažment e-mailov';
-$lang['cf_active'] = 'Actívny e-mail';
-$lang['cf_no_mail'] = 'E-mailová adresa nie je dostupná';
-$lang['cf_refresh'] = 'Obnoviť zoznam e-mailých adries';
-$lang['Text after the contact form'] = 'Text za kontaktným formulárom';
-$lang['Text before the contact form'] = 'Text pred kontaktným formulárom';
-$lang['cf_tab_persoform'] = 'Pridajte obyčajný text';
 ?>
Index: /extensions/ContactForm/language/sv_SE/index.php
===================================================================
--- /extensions/ContactForm/language/sv_SE/index.php	(revision 17482)
+++ /extensions/ContactForm/language/sv_SE/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/sv_SE/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/sv_SE/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/sv_SE/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Kontaktformulär';
-$lang['contact_form_debug'] = 'Visning av felsökningsinformation';
+$lang['A comment on the site'] = 'En kommentar till webbsidan';
+$lang['Contact'] = 'Kontakt';
+$lang['Your name'] = 'Namn';
+$lang['Your e-mail'] = 'E-post';
+$lang['Subject'] = 'Ämne';
+$lang['Message'] = 'Meddelande';
+$lang['General configuration'] = 'Allmäna inställningar';
+$lang['Add link in menu'] = 'Inkludera länk i menyn';
+$lang['Allow guests to see the form'] = 'Tillåt gäster att använda formuläret';
+$lang['E-mail address is mandatory'] = 'Obligatorisk e-postadress';
+$lang['Name is mandatory'] = 'Obligatoriskt namn';
+$lang['E-mail configuration'] = 'E-post inställningar';
+$lang['Text before the contact form'] = 'Text före kontaktformuläret';
+$lang['Text after the contact form'] = 'Text efter kontaktformuläret';
+$lang['E-mail sent successfully'] = 'E-post har skickats';
+$lang['Please enter a name'] = 'Ange ett namn';
+$lang['Please enter a subject'] = 'Ange ett ämnet';
+$lang['Please enter a message'] = 'Skriv ett meddelande';
+$lang['Error while sending e-mail'] = 'Fel vid sändning av e-post';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'Kontaktformulär';
-$lang['contact_form'] = 'Kontakt';
-$lang['contact_form_link'] = 'Kontakta webbansvarig';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Skicka meddelande status';
-
-// ==================================================================
-// Menubar block
-$lang['cf_from_name'] = 'Namn';
-$lang['cf_from_mail'] = 'E-post';
-$lang['cf_subject'] = 'Ämne';
-$lang['cf_message'] = 'Meddelande';
-$lang['cf_submit'] = 'skicka';
-$lang['title_send_mail'] = 'En kommentar till webbsidan';
-
-// ==================================================================
-// Messages
-$lang['cf_from_name_error'] = 'Ange ett namn';
-$lang['cf_mail_format_error'] = 'e-postadress måste vara av formen ”arne@anka.org';
-$lang['cf_subject_error'] = 'Ange ett ämnet';
-$lang['cf_message_error'] = 'Skriv ett meddelande';
-$lang['cf_error_sending_mail'] = 'Fel vid sändning av e-post';
-$lang['cf_sending_mail_successful'] = 'E-post har skickats';
-$lang['cf_form_error'] = 'Ogiltiga data';
-$lang['cf_no_unlink'] = 'Funktionen \'unlink\' inte tillgänglig...';
-$lang['cf_unlink_errors'] = 'Fel inträffade vid borttagning av filer';
-$lang['cf_config_saved'] = 'Inställningar har sparats';
-$lang['cf_config_saved_with_errors'] = 'Inställningar har sparats med fel!';
-$lang['cf_length_not_integer'] = 'Storleken måste vara ett heltal';
-$lang['cf_delay_not_integer'] = 'Fördröjningen måste vara ett heltal';
-$lang['cf_link_error'] = 'Variabel kan inte  innehålla mellanslag';
-$lang['cf_hide'] = 'Dölj';
-
-// ==================================================================
-// Admin page
-$lang['cf_validate'] = 'Skicka';
-// Configuration tab
-$lang['cf_tab_config'] = 'Inställningar';
-$lang['cf_config'] = 'Inställningar';
-$lang['cf_config_desc'] = 'Allmänna inställningar för plugg-in';
-$lang['cf_label_config'] = 'Allmäna inställningar';
-$lang['cf_label_mail'] = 'E-post inställningar';
-$lang['cf_menu_link'] = 'Inkludera länk i menyn';
-$lang['cf_guest_allowed'] = 'Tillåt gäster att använda formuläret';
-$lang['cf_mail_prefix'] = 'Prefix till "Ämne" i det sända e-postmeddelandet';
-$lang['cf_separator'] = 'Symbol att använda som avdelare i e-post i textformat';
-$lang['cf_separator_length'] = 'Avdelarens längd';
-$lang['cf_mandatory_name'] = 'Obligatoriskt namn';
-$lang['cf_mandatory_mail'] = 'Obligatorisk e-postadress';
-$lang['cf_redirect_delay'] = 'Fördröjning av omdirigering';
-// Emails tab
-$lang['cf_tab_emails'] = 'E-post';
-$lang['cf_emails'] = 'E-post';
-$lang['cf_emails_desc'] = 'Destinationshantering för e-post';
-$lang['cf_active'] = 'Aktiv e-post';
-$lang['cf_no_mail'] = 'Ingen e-postadress tillgänglig';
-$lang['cf_refresh'] = 'Uppdatera';
-$lang['Text after the contact form'] = 'Text efter kontaktformuläret';
-$lang['Text before the contact form'] = 'Text före kontaktformuläret';
-$lang['cf_tab_persoform'] = 'Lägg till valfri text';
 ?>
Index: /extensions/ContactForm/language/tr_TR/index.php
===================================================================
--- /extensions/ContactForm/language/tr_TR/index.php	(revision 17482)
+++ /extensions/ContactForm/language/tr_TR/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/tr_TR/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/tr_TR/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/tr_TR/plugin.lang.php	(revision 17483)
@@ -1,71 +1,43 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'İletişim Formu';
-$lang['contact_form_debug'] = 'Debug bilgisini gör';
+$lang['Contact'] = 'İletişim';
+$lang['Your name'] = 'İsminiz';
+$lang['Your e-mail'] = 'E-posta adresiniz';
+$lang['Subject'] = 'Konu';
+$lang['Message'] = 'Mesaj';
+$lang['General configuration'] = 'Genel ayarlar';
+$lang['Add link in menu'] = 'Menüye link ekle';
+$lang['Allow guests to see the form'] = 'Ziyaretciler formu görebilir';
+$lang['E-mail address is mandatory'] = 'E-postanın zorunluluğu';
+$lang['Name is mandatory'] = 'Zorunlu isim';
+$lang['E-mail configuration'] = 'E-posta ayarları';
+$lang['Text before the contact form'] = 'İletişim formun önündeki metin';
+$lang['Text after the contact form'] = 'İletişim formun arkasındaki metin';
+$lang['E-mail sent successfully'] = 'Mesajınız başarılı bir şekilde gönderildi.';
+$lang['Please enter a name'] = 'Lütfen isminizi girin';
+$lang['Please enter a subject'] = 'Lütfen konuyu girin';
+$lang['Please enter a message'] = 'Lütfen mesajınızı girin';
+$lang['Error while sending e-mail'] = 'Mesajın gönderilmesinde sorun oluştu';
 
-// ==================================================================
-// Default values if not configured
-$lang['contact_form_title'] = 'İletişim formu';
-$lang['contact_form'] = 'İletişim';
-$lang['contact_form_link'] = 'İletişim Site yöneticisi';
-
-// ==================================================================
-// Redirect page
-$lang['contact_redirect_title'] = 'Mesajın durumunu gönder';
-
-// ==================================================================
-// Menü bloğu
-$lang['cf_from_name'] = 'İsminiz';
-$lang['cf_from_mail'] = 'E-posta adresiniz';
-$lang['cf_subject'] = 'Konu';
-$lang['cf_message'] = 'Mesaj';
-$lang['cf_submit'] = 'Gönder';
-$lang['title_send_mail'] = '';
-
-// ==================================================================
-// Mesajlar
-$lang['cf_from_name_error'] = 'Lütfen isminizi girin';
-$lang['cf_mail_format_error'] = 'E-Posta yandaki gibi olmalıdır  xxx@yyy.eee (örnek : jack@altern.org)';
-$lang['cf_subject_error'] = 'Lütfen konuyu girin';
-$lang['cf_message_error'] = 'Lütfen mesajınızı girin';
-$lang['cf_error_sending_mail'] = 'Mesajın gönderilmesinde sorun oluştu';
-$lang['cf_sending_mail_successful'] = 'Mesajınız başarılı bir şekilde gönderildi.';
-$lang['cf_form_error'] = 'Geçersiz bilgi';
-$lang['cf_no_unlink'] = 'Fonksiyon \'unlink\' ulaşılamaz...';
-$lang['cf_unlink_errors'] = 'Dosyada hata oluştu';
-$lang['cf_config_saved'] = 'Değişiklikler başarılı ile kaydedildi.';
-$lang['cf_config_saved_with_errors'] = 'Değişikler hatalar ile kaydedildi';
-$lang['cf_length_not_integer'] = 'Boyut değeri tam sayı olmalı';
-$lang['cf_delay_not_integer'] = 'Geçikme değeri tam sayı olmalı';
-$lang['cf_link_error'] = 'Değişkenler boşluk içeremez';
-$lang['cf_hide'] = 'Gizle';
-
-// ==================================================================
-// Yönetici Sayfası
-$lang['cf_validate'] = 'Gönder';
-// Ayarlar  bölümü
-$lang['cf_tab_config'] = 'Ayarlar';
-$lang['cf_config'] = 'Ayarlar';
-$lang['cf_config_desc'] = 'Eklenti ayarları';
-$lang['cf_label_config'] = 'Genel ayarlar';
-$lang['cf_label_mail'] = 'E-posta ayarları';
-$lang['cf_menu_link'] = 'Menüye link ekle';
-$lang['cf_guest_allowed'] = 'Ziyaretciler formu görebilir';
-$lang['cf_mail_prefix'] = 'Gelen postaya eklenecek ön ek';
-$lang['cf_separator'] = 'Character(s) used to define a separation bar in the e-mail in text format';
-$lang['cf_separator_length'] = 'Mesaj alanın genişliği';
-$lang['cf_mandatory_name'] = 'Zorunlu isim';
-$lang['cf_mandatory_mail'] = 'E-postanın zorunluluğu';
-$lang['cf_redirect_delay'] = 'Geribildirimde geçikme süresi';
-// E-posta  bölümü
-$lang['cf_tab_emails'] = 'E-postalar';
-$lang['cf_emails'] = 'E-postalar';
-$lang['cf_emails_desc'] = 'Hedef e-posta yönetimi';
-$lang['cf_active'] = 'Etkin e-posta';
-$lang['cf_no_mail'] = 'Mevcut e-posta adresi yok';
-$lang['cf_refresh'] = 'E-posta listesini tekrar oluştur';
-$lang['Text after the contact form'] = 'İletişim formun arkasındaki metin';
-$lang['Text before the contact form'] = 'İletişim formun önündeki metin';
-$lang['cf_tab_persoform'] = 'Özelleştirilmiş metin ekle';
 ?>
Index: /extensions/ContactForm/language/uk_UA/index.php
===================================================================
--- /extensions/ContactForm/language/uk_UA/index.php	(revision 17483)
+++ /extensions/ContactForm/language/uk_UA/index.php	(revision 17483)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/ContactForm/language/uk_UA/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/uk_UA/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/uk_UA/plugin.lang.php	(revision 17483)
@@ -1,52 +1,44 @@
 <?php
-$lang['cf_message'] = 'Повідомлення';
-$lang['cf_plugin_name'] = 'Зворотній зв\'язок';
-$lang['cf_subject'] = 'Тема';
-$lang['cf_submit'] = 'Надіслати';
-$lang['contact_form'] = 'Зв\'язатися';
-$lang['contact_form_link'] = 'Зв\'язатися з адміністратором';
-$lang['cf_error_sending_mail'] = 'Помилка при відправленні по електронній пошті';
-$lang['cf_from_name'] = 'Ваше ім\'я';
-$lang['cf_from_name_error'] = 'Будь ласка, введіть ім\'я';
-$lang['cf_message_error'] = 'Будь ласка, введіть повідомлення';
-$lang['cf_sending_mail_successful'] = 'Повідомлення успішно надіслано';
-$lang['cf_subject_error'] = 'Будь ласка, ведіть тему';
-$lang['contact_form_debug'] = 'Відображення налагоджувальної інформації';
-$lang['contact_form_title'] = 'Контактна форма';
-$lang['contact_redirect_title'] = 'Статус надісланого повідомлення';
-$lang['title_send_mail'] = 'Коментар про сайт';
-$lang['cf_active'] = 'Активна електронна пошта';
-$lang['cf_config'] = 'Конфігурація';
-$lang['cf_config_desc'] = 'Плаґін основної конфігурації';
-$lang['cf_config_saved'] = 'Конфігурація успішно збережена';
-$lang['cf_config_saved_with_errors'] = 'Конфігурація збережена з помилками';
-$lang['cf_delay_not_integer'] = 'Затримка повинна бути цілим числом';
-$lang['cf_emails'] = 'Електронна пошта';
-$lang['cf_emails_desc'] = 'Управління адресою електронної пошти';
-$lang['cf_form_error'] = 'Невірні дані';
-$lang['cf_guest_allowed'] = 'Дозвольте гостям бачити форму';
-$lang['cf_hide'] = 'Приховати';
-$lang['cf_label_config'] = 'Загальна конфігурація';
-$lang['cf_label_mail'] = 'Конфігурації електронної пошти';
-$lang['cf_length_not_integer'] = 'Розмір повинен бути цілим числом';
-$lang['cf_link_error'] = 'Змінна не може містити пропусків';
-$lang['cf_mail_format_error'] = 'Невірний формат електронної пошти';
-$lang['cf_mail_prefix'] = 'Префікс до надісланої теми на емейл адресу';
-$lang['cf_mandatory_mail'] = 'Адреса електронної пошти є обов\'язковою';
-$lang['cf_mandatory_name'] = 'Ім\'я є обов\'язковим';
-$lang['cf_menu_link'] = 'Додати посилання в меню';
-$lang['cf_no_mail'] = 'Немає доступних адрес електронної пошти';
-$lang['cf_no_unlink'] = 'Функція "від\'єднати" не доступна...';
-$lang['cf_redirect_delay'] = 'Пауза затримки для перенаправлення';
-$lang['cf_refresh'] = 'Відновити список адрес електронної пошти';
-$lang['cf_separator'] = 'Символ(и), що використовуються для визначення поділу бару електронної пошти в текстовому форматі';
-$lang['cf_separator_length'] = 'Розмір панелі';
-$lang['cf_tab_config'] = 'Конфігурація';
-$lang['cf_tab_emails'] = 'Електронна пошта';
-$lang['cf_unlink_errors'] = 'Сталася помилка під час видалення файлів';
-$lang['cf_validate'] = 'Прийняти';
-$lang['cf_from_mail'] = 'Ваш емейл';
-$lang['cf_tab_persoform'] = 'Додати текстову Форму';
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+$lang['A comment on the site'] = 'Коментар про сайт';
+$lang['Contact'] = 'Зв\'язатися';
+$lang['Your name'] = 'Ваше ім\'я';
+$lang['Your e-mail'] = 'Ваш емейл';
+$lang['Subject'] = 'Тема';
+$lang['Message'] = 'Повідомлення';
+$lang['General configuration'] = 'Загальна конфігурація';
+$lang['Add link in menu'] = 'Додати посилання в меню';
+$lang['Allow guests to see the form'] = 'Дозвольте гостям бачити форму';
+$lang['E-mail address is mandatory'] = 'Конфігурації електронної пошти';
+$lang['Name is mandatory'] = 'Ім\'я є обов\'язковим';
+$lang['E-mail configuration'] = 'Адреса електронної пошти є обов\'язковою';
+$lang['Text before the contact form'] = 'Текст перед контактною формою';
 $lang['Text after the contact form'] = 'Текст після контактної форми';
-$lang['Text before the contact form'] = 'Текст перед контактною формою';
+$lang['E-mail sent successfully'] = 'Повідомлення успішно надіслано';
+$lang['Please enter a name'] = 'Будь ласка, введіть ім\'я';
+$lang['Please enter a subject'] = 'Будь ласка, ведіть тему';
+$lang['Please enter a message'] = 'Будь ласка, введіть повідомлення';
+$lang['Error while sending e-mail'] = 'Помилка при відправленні по електронній пошті';
+
 ?>
Index: /extensions/ContactForm/language/vi_VN/index.php
===================================================================
--- /extensions/ContactForm/language/vi_VN/index.php	(revision 17482)
+++ /extensions/ContactForm/language/vi_VN/index.php	(revision 17483)
@@ -1,12 +1,9 @@
 <?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 |
+// | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
Index: /extensions/ContactForm/language/vi_VN/plugin.lang.php
===================================================================
--- /extensions/ContactForm/language/vi_VN/plugin.lang.php	(revision 17482)
+++ /extensions/ContactForm/language/vi_VN/plugin.lang.php	(revision 17483)
@@ -1,71 +1,44 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
 
-$lang['cf_plugin_name'] = 'Dạng Liên hệ';
-$lang['contact_form_debug'] = 'Hiển thị của thông tin hiệu chỉnh lỗi';
+$lang['A comment on the site'] = 'Một lời bình trên trang';
+$lang['Contact'] = 'Liên hệ';
+$lang['Your name'] = 'Tên của bạn';
+$lang['Your e-mail'] = 'Email của bạn';
+$lang['Subject'] = 'Tiêu đề';
+$lang['Message'] = 'Thông điệp';
+$lang['General configuration'] = 'Cấu hình tổng quát';
+$lang['Add link in menu'] = 'Thêm liên kết vào trình đơn';
+$lang['Allow guests to see the form'] = 'Cho phép khách xem các dạng';
+$lang['E-mail address is mandatory'] = 'Địa chỉ thư điện tử là bắt buộc';
+$lang['Name is mandatory'] = 'Họ tên là bắt buộc';
+$lang['E-mail configuration'] = 'Cấu hình thư điện tử';
+$lang['Text before the contact form'] = 'Chữ hiện trước form liên lạc';
+$lang['Text after the contact form'] = 'Chữ hiện sau form liên lạc';
+$lang['E-mail sent successfully'] = 'Email đã được gởi thành công';
+$lang['Please enter a name'] = 'Vui lòng nhập tên';
+$lang['Please enter a subject'] = 'Vui lòng nhập tiêu đề';
+$lang['Please enter a message'] = 'Vui lòng nhập nội dung';
+$lang['Error while sending e-mail'] = 'Có lỗi trong quá trình gởi email';
 
-// ==================================================================
-// Giá trị mặc định nếu không được cấu hình 
-$lang['contact_form_title'] = 'Dạng Liên hệ';
-$lang['contact_form'] = 'Liên hệ';
-$lang['contact_form_link'] = 'Liên hệ webmaster';
-
-// ==================================================================
-// Trang đổi hướng
-$lang['contact_redirect_title'] = 'Gởi trạng thái tin nhắn';
-
-// ==================================================================
-// Khối thanh trình đơn
-$lang['cf_from_name'] = 'Tên của bạn';
-$lang['cf_from_mail'] = 'Email của bạn';
-$lang['cf_subject'] = 'Tiêu đề';
-$lang['cf_message'] = 'Thông điệp';
-$lang['cf_submit'] = 'Gởi';
-$lang['title_send_mail'] = 'Một lời bình trên trang';
-
-// ==================================================================
-// Thông điệp
-$lang['cf_from_name_error'] = 'Vui lòng nhập tên';
-$lang['cf_mail_format_error'] = 'địa chỉ email phải có dạng xxx@yyy.eee (ví dụ : jack@altern.org)';
-$lang['cf_subject_error'] = 'Vui lòng nhập tiêu đề';
-$lang['cf_message_error'] = 'Vui lòng nhập nội dung';
-$lang['cf_error_sending_mail'] = 'Có lỗi trong quá trình gởi email';
-$lang['cf_sending_mail_successful'] = 'Email đã được gởi thành công';
-$lang['cf_form_error'] = 'Dữ liệu không có thực';
-$lang['cf_no_unlink'] = 'Chức năng \'unlink\' không dùng được...';
-$lang['cf_unlink_errors'] = 'Lỗi xuất hiện trong quá trình xóa tệp tin';
-$lang['cf_config_saved'] = 'Cấu hình được lưu thành công';
-$lang['cf_config_saved_with_errors'] = 'Cấu hình được lưu với lỗi';
-$lang['cf_length_not_integer'] = 'Kích thước phải là số nguyên';
-$lang['cf_delay_not_integer'] = 'Độ trễ phải là số nguyên';
-$lang['cf_link_error'] = 'Biến số không thể chứa khoảng trắng';
-$lang['cf_hide'] = 'Ẩn';
-
-// ==================================================================
-// Trang quản trị
-$lang['cf_validate'] = 'Xác nhận';
-// Thẻ cấu hình
-$lang['cf_tab_config'] = 'Cấu hình';
-$lang['cf_config'] = 'Cấu hình';
-$lang['cf_config_desc'] = 'Cấu hình plugin chính';
-$lang['cf_label_config'] = 'Cấu hình tổng quát';
-$lang['cf_label_mail'] = 'Cấu hình thư điện tử';
-$lang['cf_menu_link'] = 'Thêm liên kết vào trình đơn';
-$lang['cf_guest_allowed'] = 'Cho phép khách xem các dạng';
-$lang['cf_mail_prefix'] = 'Tiếp đầu ngữ tiêu đề mail được gởi';
-$lang['cf_separator'] = 'Ký tự sử dụng để định nghĩa thanh chia của email trong định dạng kiểu chữ';
-$lang['cf_separator_length'] = 'Kích thước của thanh';
-$lang['cf_mandatory_name'] = 'Họ tên là bắt buộc';
-$lang['cf_mandatory_mail'] = 'Địa chỉ thư điện tử là bắt buộc';
-$lang['cf_redirect_delay'] = 'Tạm ngừng độ trễ của quá trình điều hướng';
-// Thẻ thư điện tử
-$lang['cf_tab_emails'] = 'Thư điện tử';
-$lang['cf_emails'] = 'Thư điện tử';
-$lang['cf_emails_desc'] = 'Quản lý thư điện tử gởi đến';
-$lang['cf_active'] = 'Kích hoạt thư điện tử';
-$lang['cf_no_mail'] = 'Không có địa chỉ thư nào dùng được';
-$lang['cf_refresh'] = 'Tạo ra danh sách địa chỉ thư';
-$lang['Text after the contact form'] = 'Chữ hiện sau form liên lạc';
-$lang['Text before the contact form'] = 'Chữ hiện trước form liên lạc';
-$lang['cf_tab_persoform'] = 'Thêm chữ theo ý bạn';
 ?>
Index: /extensions/ContactForm/main.inc.php
===================================================================
--- /extensions/ContactForm/main.inc.php	(revision 17482)
+++ /extensions/ContactForm/main.inc.php	(revision 17483)
@@ -5,30 +5,38 @@
 Description: Add a "Contact" item in the Menu block to offer a contact form to users
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=304
-Author: Criss, Gotcha
-Author URI: http://piwigo.org/
+Author: Piwigo Team
+Author URI: http://piwigo.org
 */
 
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('CF_PATH',     PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
-define('CF_ROOT',     dirname(__FILE__).'/');
-include_once(CF_PATH . 'include/cf_common.inc.php');
+define('CONTACT_FORM_PATH',  PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
+define('CONTACT_FORM_ADMIN', get_root_url() . 'admin.php?page=plugin-' . basename(dirname(__FILE__)));
 
-$cf_plugin = new CF_Plugin($plugin['id']);
-add_event_handler('loc_begin_index',             
-                  array(&$cf_plugin, 'loc_begin_index'));
-add_event_handler('loc_begin_page_tail',             
-                  array(&$cf_plugin, 'loc_begin_page_header'));
-add_event_handler('blockmanager_apply',             
-                  array(&$cf_plugin, 'blockmanager_apply'),
-                  EVENT_HANDLER_PRIORITY_NEUTRAL+10);
-add_event_handler('loc_end_index',             
-                  array(&$cf_plugin, 'loc_end_index'));
-add_event_handler('loc_end_page_tail',
-                  array(&$cf_plugin, 'loc_end_page_tail'));
-if(defined('IN_ADMIN')) {
-  add_event_handler('get_admin_plugin_menu_links',
-                    array(&$cf_plugin, 'get_admin_plugin_menu_links'));
+
+add_event_handler('init', 'contact_form_init');
+add_event_handler('loc_end_section_init', 'contact_form_section_init');
+add_event_handler('loc_end_index', 'contact_form_page');
+add_event_handler('blockmanager_apply', 'contact_form_applymenu', EVENT_HANDLER_PRIORITY_NEUTRAL+10);
+if (defined('IN_ADMIN'))
+{
+  add_event_handler('get_admin_plugin_menu_links', 'contact_form_admin_menu');
 }
-set_plugin_data($plugin['id'], $cf_plugin);
+
+include(CONTACT_FORM_PATH . 'include/functions.inc.php');
+
+
+function contact_form_init()
+{
+  global $conf;
+  $conf['ContactForm'] = unserialize($conf['ContactForm']);
+  
+  load_language('plugin.lang', CONTACT_FORM_PATH);
+  
+  if ($conf['ContactForm']['cf_must_initialize'])
+  {
+    contact_form_initialize_emails();
+  }
+}
+
 ?>
Index: /extensions/ContactForm/maintain.inc.php
===================================================================
--- /extensions/ContactForm/maintain.inc.php	(revision 17482)
+++ /extensions/ContactForm/maintain.inc.php	(revision 17483)
@@ -1,40 +1,72 @@
 <?php
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-if (!defined('IN_ADMIN') or !IN_ADMIN) die('Hacking attempt!');
 
-if (!defined('CF_PATH')) {
-  define('CF_PATH',     PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
-}
-if (!defined('CF_ROOT')) {
-  define('CF_ROOT',     dirname(__FILE__).'/');
+define('contact_form_default_config', 
+  serialize(array(
+    'cf_must_initialize' => true,
+    'cf_menu_link' => true,
+    'cf_subject_prefix' => '%gallery_title%',
+    'cf_default_subject' => 'A comment on the site',
+    'cf_allow_guest' => true,
+    'cf_mandatory_mail' => true,
+    'cf_mandatory_name' => true,
+    'cf_redirect_delay' => 5,
+    'cf_mail_type' => 'text/html',
+    'cf_admin_mails' => array(),
+    ))
+  );
+
+
+function plugin_install() 
+{
+  conf_update_param('ContactForm', contact_form_default_config);
+  conf_update_param('ContactForm_before', null);
+  conf_update_param('ContactForm_after', null);
 }
 
-function plugin_install($plugin_id, $version, &$errors) {
-  include_once(CF_PATH . 'include/cf_common.inc.php');
-  // Include language advices
-  load_language('plugin.lang', CF_PATH);
-  update_config($plugin_id, CF_CFG_DB_FACTORY);
+function plugin_activate()
+{
+  global $conf;
+
+  if (!isset($conf['ContactForm']))
+  {
+    plugin_install();
+  }
+  else
+  {
+    $new_conf = unserialize($conf['ContactForm']);
+    
+    // migration 2.4 -> 2.5
+    if (!isset($new_conf['cf_must_initialize']))
+    {
+      $new_conf['cf_must_initialize'] = false;
+      $new_conf['cf_default_subject'] = 'A comment on the site';
+      $new_conf['cf_mail_type'] = 'text/html';
+      unset($new_conf['comment'], $new_conf['cf_redirect_delay']);
+      unset($new_conf['cf_separator'], $new_conf['cf_separator_length']);
+      
+      foreach ($new_conf['cf_admin_mails'] as $email => $data)
+      {
+        $new_conf['cf_admin_mails'][] = array(
+          'email' => $email,
+          'name' => $data['NAME'],
+          'active' => $data['ACTIVE'],
+          );
+        unset($new_conf['cf_admin_mails'][ $email ]);
+      }
+      
+      conf_update_param('ContactForm', serialize($new_conf));
+      conf_update_param('ContactForm_before', stripslashes($conf['persoformtop']));
+      conf_update_param('ContactForm_after', stripslashes($conf['persoformbottom']));
+      
+      pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param IN("persoformtop", "persoformbottom") LIMIT 2;');
+    }
+  }
 }
 
-function plugin_activate($plugin_id, $version, &$errors) {
-  update_config($plugin_id);
+function plugin_uninstall() 
+{
+  pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param LIKE "ContactForm%" LIMIT 3;');
 }
 
-function plugin_deactivate($plugin_id) {
-  // Nothing special
-}
-
-function plugin_uninstall($plugin_id) {
-  include_once(CF_PATH . 'include/cf_common.inc.php');
-  $uninstall = CF_Config::uninstall($plugin_id);
-}
-
-function update_config($plugin_id, $db_comment=null) {
-  include_once(CF_PATH . 'include/cf_common.inc.php');
-  $clean = cf_clean_obsolete_files(CF_OBSOLETE);
-  if (null != $db_comment) {
-    $cf_config_default[CF_CFG_COMMENT] = $db_comment;
-  }
-  $install = CF_Config::install($plugin_id);
-}
 ?>
Index: /extensions/ContactForm/template/contact_form.tpl
===================================================================
--- /extensions/ContactForm/template/contact_form.tpl	(revision 17483)
+++ /extensions/ContactForm/template/contact_form.tpl	(revision 17483)
@@ -0,0 +1,100 @@
+{combine_css path=$CONTACT_FORM_PATH|@cat:"template/style.css"}
+{combine_script id="livevalidation" load="footer" path=$CONTACT_FORM_PATH|@cat:"template/livevalidation.min.js"}
+
+{footer_script require='livevalidation'}
+{if $contact.mandatory_name and !$contact.is_logged}
+var author = new LiveValidation('author', {ldelim} onlyOnSubmit: true });
+author.add(Validate.Presence, {ldelim} failureMessage: "{'Please enter a name'|@translate}" });
+{/if}
+
+{if $contact.mandatory_mail and (!$contact.is_logged or empty($contact.email))}
+var email = new LiveValidation('email', {ldelim} onlyOnSubmit: true });
+email.add(Validate.Presence, {ldelim} failureMessage: "{'Please enter an e-mail'|@translate}" });
+email.add(Validate.Email, {ldelim} failureMessage: "{'mail address must be like xxx@yyy.eee (example : jack@altern.org)'|@translate}" });
+{/if}
+
+var subject = new LiveValidation('subject', {ldelim} onlyOnSubmit: true });
+subject.add(Validate.Presence, {ldelim} failureMessage: "{'Please enter a subject'|@translate}" });
+subject.add(Validate.Length, {ldelim} minimum: 4, maximum: 100,
+  tooShortMessage: "{'%s must not be less than %d characters long'|@translate|@sprintf:'':4}",
+  tooLongMessage: "{'%s must not be more than %d characters long'|@translate|@sprintf:'':100}" 
+  });
+
+var content = new LiveValidation('cf_content', {ldelim} onlyOnSubmit: true });
+content.add(Validate.Presence, {ldelim} failureMessage: "{'Please enter a message'|@translate}" });
+content.add(Validate.Length, {ldelim} minimum: 20, maximum: 2000,
+  tooShortMessage: "{'%s must not be less than %d characters long'|@translate|@sprintf:'':20}",
+  tooLongMessage: "{'%s must not be more %d characters long'|@translate|@sprintf:'':2000}",
+  });
+{/footer_script}
+
+
+{* <!-- Menubar & titrePage --> *}
+{if $themeconf.name == "stripped" or $themeconf.parent == "stripped"}
+  {include file=$CONTACT_FORM_ABS_PATH|@cat:'template/themes/stripped.tpl'}
+  {assign var="clear" value="true"}
+{elseif $themeconf.name == "simple-grey" or $themeconf.parent == "simple"}
+  {include file=$CONTACT_FORM_ABS_PATH|@cat:'template/themes/simple.tpl'}
+  {assign var="clear" value="true"}
+{else}
+  {include file=$CONTACT_FORM_ABS_PATH|@cat:'template/themes/default.tpl'}
+{/if}
+
+
+{if isset($errors) or not empty($infos)}
+{include file='infos_errors.tpl'}
+{/if}
+
+{if $ContactForm_before}
+<div class="contact desc">{$ContactForm_before}</div>
+{/if}
+
+<div class="contact">
+  <form  method="post" action="{$F_ACTION}" class="filter">
+    <table>
+      <tr>
+        <td class="title"><label for="author">{'Your name'|@translate}</label></td>
+        <td>
+        {if $contact.is_logged}
+          {$contact.author}
+          <input type="hidden" name="author" value="{$contact.author}">
+        {else}
+          <input type="text" name="author" id="author" size="40" value="{$contact.author}">
+        {/if}
+        </td>
+      </tr>
+      <tr>
+        <td class="title"><label for="email">{'Your e-mail'|@translate}</label></td>
+        <td>
+        {if $contact.is_logged and !empty($contact.email)}
+          {$contact.email}
+          <input type="hidden" name="email" value="{$contact.email}">
+        {else}
+          <input type="text" name="email" id="email" size="40" value="{$contact.email}">
+        {/if}
+        </td>
+      </tr>
+      <tr>
+        <td class="title"><label for="subject">{'Subject'|@translate}</label></td>
+        <td><input type="text" name="subject" id="subject" style="width:400px;" value="{$contact.subject}"></td>
+      </tr>
+      <tr>
+        <td class="title"><label for="cf_content">{'Message'|@translate}</label></td>
+        <td><textarea name="content" id="cf_content" rows="10" style="width:400px;">{$contact.content}</textarea></td>
+      </tr>
+      <tr>
+        <td class="title">&nbsp;</td>
+        <td><input class="submit" type="submit" name="send_mail" value="{'Send'|@translate}"></td>
+      </tr>
+    </table>
+    
+    <input type="hidden" name="key" value="{$KEY}" />
+  </form>
+</div>
+
+{if $ContactForm_after}
+<div class="contact desc">{$ContactForm_after}</div>
+{/if}
+
+{if $clear}<div style="clear: both;"></div>{/if}
+</div>{* <!-- content --> *}
Index: /extensions/ContactForm/template/index.php
===================================================================
--- /extensions/ContactForm/template/index.php	(revision 17483)
+++ /extensions/ContactForm/template/index.php	(revision 17483)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/ContactForm/template/livevalidation.min.js
===================================================================
--- /extensions/ContactForm/template/livevalidation.min.js	(revision 17483)
+++ /extensions/ContactForm/template/livevalidation.min.js	(revision 17483)
@@ -0,0 +1,4 @@
+// LiveValidation 1.3 (standalone version)
+// Copyright (c) 2007-2008 Alec Hill (www.livevalidation.com)
+// LiveValidation is licensed under the terms of the MIT License
+var LiveValidation=function(B,A){this.initialize(B,A);};LiveValidation.VERSION="1.3 standalone";LiveValidation.TEXTAREA=1;LiveValidation.TEXT=2;LiveValidation.PASSWORD=3;LiveValidation.CHECKBOX=4;LiveValidation.SELECT=5;LiveValidation.FILE=6;LiveValidation.massValidate=function(C){var D=true;for(var B=0,A=C.length;B<A;++B){var E=C[B].validate();if(D){D=E;}}return D;};LiveValidation.prototype={validClass:"LV_valid",invalidClass:"LV_invalid",messageClass:"LV_validation_message",validFieldClass:"LV_valid_field",invalidFieldClass:"LV_invalid_field",initialize:function(D,C){var A=this;if(!D){throw new Error("LiveValidation::initialize - No element reference or element id has been provided!");}this.element=D.nodeName?D:document.getElementById(D);if(!this.element){throw new Error("LiveValidation::initialize - No element with reference or id of '"+D+"' exists!");}this.validations=[];this.elementType=this.getElementType();this.form=this.element.form;var B=C||{};this.validMessage=B.validMessage||"Thankyou!";var E=B.insertAfterWhatNode||this.element;this.insertAfterWhatNode=E.nodeType?E:document.getElementById(E);this.onValid=B.onValid||function(){this.insertMessage(this.createMessageSpan());this.addFieldClass();};this.onInvalid=B.onInvalid||function(){this.insertMessage(this.createMessageSpan());this.addFieldClass();};this.onlyOnBlur=B.onlyOnBlur||false;this.wait=B.wait||0;this.onlyOnSubmit=B.onlyOnSubmit||false;if(this.form){this.formObj=LiveValidationForm.getInstance(this.form);this.formObj.addField(this);}this.oldOnFocus=this.element.onfocus||function(){};this.oldOnBlur=this.element.onblur||function(){};this.oldOnClick=this.element.onclick||function(){};this.oldOnChange=this.element.onchange||function(){};this.oldOnKeyup=this.element.onkeyup||function(){};this.element.onfocus=function(F){A.doOnFocus(F);return A.oldOnFocus.call(this,F);};if(!this.onlyOnSubmit){switch(this.elementType){case LiveValidation.CHECKBOX:this.element.onclick=function(F){A.validate();return A.oldOnClick.call(this,F);};case LiveValidation.SELECT:case LiveValidation.FILE:this.element.onchange=function(F){A.validate();return A.oldOnChange.call(this,F);};break;default:if(!this.onlyOnBlur){this.element.onkeyup=function(F){A.deferValidation();return A.oldOnKeyup.call(this,F);};}this.element.onblur=function(F){A.doOnBlur(F);return A.oldOnBlur.call(this,F);};}}},destroy:function(){if(this.formObj){this.formObj.removeField(this);this.formObj.destroy();}this.element.onfocus=this.oldOnFocus;if(!this.onlyOnSubmit){switch(this.elementType){case LiveValidation.CHECKBOX:this.element.onclick=this.oldOnClick;case LiveValidation.SELECT:case LiveValidation.FILE:this.element.onchange=this.oldOnChange;break;default:if(!this.onlyOnBlur){this.element.onkeyup=this.oldOnKeyup;}this.element.onblur=this.oldOnBlur;}}this.validations=[];this.removeMessageAndFieldClass();},add:function(A,B){this.validations.push({type:A,params:B||{}});return this;},remove:function(B,D){var E=false;for(var C=0,A=this.validations.length;C<A;C++){if(this.validations[C].type==B){if(this.validations[C].params==D){E=true;break;}}}if(E){this.validations.splice(C,1);}return this;},deferValidation:function(B){if(this.wait>=300){this.removeMessageAndFieldClass();}var A=this;if(this.timeout){clearTimeout(A.timeout);}this.timeout=setTimeout(function(){A.validate();},A.wait);},doOnBlur:function(A){this.focused=false;this.validate(A);},doOnFocus:function(A){this.focused=true;this.removeMessageAndFieldClass();},getElementType:function(){switch(true){case (this.element.nodeName.toUpperCase()=="TEXTAREA"):return LiveValidation.TEXTAREA;case (this.element.nodeName.toUpperCase()=="INPUT"&&this.element.type.toUpperCase()=="TEXT"):return LiveValidation.TEXT;case (this.element.nodeName.toUpperCase()=="INPUT"&&this.element.type.toUpperCase()=="PASSWORD"):return LiveValidation.PASSWORD;case (this.element.nodeName.toUpperCase()=="INPUT"&&this.element.type.toUpperCase()=="CHECKBOX"):return LiveValidation.CHECKBOX;case (this.element.nodeName.toUpperCase()=="INPUT"&&this.element.type.toUpperCase()=="FILE"):return LiveValidation.FILE;case (this.element.nodeName.toUpperCase()=="SELECT"):return LiveValidation.SELECT;case (this.element.nodeName.toUpperCase()=="INPUT"):throw new Error("LiveValidation::getElementType - Cannot use LiveValidation on an "+this.element.type+" input!");default:throw new Error("LiveValidation::getElementType - Element must be an input, select, or textarea!");}},doValidations:function(){this.validationFailed=false;for(var C=0,A=this.validations.length;C<A;++C){var B=this.validations[C];switch(B.type){case Validate.Presence:case Validate.Confirmation:case Validate.Acceptance:this.displayMessageWhenEmpty=true;this.validationFailed=!this.validateElement(B.type,B.params);break;default:this.validationFailed=!this.validateElement(B.type,B.params);break;}if(this.validationFailed){return false;}}this.message=this.validMessage;return true;},validateElement:function(A,C){var D=(this.elementType==LiveValidation.SELECT)?this.element.options[this.element.selectedIndex].value:this.element.value;if(A==Validate.Acceptance){if(this.elementType!=LiveValidation.CHECKBOX){throw new Error("LiveValidation::validateElement - Element to validate acceptance must be a checkbox!");}D=this.element.checked;}var E=true;try{A(D,C);}catch(B){if(B instanceof Validate.Error){if(D!==""||(D===""&&this.displayMessageWhenEmpty)){this.validationFailed=true;this.message=B.message;E=false;}}else{throw B;}}finally{return E;}},validate:function(){if(!this.element.disabled){var A=this.doValidations();if(A){this.onValid();return true;}else{this.onInvalid();return false;}}else{return true;}},enable:function(){this.element.disabled=false;return this;},disable:function(){this.element.disabled=true;this.removeMessageAndFieldClass();return this;},createMessageSpan:function(){var A=document.createElement("span");var B=document.createTextNode(this.message);A.appendChild(B);return A;},insertMessage:function(B){this.removeMessage();if((this.displayMessageWhenEmpty&&(this.elementType==LiveValidation.CHECKBOX||this.element.value==""))||this.element.value!=""){var A=this.validationFailed?this.invalidClass:this.validClass;B.className+=" "+this.messageClass+" "+A;if(this.insertAfterWhatNode.nextSibling){this.insertAfterWhatNode.parentNode.insertBefore(B,this.insertAfterWhatNode.nextSibling);}else{this.insertAfterWhatNode.parentNode.appendChild(B);}}},addFieldClass:function(){this.removeFieldClass();if(!this.validationFailed){if(this.displayMessageWhenEmpty||this.element.value!=""){if(this.element.className.indexOf(this.validFieldClass)==-1){this.element.className+=" "+this.validFieldClass;}}}else{if(this.element.className.indexOf(this.invalidFieldClass)==-1){this.element.className+=" "+this.invalidFieldClass;}}},removeMessage:function(){var A;var B=this.insertAfterWhatNode;while(B.nextSibling){if(B.nextSibling.nodeType===1){A=B.nextSibling;break;}B=B.nextSibling;}if(A&&A.className.indexOf(this.messageClass)!=-1){this.insertAfterWhatNode.parentNode.removeChild(A);}},removeFieldClass:function(){if(this.element.className.indexOf(this.invalidFieldClass)!=-1){this.element.className=this.element.className.split(this.invalidFieldClass).join("");}if(this.element.className.indexOf(this.validFieldClass)!=-1){this.element.className=this.element.className.split(this.validFieldClass).join(" ");}},removeMessageAndFieldClass:function(){this.removeMessage();this.removeFieldClass();}};var LiveValidationForm=function(A){this.initialize(A);};LiveValidationForm.instances={};LiveValidationForm.getInstance=function(A){var B=Math.random()*Math.random();if(!A.id){A.id="formId_"+B.toString().replace(/\./,"")+new Date().valueOf();}if(!LiveValidationForm.instances[A.id]){LiveValidationForm.instances[A.id]=new LiveValidationForm(A);}return LiveValidationForm.instances[A.id];};LiveValidationForm.prototype={initialize:function(B){this.name=B.id;this.element=B;this.fields=[];this.oldOnSubmit=this.element.onsubmit||function(){};var A=this;this.element.onsubmit=function(C){return(LiveValidation.massValidate(A.fields))?A.oldOnSubmit.call(this,C||window.event)!==false:false;};},addField:function(A){this.fields.push(A);},removeField:function(C){var D=[];for(var B=0,A=this.fields.length;B<A;B++){if(this.fields[B]!==C){D.push(this.fields[B]);}}this.fields=D;},destroy:function(A){if(this.fields.length!=0&&!A){return false;}this.element.onsubmit=this.oldOnSubmit;LiveValidationForm.instances[this.name]=null;return true;}};var Validate={Presence:function(B,C){var C=C||{};var A=C.failureMessage||"Can't be empty!";if(B===""||B===null||B===undefined){Validate.fail(A);}return true;},Numericality:function(J,E){var A=J;var J=Number(J);var E=E||{};var F=((E.minimum)||(E.minimum==0))?E.minimum:null;var C=((E.maximum)||(E.maximum==0))?E.maximum:null;var D=((E.is)||(E.is==0))?E.is:null;var G=E.notANumberMessage||"Must be a number!";var H=E.notAnIntegerMessage||"Must be an integer!";var I=E.wrongNumberMessage||"Must be "+D+"!";var B=E.tooLowMessage||"Must not be less than "+F+"!";var K=E.tooHighMessage||"Must not be more than "+C+"!";if(!isFinite(J)){Validate.fail(G);}if(E.onlyInteger&&(/\.0+$|\.$/.test(String(A))||J!=parseInt(J))){Validate.fail(H);}switch(true){case (D!==null):if(J!=Number(D)){Validate.fail(I);}break;case (F!==null&&C!==null):Validate.Numericality(J,{tooLowMessage:B,minimum:F});Validate.Numericality(J,{tooHighMessage:K,maximum:C});break;case (F!==null):if(J<Number(F)){Validate.fail(B);}break;case (C!==null):if(J>Number(C)){Validate.fail(K);}break;}return true;},Format:function(C,E){var C=String(C);var E=E||{};var A=E.failureMessage||"Not valid!";var B=E.pattern||/./;var D=E.negate||false;if(!D&&!B.test(C)){Validate.fail(A);}if(D&&B.test(C)){Validate.fail(A);}return true;},Email:function(B,C){var C=C||{};var A=C.failureMessage||"Must be a valid email address!";Validate.Format(B,{failureMessage:A,pattern:/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i});return true;},Length:function(F,G){var F=String(F);var G=G||{};var E=((G.minimum)||(G.minimum==0))?G.minimum:null;var H=((G.maximum)||(G.maximum==0))?G.maximum:null;var C=((G.is)||(G.is==0))?G.is:null;var A=G.wrongLengthMessage||"Must be "+C+" characters long!";var B=G.tooShortMessage||"Must not be less than "+E+" characters long!";var D=G.tooLongMessage||"Must not be more than "+H+" characters long!";switch(true){case (C!==null):if(F.length!=Number(C)){Validate.fail(A);}break;case (E!==null&&H!==null):Validate.Length(F,{tooShortMessage:B,minimum:E});Validate.Length(F,{tooLongMessage:D,maximum:H});break;case (E!==null):if(F.length<Number(E)){Validate.fail(B);}break;case (H!==null):if(F.length>Number(H)){Validate.fail(D);}break;default:throw new Error("Validate::Length - Length(s) to validate against must be provided!");}return true;},Inclusion:function(H,F){var F=F||{};var K=F.failureMessage||"Must be included in the list!";var G=(F.caseSensitive===false)?false:true;if(F.allowNull&&H==null){return true;}if(!F.allowNull&&H==null){Validate.fail(K);}var D=F.within||[];if(!G){var A=[];for(var C=0,B=D.length;C<B;++C){var I=D[C];if(typeof I=="string"){I=I.toLowerCase();}A.push(I);}D=A;if(typeof H=="string"){H=H.toLowerCase();}}var J=false;for(var E=0,B=D.length;E<B;++E){if(D[E]==H){J=true;}if(F.partialMatch){if(H.indexOf(D[E])!=-1){J=true;}}}if((!F.negate&&!J)||(F.negate&&J)){Validate.fail(K);}return true;},Exclusion:function(A,B){var B=B||{};B.failureMessage=B.failureMessage||"Must not be included in the list!";B.negate=true;Validate.Inclusion(A,B);return true;},Confirmation:function(C,D){if(!D.match){throw new Error("Validate::Confirmation - Error validating confirmation: Id of element to match must be provided!");}var D=D||{};var B=D.failureMessage||"Does not match!";var A=D.match.nodeName?D.match:document.getElementById(D.match);if(!A){throw new Error("Validate::Confirmation - There is no reference with name of, or element with id of '"+D.match+"'!");}if(C!=A.value){Validate.fail(B);}return true;},Acceptance:function(B,C){var C=C||{};var A=C.failureMessage||"Must be accepted!";if(!B){Validate.fail(A);}return true;},Custom:function(D,E){var E=E||{};var B=E.against||function(){return true;};var A=E.args||{};var C=E.failureMessage||"Not valid!";if(!B(D,A)){Validate.fail(C);}return true;},now:function(A,D,C){if(!A){throw new Error("Validate::now - Validation function must be provided!");}var E=true;try{A(D,C||{});}catch(B){if(B instanceof Validate.Error){E=false;}else{throw B;}}finally{return E;}},fail:function(A){throw new Validate.Error(A);},Error:function(A){this.message=A;this.name="ValidationError";}};
Index: /extensions/ContactForm/template/mail/content_html.tpl
===================================================================
--- /extensions/ContactForm/template/mail/content_html.tpl	(revision 17483)
+++ /extensions/ContactForm/template/mail/content_html.tpl	(revision 17483)
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Piwigo Mail</title>
+  <meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}">
+  
+  <style type="text/css">{strip}<!--
+  {$CONTACT_MAIL_CSS}
+  -->{/strip}</style>
+</head>
+
+<body>
+<div id="the_page">
+
+<div id="the_header">
+{$cf_prefix}
+</div>
+
+<div id="the_content">
+  <p>
+    {'Name'|@translate} : {$contact.author}<br>
+    {'Email address'|@translate} : {$contact.email}
+  </p>
+
+  <blockquote>{$contact.content}</blockquote>
+
+  <p>
+    {'IP: %s'|@translate|@sprintf:$contact.ip}<br>
+    {'Browser: %s'|@translate|@sprintf:$contact.agent}
+  </p>
+</div>
+
+<div id="the_footer">
+  {'Sent by'|@translate} <a href="{$GALLERY_URL}">{$GALLERY_TITLE}</a>
+  - {'Powered by'|@translate} <a href="{$PHPWG_URL}" class="Piwigo">Piwigo</a> {$VERSION}
+  - Contact Form
+</div>
+
+</div>
+</body>
+</html>
Index: /extensions/ContactForm/template/mail/content_plain.tpl
===================================================================
--- /extensions/ContactForm/template/mail/content_plain.tpl	(revision 17483)
+++ /extensions/ContactForm/template/mail/content_plain.tpl	(revision 17483)
@@ -0,0 +1,16 @@
+{$cf_prefix}
+--------------------
+
+{'Name'|@translate} : {$contact.author}
+{'Email address'|@translate} : {$contact.email}
+
+====================
+{$contact.content}
+====================
+
+{'IP: %s'|@translate|@sprintf:$contact.ip}
+{'Browser: %s'|@translate|@sprintf:$contact.agent}
+
+--------------------
+{'Sent by'|@translate} "{$GALLERY_TITLE}" {$GALLERY_URL}
+{'Powered by'|@translate} Piwigo {$VERSION} - Contact Form
Index: /extensions/ContactForm/template/mail/index.php
===================================================================
--- /extensions/ContactForm/template/mail/index.php	(revision 17483)
+++ /extensions/ContactForm/template/mail/index.php	(revision 17483)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/ContactForm/template/mail/style.css
===================================================================
--- /extensions/ContactForm/template/mail/style.css	(revision 17483)
+++ /extensions/ContactForm/template/mail/style.css	(revision 17483)
@@ -0,0 +1,48 @@
+body {
+  margin:0px; 
+  padding:0px;
+  font-family: Univers, Helvetica, Optima; 
+  font-size:12px;
+  text-align:left;
+  background:#111;
+  color:#aaa;
+}
+
+a {
+  color:#CE2E5A;
+}
+ 
+#the_page {
+  width:600px;
+  margin:10px auto; 
+  padding:0px; 
+}
+
+#the_header {
+  background:#222;
+  border-top:5px solid #CE2E5A;
+  border-bottom:1px solid #111;
+  font-size:16px;
+  padding:10px;
+}
+
+#the_content {
+  background:#333;
+  border-top:1px solid #555;
+  border-bottom:1px solid #111;
+  padding:10px;
+}
+
+#the_footer {
+  background:#222;
+  border-top:1px solid #555;
+  border-bottom:2px solid #CE2E5A;
+  font-size:10px;
+  padding:5px;
+}
+
+blockquote {
+  border:1px solid #aaa;
+  margin:10px;
+  padding:10px;
+}
Index: /extensions/ContactForm/template/style.css
===================================================================
--- /extensions/ContactForm/template/style.css	(revision 17483)
+++ /extensions/ContactForm/template/style.css	(revision 17483)
@@ -0,0 +1,42 @@
+.contact {
+  width:540px;
+  margin:10px auto 10px auto;
+}
+  .contact table td {
+    padding-bottom:5px;
+    text-align:left;
+  }
+  .contact table td.title {
+    font-weight:bold;
+    text-align:right !important;
+    padding-top:3px;
+    vertical-align:top;
+    width:120px;
+  }
+  .filter label {
+    float:none;
+    margin-right:3px;
+  }
+  .contact input[type="text"], .contact textarea {
+    border-radius:2px;
+    padding:3px;
+  }
+
+.LV_validation_message{
+  display:block;
+  font-weight:bold;
+  margin:0 0 0 5px;
+}
+.LV_valid {
+   display:none;
+}
+.LV_invalid {
+  color:#cc0000;
+}
+.LV_invalid_field, 
+input.LV_invalid_field:hover, 
+input.LV_invalid_field:active,
+textarea.LV_invalid_field:hover, 
+textarea.LV_invalid_field:active {
+  border: 1px solid #cc0000;
+}
Index: /extensions/ContactForm/template/themes/default.tpl
===================================================================
--- /extensions/ContactForm/template/themes/default.tpl	(revision 17483)
+++ /extensions/ContactForm/template/themes/default.tpl	(revision 17483)
@@ -0,0 +1,13 @@
+{$MENUBAR}
+
+<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
+
+<div class="titrePage">
+  {if !empty($PLUGIN_INDEX_ACTIONS)}
+	<ul class="categoryActions">
+    {$PLUGIN_INDEX_ACTIONS}
+	</ul>
+  {/if}
+
+  <h2>{$TITLE}</h2>
+</div>
Index: /extensions/ContactForm/template/themes/index.php
===================================================================
--- /extensions/ContactForm/template/themes/index.php	(revision 17483)
+++ /extensions/ContactForm/template/themes/index.php	(revision 17483)
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/ContactForm/template/themes/simple.tpl
===================================================================
--- /extensions/ContactForm/template/themes/simple.tpl	(revision 17483)
+++ /extensions/ContactForm/template/themes/simple.tpl	(revision 17483)
@@ -0,0 +1,13 @@
+<div class="titrePage">
+  <span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span> »
+  <h2>{$TITLE}</h2>
+  
+  {if !empty($PLUGIN_INDEX_ACTIONS)}
+  <ul class="categoryActions">
+    {$PLUGIN_INDEX_ACTIONS}
+  </ul>
+  {/if}
+</div>
+
+<div id="content">
+{$MENUBAR}
Index: /extensions/ContactForm/template/themes/stripped.tpl
===================================================================
--- /extensions/ContactForm/template/themes/stripped.tpl	(revision 17483)
+++ /extensions/ContactForm/template/themes/stripped.tpl	(revision 17483)
@@ -0,0 +1,17 @@
+<div class="titrePage">
+	<div class="browsePath">
+		<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+		<h2>{$TITLE}</h2>
+	</div>
+  
+	{if !empty($PLUGIN_INDEX_ACTIONS)}
+		<div class="categoryActionsContainer">
+			<ul class="categoryActions group1">
+				{$PLUGIN_INDEX_ACTIONS}
+			</ul>
+		</div>
+	{/if}
+</div>
+
+<div id="content" {if !$stripped.hideMenu}class="menuShown"{/if}>
+{$MENUBAR}
