aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/advanced_feature.php234
-rw-r--r--admin/include/functions_history.inc.php108
-rw-r--r--admin/include/functions_notification_by_mail.inc.php1098
-rw-r--r--admin/include/functions_tabsheet.inc.php148
-rw-r--r--include/functions_filter.inc.php132
-rw-r--r--install/db/40-database.php88
-rw-r--r--install/db/41-database.php130
-rw-r--r--language/en_UK.iso-8859-1/help/advanced_feature.html32
-rw-r--r--language/en_UK.iso-8859-1/help/group_list.html42
-rw-r--r--language/en_UK.iso-8859-1/help/web_service.html94
-rw-r--r--language/fr_FR.iso-8859-1/help/advanced_feature.html32
-rw-r--r--language/fr_FR.iso-8859-1/help/group_list.html40
-rw-r--r--language/fr_FR.iso-8859-1/help/web_service.html96
-rw-r--r--plugins/add_index/admin/main_page.tpl28
-rw-r--r--plugins/add_index/index.php70
-rw-r--r--plugins/add_index/language/en_UK.iso-8859-1/help/advanced_feature.html14
-rw-r--r--plugins/add_index/language/en_UK.iso-8859-1/help/site_manager.html14
-rw-r--r--plugins/add_index/language/en_UK.iso-8859-1/plugin.lang.php88
-rw-r--r--plugins/add_index/language/fr_FR.iso-8859-1/help/advanced_feature.html14
-rw-r--r--plugins/add_index/language/fr_FR.iso-8859-1/help/site_manager.html14
-rw-r--r--plugins/add_index/language/fr_FR.iso-8859-1/plugin.lang.php88
-rw-r--r--plugins/add_index/language/index.php70
-rw-r--r--plugins/add_index/main.admin.inc.php198
-rw-r--r--plugins/add_index/main.base.inc.php86
-rw-r--r--plugins/add_index/main.inc.php110
-rw-r--r--plugins/add_index/main.normal.inc.php128
-rw-r--r--plugins/admin_advices/admin_advices.tpl64
-rw-r--r--plugins/admin_advices/default-layout.css38
-rw-r--r--plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php888
-rw-r--r--plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php958
-rw-r--r--plugins/admin_advices/main.inc.php238
-rw-r--r--template-common/csshover.htc238
-rw-r--r--template-common/default-layout.css102
-rw-r--r--template/yoga/admin/advanced_feature.tpl30
-rw-r--r--template/yoga/admin/default-layout.css354
-rw-r--r--template/yoga/admin/tabsheet.tpl12
-rw-r--r--template/yoga/admin/ws_checker.tpl458
-rw-r--r--template/yoga/fix-ie7.css64
-rw-r--r--template/yoga/fix-khtml.css2
-rw-r--r--template/yoga/mail/text/html/admin/notification_by_mail.tpl106
-rw-r--r--template/yoga/mail/text/html/footer.tpl38
-rw-r--r--template/yoga/mail/text/html/global-mail-css.tpl36
-rw-r--r--template/yoga/mail/text/html/header.tpl36
-rw-r--r--template/yoga/mail/text/plain/admin/notification_by_mail.tpl86
-rw-r--r--template/yoga/mail/text/plain/footer.tpl6
-rw-r--r--template/yoga/mail/text/plain/header.tpl6
-rw-r--r--template/yoga/not-ie.css48
-rw-r--r--template/yoga/slideshow.tpl36
-rw-r--r--template/yoga/theme/clear/mail-css.tpl28
-rw-r--r--template/yoga/theme/dark/mail-css.tpl28
-rw-r--r--template/yoga/theme/p0w0/mail-css.tpl26
-rw-r--r--template/yoga/theme/wipi/mail-css.tpl40
-rw-r--r--template/yoga/theme/wipi/theme.css700
-rw-r--r--template/yoga/theme/wipi/themeconf.inc.php32
54 files changed, 3947 insertions, 3947 deletions
diff --git a/admin/advanced_feature.php b/admin/advanced_feature.php
index b1614b488..b4a436ca0 100644
--- a/admin/advanced_feature.php
+++ b/admin/advanced_feature.php
@@ -1,117 +1,117 @@
-<?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 |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2006-04-21 23:16:37 +0200 (ven., 21 avr. 2006) $
-// | last modifier : $Author: nikrou $
-// | revision : $Revision: 1250 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-if (!defined('PHPWG_ROOT_PATH'))
-{
- die ("Hacking attempt!");
-}
-
-// +-----------------------------------------------------------------------+
-// | Check Access and exit when user status is not ok |
-// +-----------------------------------------------------------------------+
-check_status(ACCESS_ADMINISTRATOR);
-
-// +-----------------------------------------------------------------------+
-// | Actions |
-// +-----------------------------------------------------------------------+
-
-/*$action = (isset($_GET['action']) and !is_adviser()) ? $_GET['action'] : '';
-
-switch ($action)
-{
- case '???' :
- {
- break;
- }
- default :
- {
- break;
- }
-}*/
-
-// +-----------------------------------------------------------------------+
-// | Define advanced features |
-// +-----------------------------------------------------------------------+
-
-$advanced_features = array();
-
-// Add advanced features
-/*array_push($advanced_features,
- array
- (
- 'CAPTION' => l10n('???'),
- 'URL' => $start_url.'???'
- ));*/
-
-array_push($advanced_features,
- array
- (
- 'CAPTION' => l10n('Elements_not_linked'),
- 'URL' => get_root_url().'admin.php?page=element_set&amp;cat=not_linked'
- ));
-
-array_push($advanced_features,
- array
- (
- 'CAPTION' => l10n('Duplicates'),
- 'URL' => get_root_url().'admin.php?page=element_set&amp;cat=duplicates'
- ));
-
-//$advanced_features is array of array composed of CAPTION & URL
-$advanced_features =
- trigger_event('get_admin_advanced_features_links', $advanced_features);
-
-// +-----------------------------------------------------------------------+
-// | Template init |
-// +-----------------------------------------------------------------------+
-
-$template->set_filenames(array('advanced_feature'=>'admin/advanced_feature.tpl'));
-
-$start_url = get_root_url().'admin.php?page=advanced_feature&amp;action=';
-
-$template->assign_vars(
- array
- (
- 'U_HELP' => get_root_url().'popuphelp.php?page=advanced_feature'
- ));
-
-// advanced_features
-if (count($advanced_features) > 0)
-{
- foreach ($advanced_features as $advanced_feature)
- {
- $template->assign_block_vars('advanced_features.advanced_feature', $advanced_feature);
- }
-}
-
-// +-----------------------------------------------------------------------+
-// | Sending html code |
-// +-----------------------------------------------------------------------+
-
-$template->assign_var_from_handle('ADMIN_CONTENT', 'advanced_feature');
-
-?>
+<?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 |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-04-21 23:16:37 +0200 (ven., 21 avr. 2006) $
+// | last modifier : $Author: nikrou $
+// | revision : $Revision: 1250 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+ die ("Hacking attempt!");
+}
+
+// +-----------------------------------------------------------------------+
+// | Check Access and exit when user status is not ok |
+// +-----------------------------------------------------------------------+
+check_status(ACCESS_ADMINISTRATOR);
+
+// +-----------------------------------------------------------------------+
+// | Actions |
+// +-----------------------------------------------------------------------+
+
+/*$action = (isset($_GET['action']) and !is_adviser()) ? $_GET['action'] : '';
+
+switch ($action)
+{
+ case '???' :
+ {
+ break;
+ }
+ default :
+ {
+ break;
+ }
+}*/
+
+// +-----------------------------------------------------------------------+
+// | Define advanced features |
+// +-----------------------------------------------------------------------+
+
+$advanced_features = array();
+
+// Add advanced features
+/*array_push($advanced_features,
+ array
+ (
+ 'CAPTION' => l10n('???'),
+ 'URL' => $start_url.'???'
+ ));*/
+
+array_push($advanced_features,
+ array
+ (
+ 'CAPTION' => l10n('Elements_not_linked'),
+ 'URL' => get_root_url().'admin.php?page=element_set&amp;cat=not_linked'
+ ));
+
+array_push($advanced_features,
+ array
+ (
+ 'CAPTION' => l10n('Duplicates'),
+ 'URL' => get_root_url().'admin.php?page=element_set&amp;cat=duplicates'
+ ));
+
+//$advanced_features is array of array composed of CAPTION & URL
+$advanced_features =
+ trigger_event('get_admin_advanced_features_links', $advanced_features);
+
+// +-----------------------------------------------------------------------+
+// | Template init |
+// +-----------------------------------------------------------------------+
+
+$template->set_filenames(array('advanced_feature'=>'admin/advanced_feature.tpl'));
+
+$start_url = get_root_url().'admin.php?page=advanced_feature&amp;action=';
+
+$template->assign_vars(
+ array
+ (
+ 'U_HELP' => get_root_url().'popuphelp.php?page=advanced_feature'
+ ));
+
+// advanced_features
+if (count($advanced_features) > 0)
+{
+ foreach ($advanced_features as $advanced_feature)
+ {
+ $template->assign_block_vars('advanced_features.advanced_feature', $advanced_feature);
+ }
+}
+
+// +-----------------------------------------------------------------------+
+// | Sending html code |
+// +-----------------------------------------------------------------------+
+
+$template->assign_var_from_handle('ADMIN_CONTENT', 'advanced_feature');
+
+?>
diff --git a/admin/include/functions_history.inc.php b/admin/include/functions_history.inc.php
index 1bdd96992..9504afab4 100644
--- a/admin/include/functions_history.inc.php
+++ b/admin/include/functions_history.inc.php
@@ -1,54 +1,54 @@
-<?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 |
-// +-----------------------------------------------------------------------+
-// | file : $Id: functions_history.inc.php 1874 2007-03-06 02:07:15Z rub $
-// | last update : $Date: 2007-03-06 03:07:15 +0100 (mar., 06 mars 2007) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1874 $
-// +-----------------------------------------------------------------------+
-// | 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. |
-// +-----------------------------------------------------------------------+
-
-include_once(PHPWG_ROOT_PATH.'admin/include/functions_tabsheet.inc.php');
-
-function history_tabsheet()
-{
- global $page, $link_start;
-
- // TabSheet initialization
- $page['tabsheet'] = array
- (
- 'stats' => array
- (
- 'caption' => l10n('Statistics'),
- 'url' => $link_start.'stats'
- ),
- 'history' => array
- (
- 'caption' => l10n('Search'),
- 'url' => $link_start.'history'
- )
- );
-
- $page['tabsheet'][$page['page']]['selected'] = true;
-
- // Assign tabsheet to template
- template_assign_tabsheet();
-}
-
-?>
+<?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 |
+// +-----------------------------------------------------------------------+
+// | file : $Id: functions_history.inc.php 1874 2007-03-06 02:07:15Z rub $
+// | last update : $Date: 2007-03-06 03:07:15 +0100 (mar., 06 mars 2007) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1874 $
+// +-----------------------------------------------------------------------+
+// | 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. |
+// +-----------------------------------------------------------------------+
+
+include_once(PHPWG_ROOT_PATH.'admin/include/functions_tabsheet.inc.php');
+
+function history_tabsheet()
+{
+ global $page, $link_start;
+
+ // TabSheet initialization
+ $page['tabsheet'] = array
+ (
+ 'stats' => array
+ (
+ 'caption' => l10n('Statistics'),
+ 'url' => $link_start.'stats'
+ ),
+ 'history' => array
+ (
+ 'caption' => l10n('Search'),
+ 'url' => $link_start.'history'
+ )
+ );
+
+ $page['tabsheet'][$page['page']]['selected'] = true;
+
+ // Assign tabsheet to template
+ template_assign_tabsheet();
+}
+
+?>
diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php
index a3e57639e..8af31caef 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -1,549 +1,549 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
-// | Copyright (C) 2006-2007 Ruben ARNAUD - team@phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | file : $Id$
-// | last update : $Date: 2006-03-23 02:49:04 +0100 (jeu., 23 mars 2006) $
-// | last modifier : $Author: rvelices $
-// | revision : $Revision: 1094 $
-// +-----------------------------------------------------------------------+
-// | 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. |
-// +-----------------------------------------------------------------------+
-
-/* nbm_global_var */
-$env_nbm = array
- (
- 'start_time' => get_moment(),
- 'sendmail_timeout' => (intval(ini_get('max_execution_time')) * $conf['nbm_max_treatment_timeout_percent']),
- 'is_sendmail_timeout' => false
- );
-
-if
- (
- (!isset($env_nbm['sendmail_timeout'])) or
- (!is_numeric($env_nbm['sendmail_timeout'])) or
- ($env_nbm['sendmail_timeout'] <= 0)
- )
-{
- $env_nbm['sendmail_timeout'] = $conf['nbm_treatment_timeout_default'];
-}
-
-/*
- * Search an available check_key
- *
- * It's a copy of function find_available_feed_id
- *
- * @return string nbm identifier
- */
-function find_available_check_key()
-{
- while (true)
- {
- $key = generate_key(16);
- $query = '
-select
- count(*)
-from
- '.USER_MAIL_NOTIFICATION_TABLE.'
-where
- check_key = \''.$key.'\';';
-
- list($count) = mysql_fetch_row(pwg_query($query));
- if ($count == 0)
- {
- return $key;
- }
- }
-}
-
-/*
- * Check sendmail timeout state
- *
- * @return true, if it's timeout
- */
-function check_sendmail_timeout()
-{
- global $env_nbm;
-
- $env_nbm['is_sendmail_timeout'] = ((get_moment() - $env_nbm['start_time']) > $env_nbm['sendmail_timeout']);
-
- return $env_nbm['is_sendmail_timeout'];
-}
-
-
-/*
- * Add quote to all elements of check_key_list
- *
- * @return quoted check key list
- */
-function quote_check_key_list($check_key_list = array())
-{
- return array_map(create_function('$s', 'return \'\\\'\'.$s.\'\\\'\';'), $check_key_list);
-}
-
-/*
- * Execute all main queries to get list of user
- *
- * Type are the type of list 'subscribe', 'send'
- *
- * return array of users
- */
-function get_user_notifications($action, $check_key_list = array(), $enabled_filter_value = '')
-{
- global $conf;
-
- $data_users = array();
-
- if (in_array($action, array('subscribe', 'send')))
- {
- $quoted_check_key_list = quote_check_key_list($check_key_list);
- if (count($quoted_check_key_list) != 0 )
- {
- $query_and_check_key = ' and
- check_key in ('.implode(",", $quoted_check_key_list).') ';
- }
- else
- {
- $query_and_check_key = '';
- }
-
- $query = '
-select
- N.user_id,
- N.check_key,
- U.'.$conf['user_fields']['username'].' as username,
- U.'.$conf['user_fields']['email'].' as mail_address,
- N.enabled,
- N.last_send
-from
- '.USER_MAIL_NOTIFICATION_TABLE.' as N,
- '.USERS_TABLE.' as U
-where
- N.user_id = U.'.$conf['user_fields']['id'];
-
- if ($action == 'send')
- {
- // No mail empty and all users enabled
- $query .= ' and
- N.enabled = \'true\' and
- U.'.$conf['user_fields']['email'].' is not null';
- }
-
- $query .= $query_and_check_key;
-
- if (isset($enabled_filter_value) and ($enabled_filter_value != ''))
- {
- $query .= ' and
- N.enabled = \''.boolean_to_string($enabled_filter_value).'\'';
- }
-
- $query .= '
-order by';
-
- if ($action == 'send')
- {
- $query .= '
- last_send, username;';
- }
- else
- {
- $query .= '
- username;';
- }
-
- $query .= ';';
-
- $result = pwg_query($query);
- if (!empty($result))
- {
- while ($nbm_user = mysql_fetch_array($result))
- {
- array_push($data_users, $nbm_user);
- }
- }
- }
- return $data_users;
-}
-
-/*
- * Begin of use nbm environment
- * Prepare and save current environment and initialize data in order to send mail
- *
- * Return none
- */
-function begin_users_env_nbm($is_to_send_mail = false)
-{
- global $user, $lang, $lang_info, $conf, $env_nbm;
-
- // Save $user, $lang_info and $lang arrays (include/user.inc.php has been executed)
- $env_nbm['save_user'] = $user;
- $env_nbm['save_lang_info'] = $lang_info;
- $env_nbm['save_lang'] = $lang;
- // Last Language
- $env_nbm['last_language'] = $user['language'];
-
- $env_nbm['is_to_send_mail'] = $is_to_send_mail;
-
- if ($is_to_send_mail)
- {
- // Init mail configuration
- $env_nbm['email_format'] = get_str_email_format($conf['nbm_send_html_mail']);
- $env_nbm['send_as_name'] = ((isset($conf['nbm_send_mail_as']) and !empty($conf['nbm_send_mail_as'])) ? $conf['nbm_send_mail_as'] : $conf['gallery_title']);
- $env_nbm['send_as_mail_address'] = get_webmaster_mail_address();
- $env_nbm['send_as_mail_formated'] = format_email($env_nbm['send_as_name'], $env_nbm['send_as_mail_address']);
- // Init mail counter
- $env_nbm['error_on_mail_count'] = 0;
- $env_nbm['sent_mail_count'] = 0;
- // Save sendmail message info and error in the original language
- $env_nbm['msg_info'] = l10n('nbm_msg_mail_sent_to');
- $env_nbm['msg_error'] = l10n('nbm_msg_error_sending_email_to');
- }
-}
-
-/*
- * End of use nbm environment
- * Restore environment
- *
- * Return none
- */
-function end_users_env_nbm()
-{
- global $user, $lang, $lang_info, $env_nbm;
-
- // Restore $user, $lang_info and $lang arrays (include/user.inc.php has been executed)
- $user = $env_nbm['save_user'];
- $lang_info = $env_nbm['save_lang_info'];
- $lang = $env_nbm['save_lang'];
-
- if ($env_nbm['is_to_send_mail'])
- {
- unset($env_nbm['email_format']);
- unset($env_nbm['send_as_name']);
- unset($env_nbm['send_as_mail_address']);
- unset($env_nbm['send_as_mail_formated']);
- // Don t unset counter
- //unset($env_nbm['error_on_mail_count']);
- //unset($env_nbm['sent_mail_count']);
- unset($env_nbm['msg_info']);
- unset($env_nbm['msg_error']);
- }
-
- unset($env_nbm['save_user']);
- unset($env_nbm['save_lang_info']);
- unset($env_nbm['save_lang']);
- unset($env_nbm['last_language']);
- unset($env_nbm['is_to_send_mail']);
-
-}
-
-/*
- * Set user on nbm enviromnent
- *
- * Return none
- */
-function set_user_on_env_nbm(&$nbm_user, $is_action_send)
-{
- global $user, $lang, $lang_info, $env_nbm;
-
- $user = build_user( $nbm_user['user_id'], true );
-
- if ($env_nbm['last_language'] != $user['language'])
- {
- $env_nbm['last_language'] = $user['language'];
-
- // Re-Init language arrays
- $lang_info = array();
- $lang = array();
-
- // language files
- include(get_language_filepath('common.lang.php'));
- // No test admin because script is checked admin (user selected no)
- // Translations are in admin file too
- include(get_language_filepath('admin.lang.php'));
- trigger_action('loading_lang');
- @include(get_language_filepath('local.lang.php'));
- }
-
- if ($is_action_send)
- {
- $nbm_user['template'] = $user['template'];
- $nbm_user['theme'] = $user['theme'];
- $env_nbm['mail_template'] =
- get_mail_template($env_nbm['email_format'],
- array('template' => $nbm_user['template'], 'theme' => $nbm_user['theme']));
- $env_nbm['mail_template']->set_filename('notification_by_mail', 'admin/notification_by_mail.tpl');
- }
-}
-
-/*
- * Unset user on nbm enviromnent
- *
- * Return none
- */
-function unset_user_on_env_nbm()
-{
- global $env_nbm;
-
- unset($env_nbm['mail_template']);
-}
-
-/*
- * Inc Counter success
- *
- * Return none
- */
-function inc_mail_sent_success($nbm_user)
-{
- global $page, $env_nbm;
-
- $env_nbm['sent_mail_count'] += 1;
- array_push($page['infos'], sprintf($env_nbm['msg_info'], $nbm_user['username'], $nbm_user['mail_address']));
-}
-
-/*
- * Inc Counter failed
- *
- * Return none
- */
-function inc_mail_sent_failed($nbm_user)
-{
- global $page, $env_nbm;
-
- $env_nbm['error_on_mail_count'] += 1;
- array_push($page['errors'], sprintf($env_nbm['msg_error'], $nbm_user['username'], $nbm_user['mail_address']));
-}
-
-/*
- * Display Counter Info
- *
- * Return none
- */
-function display_counter_info()
-{
- global $page, $env_nbm;
-
- if ($env_nbm['error_on_mail_count'] != 0)
- {
- array_push($page['errors'], l10n_dec('nbm_msg_n_mail_not_send', 'nbm_msg_n_mails_not_send', $env_nbm['error_on_mail_count']));
- if ($env_nbm['sent_mail_count'] != 0)
- array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count']));
- }
- else
- {
- if ($env_nbm['sent_mail_count'] == 0)
- array_push($page['infos'], l10n('nbm_no_mail_to_send'));
- else
- array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count']));
- }
-}
-
-function assign_vars_nbm_mail_content($nbm_user)
-{
- global $env_nbm;
-
- set_make_full_url();
-
- $env_nbm['mail_template']->assign_vars
- (
- array
- (
- 'USERNAME' => $nbm_user['username'],
-
- 'SEND_AS_NAME' => $env_nbm['send_as_name'],
-
- 'UNSUBSCRIBE_LINK' => add_url_params(get_root_url().'nbm.php', array('unsubscribe' => $nbm_user['check_key'])),
- 'SUBSCRIBE_LINK' => add_url_params(get_root_url().'nbm.php', array('subscribe' => $nbm_user['check_key'])),
- 'CONTACT_EMAIL' => $env_nbm['send_as_mail_address']
- )
- );
-
- unset_make_full_url();
-}
-
-/*
- * Subscribe or unsubscribe notification by mail
- *
- * is_subscribe define if action=subscribe or unsubscribe
- * check_key list where action will be done
- *
- * @return check_key list treated
- */
-function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_subscribe = false, $check_key_list = array())
-{
- global $conf, $page, $env_nbm, $conf;
-
- $check_key_treated = array();
- $updated_data_count = 0;
- $error_on_updated_data_count = 0;
-
- if ($is_subscribe)
- {
- $msg_info = l10n('nbm_user_change_enabled_true');
- $msg_error = l10n('nbm_user_not_change_enabled_true');
- }
- else
- {
- $msg_info = l10n('nbm_user_change_enabled_false');
- $msg_error = l10n('nbm_user_not_change_enabled_false');
- }
-
- if (count($check_key_list) != 0)
- {
- $updates = array();
- $enabled_value = boolean_to_string($is_subscribe);
- $data_users = get_user_notifications('subscribe', $check_key_list, !$is_subscribe);
-
- // Prepare message after change language
- $msg_break_timeout = l10n('nbm_break_timeout_send_mail');
-
- // Begin nbm users environment
- begin_users_env_nbm(true);
-
- foreach ($data_users as $nbm_user)
- {
- if (check_sendmail_timeout())
- {
- // Stop fill list on 'send', if the quota is override
- array_push($page['errors'], $msg_break_timeout);
- break;
- }
-
- // Fill return list
- array_push($check_key_treated, $nbm_user['check_key']);
-
- $do_update = true;
- if ($nbm_user['mail_address'] != '')
- {
- // set env nbm user
- set_user_on_env_nbm($nbm_user, true);
-
- $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('nbm_object_subscribe'): l10n('nbm_object_unsubscribe'));
-
- // Assign current var for nbm mail
- assign_vars_nbm_mail_content($nbm_user);
-
- $section_action_by = ($is_subscribe ? 'subscribe_by_' : 'unsubscribe_by_');
- $section_action_by .= ($is_admin_request ? 'admin' : 'himself');
- $env_nbm['mail_template']->assign_block_vars
- (
- $section_action_by, array('DUMMY' => 'dummy')
- );
-
- if (pwg_mail
- (
- format_email($nbm_user['username'], $nbm_user['mail_address']),
- array
- (
- 'from' => $env_nbm['send_as_mail_formated'],
- 'subject' => $subject,
- 'email_format' => $env_nbm['email_format'],
- 'content' => $env_nbm['mail_template']->parse('notification_by_mail', true),
- 'content_format' => $env_nbm['email_format'],
- 'template' => $nbm_user['template'],
- 'theme' => $nbm_user['theme']
- )
- ))
- {
- inc_mail_sent_success($nbm_user);
- }
- else
- {
- inc_mail_sent_failed($nbm_user);
- $do_update = false;
- }
-
- // unset env nbm user
- unset_user_on_env_nbm();
-
- }
-
- if ($do_update)
- {
- array_push
- (
- $updates,
- array
- (
- 'check_key' => $nbm_user['check_key'],
- 'enabled' => $enabled_value
- )
- );
- $updated_data_count += 1;
- array_push($page['infos'], sprintf($msg_info, $nbm_user['username'], $nbm_user['mail_address']));
- }
- else
- {
- $error_on_updated_data_count += 1;
- array_push($page['errors'], sprintf($msg_error, $nbm_user['username'], $nbm_user['mail_address']));
- }
-
- }
-
- // Restore nbm environment
- end_users_env_nbm();
-
- display_counter_info();
-
- mass_updates(
- USER_MAIL_NOTIFICATION_TABLE,
- array(
- 'primary' => array('check_key'),
- 'update' => array('enabled')
- ),
- $updates
- );
-
- }
-
- array_push($page['infos'], l10n_dec('nbm_user_change_enabled_updated_data_count', 'nbm_users_change_enabled_updated_data_count', $updated_data_count));
- if ($error_on_updated_data_count != 0)
- {
- array_push($page['errors'],
- l10n_dec('nbm_user_change_enabled_error_on_updated_data_count',
- 'nbm_users_change_enabled_error_on_updated_data_count',
- $error_on_updated_data_count));
- }
-
- return $check_key_treated;
-}
-
-/*
- * Unsubscribe notification by mail
- *
- * check_key list where action will be done
- *
- * @return check_key list treated
- */
-function unsubscribe_notification_by_mail($is_admin_request, $check_key_list = array())
-{
- return do_subscribe_unsubscribe_notification_by_mail($is_admin_request, false, $check_key_list);
-}
-
-/*
- * Subscribe notification by mail
- *
- * check_key list where action will be done
- *
- * @return check_key list treated
- */
-function subscribe_notification_by_mail($is_admin_request, $check_key_list = array())
-{
- return do_subscribe_unsubscribe_notification_by_mail($is_admin_request, true, $check_key_list);
-}
-
-?>
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2006-2007 Ruben ARNAUD - team@phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | file : $Id$
+// | last update : $Date: 2006-03-23 02:49:04 +0100 (jeu., 23 mars 2006) $
+// | last modifier : $Author: rvelices $
+// | revision : $Revision: 1094 $
+// +-----------------------------------------------------------------------+
+// | 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. |
+// +-----------------------------------------------------------------------+
+
+/* nbm_global_var */
+$env_nbm = array
+ (
+ 'start_time' => get_moment(),
+ 'sendmail_timeout' => (intval(ini_get('max_execution_time')) * $conf['nbm_max_treatment_timeout_percent']),
+ 'is_sendmail_timeout' => false
+ );
+
+if
+ (
+ (!isset($env_nbm['sendmail_timeout'])) or
+ (!is_numeric($env_nbm['sendmail_timeout'])) or
+ ($env_nbm['sendmail_timeout'] <= 0)
+ )
+{
+ $env_nbm['sendmail_timeout'] = $conf['nbm_treatment_timeout_default'];
+}
+
+/*
+ * Search an available check_key
+ *
+ * It's a copy of function find_available_feed_id
+ *
+ * @return string nbm identifier
+ */
+function find_available_check_key()
+{
+ while (true)
+ {
+ $key = generate_key(16);
+ $query = '
+select
+ count(*)
+from
+ '.USER_MAIL_NOTIFICATION_TABLE.'
+where
+ check_key = \''.$key.'\';';
+
+ list($count) = mysql_fetch_row(pwg_query($query));
+ if ($count == 0)
+ {
+ return $key;
+ }
+ }
+}
+
+/*
+ * Check sendmail timeout state
+ *
+ * @return true, if it's timeout
+ */
+function check_sendmail_timeout()
+{
+ global $env_nbm;
+
+ $env_nbm['is_sendmail_timeout'] = ((get_moment() - $env_nbm['start_time']) > $env_nbm['sendmail_timeout']);
+
+ return $env_nbm['is_sendmail_timeout'];
+}
+
+
+/*
+ * Add quote to all elements of check_key_list
+ *
+ * @return quoted check key list
+ */
+function quote_check_key_list($check_key_list = array())
+{
+ return array_map(create_function('$s', 'return \'\\\'\'.$s.\'\\\'\';'), $check_key_list);
+}
+
+/*
+ * Execute all main queries to get list of user
+ *
+ * Type are the type of list 'subscribe', 'send'
+ *
+ * return array of users
+ */
+function get_user_notifications($action, $check_key_list = array(), $enabled_filter_value = '')
+{
+ global $conf;
+
+ $data_users = array();
+
+ if (in_array($action, array('subscribe', 'send')))
+ {
+ $quoted_check_key_list = quote_check_key_list($check_key_list);
+ if (count($quoted_check_key_list) != 0 )
+ {
+ $query_and_check_key = ' and
+ check_key in ('.implode(",", $quoted_check_key_list).') ';
+ }
+ else
+ {
+ $query_and_check_key = '';
+ }
+
+ $query = '
+select
+ N.user_id,
+ N.check_key,
+ U.'.$conf['user_fields']['username'].' as username,
+ U.'.$conf['user_fields']['email'].' as mail_address,
+ N.enabled,
+ N.last_send
+from
+ '.USER_MAIL_NOTIFICATION_TABLE.' as N,
+ '.USERS_TABLE.' as U
+where
+ N.user_id = U.'.$conf['user_fields']['id'];
+
+ if ($action == 'send')
+ {
+ // No mail empty and all users enabled
+ $query .= ' and
+ N.enabled = \'true\' and
+ U.'.$conf['user_fields']['email'].' is not null';
+ }
+
+ $query .= $query_and_check_key;
+
+ if (isset($enabled_filter_value) and ($enabled_filter_value != ''))
+ {
+ $query .= ' and
+ N.enabled = \''.boolean_to_string($enabled_filter_value).'\'';
+ }
+
+ $query .= '
+order by';
+
+ if ($action == 'send')
+ {
+ $query .= '
+ last_send, username;';
+ }
+ else
+ {
+ $query .= '
+ username;';
+ }
+
+ $query .= ';';
+
+ $result = pwg_query($query);
+ if (!empty($result))
+ {
+ while ($nbm_user = mysql_fetch_array($result))
+ {
+ array_push($data_users, $nbm_user);
+ }
+ }
+ }
+ return $data_users;
+}
+
+/*
+ * Begin of use nbm environment
+ * Prepare and save current environment and initialize data in order to send mail
+ *
+ * Return none
+ */
+function begin_users_env_nbm($is_to_send_mail = false)
+{
+ global $user, $lang, $lang_info, $conf, $env_nbm;
+
+ // Save $user, $lang_info and $lang arrays (include/user.inc.php has been executed)
+ $env_nbm['save_user'] = $user;
+ $env_nbm['save_lang_info'] = $lang_info;
+ $env_nbm['save_lang'] = $lang;
+ // Last Language
+ $env_nbm['last_language'] = $user['language'];
+
+ $env_nbm['is_to_send_mail'] = $is_to_send_mail;
+
+ if ($is_to_send_mail)
+ {
+ // Init mail configuration
+ $env_nbm['email_format'] = get_str_email_format($conf['nbm_send_html_mail']);
+ $env_nbm['send_as_name'] = ((isset($conf['nbm_send_mail_as']) and !empty($conf['nbm_send_mail_as'])) ? $conf['nbm_send_mail_as'] : $conf['gallery_title']);
+ $env_nbm['send_as_mail_address'] = get_webmaster_mail_address();
+ $env_nbm['send_as_mail_formated'] = format_email($env_nbm['send_as_name'], $env_nbm['send_as_mail_address']);
+ // Init mail counter
+ $env_nbm['error_on_mail_count'] = 0;
+ $env_nbm['sent_mail_count'] = 0;
+ // Save sendmail message info and error in the original language
+ $env_nbm['msg_info'] = l10n('nbm_msg_mail_sent_to');
+ $env_nbm['msg_error'] = l10n('nbm_msg_error_sending_email_to');
+ }
+}
+
+/*
+ * End of use nbm environment
+ * Restore environment
+ *
+ * Return none
+ */
+function end_users_env_nbm()
+{
+ global $user, $lang, $lang_info, $env_nbm;
+
+ // Restore $user, $lang_info and $lang arrays (include/user.inc.php has been executed)
+ $user = $env_nbm['save_user'];
+ $lang_info = $env_nbm['save_lang_info'];
+ $lang = $env_nbm['save_lang'];
+
+ if ($env_nbm['is_to_send_mail'])
+ {
+ unset($env_nbm['email_format']);
+ unset($env_nbm['send_as_name']);
+ unset($env_nbm['send_as_mail_address']);
+ unset($env_nbm['send_as_mail_formated']);
+ // Don t unset counter
+ //unset($env_nbm['error_on_mail_count']);
+ //unset($env_nbm['sent_mail_count']);
+ unset($env_nbm['msg_info']);
+ unset($env_nbm['msg_error']);
+ }
+
+ unset($env_nbm['save_user']);
+ unset($env_nbm['save_lang_info']);
+ unset($env_nbm['save_lang']);
+ unset($env_nbm['last_language']);
+ unset($env_nbm['is_to_send_mail']);
+
+}
+
+/*
+ * Set user on nbm enviromnent
+ *
+ * Return none
+ */
+function set_user_on_env_nbm(&$nbm_user, $is_action_send)
+{
+ global $user, $lang, $lang_info, $env_nbm;
+
+ $user = build_user( $nbm_user['user_id'], true );
+
+ if ($env_nbm['last_language'] != $user['language'])
+ {
+ $env_nbm['last_language'] = $user['language'];
+
+ // Re-Init language arrays
+ $lang_info = array();
+ $lang = array();
+
+ // language files
+ include(get_language_filepath('common.lang.php'));
+ // No test admin because script is checked admin (user selected no)
+ // Translations are in admin file too
+ include(get_language_filepath('admin.lang.php'));
+ trigger_action('loading_lang');
+ @include(get_language_filepath('local.lang.php'));
+ }
+
+ if ($is_action_send)
+ {
+ $nbm_user['template'] = $user['template'];
+ $nbm_user['theme'] = $user['theme'];
+ $env_nbm['mail_template'] =
+ get_mail_template($env_nbm['email_format'],
+ array('template' => $nbm_user['template'], 'theme' => $nbm_user['theme']));
+ $env_nbm['mail_template']->set_filename('notification_by_mail', 'admin/notification_by_mail.tpl');
+ }
+}
+
+/*
+ * Unset user on nbm enviromnent
+ *
+ * Return none
+ */
+function unset_user_on_env_nbm()
+{
+ global $env_nbm;
+
+ unset($env_nbm['mail_template']);
+}
+
+/*
+ * Inc Counter success
+ *
+ * Return none
+ */
+function inc_mail_sent_success($nbm_user)
+{
+ global $page, $env_nbm;
+
+ $env_nbm['sent_mail_count'] += 1;
+ array_push($page['infos'], sprintf($env_nbm['msg_info'], $nbm_user['username'], $nbm_user['mail_address']));
+}
+
+/*
+ * Inc Counter failed
+ *
+ * Return none
+ */
+function inc_mail_sent_failed($nbm_user)
+{
+ global $page, $env_nbm;
+
+ $env_nbm['error_on_mail_count'] += 1;
+ array_push($page['errors'], sprintf($env_nbm['msg_error'], $nbm_user['username'], $nbm_user['mail_address']));
+}
+
+/*
+ * Display Counter Info
+ *
+ * Return none
+ */
+function display_counter_info()
+{
+ global $page, $env_nbm;
+
+ if ($env_nbm['error_on_mail_count'] != 0)
+ {
+ array_push($page['errors'], l10n_dec('nbm_msg_n_mail_not_send', 'nbm_msg_n_mails_not_send', $env_nbm['error_on_mail_count']));
+ if ($env_nbm['sent_mail_count'] != 0)
+ array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count']));
+ }
+ else
+ {
+ if ($env_nbm['sent_mail_count'] == 0)
+ array_push($page['infos'], l10n('nbm_no_mail_to_send'));
+ else
+ array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count']));
+ }
+}
+
+function assign_vars_nbm_mail_content($nbm_user)
+{
+ global $env_nbm;
+
+ set_make_full_url();
+
+ $env_nbm['mail_template']->assign_vars
+ (
+ array
+ (
+ 'USERNAME' => $nbm_user['username'],
+
+ 'SEND_AS_NAME' => $env_nbm['send_as_name'],
+
+ 'UNSUBSCRIBE_LINK' => add_url_params(get_root_url().'nbm.php', array('unsubscribe' => $nbm_user['check_key'])),
+ 'SUBSCRIBE_LINK' => add_url_params(get_root_url().'nbm.php', array('subscribe' => $nbm_user['check_key'])),
+ 'CONTACT_EMAIL' => $env_nbm['send_as_mail_address']
+ )
+ );
+
+ unset_make_full_url();
+}
+
+/*
+ * Subscribe or unsubscribe notification by mail
+ *
+ * is_subscribe define if action=subscribe or unsubscribe
+ * check_key list where action will be done
+ *
+ * @return check_key list treated
+ */
+function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_subscribe = false, $check_key_list = array())
+{
+ global $conf, $page, $env_nbm, $conf;
+
+ $check_key_treated = array();
+ $updated_data_count = 0;
+ $error_on_updated_data_count = 0;
+
+ if ($is_subscribe)
+ {
+ $msg_info = l10n('nbm_user_change_enabled_true');
+ $msg_error = l10n('nbm_user_not_change_enabled_true');
+ }
+ else
+ {
+ $msg_info = l10n('nbm_user_change_enabled_false');
+ $msg_error = l10n('nbm_user_not_change_enabled_false');
+ }
+
+ if (count($check_key_list) != 0)
+ {
+ $updates = array();
+ $enabled_value = boolean_to_string($is_subscribe);
+ $data_users = get_user_notifications('subscribe', $check_key_list, !$is_subscribe);
+
+ // Prepare message after change language
+ $msg_break_timeout = l10n('nbm_break_timeout_send_mail');
+
+ // Begin nbm users environment
+ begin_users_env_nbm(true);
+
+ foreach ($data_users as $nbm_user)
+ {
+ if (check_sendmail_timeout())
+ {
+ // Stop fill list on 'send', if the quota is override
+ array_push($page['errors'], $msg_break_timeout);
+ break;
+ }
+
+ // Fill return list
+ array_push($check_key_treated, $nbm_user['check_key']);
+
+ $do_update = true;
+ if ($nbm_user['mail_address'] != '')
+ {
+ // set env nbm user
+ set_user_on_env_nbm($nbm_user, true);
+
+ $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('nbm_object_subscribe'): l10n('nbm_object_unsubscribe'));
+
+ // Assign current var for nbm mail
+ assign_vars_nbm_mail_content($nbm_user);
+
+ $section_action_by = ($is_subscribe ? 'subscribe_by_' : 'unsubscribe_by_');
+ $section_action_by .= ($is_admin_request ? 'admin' : 'himself');
+ $env_nbm['mail_template']->assign_block_vars
+ (
+ $section_action_by, array('DUMMY' => 'dummy')
+ );
+
+ if (pwg_mail
+ (
+ format_email($nbm_user['username'], $nbm_user['mail_address']),
+ array
+ (
+ 'from' => $env_nbm['send_as_mail_formated'],
+ 'subject' => $subject,
+ 'email_format' => $env_nbm['email_format'],
+ 'content' => $env_nbm['mail_template']->parse('notification_by_mail', true),
+ 'content_format' => $env_nbm['email_format'],
+ 'template' => $nbm_user['template'],
+ 'theme' => $nbm_user['theme']
+ )
+ ))
+ {
+ inc_mail_sent_success($nbm_user);
+ }
+ else
+ {
+ inc_mail_sent_failed($nbm_user);
+ $do_update = false;
+ }
+
+ // unset env nbm user
+ unset_user_on_env_nbm();
+
+ }
+
+ if ($do_update)
+ {
+ array_push
+ (
+ $updates,
+ array
+ (
+ 'check_key' => $nbm_user['check_key'],
+ 'enabled' => $enabled_value
+ )
+ );
+ $updated_data_count += 1;
+ array_push($page['infos'], sprintf($msg_info, $nbm_user['username'], $nbm_user['mail_address']));
+ }
+ else
+ {
+ $error_on_updated_data_count += 1;
+ array_push($page['errors'], sprintf($msg_error, $nbm_user['username'], $nbm_user['mail_address']));
+ }
+
+ }
+
+ // Restore nbm environment
+ end_users_env_nbm();
+
+ display_counter_info();
+
+ mass_updates(
+ USER_MAIL_NOTIFICATION_TABLE,
+ array(
+ 'primary' => array('check_key'),
+ 'update' => array('enabled')
+ ),
+ $updates
+ );
+
+ }
+
+ array_push($page['infos'], l10n_dec('nbm_user_change_enabled_updated_data_count', 'nbm_users_change_enabled_updated_data_count', $updated_data_count));
+ if ($error_on_updated_data_count != 0)
+ {
+ array_push($page['errors'],
+ l10n_dec('nbm_user_change_enabled_error_on_updated_data_count',
+ 'nbm_users_change_enabled_error_on_updated_data_count',
+ $error_on_updated_data_count));
+ }
+
+ return $check_key_treated;
+}
+
+/*
+ * Unsubscribe notification by mail
+ *
+ * check_key list where action will be done
+ *
+ * @return check_key list treated
+ */
+function unsubscribe_notification_by_mail($is_admin_request, $check_key_list = array())
+{
+ return do_subscribe_unsubscribe_notification_by_mail($is_admin_request, false, $check_key_list);
+}
+
+/*
+ * Subscribe notification by mail
+ *
+ * check_key list where action will be done
+ *
+ * @return check_key list treated
+ */
+function subscribe_notification_by_mail($is_admin_request, $check_key_list = array())
+{
+ return do_subscribe_unsubscribe_notification_by_mail($is_admin_request, true, $check_key_list);
+}
+
+?>
diff --git a/admin/include/functions_tabsheet.inc.php b/admin/include/functions_tabsheet.inc.php
index 9952769f3..1f7dbc0d9 100644
--- a/admin/include/functions_tabsheet.inc.php
+++ b/admin/include/functions_tabsheet.inc.php
@@ -1,74 +1,74 @@
-<?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 |
-// +-----------------------------------------------------------------------+
-// | file : $Id: functions_tabsheet.inc.php 1874 2007-03-06 02:07:15Z rub $
-// | last update : $Date: 2007-03-06 03:07:15 +0100 (mar., 06 mars 2007) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1874 $
-// +-----------------------------------------------------------------------+
-// | 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. |
-// +-----------------------------------------------------------------------+
-
-/*
- * Build TabSheet and assign this content to current page
- *
- * Uses $page['tabsheet'], it's an array of array
- *
- * $page['tabsheet'] description:
- * $page['tabsheet']'[url'] : Tab link
- * $page['tabsheet']['Caption'] : Tab caption
- * $page['tabsheet']['selected'] : Is the selected tab (default value false)
- *
- * Fill {TABSHEET} with HTML code for tabshette
- * Fill {U_TABSHEET_TITLE} with formated caption of the selected tab
- */
-
-function template_assign_tabsheet()
-{
- global $page, $template;
-
- if (count($page['tabsheet']) > 0)
- {
- $template->set_filename('tabsheet', 'admin/tabsheet.tpl');
-
- foreach ($page['tabsheet'] as $tab_name => $tab)
- {
- $is_selected = isset($tab['selected']) and $tab['selected'] === true;
- $template->assign_block_vars
- (
- 'tab',
- array
- (
- 'CLASSNAME' => ($is_selected ? 'selected_tab' : 'normal_tab'),
- 'URL' => $tab['url'],
- 'CAPTION' => $tab['caption']
- )
- );
-
- if ($is_selected)
- {
- $template->assign_vars(
- array('TABSHEET_TITLE' => '['.$tab['caption'].']'));
- }
- }
-
- $template->assign_var_from_handle('TABSHEET', 'tabsheet');
- }
-}
-
-?>
+<?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 |
+// +-----------------------------------------------------------------------+
+// | file : $Id: functions_tabsheet.inc.php 1874 2007-03-06 02:07:15Z rub $
+// | last update : $Date: 2007-03-06 03:07:15 +0100 (mar., 06 mars 2007) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1874 $
+// +-----------------------------------------------------------------------+
+// | 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. |
+// +-----------------------------------------------------------------------+
+
+/*
+ * Build TabSheet and assign this content to current page
+ *
+ * Uses $page['tabsheet'], it's an array of array
+ *
+ * $page['tabsheet'] description:
+ * $page['tabsheet']'[url'] : Tab link
+ * $page['tabsheet']['Caption'] : Tab caption
+ * $page['tabsheet']['selected'] : Is the selected tab (default value false)
+ *
+ * Fill {TABSHEET} with HTML code for tabshette
+ * Fill {U_TABSHEET_TITLE} with formated caption of the selected tab
+ */
+
+function template_assign_tabsheet()
+{
+ global $page, $template;
+
+ if (count($page['tabsheet']) > 0)
+ {
+ $template->set_filename('tabsheet', 'admin/tabsheet.tpl');
+
+ foreach ($page['tabsheet'] as $tab_name => $tab)
+ {
+ $is_selected = isset($tab['selected']) and $tab['selected'] === true;
+ $template->assign_block_vars
+ (
+ 'tab',
+ array
+ (
+ 'CLASSNAME' => ($is_selected ? 'selected_tab' : 'normal_tab'),
+ 'URL' => $tab['url'],
+ 'CAPTION' => $tab['caption']
+ )
+ );
+
+ if ($is_selected)
+ {
+ $template->assign_vars(
+ array('TABSHEET_TITLE' => '['.$tab['caption'].']'));
+ }
+ }
+
+ $template->assign_var_from_handle('TABSHEET', 'tabsheet');
+ }
+}
+
+?>
diff --git a/include/functions_filter.inc.php b/include/functions_filter.inc.php
index 12d8c051c..d2e3b5325 100644
--- a/include/functions_filter.inc.php
+++ b/include/functions_filter.inc.php
@@ -1,66 +1,66 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2006-2007 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $Id: functions_filter.inc.php 1651 2006-12-13 00:05:16Z rub $
-// | last update : $Date: 2006-12-13 01:05:16 +0100 (mer., 13 déc. 2006) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1651 $
-// +-----------------------------------------------------------------------+
-// | 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. |
-// +-----------------------------------------------------------------------+
-
-
-/**
- * Get a check key for filtered data
- * Check key are composed of elements witch force to compute data
- *
- * @param null
- * @return strinf check_key
- */
-function get_filter_check_key()
-{
- global $user, $filter;
-
- return $user['id'].$filter['recent_period'].date('Ymd');
-}
-
-/**
- * update data of categories with filtered values
- *
- * @param array list of categories
- * @return null
- */
-function update_cats_with_filtered_data(&$cats)
-{
- global $filter;
-
- if ($filter['enabled'])
- {
- $upd_fields = array('max_date_last', 'count_images', 'count_categories', 'nb_images');
-
- foreach ($cats as $cat_id => $category)
- {
- foreach ($upd_fields as $upd_field)
- {
- $cats[$cat_id][$upd_field] = $filter['categories'][$category['id']][$upd_field];
- }
- }
- }
-}
-
-?>
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2006-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $Id: functions_filter.inc.php 1651 2006-12-13 00:05:16Z rub $
+// | last update : $Date: 2006-12-13 01:05:16 +0100 (mer., 13 déc. 2006) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1651 $
+// +-----------------------------------------------------------------------+
+// | 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. |
+// +-----------------------------------------------------------------------+
+
+
+/**
+ * Get a check key for filtered data
+ * Check key are composed of elements witch force to compute data
+ *
+ * @param null
+ * @return strinf check_key
+ */
+function get_filter_check_key()
+{
+ global $user, $filter;
+
+ return $user['id'].$filter['recent_period'].date('Ymd');
+}
+
+/**
+ * update data of categories with filtered values
+ *
+ * @param array list of categories
+ * @return null
+ */
+function update_cats_with_filtered_data(&$cats)
+{
+ global $filter;
+
+ if ($filter['enabled'])
+ {
+ $upd_fields = array('max_date_last', 'count_images', 'count_categories', 'nb_images');
+
+ foreach ($cats as $cat_id => $category)
+ {
+ foreach ($upd_fields as $upd_field)
+ {
+ $cats[$cat_id][$upd_field] = $filter['categories'][$category['id']][$upd_field];
+ }
+ }
+ }
+}
+
+?>
diff --git a/install/db/40-database.php b/install/db/40-database.php
index 99779822f..d6f2ae6d1 100644
--- a/install/db/40-database.php
+++ b/install/db/40-database.php
@@ -1,44 +1,44 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2006-07-23 14:17:00 +0200 (dim, 23 jui 2006) $
-// | last modifier : $Author: nikrou $
-// | revision : $Revision: 1492 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-if (!defined('PHPWG_ROOT_PATH'))
-{
- die('Hacking attempt!');
-}
-
-$upgrade_description = 'Add ws_status to #config';
-
-$query = '
-INSERT INTO '.PREFIX_TABLE."config (param,value,comment) VALUES ('ws_status','true','Web Service is active/inactive');";
-pwg_query($query);
-
-echo
-"\n"
-. $upgrade_description
-."\n"
-;
-?>
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-07-23 14:17:00 +0200 (dim, 23 jui 2006) $
+// | last modifier : $Author: nikrou $
+// | revision : $Revision: 1492 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+ die('Hacking attempt!');
+}
+
+$upgrade_description = 'Add ws_status to #config';
+
+$query = '
+INSERT INTO '.PREFIX_TABLE."config (param,value,comment) VALUES ('ws_status','true','Web Service is active/inactive');";
+pwg_query($query);
+
+echo
+"\n"
+. $upgrade_description
+."\n"
+;
+?>
diff --git a/install/db/41-database.php b/install/db/41-database.php
index 42d0bae12..b55fe49bc 100644
--- a/install/db/41-database.php
+++ b/install/db/41-database.php
@@ -1,65 +1,65 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2005-09-21 00:04:57 +0200 (mer, 21 sep 2005) $
-// | last modifier : $Author: plg $
-// | revision : $Revision: 870 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-if (!defined('PHPWG_ROOT_PATH'))
-{
- die('Hacking attempt!');
-}
-
-$upgrade_description = 'Web service access table creation';
-
-include_once(PHPWG_ROOT_PATH.'include/constants.php');
-
-// +-----------------------------------------------------------------------+
-// | Upgrade content |
-// +-----------------------------------------------------------------------+
-
-echo "Create table ".WEB_SERVICES_ACCESS_TABLE;
-$query = '
-CREATE TABLE '.WEB_SERVICES_ACCESS_TABLE." (
- id smallint(5) unsigned NOT NULL auto_increment,
- name varchar(32) NOT NULL default '',
- access varchar(255) default NULL,
- `start` datetime default NULL,
- `end` datetime default NULL,
- request varchar(255) default NULL,
- high enum('true','false') NOT NULL default 'true',
- normal enum('true','false') NOT NULL default 'true',
- `limit` smallint(5) unsigned default NULL,
- `comment` varchar(255) default NULL,
- PRIMARY KEY (id),
- UNIQUE KEY name (name)
-) ENGINE=MyISAM COMMENT='Access for Web Services';";
-pwg_query($query);
-
-echo
-"\n"
-.'"'.$upgrade_description.'"'.' ended'
-."\n"
-;
-
-?>
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2005-09-21 00:04:57 +0200 (mer, 21 sep 2005) $
+// | last modifier : $Author: plg $
+// | revision : $Revision: 870 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+ die('Hacking attempt!');
+}
+
+$upgrade_description = 'Web service access table creation';
+
+include_once(PHPWG_ROOT_PATH.'include/constants.php');
+
+// +-----------------------------------------------------------------------+
+// | Upgrade content |
+// +-----------------------------------------------------------------------+
+
+echo "Create table ".WEB_SERVICES_ACCESS_TABLE;
+$query = '
+CREATE TABLE '.WEB_SERVICES_ACCESS_TABLE." (
+ id smallint(5) unsigned NOT NULL auto_increment,
+ name varchar(32) NOT NULL default '',
+ access varchar(255) default NULL,
+ `start` datetime default NULL,
+ `end` datetime default NULL,
+ request varchar(255) default NULL,
+ high enum('true','false') NOT NULL default 'true',
+ normal enum('true','false') NOT NULL default 'true',
+ `limit` smallint(5) unsigned default NULL,
+ `comment` varchar(255) default NULL,
+ PRIMARY KEY (id),
+ UNIQUE KEY name (name)
+) ENGINE=MyISAM COMMENT='Access for Web Services';";
+pwg_query($query);
+
+echo
+"\n"
+.'"'.$upgrade_description.'"'.' ended'
+."\n"
+;
+
+?>
diff --git a/language/en_UK.iso-8859-1/help/advanced_feature.html b/language/en_UK.iso-8859-1/help/advanced_feature.html
index 59b28616e..2fd5341fb 100644
--- a/language/en_UK.iso-8859-1/help/advanced_feature.html
+++ b/language/en_UK.iso-8859-1/help/advanced_feature.html
@@ -1,16 +1,16 @@
-<h2>Advanced features</h2>
-
-<p>List special functionnalties for expert PWG administrator:</p>
-
-<ul>
-
- <li>
- <strong>Not linked elements:</strong>
- Display images which are not associated to any virtual category.
- </li>
- <li>
- <strong>Files with same name in more than one physical category:</strong>
- Display images or any files which are found with the same filename in some categories.
- </li>
-
-</ul>
+<h2>Advanced features</h2>
+
+<p>List special functionnalties for expert PWG administrator:</p>
+
+<ul>
+
+ <li>
+ <strong>Not linked elements:</strong>
+ Display images which are not associated to any virtual category.
+ </li>
+ <li>
+ <strong>Files with same name in more than one physical category:</strong>
+ Display images or any files which are found with the same filename in some categories.
+ </li>
+
+</ul>
diff --git a/language/en_UK.iso-8859-1/help/group_list.html b/language/en_UK.iso-8859-1/help/group_list.html
index e76094cae..e918f2e5a 100644
--- a/language/en_UK.iso-8859-1/help/group_list.html
+++ b/language/en_UK.iso-8859-1/help/group_list.html
@@ -1,22 +1,22 @@
-<h2>Groups list</h2>
-
-<p>This is the place where you can manage defined groups.</p>
-
-<h3>Add a group</h3>
-
-<p>Administrator can add groups.</p>
-
-<h3>Groupes list</h3>
-
-<p>The list allows for each element to:</p>
-
-
-<ul>
- <li>go to members list</li>
- <li>go to permissions</li>
- <li>delete the group (require a confirmation checkbox)</li>
- <li>toggle status "default" (require a confirmation checkbox)</li>
-</ul>
-
-<h3>Default groups</h3>
+<h2>Groups list</h2>
+
+<p>This is the place where you can manage defined groups.</p>
+
+<h3>Add a group</h3>
+
+<p>Administrator can add groups.</p>
+
+<h3>Groupes list</h3>
+
+<p>The list allows for each element to:</p>
+
+
+<ul>
+ <li>go to members list</li>
+ <li>go to permissions</li>
+ <li>delete the group (require a confirmation checkbox)</li>
+ <li>toggle status "default" (require a confirmation checkbox)</li>
+</ul>
+
+<h3>Default groups</h3>
<p>Default groups are groups associated automatically to new user.</p> \ No newline at end of file
diff --git a/language/en_UK.iso-8859-1/help/web_service.html b/language/en_UK.iso-8859-1/help/web_service.html
index 4e71c13bf..e106a35cb 100644
--- a/language/en_UK.iso-8859-1/help/web_service.html
+++ b/language/en_UK.iso-8859-1/help/web_service.html
@@ -1,47 +1,47 @@
-<h2>Web Service Checker</h2>
-
-<p>This page let you define all parameters for your web service.</p>
-
-<dl>
-
- <dt>Environment setting</dt>
-
- <dd>If Web Service access control is active (Advanced configuration => $conf['ws_access_control'])
- you will see there all Advanced configuration related to Web Service.</dd>
-
- <dt>Confidential partner key (Mandatory)</dt>
-
- <dd>Unique key to share with your partner. Keep that one long enough (e.g. 8 characters).
- Keep it as complex enough (mixed figures, upper and lower case characters, special characters).
- For example: "P!e2r!k Le G@2l".
-
- <strong>Hidden to anyone in adviser mode.</strong>
-
- <dt>Target (Optional)</dt>
-
- <dd>Can be an image id list like that:<ul><li>
- list/277,275,142,235,178,190,204,236-238,253,268,276,285,41,73</li><li>
- a category id list as : cat/16,32,21</li><li>
- or a tag id list as: tag/22,61,36 </li></ul>
- all id list will be reduced to the min list as:<ul><li>
- list/41,73,142,178,190,204,<strong>235-238</strong>,253,268,<strong>275-277</strong>,285</li></ul>
- </dd>
-
- <dt>Restrict access (Optional)</dt>
-
- <dd>If you want to limit your partner to a specific request.</dd>
-
- <dt>Returned images limit </dt>
-
- <dd>Images limit count: to return to your partner for each request.</dd>
-
- <dt>Duration </dt>
-
- <dd>From now, set availability in days. If you postpone over the duration, the service would never be available.</dd>
-
- <dt>Comment </dt>
-
- <dd>Let you describe who's behind this Web Service, be clear enough.
- Don't forget that if someone is Admin and Adviser on your website. He can read this comment zone.</dd>
-
-</dl>
+<h2>Web Service Checker</h2>
+
+<p>This page let you define all parameters for your web service.</p>
+
+<dl>
+
+ <dt>Environment setting</dt>
+
+ <dd>If Web Service access control is active (Advanced configuration => $conf['ws_access_control'])
+ you will see there all Advanced configuration related to Web Service.</dd>
+
+ <dt>Confidential partner key (Mandatory)</dt>
+
+ <dd>Unique key to share with your partner. Keep that one long enough (e.g. 8 characters).
+ Keep it as complex enough (mixed figures, upper and lower case characters, special characters).
+ For example: "P!e2r!k Le G@2l".
+
+ <strong>Hidden to anyone in adviser mode.</strong>
+
+ <dt>Target (Optional)</dt>
+
+ <dd>Can be an image id list like that:<ul><li>
+ list/277,275,142,235,178,190,204,236-238,253,268,276,285,41,73</li><li>
+ a category id list as : cat/16,32,21</li><li>
+ or a tag id list as: tag/22,61,36 </li></ul>
+ all id list will be reduced to the min list as:<ul><li>
+ list/41,73,142,178,190,204,<strong>235-238</strong>,253,268,<strong>275-277</strong>,285</li></ul>
+ </dd>
+
+ <dt>Restrict access (Optional)</dt>
+
+ <dd>If you want to limit your partner to a specific request.</dd>
+
+ <dt>Returned images limit </dt>
+
+ <dd>Images limit count: to return to your partner for each request.</dd>
+
+ <dt>Duration </dt>
+
+ <dd>From now, set availability in days. If you postpone over the duration, the service would never be available.</dd>
+
+ <dt>Comment </dt>
+
+ <dd>Let you describe who's behind this Web Service, be clear enough.
+ Don't forget that if someone is Admin and Adviser on your website. He can read this comment zone.</dd>
+
+</dl>
diff --git a/language/fr_FR.iso-8859-1/help/advanced_feature.html b/language/fr_FR.iso-8859-1/help/advanced_feature.html
index fb5fbd5b6..8d0d03fec 100644
--- a/language/fr_FR.iso-8859-1/help/advanced_feature.html
+++ b/language/fr_FR.iso-8859-1/help/advanced_feature.html
@@ -1,16 +1,16 @@
-<h2>Fonctions avancées</h2>
-
-<p>Liste des fonctionnalités spéciales pour les administrateurs experts de PWG:</p>
-
-<ul>
-
- <li>
- <strong>Eléments non liés:</strong>
- Affiche les images qui ne sont pas associées à une catégorie virtuelle
- </li>
- <li>
- <strong>Fichiers portant le même nom dans plusieurs catégories physiques:</strong>
- Affiche les images ou les éventuels fichiers qui pourraient être trouvés dans plusieurs catégories.
- </li>
-
-</ul>
+<h2>Fonctions avancées</h2>
+
+<p>Liste des fonctionnalités spéciales pour les administrateurs experts de PWG:</p>
+
+<ul>
+
+ <li>
+ <strong>Eléments non liés:</strong>
+ Affiche les images qui ne sont pas associées à une catégorie virtuelle
+ </li>
+ <li>
+ <strong>Fichiers portant le même nom dans plusieurs catégories physiques:</strong>
+ Affiche les images ou les éventuels fichiers qui pourraient être trouvés dans plusieurs catégories.
+ </li>
+
+</ul>
diff --git a/language/fr_FR.iso-8859-1/help/group_list.html b/language/fr_FR.iso-8859-1/help/group_list.html
index 321a87e3e..6848d6743 100644
--- a/language/fr_FR.iso-8859-1/help/group_list.html
+++ b/language/fr_FR.iso-8859-1/help/group_list.html
@@ -1,21 +1,21 @@
-<h2>Liste des groupes</h2>
-
-<p>Manipulation des propriétés des groupes définis.</p>
-
-<h3>Ajouter un groupe</h3>
-
-<p>L'administrateur peut ajouter des groupes.</p>
-
-<h3>Liste des groupes</h3>
-
-<p>La liste permet pour chaque groupe:</p>
-
-<ul>
- <li>d'accéder à la liste des membres</li>
- <li>d'accéder aux permissions</li>
- <li>de supprimer le groupe (nécessite une confirmation)</li>
- <li>d'inverser le statut "par défaut" (nécessite une confirmation)</li>
-</ul>
-
-<h3>Groupes par défaut</h3>
+<h2>Liste des groupes</h2>
+
+<p>Manipulation des propriétés des groupes définis.</p>
+
+<h3>Ajouter un groupe</h3>
+
+<p>L'administrateur peut ajouter des groupes.</p>
+
+<h3>Liste des groupes</h3>
+
+<p>La liste permet pour chaque groupe:</p>
+
+<ul>
+ <li>d'accéder à la liste des membres</li>
+ <li>d'accéder aux permissions</li>
+ <li>de supprimer le groupe (nécessite une confirmation)</li>
+ <li>d'inverser le statut "par défaut" (nécessite une confirmation)</li>
+</ul>
+
+<h3>Groupes par défaut</h3>
<p>Les groupes par défaut sont les groupes associés automatiquement à chaque nouvel utilisateur.</p> \ No newline at end of file
diff --git a/language/fr_FR.iso-8859-1/help/web_service.html b/language/fr_FR.iso-8859-1/help/web_service.html
index 944ff4b34..bf420456e 100644
--- a/language/fr_FR.iso-8859-1/help/web_service.html
+++ b/language/fr_FR.iso-8859-1/help/web_service.html
@@ -1,48 +1,48 @@
-<h2>Web Service Checker</h2>
-
-<p>Cette page permet de définir les paramètres de votre web service.</p>
-
-<dl>
-
- <dt>Conditions de fonctionnement</dt>
-
- <dd>Si l'accès aux Web Services est contrôlé (Configuration avancée => $conf['ws_access_control'])
- vous trouverez ici toutes les valeurs de la configuration avancée relative aux Web Services.</dd>
-
- <dt>Clé confidentielle (Obligatoire)</dt>
-
- <dd>Clé unique à partager avec votre partenaire. Doit être assez longue ( 8 caractères par exemple),
- doit être assez complexe (avec des chiffres, des majuscules et minuscules, et des caractères spéciaux).
- Par exemple: "P!e2r!k Le G@2l".
-
- <strong>Ce champ est masqué en mode conseillé.</strong>
-
- <dt>Cible (Facultatif)</dt>
-
- <dd>Soit une liste d'identifiants d'images ceci:<ul><li>
- list/277,275,142,235,178,190,204,236-238,253,268,276,285,41,73</li><li>
- une liste de catégories comme : cat/16,32,21</li><li>
- ou encore une liste de tags : tag/22,61,36 </li></ul>
- Tout liste d'identifiants sera réduite a sa plus simple expression:<ul><li>
- list/41,73,142,178,190,204,<strong>235-238</strong>,253,268,<strong>275-277</strong>,285</li></ul>
-
- </dd>
-
- <dt>Accès restreint (Facultatif)</dt>
-
- <dd>Si vous souhaitez limiter votre partenaire à un type de requête particulier.</dd>
-
- <dt>Limite de transmision </dt>
-
- <dd>Nombre d'images maximum adressées à votre partenaire à chacune de ses requêtes.</dd>
-
- <dt>Durée </dt>
-
- <dd>A partir de maintenant, indiquez la disponibilité en jours. Si vous reportez la disponibilité au delà de sa durée, le service ne devrait jamais être rendu.</dd>
-
- <dt>Commentaire </dt>
-
- <dd>Vous permet de décrire qui se trouve derrière ce Service Web, de façon plus claire pour vous.
- N'oubliez pas qu'un Administrateur en mode conseiller peut lire le contenu de ce commentaire.</dd>
-
-</dl>
+<h2>Web Service Checker</h2>
+
+<p>Cette page permet de définir les paramètres de votre web service.</p>
+
+<dl>
+
+ <dt>Conditions de fonctionnement</dt>
+
+ <dd>Si l'accès aux Web Services est contrôlé (Configuration avancée => $conf['ws_access_control'])
+ vous trouverez ici toutes les valeurs de la configuration avancée relative aux Web Services.</dd>
+
+ <dt>Clé confidentielle (Obligatoire)</dt>
+
+ <dd>Clé unique à partager avec votre partenaire. Doit être assez longue ( 8 caractères par exemple),
+ doit être assez complexe (avec des chiffres, des majuscules et minuscules, et des caractères spéciaux).
+ Par exemple: "P!e2r!k Le G@2l".
+
+ <strong>Ce champ est masqué en mode conseillé.</strong>
+
+ <dt>Cible (Facultatif)</dt>
+
+ <dd>Soit une liste d'identifiants d'images ceci:<ul><li>
+ list/277,275,142,235,178,190,204,236-238,253,268,276,285,41,73</li><li>
+ une liste de catégories comme : cat/16,32,21</li><li>
+ ou encore une liste de tags : tag/22,61,36 </li></ul>
+ Tout liste d'identifiants sera réduite a sa plus simple expression:<ul><li>
+ list/41,73,142,178,190,204,<strong>235-238</strong>,253,268,<strong>275-277</strong>,285</li></ul>
+
+ </dd>
+
+ <dt>Accès restreint (Facultatif)</dt>
+
+ <dd>Si vous souhaitez limiter votre partenaire à un type de requête particulier.</dd>
+
+ <dt>Limite de transmision </dt>
+
+ <dd>Nombre d'images maximum adressées à votre partenaire à chacune de ses requêtes.</dd>
+
+ <dt>Durée </dt>
+
+ <dd>A partir de maintenant, indiquez la disponibilité en jours. Si vous reportez la disponibilité au delà de sa durée, le service ne devrait jamais être rendu.</dd>
+
+ <dt>Commentaire </dt>
+
+ <dd>Vous permet de décrire qui se trouve derrière ce Service Web, de façon plus claire pour vous.
+ N'oubliez pas qu'un Administrateur en mode conseiller peut lire le contenu de ce commentaire.</dd>
+
+</dl>
diff --git a/plugins/add_index/admin/main_page.tpl b/plugins/add_index/admin/main_page.tpl
index 155151851..ecdd3edf1 100644
--- a/plugins/add_index/admin/main_page.tpl
+++ b/plugins/add_index/admin/main_page.tpl
@@ -1,14 +1,14 @@
-<!-- $Id: notification_by_mail.tpl Ruben ARNAUD -->
-<div class="titrePage">
- <h2>{lang:Add_Index}</h2>
-</div>
-
-<!-- BEGIN add_index_results -->
-<div>
- <ul>
- <!-- BEGIN result -->
- <li>{add_index_results.result.RESULT}</li>
- <!-- END result -->
- </ul>
-</div>
-<!-- END add_index_results -->
+<!-- $Id: notification_by_mail.tpl Ruben ARNAUD -->
+<div class="titrePage">
+ <h2>{lang:Add_Index}</h2>
+</div>
+
+<!-- BEGIN add_index_results -->
+<div>
+ <ul>
+ <!-- BEGIN result -->
+ <li>{add_index_results.result.RESULT}</li>
+ <!-- END result -->
+ </ul>
+</div>
+<!-- END add_index_results -->
diff --git a/plugins/add_index/index.php b/plugins/add_index/index.php
index f0ba36fa3..083b24edf 100644
--- a/plugins/add_index/index.php
+++ b/plugins/add_index/index.php
@@ -1,35 +1,35 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1481 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-// recursive call of index.php
-
-$url = '../index.php';
-header( 'Request-URI: '.$url );
-header( 'Content-Location: '.$url );
-header( 'Location: '.$url );
-exit();
-?>
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1481 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+// recursive call of index.php
+
+$url = '../index.php';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/add_index/language/en_UK.iso-8859-1/help/advanced_feature.html b/plugins/add_index/language/en_UK.iso-8859-1/help/advanced_feature.html
index 5724d5d1b..00d15b57c 100644
--- a/plugins/add_index/language/en_UK.iso-8859-1/help/advanced_feature.html
+++ b/plugins/add_index/language/en_UK.iso-8859-1/help/advanced_feature.html
@@ -1,7 +1,7 @@
-<p>Functionality of AddIndex plugin:</p>
-<ul>
- <li>
- <strong>Add and overwrite "index" files for all local sites:</strong>
- Overwrite copy the file ./include/index.php to all sub-directories of gallerie local sites.
- </li>
-<ul>
+<p>Functionality of AddIndex plugin:</p>
+<ul>
+ <li>
+ <strong>Add and overwrite "index" files for all local sites:</strong>
+ Overwrite copy the file ./include/index.php to all sub-directories of gallerie local sites.
+ </li>
+<ul>
diff --git a/plugins/add_index/language/en_UK.iso-8859-1/help/site_manager.html b/plugins/add_index/language/en_UK.iso-8859-1/help/site_manager.html
index 3ea24ac6b..353980adc 100644
--- a/plugins/add_index/language/en_UK.iso-8859-1/help/site_manager.html
+++ b/plugins/add_index/language/en_UK.iso-8859-1/help/site_manager.html
@@ -1,7 +1,7 @@
-<p>Functionality of AddIndex plugin:</p>
-<ul>
- <li>
- <strong>Add "index" files for local site:</strong>
- Copy the file ./include/index.php to all sub-directories of selected local site.
- </li>
-<ul>
+<p>Functionality of AddIndex plugin:</p>
+<ul>
+ <li>
+ <strong>Add "index" files for local site:</strong>
+ Copy the file ./include/index.php to all sub-directories of selected local site.
+ </li>
+<ul>
diff --git a/plugins/add_index/language/en_UK.iso-8859-1/plugin.lang.php b/plugins/add_index/language/en_UK.iso-8859-1/plugin.lang.php
index d49d702f5..5dfebec4f 100644
--- a/plugins/add_index/language/en_UK.iso-8859-1/plugin.lang.php
+++ b/plugins/add_index/language/en_UK.iso-8859-1/plugin.lang.php
@@ -1,44 +1,44 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
-// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1481 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-$lang['Add_Index'] = 'Add "index" files';
-$lang['Advanced_Add_Index'] = 'Add and overwrite "index" files for all local sites';
-$lang['Manager_Add_Index'] = 'add "index"';
-
-$lang['add_index_file_copied'] = '%s copied';
-$lang['add_index_file_not_copied'] = '%s not copied';
-$lang['add_index_not_local_site'] = '%s [%d] is a remote site, it\`s compatible with add "index" files';
-$lang['add_index_nb_copied_file'] = '%d file copied';
-$lang['add_index_nb_copied_files'] = '%d files copied';
-$lang['add_index_nb_skipped_file'] = '%d file skipped';
-$lang['add_index_nb_skipped_files'] = '%d files skipped';
-$lang['add_index_nb_not_copied_file'] = '%d file not copied';
-$lang['add_index_nb_not_copied_files'] = '%d files not copied';
-$lang['add_index_src_file_dont_exists'] = 'Source file %s don\'t esists, cannot duplicate this file';
-
-?>
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1481 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+$lang['Add_Index'] = 'Add "index" files';
+$lang['Advanced_Add_Index'] = 'Add and overwrite "index" files for all local sites';
+$lang['Manager_Add_Index'] = 'add "index"';
+
+$lang['add_index_file_copied'] = '%s copied';
+$lang['add_index_file_not_copied'] = '%s not copied';
+$lang['add_index_not_local_site'] = '%s [%d] is a remote site, it\`s compatible with add "index" files';
+$lang['add_index_nb_copied_file'] = '%d file copied';
+$lang['add_index_nb_copied_files'] = '%d files copied';
+$lang['add_index_nb_skipped_file'] = '%d file skipped';
+$lang['add_index_nb_skipped_files'] = '%d files skipped';
+$lang['add_index_nb_not_copied_file'] = '%d file not copied';
+$lang['add_index_nb_not_copied_files'] = '%d files not copied';
+$lang['add_index_src_file_dont_exists'] = 'Source file %s don\'t esists, cannot duplicate this file';
+
+?>
diff --git a/plugins/add_index/language/fr_FR.iso-8859-1/help/advanced_feature.html b/plugins/add_index/language/fr_FR.iso-8859-1/help/advanced_feature.html
index 5f0172d05..2592c0d28 100644
--- a/plugins/add_index/language/fr_FR.iso-8859-1/help/advanced_feature.html
+++ b/plugins/add_index/language/fr_FR.iso-8859-1/help/advanced_feature.html
@@ -1,7 +1,7 @@
-<p>Fonctionnalité du plugin AddIndex:</p>
-<ul>
- <li>
- <strong>Ajout et écrasement des fichiers "index" pour tous les sites locaux :</strong>
- Copie avec écrasement le fichier ./include/index.php dans tous les sous-répertoires des galeries des sites locaux.
- </li>
-</ul>
+<p>Fonctionnalité du plugin AddIndex:</p>
+<ul>
+ <li>
+ <strong>Ajout et écrasement des fichiers "index" pour tous les sites locaux :</strong>
+ Copie avec écrasement le fichier ./include/index.php dans tous les sous-répertoires des galeries des sites locaux.
+ </li>
+</ul>
diff --git a/plugins/add_index/language/fr_FR.iso-8859-1/help/site_manager.html b/plugins/add_index/language/fr_FR.iso-8859-1/help/site_manager.html
index f341c7cda..533510d99 100644
--- a/plugins/add_index/language/fr_FR.iso-8859-1/help/site_manager.html
+++ b/plugins/add_index/language/fr_FR.iso-8859-1/help/site_manager.html
@@ -1,7 +1,7 @@
-<p>Fonctionnalité du plugin AddIndex:</p>
-<ul>
- <li>
- <strong>Ajout des fichiers "index" pour le site local :</strong>
- Copie le fichier ./include/index.php dans tous les sous-répertoires du site sélectionné.
- </li>
-</ul>
+<p>Fonctionnalité du plugin AddIndex:</p>
+<ul>
+ <li>
+ <strong>Ajout des fichiers "index" pour le site local :</strong>
+ Copie le fichier ./include/index.php dans tous les sous-répertoires du site sélectionné.
+ </li>
+</ul>
diff --git a/plugins/add_index/language/fr_FR.iso-8859-1/plugin.lang.php b/plugins/add_index/language/fr_FR.iso-8859-1/plugin.lang.php
index 711ef3abe..b500c8868 100644
--- a/plugins/add_index/language/fr_FR.iso-8859-1/plugin.lang.php
+++ b/plugins/add_index/language/fr_FR.iso-8859-1/plugin.lang.php
@@ -1,44 +1,44 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
-// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1481 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-$lang['Add_Index'] = 'Ajout des fichiers "index"';
-$lang['Advanced_Add_Index'] = 'Ajout et écrasement des fichiers "index" pour tous les sites locaux';
-$lang['Manager_Add_Index'] = 'ajout des "index"';
-
-$lang['add_index_file_copied'] = '%s copié';
-$lang['add_index_file_not_copied'] = '%s non copié';
-$lang['add_index_not_local_site'] = '%s [%d] est un site distant, ce n\'est pas compatible avec l\'ajout de fichiers "index"';
-$lang['add_index_nb_copied_file'] = '%d fichier copié';
-$lang['add_index_nb_copied_files'] = '%d fichiers copiés';
-$lang['add_index_nb_skipped_file'] = '%d fichier à ne pas traiter';
-$lang['add_index_nb_skipped_files'] = '%d fichiers à ne pas traiter';
-$lang['add_index_nb_not_copied_file'] = '%d fichier non copié';
-$lang['add_index_nb_not_copied_files'] = '%d fichiers non copiés';
-$lang['add_index_src_file_dont_exists'] = 'Le fichier source n\'existe pas, la duplication de ce fichier n\'est pas possible';
-
-?>
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1481 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+$lang['Add_Index'] = 'Ajout des fichiers "index"';
+$lang['Advanced_Add_Index'] = 'Ajout et écrasement des fichiers "index" pour tous les sites locaux';
+$lang['Manager_Add_Index'] = 'ajout des "index"';
+
+$lang['add_index_file_copied'] = '%s copié';
+$lang['add_index_file_not_copied'] = '%s non copié';
+$lang['add_index_not_local_site'] = '%s [%d] est un site distant, ce n\'est pas compatible avec l\'ajout de fichiers "index"';
+$lang['add_index_nb_copied_file'] = '%d fichier copié';
+$lang['add_index_nb_copied_files'] = '%d fichiers copiés';
+$lang['add_index_nb_skipped_file'] = '%d fichier à ne pas traiter';
+$lang['add_index_nb_skipped_files'] = '%d fichiers à ne pas traiter';
+$lang['add_index_nb_not_copied_file'] = '%d fichier non copié';
+$lang['add_index_nb_not_copied_files'] = '%d fichiers non copiés';
+$lang['add_index_src_file_dont_exists'] = 'Le fichier source n\'existe pas, la duplication de ce fichier n\'est pas possible';
+
+?>
diff --git a/plugins/add_index/language/index.php b/plugins/add_index/language/index.php
index f0ba36fa3..083b24edf 100644
--- a/plugins/add_index/language/index.php
+++ b/plugins/add_index/language/index.php
@@ -1,35 +1,35 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1481 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-// recursive call of index.php
-
-$url = '../index.php';
-header( 'Request-URI: '.$url );
-header( 'Content-Location: '.$url );
-header( 'Location: '.$url );
-exit();
-?>
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1481 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+// recursive call of index.php
+
+$url = '../index.php';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/add_index/main.admin.inc.php b/plugins/add_index/main.admin.inc.php
index 93421854f..39a3fe171 100644
--- a/plugins/add_index/main.admin.inc.php
+++ b/plugins/add_index/main.admin.inc.php
@@ -1,100 +1,100 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
-// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1481 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-if ((!defined('PHPWG_ROOT_PATH')) or (!(defined('IN_ADMIN') and IN_ADMIN)))
-{
- die('Hacking attempt!');
-}
-
-class AdminAddIndex extends AddIndex
-{
- function load_params()
- {
- global $conf;
-
- // Name of index file (index.php or index.htm or index.html)
- if (!isset($conf['add_index_filename']))
- {
- $conf['add_index_filename'] = 'index.php';
- }
- // Name of index file (index.php or index.htm or index.html)
- if (!isset($conf['add_index_source_directory_path']))
- {
- // Name of the directoty use in order to copy index file
- $conf['add_index_source_directory_path'] = PHPWG_ROOT_PATH.'include/';
- }
- }
-
- function loading_lang()
- {
- global $lang;
-
- include(get_language_filepath('plugin.lang.php', $this->path));
- }
-
- function get_admin_advanced_features_links($advanced_features)
- {
- array_push($advanced_features,
- array
- (
- 'CAPTION' => l10n('Advanced_Add_Index'),
- 'URL' => get_admin_plugin_menu_link(dirname(__FILE__).'/admin/main_page.php').'&amp;overwrite'
- ));
-
- return $advanced_features;
- }
-
- function get_admins_site_links($site_manager_plugin_links, $site_id, $is_remote)
- {
- if (!$is_remote)
- {
- array_push($site_manager_plugin_links,
- array
- (
- 'U_HREF' => get_admin_plugin_menu_link(dirname(__FILE__).'/admin/main_page.php').'&amp;site_id='.$site_id,
- 'U_CAPTION' => l10n('Manager_Add_Index'),
- 'U_HINT' => l10n('Add_Index')
- ));
- }
-
- return $site_manager_plugin_links;
- }
-}
-
-// Create object
-$add_index = new AdminAddIndex();
-
-// Load Add Index parameters
-$add_index->load_params();
-
-// Add events
-add_event_handler('loading_lang', array(&$add_index, 'loading_lang'));
-add_event_handler('get_admin_advanced_features_links', array(&$add_index, 'get_admin_advanced_features_links'));
-add_event_handler('get_admins_site_links', array(&$add_index, 'get_admins_site_links'), EVENT_HANDLER_PRIORITY_NEUTRAL, 3);
-
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1481 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+if ((!defined('PHPWG_ROOT_PATH')) or (!(defined('IN_ADMIN') and IN_ADMIN)))
+{
+ die('Hacking attempt!');
+}
+
+class AdminAddIndex extends AddIndex
+{
+ function load_params()
+ {
+ global $conf;
+
+ // Name of index file (index.php or index.htm or index.html)
+ if (!isset($conf['add_index_filename']))
+ {
+ $conf['add_index_filename'] = 'index.php';
+ }
+ // Name of index file (index.php or index.htm or index.html)
+ if (!isset($conf['add_index_source_directory_path']))
+ {
+ // Name of the directoty use in order to copy index file
+ $conf['add_index_source_directory_path'] = PHPWG_ROOT_PATH.'include/';
+ }
+ }
+
+ function loading_lang()
+ {
+ global $lang;
+
+ include(get_language_filepath('plugin.lang.php', $this->path));
+ }
+
+ function get_admin_advanced_features_links($advanced_features)
+ {
+ array_push($advanced_features,
+ array
+ (
+ 'CAPTION' => l10n('Advanced_Add_Index'),
+ 'URL' => get_admin_plugin_menu_link(dirname(__FILE__).'/admin/main_page.php').'&amp;overwrite'
+ ));
+
+ return $advanced_features;
+ }
+
+ function get_admins_site_links($site_manager_plugin_links, $site_id, $is_remote)
+ {
+ if (!$is_remote)
+ {
+ array_push($site_manager_plugin_links,
+ array
+ (
+ 'U_HREF' => get_admin_plugin_menu_link(dirname(__FILE__).'/admin/main_page.php').'&amp;site_id='.$site_id,
+ 'U_CAPTION' => l10n('Manager_Add_Index'),
+ 'U_HINT' => l10n('Add_Index')
+ ));
+ }
+
+ return $site_manager_plugin_links;
+ }
+}
+
+// Create object
+$add_index = new AdminAddIndex();
+
+// Load Add Index parameters
+$add_index->load_params();
+
+// Add events
+add_event_handler('loading_lang', array(&$add_index, 'loading_lang'));
+add_event_handler('get_admin_advanced_features_links', array(&$add_index, 'get_admin_advanced_features_links'));
+add_event_handler('get_admins_site_links', array(&$add_index, 'get_admins_site_links'), EVENT_HANDLER_PRIORITY_NEUTRAL, 3);
+
?> \ No newline at end of file
diff --git a/plugins/add_index/main.base.inc.php b/plugins/add_index/main.base.inc.php
index 50f6e898a..9f78099ea 100644
--- a/plugins/add_index/main.base.inc.php
+++ b/plugins/add_index/main.base.inc.php
@@ -1,44 +1,44 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
-// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1481 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-if (!defined('PHPWG_ROOT_PATH'))
-{
- die('Hacking attempt!');
-}
-
-class AddIndex
-{
- var $path;
-
- function AddIndex()
- {
- $this->path = dirname(__FILE__).'/';
- }
-}
-
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1481 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+ die('Hacking attempt!');
+}
+
+class AddIndex
+{
+ var $path;
+
+ function AddIndex()
+ {
+ $this->path = dirname(__FILE__).'/';
+ }
+}
+
?> \ No newline at end of file
diff --git a/plugins/add_index/main.inc.php b/plugins/add_index/main.inc.php
index 8d9989dbc..da25cd454 100644
--- a/plugins/add_index/main.inc.php
+++ b/plugins/add_index/main.inc.php
@@ -1,56 +1,56 @@
-<?php /*
-Plugin Name: Add Index
-Version: 1.0
-Description: Add file index.php file on all sub-directories of local galleries pictures. / Ajoute le fichier index.php sur les sous-répertoires de galeries d'images locales.
-Plugin URI: http://www.phpwebgallery.net
-Author: PhpWebGallery team
-Author URI: http://www.phpwebgallery.net
-*/
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
-// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1481 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-if (!defined('PHPWG_ROOT_PATH'))
-{
- die('Hacking attempt!');
-}
-
-if (in_array(script_basename(), array('popuphelp', 'admin')))
-{
- if (defined('IN_ADMIN') and IN_ADMIN)
- {
- include_once(dirname(__FILE__).'/'.'main.base.inc.php');
- include_once(dirname(__FILE__).'/'.'main.admin.inc.php');
- }
- else
- {
- include_once(dirname(__FILE__).'/'.'main.base.inc.php');
- include_once(dirname(__FILE__).'/'.'main.normal.inc.php');
- }
- set_plugin_data($plugin['id'], $add_index);
-}
-
+<?php /*
+Plugin Name: Add Index
+Version: 1.0
+Description: Add file index.php file on all sub-directories of local galleries pictures. / Ajoute le fichier index.php sur les sous-répertoires de galeries d'images locales.
+Plugin URI: http://www.phpwebgallery.net
+Author: PhpWebGallery team
+Author URI: http://www.phpwebgallery.net
+*/
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1481 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+ die('Hacking attempt!');
+}
+
+if (in_array(script_basename(), array('popuphelp', 'admin')))
+{
+ if (defined('IN_ADMIN') and IN_ADMIN)
+ {
+ include_once(dirname(__FILE__).'/'.'main.base.inc.php');
+ include_once(dirname(__FILE__).'/'.'main.admin.inc.php');
+ }
+ else
+ {
+ include_once(dirname(__FILE__).'/'.'main.base.inc.php');
+ include_once(dirname(__FILE__).'/'.'main.normal.inc.php');
+ }
+ set_plugin_data($plugin['id'], $add_index);
+}
+
?> \ No newline at end of file
diff --git a/plugins/add_index/main.normal.inc.php b/plugins/add_index/main.normal.inc.php
index f412a4b1f..af3795cb9 100644
--- a/plugins/add_index/main.normal.inc.php
+++ b/plugins/add_index/main.normal.inc.php
@@ -1,65 +1,65 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
-// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
-// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
-// | last modifier : $Author: rub $
-// | revision : $Revision: 1481 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU General Public License as published by |
-// | the Free Software Foundation |
-// | |
-// | This program is distributed in the hope that it will be useful, but |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
-// | General Public License for more details. |
-// | |
-// | You should have received a copy of the GNU General Public License |
-// | along with this program; if not, write to the Free Software |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA. |
-// +-----------------------------------------------------------------------+
-
-if (!defined('PHPWG_ROOT_PATH'))
-{
- die('Hacking attempt!');
-}
-
-class NormalAddIndex extends AddIndex
-{
- function get_popup_help_content($popup_help_content, $page)
- {
- if (in_array($page, array('advanced_feature', 'site_manager')))
- {
- $help_content =
- @file_get_contents(get_language_filepath('help/'.$page.'.html', $this->path));
- }
- else
- {
- $help_content = false;
- }
-
- if ($help_content == false)
- {
- return $popup_help_content;
- }
- else
- {
- return $popup_help_content.$help_content;
- }
- }
-}
-
-// Create object
-$add_index = new NormalAddIndex();
-
-// Add events
-add_event_handler('get_popup_help_content', array(&$add_index, 'get_popup_help_content'), EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
-
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2007 Ruben ARNAUD - team@phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $RCSfile$
+// | last update : $Date: 2006-07-18 23:38:54 +0200 (mar., 18 juil. 2006) $
+// | last modifier : $Author: rub $
+// | revision : $Revision: 1481 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+ die('Hacking attempt!');
+}
+
+class NormalAddIndex extends AddIndex
+{
+ function get_popup_help_content($popup_help_content, $page)
+ {
+ if (in_array($page, array('advanced_feature', 'site_manager')))
+ {
+ $help_content =
+ @file_get_contents(get_language_filepath('help/'.$page.'.html', $this->path));
+ }
+ else
+ {
+ $help_content = false;
+ }
+
+ if ($help_content == false)
+ {
+ return $popup_help_content;
+ }
+ else
+ {
+ return $popup_help_content.$help_content;
+ }
+ }
+}
+
+// Create object
+$add_index = new NormalAddIndex();
+
+// Add events
+add_event_handler('get_popup_help_content', array(&$add_index, 'get_popup_help_content'), EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
+
?> \ No newline at end of file
diff --git a/plugins/admin_advices/admin_advices.tpl b/plugins/admin_advices/admin_advices.tpl
index 19aa777cb..2a4d09635 100644
--- a/plugins/admin_advices/admin_advices.tpl
+++ b/plugins/admin_advices/admin_advices.tpl
@@ -1,32 +1,32 @@
-<div class="content">
- <h2>{lang:An_advice_about} {ADVICE_ABOUT}</h2>
- <h3>{ADVICE_TEXT}</h3>
- <table summary="Admin advices summary">
- <tr><td style="text-align: left; width: 50%;">
- <!-- BEGIN More -->
- {More.ADVICE} <br />
- <!-- END More -->
- <br />
- </td><td style="text-align: right; width: 20%;">
- <!-- BEGIN thumbnail -->
- <a href="{thumbnail.U_MODIFY}" title="{lang:link_info_image}">
- <img class="thumbnail" src="{thumbnail.IMAGE}"
- alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"></a>
- </td><td style="text-align: left;">
- <img src="{thumbnail.NAME}.png"
- alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Name}<br />
- <img src="{thumbnail.COMMENT}.png"
- alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Description}<br />
- <img src="{thumbnail.AUTHOR}.png"
- alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Author}<br />
- <img src="{thumbnail.CREATE_DATE}.png"
- alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Creation date}<br />
- <img src="{thumbnail.METADATA}.png"
- alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Metadata}<br />
- <img src="{thumbnail.TAGS}.png"
- alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Tags} ({thumbnail.NUM_TAGS})
- <!-- END thumbnail -->
- </td></tr>
- </table>
-
-</div>
+<div class="content">
+ <h2>{lang:An_advice_about} {ADVICE_ABOUT}</h2>
+ <h3>{ADVICE_TEXT}</h3>
+ <table summary="Admin advices summary">
+ <tr><td style="text-align: left; width: 50%;">
+ <!-- BEGIN More -->
+ {More.ADVICE} <br />
+ <!-- END More -->
+ <br />
+ </td><td style="text-align: right; width: 20%;">
+ <!-- BEGIN thumbnail -->
+ <a href="{thumbnail.U_MODIFY}" title="{lang:link_info_image}">
+ <img class="thumbnail" src="{thumbnail.IMAGE}"
+ alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"></a>
+ </td><td style="text-align: left;">
+ <img src="{thumbnail.NAME}.png"
+ alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Name}<br />
+ <img src="{thumbnail.COMMENT}.png"
+ alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Description}<br />
+ <img src="{thumbnail.AUTHOR}.png"
+ alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Author}<br />
+ <img src="{thumbnail.CREATE_DATE}.png"
+ alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Creation date}<br />
+ <img src="{thumbnail.METADATA}.png"
+ alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Metadata}<br />
+ <img src="{thumbnail.TAGS}.png"
+ alt="{thumbnail.IMAGE_ALT}" title="{thumbnail.IMAGE_TITLE}"> {lang:Tags} ({thumbnail.NUM_TAGS})
+ <!-- END thumbnail -->
+ </td></tr>
+ </table>
+
+</div>
diff --git a/plugins/admin_advices/default-layout.css b/plugins/admin_advices/default-layout.css
index 766617631..35f8801f3 100644
--- a/plugins/admin_advices/default-layout.css
+++ b/plugins/admin_advices/default-layout.css
@@ -1,19 +1,19 @@
-.content {
- list-style-type:none;
- margin: 0 1em 0 14.5em;
- padding: 0 0 15px 0;
-}
-.content h2 {
- font-weight: bold;
- padding-left: 2em;
-}
-.content h3 {
- text-align: left;
- padding-left: 3em;
- font-size: 120%;
-}
-.content table tr td {
- text-align: left;
- padding-left: 2em;
-}
-
+.content {
+ list-style-type:none;
+ margin: 0 1em 0 14.5em;
+ padding: 0 0 15px 0;
+}
+.content h2 {
+ font-weight: bold;
+ padding-left: 2em;
+}
+.content h3 {
+ text-align: left;
+ padding-left: 3em;
+ font-size: 120%;
+}
+.content table tr td {
+ text-align: left;
+ padding-left: 2em;
+}
+
diff --git a/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php b/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php
index f06b0c6c1..768323c61 100644
--- a/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php
+++ b/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php
@@ -1,444 +1,444 @@
-<?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 |
-// +-----------------------------------------------------------------------+
-//$lang_info['language_name'] = 'English';
-//$lang_info['country'] = ''Great Britain';
-//$lang_info['charset'] = 'iso-8859-1';
-//$lang_info['direction'] = 'ltr';
-//$lang_info['code'] = 'en';
-global $lang;
-$lang['An_advice_about'] = 'A new advice about';
-$lang['Metadata'] = 'Metadata';
-
-foreach ($conf as $key => $value)
-{
- if ( is_string($value) )
- {
- $bool = ($value == 'false') ? false : $value;
- $bool = ($value == 'true') ? true : $bool;
- $conf[$key] = $bool;
- }
-}
-
-//
-// Don't forget to update range for new advices
-//
-$cases = range(1,35);
-srand ((double) microtime() * 10000000);
-shuffle($cases);
-
-$cond = false;
-foreach ($cases as $id_adv)
-{
- if ($cond) break;
- $adv = array();
- switch ($id_adv) {
- Case 1 :
- $adv[] = 'Current value: public. ';
- $adv[] = 'Try $conf[\'newcat_default_status\'] = \'private\';';
- $adv[] = 'You will have more time to describe and check your pictures.';
- $adv[] = 'Time to decide between private and public status.';
- $adv[] = 'If you choose private, time to distribute authorization.';
- $adv[] = 'Your new category will be well prepared.';
- $cond = ($conf['newcat_default_status'] !== 'public');
- $confk = 'newcat_default_status';
- break;
-
- Case 2 :
- $adv[] = 'Current value: ' . (string) $conf['slideshow_period'] . '.';
- $adv[] = 'This value could be too small for low band connections.';
- $adv[] = 'Think about higher value like 4.';
- $cond = ( $conf['slideshow_period'] < 4 );
- $confk = 'slideshow_period';
- break;
-
- Case 3 :
- $adv[] = 'Current value: ' . implode(', ', $conf['file_ext']) . '. ';
- $adv[] = 'Should never contains extensions which can be executed';
- $adv[] = 'on the server side like *.php, *.PHP, *.asp, ...';
- $cond = ( in_array('php',$conf['file_ext']) );
- $confk = 'file_ext';
- break;
-
- Case 4 :
- $adv[] = 'Show IPTC Data from your picture:';
- $adv[] = ' 1 - Copy one of your jpg pictures (a public one)' .
- ' in ./tools/<br />' .
- ' 2 - Rename it as sample.jpg.<br />' .
- ' 3 - Run ./tools/metadata.php<br />' .
- ' 4 - Analyse results to determine which IPTC fields could be' .
- ' useful for your visitors.';
- $adv[] = 'Beginners would prefer to keep $conf[\'show_iptc\'] = false;';
- $adv[] = 'Advanced users would take care of $lang values and impacts' .
- ' on templates.';
- $cond = true;
- $confk = 'show_iptc_mapping';
- break;
-
- Case 5 :
- $adv[] = 'Current value: ' . (string) $conf['top_number'] . '.';
- $adv[] = 'This value is maybe too high for low connections, ' .
- 'think about 25-50 depending on your thumbnail sizes.';
- $cond = ( $conf['top_number'] > 50 );
- $confk = 'top_number';
- break;
-
- Case 6 :
- $adv[] = 'Current value: ' . (string) $conf['top_number'] . '.';
- $adv[] = 'One? It could be too low for random pictures, ' .
- 'think about 5-10 depending on your thumbnail sizes.';
- $cond = ( $conf['top_number'] < 2 ) ? true : false;
- $confk = 'top_number';
- break;
-
- Case 7 :
- $adv[] = 'Current value: ' . (string) $conf['anti-flood_time'] . '.';
- $adv[] = 'For normal flow processing, your value is probably too high. ' .
- 'Reasonable value is 60 (default).' ;
- $cond = ( $conf['anti-flood_time'] > 100 ) ? true : false;
- $confk = 'anti-flood_time';
- break;
-
- Case 8 :
- $adv[] = 'Current value: ' . (string) $conf['calendar_datefield'] . '.';
- $adv[] = 'Authorized values are ' .
- "'date_creation' or 'date_available'" .
- ', otherwise you can get unpredictable results.' ;
- $cond = ( !in_array($conf['calendar_datefield'],
- array('date_creation','date_available')) );
- $confk = 'calendar_datefield';
- break;
-
- Case 9 :
- // If (iptc or exif) are used and date_creation is updated
- // Then it's Ok, you can use date_creation by default for calendar
- // else ... Advice
- $adv[] = 'Current value: ' . (string) $conf['calendar_datefield'] . '.';
- $adv[] = "'date_creation'" . ' is NOT filled by ' .
- 'any activated use metadata mapping fields.';
- $adv[] = 'So activate metadata usage <strong>or</strong> change to ' .
- '$conf[\'calendar_datefield\'] = \'date_available\'';
- $adv[] = 'Activate metadata usage as you want: <br />' .
- '1 - $conf[\'use_iptc\'] = true; or $conf[\'use_exif\'] = true; ' .
- 'each way will be correct.<br />' .
- '2 - And respectively map:<br />' .
- '$conf[\'use_iptc_mapping\'] = array( ..., \'date_creation\' ' .
- '=> \'2#055\', ...<br />' .
- 'or/and:<br />' .
- '$conf[\'use_exif_mapping\'] = array(\'date_creation\' ' .
- '=> \'DateTimeOriginal\', ...<br />' .
- '3 - Finally, a new task is up to you: Metadata synchronization.' ;
- $cond2 = ( $conf['use_exif'] and
- isset($conf['use_exif_mapping']['date_creation']) );
- $cond3 = ( $conf['use_iptc'] and
- isset($conf['use_iptc_mapping']['date_creation']) );
- $cond = ( $conf['calendar_datefield'] == 'date_creation' );
- $cond = ( ($cond2 or $cond3) and $cond ) ? false : true;
- $confk = 'calendar_datefield';
- break;
-
- Case 10 :
- $adv[] = 'Current value: false.';
- $adv[] = 'Not useful, private status is better, so code ' .
- '$conf[\'newcat_default_visible\'] = true;' ;
- $cond = !$conf['newcat_default_visible'];
- $confk = 'newcat_default_visible';
- break;
-
- Case 11 :
- $adv[] = 'Current value: true.';
- $adv[] = 'Any new subscriber has access to High Resolution pictures. ' .
- 'Is it what you want? No, so try ' .
- '$conf[\'newuser_default_enabled_high\'] = false;' ;
- $cond = $conf['newuser_default_enabled_high'];
- $confk = 'newuser_default_enabled_high';
- break;
-
- Case 12 :
- $adv[] = 'Current value: ' . (string) $conf['level_separator'] . '.';
- $adv[] = 'Try something else like $conf[\'level_separator\'] = \'+ \';';
- $cond = ( $conf['level_separator'] == ' / ' );
- $confk = 'level_separator';
- break;
-
- Case 13 :
- $adv[] = 'Current value: ' . (string) $conf['paginate_pages_around'] . '.';
- $adv[] = 'Usual range is between 2 and 5. To be light, choose ' .
- '$conf[\'paginate_pages_around\'] = 2; <br />' .
- 'To offer large jump, choose $conf[\'paginate_pages_around\'] = 7;';
- $cond = (($conf['paginate_pages_around'] < 2)
- or ($conf['paginate_pages_around'] > 12));
- $confk = 'paginate_pages_around';
- break;
-
- Case 14 :
- $adv[] = 'Current value: ' . (string) $conf['tn_width'] . '.';
- $adv[] = 'Should be a close value to your thumbnail width.' .
- $adv[] = 'Usual range is between 96 and 150, ' .
- 'about $conf[\'tn_width\'] = 128;';
- $cond = (($conf['tn_width'] < 66)
- or ($conf['tn_width'] > 180));
- $confk = 'tn_width';
- break;
-
- Case 15 :
- $adv[] = 'Current value: ' . (string) $conf['tn_height'] . '.';
- $adv[] = 'Should be a close value to your thumbnail height.' .
- $adv[] = 'Usual range is between 96 and 150, ' .
- 'about $conf[\'tn_height\'] = 128;';
- $cond = (($conf['tn_height'] < 66)
- or ($conf['tn_height'] > 180));
- $confk = 'tn_height';
- break;
-
- Case 16 :
- $adv[] = 'Thumbnail height and width have to be equal.';
- $adv[] = 'Choose $conf[\'tn_height\'] = ' . (string) $conf['tn_width'] .
- ';<br />' .
- 'or $conf[\'tn_width\'] = ' . (string) $conf['tn_height'] . ';';
- $cond = ( $conf['tn_height'] !== $conf['tn_width'] );
- $confk = 'tn_height';
- break;
-
- Case 17 :
- $adv[] = 'Current value: true.';
- $adv[] = 'For security reason, please set ' .
- '$conf[\'show_version\'] = false;';
- $cond = $conf['show_version'];
- $confk = 'show_version';
- break;
-
- Case 18 :
- $adv[] = 'Current value: true.';
- $adv[] = 'For a lighter gallery just have a look to ' .
- '$conf[\'show_thumbnail_caption\'] = false;';
- $cond = $conf['show_thumbnail_caption'];
- $confk = 'show_thumbnail_caption';
- break;
-
- Case 19 :
- $adv[] = 'Current value: true.';
- $adv[] = 'For a lighter gallery just have a look to ' .
- '$conf[\'show_picture_name_on_title\'] = false;';
- $cond = $conf['show_picture_name_on_title'];
- $confk = 'show_picture_name_on_title';
- break;
-
- Case 20 :
- $adv[] = 'Current value: true.';
- $adv[] = 'If you do NOT have any category descriptions just have ' .
- 'a look to $conf[\'subcatify\'] = false;';
- $cond = $conf['subcatify'];
- $confk = 'subcatify';
- break;
-
- Case 21 :
- $adv[] = 'Current value: true.';
- $adv[] = 'Leave $conf[\'allow_random_representative\'] = true; <br />' .
- 'but analyze if you can avoid for performance reasons.' ;
- $cond = $conf['allow_random_representative'];
- $confk = 'allow_random_representative';
- break;
-
- Case 22 :
- $adv[] = 'Current value: ' . (string) $conf['prefix_thumbnail'] . '.';
- $adv[] = 'Be careful your $conf[\'prefix_thumbnail\'] is NOT standard.';
- $adv[] = 'Do NOT change it except if your thumbnails are NOT visible.';
- $adv[] = 'Distant site may use a different prefix but ' .
- 'create_listing_file.php must be modified.<br />' .
- 'You will get a warning message during synchronization in ' .
- 'that case.';
- $adv[] = 'Try to keep the same prefix thru all your sites either ' .
- 'local or distants.';
- $adv[] = 'Keep this parameter in your ./include/config_'.
- '<strong>local.inc.php</strong>. <br />'.
- 'See our wiki configuration page for more information about ' .
- './include/config_<strong>local.inc.php</strong>.';
- $cond = ( $conf['prefix_thumbnail'] !== 'TN-' );
- $confk = 'prefix_thumbnail';
- break;
-
- Case 23 :
- $adv[] = 'Current value: ' . (string) $conf['users_page'] . '.';
- $adv[] = 'Unless you have a low band connection, you can draw up ' .
- '$conf[\'users_page\'] to a higher value ' .
- 'if you have more than 20 members.';
- $cond = ( $conf['users_page'] < 21 );
- $confk = 'users_page';
- break;
-
- Case 24 :
- $adv[] = 'Current value: true.';
- $adv[] = 'Should be false, only few webmasters have to set ' .
- '$conf[\'mail_options\'] = true; <br />' .
- 'A specific advice you can get from an advanced ' .
- 'user on our forum in some mailing issues.' ;
- $cond = $conf['mail_options'];
- $confk = 'mail_options';
- break;
-
- Case 25 :
- $adv[] = 'Current value: true.';
- $adv[] = 'Should be false, only PWG dev Team have to set ' .
- '$conf[\'check_upgrade_feed\'] = true; for test purpose.' ;
- $cond = $conf['check_upgrade_feed'];
- $confk = 'check_upgrade_feed';
- break;
-
- Case 26 :
- $adv[] = '$conf[\'rate_items\'] has ' . count($conf['rate_items'])
- . 'items.';
- $adv[] = 'Your $conf[\'rate_items\'] would have 4 or 5 items not less.';
- $cond = ( count($conf['rate_items']) < 4 );
- $confk = 'rate_items';
- break;
-
- Case 27 :
- $adv[] = '$conf[\'rate_items\'] has ' . count($conf['rate_items'])
- . 'items.';
- $adv[] = 'Your $conf[\'rate_items\'] would have 5 or 6 items not more.';
- $adv[] = 'Check your best rated pictures prior to remove some values.' .
- '<br />Reduce excessive rating and change your ' .
- '$conf[\'rate_items\'].';
- $cond = ( count($conf['rate_items']) > 6 );
- $confk = 'rate_items';
- break;
-
- Case 28 :
- $adv[] = 'Current value: true.';
- $adv[] = 'Could be true, think about $conf[\'show_iptc\'] = false;'
- . '<br />Some Professional photographers choose false ' .
- 'their reasons are not really professional.' ;
- $adv[] = 'Do NOT confuse between <strong>show</strong>_iptc and ' .
- '<strong>use</strong>_iptc (have a look on metadata page ' .
- 'on our wiki).';
- $cond = $conf['show_iptc'];
- $confk = 'show_iptc';
- break;
-
- Case 29 :
- $adv[] = 'Current value: true.';
- $adv[] = 'Documentalists and professionnal photographers would ' .
- 'set it true, but beginners should leave it ' .
- 'as $conf[\'use_iptc\'] = false;';
- $adv[] = 'Take care of mentionned fields in metadata synchronization.' .
- '<br />Mentionned fields would be rewrited with IPTC values ' .
- ' even those ones are NOT empty.';
- $adv[] = 'Do NOT confuse between <strong>show</strong>_iptc and ' .
- '<strong>use</strong>_iptc (have a look on metadata page ' .
- 'on our wiki).';
- $cond = $conf['use_iptc'];
- $confk = 'use_iptc';
- break;
-
- Case 30 :
- $adv[] = 'How to deal with IPTC:';
- $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' .
- '<br />2 - Rename it as sample.jpg.' .
- '<br />3 - Run ./tools/metadata.php' .
- '<br />4 - Analyse results to determine which IPTC fields ' .
- 'could be used to override database fields.';
- $adv[] = 'Beginners would prefer to keep $conf[\'use_iptc\'] = false;';
- $adv[] = 'Advanced users make documentation efforts prior ' .
- 'to upload their pictures.<br />' .
- 'IPTC fields have to be described in ' .
- '$conf[\'use_iptc_mapping\']';
- $adv[] = 'In any case, <strong>show</strong>_iptc_mapping and ' .
- '<strong>use</strong>_iptc_mapping must be totally different.';
- $cond = true;
- $confk = 'use_iptc';
- break;
-
- Case 31 :
- $adv[] = 'How to deal with IPTC:';
- $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' .
- '<br />2 - Rename it as sample.jpg.' .
- '<br />3 - Run ./tools/metadata.php' .
- '<br />4 - Analyse results to determine which IPTC fields ' .
- 'could be used to override database fields.';
- $adv[] = 'Beginners would prefer to keep $conf[\'use_iptc\'] = false;';
- $adv[] = 'Advanced users make documentation efforts prior ' .
- 'to upload their pictures.';
- $adv[] = 'Take care of mentionned fields in metadata synchronization.' .
- '<br />Mentionned fields would be rewrited with IPTC values ' .
- ' even those ones are NOT empty.';
- $adv[] = 'In any case, <strong>show</strong>_iptc_mapping and ' .
- '<strong>use</strong>_iptc_mapping must be totally different.';
- $cond = true;
- $confk = 'use_iptc_mapping';
- break;
-
- Case 32 :
- $adv[] = 'Current value: ' . ( ( $conf['show_exif'] ) ? 'true':'false' )
- . '.';
- $adv[] = 'Should be true, some information from your camera ' .
- 'can be displayed.';
- $adv[] = 'Think about EXIF information could be different depending ' .
- 'on camera models.<br />' .
- 'If you change your camera these fields could be ' .
- 'partly different.';
- $adv[] = 'Many professional photographers choose false, ' .
- 'their reasons are to protect their knowledge.' ;
- $adv[] = 'Do NOT confuse between <strong>show</strong>_exif and ' .
- '<strong>use</strong>_exif (have a look on metadata page ' .
- 'on our wiki).';
- $cond = true;
- $confk = 'show_exif';
- break;
-
- Case 33 :
- $adv[] = 'How to deal with EXIF:';
- $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' .
- '<br />2 - Rename it as sample.jpg.' .
- '<br />3 - Run ./tools/metadata.php' .
- '<br />4 - Analyse results to determine which EXIF fields ' .
- 'could be used to override database fields.';
- $adv[] = 'Beginners would prefer to let default values.';
- $adv[] = 'Advanced users would take care of $lang values and ' .
- 'impacts on templates.';
- $adv[] = 'In any case, <strong>show</strong>_exif_fields and ' .
- '<strong>use</strong>_exif_mapping must be totally different.';
- $cond = true;
- $confk = 'show_exif_fields';
- break;
-
- Case 34 :
- $adv[] = 'Current value: ' . ( ( $conf['use_exif'] ) ? 'true':'false' )
- . '.';
- $adv[] = 'Documentalists and professionnal photographers would ' .
- 'set it true, but beginners should leave the default value.';
- $adv[] = 'Take care of mentionned fields in metadata synchronization.' .
- '<br />Mentionned fields would be rewrited with EXIF values ' .
- ' even those ones are NOT empty.';
- $adv[] = 'Do NOT confuse between <strong>show</strong>_exif and ' .
- '<strong>use</strong>_exif (have a look on metadata page ' .
- 'on our wiki).';
- $cond = true;
- $confk = 'use_exif';
- break;
-
- Case 35 :
- $adv[] = 'How to deal with EXIF:';
- $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' .
- '<br />2 - Rename it as sample.jpg.' .
- '<br />3 - Run ./tools/metadata.php' .
- '<br />4 - Analyse results to determine which EXIF fields ' .
- 'could be used to override database fields.';
- $adv[] = 'Beginners would prefer to let default values.';
- $adv[] = 'Advanced users would carefully chose overrided fields ' .
- 'prior to synchronize.';
- $adv[] = 'Take care of mentionned fields in metadata synchronization.' .
- '<br />Mentionned fields would be rewrited with EXIF values ' .
- ' even those ones are NOT empty.';
- $adv[] = 'In any case, <strong>show</strong>_exif_fields and ' .
- '<strong>use</strong>_exif_mapping must be totally different.';
- $cond = true;
- $confk = 'use_exif_mapping';
- break;
- }
-}
-
-?>
+<?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 |
+// +-----------------------------------------------------------------------+
+//$lang_info['language_name'] = 'English';
+//$lang_info['country'] = ''Great Britain';
+//$lang_info['charset'] = 'iso-8859-1';
+//$lang_info['direction'] = 'ltr';
+//$lang_info['code'] = 'en';
+global $lang;
+$lang['An_advice_about'] = 'A new advice about';
+$lang['Metadata'] = 'Metadata';
+
+foreach ($conf as $key => $value)
+{
+ if ( is_string($value) )
+ {
+ $bool = ($value == 'false') ? false : $value;
+ $bool = ($value == 'true') ? true : $bool;
+ $conf[$key] = $bool;
+ }
+}
+
+//
+// Don't forget to update range for new advices
+//
+$cases = range(1,35);
+srand ((double) microtime() * 10000000);
+shuffle($cases);
+
+$cond = false;
+foreach ($cases as $id_adv)
+{
+ if ($cond) break;
+ $adv = array();
+ switch ($id_adv) {
+ Case 1 :
+ $adv[] = 'Current value: public. ';
+ $adv[] = 'Try $conf[\'newcat_default_status\'] = \'private\';';
+ $adv[] = 'You will have more time to describe and check your pictures.';
+ $adv[] = 'Time to decide between private and public status.';
+ $adv[] = 'If you choose private, time to distribute authorization.';
+ $adv[] = 'Your new category will be well prepared.';
+ $cond = ($conf['newcat_default_status'] !== 'public');
+ $confk = 'newcat_default_status';
+ break;
+
+ Case 2 :
+ $adv[] = 'Current value: ' . (string) $conf['slideshow_period'] . '.';
+ $adv[] = 'This value could be too small for low band connections.';
+ $adv[] = 'Think about higher value like 4.';
+ $cond = ( $conf['slideshow_period'] < 4 );
+ $confk = 'slideshow_period';
+ break;
+
+ Case 3 :
+ $adv[] = 'Current value: ' . implode(', ', $conf['file_ext']) . '. ';
+ $adv[] = 'Should never contains extensions which can be executed';
+ $adv[] = 'on the server side like *.php, *.PHP, *.asp, ...';
+ $cond = ( in_array('php',$conf['file_ext']) );
+ $confk = 'file_ext';
+ break;
+
+ Case 4 :
+ $adv[] = 'Show IPTC Data from your picture:';
+ $adv[] = ' 1 - Copy one of your jpg pictures (a public one)' .
+ ' in ./tools/<br />' .
+ ' 2 - Rename it as sample.jpg.<br />' .
+ ' 3 - Run ./tools/metadata.php<br />' .
+ ' 4 - Analyse results to determine which IPTC fields could be' .
+ ' useful for your visitors.';
+ $adv[] = 'Beginners would prefer to keep $conf[\'show_iptc\'] = false;';
+ $adv[] = 'Advanced users would take care of $lang values and impacts' .
+ ' on templates.';
+ $cond = true;
+ $confk = 'show_iptc_mapping';
+ break;
+
+ Case 5 :
+ $adv[] = 'Current value: ' . (string) $conf['top_number'] . '.';
+ $adv[] = 'This value is maybe too high for low connections, ' .
+ 'think about 25-50 depending on your thumbnail sizes.';
+ $cond = ( $conf['top_number'] > 50 );
+ $confk = 'top_number';
+ break;
+
+ Case 6 :
+ $adv[] = 'Current value: ' . (string) $conf['top_number'] . '.';
+ $adv[] = 'One? It could be too low for random pictures, ' .
+ 'think about 5-10 depending on your thumbnail sizes.';
+ $cond = ( $conf['top_number'] < 2 ) ? true : false;
+ $confk = 'top_number';
+ break;
+
+ Case 7 :
+ $adv[] = 'Current value: ' . (string) $conf['anti-flood_time'] . '.';
+ $adv[] = 'For normal flow processing, your value is probably too high. ' .
+ 'Reasonable value is 60 (default).' ;
+ $cond = ( $conf['anti-flood_time'] > 100 ) ? true : false;
+ $confk = 'anti-flood_time';
+ break;
+
+ Case 8 :
+ $adv[] = 'Current value: ' . (string) $conf['calendar_datefield'] . '.';
+ $adv[] = 'Authorized values are ' .
+ "'date_creation' or 'date_available'" .
+ ', otherwise you can get unpredictable results.' ;
+ $cond = ( !in_array($conf['calendar_datefield'],
+ array('date_creation','date_available')) );
+ $confk = 'calendar_datefield';
+ break;
+
+ Case 9 :
+ // If (iptc or exif) are used and date_creation is updated
+ // Then it's Ok, you can use date_creation by default for calendar
+ // else ... Advice
+ $adv[] = 'Current value: ' . (string) $conf['calendar_datefield'] . '.';
+ $adv[] = "'date_creation'" . ' is NOT filled by ' .
+ 'any activated use metadata mapping fields.';
+ $adv[] = 'So activate metadata usage <strong>or</strong> change to ' .
+ '$conf[\'calendar_datefield\'] = \'date_available\'';
+ $adv[] = 'Activate metadata usage as you want: <br />' .
+ '1 - $conf[\'use_iptc\'] = true; or $conf[\'use_exif\'] = true; ' .
+ 'each way will be correct.<br />' .
+ '2 - And respectively map:<br />' .
+ '$conf[\'use_iptc_mapping\'] = array( ..., \'date_creation\' ' .
+ '=> \'2#055\', ...<br />' .
+ 'or/and:<br />' .
+ '$conf[\'use_exif_mapping\'] = array(\'date_creation\' ' .
+ '=> \'DateTimeOriginal\', ...<br />' .
+ '3 - Finally, a new task is up to you: Metadata synchronization.' ;
+ $cond2 = ( $conf['use_exif'] and
+ isset($conf['use_exif_mapping']['date_creation']) );
+ $cond3 = ( $conf['use_iptc'] and
+ isset($conf['use_iptc_mapping']['date_creation']) );
+ $cond = ( $conf['calendar_datefield'] == 'date_creation' );
+ $cond = ( ($cond2 or $cond3) and $cond ) ? false : true;
+ $confk = 'calendar_datefield';
+ break;
+
+ Case 10 :
+ $adv[] = 'Current value: false.';
+ $adv[] = 'Not useful, private status is better, so code ' .
+ '$conf[\'newcat_default_visible\'] = true;' ;
+ $cond = !$conf['newcat_default_visible'];
+ $confk = 'newcat_default_visible';
+ break;
+
+ Case 11 :
+ $adv[] = 'Current value: true.';
+ $adv[] = 'Any new subscriber has access to High Resolution pictures. ' .
+ 'Is it what you want? No, so try ' .
+ '$conf[\'newuser_default_enabled_high\'] = false;' ;
+ $cond = $conf['newuser_default_enabled_high'];
+ $confk = 'newuser_default_enabled_high';
+ break;
+
+ Case 12 :
+ $adv[] = 'Current value: ' . (string) $conf['level_separator'] . '.';
+ $adv[] = 'Try something else like $conf[\'level_separator\'] = \'+ \';';
+ $cond = ( $conf['level_separator'] == ' / ' );
+ $confk = 'level_separator';
+ break;
+
+ Case 13 :
+ $adv[] = 'Current value: ' . (string) $conf['paginate_pages_around'] . '.';
+ $adv[] = 'Usual range is between 2 and 5. To be light, choose ' .
+ '$conf[\'paginate_pages_around\'] = 2; <br />' .
+ 'To offer large jump, choose $conf[\'paginate_pages_around\'] = 7;';
+ $cond = (($conf['paginate_pages_around'] < 2)
+ or ($conf['paginate_pages_around'] > 12));
+ $confk = 'paginate_pages_around';
+ break;
+
+ Case 14 :
+ $adv[] = 'Current value: ' . (string) $conf['tn_width'] . '.';
+ $adv[] = 'Should be a close value to your thumbnail width.' .
+ $adv[] = 'Usual range is between 96 and 150, ' .
+ 'about $conf[\'tn_width\'] = 128;';
+ $cond = (($conf['tn_width'] < 66)
+ or ($conf['tn_width'] > 180));
+ $confk = 'tn_width';
+ break;
+
+ Case 15 :
+ $adv[] = 'Current value: ' . (string) $conf['tn_height'] . '.';
+ $adv[] = 'Should be a close value to your thumbnail height.' .
+ $adv[] = 'Usual range is between 96 and 150, ' .
+ 'about $conf[\'tn_height\'] = 128;';
+ $cond = (($conf['tn_height'] < 66)
+ or ($conf['tn_height'] > 180));
+ $confk = 'tn_height';
+ break;
+
+ Case 16 :
+ $adv[] = 'Thumbnail height and width have to be equal.';
+ $adv[] = 'Choose $conf[\'tn_height\'] = ' . (string) $conf['tn_width'] .
+ ';<br />' .
+ 'or $conf[\'tn_width\'] = ' . (string) $conf['tn_height'] . ';';
+ $cond = ( $conf['tn_height'] !== $conf['tn_width'] );
+ $confk = 'tn_height';
+ break;
+
+ Case 17 :
+ $adv[] = 'Current value: true.';
+ $adv[] = 'For security reason, please set ' .
+ '$conf[\'show_version\'] = false;';
+ $cond = $conf['show_version'];
+ $confk = 'show_version';
+ break;
+
+ Case 18 :
+ $adv[] = 'Current value: true.';
+ $adv[] = 'For a lighter gallery just have a look to ' .
+ '$conf[\'show_thumbnail_caption\'] = false;';
+ $cond = $conf['show_thumbnail_caption'];
+ $confk = 'show_thumbnail_caption';
+ break;
+
+ Case 19 :
+ $adv[] = 'Current value: true.';
+ $adv[] = 'For a lighter gallery just have a look to ' .
+ '$conf[\'show_picture_name_on_title\'] = false;';
+ $cond = $conf['show_picture_name_on_title'];
+ $confk = 'show_picture_name_on_title';
+ break;
+
+ Case 20 :
+ $adv[] = 'Current value: true.';
+ $adv[] = 'If you do NOT have any category descriptions just have ' .
+ 'a look to $conf[\'subcatify\'] = false;';
+ $cond = $conf['subcatify'];
+ $confk = 'subcatify';
+ break;
+
+ Case 21 :
+ $adv[] = 'Current value: true.';
+ $adv[] = 'Leave $conf[\'allow_random_representative\'] = true; <br />' .
+ 'but analyze if you can avoid for performance reasons.' ;
+ $cond = $conf['allow_random_representative'];
+ $confk = 'allow_random_representative';
+ break;
+
+ Case 22 :
+ $adv[] = 'Current value: ' . (string) $conf['prefix_thumbnail'] . '.';
+ $adv[] = 'Be careful your $conf[\'prefix_thumbnail\'] is NOT standard.';
+ $adv[] = 'Do NOT change it except if your thumbnails are NOT visible.';
+ $adv[] = 'Distant site may use a different prefix but ' .
+ 'create_listing_file.php must be modified.<br />' .
+ 'You will get a warning message during synchronization in ' .
+ 'that case.';
+ $adv[] = 'Try to keep the same prefix thru all your sites either ' .
+ 'local or distants.';
+ $adv[] = 'Keep this parameter in your ./include/config_'.
+ '<strong>local.inc.php</strong>. <br />'.
+ 'See our wiki configuration page for more information about ' .
+ './include/config_<strong>local.inc.php</strong>.';
+ $cond = ( $conf['prefix_thumbnail'] !== 'TN-' );
+ $confk = 'prefix_thumbnail';
+ break;
+
+ Case 23 :
+ $adv[] = 'Current value: ' . (string) $conf['users_page'] . '.';
+ $adv[] = 'Unless you have a low band connection, you can draw up ' .
+ '$conf[\'users_page\'] to a higher value ' .
+ 'if you have more than 20 members.';
+ $cond = ( $conf['users_page'] < 21 );
+ $confk = 'users_page';
+ break;
+
+ Case 24 :
+ $adv[] = 'Current value: true.';
+ $adv[] = 'Should be false, only few webmasters have to set ' .
+ '$conf[\'mail_options\'] = true; <br />' .
+ 'A specific advice you can get from an advanced ' .
+ 'user on our forum in some mailing issues.' ;
+ $cond = $conf['mail_options'];
+ $confk = 'mail_options';
+ break;
+
+ Case 25 :
+ $adv[] = 'Current value: true.';
+ $adv[] = 'Should be false, only PWG dev Team have to set ' .
+ '$conf[\'check_upgrade_feed\'] = true; for test purpose.' ;
+ $cond = $conf['check_upgrade_feed'];
+ $confk = 'check_upgrade_feed';
+ break;
+
+ Case 26 :
+ $adv[] = '$conf[\'rate_items\'] has ' . count($conf['rate_items'])
+ . 'items.';
+ $adv[] = 'Your $conf[\'rate_items\'] would have 4 or 5 items not less.';
+ $cond = ( count($conf['rate_items']) < 4 );
+ $confk = 'rate_items';
+ break;
+
+ Case 27 :
+ $adv[] = '$conf[\'rate_items\'] has ' . count($conf['rate_items'])
+ . 'items.';
+ $adv[] = 'Your $conf[\'rate_items\'] would have 5 or 6 items not more.';
+ $adv[] = 'Check your best rated pictures prior to remove some values.' .
+ '<br />Reduce excessive rating and change your ' .
+ '$conf[\'rate_items\'].';
+ $cond = ( count($conf['rate_items']) > 6 );
+ $confk = 'rate_items';
+ break;
+
+ Case 28 :
+ $adv[] = 'Current value: true.';
+ $adv[] = 'Could be true, think about $conf[\'show_iptc\'] = false;'
+ . '<br />Some Professional photographers choose false ' .
+ 'their reasons are not really professional.' ;
+ $adv[] = 'Do NOT confuse between <strong>show</strong>_iptc and ' .
+ '<strong>use</strong>_iptc (have a look on metadata page ' .
+ 'on our wiki).';
+ $cond = $conf['show_iptc'];
+ $confk = 'show_iptc';
+ break;
+
+ Case 29 :
+ $adv[] = 'Current value: true.';
+ $adv[] = 'Documentalists and professionnal photographers would ' .
+ 'set it true, but beginners should leave it ' .
+ 'as $conf[\'use_iptc\'] = false;';
+ $adv[] = 'Take care of mentionned fields in metadata synchronization.' .
+ '<br />Mentionned fields would be rewrited with IPTC values ' .
+ ' even those ones are NOT empty.';
+ $adv[] = 'Do NOT confuse between <strong>show</strong>_iptc and ' .
+ '<strong>use</strong>_iptc (have a look on metadata page ' .
+ 'on our wiki).';
+ $cond = $conf['use_iptc'];
+ $confk = 'use_iptc';
+ break;
+
+ Case 30 :
+ $adv[] = 'How to deal with IPTC:';
+ $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' .
+ '<br />2 - Rename it as sample.jpg.' .
+ '<br />3 - Run ./tools/metadata.php' .
+ '<br />4 - Analyse results to determine which IPTC fields ' .
+ 'could be used to override database fields.';
+ $adv[] = 'Beginners would prefer to keep $conf[\'use_iptc\'] = false;';
+ $adv[] = 'Advanced users make documentation efforts prior ' .
+ 'to upload their pictures.<br />' .
+ 'IPTC fields have to be described in ' .
+ '$conf[\'use_iptc_mapping\']';
+ $adv[] = 'In any case, <strong>show</strong>_iptc_mapping and ' .
+ '<strong>use</strong>_iptc_mapping must be totally different.';
+ $cond = true;
+ $confk = 'use_iptc';
+ break;
+
+ Case 31 :
+ $adv[] = 'How to deal with IPTC:';
+ $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' .
+ '<br />2 - Rename it as sample.jpg.' .
+ '<br />3 - Run ./tools/metadata.php' .
+ '<br />4 - Analyse results to determine which IPTC fields ' .
+ 'could be used to override database fields.';
+ $adv[] = 'Beginners would prefer to keep $conf[\'use_iptc\'] = false;';
+ $adv[] = 'Advanced users make documentation efforts prior ' .
+ 'to upload their pictures.';
+ $adv[] = 'Take care of mentionned fields in metadata synchronization.' .
+ '<br />Mentionned fields would be rewrited with IPTC values ' .
+ ' even those ones are NOT empty.';
+ $adv[] = 'In any case, <strong>show</strong>_iptc_mapping and ' .
+ '<strong>use</strong>_iptc_mapping must be totally different.';
+ $cond = true;
+ $confk = 'use_iptc_mapping';
+ break;
+
+ Case 32 :
+ $adv[] = 'Current value: ' . ( ( $conf['show_exif'] ) ? 'true':'false' )
+ . '.';
+ $adv[] = 'Should be true, some information from your camera ' .
+ 'can be displayed.';
+ $adv[] = 'Think about EXIF information could be different depending ' .
+ 'on camera models.<br />' .
+ 'If you change your camera these fields could be ' .
+ 'partly different.';
+ $adv[] = 'Many professional photographers choose false, ' .
+ 'their reasons are to protect their knowledge.' ;
+ $adv[] = 'Do NOT confuse between <strong>show</strong>_exif and ' .
+ '<strong>use</strong>_exif (have a look on metadata page ' .
+ 'on our wiki).';
+ $cond = true;
+ $confk = 'show_exif';
+ break;
+
+ Case 33 :
+ $adv[] = 'How to deal with EXIF:';
+ $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' .
+ '<br />2 - Rename it as sample.jpg.' .
+ '<br />3 - Run ./tools/metadata.php' .
+ '<br />4 - Analyse results to determine which EXIF fields ' .
+ 'could be used to override database fields.';
+ $adv[] = 'Beginners would prefer to let default values.';
+ $adv[] = 'Advanced users would take care of $lang values and ' .
+ 'impacts on templates.';
+ $adv[] = 'In any case, <strong>show</strong>_exif_fields and ' .
+ '<strong>use</strong>_exif_mapping must be totally different.';
+ $cond = true;
+ $confk = 'show_exif_fields';
+ break;
+
+ Case 34 :
+ $adv[] = 'Current value: ' . ( ( $conf['use_exif'] ) ? 'true':'false' )
+ . '.';
+ $adv[] = 'Documentalists and professionnal photographers would ' .
+ 'set it true, but beginners should leave the default value.';
+ $adv[] = 'Take care of mentionned fields in metadata synchronization.' .
+ '<br />Mentionned fields would be rewrited with EXIF values ' .
+ ' even those ones are NOT empty.';
+ $adv[] = 'Do NOT confuse between <strong>show</strong>_exif and ' .
+ '<strong>use</strong>_exif (have a look on metadata page ' .
+ 'on our wiki).';
+ $cond = true;
+ $confk = 'use_exif';
+ break;
+
+ Case 35 :
+ $adv[] = 'How to deal with EXIF:';
+ $adv[] = '1 - Copy one of your jpg pictures (a public one) in ./tools/' .
+ '<br />2 - Rename it as sample.jpg.' .
+ '<br />3 - Run ./tools/metadata.php' .
+ '<br />4 - Analyse results to determine which EXIF fields ' .
+ 'could be used to override database fields.';
+ $adv[] = 'Beginners would prefer to let default values.';
+ $adv[] = 'Advanced users would carefully chose overrided fields ' .
+ 'prior to synchronize.';
+ $adv[] = 'Take care of mentionned fields in metadata synchronization.' .
+ '<br />Mentionned fields would be rewrited with EXIF values ' .
+ ' even those ones are NOT empty.';
+ $adv[] = 'In any case, <strong>show</strong>_exif_fields and ' .
+ '<strong>use</strong>_exif_mapping must be totally different.';
+ $cond = true;
+ $confk = 'use_exif_mapping';
+ break;
+ }
+}
+
+?>
diff --git a/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php b/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php
index e6a6a6cc6..d7399333c 100644
--- a/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php
+++ b/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php
@@ -1,479 +1,479 @@
-<?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 |
-// +-----------------------------------------------------------------------+
-//$lang_info['language_name'] = 'Français';
-//$lang_info['country'] = 'France';
-//$lang_info['charset'] = 'iso-8859-1';
-//$lang_info['direction'] = 'ltr';
-//$lang_info['code'] = 'fr';
-global $lang;
-$lang['An_advice_about'] = 'Un nouveau conseil à propos de ';
-$lang['Metadata'] = 'Méta-données';
-
-foreach ($conf as $key => $value)
-{
- if ( is_string($value) )
- {
- $bool = ($value == 'false') ? false : $value;
- $bool = ($value == 'true') ? true : $bool;
- $conf[$key] = $bool;
- }
-}
-
-//
-// Don't forget to update range for new advices
-//
-$cases = range(1,35);
-srand ((double) microtime() * 10000000);
-shuffle($cases);
-
-$cond = false;
-foreach ($cases as $id_adv)
-{
- if ($cond) break;
- $adv = array();
- switch ($id_adv) {
- Case 1 :
- $adv[] = 'Valeur actuelle : public. ';
- $adv[] = 'Essayez $conf[\'newcat_default_status\'] = \'private\';';
- $adv[] = 'Vous aurez plus de temps pour décrire et contrôler vos images. '
- . 'Du temps pour vous décider entre un statut privé ou public.';
- $adv[] = 'Si vous choisissez de rester privé, vous passerez directement '
- . 'à l\'attribution des autorisations. <br />'
- . 'Vos nouvelles catégories seront préparées plus facilement.';
- $cond = ($conf['newcat_default_status'] !== 'public');
- $confk = 'newcat_default_status';
- break;
-
- Case 2 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['slideshow_period'] . '.';
- $adv[] = 'Ce délai pourrait être trop petit pour les connexions '
- . 'en bas débit.';
- $adv[] = 'Pensez à une valeur supérieure comme 4.';
- $cond = ( $conf['slideshow_period'] < 4 );
- $confk = 'slideshow_period';
- break;
-
- Case 3 :
- $adv[] = 'Valeur actuelle : ' . implode(', ', $conf['file_ext']) . '. ';
- $adv[] = 'Ne devrait jamais contenir des extensions pouvant être ';
- $adv[] = 'exécutées sur le serveur comme *.php, *.PHP, *.asp, ...';
- $cond = ( in_array('php',$conf['file_ext']) );
- $confk = 'file_ext';
- break;
-
- Case 4 :
- $adv[] = 'Comment gérer les IPTC:';
- $adv[] = ' 1 - Copiez une image jpg (publique) dans ./tools/<br />'
- . ' 2 - Renommez celle-ci en sample.jpg.<br />'
- . ' 3 - Lancez ./tools/metadata.php<br />'
- . ' 4 - Analysez les résultats pour déterminer quels champs '
- . 'IPTC pourraient intéresser vos visiteurs.';
- $adv[] = 'Les débutants laisseront $conf[\'show_iptc\'] = false;';
- $adv[] = 'Les utilisateurs avancés penseront aux valeurs du tableau '
- . '$lang; voire même à l\'impact possible sur les templates.';
- $cond = true;
- $confk = 'show_iptc_mapping';
- break;
-
- Case 5 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['top_number'] . '.';
- $adv[] = 'Cette valeur pourrait être trop grande pour des connexions '
- . 'bas débit.<br /> Pensez à une valeur située entre 25-50 '
- . 'en fonction de la taille de vos minitures.';
- $cond = ( $conf['top_number'] > 50 );
- $confk = 'top_number';
- break;
-
- Case 6 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['top_number'] . '.';
- $adv[] = 'Une seule? Au moins pour les images aléatoires, pensez '
- . 'autour de 5-10 selon la tailles de vos miniatures.';
- $cond = ( $conf['top_number'] < 2 ) ? true : false;
- $confk = 'top_number';
- break;
-
- Case 7 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['anti-flood_time'] . '.';
- $adv[] = 'Pour un traitement fluide, votre valeur est sans doute trop '
- . 'grande. Une valeur raisonnable serait 60 (valeur par défaut).' ;
- $cond = ( $conf['anti-flood_time'] > 100 ) ? true : false;
- $confk = 'anti-flood_time';
- break;
-
- Case 8 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['calendar_datefield'] .'.';
- $adv[] = 'Les valeurs admises sont '
- . "'date_creation' ou 'date_available'" . ', toute autre valeur'
- . 'peut aboutir à des résultats imprévisibles.' ;
- $cond = ( !in_array($conf['calendar_datefield'],
- array('date_creation','date_available')) );
- $confk = 'calendar_datefield';
- break;
-
- Case 9 :
- // If (iptc or exif) are used and date_creation is updated
- // Then it's Ok, you can use date_creation by default for calendar
- // else ... Advise
- $adv[] = 'Valeur actuelle : ' . (string) $conf['calendar_datefield'] .'.';
- $adv[] = "La 'date_creation'" . ' n\'est pas renseignée. Aucun champ '
- . 'des méta-données (use_) n\'actualise la base.';
- $adv[] = 'Soit vous activez l\'usage des méta-données <strong>ou'
- . '</strong> changez pour '
- . '$conf[\'calendar_datefield\'] = \'date_available\'';
- $adv[] = 'Activez l\'usage des méta-données simplement par: <br />'
- . '1 - $conf[\'use_iptc\'] = true; ou $conf[\'use_exif\'] = true; '
- . 'au choix, les 2 sont valables.<br />'
- . '2 - Respectivement à chacune faire la modif:<br />'
- . '$conf[\'use_iptc_mapping\'] = array( ..., \'date_creation\' '
- . '=> \'2#055\', ...<br />'
- . 'et/ou:<br />'
- . '$conf[\'use_exif_mapping\'] = array(\'date_creation\' '
- . '=> \'DateTimeOriginal\', ...<br />'
- . '3 - Enfin une nouvelle tache vous est destinée: '
- . 'la synchronisation des méta-données.' ;
- $cond2 = ( $conf['use_exif'] and
- isset($conf['use_exif_mapping']['date_creation']) );
- $cond3 = ( $conf['use_iptc'] and
- isset($conf['use_iptc_mapping']['date_creation']) );
- $cond = ( $conf['calendar_datefield'] == 'date_creation' );
- $cond = ( ($cond2 or $cond3) and $cond ) ? false : true;
- $confk = 'calendar_datefield';
- break;
-
- Case 10 :
- $adv[] = 'Valeur actuelle : false.';
- $adv[] = 'C\'est une erreur, un statut "private" est plus simple, '
- . 'alors choisissez $conf[\'newcat_default_visible\'] = true;' ;
- $cond = !$conf['newcat_default_visible'];
- $confk = 'newcat_default_visible';
- break;
-
- Case 11 :
- $adv[] = 'Valeur actuelle : true.';
- $adv[] = 'Il suffit de s\'inscrire pour avoir accès aux images en Haute '
- . 'résolution. Même les visiteurs occasionnels ont cet accès. '
- . '<br />C\'est bien ce que vous voulez, n\'est-ce pas? '
- . 'Non? Alors essayez ceci:<br />' .
- '$conf[\'newuser_default_enabled_high\'] = false;' ;
- $cond = $conf['newuser_default_enabled_high'];
- $confk = 'newuser_default_enabled_high';
- break;
-
- Case 12 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['level_separator'] . '.';
- $adv[] = 'Vous pouvez toujours essayer un autre séparateur commme :'
- . '<br />$conf[\'level_separator\'] = \'+ \';';
- $cond = ( $conf['level_separator'] == ' / ' );
- $confk = 'level_separator';
- break;
-
- Case 13 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['paginate_pages_around']
- . '.';
- $adv[] = 'Les valeurs habituelles se situent entre 2 et 5.'
- . 'Pour un site avec une interface légère, on choisira : <br />'
- . '$conf[\'paginate_pages_around\'] = 2; <br />'
- . 'Afin de proposer plus d\'accès directs, on choisira : <br />'
- . '$conf[\'paginate_pages_around\'] = 7;';
- $cond = (($conf['paginate_pages_around'] < 2)
- or ($conf['paginate_pages_around'] > 12));
- $confk = 'paginate_pages_around';
- break;
-
- Case 14 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['tn_width'] . '.';
- $adv[] = 'Doit être une valeur proche de la largeur de vos miniatures.';
- $adv[] = 'Les valeurs habituelles se situent entre 96 et 150, '
- . 'comme $conf[\'tn_width\'] = 128;';
- $cond = (($conf['tn_width'] < 66)
- or ($conf['tn_width'] > 180));
- $confk = 'tn_width';
- break;
-
- Case 15 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['tn_height'] . '.';
- $adv[] = 'Doit être une valeur proche de la hauteur de vos miniatures.';
- $adv[] = 'Les valeurs habituelles se situent entre 96 et 150, '
- . 'comme $conf[\'tn_height\'] = 128;';
- $cond = (($conf['tn_height'] < 66)
- or ($conf['tn_height'] > 180));
- $confk = 'tn_height';
- break;
-
- Case 16 :
- $adv[] = 'Il n\'y a aucune raison pour que la largeur maximale soit '
- . 'différente de la hauteur maximale. Pourquoi les ajouts en '
- . 'portrait afficheraient des miniatures dans une résolution '
- . 'différente de celle des miniatures en paysage?';
- $adv[] = 'Essayez $conf[\'tn_height\'] = ' . (string) $conf['tn_width']
- . ';<br />'
- . 'ou $conf[\'tn_width\'] = ' . (string) $conf['tn_height'] . ';';
- $cond = ( $conf['tn_height'] !== $conf['tn_width'] );
- $confk = 'tn_height';
- break;
-
- Case 17 :
- $adv[] = 'Valeur actuelle : true.';
- $adv[] = 'Pour des raisons de sécurité de votre galerie, préférez '
- . '$conf[\'show_version\'] = false;';
- $cond = $conf['show_version'];
- $confk = 'show_version';
- break;
-
- Case 18 :
- $adv[] = 'Valeur actuelle : true.';
- $adv[] = 'Pour une galerie moins chargée, faites le test de '
- . '$conf[\'show_thumbnail_caption\'] = false;';
- $cond = $conf['show_thumbnail_caption'];
- $confk = 'show_thumbnail_caption';
- break;
-
- Case 19 :
- $adv[] = 'Valeur actuelle : true.';
- $adv[] = 'Pour une galerie moins chargée, faites le test de '
- . '$conf[\'show_picture_name_on_title\'] = false;';
- $cond = $conf['show_picture_name_on_title'];
- $confk = 'show_picture_name_on_title';
- break;
-
- Case 20 :
- $adv[] = 'Valeur actuelle : true.';
- $adv[] = 'Aucune de vos catégories ne possède de descriptions alors '
- . 'essayez $conf[\'subcatify\'] = false;';
- $cond = $conf['subcatify'];
- $confk = 'subcatify';
- break;
-
- Case 21 :
- $adv[] = 'Valeur actuelle : true.';
- $adv[] = 'Laissez $conf[\'allow_random_representative\'] = true; <br />'
- . 'mais étudiez comment vous pouvez l\'éviter pour des raisons '
- . 'de performance.' ;
- $cond = $conf['allow_random_representative'];
- $confk = 'allow_random_representative';
- break;
-
- Case 22 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['prefix_thumbnail'] . '.';
- $adv[] = 'Attention, votre $conf[\'prefix_thumbnail\'] n\'est pas '
- . 'standard.';
- $adv[] = 'Ne pas changer votre préfixe sauf si vos miniatures ont un '
- . 'problème d\'affichage.';
- $adv[] = 'Un site distant peut avoir un préfixe différent, le '
- . 'create_listing_file.php devra être modifié.<br />'
- . 'Vous devriez avoir un message d\'avertissement pendant la '
- . 'synchronisation dans ce cas.';
- $adv[] = 'Try to keep the same prefix thru all your sites either '
- . 'local or distants.';
- $adv[] = 'Conservez ce paramètre dans votre ./include/config_'
- . '<strong>local.inc.php</strong>. <br />'
- . 'Voir la page sur la configuration dans le Wiki pour plus '
- . 'd\'informations à propos de '
- . './include/config_<strong>local.inc.php</strong>.';
- $cond = ( $conf['prefix_thumbnail'] !== 'TN-' );
- $confk = 'prefix_thumbnail';
- break;
-
- Case 23 :
- $adv[] = 'Valeur actuelle : ' . (string) $conf['users_page'] . '.';
- $adv[] = 'A moins d\'avoir une connexion bas débit, vous pouvez '
- . 'augmenter largement $conf[\'users_page\'] '
- . 'surtout si vous avez plus de 20 membres.';
- $cond = ( $conf['users_page'] < 21 );
- $confk = 'users_page';
- break;
-
- Case 24 :
- $adv[] = 'Valeur actuelle : true.';
- $adv[] = 'Devrait être à false, seulement quelques webmasters devront '
- . 'indiquer $conf[\'mail_options\'] = true; <br />'
- . 'Un utilisateur avancé de notre forum les aura conseillé '
- . 'dans un seul cas de problème d\'email.' ;
- $cond = $conf['mail_options'];
- $confk = 'mail_options';
- break;
-
- Case 25 :
- $adv[] = 'Valeur actuelle : true.';
- $adv[] = 'Devrait être à false, seuls les membres de l\'équipe PWG '
- . 'codent $conf[\'check_upgrade_feed\'] = true; pour leurs tests.';
- $cond = $conf['check_upgrade_feed'];
- $confk = 'check_upgrade_feed';
- break;
-
- Case 26 :
- $adv[] = '$conf[\'rate_items\'] dispose de ' . count($conf['rate_items'])
- . 'éléments.';
- $adv[] = 'Votre $conf[\'rate_items\'] devrait avoir 4 ou 5 éléments '
- . 'mais pas moins.';
- $cond = ( count($conf['rate_items']) < 4 );
- $confk = 'rate_items';
- break;
-
- Case 27 :
- $adv[] = '$conf[\'rate_items\'] has ' . count($conf['rate_items'])
- . 'items.';
- $adv[] = 'Votre $conf[\'rate_items\'] devrait avoir 4 ou 5 éléments '
- . 'mais pas plus.';
- $adv[] = 'Contrôlez vos images les mieux notées avant de retirer '
- . ' certaines valeurs.'
- . '<br />Réduire les valeurs excessives et modifiez votre '
- . '$conf[\'rate_items\'].';
- $cond = ( count($conf['rate_items']) > 6 );
- $confk = 'rate_items';
- break;
-
- Case 28 :
- $adv[] = 'Valeur actuelle : true.';
- $adv[] = 'Peut être effectivement à true, éventuellement choisissez '
- . '$conf[\'show_iptc\'] = false;'
- . '<br />Comme quelques photographes professionnels choisissez '
- . 'false bien que leurs raisons ne soient guère professionnelles.';
- $adv[] = 'Ne confondez pas <strong>show</strong>_iptc et '
- . '<strong>use</strong>_iptc (consultez la pages de métadonnées '
- . 'sur notre wiki).';
- $cond = $conf['show_iptc'];
- $confk = 'show_iptc';
- break;
-
- Case 29 :
- $adv[] = 'Valeur actuelle : true.';
- $adv[] = 'Les documentalistes et photographes professionnels choisiront '
- . 'cette valeur true, mais les débutants devraient laisser '
- . '$conf[\'use_iptc\'] = false;';
- $adv[] = 'Faire attention aux champs mentionnés dans la synchronisation '
- . 'des métadonnées.<br />Les champs indiqués pourront être '
- . 'écrasés par des valeurs de champs IPTC quand bien même ces '
- . 'champs ne seraient pas vides.';
- $adv[] = 'Ne confondez pas <strong>show</strong>_iptc et '
- . '<strong>use</strong>_iptc (consultez la pages de métadonnées '
- . 'sur notre wiki).';
- $cond = $conf['use_iptc'];
- $confk = 'use_iptc';
- break;
-
- Case 30 :
- $adv[] = 'Comment gérer les IPTC:';
- $adv[] = ' 1 - Copiez une image jpg (publique) dans ./tools/<br />'
- . ' 2 - Renommez celle-ci en sample.jpg.<br />'
- . ' 3 - Lancez ./tools/metadata.php<br />'
- . ' 4 - Analysez les résultats pour déterminer quels champs '
- . 'IPTC pourraient intéresser vos visiteurs.';
- $adv[] = 'Les débutants laisseront $conf[\'use_iptc\'] = false;';
- $adv[] = 'Les utilisateurs avancés feront des efforts de documentation '
- . 'avant de transférer leurs images.<br />'
- . 'Les champs IPTC doivent être décrits par '
- . '$conf[\'use_iptc_mapping\']';
- $adv[] = 'Dans tous les cas, <strong>show</strong>_iptc_mapping et '
- . '<strong>use</strong>_iptc_mapping seront '
- . 'totalement différents.';
- $cond = true;
- $confk = 'use_iptc';
- break;
-
- Case 31 :
- $adv[] = 'Comment gérer les IPTC:';
- $adv[] = ' 1 - Copiez une image jpg (publique) dans ./tools/<br />'
- . ' 2 - Renommez celle-ci en sample.jpg.<br />'
- . ' 3 - Lancez ./tools/metadata.php<br />'
- . ' 4 - Analysez les résultats pour déterminer quels champs '
- . 'IPTC pourraient intéresser vos visiteurs.';
- $adv[] = 'Les débutants laisseront $conf[\'use_iptc\'] = false;';
- $adv[] = 'Les utilisateurs avancés feront des efforts de documentation '
- . 'avant de transférer leurs images.<br />'
- . 'Les champs IPTC doivent être décrits par '
- . '$conf[\'use_iptc_mapping\']';
- $adv[] = 'Faire attention aux champs mentionnés dans la synchronisation '
- . 'des métadonnées.<br />Les champs indiqués pourront être '
- . 'écrasés par des valeurs de champs IPTC quand bien même ces '
- . 'champs ne seraient pas vides.';
- $adv[] = 'Dans tous les cas, <strong>show</strong>_iptc_mapping et '
- . '<strong>use</strong>_iptc_mapping seront '
- . 'totalement différents.';
- $cond = true;
- $confk = 'use_iptc_mapping';
- break;
-
- Case 32 :
- $adv[] = 'Valeur actuelle : '
- . ( ( $conf['show_exif'] ) ? 'true':'false' ) . '.';
- $adv[] = 'Devrait être à true, certaines informations propres à votre '
- . 'appareil pourront être affichées.';
- $adv[] = 'Pensez au fait que les informations EXIF peuvent être '
- . 'différentes suivant les modèles d\'appareil.<br />'
- . 'Si vous changez votre appareil ces champs pourraient en '
- . 'partie differents.';
- $adv[] = 'Beaucoup de photographes professionnels choissent false, '
- . 'ceci afin de protéger leur savoir-faire.' ;
- $adv[] = 'Ne confondez pas <strong>show</strong>_exif et '
- . '<strong>use</strong>_exif (consultez la pages de métadonnées '
- . 'sur notre wiki).';
- $cond = true;
- $confk = 'show_exif';
- break;
-
- Case 33 :
- $adv[] = 'Comment gérer les EXIF:';
- $adv[] = ' 1 - Copiez une image jpg (publique) dans ./tools/<br />'
- . ' 2 - Renommez celle-ci en sample.jpg.<br />'
- . ' 3 - Lancez ./tools/metadata.php<br />'
- . ' 4 - Analysez les résultats pour déterminer quels champs '
- . 'EXIF pourraient intéresser vos visiteurs.';
- $adv[] = 'Les débutants laisseront la valeur par défaut.';
- $adv[] = 'Les utilisateurs avancés penseront aux valeurs du tableau '
- . '$lang; voire même à l\'impact possible sur les templates.';
- $adv[] = 'Dans tous les cas, <strong>show</strong>_exif_fields et '
- . '<strong>use</strong>_exif_mapping seront '
- . 'totalement différents.';
- $cond = true;
- $confk = 'show_exif_fields';
- break;
-
- Case 34 :
- $adv[] = 'Valeur actuelle : ' . ( ( $conf['use_exif'] ) ? 'true':'false' )
- . '.';
- $adv[] = 'Les documentalistes et photographes professionnels choisiront '
- . 'cette valeur true, mais les débutants devraient laisser '
- . 'la valeur par défaut.';
- $adv[] = 'Faire attention aux champs mentionnés dans la synchronisation '
- . 'des métadonnées.<br />Les champs indiqués pourront être '
- . 'écrasés par des valeurs de champs EXIF quand bien même ces '
- . 'champs ne seraient pas vides.';
- $adv[] = 'Ne confondez pas <strong>show</strong>_exif et '
- . '<strong>use</strong>_exif (consultez la pages de métadonnées '
- . 'sur notre wiki).';
- $cond = true;
- $confk = 'use_exif';
- break;
-
- Case 35 :
- $adv[] = 'Comment gérer les EXIF:';
- $adv[] = ' 1 - Copiez une image jpg (publique) dans ./tools/<br />'
- . ' 2 - Renommez celle-ci en sample.jpg.<br />'
- . ' 3 - Lancez ./tools/metadata.php<br />'
- . ' 4 - Analysez les résultats pour déterminer quels champs '
- . 'EXIF pourraient intéresser vos visiteurs.';
- $adv[] = 'Les débutants laisseront la valeur par défaut.';
- $adv[] = 'Les utilisateurs avancés penseront aux valeurs du tableau '
- . '$lang; voire même à l\'impact possible sur les templates.';
- $adv[] = 'Les débutants laisseront $conf[\'use_exif\'] = false;';
- $adv[] = 'Les utilisateurs avancés feront très attention aux champs '
- . 'sélectionnés et modifiés par la synchronisation.';
- $adv[] = 'Faire attention aux champs mentionnés dans la synchronisation '
- . 'des métadonnées.<br />Ces champs pourront être '
- . 'écrasés par des valeurs de champs EXIF quand bien même ces '
- . 'champs ne seraient pas vides.';
- $adv[] = 'Dans tous les cas, <strong>show</strong>_exif_fields et '
- . '<strong>use</strong>_exif_mapping seront '
- . 'totalement différents.';
- $cond = true;
- $confk = 'use_exif_mapping';
- break;
- }
-}
-
-?>
+<?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 |
+// +-----------------------------------------------------------------------+
+//$lang_info['language_name'] = 'Français';
+//$lang_info['country'] = 'France';
+//$lang_info['charset'] = 'iso-8859-1';
+//$lang_info['direction'] = 'ltr';
+//$lang_info['code'] = 'fr';
+global $lang;
+$lang['An_advice_about'] = 'Un nouveau conseil à propos de ';
+$lang['Metadata'] = 'Méta-données';
+
+foreach ($conf as $key => $value)
+{
+ if ( is_string($value) )
+ {
+ $bool = ($value == 'false') ? false : $value;
+ $bool = ($value == 'true') ? true : $bool;
+ $conf[$key] = $bool;
+ }
+}
+
+//
+// Don't forget to update range for new advices
+//
+$cases = range(1,35);
+srand ((double) microtime() * 10000000);
+shuffle($cases);
+
+$cond = false;
+foreach ($cases as $id_adv)
+{
+ if ($cond) break;
+ $adv = array();
+ switch ($id_adv) {
+ Case 1 :
+ $adv[] = 'Valeur actuelle : public. ';
+ $adv[] = 'Essayez $conf[\'newcat_default_status\'] = \'private\';';
+ $adv[] = 'Vous aurez plus de temps pour décrire et contrôler vos images. '
+ . 'Du temps pour vous décider entre un statut privé ou public.';
+ $adv[] = 'Si vous choisissez de rester privé, vous passerez directement '
+ . 'à l\'attribution des autorisations. <br />'
+ . 'Vos nouvelles catégories seront préparées plus facilement.';
+ $cond = ($conf['newcat_default_status'] !== 'public');
+ $confk = 'newcat_default_status';
+ break;
+
+ Case 2 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['slideshow_period'] . '.';
+ $adv[] = 'Ce délai pourrait être trop petit pour les connexions '
+ . 'en bas débit.';
+ $adv[] = 'Pensez à une valeur supérieure comme 4.';
+ $cond = ( $conf['slideshow_period'] < 4 );
+ $confk = 'slideshow_period';
+ break;
+
+ Case 3 :
+ $adv[] = 'Valeur actuelle : ' . implode(', ', $conf['file_ext']) . '. ';
+ $adv[] = 'Ne devrait jamais contenir des extensions pouvant être ';
+ $adv[] = 'exécutées sur le serveur comme *.php, *.PHP, *.asp, ...';
+ $cond = ( in_array('php',$conf['file_ext']) );
+ $confk = 'file_ext';
+ break;
+
+ Case 4 :
+ $adv[] = 'Comment gérer les IPTC:';
+ $adv[] = ' 1 - Copiez une image jpg (publique) dans ./tools/<br />'
+ . ' 2 - Renommez celle-ci en sample.jpg.<br />'
+ . ' 3 - Lancez ./tools/metadata.php<br />'
+ . ' 4 - Analysez les résultats pour déterminer quels champs '
+ . 'IPTC pourraient intéresser vos visiteurs.';
+ $adv[] = 'Les débutants laisseront $conf[\'show_iptc\'] = false;';
+ $adv[] = 'Les utilisateurs avancés penseront aux valeurs du tableau '
+ . '$lang; voire même à l\'impact possible sur les templates.';
+ $cond = true;
+ $confk = 'show_iptc_mapping';
+ break;
+
+ Case 5 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['top_number'] . '.';
+ $adv[] = 'Cette valeur pourrait être trop grande pour des connexions '
+ . 'bas débit.<br /> Pensez à une valeur située entre 25-50 '
+ . 'en fonction de la taille de vos minitures.';
+ $cond = ( $conf['top_number'] > 50 );
+ $confk = 'top_number';
+ break;
+
+ Case 6 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['top_number'] . '.';
+ $adv[] = 'Une seule? Au moins pour les images aléatoires, pensez '
+ . 'autour de 5-10 selon la tailles de vos miniatures.';
+ $cond = ( $conf['top_number'] < 2 ) ? true : false;
+ $confk = 'top_number';
+ break;
+
+ Case 7 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['anti-flood_time'] . '.';
+ $adv[] = 'Pour un traitement fluide, votre valeur est sans doute trop '
+ . 'grande. Une valeur raisonnable serait 60 (valeur par défaut).' ;
+ $cond = ( $conf['anti-flood_time'] > 100 ) ? true : false;
+ $confk = 'anti-flood_time';
+ break;
+
+ Case 8 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['calendar_datefield'] .'.';
+ $adv[] = 'Les valeurs admises sont '
+ . "'date_creation' ou 'date_available'" . ', toute autre valeur'
+ . 'peut aboutir à des résultats imprévisibles.' ;
+ $cond = ( !in_array($conf['calendar_datefield'],
+ array('date_creation','date_available')) );
+ $confk = 'calendar_datefield';
+ break;
+
+ Case 9 :
+ // If (iptc or exif) are used and date_creation is updated
+ // Then it's Ok, you can use date_creation by default for calendar
+ // else ... Advise
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['calendar_datefield'] .'.';
+ $adv[] = "La 'date_creation'" . ' n\'est pas renseignée. Aucun champ '
+ . 'des méta-données (use_) n\'actualise la base.';
+ $adv[] = 'Soit vous activez l\'usage des méta-données <strong>ou'
+ . '</strong> changez pour '
+ . '$conf[\'calendar_datefield\'] = \'date_available\'';
+ $adv[] = 'Activez l\'usage des méta-données simplement par: <br />'
+ . '1 - $conf[\'use_iptc\'] = true; ou $conf[\'use_exif\'] = true; '
+ . 'au choix, les 2 sont valables.<br />'
+ . '2 - Respectivement à chacune faire la modif:<br />'
+ . '$conf[\'use_iptc_mapping\'] = array( ..., \'date_creation\' '
+ . '=> \'2#055\', ...<br />'
+ . 'et/ou:<br />'
+ . '$conf[\'use_exif_mapping\'] = array(\'date_creation\' '
+ . '=> \'DateTimeOriginal\', ...<br />'
+ . '3 - Enfin une nouvelle tache vous est destinée: '
+ . 'la synchronisation des méta-données.' ;
+ $cond2 = ( $conf['use_exif'] and
+ isset($conf['use_exif_mapping']['date_creation']) );
+ $cond3 = ( $conf['use_iptc'] and
+ isset($conf['use_iptc_mapping']['date_creation']) );
+ $cond = ( $conf['calendar_datefield'] == 'date_creation' );
+ $cond = ( ($cond2 or $cond3) and $cond ) ? false : true;
+ $confk = 'calendar_datefield';
+ break;
+
+ Case 10 :
+ $adv[] = 'Valeur actuelle : false.';
+ $adv[] = 'C\'est une erreur, un statut "private" est plus simple, '
+ . 'alors choisissez $conf[\'newcat_default_visible\'] = true;' ;
+ $cond = !$conf['newcat_default_visible'];
+ $confk = 'newcat_default_visible';
+ break;
+
+ Case 11 :
+ $adv[] = 'Valeur actuelle : true.';
+ $adv[] = 'Il suffit de s\'inscrire pour avoir accès aux images en Haute '
+ . 'résolution. Même les visiteurs occasionnels ont cet accès. '
+ . '<br />C\'est bien ce que vous voulez, n\'est-ce pas? '
+ . 'Non? Alors essayez ceci:<br />' .
+ '$conf[\'newuser_default_enabled_high\'] = false;' ;
+ $cond = $conf['newuser_default_enabled_high'];
+ $confk = 'newuser_default_enabled_high';
+ break;
+
+ Case 12 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['level_separator'] . '.';
+ $adv[] = 'Vous pouvez toujours essayer un autre séparateur commme :'
+ . '<br />$conf[\'level_separator\'] = \'+ \';';
+ $cond = ( $conf['level_separator'] == ' / ' );
+ $confk = 'level_separator';
+ break;
+
+ Case 13 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['paginate_pages_around']
+ . '.';
+ $adv[] = 'Les valeurs habituelles se situent entre 2 et 5.'
+ . 'Pour un site avec une interface légère, on choisira : <br />'
+ . '$conf[\'paginate_pages_around\'] = 2; <br />'
+ . 'Afin de proposer plus d\'accès directs, on choisira : <br />'
+ . '$conf[\'paginate_pages_around\'] = 7;';
+ $cond = (($conf['paginate_pages_around'] < 2)
+ or ($conf['paginate_pages_around'] > 12));
+ $confk = 'paginate_pages_around';
+ break;
+
+ Case 14 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['tn_width'] . '.';
+ $adv[] = 'Doit être une valeur proche de la largeur de vos miniatures.';
+ $adv[] = 'Les valeurs habituelles se situent entre 96 et 150, '
+ . 'comme $conf[\'tn_width\'] = 128;';
+ $cond = (($conf['tn_width'] < 66)
+ or ($conf['tn_width'] > 180));
+ $confk = 'tn_width';
+ break;
+
+ Case 15 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['tn_height'] . '.';
+ $adv[] = 'Doit être une valeur proche de la hauteur de vos miniatures.';
+ $adv[] = 'Les valeurs habituelles se situent entre 96 et 150, '
+ . 'comme $conf[\'tn_height\'] = 128;';
+ $cond = (($conf['tn_height'] < 66)
+ or ($conf['tn_height'] > 180));
+ $confk = 'tn_height';
+ break;
+
+ Case 16 :
+ $adv[] = 'Il n\'y a aucune raison pour que la largeur maximale soit '
+ . 'différente de la hauteur maximale. Pourquoi les ajouts en '
+ . 'portrait afficheraient des miniatures dans une résolution '
+ . 'différente de celle des miniatures en paysage?';
+ $adv[] = 'Essayez $conf[\'tn_height\'] = ' . (string) $conf['tn_width']
+ . ';<br />'
+ . 'ou $conf[\'tn_width\'] = ' . (string) $conf['tn_height'] . ';';
+ $cond = ( $conf['tn_height'] !== $conf['tn_width'] );
+ $confk = 'tn_height';
+ break;
+
+ Case 17 :
+ $adv[] = 'Valeur actuelle : true.';
+ $adv[] = 'Pour des raisons de sécurité de votre galerie, préférez '
+ . '$conf[\'show_version\'] = false;';
+ $cond = $conf['show_version'];
+ $confk = 'show_version';
+ break;
+
+ Case 18 :
+ $adv[] = 'Valeur actuelle : true.';
+ $adv[] = 'Pour une galerie moins chargée, faites le test de '
+ . '$conf[\'show_thumbnail_caption\'] = false;';
+ $cond = $conf['show_thumbnail_caption'];
+ $confk = 'show_thumbnail_caption';
+ break;
+
+ Case 19 :
+ $adv[] = 'Valeur actuelle : true.';
+ $adv[] = 'Pour une galerie moins chargée, faites le test de '
+ . '$conf[\'show_picture_name_on_title\'] = false;';
+ $cond = $conf['show_picture_name_on_title'];
+ $confk = 'show_picture_name_on_title';
+ break;
+
+ Case 20 :
+ $adv[] = 'Valeur actuelle : true.';
+ $adv[] = 'Aucune de vos catégories ne possède de descriptions alors '
+ . 'essayez $conf[\'subcatify\'] = false;';
+ $cond = $conf['subcatify'];
+ $confk = 'subcatify';
+ break;
+
+ Case 21 :
+ $adv[] = 'Valeur actuelle : true.';
+ $adv[] = 'Laissez $conf[\'allow_random_representative\'] = true; <br />'
+ . 'mais étudiez comment vous pouvez l\'éviter pour des raisons '
+ . 'de performance.' ;
+ $cond = $conf['allow_random_representative'];
+ $confk = 'allow_random_representative';
+ break;
+
+ Case 22 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['prefix_thumbnail'] . '.';
+ $adv[] = 'Attention, votre $conf[\'prefix_thumbnail\'] n\'est pas '
+ . 'standard.';
+ $adv[] = 'Ne pas changer votre préfixe sauf si vos miniatures ont un '
+ . 'problème d\'affichage.';
+ $adv[] = 'Un site distant peut avoir un préfixe différent, le '
+ . 'create_listing_file.php devra être modifié.<br />'
+ . 'Vous devriez avoir un message d\'avertissement pendant la '
+ . 'synchronisation dans ce cas.';
+ $adv[] = 'Try to keep the same prefix thru all your sites either '
+ . 'local or distants.';
+ $adv[] = 'Conservez ce paramètre dans votre ./include/config_'
+ . '<strong>local.inc.php</strong>. <br />'
+ . 'Voir la page sur la configuration dans le Wiki pour plus '
+ . 'd\'informations à propos de '
+ . './include/config_<strong>local.inc.php</strong>.';
+ $cond = ( $conf['prefix_thumbnail'] !== 'TN-' );
+ $confk = 'prefix_thumbnail';
+ break;
+
+ Case 23 :
+ $adv[] = 'Valeur actuelle : ' . (string) $conf['users_page'] . '.';
+ $adv[] = 'A moins d\'avoir une connexion bas débit, vous pouvez '
+ . 'augmenter largement $conf[\'users_page\'] '
+ . 'surtout si vous avez plus de 20 membres.';
+ $cond = ( $conf['users_page'] < 21 );
+ $confk = 'users_page';
+ break;
+
+ Case 24 :
+ $adv[] = 'Valeur actuelle : true.';
+ $adv[] = 'Devrait être à false, seulement quelques webmasters devront '
+ . 'indiquer $conf[\'mail_options\'] = true; <br />'
+ . 'Un utilisateur avancé de notre forum les aura conseillé '
+ . 'dans un seul cas de problème d\'email.' ;
+ $cond = $conf['mail_options'];
+ $confk = 'mail_options';
+ break;
+
+ Case 25 :
+ $adv[] = 'Valeur actuelle : true.';
+ $adv[] = 'Devrait être à false, seuls les membres de l\'équipe PWG '
+ . 'codent $conf[\'check_upgrade_feed\'] = true; pour leurs tests.';
+ $cond = $conf['check_upgrade_feed'];
+ $confk = 'check_upgrade_feed';
+ break;
+
+ Case 26 :
+ $adv[] = '$conf[\'rate_items\'] dispose de ' . count($conf['rate_items'])
+ . 'éléments.';
+ $adv[] = 'Votre $conf[\'rate_items\'] devrait avoir 4 ou 5 éléments '
+ . 'mais pas moins.';
+ $cond = ( count($conf['rate_items']) < 4 );
+ $confk = 'rate_items';
+ break;
+
+ Case 27 :
+ $adv[] = '$conf[\'rate_items\'] has ' . count($conf['rate_items'])
+ . 'items.';
+ $adv[] = 'Votre $conf[\'rate_items\'] devrait avoir 4 ou 5 éléments '
+ . 'mais pas plus.';
+ $adv[] = 'Contrôlez vos images les mieux notées avant de retirer '
+ . ' certaines valeurs.'
+ . '<br />Réduire les valeurs excessives et modifiez votre '
+ . '$conf[\'rate_items\'].';
+ $cond = ( count($conf['rate_items']) > 6 );
+ $confk = 'rate_items';
+ break;
+
+ Case 28 :
+ $adv[] = 'Valeur actuelle : true.';
+ $adv[] = 'Peut être effectivement à true, éventuellement choisissez '
+ . '$conf[\'show_iptc\'] = false;'
+ . '<br />Comme quelques photographes professionnels choisissez '
+ . 'false bien que leurs raisons ne soient guère professionnelles.';
+ $adv[] = 'Ne confondez pas <strong>show</strong>_iptc et '
+ . '<strong>use</strong>_iptc (consultez la pages de métadonnées '
+ . 'sur notre wiki).';
+ $cond = $conf['show_iptc'];
+ $confk = 'show_iptc';
+ break;
+
+ Case 29 :
+ $adv[] = 'Valeur actuelle : true.';
+ $adv[] = 'Les documentalistes et photographes professionnels choisiront '
+ . 'cette valeur true, mais les débutants devraient laisser '
+ . '$conf[\'use_iptc\'] = false;';
+ $adv[] = 'Faire attention aux champs mentionnés dans la synchronisation '
+ . 'des métadonnées.<br />Les champs indiqués pourront être '
+ . 'écrasés par des valeurs de champs IPTC quand bien même ces '
+ . 'champs ne seraient pas vides.';
+ $adv[] = 'Ne confondez pas <strong>show</strong>_iptc et '
+ . '<strong>use</strong>_iptc (consultez la pages de métadonnées '
+ . 'sur notre wiki).';
+ $cond = $conf['use_iptc'];
+ $confk = 'use_iptc';
+ break;
+
+ Case 30 :
+ $adv[] = 'Comment gérer les IPTC:';
+ $adv[] = ' 1 - Copiez une image jpg (publique) dans ./tools/<br />'
+ . ' 2 - Renommez celle-ci en sample.jpg.<br />'
+ . ' 3 - Lancez ./tools/metadata.php<br />'
+ . ' 4 - Analysez les résultats pour déterminer quels champs '
+ . 'IPTC pourraient intéresser vos visiteurs.';
+ $adv[] = 'Les débutants laisseront $conf[\'use_iptc\'] = false;';
+ $adv[] = 'Les utilisateurs avancés feront des efforts de documentation '
+ . 'avant de transférer leurs images.<br />'
+ . 'Les champs IPTC doivent être décrits par '
+ . '$conf[\'use_iptc_mapping\']';
+ $adv[] = 'Dans tous les cas, <strong>show</strong>_iptc_mapping et '
+ . '<strong>use</strong>_iptc_mapping seront '
+ . 'totalement différents.';
+ $cond = true;
+ $confk = 'use_iptc';
+ break;
+
+ Case 31 :
+ $adv[] = 'Comment gérer les IPTC:';
+ $adv[] = ' 1 - Copiez une image jpg (publique) dans ./tools/<br />'
+ . ' 2 - Renommez celle-ci en sample.jpg.<br />'
+ . ' 3 - Lancez ./tools/metadata.php<br />'
+ . ' 4 - Analysez les résultats pour déterminer quels champs '
+ . 'IPTC pourraient intéresser vos visiteurs.';
+ $adv[] = 'Les débutants laisseront $conf[\'use_iptc\'] = false;';
+ $adv[] = 'Les utilisateurs avancés feront des efforts de documentation '
+ . 'avant de transférer leurs images.<br />'
+ . 'Les champs IPTC doivent être décrits par '
+ . '$conf[\'use_iptc_mapping\']';
+ $adv[] = 'Faire attention aux champs mentionnés dans la synchronisation '
+ . 'des métadonnées.<br />Les champs indiqués pourront être '
+ . 'écrasés par des valeurs de champs IPTC quand bien même ces '
+ . 'champs ne seraient pas vides.';
+ $adv[] = 'Dans tous les cas, <strong>show</strong>_iptc_mapping et '
+ . '<strong>use</strong>_iptc_mapping seront '
+ . 'totalement différents.';
+ $cond = true;
+ $confk = 'use_iptc_mapping';
+ break;
+
+ Case 32 :
+ $adv[] = 'Valeur actuelle : '
+ . ( ( $conf['show_exif'] ) ? 'true':'false' ) . '.';
+ $adv[] = 'Devrait être à true, certaines informations propres à votre '
+ . 'appareil pourront être affichées.';
+ $adv[] = 'Pensez au fait que les informations EXIF peuvent être '
+ . 'différentes suivant les modèles d\'appareil.<br />'
+ . 'Si vous changez votre appareil ces champs pourraient en '
+ . 'partie differents.';
+ $adv[] = 'Beaucoup de photographes professionnels choissent false, '
+ . 'ceci afin de protéger leur savoir-faire.' ;
+ $adv[] = 'Ne confondez pas <strong>show</strong>_exif et '
+ . '<strong>use</strong>_exif (consultez la pages de métadonnées '
+ . 'sur notre wiki).';
+ $cond = true;
+ $confk = 'show_exif';
+ break;
+
+ Case 33 :
+ $adv[] = 'Comment gérer les EXIF:';
+ $adv[] = ' 1 - Copiez une image jpg (publique) dans ./tools/<br />'
+ . ' 2 - Renommez celle-ci en sample.jpg.<br />'
+ . ' 3 - Lancez ./tools/metadata.php<br />'
+ . ' 4 - Analysez les résultats pour déterminer quels champs '
+ . 'EXIF pourraient intéresser vos visiteurs.';
+ $adv[] = 'Les débutants laisseront la valeur par défaut.';
+ $adv[] = 'Les utilisateurs avancés penseront aux valeurs du tableau '
+ . '$lang; voire même à l\'impact possible sur les templates.';
+ $adv[] = 'Dans tous les cas, <strong>show</strong>_exif_fields et '
+ . '<strong>use</strong>_exif_mapping seront '
+ . 'totalement différents.';
+ $cond = true;
+ $confk = 'show_exif_fields';
+ break;
+
+ Case 34 :
+ $adv[] = 'Valeur actuelle : ' . ( ( $conf['use_exif'] ) ? 'true':'false' )
+ . '.';
+ $adv[] = 'Les documentalistes et photographes professionnels choisiront '
+ . 'cette valeur true, mais les débutants devraient laisser '
+ . 'la valeur par défaut.';
+ $adv[] = 'Faire attention aux champs mentionnés dans la synchronisation '
+ . 'des métadonnées.<br />Les champs indiqués pourront être '
+ . 'écrasés par des valeurs de champs EXIF quand bien même ces '
+ . 'champs ne seraient pas vides.';
+ $adv[] = 'Ne confondez pas <strong>show</strong>_exif et '
+ . '<strong>use</strong>_exif (consultez la pages de métadonnées '
+ . 'sur notre wiki).';
+ $cond = true;
+ $confk = 'use_exif';
+ break;
+
+ Case 35 :
+ $adv[] = 'Comment gérer les EXIF:';
+ $adv[] = ' 1 - Copiez une image jpg (publique) dans ./tools/<br />'
+ . ' 2 - Renommez celle-ci en sample.jpg.<br />'
+ . ' 3 - Lancez ./tools/metadata.php<br />'
+ . ' 4 - Analysez les résultats pour déterminer quels champs '
+ . 'EXIF pourraient intéresser vos visiteurs.';
+ $adv[] = 'Les débutants laisseront la valeur par défaut.';
+ $adv[] = 'Les utilisateurs avancés penseront aux valeurs du tableau '
+ . '$lang; voire même à l\'impact possible sur les templates.';
+ $adv[] = 'Les débutants laisseront $conf[\'use_exif\'] = false;';
+ $adv[] = 'Les utilisateurs avancés feront très attention aux champs '
+ . 'sélectionnés et modifiés par la synchronisation.';
+ $adv[] = 'Faire attention aux champs mentionnés dans la synchronisation '
+ . 'des métadonnées.<br />Ces champs pourront être '
+ . 'écrasés par des valeurs de champs EXIF quand bien même ces '
+ . 'champs ne seraient pas vides.';
+ $adv[] = 'Dans tous les cas, <strong>show</strong>_exif_fields et '
+ . '<strong>use</strong>_exif_mapping seront '
+ . 'totalement différents.';
+ $cond = true;
+ $confk = 'use_exif_mapping';
+ break;
+ }
+}
+
+?>
diff --git a/plugins/admin_advices/main.inc.php b/plugins/admin_advices/main.inc.php
index 6db9b358a..18600e4b1 100644
--- a/plugins/admin_advices/main.inc.php
+++ b/plugins/admin_advices/main.inc.php
@@ -1,119 +1,119 @@
-<?php /*
-Plugin Name: Admin Advices
-Version: 1.0
-Description: Give you an advice on the administration page.
-Plugin URI: http://www.phpwebgallery.net
-Author: PhpWebGallery team
-Author URI: http://www.phpwebgallery.net
-*/
-
-add_event_handler('loc_end_page_header', 'set_admin_advice_add_css' );
-
-// Add a XHTML tag in HEAD section
-function set_admin_advice_add_css()
-{
- global $template, $page;
- if ( isset($page['body_id']) and $page['body_id']=='theAdminPage'
- and $page['page'] == 'intro'
- )
- {// This Plugin works only on the Admin page
- $template->assign_block_vars(
- 'head_element',
- array(
- 'CONTENT' => '<link rel="stylesheet" type="text/css" '
- . 'href="'.PHPWG_PLUGINS_PATH.'admin_advices/default-layout.css">',
- )
- );
- add_event_handler('loc_begin_page_tail', 'set_admin_advice' );
- }
-}
-
-// Build an advice on the Admin Intro page
-function set_admin_advice()
-{
- global $page, $user, $template, $conf;
-
-// Setup Advice Language (Maybe there is already a variable)
- $advlang = ( isset($user['language']) ) ?
- $user['language'] : $conf['default_language']; // en_UK.iso-8859-1
- $my_path = dirname(__FILE__).'/';
- $adv = array();
- if ( !@file_exists($my_path."$advlang/lang.adv.php") )
- {
- $advlang = 'en_UK.iso-8859-1';
- }
-// Include language advices
- @include_once( $my_path."$advlang/lang.adv.php" );
-
-// If there is an advice
- if ( $cond )
- {
- $template->set_filenames(array(
- 'admin_advice' => $my_path.'admin_advices.tpl')
- );
-
-// Random Thumbnail
- $query = '
-SELECT *
-FROM '.IMAGES_TABLE.'
-ORDER BY RAND(NOW())
-LIMIT 0, 1
-;';
- $result = pwg_query($query);
- $row = mysql_fetch_assoc($result);
- if ( is_array($row) )
- {
- $url_modify = get_root_url().'admin.php?page=picture_modify'
- .'&amp;image_id='.$row['id'];
- $url_check = get_themeconf('icon_dir').'/';
- $url_uncheck = $url_check . 'uncheck';
- $url_check .= 'check';
- $picture_id = $row['id'];
- $query = '
-SELECT * FROM '.IMAGE_TAG_TABLE.'
-WHERE image_id = ' . $picture_id .'
-;';
- $tag_count = mysql_num_rows(mysql_query($query));
- $template->assign_block_vars(
- 'thumbnail',
- array(
- 'IMAGE' => get_thumbnail_url($row),
- 'IMAGE_ALT' => $row['file'],
- 'IMAGE_TITLE' => $row['name'],
- 'METADATA' => (empty($row['date_metadata_update'])) ?
- $url_uncheck : $url_check,
- 'NAME' => (empty($row['name'])) ?
- $url_uncheck : $url_check,
- 'COMMENT' => (empty($row['comment'])) ?
- $url_uncheck : $url_check,
- 'AUTHOR' => (empty($row['author'])) ?
- $url_uncheck : $url_check,
- 'CREATE_DATE' => (empty($row['date_creation'])) ?
- $url_uncheck : $url_check,
- 'TAGS' => ($tag_count == 0) ?
- $url_uncheck : $url_check,
- 'NUM_TAGS' => (string) $tag_count,
- 'U_MODIFY' => $url_modify,
- )
- );
- }
- $advice_text = array_shift($adv);
- $template->assign_vars(
- array(
- 'ADVICE_ABOUT' => '$conf[' . "'$confk'] ",
- 'ADVICE_TEXT' => $advice_text,
- )
- );
- foreach ($adv as $advice)
- {
- $template->assign_block_vars(
- 'More',
- array(
- 'ADVICE' => $advice
- )
- );
- }
- $template->parse('admin_advice');
- }
-}
-?>
+<?php /*
+Plugin Name: Admin Advices
+Version: 1.0
+Description: Give you an advice on the administration page.
+Plugin URI: http://www.phpwebgallery.net
+Author: PhpWebGallery team
+Author URI: http://www.phpwebgallery.net
+*/
+
+add_event_handler('loc_end_page_header', 'set_admin_advice_add_css' );
+
+// Add a XHTML tag in HEAD section
+function set_admin_advice_add_css()
+{
+ global $template, $page;
+ if ( isset($page['body_id']) and $page['body_id']=='theAdminPage'
+ and $page['page'] == 'intro'
+ )
+ {// This Plugin works only on the Admin page
+ $template->assign_block_vars(
+ 'head_element',
+ array(
+ 'CONTENT' => '<link rel="stylesheet" type="text/css" '
+ . 'href="'.PHPWG_PLUGINS_PATH.'admin_advices/default-layout.css">',
+ )
+ );
+ add_event_handler('loc_begin_page_tail', 'set_admin_advice' );
+ }
+}
+
+// Build an advice on the Admin Intro page
+function set_admin_advice()
+{
+ global $page, $user, $template, $conf;
+
+// Setup Advice Language (Maybe there is already a variable)
+ $advlang = ( isset($user['language']) ) ?
+ $user['language'] : $conf['default_language']; // en_UK.iso-8859-1
+ $my_path = dirname(__FILE__).'/';
+ $adv = array();
+ if ( !@file_exists($my_path."$advlang/lang.adv.php") )
+ {
+ $advlang = 'en_UK.iso-8859-1';
+ }
+// Include language advices
+ @include_once( $my_path."$advlang/lang.adv.php" );
+
+// If there is an advice
+ if ( $cond )
+ {
+ $template->set_filenames(array(
+ 'admin_advice' => $my_path.'admin_advices.tpl')
+ );
+
+// Random Thumbnail
+ $query = '
+SELECT *
+FROM '.IMAGES_TABLE.'
+ORDER BY RAND(NOW())
+LIMIT 0, 1
+;';
+ $result = pwg_query($query);
+ $row = mysql_fetch_assoc($result);
+ if ( is_array($row) )
+ {
+ $url_modify = get_root_url().'admin.php?page=picture_modify'
+ .'&amp;image_id='.$row['id'];
+ $url_check = get_themeconf('icon_dir').'/';
+ $url_uncheck = $url_check . 'uncheck';
+ $url_check .= 'check';
+ $picture_id = $row['id'];
+ $query = '
+SELECT * FROM '.IMAGE_TAG_TABLE.'
+WHERE image_id = ' . $picture_id .'
+;';
+ $tag_count = mysql_num_rows(mysql_query($query));
+ $template->assign_block_vars(
+ 'thumbnail',
+ array(
+ 'IMAGE' => get_thumbnail_url($row),
+ 'IMAGE_ALT' => $row['file'],
+ 'IMAGE_TITLE' => $row['name'],
+ 'METADATA' => (empty($row['date_metadata_update'])) ?
+ $url_uncheck : $url_check,
+ 'NAME' => (empty($row['name'])) ?
+ $url_uncheck : $url_check,
+ 'COMMENT' => (empty($row['comment'])) ?
+ $url_uncheck : $url_check,
+ 'AUTHOR' => (empty($row['author'])) ?
+ $url_uncheck : $url_check,
+ 'CREATE_DATE' => (empty($row['date_creation'])) ?
+ $url_uncheck : $url_check,
+ 'TAGS' => ($tag_count == 0) ?
+ $url_uncheck : $url_check,
+ 'NUM_TAGS' => (string) $tag_count,
+ 'U_MODIFY' => $url_modify,
+ )
+ );
+ }
+ $advice_text = array_shift($adv);
+ $template->assign_vars(
+ array(
+ 'ADVICE_ABOUT' => '$conf[' . "'$confk'] ",
+ 'ADVICE_TEXT' => $advice_text,
+ )
+ );
+ foreach ($adv as $advice)
+ {
+ $template->assign_block_vars(
+ 'More',
+ array(
+ 'ADVICE' => $advice
+ )
+ );
+ }
+ $template->parse('admin_advice');
+ }
+}
+?>
diff --git a/template-common/csshover.htc b/template-common/csshover.htc
index 3ba936ac3..14f88576c 100644
--- a/template-common/csshover.htc
+++ b/template-common/csshover.htc
@@ -1,120 +1,120 @@
-<attach event="ondocumentready" handler="parseStylesheets" />
-<script>
-/**
- * Whatever:hover - V1.42.060206 - hover & active
- * ------------------------------------------------------------
- * (c) 2005 - Peter Nederlof
- * Peterned - http://www.xs4all.nl/~peterned/
- * License - http://creativecommons.org/licenses/LGPL/2.1/
- *
- * Whatever:hover is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Whatever:hover 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
- * Lesser General Public License for more details.
- *
- * Credits and thanks to:
- * Arnoud Berendsen, Martin Reurings, Robert Hanson
- *
- * howto: body { behavior:url("csshover.htc"); }
- * ------------------------------------------------------------
- */
-
-var csshoverReg = /(^|\s)(([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active)/i,
-currentSheet, doc = window.document, hoverEvents = [], activators = {
- onhover:{on:'onmouseover', off:'onmouseout'},
- onactive:{on:'onmousedown', off:'onmouseup'}
-}
-
-function parseStylesheets() {
- if(!/MSIE (5|6)/.test(navigator.userAgent)) return;
- window.attachEvent('onunload', unhookHoverEvents);
- var sheets = doc.styleSheets, l = sheets.length;
- for(var i=0; i<l; i++)
- parseStylesheet(sheets[i]);
-}
- function parseStylesheet(sheet) {
- if(sheet.imports) {
- try {
- var imports = sheet.imports, l = imports.length;
- for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]);
- } catch(securityException){}
- }
-
- try {
- var rules = (currentSheet = sheet).rules, l = rules.length;
- for(var j=0; j<l; j++) parseCSSRule(rules[j]);
- } catch(securityException){}
- }
-
- function parseCSSRule(rule) {
- var select = rule.selectorText, style = rule.style.cssText;
- if(!csshoverReg.test(select) || !style) return;
-
- var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
- var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
- var className = (/\.([a-z0-9_-]*on(hover|active))/i).exec(newSelect)[1];
- var affected = select.replace(/:(hover|active).*$/, '');
- var elements = getElementsBySelect(affected);
- if(elements.length == 0) return;
-
- currentSheet.addRule(newSelect, style);
- for(var i=0; i<elements.length; i++)
- new HoverElement(elements[i], className, activators[pseudo]);
- }
-
-function HoverElement(node, className, events) {
- if(!node.hovers) node.hovers = {};
- if(node.hovers[className]) return;
- node.hovers[className] = true;
- hookHoverEvent(node, events.on, function() { node.className += ' ' + className; });
- hookHoverEvent(node, events.off, function() { node.className = node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
-}
- function hookHoverEvent(node, type, handler) {
- node.attachEvent(type, handler);
- hoverEvents[hoverEvents.length] = {
- node:node, type:type, handler:handler
- };
- }
-
- function unhookHoverEvents() {
- for(var e,i=0; i<hoverEvents.length; i++) {
- e = hoverEvents[i];
- e.node.detachEvent(e.type, e.handler);
- }
- }
-
-function getElementsBySelect(rule) {
- var parts, nodes = [doc];
- parts = rule.split(' ');
- for(var i=0; i<parts.length; i++) {
- nodes = getSelectedNodes(parts[i], nodes);
- } return nodes;
-}
- function getSelectedNodes(select, elements) {
- var result, node, nodes = [];
- var identify = (/\#([a-z0-9_-]+)/i).exec(select);
- if(identify) {
- var element = doc.getElementById(identify[1]);
- return element? [element]:nodes;
- }
-
- var classname = (/\.([a-z0-9_-]+)/i).exec(select);
- var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, '');
- var classReg = classname? new RegExp('\\b' + classname[1] + '\\b'):false;
- for(var i=0; i<elements.length; i++) {
- result = tagName? elements[i].all.tags(tagName):elements[i].all;
- for(var j=0; j<result.length; j++) {
- node = result[j];
- if(classReg && !classReg.test(node.className)) continue;
- nodes[nodes.length] = node;
- }
- }
-
- return nodes;
- }
+<attach event="ondocumentready" handler="parseStylesheets" />
+<script>
+/**
+ * Whatever:hover - V1.42.060206 - hover & active
+ * ------------------------------------------------------------
+ * (c) 2005 - Peter Nederlof
+ * Peterned - http://www.xs4all.nl/~peterned/
+ * License - http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * Whatever:hover is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Whatever:hover 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
+ * Lesser General Public License for more details.
+ *
+ * Credits and thanks to:
+ * Arnoud Berendsen, Martin Reurings, Robert Hanson
+ *
+ * howto: body { behavior:url("csshover.htc"); }
+ * ------------------------------------------------------------
+ */
+
+var csshoverReg = /(^|\s)(([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active)/i,
+currentSheet, doc = window.document, hoverEvents = [], activators = {
+ onhover:{on:'onmouseover', off:'onmouseout'},
+ onactive:{on:'onmousedown', off:'onmouseup'}
+}
+
+function parseStylesheets() {
+ if(!/MSIE (5|6)/.test(navigator.userAgent)) return;
+ window.attachEvent('onunload', unhookHoverEvents);
+ var sheets = doc.styleSheets, l = sheets.length;
+ for(var i=0; i<l; i++)
+ parseStylesheet(sheets[i]);
+}
+ function parseStylesheet(sheet) {
+ if(sheet.imports) {
+ try {
+ var imports = sheet.imports, l = imports.length;
+ for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]);
+ } catch(securityException){}
+ }
+
+ try {
+ var rules = (currentSheet = sheet).rules, l = rules.length;
+ for(var j=0; j<l; j++) parseCSSRule(rules[j]);
+ } catch(securityException){}
+ }
+
+ function parseCSSRule(rule) {
+ var select = rule.selectorText, style = rule.style.cssText;
+ if(!csshoverReg.test(select) || !style) return;
+
+ var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
+ var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
+ var className = (/\.([a-z0-9_-]*on(hover|active))/i).exec(newSelect)[1];
+ var affected = select.replace(/:(hover|active).*$/, '');
+ var elements = getElementsBySelect(affected);
+ if(elements.length == 0) return;
+
+ currentSheet.addRule(newSelect, style);
+ for(var i=0; i<elements.length; i++)
+ new HoverElement(elements[i], className, activators[pseudo]);
+ }
+
+function HoverElement(node, className, events) {
+ if(!node.hovers) node.hovers = {};
+ if(node.hovers[className]) return;
+ node.hovers[className] = true;
+ hookHoverEvent(node, events.on, function() { node.className += ' ' + className; });
+ hookHoverEvent(node, events.off, function() { node.className = node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
+}
+ function hookHoverEvent(node, type, handler) {
+ node.attachEvent(type, handler);
+ hoverEvents[hoverEvents.length] = {
+ node:node, type:type, handler:handler
+ };
+ }
+
+ function unhookHoverEvents() {
+ for(var e,i=0; i<hoverEvents.length; i++) {
+ e = hoverEvents[i];
+ e.node.detachEvent(e.type, e.handler);
+ }
+ }
+
+function getElementsBySelect(rule) {
+ var parts, nodes = [doc];
+ parts = rule.split(' ');
+ for(var i=0; i<parts.length; i++) {
+ nodes = getSelectedNodes(parts[i], nodes);
+ } return nodes;
+}
+ function getSelectedNodes(select, elements) {
+ var result, node, nodes = [];
+ var identify = (/\#([a-z0-9_-]+)/i).exec(select);
+ if(identify) {
+ var element = doc.getElementById(identify[1]);
+ return element? [element]:nodes;
+ }
+
+ var classname = (/\.([a-z0-9_-]+)/i).exec(select);
+ var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, '');
+ var classReg = classname? new RegExp('\\b' + classname[1] + '\\b'):false;
+ for(var i=0; i<elements.length; i++) {
+ result = tagName? elements[i].all.tags(tagName):elements[i].all;
+ for(var j=0; j<result.length; j++) {
+ node = result[j];
+ if(classReg && !classReg.test(node.className)) continue;
+ nodes[nodes.length] = node;
+ }
+ }
+
+ return nodes;
+ }
</script> \ No newline at end of file
diff --git a/template-common/default-layout.css b/template-common/default-layout.css
index 12b55a8a1..fa9928c33 100644
--- a/template-common/default-layout.css
+++ b/template-common/default-layout.css
@@ -1,51 +1,51 @@
-/* $Id$ */
-
-/* Set the width of the menubar for the galery */
-#menubar {
- width: 18em;
-}
-#content {
- margin-left: 20em; /* = #menubar width + 2em */
-}
-/* Set minimum width of the page before getting a scrollbar */
-/* IE5 and IE6 don't get that */
-BODY {
- min-width: 60em; /* ~ 3* #menubar width */
-}
-BODY#thePopuphelpPage {
- min-width: 0;
-}
-
-/* Set the width of the menubar for the admin section */
-BODY#theAdminPage #menubar {
- width: 12.5em;
-}
-BODY#theAdminPage #content {
- margin-left: 14.5em; /* = #menubar width + 2em */
-}
-
-/* Set some sizes according to your maximum thumbnail width and height */
-#content UL.thumbnails SPAN,
-#content UL.thumbnails SPAN.wrap2 A,
-#content UL.thumbnails LABEL,
-#content DIV.thumbnailCategory DIV.illustration {
- width: 140px; /* max thumbnail width + 2px */
-}
-#content UL.thumbnails SPAN.wrap2,
-#content DIV.thumbnailCategory DIV.description {
- height: 140px; /* max thumbnail height + 2px */
-}
-#content DIV.comment BLOCKQUOTE {
- margin-left: 150px; /*maximum thumbnail width + ~10px */
-}
-
-/* Category thumbnails on main page */
-#content UL.thumbnailCategories LI {
- width: 49.7%; /* 49.7% for 2 per line, 33.2% for 3 per line*/
-}
-
-/* Set defaults for thumbnails legend */
-#content UL.thumbnails SPAN.thumbLegend {
- display: block; /* display: none; if you don't want legend */
- height: 4em; /* legend height (don't set auto to be Gecko friendly)*/
-}
+/* $Id$ */
+
+/* Set the width of the menubar for the galery */
+#menubar {
+ width: 18em;
+}
+#content {
+ margin-left: 20em; /* = #menubar width + 2em */
+}
+/* Set minimum width of the page before getting a scrollbar */
+/* IE5 and IE6 don't get that */
+BODY {
+ min-width: 60em; /* ~ 3* #menubar width */
+}
+BODY#thePopuphelpPage {
+ min-width: 0;
+}
+
+/* Set the width of the menubar for the admin section */
+BODY#theAdminPage #menubar {
+ width: 12.5em;
+}
+BODY#theAdminPage #content {
+ margin-left: 14.5em; /* = #menubar width + 2em */
+}
+
+/* Set some sizes according to your maximum thumbnail width and height */
+#content UL.thumbnails SPAN,
+#content UL.thumbnails SPAN.wrap2 A,
+#content UL.thumbnails LABEL,
+#content DIV.thumbnailCategory DIV.illustration {
+ width: 140px; /* max thumbnail width + 2px */
+}
+#content UL.thumbnails SPAN.wrap2,
+#content DIV.thumbnailCategory DIV.description {
+ height: 140px; /* max thumbnail height + 2px */
+}
+#content DIV.comment BLOCKQUOTE {
+ margin-left: 150px; /*maximum thumbnail width + ~10px */
+}
+
+/* Category thumbnails on main page */
+#content UL.thumbnailCategories LI {
+ width: 49.7%; /* 49.7% for 2 per line, 33.2% for 3 per line*/
+}
+
+/* Set defaults for thumbnails legend */
+#content UL.thumbnails SPAN.thumbLegend {
+ display: block; /* display: none; if you don't want legend */
+ height: 4em; /* legend height (don't set auto to be Gecko friendly)*/
+}
diff --git a/template/yoga/admin/advanced_feature.tpl b/template/yoga/admin/advanced_feature.tpl
index ac0143e53..5d9e6a73b 100644
--- a/template/yoga/admin/advanced_feature.tpl
+++ b/template/yoga/admin/advanced_feature.tpl
@@ -1,15 +1,15 @@
-<!-- $Id: advanced_feature.tpl 1111 2006-03-28 21:05:12Z rub $ -->
-<div class="titrePage">
- <ul class="categoryActions">
- <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
- </ul>
- <h2>{lang:Advanced_features}</h2>
-</div>
-
-<ul>
- <!-- BEGIN advanced_features -->
- <!-- BEGIN advanced_feature -->
- <li><a href="{advanced_features.advanced_feature.URL}" {TAG_INPUT_ENABLED}>{advanced_features.advanced_feature.CAPTION}</a></li>
- <!-- END advanced_feature -->
- <!-- END advanced_features -->
-</ul>
+<!-- $Id: advanced_feature.tpl 1111 2006-03-28 21:05:12Z rub $ -->
+<div class="titrePage">
+ <ul class="categoryActions">
+ <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+ </ul>
+ <h2>{lang:Advanced_features}</h2>
+</div>
+
+<ul>
+ <!-- BEGIN advanced_features -->
+ <!-- BEGIN advanced_feature -->
+ <li><a href="{advanced_features.advanced_feature.URL}" {TAG_INPUT_ENABLED}>{advanced_features.advanced_feature.CAPTION}</a></li>
+ <!-- END advanced_feature -->
+ <!-- END advanced_features -->
+</ul>
diff --git a/template/yoga/admin/default-layout.css b/template/yoga/admin/default-layout.css
index d6510b133..80db22cfe 100644
--- a/template/yoga/admin/default-layout.css
+++ b/template/yoga/admin/default-layout.css
@@ -1,177 +1,177 @@
-/* $Id: */
-BODY#theAdminPage #theHeader P {
- display: none;
-}
-
-/* History tables */
-TABLE.table2 {
- border: 1px solid black;
- margin: 1em auto;
- padding: 0;
-}
-
-TABLE.table2 TD, TABLE.table2 TH {
- padding: 0 1em;
-}
-
-TABLE.table2 TR {
- text-align: left;
-}
-
-TABLE.table2 TR.throw {
- text-align: center;
-}
-
-.hour {
- white-space: pre;
-}
-
-.number {
- text-align: right;
-}
-
-TABLE#dailyStats {
- width: 60%;
-}
-
-TABLE#detailedStats {
- width: 99%;
-}
-
-/* categoryOrdering */
-SELECT.categoryList {
- width: 100%;
-}
-
-FORM#categoryOrdering {
- padding-left: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
- padding-right: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
-}
-FORM#categoryOrdering p {
- text-align: left;
- margin-top: 1em;
- margin-bottom: 1em;
-}
-UL.categoryUl {
- list-style: none;
- padding: 0;
- margin: 0;
-}
-
-LI.categoryLi {
- border: 1px solid gray;
- padding: 0px 5px;
- margin-bottom: 5px;
-}
-
-FORM#categoryOrdering UL.categoryActions {
- float: right;
- margin-top: 5px;
-}
-/* */
-
-FORM#catModify TABLE { width: auto; }
-
-FIELDSET.elementEdit A {
- display: block;
- float: right;
-}
-
-TABLE.doubleSelect {
- text-align: center;
- margin: 0 auto;
- width: 100%;
-}
-
-TABLE.doubleSelect TD {
- padding: 0 5px;
- width: 50%;
-}
-
-TABLE.doubleSelect SELECT.categoryList {
- width: 100%;
-}
-
-FORM#categoryPermissions LI {
- display:inline;
- white-space: nowrap;
-}
-
-FIELDSET#mainConf SPAN.property {
- width: 25%;
-}
-FIELDSET#mainConf TEXTAREA.description {
- width: 70%;
-}
-
-/* PWG Links Menu is fixed Graphic charts */
-.pwgmenu {
- display: table;
- list-style-type: none;
- list-style-image: none; /* for firefox */
- white-space: nowrap;
- position: relative;
- text-decoration : none;
- font-family: verdana, arial, helvetica, sans-serif;
- font-size: 70%;
- line-height: 1.1em;
- width: 66em;
- margin: 1px 8px 1px auto;
- padding: 3px;
- background: transparent;
-}
-.pwgmenu li {
- float: left;
- width: 10em !important;
- text-align: center;
- margin: 0 6px;
- padding: 0;
-
-}
-.pwgmenu a {
- width: 9em !important;
- display: block;
- padding: 4px 8px;
- background: #69c; /* PWG Graphic charts */
- color: white;
- text-align: center;
- text-decoration: none;
- font-weight: bold;
- border: 1px solid #fff; /* Why bordered? in case of #69c background */
-}
-.pwgmenu a:hover {
- background: #f92;
- color: white;
-} /* PWG Graphic charts */
-
-
-.statBar {
- height: 10px;
- background-color: #66f;
- border: 1px solid black;
-}
-
-/* Tabsheet */
-ul.tabsheet {
- display: table;
- list-style-type: none;
- list-style-image: none; /* for firefox */
- white-space: nowrap;
- margin-left: auto; margin-right: auto;
- text-decoration : none;
- background: transparent;
- border-bottom: 1px solid #fff;
-}
-
-ul.tabsheet li {
- float: left;
- text-align: center;
- margin: 0 6px;
- color: white;
- font-size: 110%;
- font-weight: bold;
- padding: 4px 8px;
- border: 1px solid #fff;
- border-radius: 6px 6px 0px 0px; /* round corners with CSS3 compliant browsers */
- padding: 5px 2em 2px 2em;
-}
+/* $Id: */
+BODY#theAdminPage #theHeader P {
+ display: none;
+}
+
+/* History tables */
+TABLE.table2 {
+ border: 1px solid black;
+ margin: 1em auto;
+ padding: 0;
+}
+
+TABLE.table2 TD, TABLE.table2 TH {
+ padding: 0 1em;
+}
+
+TABLE.table2 TR {
+ text-align: left;
+}
+
+TABLE.table2 TR.throw {
+ text-align: center;
+}
+
+.hour {
+ white-space: pre;
+}
+
+.number {
+ text-align: right;
+}
+
+TABLE#dailyStats {
+ width: 60%;
+}
+
+TABLE#detailedStats {
+ width: 99%;
+}
+
+/* categoryOrdering */
+SELECT.categoryList {
+ width: 100%;
+}
+
+FORM#categoryOrdering {
+ padding-left: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
+ padding-right: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
+}
+FORM#categoryOrdering p {
+ text-align: left;
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+UL.categoryUl {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+}
+
+LI.categoryLi {
+ border: 1px solid gray;
+ padding: 0px 5px;
+ margin-bottom: 5px;
+}
+
+FORM#categoryOrdering UL.categoryActions {
+ float: right;
+ margin-top: 5px;
+}
+/* */
+
+FORM#catModify TABLE { width: auto; }
+
+FIELDSET.elementEdit A {
+ display: block;
+ float: right;
+}
+
+TABLE.doubleSelect {
+ text-align: center;
+ margin: 0 auto;
+ width: 100%;
+}
+
+TABLE.doubleSelect TD {
+ padding: 0 5px;
+ width: 50%;
+}
+
+TABLE.doubleSelect SELECT.categoryList {
+ width: 100%;
+}
+
+FORM#categoryPermissions LI {
+ display:inline;
+ white-space: nowrap;
+}
+
+FIELDSET#mainConf SPAN.property {
+ width: 25%;
+}
+FIELDSET#mainConf TEXTAREA.description {
+ width: 70%;
+}
+
+/* PWG Links Menu is fixed Graphic charts */
+.pwgmenu {
+ display: table;
+ list-style-type: none;
+ list-style-image: none; /* for firefox */
+ white-space: nowrap;
+ position: relative;
+ text-decoration : none;
+ font-family: verdana, arial, helvetica, sans-serif;
+ font-size: 70%;
+ line-height: 1.1em;
+ width: 66em;
+ margin: 1px 8px 1px auto;
+ padding: 3px;
+ background: transparent;
+}
+.pwgmenu li {
+ float: left;
+ width: 10em !important;
+ text-align: center;
+ margin: 0 6px;
+ padding: 0;
+
+}
+.pwgmenu a {
+ width: 9em !important;
+ display: block;
+ padding: 4px 8px;
+ background: #69c; /* PWG Graphic charts */
+ color: white;
+ text-align: center;
+ text-decoration: none;
+ font-weight: bold;
+ border: 1px solid #fff; /* Why bordered? in case of #69c background */
+}
+.pwgmenu a:hover {
+ background: #f92;
+ color: white;
+} /* PWG Graphic charts */
+
+
+.statBar {
+ height: 10px;
+ background-color: #66f;
+ border: 1px solid black;
+}
+
+/* Tabsheet */
+ul.tabsheet {
+ display: table;
+ list-style-type: none;
+ list-style-image: none; /* for firefox */
+ white-space: nowrap;
+ margin-left: auto; margin-right: auto;
+ text-decoration : none;
+ background: transparent;
+ border-bottom: 1px solid #fff;
+}
+
+ul.tabsheet li {
+ float: left;
+ text-align: center;
+ margin: 0 6px;
+ color: white;
+ font-size: 110%;
+ font-weight: bold;
+ padding: 4px 8px;
+ border: 1px solid #fff;
+ border-radius: 6px 6px 0px 0px; /* round corners with CSS3 compliant browsers */
+ padding: 5px 2em 2px 2em;
+}
diff --git a/template/yoga/admin/tabsheet.tpl b/template/yoga/admin/tabsheet.tpl
index 257cfd13e..55cdd14ea 100644
--- a/template/yoga/admin/tabsheet.tpl
+++ b/template/yoga/admin/tabsheet.tpl
@@ -1,6 +1,6 @@
-<!-- $Id$ -->
-<ul class="tabsheet">
-<!-- BEGIN tab -->
- <li class="{tab.CLASSNAME}"><a href="{tab.URL}">{tab.CAPTION}</a></li>
-<!-- END tab -->
-</ul>
+<!-- $Id$ -->
+<ul class="tabsheet">
+<!-- BEGIN tab -->
+ <li class="{tab.CLASSNAME}"><a href="{tab.URL}">{tab.CAPTION}</a></li>
+<!-- END tab -->
+</ul>
diff --git a/template/yoga/admin/ws_checker.tpl b/template/yoga/admin/ws_checker.tpl
index db11059b1..55ab45ea9 100644
--- a/template/yoga/admin/ws_checker.tpl
+++ b/template/yoga/admin/ws_checker.tpl
@@ -1,229 +1,229 @@
-<!-- $Id: ws_checker.tpl 939 2005-11-17 20:13:36Z VDigital $ -->
-
-<div class="titrePage">
- <ul class="categoryActions">
- <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
- </ul>
- <h2>{lang:title_wscheck} - {lang:web_services}</h2>
-</div>
-
-<!-- BEGIN update_result -->
-<ul>
- {update_result.UPD_ELEMENT}
-</ul>
-<!-- END update_result -->
-
-<!-- Add Access -->
-<form method="post" name="adding_access" action="{F_STATUS_ACTION}">
- <!-- Current Default -->
- <fieldset>
- <legend>{lang:ws_adding_legend}</legend>
- <table>
- <!-- Access key -->
- <tr>
- <td>
- <label for="KeyName">{lang:Confidential partner key} </label>
- </td>
- <td>
- <input type="text" maxlength="35" size="35" name="add_partner"
- id="add_partner" value="{F_ADD_PARTNER}"
- title="{lang:Basis of access key calculation}" />
- </td>
- </tr>
-
- <!-- Target (cat/ids, tag/ids, or list/ids ids=id,id-id,...) -->
- <tr>
- <td>
- <label for="Access">{lang:Target}</label>
- </td>
- <td>
- <input type="text" maxlength="128" size="35" name="add_target"
- id="add_target" value="{F_ADD_ACCESS}"
- title="{lang:Facultative and restrictive option}" />
- <i><small> ({lang:Access: see help text for more})
- </small></i>
- </td>
- </tr>
-
- <!-- Restricted access to specific request -->
- <tr>
- <td>
- <label for="add_request">{lang:Restrict access to}</label>
- </td>
- <td>
- <select name="add_request" id="add_request" style="width: 18em"
- onfocus="this.className='focus';"
- onblur="this.className='nofocus';">
- <!-- BEGIN add_request -->
- <option value="{add_request.VALUE}"
- {add_request.SELECTED}>{add_request.CONTENT}
- </option>
- <!-- END add_request -->
- </select>
- <i><small> ({lang:ws_Methods})</small></i>
- </td>
- </tr>
-
- <!-- Limit number of images information to be return -->
- <tr>
- <td>
- <label for="add_limit">{lang:Returned images limit}</label>
- </td>
- <td>
- <select name="add_limit" id="add_limit" style="width: 10em"
- onfocus="this.className='focus';"
- onblur="this.className='nofocus';">
- <!-- BEGIN add_limit -->
- <option value="{add_limit.VALUE}"
- {add_limit.SELECTED}>{add_limit.CONTENT}
- </option>
- <!-- END add_limit -->
- </select>
- </td>
- </tr>
-
- <!-- Open service is postponed by n days -->
- <!-- In comment currently
- <tr>
- <td>
- <label for="add_start">{lang:Postponed availability in days}</label>
- </td>
- <td>
- <select name="add_start" id="add_start" style="width: 10em"
- onfocus="this.className='focus';"
- onblur="this.className='nofocus';">
- <!-- BEGIN add_start -->
- <option value="{add_start.VALUE}"
- {add_start.SELECTED}>{add_start.CONTENT}
- </option>
- <!-- END add_start -->
- </select>
- </td>
- </tr> -->
-
- <!-- Opened service only for n days -->
- <tr>
- <td>
- <label for="add_end">{lang:Duration in days}</label>
- </td>
- <td>
- <select name="add_end" id="add_end" style="width: 10em"
- onfocus="this.className='focus';"
- onblur="this.className='nofocus';">
- <!-- BEGIN add_end -->
- <option value="{add_end.VALUE}"
- {add_end.SELECTED}>{add_end.CONTENT}
- </option>
- <!-- END add_end -->
- </select>
- </td>
- </tr>
-
- <!-- Idendify your partner (name / website / phone) as you want -->
- <tr>
- <td>
- <label for="add_Comment">{lang:ws_Comment}</label>
- <br />
- </td>
- <td>
- <textarea name="add_comment" id="add_comment"
- rows="4" cols="80">{lang:Comment to identify your partner clearly}</textarea>
- </td>
- </tr>
-
- <!-- Add submit button -->
- <tr>
- <td>
- </td>
- <td>
- <input class="submit" type="submit" name="wsa_submit" style="width: 10em; padding-top: 3px;"
- value="{lang:Submit}" {TAG_INPUT_ENABLED}
- title="{lang:Add this access definition}" />
- </td>
- </tr>
- </table>
- </fieldset>
-</form>
-
-<!-- BEGIN acc_list -->
-<!-- Access list -->
-<form method="post" name="preferences" action="{F_STATUS_ACTION}">
- <input type="hidden" name="partner_prev" value="{F_PREV_PARTNER}">
- <input type="hidden" name="request_prev" value="{F_PREV_REQUEST}">
- <input type="hidden" name="high_prev" value="{F_PREV_HIGH}">
- <input type="hidden" name="normal_prev" value="{F_PREV_NORMAL}">
- <input type="hidden" name="order_prev" value="{F_PREV_ORDER}">
- <input type="hidden" name="dir5n_prev" value="{F_PREV_DIR5N}">
- <!-- Delete / Update Selected -->
- <fieldset>
- <legend>{lang:ws_update_legend}</legend>
- <table class="table2">
- <tr class="throw">
- <th>&nbsp;</th>
- <th>{lang:ws_KeyName}</th>
- <th>{lang:ws_Access}</th>
- <th>{lang:ws_End}</th>
- <th>{lang:ws_Request}</th>
- <th>{lang:ws_Limit}</th>
- <th>{lang:ws_Comment}</th>
- </tr>
- <!-- BEGIN access -->
- <tr class="{acc_list.access.CLASS}">
- <td>
- <input type="radio" name="selection"
- value="{acc_list.access.ID}" id="selection-{acc_list.access.ID}">
- </td>
- <td><label for="selection-{acc_list.access.ID}">{acc_list.access.NAME}</label></td>
- <td>{acc_list.access.TARGET}</td>
- <td>{acc_list.access.END}</td>
- <td>{acc_list.access.REQUEST}</td>
- <td>{acc_list.access.LIMIT}</td>
- <td>{acc_list.access.COMMENT}</td>
- </tr>
- <!-- END user -->
- </table>
-
- <table>
- <tr>
- <td>
- {lang:ws_delete_legend}
- </td>
- <td>
- <input type="radio" name="delete_confirmation"
- value="true">
- <input class="submit" type="submit" name="wsX_submit" style="width: 10em; padding-top: 3px;"
- value="{lang:Delete}" {TAG_INPUT_ENABLED}>
- </td>
- </tr>
- </table>
- <hr>
- <table>
- <tr>
- <td>
- <span class="property">
- <label for="upd_end">{lang:Modify End from Now +} </label>
- </span>
- <select name="upd_end" id="upd_end" style="width: 10em"
- onfocus="this.className='focus';"
- onblur="this.className='nofocus';">
- <!-- BEGIN upd_end -->
- <option value="{acc_list.upd_end.VALUE}" {acc_list.upd_end.SELECTED}>
- {acc_list.upd_end.CONTENT}
- </option>
- <!-- END upd_end -->
- </select>
- <input class="submit" type="submit" name="wsu_submit" style="width: 10em; padding-top: 3px;"
- value="{lang:Submit}" {TAG_INPUT_ENABLED}>
- </td>
- <td>
- <i><small> ({lang:Web Services availability duration in days})</small></i>
- </td>
- </tr>
- </table>
-
- </fieldset>
-</form>
-<!-- BEGIN ws_status -->
- <h3>{acc_list.ws_status.VALUE}</h3>
-<!-- END ws_status -->
-<!-- END acc_list -->
+<!-- $Id: ws_checker.tpl 939 2005-11-17 20:13:36Z VDigital $ -->
+
+<div class="titrePage">
+ <ul class="categoryActions">
+ <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+ </ul>
+ <h2>{lang:title_wscheck} - {lang:web_services}</h2>
+</div>
+
+<!-- BEGIN update_result -->
+<ul>
+ {update_result.UPD_ELEMENT}
+</ul>
+<!-- END update_result -->
+
+<!-- Add Access -->
+<form method="post" name="adding_access" action="{F_STATUS_ACTION}">
+ <!-- Current Default -->
+ <fieldset>
+ <legend>{lang:ws_adding_legend}</legend>
+ <table>
+ <!-- Access key -->
+ <tr>
+ <td>
+ <label for="KeyName">{lang:Confidential partner key} </label>
+ </td>
+ <td>
+ <input type="text" maxlength="35" size="35" name="add_partner"
+ id="add_partner" value="{F_ADD_PARTNER}"
+ title="{lang:Basis of access key calculation}" />
+ </td>
+ </tr>
+
+ <!-- Target (cat/ids, tag/ids, or list/ids ids=id,id-id,...) -->
+ <tr>
+ <td>
+ <label for="Access">{lang:Target}</label>
+ </td>
+ <td>
+ <input type="text" maxlength="128" size="35" name="add_target"
+ id="add_target" value="{F_ADD_ACCESS}"
+ title="{lang:Facultative and restrictive option}" />
+ <i><small> ({lang:Access: see help text for more})
+ </small></i>
+ </td>
+ </tr>
+
+ <!-- Restricted access to specific request -->
+ <tr>
+ <td>
+ <label for="add_request">{lang:Restrict access to}</label>
+ </td>
+ <td>
+ <select name="add_request" id="add_request" style="width: 18em"
+ onfocus="this.className='focus';"
+ onblur="this.className='nofocus';">
+ <!-- BEGIN add_request -->
+ <option value="{add_request.VALUE}"
+ {add_request.SELECTED}>{add_request.CONTENT}
+ </option>
+ <!-- END add_request -->
+ </select>
+ <i><small> ({lang:ws_Methods})</small></i>
+ </td>
+ </tr>
+
+ <!-- Limit number of images information to be return -->
+ <tr>
+ <td>
+ <label for="add_limit">{lang:Returned images limit}</label>
+ </td>
+ <td>
+ <select name="add_limit" id="add_limit" style="width: 10em"
+ onfocus="this.className='focus';"
+ onblur="this.className='nofocus';">
+ <!-- BEGIN add_limit -->
+ <option value="{add_limit.VALUE}"
+ {add_limit.SELECTED}>{add_limit.CONTENT}
+ </option>
+ <!-- END add_limit -->
+ </select>
+ </td>
+ </tr>
+
+ <!-- Open service is postponed by n days -->
+ <!-- In comment currently
+ <tr>
+ <td>
+ <label for="add_start">{lang:Postponed availability in days}</label>
+ </td>
+ <td>
+ <select name="add_start" id="add_start" style="width: 10em"
+ onfocus="this.className='focus';"
+ onblur="this.className='nofocus';">
+ <!-- BEGIN add_start -->
+ <option value="{add_start.VALUE}"
+ {add_start.SELECTED}>{add_start.CONTENT}
+ </option>
+ <!-- END add_start -->
+ </select>
+ </td>
+ </tr> -->
+
+ <!-- Opened service only for n days -->
+ <tr>
+ <td>
+ <label for="add_end">{lang:Duration in days}</label>
+ </td>
+ <td>
+ <select name="add_end" id="add_end" style="width: 10em"
+ onfocus="this.className='focus';"
+ onblur="this.className='nofocus';">
+ <!-- BEGIN add_end -->
+ <option value="{add_end.VALUE}"
+ {add_end.SELECTED}>{add_end.CONTENT}
+ </option>
+ <!-- END add_end -->
+ </select>
+ </td>
+ </tr>
+
+ <!-- Idendify your partner (name / website / phone) as you want -->
+ <tr>
+ <td>
+ <label for="add_Comment">{lang:ws_Comment}</label>
+ <br />
+ </td>
+ <td>
+ <textarea name="add_comment" id="add_comment"
+ rows="4" cols="80">{lang:Comment to identify your partner clearly}</textarea>
+ </td>
+ </tr>
+
+ <!-- Add submit button -->
+ <tr>
+ <td>
+ </td>
+ <td>
+ <input class="submit" type="submit" name="wsa_submit" style="width: 10em; padding-top: 3px;"
+ value="{lang:Submit}" {TAG_INPUT_ENABLED}
+ title="{lang:Add this access definition}" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+</form>
+
+<!-- BEGIN acc_list -->
+<!-- Access list -->
+<form method="post" name="preferences" action="{F_STATUS_ACTION}">
+ <input type="hidden" name="partner_prev" value="{F_PREV_PARTNER}">
+ <input type="hidden" name="request_prev" value="{F_PREV_REQUEST}">
+ <input type="hidden" name="high_prev" value="{F_PREV_HIGH}">
+ <input type="hidden" name="normal_prev" value="{F_PREV_NORMAL}">
+ <input type="hidden" name="order_prev" value="{F_PREV_ORDER}">
+ <input type="hidden" name="dir5n_prev" value="{F_PREV_DIR5N}">
+ <!-- Delete / Update Selected -->
+ <fieldset>
+ <legend>{lang:ws_update_legend}</legend>
+ <table class="table2">
+ <tr class="throw">
+ <th>&nbsp;</th>
+ <th>{lang:ws_KeyName}</th>
+ <th>{lang:ws_Access}</th>
+ <th>{lang:ws_End}</th>
+ <th>{lang:ws_Request}</th>
+ <th>{lang:ws_Limit}</th>
+ <th>{lang:ws_Comment}</th>
+ </tr>
+ <!-- BEGIN access -->
+ <tr class="{acc_list.access.CLASS}">
+ <td>
+ <input type="radio" name="selection"
+ value="{acc_list.access.ID}" id="selection-{acc_list.access.ID}">
+ </td>
+ <td><label for="selection-{acc_list.access.ID}">{acc_list.access.NAME}</label></td>
+ <td>{acc_list.access.TARGET}</td>
+ <td>{acc_list.access.END}</td>
+ <td>{acc_list.access.REQUEST}</td>
+ <td>{acc_list.access.LIMIT}</td>
+ <td>{acc_list.access.COMMENT}</td>
+ </tr>
+ <!-- END user -->
+ </table>
+
+ <table>
+ <tr>
+ <td>
+ {lang:ws_delete_legend}
+ </td>
+ <td>
+ <input type="radio" name="delete_confirmation"
+ value="true">
+ <input class="submit" type="submit" name="wsX_submit" style="width: 10em; padding-top: 3px;"
+ value="{lang:Delete}" {TAG_INPUT_ENABLED}>
+ </td>
+ </tr>
+ </table>
+ <hr>
+ <table>
+ <tr>
+ <td>
+ <span class="property">
+ <label for="upd_end">{lang:Modify End from Now +} </label>
+ </span>
+ <select name="upd_end" id="upd_end" style="width: 10em"
+ onfocus="this.className='focus';"
+ onblur="this.className='nofocus';">
+ <!-- BEGIN upd_end -->
+ <option value="{acc_list.upd_end.VALUE}" {acc_list.upd_end.SELECTED}>
+ {acc_list.upd_end.CONTENT}
+ </option>
+ <!-- END upd_end -->
+ </select>
+ <input class="submit" type="submit" name="wsu_submit" style="width: 10em; padding-top: 3px;"
+ value="{lang:Submit}" {TAG_INPUT_ENABLED}>
+ </td>
+ <td>
+ <i><small> ({lang:Web Services availability duration in days})</small></i>
+ </td>
+ </tr>
+ </table>
+
+ </fieldset>
+</form>
+<!-- BEGIN ws_status -->
+ <h3>{acc_list.ws_status.VALUE}</h3>
+<!-- END ws_status -->
+<!-- END acc_list -->
diff --git a/template/yoga/fix-ie7.css b/template/yoga/fix-ie7.css
index 029ab46e1..b00319d0b 100644
--- a/template/yoga/fix-ie7.css
+++ b/template/yoga/fix-ie7.css
@@ -1,32 +1,32 @@
-/* $Id: fix-ie7.css 1518 2007-01-09 16:26:52Z Vincent $ */
-/* fix IE with another layout for thumbnails */
-
-#content UL.thumbnails SPAN.wrap2 {
- display: block;
- position: relative;
- text-align: left;
-}
-#content UL.thumbnails SPAN.wrap2 A,
-#content UL.thumbnails SPAN.wrap2 SPAN {
- overflow: visible;
- position: absolute;
- top: 50%;
- text-align: center;
-}
-
-#content UL.thumbnails IMG.thumbnail {
- position: relative;
- top: -50%;
- margin-top: 2%;
-}
-#content UL.thumbnails SPAN.wrap2 {
- border-radius: 8px;
-}
-.tabsheet li {
- border-radius: 12px 12px 0px 0px; /* round corners with CSS3 compliant browsers */
-}
-ul.tabsheet {
- padding: 0px 0em 1.98em 6em;
- border-bottom: 1px solid #fff;
- border-top: 0px;
-}
+/* $Id: fix-ie7.css 1518 2007-01-09 16:26:52Z Vincent $ */
+/* fix IE with another layout for thumbnails */
+
+#content UL.thumbnails SPAN.wrap2 {
+ display: block;
+ position: relative;
+ text-align: left;
+}
+#content UL.thumbnails SPAN.wrap2 A,
+#content UL.thumbnails SPAN.wrap2 SPAN {
+ overflow: visible;
+ position: absolute;
+ top: 50%;
+ text-align: center;
+}
+
+#content UL.thumbnails IMG.thumbnail {
+ position: relative;
+ top: -50%;
+ margin-top: 2%;
+}
+#content UL.thumbnails SPAN.wrap2 {
+ border-radius: 8px;
+}
+.tabsheet li {
+ border-radius: 12px 12px 0px 0px; /* round corners with CSS3 compliant browsers */
+}
+ul.tabsheet {
+ padding: 0px 0em 1.98em 6em;
+ border-bottom: 1px solid #fff;
+ border-top: 0px;
+}
diff --git a/template/yoga/fix-khtml.css b/template/yoga/fix-khtml.css
index 6853313e9..e071061c9 100644
--- a/template/yoga/fix-khtml.css
+++ b/template/yoga/fix-khtml.css
@@ -1,4 +1,4 @@
-/* $Id:$ */
+/* $Id$ */
/* Issue in Safari/Konqueror only */
/* If H2 has a 0 margin-top categoryActions doesn't float right but overwrites H2 */
#content>DIV.titrePage>H2 {
diff --git a/template/yoga/mail/text/html/admin/notification_by_mail.tpl b/template/yoga/mail/text/html/admin/notification_by_mail.tpl
index d2a81000c..77d40daea 100644
--- a/template/yoga/mail/text/html/admin/notification_by_mail.tpl
+++ b/template/yoga/mail/text/html/admin/notification_by_mail.tpl
@@ -1,53 +1,53 @@
-<div id="nbm_message">
-<h2>{lang:Notification}</h2>
-<p>{lang:nbm_content_hello_1}{USERNAME}{lang:nbm_content_hello_2}</p>
-
-<!-- BEGIN subscribe_by_admin -->
-<p>{lang:nbm_content_subscribe_by_admin}</p>
-<!-- END subscribe_by_admin -->
-<!-- BEGIN subscribe_by_himself -->
-<p>{lang:nbm_content_subscribe_by_himself}</p>
-<!-- END subscribe_by_himself -->
-<!-- BEGIN unsubscribe_by_admin -->
-<p>{lang:nbm_content_unsubscribe_by_admin}</p>
-<!-- END unsubscribe_by_admin -->
-<!-- BEGIN unsubscribe_by_himself -->
-<p>{lang:nbm_content_unsubscribe_by_himself}</p>
-<!-- END unsubscribe_by_himself -->
-<!-- BEGIN content_new_elements_single -->
-<p>{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_single}{content_new_elements_single.DATE_SINGLE}{content_new_elements_single.END_PUNCT}</p>
-<!-- END content_new_elements_single -->
-<!-- BEGIN content_new_elements_between -->
-<p>{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_between_1}{content_new_elements_between.DATE_BETWEEN_1}{lang:nbm_content_new_elements_between_2}{content_new_elements_between.DATE_BETWEEN_2}{content_new_elements_between.END_PUNCT}</p>
-<!-- END content_new_elements_between -->
-<!-- BEGIN global_new_line -->
-<ul id="nbm_new_line">
- <!-- BEGIN new_line -->
- <li>{global_new_line.new_line.DATA}</li>
- <!-- END new_line -->
-</ul>
-<!-- END global_new_line -->
-<!-- BEGIN custom -->
-<p>{custom.CUSTOMIZE_MAIL_CONTENT}</p>
-<!-- END custom -->
-<!-- BEGIN goto -->
-<p>{lang:nbm_content_goto_1}<a href="{goto.GALLERY_URL}">{goto.GALLERY_TITLE}</a>{lang:nbm_content_goto_2}</p>
-<!-- END goto -->
-<p>{lang:nbm_content_byebye}</p>
-<p ALIGN=center>{SEND_AS_NAME}</p>
-<p>
-<br/><hr>
-{lang:nbm_content_unsubscribe_link}{lang:nbm_content_click_on}<a href="{UNSUBSCRIBE_LINK}">{UNSUBSCRIBE_LINK}</a><br/>
-{lang:nbm_content_subscribe_link}{lang:nbm_content_click_on}<a href="{SUBSCRIBE_LINK}">{SUBSCRIBE_LINK}</a><br/>
-{lang:nbm_content_problem_contact}<a href="mailto:{CONTACT_EMAIL}?subject={lang:nbm_content_pb_contact_object}">{CONTACT_EMAIL}</a><br/>
-<hr><br/>
-</p>
-<!-- BEGIN recent_post -->
-</div>
-<div id="nbm_recent_post">
- <!-- BEGIN recent_post_block -->
- <h2>{recent_post.recent_post_block.TITLE}</h2>
- {recent_post.recent_post_block.HTML_DATA}
- <!-- END recent_post_block -->
-<!-- END recent_post -->
-</div>
+<div id="nbm_message">
+<h2>{lang:Notification}</h2>
+<p>{lang:nbm_content_hello_1}{USERNAME}{lang:nbm_content_hello_2}</p>
+
+<!-- BEGIN subscribe_by_admin -->
+<p>{lang:nbm_content_subscribe_by_admin}</p>
+<!-- END subscribe_by_admin -->
+<!-- BEGIN subscribe_by_himself -->
+<p>{lang:nbm_content_subscribe_by_himself}</p>
+<!-- END subscribe_by_himself -->
+<!-- BEGIN unsubscribe_by_admin -->
+<p>{lang:nbm_content_unsubscribe_by_admin}</p>
+<!-- END unsubscribe_by_admin -->
+<!-- BEGIN unsubscribe_by_himself -->
+<p>{lang:nbm_content_unsubscribe_by_himself}</p>
+<!-- END unsubscribe_by_himself -->
+<!-- BEGIN content_new_elements_single -->
+<p>{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_single}{content_new_elements_single.DATE_SINGLE}{content_new_elements_single.END_PUNCT}</p>
+<!-- END content_new_elements_single -->
+<!-- BEGIN content_new_elements_between -->
+<p>{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_between_1}{content_new_elements_between.DATE_BETWEEN_1}{lang:nbm_content_new_elements_between_2}{content_new_elements_between.DATE_BETWEEN_2}{content_new_elements_between.END_PUNCT}</p>
+<!-- END content_new_elements_between -->
+<!-- BEGIN global_new_line -->
+<ul id="nbm_new_line">
+ <!-- BEGIN new_line -->
+ <li>{global_new_line.new_line.DATA}</li>
+ <!-- END new_line -->
+</ul>
+<!-- END global_new_line -->
+<!-- BEGIN custom -->
+<p>{custom.CUSTOMIZE_MAIL_CONTENT}</p>
+<!-- END custom -->
+<!-- BEGIN goto -->
+<p>{lang:nbm_content_goto_1}<a href="{goto.GALLERY_URL}">{goto.GALLERY_TITLE}</a>{lang:nbm_content_goto_2}</p>
+<!-- END goto -->
+<p>{lang:nbm_content_byebye}</p>
+<p ALIGN=center>{SEND_AS_NAME}</p>
+<p>
+<br/><hr>
+{lang:nbm_content_unsubscribe_link}{lang:nbm_content_click_on}<a href="{UNSUBSCRIBE_LINK}">{UNSUBSCRIBE_LINK}</a><br/>
+{lang:nbm_content_subscribe_link}{lang:nbm_content_click_on}<a href="{SUBSCRIBE_LINK}">{SUBSCRIBE_LINK}</a><br/>
+{lang:nbm_content_problem_contact}<a href="mailto:{CONTACT_EMAIL}?subject={lang:nbm_content_pb_contact_object}">{CONTACT_EMAIL}</a><br/>
+<hr><br/>
+</p>
+<!-- BEGIN recent_post -->
+</div>
+<div id="nbm_recent_post">
+ <!-- BEGIN recent_post_block -->
+ <h2>{recent_post.recent_post_block.TITLE}</h2>
+ {recent_post.recent_post_block.HTML_DATA}
+ <!-- END recent_post_block -->
+<!-- END recent_post -->
+</div>
diff --git a/template/yoga/mail/text/html/footer.tpl b/template/yoga/mail/text/html/footer.tpl
index 1e85a6a5d..c0ee0d2e4 100644
--- a/template/yoga/mail/text/html/footer.tpl
+++ b/template/yoga/mail/text/html/footer.tpl
@@ -1,19 +1,19 @@
-</div> <!-- content -->
-<div id="copyright">
-<HR>
- <!-- Please, do not remove this copyright. If you really want to,
- contact us on http://phpwebgallery.net to find a solution on how
- to show the origin of the script...-->
-
- {lang:powered_by}
- <a href="http://www.phpwebgallery.net" class="PWG">
- <span class="P">Php</span><span class="W">Web</span><span class="G">Gallery</span></a>
- {VERSION}
- - {lang:send_mail}
- <a href="mailto:{MAIL}?subject={TITLE_MAIL}">{lang:Webmaster}</a>
-
-</div> <!-- copyright -->
-</div> <!-- the_page -->
-
-</body>
-</html>
+</div> <!-- content -->
+<div id="copyright">
+<HR>
+ <!-- Please, do not remove this copyright. If you really want to,
+ contact us on http://phpwebgallery.net to find a solution on how
+ to show the origin of the script...-->
+
+ {lang:powered_by}
+ <a href="http://www.phpwebgallery.net" class="PWG">
+ <span class="P">Php</span><span class="W">Web</span><span class="G">Gallery</span></a>
+ {VERSION}
+ - {lang:send_mail}
+ <a href="mailto:{MAIL}?subject={TITLE_MAIL}">{lang:Webmaster}</a>
+
+</div> <!-- copyright -->
+</div> <!-- the_page -->
+
+</body>
+</html>
diff --git a/template/yoga/mail/text/html/global-mail-css.tpl b/template/yoga/mail/text/html/global-mail-css.tpl
index dd65efff3..c8e4b3c63 100644
--- a/template/yoga/mail/text/html/global-mail-css.tpl
+++ b/template/yoga/mail/text/html/global-mail-css.tpl
@@ -1,18 +1,18 @@
-/* $Id$ */
-/* Global mail css */
-/* Including like css style on HTML mail */
-
-body{background-color:#fff;font-family: Univers, Helvetica, Optima;font-size:12px; margin:0px;padding:0px; color:#369;}
-#the_page {background: #fff url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;
-margin:0px;padding:0px;text-align: left;}
-#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;
-margin:0px;padding:82px 0px 0px 62px; width:732px;}
-hr {width:632px;margin-left:0px;}
-#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
-color: #69c;font-size:10px;margin:0px;padding:98px 0px 62px 62px;}
-.PWG {font-family: verdana, sans-serif !important; font-size: 0.9em; font-weight: normal; letter-spacing: 0px;}
-h2 { background-color:#ddd;padding: 7px 15px; width:617px;font-weight:bold;}
-img { margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
-img:hover { padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }
-a { color: #005e89; background: transparent; }
-a:hover { color: #858460; text-decoration: none;}
+/* $Id$ */
+/* Global mail css */
+/* Including like css style on HTML mail */
+
+body{background-color:#fff;font-family: Univers, Helvetica, Optima;font-size:12px; margin:0px;padding:0px; color:#369;}
+#the_page {background: #fff url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;
+margin:0px;padding:0px;text-align: left;}
+#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;
+margin:0px;padding:82px 0px 0px 62px; width:732px;}
+hr {width:632px;margin-left:0px;}
+#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
+color: #69c;font-size:10px;margin:0px;padding:98px 0px 62px 62px;}
+.PWG {font-family: verdana, sans-serif !important; font-size: 0.9em; font-weight: normal; letter-spacing: 0px;}
+h2 { background-color:#ddd;padding: 7px 15px; width:617px;font-weight:bold;}
+img { margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
+img:hover { padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }
+a { color: #005e89; background: transparent; }
+a:hover { color: #858460; text-decoration: none;}
diff --git a/template/yoga/mail/text/html/header.tpl b/template/yoga/mail/text/html/header.tpl
index 8ac637793..37df3bad9 100644
--- a/template/yoga/mail/text/html/header.tpl
+++ b/template/yoga/mail/text/html/header.tpl
@@ -1,18 +1,18 @@
------={BOUNDARY_KEY}
-Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};
-Content-Transfer-Encoding: 8bit
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="{LANG}" dir="{DIR}">
-<head>
-<title>PhpWebGallery Mail</title>
-<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
-<style><!-- /* Mini style for mails */
-{GLOBAL_MAIL_CSS}
-{MAIL_CSS}
-{LOCAL_MAIL_CSS}
---></style>
-</head>
-<body>
-<div id="the_page">
-<div id="content">
+-----={BOUNDARY_KEY}
+Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};
+Content-Transfer-Encoding: 8bit
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="{LANG}" dir="{DIR}">
+<head>
+<title>PhpWebGallery Mail</title>
+<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
+<style><!-- /* Mini style for mails */
+{GLOBAL_MAIL_CSS}
+{MAIL_CSS}
+{LOCAL_MAIL_CSS}
+--></style>
+</head>
+<body>
+<div id="the_page">
+<div id="content">
diff --git a/template/yoga/mail/text/plain/admin/notification_by_mail.tpl b/template/yoga/mail/text/plain/admin/notification_by_mail.tpl
index 0f2179300..edaced083 100644
--- a/template/yoga/mail/text/plain/admin/notification_by_mail.tpl
+++ b/template/yoga/mail/text/plain/admin/notification_by_mail.tpl
@@ -1,43 +1,43 @@
-{lang:nbm_content_hello_1}{USERNAME}{lang:nbm_content_hello_2}
-
-<!-- BEGIN subscribe_by_admin -->
-{lang:nbm_content_subscribe_by_admin}
-<!-- END subscribe_by_admin -->
-<!-- BEGIN subscribe_by_himself -->
-{lang:nbm_content_subscribe_by_himself}
-<!-- END subscribe_by_himself -->
-<!-- BEGIN unsubscribe_by_admin -->
-{lang:nbm_content_unsubscribe_by_admin}
-<!-- END unsubscribe_by_admin -->
-<!-- BEGIN unsubscribe_by_himself -->
-{lang:nbm_content_unsubscribe_by_himself}
-<!-- END unsubscribe_by_himself -->
-<!-- BEGIN content_new_elements_single -->
-{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_single}{content_new_elements_single.DATE_SINGLE}{content_new_elements_single.END_PUNCT}
-<!-- END content_new_elements_single -->
-<!-- BEGIN content_new_elements_between -->
-{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_between_1}{content_new_elements_between.DATE_BETWEEN_1}{lang:nbm_content_new_elements_between_2}{content_new_elements_between.DATE_BETWEEN_2}{content_new_elements_between.END_PUNCT}
-<!-- END content_new_elements_between -->
-<!-- BEGIN global_new_line -->
-<!-- BEGIN new_line -->
- o {global_new_line.new_line.DATA}
-<!-- END new_line -->
-<!-- END global_new_line -->
-<!-- BEGIN custom -->
-
-{custom.CUSTOMIZE_MAIL_CONTENT}
-<!-- END custom -->
-<!-- BEGIN goto -->
-
-{lang:nbm_content_goto_1}{goto.GALLERY_TITLE} {goto.GALLERY_URL} {lang:nbm_content_goto_2}
-<!-- END goto -->
-
-{lang:nbm_content_byebye}
- {SEND_AS_NAME}
-
-______________________________________________________________________________
-
-{lang:nbm_content_unsubscribe_link}{lang:nbm_content_click_on}{UNSUBSCRIBE_LINK}
-{lang:nbm_content_subscribe_link}{lang:nbm_content_click_on}{SUBSCRIBE_LINK}
-{lang:nbm_content_problem_contact}{CONTACT_EMAIL}
-______________________________________________________________________________
+{lang:nbm_content_hello_1}{USERNAME}{lang:nbm_content_hello_2}
+
+<!-- BEGIN subscribe_by_admin -->
+{lang:nbm_content_subscribe_by_admin}
+<!-- END subscribe_by_admin -->
+<!-- BEGIN subscribe_by_himself -->
+{lang:nbm_content_subscribe_by_himself}
+<!-- END subscribe_by_himself -->
+<!-- BEGIN unsubscribe_by_admin -->
+{lang:nbm_content_unsubscribe_by_admin}
+<!-- END unsubscribe_by_admin -->
+<!-- BEGIN unsubscribe_by_himself -->
+{lang:nbm_content_unsubscribe_by_himself}
+<!-- END unsubscribe_by_himself -->
+<!-- BEGIN content_new_elements_single -->
+{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_single}{content_new_elements_single.DATE_SINGLE}{content_new_elements_single.END_PUNCT}
+<!-- END content_new_elements_single -->
+<!-- BEGIN content_new_elements_between -->
+{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_between_1}{content_new_elements_between.DATE_BETWEEN_1}{lang:nbm_content_new_elements_between_2}{content_new_elements_between.DATE_BETWEEN_2}{content_new_elements_between.END_PUNCT}
+<!-- END content_new_elements_between -->
+<!-- BEGIN global_new_line -->
+<!-- BEGIN new_line -->
+ o {global_new_line.new_line.DATA}
+<!-- END new_line -->
+<!-- END global_new_line -->
+<!-- BEGIN custom -->
+
+{custom.CUSTOMIZE_MAIL_CONTENT}
+<!-- END custom -->
+<!-- BEGIN goto -->
+
+{lang:nbm_content_goto_1}{goto.GALLERY_TITLE} {goto.GALLERY_URL} {lang:nbm_content_goto_2}
+<!-- END goto -->
+
+{lang:nbm_content_byebye}
+ {SEND_AS_NAME}
+
+______________________________________________________________________________
+
+{lang:nbm_content_unsubscribe_link}{lang:nbm_content_click_on}{UNSUBSCRIBE_LINK}
+{lang:nbm_content_subscribe_link}{lang:nbm_content_click_on}{SUBSCRIBE_LINK}
+{lang:nbm_content_problem_contact}{CONTACT_EMAIL}
+______________________________________________________________________________
diff --git a/template/yoga/mail/text/plain/footer.tpl b/template/yoga/mail/text/plain/footer.tpl
index 7d97bba50..a43f1621a 100644
--- a/template/yoga/mail/text/plain/footer.tpl
+++ b/template/yoga/mail/text/plain/footer.tpl
@@ -1,3 +1,3 @@
-
-------------------------
-PhpWebGallery {VERSION}
+
+------------------------
+PhpWebGallery {VERSION}
diff --git a/template/yoga/mail/text/plain/header.tpl b/template/yoga/mail/text/plain/header.tpl
index 1aefc7d2d..ce7667106 100644
--- a/template/yoga/mail/text/plain/header.tpl
+++ b/template/yoga/mail/text/plain/header.tpl
@@ -1,3 +1,3 @@
------={BOUNDARY_KEY}
-Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};
-Content-Transfer-Encoding: 8bit
+-----={BOUNDARY_KEY}
+Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};
+Content-Transfer-Encoding: 8bit
diff --git a/template/yoga/not-ie.css b/template/yoga/not-ie.css
index a66f305f6..a9caaed28 100644
--- a/template/yoga/not-ie.css
+++ b/template/yoga/not-ie.css
@@ -1,24 +1,24 @@
-/* $Id$ */
-
-/* All directives not supported by IE */
-/* can be overiden in any theme but not hidden to IE */
-
-#content UL.thumbnails SPAN.wrap2 {
- -moz-border-radius: 4px; /* round corners with Geko */
- -webkit-border-radius: 4px; /* Safari webkit project */
-}
-#content DIV#comments {
- padding-left: 5px;
- padding-right: 5px;
- -moz-box-sizing: padding-box !important;
-}
-FORM#quickconnect LABEL {
- margin:0;
- width: 100%;
- -moz-box-sizing: padding-box !important;
- box-sizing: border-box; /* CSS3 */
-}
-ul.tabsheet li {
- -moz-border-radius: 6px 6px 0px 0px; /* round corners with CSS3 compliant browsers */
- -webkit-border-radius: 6px 6px 0px 0px; /* Safari webkit project */
-}
+/* $Id$ */
+
+/* All directives not supported by IE */
+/* can be overiden in any theme but not hidden to IE */
+
+#content UL.thumbnails SPAN.wrap2 {
+ -moz-border-radius: 4px; /* round corners with Geko */
+ -webkit-border-radius: 4px; /* Safari webkit project */
+}
+#content DIV#comments {
+ padding-left: 5px;
+ padding-right: 5px;
+ -moz-box-sizing: padding-box !important;
+}
+FORM#quickconnect LABEL {
+ margin:0;
+ width: 100%;
+ -moz-box-sizing: padding-box !important;
+ box-sizing: border-box; /* CSS3 */
+}
+ul.tabsheet li {
+ -moz-border-radius: 6px 6px 0px 0px; /* round corners with CSS3 compliant browsers */
+ -webkit-border-radius: 6px 6px 0px 0px; /* Safari webkit project */
+}
diff --git a/template/yoga/slideshow.tpl b/template/yoga/slideshow.tpl
index 9afd46f7b..76cf4172a 100644
--- a/template/yoga/slideshow.tpl
+++ b/template/yoga/slideshow.tpl
@@ -1,18 +1,18 @@
-<!-- $Id: slideshow.tpl 1672 2006-12-17 11:02:09Z vdigital $ -->
-<div id="imageHeaderBar">
- <div class="browsePath">
- <!-- BEGIN stop_slideshow -->
- [ <a href="{stop_slideshow.U_SLIDESHOW}">{lang:slideshow_stop}</a> ]
- <!-- END stop_slideshow -->
- </div>
- <div class="imageNumber">{PHOTO}</div>
- <!-- BEGIN title -->
- <h2 class="showtitle">{TITLE}</h2>
- <!-- END title -->
-</div>
-<div id="theImage">
- {ELEMENT_CONTENT}
-<!-- BEGIN legend -->
-<p class="showlegend">{legend.COMMENT_IMG}</p>
-<!-- END legend -->
-</div>
+<!-- $Id: slideshow.tpl 1672 2006-12-17 11:02:09Z vdigital $ -->
+<div id="imageHeaderBar">
+ <div class="browsePath">
+ <!-- BEGIN stop_slideshow -->
+ [ <a href="{stop_slideshow.U_SLIDESHOW}">{lang:slideshow_stop}</a> ]
+ <!-- END stop_slideshow -->
+ </div>
+ <div class="imageNumber">{PHOTO}</div>
+ <!-- BEGIN title -->
+ <h2 class="showtitle">{TITLE}</h2>
+ <!-- END title -->
+</div>
+<div id="theImage">
+ {ELEMENT_CONTENT}
+<!-- BEGIN legend -->
+<p class="showlegend">{legend.COMMENT_IMG}</p>
+<!-- END legend -->
+</div>
diff --git a/template/yoga/theme/clear/mail-css.tpl b/template/yoga/theme/clear/mail-css.tpl
index 549113132..e88f6685d 100644
--- a/template/yoga/theme/clear/mail-css.tpl
+++ b/template/yoga/theme/clear/mail-css.tpl
@@ -1,14 +1,14 @@
-/* $Id$ */
-/* Theme mail css */
-/* Including like css style on HTML mail */
-
-body{background-color:#fff; color:#696969;}
-#the_page {background: #fff url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
-#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
-#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
-color: #333;}
-h2 { background-color: #ddd;}
-img { margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
-img:hover { padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }
-a { color: #369; background: transparent; }
-a:hover { color: #ddd; }
+/* $Id$ */
+/* Theme mail css */
+/* Including like css style on HTML mail */
+
+body{background-color:#fff; color:#696969;}
+#the_page {background: #fff url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
+#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
+#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
+color: #333;}
+h2 { background-color: #ddd;}
+img { margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
+img:hover { padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }
+a { color: #369; background: transparent; }
+a:hover { color: #ddd; }
diff --git a/template/yoga/theme/dark/mail-css.tpl b/template/yoga/theme/dark/mail-css.tpl
index 50b8d1c2b..602a482b4 100644
--- a/template/yoga/theme/dark/mail-css.tpl
+++ b/template/yoga/theme/dark/mail-css.tpl
@@ -1,14 +1,14 @@
-/* $Id$ */
-/* Theme mail css */
-/* Including like css style on HTML mail */
-
-body{background-color:#444; color:#fff;}
-#the_page {background: #444 url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
-#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
-#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
-color: #69c;}
-h2 { background-color: #ddd;color:#fff48e;background-image: url({pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/images/tableh1_bg.png);}
-img { margin: 16px; border: 16px solid #111; -moz-border-radius: 4px; border-radius: 4px 4px; }
-img:hover { padding: 15px; border: 1px solid yellow;background-color:#444;-moz-border-radius: 4px; border-radius: 4px 4px; }
-a { color: #fff48e; background: transparent;border-bottom:1px dotted #005e89; }
-a:hover {color: #fff48e;}
+/* $Id$ */
+/* Theme mail css */
+/* Including like css style on HTML mail */
+
+body{background-color:#444; color:#fff;}
+#the_page {background: #444 url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
+#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
+#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
+color: #69c;}
+h2 { background-color: #ddd;color:#fff48e;background-image: url({pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/images/tableh1_bg.png);}
+img { margin: 16px; border: 16px solid #111; -moz-border-radius: 4px; border-radius: 4px 4px; }
+img:hover { padding: 15px; border: 1px solid yellow;background-color:#444;-moz-border-radius: 4px; border-radius: 4px 4px; }
+a { color: #fff48e; background: transparent;border-bottom:1px dotted #005e89; }
+a:hover {color: #fff48e;}
diff --git a/template/yoga/theme/p0w0/mail-css.tpl b/template/yoga/theme/p0w0/mail-css.tpl
index 01da64618..a0add0604 100644
--- a/template/yoga/theme/p0w0/mail-css.tpl
+++ b/template/yoga/theme/p0w0/mail-css.tpl
@@ -1,13 +1,13 @@
-/* $Id$ */
-/* Theme mail css */
-/* Including like css style on HTML mail */
-
-body{background-color:#cde; color:#369;}
-#the_page {background: #cde url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
-#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
-#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
-color: #69c;}
-h2 {color:#fff;background: #369 url({pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/images/button-bg.png);}
-img { margin:16px;padding:15px;border:1px solid #69c;background-color:#eef;-moz-border-radius:4px; border-radius:4px 4px; }
-img:hover {border: 1px solid #c60; -moz-border-radius:4px; border-radius:4px 4px; }
-a { color: #f92; background: transparent; }
+/* $Id$ */
+/* Theme mail css */
+/* Including like css style on HTML mail */
+
+body{background-color:#cde; color:#369;}
+#the_page {background: #cde url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
+#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
+#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
+color: #69c;}
+h2 {color:#fff;background: #369 url({pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/images/button-bg.png);}
+img { margin:16px;padding:15px;border:1px solid #69c;background-color:#eef;-moz-border-radius:4px; border-radius:4px 4px; }
+img:hover {border: 1px solid #c60; -moz-border-radius:4px; border-radius:4px 4px; }
+a { color: #f92; background: transparent; }
diff --git a/template/yoga/theme/wipi/mail-css.tpl b/template/yoga/theme/wipi/mail-css.tpl
index e24583928..817f49494 100644
--- a/template/yoga/theme/wipi/mail-css.tpl
+++ b/template/yoga/theme/wipi/mail-css.tpl
@@ -1,20 +1,20 @@
-/* $Id$ */
-/* Theme mail css */
-/* Including like css style on HTML mail */
-
-body{background-color:#111; color:#69c;}
-#the_page {background: #111 url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
-#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
-#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
-color: #69c;}
-h2 { background-color: #222;color:#eee;background-image: url({pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/images/tableh1_bg.png);}
-img { margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; }
-img:hover {border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; }
-a { color: #69c; background: transparent; }
-a:hover { color: #f92; }
-a.PWG { border: 0px; }
-a.PWG .P { color : #f92; }
-a.PWG .W { color : #aaa; }
-a.PWG .G { color : #69c; }
-a.PWG:hover .P { color : #69c; }
-a.PWG:hover .G { color : #f92; }
+/* $Id$ */
+/* Theme mail css */
+/* Including like css style on HTML mail */
+
+body{background-color:#111; color:#69c;}
+#the_page {background: #111 url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;}
+#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
+#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
+color: #69c;}
+h2 { background-color: #222;color:#eee;background-image: url({pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/images/tableh1_bg.png);}
+img { margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; }
+img:hover {border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; }
+a { color: #69c; background: transparent; }
+a:hover { color: #f92; }
+a.PWG { border: 0px; }
+a.PWG .P { color : #f92; }
+a.PWG .W { color : #aaa; }
+a.PWG .G { color : #69c; }
+a.PWG:hover .P { color : #69c; }
+a.PWG:hover .G { color : #f92; }
diff --git a/template/yoga/theme/wipi/theme.css b/template/yoga/theme/wipi/theme.css
index 6054b9705..6ab5f0b6e 100644
--- a/template/yoga/theme/wipi/theme.css
+++ b/template/yoga/theme/wipi/theme.css
@@ -1,350 +1,350 @@
-/* $Id: theme.css 1677 2006-12-21 21:38:20Z rub $ */
-
-/* text color */
-BODY, H1, H3, DT,
-INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
- color:#e0e0e0;
-}
-#menubar {
- margin : 0px;
- background-color: transparent;
- border: 0px;
-}
-H2, .throw {
- color: #eee;
-}
-#menubar DT, #menubar DT A {
- color: #eee;
- font-weight: lighter;
-}
-#menubar DT A:hover {
- color: #69c;
- font-weight: lighter;
-}
-#menubar .selected A {
- color: #eee;
-}
-#menubar .selected A:hover {
- color: #f92;
-}
-#menubar DT:before {
- content: "__\\_ ";
- color: #f92;
-}
-#menubar DT:after {
- content: " _/__";
- color: #69c;
-}
-#menubar .button {
- margin: 0 2px 0px 8px;
- width: auto;
- padding: 0;
- text-indent: 0;
- list-style: none;
- text-align: center;
- float: left;
-}
-#theAdminPage #menubar DT:before,
-#theAdminPage #menubar DT:after {
- content: '';
-}
-#content .navigationBar {
- color: #aaaaaa;
-}
-#content .pageNumberSelected {
- color: #f92;
-}
-#content .infos {
- background-color: #69c;
- color: #036;
-}
-#content .errors {
- background-color: #fc5;
- border-color: #f92;
- color: #900;
-}
-.tabsheet li,
-.tabsheet li a { color: #69c; }
-.tabsheet li a:hover { color: #f92; }
-/* backgrounds */
-BODY {
- background: #111;
- margin: 0px;
- padding: 0px;
-}
-H3, #imageHeaderBar, #imageToolBar A:hover, .row1, .tabsheet li {
- background-color: #222;
-}
-#theAdminPage h2, #theAdminPage h3 { border-bottom: 1px solid #69c; }
-#theAdminPage #the_page {
- background-color: #111;
-}
-#imageToolBar, .header_notes {
- background-color: #333;
-}
-.selected_tab { background-color: eee !important; }
-A {
- border-color: #69c;
-}
-A:hover {
- border-color: #f92;
-}
-#content, .content {
- background-color: #181818;
- border: 1px solid #eee;
- padding: 5px;
-}
-#theAdminPage #the_page #content, #theAdminPage #the_page .content {
- background-color: #111;
- border-width: 0px;
- padding: 5px;
-}
-H2, #menubar DT, .throw, TD H3, #theAdminPage H3 {
- background-image: url(images/tableh1_bg.png);
- background-repeat: repeat-x;
-}
-#content H2 {
- background: none;
- border: 0px;
- letter-spacing: -0.05em;
- text-indent: 1em;
- text-transform: uppercase;
- font-weight: lighter;
- margin-bottom: 20px;
-}
-#content ul.thumbnailCategories li div.thumbnailCategory .description h3,
-#content h3 { text-align: center; }
-#content ul.thumbnailCategories li div.thumbnailCategory .description p {
- color: #f92; text-indent: 0em;
-}
-#content ul.thumbnailCategories li div.thumbnailCategory .description p + p {
- color: #fff;
-}
-.browsePath A {
- color: #eee;
-}
-#content H2:before, .browsePath:before, .imageNumber:before,
-#imageHeaderBar H2:before {
- content: "____\\_ ";
- color: #69c;
- font-family: Times, Zapf-Chancery, Cottonwood, Helvetica;
- letter-spacing: 0em;
-}
-#content H2:after, .browsePath:after, .imageNumber:after,
-#imageHeaderBar H2:after {
- content: " _/____";
- color: #f92;
- font-family: Times, Zapf-Chancery, Cottonwood, Helvetica;
- letter-spacing: 0em;
-}
-#imageHeaderBar H2 {
- background-image: none;
- background-color: transparent;
- border: none;
-}
-#thePicturePage #the_page {
- background-color: #111;
-}
-#thePicturePage #imageHeaderBar {
- background-image: url(images/tableh2_bg.png);
- background-repeat: repeat-x;
-}
-#thePicturePage #imageToolBar {
- background-color: #111;
- border-bottom: 2px solid #69c;
-}
-#thePicturePage #theImage {
- background-color: #111;
- margin: 0px;
- padding: 3px 0px 15px 0px;
-}
-
-#thePicturePage #comments H2 {
- background-image: none;
- background-color: #222;
- border-top: 2px solid #69c;
- border-bottom: 2px solid #69c;
- color: #69c;
- font-weight: lighter;
-}
-
-/* borders */
-#comments DIV.comment BLOCKQUOTE {
- border: 1px solid #000;
-}
-#imageHeaderBar {
- border-top: 1px solid #000;
-}
-H2, #imageToolBar {
- border-bottom: 1px solid #000;
-}
-
-#theImage IMG {
- border-color: #fff;
-}
-
-#content UL.thumbnail IMG {
- border: 1px solid #a0a0a0;
-}
-.illustration A {
- border: 0px;
-}
-FIELDSET, INPUT, SELECT, TEXTAREA,
-#content DIV.comment A.illustration IMG, #infos,
-#content DIV.thumbnailCategory {
- border: 1px solid gray;
-}
-#content DIV.thumbnailCategory {
- border: 1px solid #69c;
- margin: 8px 4px;
-}
-#comments DIV.comment BLOCKQUOTE {
- border-left: 2px solid #696969;
-}
-
-#content UL.thumbnails SPAN.wrap2 {
- border: 1px solid #aaaaaa; /* thumbnails border color and style */
- border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */
-}
-
-#content UL.thumbnails SPAN.wrap2:hover,
-#content UL.thumbnailCategories DIV.thumbnailCategory:hover {
- background-color: #333;
- border-color: #69c; /* thumbnails border color when mouse cursor is over it */
-}
-
-#menubar .buttonmenu {
- margin: 0 2px;
- width: auto;
- padding: 0;
- text-indent: 0;
- list-style: none;
- text-align: center;
- float: left;
-}
-/* links */
-A, INPUT.rateButton, legend {
- color: #69c;
-}
-
-A:hover {
- color: #f92;
-}
-
-#imageToolBar A, #imageToolBar A:hover {
- border-bottom: none;
-}
-A.navThumb, A.navThumb:hover {
- border-bottom: none;
-}
-/* others */
-.pleaseNote {
- background: #9c9c9c;
- color: #ffff99;
- padding: 1ex;
- font-weight: bold;
-}
-#the_page {
- border: 1px dotted #f92;
- padding-top: 5px;
- padding-bottom:30px;
- text-align:center;
- display:block;
- margin: 2px;
-}
-#copyright {
- color: #69c;
-}
-/*calendar elements*/
-SPAN.calItemEmpty { color: silver; }
-
-SPAN.calItem, SPAN.calItemEmpty
-{
- border: 1px solid gray;
-}
-label {
- cursor:pointer
-}
-input#qsearchInput {
- color: #58c;
- background-color: #222;
- border: 1px solid #333;
- padding: 1px 3px;
-}
-.zero { display: none }
-.one { background: transparent; }
-.plural { background: transparent; }
-.nb-hits { color: #69c; }
-.nb-comments { color: #f92; }
-
-FORM#quickconnect,
-FORM#quickconnect FIELDSET,
-FORM#quickconnect P,
-FORM#quickconnect UL.actions,
-FORM#quickconnect FIELDSET>UL.actions,
-FORM#quickconnect UL.actions,
-FORM#quickconnect P,
-FORM#quickconnect LABEL {
- color: #69c;
-}
-FORM#quickconnect P INPUT,
-FORM#quickconnect INPUT[type=text],
-FORM#quickconnect INPUT[type=password] {
- width: 85%;
- color: #58c;
- background-color: #222;
- border: 1px solid #333;
- padding: 1px 3px;
-}
-
-/* nice looking month calendar*/
-TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}
-
-TD.calDayCellEmpty { color: silver; }
-
-.calBackDate { color: #000; }
-.calForeDate { color: #fff; }
-.virtual_cat { background: #222 !important; }
-
-.PWG {
- font-family: verdana, arial, helvetica, sans-serif !important;
- font-size: 0.9em;
- font-weight: normal;
- letter-spacing: 0px;
-}
-a.PWG { border: 0px; }
-a.PWG .P { color : #f92; }
-a.PWG .W { color : #aaa; }
-a.PWG .G { color : #69c; }
-a.PWG:hover .P { color : #69c; }
-a.PWG:hover .G { color : #f92; }
-#menubar DT {
- border-top: 1px solid #eef;
- border-right: 1px solid #69c;
- border-bottom: 1px solid #69c;
- border-bottom-right-radius: 12px;
- -moz-border-radius-bottomright: 12px;
- box-shadow: 5px 5px #69c;
-}
-.statBar { background-color: #e60; }
-#imageToolBar .randomButtons a:hover,
-#imageToolBar .navButtons a:hover { background-color: #111; }
-#menubar .menuInfoCat,
-#menubar .menuInfoCatByChild, .qsearch,
-h2.showtitle, #theImage p.showlegend { display: none }
-* { outline-width: 0px; }
-ul.tabsheet {
- border-top: 1px solid #69c !important;
- border-bottom: 0px !important;
-}
-.tabsheet li {
- border: 1px solid #fff;
- background-image: url(images/tableh1_bg.png);
- background-repeat: repeat-x;
-}
-.tabsheet li:hover { border-color: #f92 !important; }
-ul.tabsheet li {
- -moz-border-radius: 0px 0px 3px 3px;
- border-radius: 0px 0px 12px 12px;
- -webkit-border-radius: 0px 0px 3px 3px;
-}
+/* $Id: theme.css 1677 2006-12-21 21:38:20Z rub $ */
+
+/* text color */
+BODY, H1, H3, DT,
+INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
+ color:#e0e0e0;
+}
+#menubar {
+ margin : 0px;
+ background-color: transparent;
+ border: 0px;
+}
+H2, .throw {
+ color: #eee;
+}
+#menubar DT, #menubar DT A {
+ color: #eee;
+ font-weight: lighter;
+}
+#menubar DT A:hover {
+ color: #69c;
+ font-weight: lighter;
+}
+#menubar .selected A {
+ color: #eee;
+}
+#menubar .selected A:hover {
+ color: #f92;
+}
+#menubar DT:before {
+ content: "__\\_ ";
+ color: #f92;
+}
+#menubar DT:after {
+ content: " _/__";
+ color: #69c;
+}
+#menubar .button {
+ margin: 0 2px 0px 8px;
+ width: auto;
+ padding: 0;
+ text-indent: 0;
+ list-style: none;
+ text-align: center;
+ float: left;
+}
+#theAdminPage #menubar DT:before,
+#theAdminPage #menubar DT:after {
+ content: '';
+}
+#content .navigationBar {
+ color: #aaaaaa;
+}
+#content .pageNumberSelected {
+ color: #f92;
+}
+#content .infos {
+ background-color: #69c;
+ color: #036;
+}
+#content .errors {
+ background-color: #fc5;
+ border-color: #f92;
+ color: #900;
+}
+.tabsheet li,
+.tabsheet li a { color: #69c; }
+.tabsheet li a:hover { color: #f92; }
+/* backgrounds */
+BODY {
+ background: #111;
+ margin: 0px;
+ padding: 0px;
+}
+H3, #imageHeaderBar, #imageToolBar A:hover, .row1, .tabsheet li {
+ background-color: #222;
+}
+#theAdminPage h2, #theAdminPage h3 { border-bottom: 1px solid #69c; }
+#theAdminPage #the_page {
+ background-color: #111;
+}
+#imageToolBar, .header_notes {
+ background-color: #333;
+}
+.selected_tab { background-color: eee !important; }
+A {
+ border-color: #69c;
+}
+A:hover {
+ border-color: #f92;
+}
+#content, .content {
+ background-color: #181818;
+ border: 1px solid #eee;
+ padding: 5px;
+}
+#theAdminPage #the_page #content, #theAdminPage #the_page .content {
+ background-color: #111;
+ border-width: 0px;
+ padding: 5px;
+}
+H2, #menubar DT, .throw, TD H3, #theAdminPage H3 {
+ background-image: url(images/tableh1_bg.png);
+ background-repeat: repeat-x;
+}
+#content H2 {
+ background: none;
+ border: 0px;
+ letter-spacing: -0.05em;
+ text-indent: 1em;
+ text-transform: uppercase;
+ font-weight: lighter;
+ margin-bottom: 20px;
+}
+#content ul.thumbnailCategories li div.thumbnailCategory .description h3,
+#content h3 { text-align: center; }
+#content ul.thumbnailCategories li div.thumbnailCategory .description p {
+ color: #f92; text-indent: 0em;
+}
+#content ul.thumbnailCategories li div.thumbnailCategory .description p + p {
+ color: #fff;
+}
+.browsePath A {
+ color: #eee;
+}
+#content H2:before, .browsePath:before, .imageNumber:before,
+#imageHeaderBar H2:before {
+ content: "____\\_ ";
+ color: #69c;
+ font-family: Times, Zapf-Chancery, Cottonwood, Helvetica;
+ letter-spacing: 0em;
+}
+#content H2:after, .browsePath:after, .imageNumber:after,
+#imageHeaderBar H2:after {
+ content: " _/____";
+ color: #f92;
+ font-family: Times, Zapf-Chancery, Cottonwood, Helvetica;
+ letter-spacing: 0em;
+}
+#imageHeaderBar H2 {
+ background-image: none;
+ background-color: transparent;
+ border: none;
+}
+#thePicturePage #the_page {
+ background-color: #111;
+}
+#thePicturePage #imageHeaderBar {
+ background-image: url(images/tableh2_bg.png);
+ background-repeat: repeat-x;
+}
+#thePicturePage #imageToolBar {
+ background-color: #111;
+ border-bottom: 2px solid #69c;
+}
+#thePicturePage #theImage {
+ background-color: #111;
+ margin: 0px;
+ padding: 3px 0px 15px 0px;
+}
+
+#thePicturePage #comments H2 {
+ background-image: none;
+ background-color: #222;
+ border-top: 2px solid #69c;
+ border-bottom: 2px solid #69c;
+ color: #69c;
+ font-weight: lighter;
+}
+
+/* borders */
+#comments DIV.comment BLOCKQUOTE {
+ border: 1px solid #000;
+}
+#imageHeaderBar {
+ border-top: 1px solid #000;
+}
+H2, #imageToolBar {
+ border-bottom: 1px solid #000;
+}
+
+#theImage IMG {
+ border-color: #fff;
+}
+
+#content UL.thumbnail IMG {
+ border: 1px solid #a0a0a0;
+}
+.illustration A {
+ border: 0px;
+}
+FIELDSET, INPUT, SELECT, TEXTAREA,
+#content DIV.comment A.illustration IMG, #infos,
+#content DIV.thumbnailCategory {
+ border: 1px solid gray;
+}
+#content DIV.thumbnailCategory {
+ border: 1px solid #69c;
+ margin: 8px 4px;
+}
+#comments DIV.comment BLOCKQUOTE {
+ border-left: 2px solid #696969;
+}
+
+#content UL.thumbnails SPAN.wrap2 {
+ border: 1px solid #aaaaaa; /* thumbnails border color and style */
+ border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */
+}
+
+#content UL.thumbnails SPAN.wrap2:hover,
+#content UL.thumbnailCategories DIV.thumbnailCategory:hover {
+ background-color: #333;
+ border-color: #69c; /* thumbnails border color when mouse cursor is over it */
+}
+
+#menubar .buttonmenu {
+ margin: 0 2px;
+ width: auto;
+ padding: 0;
+ text-indent: 0;
+ list-style: none;
+ text-align: center;
+ float: left;
+}
+/* links */
+A, INPUT.rateButton, legend {
+ color: #69c;
+}
+
+A:hover {
+ color: #f92;
+}
+
+#imageToolBar A, #imageToolBar A:hover {
+ border-bottom: none;
+}
+A.navThumb, A.navThumb:hover {
+ border-bottom: none;
+}
+/* others */
+.pleaseNote {
+ background: #9c9c9c;
+ color: #ffff99;
+ padding: 1ex;
+ font-weight: bold;
+}
+#the_page {
+ border: 1px dotted #f92;
+ padding-top: 5px;
+ padding-bottom:30px;
+ text-align:center;
+ display:block;
+ margin: 2px;
+}
+#copyright {
+ color: #69c;
+}
+/*calendar elements*/
+SPAN.calItemEmpty { color: silver; }
+
+SPAN.calItem, SPAN.calItemEmpty
+{
+ border: 1px solid gray;
+}
+label {
+ cursor:pointer
+}
+input#qsearchInput {
+ color: #58c;
+ background-color: #222;
+ border: 1px solid #333;
+ padding: 1px 3px;
+}
+.zero { display: none }
+.one { background: transparent; }
+.plural { background: transparent; }
+.nb-hits { color: #69c; }
+.nb-comments { color: #f92; }
+
+FORM#quickconnect,
+FORM#quickconnect FIELDSET,
+FORM#quickconnect P,
+FORM#quickconnect UL.actions,
+FORM#quickconnect FIELDSET>UL.actions,
+FORM#quickconnect UL.actions,
+FORM#quickconnect P,
+FORM#quickconnect LABEL {
+ color: #69c;
+}
+FORM#quickconnect P INPUT,
+FORM#quickconnect INPUT[type=text],
+FORM#quickconnect INPUT[type=password] {
+ width: 85%;
+ color: #58c;
+ background-color: #222;
+ border: 1px solid #333;
+ padding: 1px 3px;
+}
+
+/* nice looking month calendar*/
+TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}
+
+TD.calDayCellEmpty { color: silver; }
+
+.calBackDate { color: #000; }
+.calForeDate { color: #fff; }
+.virtual_cat { background: #222 !important; }
+
+.PWG {
+ font-family: verdana, arial, helvetica, sans-serif !important;
+ font-size: 0.9em;
+ font-weight: normal;
+ letter-spacing: 0px;
+}
+a.PWG { border: 0px; }
+a.PWG .P { color : #f92; }
+a.PWG .W { color : #aaa; }
+a.PWG .G { color : #69c; }
+a.PWG:hover .P { color : #69c; }
+a.PWG:hover .G { color : #f92; }
+#menubar DT {
+ border-top: 1px solid #eef;
+ border-right: 1px solid #69c;
+ border-bottom: 1px solid #69c;
+ border-bottom-right-radius: 12px;
+ -moz-border-radius-bottomright: 12px;
+ box-shadow: 5px 5px #69c;
+}
+.statBar { background-color: #e60; }
+#imageToolBar .randomButtons a:hover,
+#imageToolBar .navButtons a:hover { background-color: #111; }
+#menubar .menuInfoCat,
+#menubar .menuInfoCatByChild, .qsearch,
+h2.showtitle, #theImage p.showlegend { display: none }
+* { outline-width: 0px; }
+ul.tabsheet {
+ border-top: 1px solid #69c !important;
+ border-bottom: 0px !important;
+}
+.tabsheet li {
+ border: 1px solid #fff;
+ background-image: url(images/tableh1_bg.png);
+ background-repeat: repeat-x;
+}
+.tabsheet li:hover { border-color: #f92 !important; }
+ul.tabsheet li {
+ -moz-border-radius: 0px 0px 3px 3px;
+ border-radius: 0px 0px 12px 12px;
+ -webkit-border-radius: 0px 0px 3px 3px;
+}
diff --git a/template/yoga/theme/wipi/themeconf.inc.php b/template/yoga/theme/wipi/themeconf.inc.php
index 05c933e08..4ac750e46 100644
--- a/template/yoga/theme/wipi/themeconf.inc.php
+++ b/template/yoga/theme/wipi/themeconf.inc.php
@@ -1,16 +1,16 @@
-<?php
-$themeconf = array(
- 'template' => 'yoga',
- 'theme' => 'wipi',
- 'template_dir' => 'template/yoga',
- 'icon_dir' => 'template/yoga/icon',
- 'admin_icon_dir' => 'template/yoga/icon/admin',
- 'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
- 'local_head' => '<!-- no theme specific head content -->',
-);
-if ( !isset($lang['Theme: wipi']) )
-{
- $lang['Theme: wipi'] = 'The site is displayed with wipi theme based ' .
- ' on yoga template, a standard template/theme of PhpWebgallery.';
-}
-?>
+<?php
+$themeconf = array(
+ 'template' => 'yoga',
+ 'theme' => 'wipi',
+ 'template_dir' => 'template/yoga',
+ 'icon_dir' => 'template/yoga/icon',
+ 'admin_icon_dir' => 'template/yoga/icon/admin',
+ 'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
+ 'local_head' => '<!-- no theme specific head content -->',
+);
+if ( !isset($lang['Theme: wipi']) )
+{
+ $lang['Theme: wipi'] = 'The site is displayed with wipi theme based ' .
+ ' on yoga template, a standard template/theme of PhpWebgallery.';
+}
+?>