update ES_es language

git-svn-id: http://piwigo.org/svn/branches/2.0@6117 68402e56-0260-453c-a942-63ccdbb3a9ee

about.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

action.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -177,8 +177,7 @@ $http_headers[] = 'Content-Type: '.$ctype;
 
 if (!isset($_GET['view']))
 {
-  $http_headers[] = 'Content-Disposition: attachment; filename="'
-            .basename($file).'";';
+  $http_headers[] = 'Content-Disposition: attachment; filename="'.$element_info['file'].'";';
   $http_headers[] = 'Content-Transfer-Encoding: binary';
 }
 else

admin.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -95,6 +95,7 @@ $template->assign(
     'U_PERMALINKS'=> $link_start.'permalinks',
     'U_RETURN'=> make_index_url(),
     'U_ADMIN'=> PHPWG_ROOT_PATH.'admin.php',
+    'U_LOGOUT'=> PHPWG_ROOT_PATH.'index.php?act=logout',
     'U_PLUGINS'=> $link_start.'plugins_list',
     )
   );

admin/advanced_feature.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -92,7 +92,8 @@ $start_url = get_root_url().'admin.php?page=advanced_feature&action=';
 $template->assign(
   array
   (
-    'U_HELP' => get_root_url().'popuphelp.php?page=advanced_feature'
+    'U_HELP' => get_root_url().'popuphelp.php?page=advanced_feature',
+    'U_ACTIVE_MENU' => 5
   ));
 
 // advanced_features

admin/cat_list.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -33,6 +33,11 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 // +-----------------------------------------------------------------------+
 check_status(ACCESS_ADMINISTRATOR);
 
+if (!empty($_POST) or isset($_GET['delete']))
+{
+  check_pwg_token();
+}
+
 // +-----------------------------------------------------------------------+
 // |                               functions                               |
 // +-----------------------------------------------------------------------+
@@ -64,6 +69,8 @@ function save_categories_order($categories)
 // |                            initialization                             |
 // +-----------------------------------------------------------------------+
 
+check_input_parameter('parent_id', $_GET, false, PATTERN_ID);
+
 $categories = array();
 
 $base_url = get_root_url().'admin.php?page=cat_list';
@@ -132,6 +139,29 @@ SELECT id, name
     l10n('Categories ordered alphanumerically')
     );
 }
+// sort categories alpha-numerically reverse
+else if (isset($_POST['submitOrderAlphaNumReverse']))
+{
+  $query = '
+SELECT id, name
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id_uppercat '.
+    (!isset($_GET['parent_id']) ? 'IS NULL' : '= '.$_GET['parent_id']).'
+;';
+  $result = pwg_query($query);
+  while ($row = mysql_fetch_assoc($result))
+  {
+    $categories[ $row['id'] ] = strtolower($row['name']);
+  }
+
+  arsort($categories, SORT_REGULAR);
+  save_categories_order(array_keys($categories));
+
+  array_push(
+    $page['infos'],
+    l10n('Categories ordered alphanumerically reverse')
+    );
+}
 
 // +-----------------------------------------------------------------------+
 // |                            Navigation path                            |
@@ -161,6 +191,7 @@ if (isset($_GET['parent_id']))
 $template->assign(array(
   'CATEGORIES_NAV'=>$navigation,
   'F_ACTION'=>$form_action,
+  'PWG_TOKEN' => get_pwg_token(),
  ));
 
 // +-----------------------------------------------------------------------+
@@ -236,6 +267,7 @@ foreach ($categories as $category)
   if (empty($category['dir']))
   {
     $tpl_cat['U_DELETE'] = $self_url.'&delete='.$category['id'];
+    $tpl_cat['U_DELETE'].= '&pwg_token='.get_pwg_token();
   }
 
   if ( array_key_exists($category['id'], $categories_with_images) )

admin/cat_modify.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -235,6 +235,7 @@ if (!empty($category['id_uppercat']))
 $template->assign(
   array(
     'CATEGORIES_NAV'     => $navigation,
+    'CAT_ID'             => $category['id'],
     'CAT_NAME'           => @htmlspecialchars($category['name']),
     'CAT_COMMENT'        => @htmlspecialchars($category['comment']),
 
@@ -470,7 +471,7 @@ SELECT id, file, path, tn_ext
                           'image_file' => $element['file'],
                           'category' => $category
                         ))
-                      .'"><img src="'.get_thumbnail_url($element).'"/></a>';
+                      .'" class="thumblnk"><img src="'.get_thumbnail_url($element).'"/></a>';
     }
   }
   

admin/cat_move.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/cat_options.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/cat_perm.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/comments.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -139,7 +139,7 @@ SELECT c.id, c.image_id, c.date, c.author, c.content, i.path, i.tn_ext
     INNER JOIN '.IMAGES_TABLE.' AS i
       ON i.id = c.image_id
   WHERE validated = \'false\'
-  ORDER BY c.date DESC  
+  ORDER BY c.date DESC
 ;';
 $result = pwg_query($query);
 while ($row = mysql_fetch_assoc($result))
@@ -160,7 +160,7 @@ while ($row = mysql_fetch_assoc($result))
       'ID' => $row['id'],
       'TN_SRC' => $thumb,
       'AUTHOR' => trigger_event('render_comment_author', $row['author']),
-      'DATE' => format_date($row['date'],'mysql_datetime',true),
+      'DATE' => format_date($row['date'], true),
       'CONTENT' => trigger_event('render_comment_content',$row['content'])
       )
     );

admin/configuration.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/element_set.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -39,6 +39,8 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 // +-----------------------------------------------------------------------+
 check_status(ACCESS_ADMINISTRATOR);
 
+check_input_parameter('selection', $_POST, true, PATTERN_ID);
+
 // +-----------------------------------------------------------------------+
 // |                          caddie management                            |
 // +-----------------------------------------------------------------------+
@@ -133,6 +135,7 @@ SELECT element_id
 else if ('not_linked' == $_GET['cat'])
 {
   $page['title'] = l10n('Elements_not_linked');
+  $template->assign(array('U_ACTIVE_MENU' => 5 ));
 
   // we are searching elements not linked to any virtual category
   $query = '
@@ -163,6 +166,7 @@ SELECT DISTINCT(image_id)
 else if ('duplicates' == $_GET['cat'])
 {
   $page['title'] = l10n('Duplicates');
+  $template->assign(array('U_ACTIVE_MENU' => 5 ));
 
   // we are searching related elements twice or more to physical categories
   // 1 - Retrieve Files

admin/element_set_global.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -43,6 +43,12 @@ check_status(ACCESS_ADMINISTRATOR);
 // |                         deletion form submission                      |
 // +-----------------------------------------------------------------------+
 
+// the $_POST['selection'] was already checked in element_set.php
+check_input_parameter('add_tags', $_POST, true, PATTERN_ID);
+check_input_parameter('del_tags', $_POST, true, PATTERN_ID);
+check_input_parameter('associate', $_POST, false, PATTERN_ID);
+check_input_parameter('dissociate', $_POST, false, PATTERN_ID);
+
 if (isset($_POST['delete']))
 {
   if (isset($_POST['confirm_deletion']) and 1 == $_POST['confirm_deletion'])
@@ -85,21 +91,9 @@ SELECT
 
       if (count($deletables) > 0)
       {
-        // what will be the categories to update? (to avoid orphan on
-        // representative_picture_id)
-        $query = '
-SELECT
-    category_id
-  FROM '.IMAGE_CATEGORY_TABLE.'
-  WHERE image_id IN ('.implode(',', $deletables).')
-;';
-        $categories_to_update = array_from_query($query, 'category_id');
-          
         $physical_deletion = true;
         delete_elements($deletables, $physical_deletion);
 
-        update_category($categories_to_update);
-
         array_push(
           $page['infos'],
           sprintf(

admin/element_set_ranks.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/element_set_unit.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/extend_for_templates.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -60,7 +60,9 @@ $relevant_parameters = array(
     'posted-monthly-calendar',
     'search',
     'flat',
-    'list',); /* <=> Random */
+    'list', /* <=> Random */
+    'tags',
+    ); 
   $query = '
 SELECT permalink
   FROM '.CATEGORIES_TABLE.'
@@ -73,30 +75,43 @@ $relevant_parameters = array_merge($relevant_parameters, $permalinks);
 
 /* Link all supported templates to their respective handle */
 $eligible_templates = array(
-    '----------'              => 'N/A',
-    'about.tpl'               => 'about',
-    'identification.tpl'      => 'identification',
-    'mainpage_categories.tpl' => 'index_category_thumbnails',
-    'thumbnails.tpl'          => 'index_thumbnails',
-    'redirect.tpl'            => 'redirect',
- // 'menubar.tpl'             => 'menubar', // TODO by blocks
-    'header.tpl'              => 'header',
-    'footer.tpl'              => 'tail',
-    'index.tpl'               => 'index',
-    'nbm.tpl'                 => 'nbm',
-    'notification.tpl'        => 'notification',
-    'picture_content.tpl'     => 'default_content',
-    'picture.tpl'             => 'picture',
-    'popuphelp.tpl'           => 'popuphelp',
-    'profile.tpl'             => 'profile',
-    'profile_content.tpl'     => 'profile_content',
-    'register.tpl'            => 'register',
-    'search.tpl'              => 'search',
-    'search_rules.tpl'        => 'search_rules',
-    'slideshow.tpl'           => 'slideshow',
-    'tags.tpl'                => 'tags',
-    'upload.tpl'              => 'upload',);
-  $flip_templates = array_flip($eligible_templates);
+    '----------'                 => 'N/A',
+    'about.tpl'                  => 'about',
+    'footer.tpl'                 => 'tail',
+    'header.tpl'                 => 'header',
+    'identification.tpl'         => 'identification',
+    'index.tpl'                  => 'index',
+    'mainpage_categories.tpl'    => 'index_category_thumbnails',
+    'menubar.tpl'                => 'menubar',
+    'menubar_categories.tpl'     => 'mbCategories',
+    'menubar_identification.tpl' => 'mbIdentification',
+    'menubar_links.tpl'          => 'mbLinks',
+    'menubar_menu.tpl'           => 'mbMenu',
+    'menubar_specials.tpl'       => 'mbSpecials',
+    'menubar_tags.tpl'           => 'mbTags',
+    'nbm.tpl'                    => 'nbm',
+    'notification.tpl'           => 'notification',
+    'picture.tpl'                => 'picture',
+    'picture_content.tpl'        => 'default_content',
+    'picture_nav_buttons.tpl'    => 'picture_nav_buttons',
+    'popuphelp.tpl'              => 'popuphelp',
+    'profile.tpl'                => 'profile',
+    'profile_content.tpl'        => 'profile_content',
+    'redirect.tpl'               => 'redirect',
+    'register.tpl'               => 'register',
+    'search.tpl'                 => 'search',
+    'search_rules.tpl'           => 'search_rules',
+    'slideshow.tpl'              => 'slideshow',
+    'tags.tpl'                   => 'tags',
+    'thumbnails.tpl'             => 'index_thumbnails',
+    'upload.tpl'                 => 'upload',);
+
+$flip_templates = array_flip($eligible_templates);
+
+$available_templates = array_merge(
+  array('N/A' => '----------'),
+  get_dirs(PHPWG_ROOT_PATH.'template'));
+
 // +-----------------------------------------------------------------------+
 // |                            selected templates                         |
 // +-----------------------------------------------------------------------+
@@ -112,9 +127,11 @@ if (isset($_POST['submit']) and !is_adviser())
     $handle = $eligible_templates[$original];
     $url_keyword = $_POST['url'][$i];
     if ($url_keyword == '----------') $url_keyword = 'N/A';
+    $bound_tpl = $_POST['bound'][$i];
+    if ($bound_tpl == '----------') $bound_tpl = 'N/A';
     if ($handle != 'N/A')
     {
-      $replacements[$newtpl] = array($handle, $url_keyword);
+      $replacements[$newtpl] = array($handle, $url_keyword, $bound_tpl);
     }
     $i++;
   }
@@ -144,7 +161,7 @@ foreach ($tpl_extension as $file => $conditions)
 }
 foreach ($new_extensions as $file)
 {
-  $tpl_extension[$file] = array('N/A', 'N/A');
+  $tpl_extension[$file] = array('N/A', 'N/A', 'N/A');
 }
 
 $template->set_filenames(array('extend_for_templates'
@@ -161,14 +178,17 @@ foreach ($tpl_extension as $file => $conditions)
 {
   $handle = $conditions[0];
   $url_keyword = $conditions[1];
+  $bound_tpl = $conditions[2];
   {  
   $template->append('extents',
     array(
-      'replacer'      => $file,
-      'url_parameter' => $relevant_parameters,
-      'original_tpl'  => array_keys($eligible_templates),
-      'selected_tpl'  => $flip_templates[$handle],
-      'selected_url'  => $url_keyword,)
+      'replacer'       => $file,
+      'url_parameter'  => $relevant_parameters,
+      'original_tpl'   => array_keys($eligible_templates),
+      'bound_tpl'          => $available_templates,
+      'selected_tpl'   => $flip_templates[$handle],
+      'selected_url'   => $url_keyword,
+      'selected_bound' => $bound_tpl,)
       );
   }
 }

admin/group_list.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -33,6 +33,11 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 // +-----------------------------------------------------------------------+
 check_status(ACCESS_ADMINISTRATOR);
 
+if (!empty($_POST) or isset($_GET['delete']) or isset($_GET['toggle_is_default']))
+{
+  check_pwg_token();
+}
+
 // +-----------------------------------------------------------------------+
 // |                             delete a group                            |
 // +-----------------------------------------------------------------------+
@@ -107,7 +112,7 @@ SELECT COUNT(*)
 INSERT INTO '.GROUPS_TABLE.'
   (name)
   VALUES
-  (\''.mysql_escape_string($_POST['groupname']).'\')
+  (\''.mysql_real_escape_string($_POST['groupname']).'\')
 ;';
     pwg_query($query);
 
@@ -155,6 +160,7 @@ $template->assign(
   array(
     'F_ADD_ACTION' => get_root_url().'admin.php?page=group_list',
     'U_HELP' => get_root_url().'popuphelp.php?page=group_list',
+    'PWG_TOKEN' => get_pwg_token(),
     )
   );
 
@@ -191,9 +197,9 @@ SELECT COUNT(*)
       'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('is_default_group').']' : ''),
       'MEMBERS' => l10n_dec('%d member', '%d members', $counter),
       'U_MEMBERS' => $members_url.$row['id'],
-      'U_DELETE' => $del_url.$row['id'],
+      'U_DELETE' => $del_url.$row['id'].'&pwg_token='.get_pwg_token(),
       'U_PERM' => $perm_url.$row['id'],
-      'U_ISDEFAULT' => $toggle_is_default_url.$row['id']
+      'U_ISDEFAULT' => $toggle_is_default_url.$row['id'].'&pwg_token='.get_pwg_token(),
       )
     );
 }

admin/group_perm.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/help.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/history.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -110,7 +110,7 @@ if (isset($_POST['submit']))
     $search['fields']['filename'] = str_replace(
       '*',
       '%',
-      mysql_escape_string($_POST['filename'])
+      mysql_real_escape_string($_POST['filename'])
       );
   }
 

admin/images/index.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/include/c13y_internal.class.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/include/check_integrity.class.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/include/functions.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -23,7 +23,6 @@
 
 include(PHPWG_ROOT_PATH.'admin/include/functions_metadata.php');
 
-
 // The function delete_site deletes a site and call the function
 // delete_categories for each primary category of the site
 function delete_site( $id )
@@ -114,11 +113,16 @@ DELETE FROM '.CATEGORIES_TABLE.'
 ;';
   pwg_query($query);
 
-   $query='
+  $query='
 DELETE FROM '.OLD_PERMALINKS_TABLE.'
   WHERE cat_id IN ('.implode(',',$ids).')';
   pwg_query($query);
 
+  $query='
+DELETE FROM '.USER_CACHE_CATEGORIES_TABLE.'
+  WHERE cat_id IN ('.implode(',',$ids).')';
+  pwg_query($query);
+
   trigger_action('delete_categories', $ids);
 }
 
@@ -138,7 +142,7 @@ function delete_elements($ids, $physical_deletion=false)
   if ($physical_deletion)
   {
     include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
-    
+
     // we can currently delete physically only photo with no
     // storage_category_id (added via pLoader)
     //
@@ -166,7 +170,7 @@ SELECT
 
       foreach (array($file_path, $thumbnail_path, $high_path) as $path)
       {
-        if (isset($path) and !unlink($path))
+        if (isset($path) and is_file($path) and !unlink($path))
         {
           die('"'.$path.'" cannot be removed');
         }
@@ -230,6 +234,20 @@ DELETE FROM '.IMAGES_TABLE.'
 ;';
   pwg_query($query);
 
+  // are the photo used as category representant?
+  $query = '
+SELECT
+    id
+  FROM '.CATEGORIES_TABLE.'
+  WHERE representative_picture_id IN (
+'.wordwrap(implode(', ', $ids), 80, "\n").')
+;';
+  $category_ids = array_from_query($query, 'id');
+  if (count($category_ids) > 0)
+  {
+    update_category($category_ids);
+  }
+  
   trigger_action('delete_elements', $ids);
 }
 
@@ -1226,7 +1244,7 @@ SELECT uppercats
     {
       // technically, you can't move a category with uppercats 12,125,13,14
       // into a new parent category with uppercats 12,125,13,14,24
-      if (preg_match('/^'.$category['uppercats'].'/', $new_parent_uppercats))
+      if (preg_match('/^'.$category['uppercats'].',/', $new_parent_uppercats))
       {
         array_push(
           $page['errors'],
@@ -1593,7 +1611,7 @@ DELETE
 /**
  * Do maintenance on all PWG tables
  *
- * @return nono
+ * @return none
  */
 function do_maintenance_all_tables()
 {
@@ -1642,7 +1660,7 @@ function do_maintenance_all_tables()
   {
     array_push(
           $page['infos'],
-          l10n('Optimization completed')
+          l10n('Optimizations completed')
           );
   }
   else
@@ -1736,34 +1754,39 @@ SELECT image_id
  */
 function pwg_URL()
 {
-  global $lang_info;
   $urls = array(
-    'WIKI'       => 'http://'.PHPWG_DOMAIN.'/doc/',
-    'HOME'       => 'http://'.PHPWG_DOMAIN.'/',
-    'DEMO'       => 'http://demo.'.PHPWG_DOMAIN.'/',
-    'FORUM'      => 'http://forum.'.PHPWG_DOMAIN.'/',
-    'BUGS'       => 'http://bugs.'.PHPWG_DOMAIN.'/',
+    'HOME'       => 'http://'.PHPWG_DOMAIN,
+    'WIKI'       => 'http://'.PHPWG_DOMAIN.'/doc',
+    'DEMO'       => 'http://'.PHPWG_DOMAIN.'/demo',
+    'FORUM'      => 'http://'.PHPWG_DOMAIN.'/forum',
+    'BUGS'       => 'http://'.PHPWG_DOMAIN.'/bugs',
     'EXTENSIONS' => 'http://'.PHPWG_DOMAIN.'/ext',
     );
-  if ( isset($lang_info['code']) and
-       in_array($lang_info['code'], array('fr','en')) )
-  { /* current wiki languages are French or English */
-    $urls['WIKI'] .= 'doku.php?id='.$lang_info['code'].':'.$lang_info['code'];
-    $urls['HOME'] .= '?lang='.$lang_info['code'];
-  }
   return $urls;
 }
 
 /**
  * Invalidates cahed data (permissions and category counts) for all users.
  */
-function invalidate_user_cache()
+function invalidate_user_cache($full = true)
 {
-  $query = '
+  if ($full)
+  {
+    $query = '
+TRUNCATE TABLE '.USER_CACHE_CATEGORIES_TABLE.';';
+    pwg_query($query);
+    $query = '
+TRUNCATE TABLE '.USER_CACHE_TABLE.';';
+    pwg_query($query);
+  }
+  else
+  {
+    $query = '
 UPDATE '.USER_CACHE_TABLE.'
-  SET need_update = \'true\'';
-  pwg_query($query);
-  trigger_action('invalidate_user_cache');
+  SET need_update = \'true\';';
+    pwg_query($query);
+  }
+  trigger_action('invalidate_user_cache', $full);
 }
 
 /**
@@ -1847,7 +1870,7 @@ function get_extents($start='')
     {
       $extents = array_merge($extents, get_extents($path));
     }
-    elseif ( !is_link($path) and file_exists($path) 
+    elseif ( !is_link($path) and file_exists($path)
             and get_extension($path) == 'tpl' )
     {
       $extents[] = substr($path, 21);
@@ -1899,4 +1922,228 @@ SELECT id
       );
   }
 }
+
+/**
+ * Is the category accessible to the (Admin) user ?
+ *
+ * Note : if the user is not authorized to see this category, category jump
+ * will be replaced by admin cat_modify page
+ *
+ * @param int category id to verify
+ * @return bool
+ */
+function cat_admin_access($category_id)
+{
+  global $user;
+
+  // $filter['visible_categories'] and $filter['visible_images']
+  // are not used because it's not necessary (filter <> restriction)
+  if (in_array($category_id, explode(',', $user['forbidden_categories'])))
+  {
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Retrieve data from external URL
+ *
+ * @param string $src: URL
+ * @param global $dest: can be a file ressource or string
+ * @return bool
+ */
+function fetchRemote($src, &$dest, $user_agent='Piwigo', $step=0)
+{
+  // Try to retrieve data from local file?
+  if (!url_is_remote($src))
+  {
+    $content = @file_get_contents($src);
+    if ($content !== false)
+    {
+      is_resource($dest) ? @fwrite($dest, $content) : $dest = $content;
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+  // After 3 redirections, return false
+  if ($step > 3) return false;
+
+  // Initialize $dest
+  is_resource($dest) or $dest = '';
+
+  // Try curl to read remote file
+  if (function_exists('curl_init'))
+  {
+    $ch = @curl_init();
+    @curl_setopt($ch, CURLOPT_URL, $src);
+    @curl_setopt($ch, CURLOPT_HEADER, 1);
+    @curl_setopt($ch, CURLOPT_USERAGENT, $user_agent);
+    @curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    $content = @curl_exec($ch);
+    $header_length = @curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+    $status = @curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    @curl_close($ch);
+    if ($content !== false and $status >= 200 and $status < 400)
+    {
+      if (preg_match('/Location:\s+?(.+)/', substr($content, 0, $header_length), $m))
+      {
+        return fetchRemote($m[1], $dest, $user_agent, $step+1);
+      }
+      $content = substr($content, $header_length);
+      is_resource($dest) ? @fwrite($dest, $content) : $dest = $content;
+      return true;
+    }
+  }
+
+  // Try file_get_contents to read remote file
+  if (ini_get('allow_url_fopen'))
+  {
+    $content = @file_get_contents($src);
+    if ($content !== false)
+    {
+      is_resource($dest) ? @fwrite($dest, $content) : $dest = $content;
+      return true;
+    }
+  }
+
+  // Try fsockopen to read remote file
+  $src = parse_url($src);
+  $host = $src['host'];
+  $path = isset($src['path']) ? $src['path'] : '/';
+  $path .= isset($src['query']) ? '?'.$src['query'] : '';
+
+  if (($s = @fsockopen($host,80,$errno,$errstr,5)) === false)
+  {
+    return false;
+  }
+
+  fwrite($s,
+    "GET ".$path." HTTP/1.0\r\n"
+    ."Host: ".$host."\r\n"
+    ."User-Agent: ".$user_agent."\r\n"
+    ."Accept: */*\r\n"
+    ."\r\n"
+  );
+
+  $i = 0;
+  $in_content = false;
+  while (!feof($s))
+  {
+    $line = fgets($s);
+
+    if (rtrim($line,"\r\n") == '' && !$in_content)
+    {
+      $in_content = true;
+      $i++;
+      continue;
+    }
+    if ($i == 0)
+    {
+      if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/',rtrim($line,"\r\n"), $m))
+      {
+        fclose($s);
+        return false;
+      }
+      $status = (integer) $m[2];
+      if ($status < 200 || $status >= 400)
+      {
+        fclose($s);
+        return false;
+      }
+    }
+    if (!$in_content)
+    {
+      if (preg_match('/Location:\s+?(.+)$/',rtrim($line,"\r\n"),$m))
+      {
+        fclose($s);
+        return fetchRemote(trim($m[1]),$dest,$user_agent,$step+1);
+      }
+      $i++;
+      continue;
+    }
+    is_resource($dest) ? @fwrite($dest, $line) : $dest .= $line;
+    $i++;
+  }
+  fclose($s);
+  return true;
+}
+
+
+/**
+ * returns the groupname corresponding to the given group identifier if
+ * exists
+ *
+ * @param int group_id
+ * @return mixed
+ */
+function get_groupname($group_id)
+{
+  $query = '
+SELECT name
+  FROM '.GROUPS_TABLE.'
+  WHERE id = '.intval($group_id).'
+;';
+  $result = pwg_query($query);
+  if (mysql_num_rows($result) > 0)
+  {
+    list($groupname) = mysql_fetch_row($result);
+  }
+  else
+  {
+    return false;
+  }
+
+  return $groupname;
+}
+
+/**
+ * returns the username corresponding to the given user identifier if exists
+ *
+ * @param int user_id
+ * @return mixed
+ */
+function get_username($user_id)
+{
+  global $conf;
+
+  $query = '
+SELECT '.$conf['user_fields']['username'].'
+  FROM '.USERS_TABLE.'
+  WHERE '.$conf['user_fields']['id'].' = '.intval($user_id).'
+;';
+  $result = pwg_query($query);
+  if (mysql_num_rows($result) > 0)
+  {
+    list($username) = mysql_fetch_row($result);
+  }
+  else
+  {
+    return false;
+  }
+
+  return $username;
+}
+
+function get_newsletter_subscribe_base_url($language) {
+  $subscribe_domain = 'piwigo.org';
+
+  $domain_of = array(
+    'fr_FR' => 'fr.piwigo.org',
+    'it_IT' => 'it.piwigo.org',
+    'de_DE' => 'de.piwigo.org',
+    'es_ES' => 'es.piwigo.org',
+    'zh_CN' => 'cn.piwigo.org',
+    'pl_PL' => 'pl.piwigo.org',
+    );
+
+  if (isset($domain_of[$language])) {
+    $subscribe_domain = $domain_of[$language];
+  }
+
+  return 'http://'.$subscribe_domain.'/announcement/subscribe/';
+}
 ?>

admin/include/functions_history.inc.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/include/functions_metadata.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -141,11 +141,22 @@ SELECT id
     if ($conf['use_exif'])
     {
       $exif = get_sync_exif_data($file);
+      if (count($exif) == 0 and isset($data['high_filesize']))
+      {
+        $exif = get_sync_exif_data($high_file);
+      }
+      $data = array_merge($data, $exif);
     }
 
     if ($conf['use_iptc'])
     {
       $iptc = get_sync_iptc_data($file);
+      if (count($iptc) == 0 and isset($data['high_filesize']))
+      {
+        $iptc = get_sync_iptc_data($high_file);
+      }
+      $data = array_merge($data, $iptc);
+      
       if (count($iptc) > 0)
       {
         foreach (array_keys($iptc) as $key)

admin/include/functions_notification_by_mail.inc.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -415,7 +415,15 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su
 
         $section_action_by = ($is_subscribe ? 'subscribe_by_' : 'unsubscribe_by_');
         $section_action_by .= ($is_admin_request ? 'admin' : 'himself');
-        $env_nbm['mail_template']->assign( $section_action_by, true );
+        $env_nbm['mail_template']->assign
+        (
+          array
+          (
+            $section_action_by => true,
+            'GOTO_GALLERY_TITLE' => $conf['gallery_title'],
+            'GOTO_GALLERY_URL' => $conf['gallery_url'],
+          )
+        );
 
         if (pwg_mail
             (

admin/include/functions_permalinks.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/include/functions_plugins.inc.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/include/functions_themes.inc.php

@@ -33,7 +33,9 @@ function selected_admin_menu()
       case 'tags':
         return 3;
       case 'user_list':
+      case 'user_perm':
       case 'group_list':
+      case 'group_perm':
       case 'notification_by_mail':
         return 4;
       case 'stats':

admin/include/functions_upgrade.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -23,17 +23,11 @@
 
 function check_upgrade()
 {
-  // Is Piwigo already installed ?
-  if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE)
+  if (defined('PHPWG_IN_UPGRADE'))
   {
-    $message = 'Piwigo is not in upgrade mode. In include/mysql.inc.php,
-insert line
-<pre style="background-color:lightgray">
-define(\'PHPWG_IN_UPGRADE\', true);
-</pre>
-if you want to upgrade';
-    die($message);
+    return PHPWG_IN_UPGRADE;
   }
+  return false;
 }
 
 // concerning upgrade, we use the default tables
@@ -94,4 +88,149 @@ function create_empty_local_files()
    }
 }
 
-?>
+// Deactivate all non-standard plugins
+function deactivate_non_standard_plugins()
+{
+  global $page;
+
+  $standard_plugins = array(
+    'add_index',
+    'admin_advices',
+    'admin_multi_view',
+    'c13y_upgrade',
+    'event_tracer',
+    'language_switch',
+    'LocalFilesEditor'
+    );
+
+  $query = '
+SELECT id
+FROM '.PREFIX_TABLE.'plugins
+WHERE state = "active"
+AND id NOT IN ("' . implode('","', $standard_plugins) . '")
+;';
+
+  $result = pwg_query($query);
+  $plugins = array();
+  while ($row = mysql_fetch_assoc($result))
+  {
+    array_push($plugins, $row['id']);
+  }
+
+  if (!empty($plugins))
+  {
+    $query = '
+UPDATE '.PREFIX_TABLE.'plugins
+SET state="inactive"
+WHERE id IN ("' . implode('","', $plugins) . '")
+;';
+    pwg_query($query);
+
+    array_push($page['infos'],
+      l10n('deactivated plugins').'<p><i>'.implode(', ', $plugins).'</i></p>');
+  }
+}
+
+// Check access rights
+function check_upgrade_access_rights($current_release, $username, $password)
+{
+  global $conf, $page;
+
+  if(!@get_magic_quotes_gpc())
+  {
+    $username = mysql_real_escape_string($username);
+  }
+
+  if (version_compare($current_release, '2.0', '<'))
+  {
+    $username = utf8_decode($username);
+    $password = utf8_decode($password);
+  }
+
+  if (version_compare($current_release, '1.5', '<'))
+  {
+    $query = '
+SELECT password, status
+FROM '.USERS_TABLE.'
+WHERE username = "'.$username.'"
+;';
+  }
+  else
+  {
+    $query = '
+SELECT u.password, ui.status
+FROM '.$conf['users_table'].' AS u
+INNER JOIN '.USER_INFOS_TABLE.' AS ui
+ON u.'.$conf['user_fields']['id'].'=ui.user_id
+WHERE '.$conf['user_fields']['username'].'="'.$username.'"
+;';
+  }
+  $row = mysql_fetch_assoc(pwg_query($query));
+
+  if (!isset($conf['pass_convert']))
+  {
+    $conf['pass_convert'] = create_function('$s', 'return md5($s);');
+  }
+
+  if ($row['password'] != $conf['pass_convert']($password))
+  {
+    array_push($page['errors'], l10n('invalid_pwd'));
+  }
+  elseif ($row['status'] != 'admin' and $row['status'] != 'webmaster')
+  {
+    array_push($page['errors'], l10n('You do not have access rights to run upgrade'));
+  }
+  else
+  {
+    define('PHPWG_IN_UPGRADE', true);
+  }
+}
+
+/**
+ * which upgrades are available ?
+ *
+ * @return array
+ */
+function get_available_upgrade_ids()
+{
+  $upgrades_path = PHPWG_ROOT_PATH.'install/db';
+
+  $available_upgrade_ids = array();
+
+  if ($contents = opendir($upgrades_path))
+  {
+    while (($node = readdir($contents)) !== false)
+    {
+      if (is_file($upgrades_path.'/'.$node)
+          and preg_match('/^(.*?)-database\.php$/', $node, $match))
+      {
+        array_push($available_upgrade_ids, $match[1]);
+      }
+    }
+  }
+  natcasesort($available_upgrade_ids);
+
+  return $available_upgrade_ids;
+}
+
+
+/**
+ * returns true if there are available upgrade files
+ */
+function check_upgrade_feed()
+{
+  // retrieve already applied upgrades
+  $query = '
+SELECT id
+  FROM '.UPGRADE_TABLE.'
+;';
+  $applied = array_from_query($query, 'id');
+
+  // retrieve existing upgrades
+  $existing = get_available_upgrade_ids();
+
+  // which upgrades need to be applied?
+  return (count(array_diff($existing, $applied)) > 0);
+}
+
+?>

admin/include/functions_waiting.inc.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/include/index.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/include/plugins.class.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -109,7 +109,9 @@ INSERT INTO ' . PLUGINS_TABLE . ' (id,version) VALUES ("'
         if (empty($errors))
         {
           $query = '
-UPDATE ' . PLUGINS_TABLE . ' SET state="active" WHERE id="' . $plugin_id . '"';
+UPDATE ' . PLUGINS_TABLE . '
+SET state="active", version="'.$this->fs_plugins[$plugin_id]['version'].'"
+WHERE id="' . $plugin_id . '"';
           pwg_query($query);
         }
         break;
@@ -211,7 +213,11 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"';
           {
             $plugin['uri'] = trim($val[1]);
           }
-          if ( preg_match("|Description: (.*)|", $plg_data, $val) )
+          if ($desc = load_language('description.txt', $path.'/', array('return' => true)))
+          {
+            $plugin['description'] = trim($desc);
+          }
+          elseif ( preg_match("|Description: (.*)|", $plg_data, $val) )
           {
             $plugin['description'] = trim($val[1]);
           }
@@ -264,12 +270,13 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"';
    */
   function get_server_plugins($new=false)
   {
+    global $user;
+
     // Retrieve PEM versions
     $version = PHPWG_VERSION;
     $versions_to_check = array();
     $url = PEM_URL . '/api/get_version_list.php?category_id=12&format=php';
-    if ($source = @file_get_contents($url)
-      and $pem_versions = @unserialize($source))
+    if (fetchRemote($url, $result) and $pem_versions = @unserialize($result))
     {
       if (!preg_match('/^\d+\.\d+\.\d+/', $version))
       {
@@ -302,15 +309,17 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"';
     // Retrieve PEM plugins infos
     $url = PEM_URL . '/api/get_revision_list.php?category_id=12&format=php&last_revision_only=true';
     $url .= '&version=' . implode(',', $versions_to_check);
+    $url .= '&lang=' . substr($user['language'], 0, 2);
+    $url .= '&get_nb_downloads=true';
 
     if (!empty($plugins_to_check))
     {
       $url .= $new ? '&extension_exclude=' : '&extension_include=';
       $url .= implode(',', $plugins_to_check);
     }
-    if ($source = @file_get_contents($url))
+    if (fetchRemote($url, $result))
     {
-      $pem_plugins = @unserialize($source);
+      $pem_plugins = @unserialize($result);
       if (!is_array($pem_plugins))
       {
         return false;
@@ -321,6 +330,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"';
       }
       return true;
     }
+    return false;
   }
   
   /**
@@ -342,6 +352,9 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"';
       case 'author':
         uasort($this->server_plugins, array($this, 'extension_author_compare'));
         break;
+      case 'downloads':
+        usort($this->server_plugins, array($this, 'extension_downloads_compare'));
+        break;
     }
   }
 
@@ -357,8 +370,10 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"';
     {
       $url = PEM_URL . '/download.php?rid=' . $revision;
       $url .= '&origin=piwigo_' . $action;
-      if (@copy($url, $archive))
+
+      if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle))
       {
+        fclose($handle);
         include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
         $zip = new PclZip($archive);
         if ($list = $zip->listContent())
@@ -397,6 +412,27 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"';
                   break;
                 }
               }
+              if (file_exists($extract_path.'/obsolete.list')
+                and $old_files = file($extract_path.'/obsolete.list', FILE_IGNORE_NEW_LINES)
+                and !empty($old_files))
+              {
+                array_push($old_files, 'obsolete.list');
+                foreach($old_files as $old_file)
+                {
+                  $path = $extract_path.'/'.$old_file;
+                  if (is_file($path))
+                  {
+                    @unlink($path);
+                  }
+                  elseif (is_dir($path))
+                  {
+                    if (!$this->deltree($path))
+                    {
+                      $this->send_to_trash($path);
+                    }
+                  }
+                }
+              }
             }
             else $status = 'extract_error';
           }
@@ -503,6 +539,12 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"';
     else return $r;
   }
 
+  function extension_downloads_compare($a, $b)
+  {
+    if ($a['extension_nb_downloads'] < $b['extension_nb_downloads']) return 1;
+    else return -1;
+  }
+
   function sort_plugins_by_state()
   {
     uasort($this->fs_plugins, 'name_compare');

admin/include/tabsheet.class.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/index.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/intro.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -42,17 +42,14 @@ check_status(ACCESS_ADMINISTRATOR);
 // Check for upgrade : code inspired from punbb
 if (isset($_GET['action']) and 'check_upgrade' == $_GET['action'])
 {
-  if (!ini_get('allow_url_fopen'))
+  if (!fetchRemote(PHPWG_URL.'/download/latest_version', $result))
   {
-    array_push(
-      $page['errors'],
-      l10n('Unable to check for upgrade since allow_url_fopen is disabled.')
-      );
+    array_push($page['errors'], l10n('Unable to check for upgrade.'));
   }
   else
   {
     $versions = array('current' => PHPWG_VERSION);
-    $lines = @file(PHPWG_URL.'/latest_version');
+    $lines = @explode("\r\n", $result);
 
     // if the current version is a BSF (development branch) build, we check
     // the first line, for stable versions, we check the second line
@@ -118,6 +115,15 @@ else if (isset($_GET['action']) and 'phpinfo' == $_GET['action'])
 
 $template->set_filenames(array('intro' => 'intro.tpl'));
 
+if ($conf['show_newsletter_subscription']) {
+  $template->assign(
+    array(
+      'EMAIL' => $user['email'],
+      'SUBSCRIBE_BASE_URL' => get_newsletter_subscribe_base_url($user['language']),
+      )
+    );
+}
+
 $php_current_timestamp = date("Y-m-d H:i:s");
 list($mysql_version, $db_current_timestamp) = mysql_fetch_row(pwg_query('SELECT VERSION(), CURRENT_TIMESTAMP;'));
 
@@ -185,6 +191,7 @@ list($nb_comments) = mysql_fetch_row(pwg_query($query));
 
 $template->assign(
   array(
+    'PHPWG_URL' => PHPWG_URL,
     'PWG_VERSION' => PHPWG_VERSION,
     'OS' => PHP_OS,
     'PHP_VERSION' => phpversion(),
@@ -224,7 +231,7 @@ SELECT MIN(date_available)
       'DB_DATE' =>
       sprintf(
         l10n('first element added on %s'),
-        format_date($first_date, 'mysql_datetime')
+        format_date($first_date)
         )
       )
     );

admin/maintenance.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,7 +46,7 @@ switch ($action)
     update_uppercats();
     update_category('all');
     update_global_rank();
-    invalidate_user_cache();
+    invalidate_user_cache(true);
     break;
   }
   case 'images' :
@@ -100,6 +100,15 @@ DELETE
     $c13y->maintenance();
     break;
   }
+  case 'search' :
+  {
+    $query = '
+DELETE
+  FROM '.SEARCH_TABLE.'
+;';
+    pwg_query($query);
+    break;
+  }
   case 'compiled-templates' :
   {
     $template->delete_compiled_templates();
@@ -129,6 +138,7 @@ $template->assign(
     'U_MAINT_FEEDS' => $start_url.'feeds',
     'U_MAINT_DATABASE' => $start_url.'database',
     'U_MAINT_C13Y' => $start_url.'c13y',
+	'U_MAINT_SEARCH' => $start_url.'search',
     'U_MAINT_COMPILED_TEMPLATES' => $start_url.'compiled-templates',
     'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=maintenance',
     )

admin/menubar.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -99,6 +99,7 @@ if ( isset($_POST['submit']) and !is_adviser() )
   make_consecutive( $mb_conf );
 
   // BEGIN OPTIM - DONT ASK ABOUT THIS ALGO - but optimizes the size of the array we save in DB
+  /* !!! OPTIM DISABLED UNTIL IT HAS BEEN FIXED !!!
   $reg_keys = array_keys($reg_blocks);
   $cnf_keys = array_keys($mb_conf);
   $best_slice = array( 'len'=>0 );
@@ -121,7 +122,9 @@ if ( isset($_POST['submit']) and !is_adviser() )
       }
     }
   }
+  */
   $mb_conf_db = $mb_conf;
+  /*
   if ($best_slice['len'])
   {
     for ($j=0; $j<$best_slice['start_cnf']; $j++ )
@@ -137,7 +140,7 @@ if ( isset($_POST['submit']) and !is_adviser() )
   }
   //var_export( $best_slice ); var_export($mb_conf);  var_export($mb_conf_db);
   // END OPTIM
-
+  */
   $query = '
 UPDATE '.CONFIG_TABLE.'
   SET value="'.addslashes(serialize($mb_conf_db)).'"

admin/notification_by_mail.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/permalinks.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -100,7 +100,7 @@ DELETE FROM '.OLD_PERMALINKS_TABLE.'
   LIMIT 1';
   pwg_query($query);
   if (mysql_affected_rows()==0)
-    array_push($page['errors'], 'Cannot delete the old permalink !');
+    array_push($page['errors'], l10n('Cannot delete the old permalink !'));
 }
 
 

admin/picture_modify.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -33,6 +33,9 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 // +-----------------------------------------------------------------------+
 check_status(ACCESS_ADMINISTRATOR);
 
+check_input_parameter('image_id', $_GET, false, PATTERN_ID);
+check_input_parameter('cat_id', $_GET, false, PATTERN_ID);
+
 // +-----------------------------------------------------------------------+
 // |                          synchronize metadata                         |
 // +-----------------------------------------------------------------------+
@@ -241,8 +244,7 @@ $template->assign(
 
     'FILESIZE' => @$row['filesize'].' KB',
 
-    'REGISTRATION_DATE' =>
-      format_date($row['date_available'], 'mysql_datetime', false),
+    'REGISTRATION_DATE' => format_date($row['date_available']),
 
     'AUTHOR' => isset($_POST['author']) ? $_POST['author'] : @$row['author'],
 
@@ -413,7 +415,7 @@ $query.= '
 display_select_cat_wrapper($query, array(), 'associated_options');
 
 $result = pwg_query($query);
-$associateds = array();
+$associateds = array(-1);
 if (isset($storage_category_id))
 {
   array_push($associateds, $storage_category_id);

admin/plugin.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/plugins_list.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -32,16 +32,25 @@ $template->set_filenames(array('plugins' => 'plugins_list.tpl'));
 
 $order = isset($_GET['order']) ? $_GET['order'] : 'name';
 $base_url = get_root_url().'admin.php?page='.$page['page'].'&order='.$order;
+$action_url = $base_url.'&plugin='.'%s'.'&pwg_token='.get_pwg_token();
 
 $plugins = new plugins();
 
 //--------------------------------------------------perform requested actions
 if (isset($_GET['action']) and isset($_GET['plugin']) and !is_adviser())
 {
-  $page['errors'] =
-    $plugins->perform_action($_GET['action'], $_GET['plugin']);
+  check_pwg_token();
+  
+  $page['errors'] = $plugins->perform_action($_GET['action'], $_GET['plugin']);
 
-  if (empty($page['errors'])) redirect($base_url);
+  if (empty($page['errors']))
+  {
+    if ($_GET['action'] == 'activate' or $_GET['action'] == 'deactivate')
+    {
+      $template->delete_compiled_templates();
+    }
+    redirect($base_url);
+  }
 }
 
 //--------------------------------------------------------------------Tabsheet
@@ -90,7 +99,7 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
     array('NAME' => $display_name,
           'VERSION' => $fs_plugin['version'],
           'DESCRIPTION' => $desc,
-          'U_ACTION' => $base_url.'&plugin='.$plugin_id);
+          'U_ACTION' => sprintf($action_url, $plugin_id));
 
   if (isset($plugins->db_plugins_by_id[$plugin_id]))
   {
@@ -109,14 +118,12 @@ $missing_plugin_ids = array_diff(
 
 foreach($missing_plugin_ids as $plugin_id)
 {
-  $action_url = $base_url.'&plugin='.$plugin_id;
-
   $template->append( 'plugins',
       array(
         'NAME' => $plugin_id,
         'VERSION' => $plugins->db_plugins_by_id[$plugin_id]['version'],
         'DESCRIPTION' => "ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW !",
-        'U_ACTION' => $base_url.'&plugin='.$plugin_id,
+        'U_ACTION' => sprintf($action_url, $plugin_id),
         'STATE' => 'missing'
       )
     );

admin/plugins_new.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -38,6 +38,8 @@ $plugins = new plugins();
 //------------------------------------------------------automatic installation
 if (isset($_GET['revision']) and isset($_GET['extension']) and !is_adviser())
 {
+  check_pwg_token();
+  
   $install_status = $plugins->extract_plugin_files('install', $_GET['revision'], $_GET['extension']);
 
   redirect($base_url.'&installstatus='.$install_status);
@@ -83,45 +85,44 @@ $template->assign('order_options',
     $link.'date' => l10n('Post date'),
     $link.'revision' => l10n('plugins_revisions'),
     $link.'name' => l10n('Name'),
-    $link.'author' => l10n('Author')));
+    $link.'author' => l10n('Author'),
+    $link.'downloads' => l10n('Number of downloads')));
 $template->assign('order_selected', $link.$order);
 
 // +-----------------------------------------------------------------------+
 // |                     start template output                             |
 // +-----------------------------------------------------------------------+
-if (!ini_get('allow_url_fopen'))
-{
-  array_push($page['errors'], l10n('Unable to retrieve server informations since allow_url_fopen is disabled.'));
-}
-elseif ($plugins->get_server_plugins(true))
+if ($plugins->get_server_plugins(true))
 {
   $plugins->sort_server_plugins($order);
 
   foreach($plugins->server_plugins as $plugin)
   {
-    /* Need to remove this lines for final release : piwigo website will be utf8 only */
-    $plugin['extension_description'] = utf8_encode($plugin['extension_description']);
-    $plugin['revision_description'] = utf8_encode($plugin['revision_description']);
-
     list($date, ) = explode(' ', $plugin['revision_date']);
 
-    $ver_desc = sprintf(l10n('plugins_description'),
-      $plugin['revision_name'],
-      $date,
-      $plugin['revision_description']);
+    $ext_desc = '<i>'.l10n('Downloads').':</i> '.$plugin['extension_nb_downloads']."\r\n"
+      ."\r\n"
+      .$plugin['extension_description'];
+
+    $rev_desc = '<i>'.l10n('Version').':</i> '.$plugin['revision_name']."\r\n"
+      .'<i>'.l10n('Released on').':</i> '.$date."\r\n"
+      .'<i>'.l10n('Downloads').':</i> '.$plugin['revision_nb_downloads']."\r\n"
+      ."\r\n"
+      .$plugin['revision_description'];
 
     $url_auto_install = htmlentities($base_url)
       . '&amp;revision=' . $plugin['revision_id']
-      . '&amp;extension=' . $plugin['extension_id'];
+      . '&amp;extension=' . $plugin['extension_id']
+      . '&amp;pwg_token='.get_pwg_token()
+    ;
 
     $template->append('plugins', array(
       'EXT_NAME' => $plugin['extension_name'],
       'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin['extension_id'],
-      'EXT_DESC' => $plugin['extension_description'],
+      'EXT_DESC' => $ext_desc,
       'VERSION' => $plugin['revision_name'],
-      'VERSION_URL' => PEM_URL.'/revision_view.php?rid='.$plugin['revision_id'],
       'DATE' => $date,
-      'VER_DESC' => $ver_desc,
+      'VER_DESC' => $rev_desc,
       'AUTHOR' => $plugin['author_name'],
       'URL_INSTALL' => $url_auto_install,
       'URL_DOWNLOAD' => $plugin['download_url'] . '&amp;origin=piwigo_download'));

admin/plugins_update.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -37,6 +37,8 @@ $plugins = new plugins();
 //-----------------------------------------------------------automatic upgrade
 if (isset($_GET['plugin']) and isset($_GET['revision']) and !is_adviser())
 {
+  check_pwg_token();
+  
   $plugin_id = $_GET['plugin'];
   $revision = $_GET['revision'];
 
@@ -48,6 +50,7 @@ if (isset($_GET['plugin']) and isset($_GET['revision']) and !is_adviser())
     redirect($base_url
       . '&revision=' . $revision
       . '&plugin=' . $plugin_id
+      . '&pwg_token='.get_pwg_token()
       . '&reactivate=true');
   }
 
@@ -86,7 +89,7 @@ if (isset($_GET['upgradestatus']) and isset($_GET['plugin']))
 
     default:
       array_push($page['errors'],
-        sprintf(l10n('plugins_extract_error'), $_GET['installstatus']),
+        sprintf(l10n('plugins_extract_error'), $_GET['upgradestatus']),
         l10n('plugins_check_chmod'));
   }  
 }
@@ -97,11 +100,7 @@ set_plugins_tabsheet($page['page']);
 // +-----------------------------------------------------------------------+
 // |                     start template output                             |
 // +-----------------------------------------------------------------------+
-if (!ini_get('allow_url_fopen'))
-{
-  array_push($page['errors'], l10n('Unable to connect to PEM server since allow_url_fopen is disabled.'));
-}
-elseif ($plugins->get_server_plugins())
+if ($plugins->get_server_plugins())
 {
   foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
   {
@@ -110,41 +109,44 @@ elseif ($plugins->get_server_plugins())
     {
       $plugin_info = $plugins->server_plugins[$fs_plugin['extension']];
 
-      /* Need to remove this lines for final release : piwigo website will be utf8 only */
-      $plugin_info['extension_description'] = utf8_encode($plugin_info['extension_description']);
-      $plugin_info['revision_description'] = utf8_encode($plugin_info['revision_description']);
-
       list($date, ) = explode(' ', $plugin_info['revision_date']);
 
-      $ver_desc = sprintf(l10n('plugins_description'),
-        $plugin_info['revision_name'],
-        $date,
-        $plugin_info['revision_description']);
+      $ext_desc = '<i>'.l10n('Downloads').':</i> '.$plugin_info['extension_nb_downloads']."\r\n"
+        ."\r\n"
+        .$plugin_info['extension_description'];
+
+      $rev_desc = '<i>'.l10n('Version').':</i> '.$plugin_info['revision_name']."\r\n"
+        .'<i>'.l10n('Released on').':</i> '.$date."\r\n"
+        .'<i>'.l10n('Downloads').':</i> '.$plugin_info['revision_nb_downloads']."\r\n"
+        ."\r\n"
+        .$plugin_info['revision_description'];
 
       if ($plugins->plugin_version_compare($fs_plugin['version'], $plugin_info['revision_name']))
       {
         // Plugin is up to date
         $template->append('plugins_uptodate', array(
-          'URL' => $fs_plugin['uri'],
+          'URL' => PEM_URL.'/extension_view.php?eid='.$plugin_info['extension_id'],
           'NAME' => $fs_plugin['name'],
-          'EXT_DESC' => $plugin_info['extension_description'],
-          'VERSION' => $fs_plugin['version']));
+          'EXT_DESC' => $ext_desc,
+          'VERSION' => $fs_plugin['version'],
+          'VER_DESC' => $rev_desc));
       }
       else
       {
         // Plugin need upgrade
         $url_auto_update = $base_url
           . '&amp;revision=' . $plugin_info['revision_id']
-          . '&amp;plugin=' . $plugin_id;
+          . '&amp;plugin=' . $plugin_id
+          . '&amp;pwg_token='.get_pwg_token()
+          ;
 
         $template->append('plugins_not_uptodate', array(
           'EXT_NAME' => $fs_plugin['name'],
-          'EXT_URL' => $fs_plugin['uri'],
-          'EXT_DESC' => $plugin_info['extension_description'],
+          'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin_info['extension_id'],
+          'EXT_DESC' => $ext_desc,
           'VERSION' => $fs_plugin['version'],
-          'VERSION_URL' => PEM_URL.'/revision_view.php?rid='.$plugin_info['revision_id'],
           'NEW_VERSION' => $plugin_info['revision_name'],
-          'NEW_VER_DESC' => $ver_desc,
+          'NEW_VER_DESC' => $rev_desc,
           'URL_UPDATE' => $url_auto_update,
           'URL_DOWNLOAD' => $plugin_info['download_url'] . '&amp;origin=piwigo_download'));
       }

admin/profile.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/rating.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/site_manager.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -33,6 +33,11 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 // +-----------------------------------------------------------------------+
 check_status(ACCESS_ADMINISTRATOR);
 
+if (!empty($_POST) or isset($_GET['action']))
+{
+  check_pwg_token();
+}
+
 /**
  * requests the given $url (a remote create_listing_file.php) and fills a
  * list of lines corresponding to request output
@@ -44,8 +49,9 @@ function remote_output($url)
 {
   global $template, $page;
 
-  if($lines = @file($url))
+  if (fetchRemote($url, $result))
   {
+    $lines = explode("\r\n", $result);
     // cleaning lines from HTML tags
     foreach ($lines as $line)
     {
@@ -112,8 +118,9 @@ SELECT COUNT(id) AS count
         $clf_url = $url.'create_listing_file.php';
         $clf_url.= '?action=test';
         $clf_url.= '&version='.PHPWG_VERSION;
-        if ( ($lines = @file($clf_url)) !== false)
+        if (fetchRemote($clf_url, $result))
         {
+          $lines = explode("\r\n", $result);
           $first_line = strip_tags($lines[0]);
           if (!preg_match('/^PWG-INFO-2:/', $first_line))
           {
@@ -196,11 +203,13 @@ SELECT galleries_url
   }
 }
 
-$template->assign( array(
-  'U_HELP'    => get_root_url().'popuphelp.php?page=site_manager',
-  'F_ACTION'  => get_root_url().'admin.php'
-                .get_query_string_diff( array('action','site') )
-  ) );
+$template->assign(
+  array(
+    'U_HELP'    => get_root_url().'popuphelp.php?page=site_manager',
+    'F_ACTION'  => get_root_url().'admin.php'.get_query_string_diff(array('action','site','pwg_token')),
+    'PWG_TOKEN' => get_pwg_token(),
+    )
+  );
 
 // +-----------------------------------------------------------------------+
 // |                           remote sites list                           |
@@ -240,6 +249,7 @@ while ($row = mysql_fetch_array($result))
   $base_url = PHPWG_ROOT_PATH.'admin.php';
   $base_url.= '?page=site_manager';
   $base_url.= '&site='.$row['id'];
+  $base_url.= '&pwg_token='.get_pwg_token();
   $base_url.= '&action=';
 
   $update_url = PHPWG_ROOT_PATH.'admin.php';

admin/site_reader_local.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/site_reader_remote.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -48,7 +48,7 @@ function RemoteSiteReader($url, $listing_url)
 
   if (!isset($listing_url))
   {
-    $this->listing_url = $this->site_url.'/listing.xml';
+    $this->listing_url = $this->site_url.'listing.xml';
   }
   else
   {
@@ -65,11 +65,10 @@ function open()
 {
   global $errors;
 
-  if (@fopen($this->listing_url, 'r'))
+  if ($xml_content = getXmlCode($this->listing_url))
   {
     $this->site_dirs = array();
     $this->site_files = array();
-    $xml_content = getXmlCode($this->listing_url);
     $info_xml_element = getChild($xml_content, 'informations');
     if (getAttribute($info_xml_element , 'phpwg_version') != PHPWG_VERSION)
     {

admin/site_update.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/stats.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/tags.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -29,6 +29,11 @@ if( !defined("PHPWG_ROOT_PATH") )
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 check_status(ACCESS_ADMINISTRATOR);
 
+if (!empty($_POST))
+{
+  check_pwg_token();
+}
+
 // +-----------------------------------------------------------------------+
 // |                                edit tags                              |
 // +-----------------------------------------------------------------------+
@@ -189,7 +194,8 @@ $template->set_filenames(array('tags' => 'tags.tpl'));
 
 $template->assign(
   array(
-    'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=tags'
+    'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=tags',
+    'PWG_TOKEN' => get_pwg_token(),
     )
   );
 

admin/template/goto/admin.tpl

@@ -7,7 +7,7 @@ jQuery().ready(function(){ldelim}
   jQuery('#menubar').accordion({ldelim}
     header: "dt.rdion",
     event: "click",
-    active: {$themeconf.selected_admin_menu}
+    active: {$U_ACTIVE_MENU|default:$themeconf.selected_admin_menu}
   });
 });
 </script>
@@ -20,6 +20,7 @@ jQuery().ready(function(){ldelim}
         <li><a href="{$U_RETURN}">{'home'|@translate}</a></li>
         <li><a href="{$U_FAQ}">{'instructions'|@translate}</a></li>
         <li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'admin'|@translate}</a></li>
+        <li><a href="{$U_LOGOUT}">{'logout'|@translate}</a></li>
 {if isset($pwgmenu)}
         <li class="external"><a class="external" href="{$pwgmenu.WIKI}" onclick="window.open(this.href, ''); 
           return false;">{'WIKI / DOC'|@translate}</a></li>
@@ -46,7 +47,7 @@ jQuery().ready(function(){ldelim}
     <dd>
       <ul>
         <li><a href="{$U_SITE_MANAGER}">{'Site manager'|@translate}</a></li>
-        <li><a href="{$U_CAT_UPDATE}">{'update'|@translate}</a><br />&nbsp;</li>
+        <li><a href="{$U_CAT_UPDATE}">{'update'|@translate}</a></li>
         <li><a href="{$U_CATEGORIES}">{'manage'|@translate}</a></li>
         <li><a href="{$U_MOVE}">{'Move'|@translate}</a></li>
         <li><a href="{$U_CAT_OPTIONS}">{'cat_options_title'|@translate}</a></li>

admin/template/goto/cat_list.tpl

@@ -27,20 +27,24 @@
 <h3>{$CATEGORIES_NAV}</h3>
 
 <form id="addVirtual" action="{$F_ACTION}" method="post">
+  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
   <p>
     {'cat_add'|@translate} : <input type="text" name="virtual_name" />
     <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED} />
     {if count($categories)>9 }
-    <a href="#EoP" class="button"><img src="{$themeconf.admin_icon_dir}/page_end.png" class="button" alt="page_end" /></a>
+    <a href="#EoP" class="button" style="border:0;">
+		<img src="{$themeconf.admin_icon_dir}/page_end.png" title="{'Page end'|@translate}" class="button" alt="page_end" style="margin-bottom:-0.6em;"/></a>
     {/if}
   </p>
 </form>
 
 {if count($categories) }
 <form id="categoryOrdering" action="{$F_ACTION}" method="post">
+  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
   <p>
     <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED} />
     <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED} />
+	<input class="submit" name="submitOrderAlphaNumReverse" type="submit" value="{'Order alphanumerically reverse'|@translate}" {$TAG_INPUT_ENABLED} />
   </p>
   <ul class="categoryUl">
 
@@ -48,7 +52,9 @@
     <li class="categoryLi{if $category.IS_VIRTUAL} virtual_cat{/if}" id="cat_{$category.ID}">
       <!-- category {$category.ID} -->
       <ul class="categoryActions">
+        {if cat_admin_access($category.ID)}
         <li><a href="{$category.U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li>
+        {/if}
         <li><a href="{$category.U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"/></a></li>
         {if isset($category.U_MANAGE_ELEMENTS) }
         <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
@@ -83,6 +89,7 @@
   <p>
     <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED} />
     <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED} />
+	<input class="submit" name="submitOrderAlphaNumReverse" type="submit" value="{'Order alphanumerically reverse'|@translate}" {$TAG_INPUT_ENABLED} />
   </p>
 
 </form>

admin/template/goto/cat_modify.tpl

@@ -1,6 +1,7 @@
 {* $Id$ *}
 
 {include file='include/autosize.inc.tpl'}
+{include file='include/resize.inc.tpl'}
 
 <div class="titrePage">
   <h2>{'title_edit_cat'|@translate}</h2>
@@ -9,7 +10,9 @@
 <h3>{$CATEGORIES_NAV}</h3>
 
 <ul class="categoryActions">
+  {if cat_admin_access($CAT_ID)}
   <li><a href="{$U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li>
+  {/if}
   {if isset($U_MANAGE_ELEMENTS) }
   <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
   <li><a href="{$U_MANAGE_RANKS}" title="{'manage image ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}" /></a></li>
@@ -39,7 +42,7 @@
     <tr>
       <td><strong>{'Name'|@translate}</strong></td>
       <td>
-        <input type="text" name="name" value="{$CAT_NAME}" maxlength="60"/>
+        <input type="text" class="large" name="name" value="{$CAT_NAME}" maxlength="60"/>
       </td>
     </tr>
     <tr>
@@ -155,7 +158,7 @@
   <table>
     <tr>
       <td>{'Virtual category name'|@translate}</td>
-      <td><input type="text" name="virtual_name"></td>
+      <td><input type="text" class="large" name="virtual_name"></td>
     </tr>
 
     <tr>

admin/template/goto/cat_move.tpl

@@ -1,5 +1,7 @@
 {* $Id$ *}
 
+{include file='include/resize.inc.tpl'}
+
 <div class="titrePage">
   <h2>{'Move categories'|@translate}</h2>
 </div>

admin/template/goto/comments.tpl

@@ -13,11 +13,11 @@
     <a class="illustration" href="{$comment.U_PICTURE}"><img src="{$comment.TN_SRC}" /></a>
     <p class="commentHeader"><strong>{$comment.AUTHOR}</strong> - <em>{$comment.DATE}</em></p>
     <blockquote>{$comment.CONTENT}</blockquote>
+  </div>
     <ul class="actions">
       <li><label><input type="radio" name="action-{$comment.ID}" value="reject" />{'Reject'|@translate}</label></li>
       <li><label><input type="radio" name="action-{$comment.ID}" value="validate" />{'Validate'|@translate}</label></li>
     </ul>
-  </div>
   {/foreach}
 
   <p class="bottomButtons">

admin/template/goto/default-colors.css

@@ -3,7 +3,7 @@
 
 /* So that non-links are slightly greyed out */
 .content .navigationBar {
-	color: #b0b0b0;
+	color: #999;
 }
 
 /* Tables & forms */
@@ -11,12 +11,12 @@
 INPUT.text, INPUT.password, INPUT.button,
 INPUT.submit, INPUT.reset, INPUT.file,
 SELECT, TEXTAREA {
-  color:black;
-  background-color: #d3d3d3;	/* lightgrey */
+  color:#999;
+  background-color: #666;	
 }
 
 INPUT:focus, SELECT:focus, TEXTAREA:focus, INPUT.focus, FORM .focus {
-  background-color: #f5f5f5;	/* whitesmoke */
+  background-color: #444;	/* whitesmoke */
 }
 
 /* some theme set a border on INPUT  which is not pretty for radio/checkbox */
@@ -29,12 +29,12 @@ INPUT.radio, INPUT.checkbox {
 }
 
 .errors { /* Errors display */
-  color: red;
-  background-color: #ffe1e1;
+  color: #f33;
+  background-color: transparent;
   font-weight: bold;
   text-align: left;
   margin: 5px;
-  border: 1px solid red;
+  border: 1px solid #666;
   background-image: url(icon/errors.png);
   background-repeat: no-repeat;
   background-position: top right;
@@ -46,8 +46,8 @@ INPUT.radio, INPUT.checkbox {
  */
 .infos {
   text-align: left;
-  color: #002000;
-  background-color: #98fb98; /* palegreen */
+  color: #f70;
+  background-color: transparent; 
   background-image: url(icon/infos.png);
   background-repeat: no-repeat;
   background-position: top right;
@@ -61,8 +61,8 @@ INPUT.radio, INPUT.checkbox {
 .header_msgs {
   text-align:center;
   font-weight: bold;
-  color:#696969;	/* dimgray */
-  background-color: #d3d3d3;
+  color:#333;
+  background-color: transparent;
   margin: 1px;
   padding: 1px;
 }
@@ -71,7 +71,7 @@ INPUT.radio, INPUT.checkbox {
  * Header notes box in public/administration
  */
 .header_notes {
-  border: 1px solid #aaaaaa; /* border color and style */
+  border: 1px solid #666; 
   text-align: center;
   background-image: url(icon/note.png);
   background-repeat: no-repeat;

admin/template/goto/default-layout.css

@@ -2,12 +2,12 @@
 
 /* History tables */
 TABLE.table2 {
-	border: 1px solid black;
+	border: 1px solid #111;
 	margin: 1em auto;
 	padding: 0;
 }
 
-TABLE.table2 TD {
+TABLE.table2 TD, TABLE.table2 TH {
 	padding: 0 5px;
 }
 
@@ -38,6 +38,7 @@ TABLE#detailedStats {
 }
 
 /* Plugins tables */
+TABLE.plugins { min-width: 400px; }
 TABLE.plugins A { border: 0; }
 TABLE.plugins TR TD { padding: 4px 10px; }
 TABLE.plugins TR TD.pluginState { padding: 4px 16px; }
@@ -85,7 +86,7 @@ UL.categoryUl {
 
 LI.categoryLi {
 	width: 100%;
-	border: 1px solid gray;
+	border: 1px solid #666;
 	padding: 0px 5px;
 	margin-bottom: 5px;
 }
@@ -150,24 +151,28 @@ FIELDSET#historyConf SPAN.property {
 }
 FIELDSET#mainConfCheck INPUT,
 FIELDSET#historyConf INPUT,
-FIELDSET#commentsConf INPUT,
-FIELDSET#uploadConf SELECT,
-FIELDSET#uploadConf INPUT {
+FIELDSET#commentsConf INPUT {
 	margin-left: 5%;
 }
-
+FIELDSET#uploadConf SELECT {
+	float: right;
+	margin: 2px 10px 0px;
+}
+FIELDSET#uploadConf INPUT {
+	float: right;
+	margin: 5px 10px 0px;
+}
+FIELDSET#uploadConf SPAN.property {
+	width: 65%;
+}
 FIELDSET#commentsConf SPAN.property {
 	width: 85%;
 }
 
-FIELDSET#uploadConf SPAN.property {
-	width: 73%;
-}
-
 .statBar {
 	height: 10px;
 	background-color: #ff7700;
-	border: 1px solid black;
+	border: 1px solid #666;
 }
 
 .over{
@@ -182,10 +187,10 @@ z-index: 50;
 
 .over SPAN{ /*CSS for enlarged image*/
 position: absolute;
-background-color: #eee;
+background-color: #222;
 padding: 5px;
 left: -1000px;
-border: 1px solid #69c;
+border: 1px solid #ff3363;
 visibility: hidden;
 color: black;
 text-decoration: none;
@@ -227,10 +232,10 @@ H2 {
 
 A {
 	text-decoration:none;
-	border-bottom: 1px dotted #005e89;
+	border-bottom: 0;
 }
 A:hover {
-	border-bottom: 1px solid #858460;
+	border-bottom: 1px solid #FF3363;
 }
 A.button, A.button:hover { 
 	border: 0; 
@@ -374,7 +379,7 @@ FORM.filter FIELDSET P
 }
 
 FORM.filter INPUT[type="submit"] {
-	margin-top: 5px;
+	margin-top: 1.8em;
 }
 
 FORM.properties UL, FORM#update UL {

admin/template/goto/double_select.tpl

@@ -1,21 +1,6 @@
 {* $Id$ *}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.core.packed.js"}
-{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.resizable.packed.js"}
 
-<script type="text/javascript">
-  jQuery().ready(function(){ldelim}
-    jQuery(".doubleSelect select.categoryList").resizable({ldelim}
-    handles: "w,e",
-    animate: true,
-    animateDuration: "slow",
-    animateEasing: "swing",
-    preventDefault: true,
-    preserveCursor: true,
-    autoHide: true,
-    ghost: true
-    });
-  });
-</script>
+{include file='include/dbselect.inc.tpl'}
 
 <table class="doubleSelect">
   <tr>

admin/template/goto/element_set_global.tpl

@@ -125,7 +125,7 @@
           <label><input type="radio" name="author_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
           <label><input type="radio" name="author_action" value="unset" /> {'unset'|@translate}</label>
           <label><input type="radio" name="author_action" value="set" id="author_action_set" /> {'set to'|@translate}</label>
-          <input onchange="document.getElementById('author_action_set').checked = true;" type="text" name="author" value="" />
+          <input onchange="document.getElementById('author_action_set').checked = true;" type="text" class="large" name="author" value="" />
         </td>
       </tr>
 
@@ -135,7 +135,7 @@
           <label><input type="radio" name="name_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
           <label><input type="radio" name="name_action" value="unset" /> {'unset'|@translate}</label>
           <label><input type="radio" name="name_action" value="set" id="name_action_set" /> {'set to'|@translate}</label>
-          <input onchange="document.getElementById('name_action_set').checked = true;" type="text" name="name" value="" />
+          <input onchange="document.getElementById('name_action_set').checked = true;" type="text" class="large" name="name" value="" />
         </td>
       </tr>
 

admin/template/goto/element_set_unit.tpl

@@ -40,12 +40,12 @@
 
     <tr>
       <td><strong>{'Name'|@translate}</strong></td>
-      <td><input type="text" name="name-{$element.ID}" value="{$element.NAME}" /></td>
+      <td><input type="text" class="large" name="name-{$element.ID}" value="{$element.NAME}" /></td>
     </tr>
 
     <tr>
       <td><strong>{'Author'|@translate}</strong></td>
-      <td><input type="text" name="author-{$element.ID}" value="{$element.AUTHOR}" /></td>
+      <td><input type="text" class="large" name="author-{$element.ID}" value="{$element.AUTHOR}" /></td>
     </tr>
 
     <tr>

admin/template/goto/extend_for_templates.tpl

@@ -9,6 +9,7 @@
       <th>{'Replacers'|@translate}</th>
       <th>{'Original templates'|@translate}</th>
       <th>{'Optional URL keyword'|@translate}</th>
+      <th>{'Bound template'|@translate}</th>
     </tr>
     {foreach from=$extents item=tpl name=extent_loop}
     <tr class="{if $smarty.foreach.extent_loop.index is odd}row1{else}row2{/if}">
@@ -22,6 +23,9 @@
       <td>
         {html_options name=url[] output=$tpl.url_parameter values=$tpl.url_parameter selected=$tpl.selected_url}
       </td>
+      <td>
+        {html_options name=bound[] output=$tpl.bound_tpl values=$tpl.bound_tpl selected=$tpl.selected_bound}
+      </td>
     </tr>
     {/foreach}
   </table>

admin/template/goto/footer.tpl

@@ -15,7 +15,7 @@
   *}
 
   {'powered_by'|@translate}
-  <a href="http://piwigo.org" class="Piwigo">
+  <a href="{$PHPWG_URL}" class="Piwigo">
   <span class="Piwigo">Piwigo</span></a>
   {$VERSION}
   {if isset($CONTACT_MAIL)}

admin/template/goto/group_list.tpl

@@ -4,6 +4,7 @@
 </div>
 
 <form method="post" name="add_user" action="{$F_ADD_ACTION}" class="properties">
+  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
   <fieldset>
     <legend>{'Add group'|@translate}</legend>
 

admin/template/goto/history.tpl

@@ -20,13 +20,13 @@
     <li><label>{'search_date_from'|@translate}</label></li>
     <li>
       <select id="start_day" name="start_day">
-        <option value="0">--</option>
-        {section name=day start=1 loop=32}
-        <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$START_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
-        {/section}
+        <option value="0">--</option>
+        {section name=day start=1 loop=32}
+        <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$START_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
+        {/section}
       </select>
       <select id="start_month" name="start_month">
-      {html_options options=$month_list selected=$START_MONTH_SELECTED}
+      {html_options options=$month_list selected=$START_MONTH_SELECTED}
       </select>
       <input id="start_year" name="start_year" value="{$START_YEAR}" type="text" size="4" maxlength="4" >
       <input id="start_linked_date" name="start_linked_date" type="hidden" size="10" disabled="disabled"/>
@@ -36,13 +36,13 @@
     <li><label>{'search_date_to'|@translate}</label></li>
     <li>
       <select id="end_day" name="end_day">
-        <option value="0">--</option>
-        {section name=day start=1 loop=32}
-        <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$END_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
-        {/section}
+        <option value="0">--</option>
+        {section name=day start=1 loop=32}
+        <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$END_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
+        {/section}
       </select>
       <select id="end_month" name="end_month">
-      {html_options options=$month_list selected=$END_MONTH_SELECTED}
+      {html_options options=$month_list selected=$END_MONTH_SELECTED}
       </select>
       <input id="end_year" name="end_year" value="{$END_YEAR}" type="text" size="4" maxlength="4" >
       <input id="end_linked_date" name="end_linked_date" type="hidden" size="10" disabled="disabled"/>
@@ -52,15 +52,15 @@
   <label>
     {'Element type'|@translate}
     <select name="types[]" multiple="multiple" size="4">
-      {html_options values=$type_option_values output=$type_option_values|translate selected=$type_option_selected}
+      {html_options values=$type_option_values output=$type_option_values|translate selected=$type_option_selected}
     </select>
   </label>
 
   <label>
     {'User'|@translate}
     <select name="user">
-      <option value="-1">------------</option>
-      {html_options options=$user_options selected=$user_options_selected}
+      <option value="-1">------------</option>
+      {html_options options=$user_options selected=$user_options_selected}
     </select>
   </label>
 
@@ -73,18 +73,18 @@
     {'File name'|@translate}
     <input name="filename" value="{$FILENAME}" type="text">
   </label>
-
-  <label>
-    {'Thumbnails'|@translate}
-    <select name="display_thumbnail">
-      {html_options values=$display_thumbnail_values output=$display_thumbnail_values|translate selected=$display_thumbnail_selected}
-    </select>
-  </label>
+
+  <label>
+    {'Thumbnails'|@translate}
+    <select name="display_thumbnail">
+      {html_options values=$display_thumbnail_values output=$display_thumbnail_values|translate selected=$display_thumbnail_selected}
+    </select>
+  </label>
 
   <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" />
 </fieldset>
 </form>
-
+
 {if isset($search_summary)}
 <fieldset>
   <legend>{'Summary'|@translate}</legend>
@@ -102,13 +102,13 @@
 </fieldset>
 {/if}
 
-
-{if !empty($NAV_BAR)}
-<div class="navigationBar">
-  {$NAV_BAR}
-</div>
-{/if}
-
+
+{if !empty($NAV_BAR)}
+<div class="navigationBar">
+  {$NAV_BAR}
+</div>
+{/if}
+
 
 <table class="table2" id="detailedStats">
 <tr class="throw">
@@ -123,7 +123,7 @@
   <th>{'tags'|@translate}</th>
 </tr>
 {if !empty($search_results) }
-{foreach from=$search_results item=detail name=res_loop}
+{foreach from=$search_results item=detail name=res_loop}
 <tr class="{if $smarty.foreach.res_loop.index is odd}row1{else}row2{/if}">
   <td class="hour">{$detail.DATE}</td>
   <td class="hour">{$detail.TIME}</td>
@@ -135,13 +135,13 @@
   <td>{$detail.CATEGORY}</td>
   <td>{$detail.TAGS}</td>
 </tr>
-{/foreach}
+{/foreach}
 {/if}
 </table>
-
-
-{if !empty($NAV_BAR)}
-<div class="navigationBar">
-  {$NAV_BAR}
-</div>
-{/if}
+
+
+{if !empty($NAV_BAR)}
+<div class="navigationBar">
+  {$NAV_BAR}
+</div>
+{/if}

admin/template/goto/icon/index.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/template/goto/include/datepicker.inc.tpl

@@ -1,196 +1,25 @@
 {* $Id$ *}
+
 {known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.core.packed.js"}
 {known_script id="jquery.ui.datepicker" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.datepicker.packed.js"}
-{known_script id="jquery.ui.datepicker-$lang_info.code" src=$ROOT_URL|@cat:"template-common/lib/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
+{known_script id="datepicker.js" src=$ROOT_URL|@cat:"template-common/datepicker.js"}
+
+{assign var="datepicker_language" value="template-common/lib/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
+
+{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
+{known_script id="jquery.ui.datepicker-$lang_info.code" src=$ROOT_URL|@cat:$datepicker_language}
+{/if}
 
 {html_head}
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}template-common/lib/ui/ui.datepicker.css">
 {/html_head}
 
-{literal}
 <script type="text/javascript">
-// return formated date with control values
-// day, month, year: selectors of visible date controls
-function pwg_get_fmt_datepicker(day, month, year)
-{
-  return $(year).val() + "-" + $(month).val() + "-" + $(day).val();
-}
-
-// initialize controls
-// day, month, year: selectors of visible date controls
-// linked_date: selector of hidden linked dates control
-// checked_on_change: selector of control to change "checked" attribut
-// min_linked_date: selector of hidden linked date control witch give min value
-// max_linked_date: selector of hidden linked date control witch give max value
 function pwg_initialization_datepicker(day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date)
-{
-  // Action on change date value
-  function pwg_on_date_change()
-  {
-    pwg_check_date();
-    if (checked_on_change != null)
-    {
-      $(checked_on_change).attr("checked", "true");
-    }
-  }
-
-  // In order to desable element of list
-  function pwg_disabled_selection()
-  {
-    array_date = $(linked_date).val().split('-');
-    y = array_date[0];
-    m = array_date[1];
-
-    // Init list
-    $(day + " option").attr("disabled", "");
-    $(month + " option").attr("disabled", "");
-
-    var daysInMonth = 32 - new Date(y, m - 1, 32).getDate();
-    $(day + " option:gt(" + (daysInMonth) +")").attr("disabled", "disabled");
-
-    if ((min_linked_date != null) && ($(min_linked_date).datepicker("getDate") != null))
-    {
-      date_cmp = min_linked_date;
-      op_cmp = "lt";
-    }
-    else if ((max_linked_date != null) && ($(max_linked_date).datepicker("getDate") != null))
-    {
-      date_cmp = max_linked_date;
-      op_cmp = "gt";
-    }
-    else
-    {
-      date_cmp = null;
-      op_cmp = null;
-    }
-
-    if (op_cmp != null)
-    {
-      array_date = $(date_cmp).val().split('-');
-      y_cmp = array_date[0];
-      m_cmp = array_date[1];
-      d_cmp = array_date[2];
-      
-      if (y == y_cmp)
-      {
-        $(month + " option:" + op_cmp + "(" + (m_cmp) +")").attr("disabled", "disabled");
-        if (op_cmp ==  "lt")
-        {
-            $(month + " option:eq(" + (0) +")").attr("disabled", "");
-        }
-
-        if (m == m_cmp)
-        {
-          $(day + " option:" + op_cmp + "(" + (d_cmp) +")").attr("disabled", "disabled");
-          if (op_cmp ==  "lt")
-          {
-            $(day + " option:eq(" + (0) +")").attr("disabled", "");
-          }
-        }
-      }
-    }
-  }
-
-  // Prevent selection of invalid dates through the select controls 
-  function pwg_check_date()
-  {
-    last_date = $(linked_date).val();
-
-    $(linked_date).val(pwg_get_fmt_datepicker(day, month, year));
-
-    if ((min_linked_date != null) && ($(min_linked_date).datepicker("getDate") != null))
-    {
-      cancel = ($(min_linked_date).datepicker("getDate") > $(linked_date).datepicker("getDate"));
-    }
-    else if ((max_linked_date != null) && ($(max_linked_date).datepicker("getDate") != null))
-    {
-      cancel = ($(max_linked_date).datepicker("getDate") < $(linked_date).datepicker("getDate"));
-    }
-    else
-    {
-      cancel = false;
-    }
-
-    if (cancel)
-    {
-      array_date = last_date.split('-');
-      $(year).val(array_date[0]);
-      $(month).val(array_date[1]);
-      $(day).val(array_date[2]);
-      // check again
-      pwg_check_date();
-    }
-  }
-
-  jQuery().ready(function(){
-    // Init hidden value
-    $(linked_date).val(pwg_get_fmt_datepicker(day, month, year));
-
-    // Init Datepicker
-    jQuery(linked_date).datepicker({
-      dateFormat:'yy-m-d',
-      beforeShow:
-        // Prepare to show a date picker linked to three select controls 
-        function readLinked(input) { 
-            //$(linked_date).val(pwg_get_fmt_datepicker(day, month, year));
-            if (min_linked_date != null)
-            {
-              return {minDate: $(min_linked_date).datepicker("getDate")};
-            }
-            else if (max_linked_date != null)
-            {
-              return {maxDate: $(max_linked_date).datepicker("getDate")};
-            }
-            else
-            {
-              return {};
-            }
-        },
-      onSelect:
-        // Update three select controls to match a date picker selection 
-        function updateLinked(date) {
-            if (date.length == 0)
-            {
-              $(year).val("");
-              $(month).val("0");
-              $(day).val("0");
-            }
-            else
-            {
-              array_date = date.split('-');
-              $(year).val(array_date[0]);
-              $(month).val(array_date[1]);
-              $(day).val(array_date[2]);
-            }
-            pwg_on_date_change();
-        },
-      showOn: "both",
-{/literal}
-      buttonImage: "{$ROOT_URL}admin/template/{$themeconf.template}/icon/datepicker.png",
-{literal}
-      buttonImageOnly: true,
-      buttonText: ""
-      });
-
-    // Check showed controls
-    jQuery(day + ", " + month + ", " + year).change(
-      function ()
-      {
-        pwg_on_date_change();
-      });
-
-    // Check showed controls
-    jQuery(day + ", " + month + ", " + year).focus(
-      function ()
-      {
-        pwg_disabled_selection();
-      });
-
-    // In order to init linked input
-    pwg_check_date();
-   });
-
+{ldelim}
+  return pwg_common_initialization_datepicker(
+    "{$ROOT_URL}admin/template/{$themeconf.template}/icon/datepicker.png",
+    day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date);
 }
 </script>
-{/literal}

admin/template/goto/include/dbselect.inc.tpl

@@ -0,0 +1,23 @@
+{* $Id$ *}
+{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.core.packed.js"}
+{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.resizable.packed.js"}
+
+{* Resize possible *}
+{literal}
+<script type="text/javascript">
+  jQuery().ready(function(){
+    // Resize possible for double select list
+    jQuery(".doubleSelect select.categoryList").resizable({
+      handles: "w,e",
+      animate: true,
+      animateDuration: "slow",
+      animateEasing: "swing",
+      preventDefault: true,
+      preserveCursor: true,
+      autoHide: true,
+      ghost: true
+    });
+  });
+</script>
+{/literal}

admin/template/goto/include/resize.inc.tpl

@@ -0,0 +1,23 @@
+{* $Id$ *}
+{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.core.packed.js"}
+{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.resizable.packed.js"}
+
+{* Resize possible *}
+{literal}
+<script type="text/javascript">
+  jQuery().ready(function(){
+    // Resize possible for list
+    jQuery(".categoryList").resizable({
+      handles: "all",
+      animate: true,
+      animateDuration: "slow",
+      animateEasing: "swing",
+      preventDefault: true,
+      preserveCursor: true,
+      autoHide: true,
+      ghost: true
+    });
+  });
+</script>
+{/literal}

admin/template/goto/index.php

@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+

admin/template/goto/install.tpl

@@ -0,0 +1,171 @@
+{* $Id$ *}
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="{$lang_info.code}" dir="{$lang_info.direction}">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={$T_CONTENT_ENCODING}">
+<meta http-equiv="Content-script-type" content="text/javascript">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
+{literal}
+<style type="text/css">
+.content {
+ width: 800px;
+ margin: auto;
+ text-align: center;
+}
+
+.table2 {
+  width: 100%;
+  margin-bottom: 1em !important;
+}
+
+TD {
+  text-align: left;
+  padding: 0.1em 0.5em;
+  height: 2.5em;
+}
+
+.sql_content, .infos a {
+  color: #ff3363;
+}
+</style>
+{/literal}
+<title>Piwigo {$RELEASE} - {'Installation'|@translate}</title>
+</head>
+
+<body>
+<div id="headbranch"></div> {* Dummy block for double background management *}
+<div id="the_page">
+<div id="theHeader"></div>
+<div id="content" class="content">
+
+<h2>Piwigo {$RELEASE} - {'Installation'|@translate}</h2>
+
+{if isset($errors)}
+<div class="errors">
+  <ul>
+    {foreach from=$errors item=error}
+    <li>{$error}</li>
+    {/foreach}
+  </ul>
+</div>
+{/if}
+
+{if isset($infos)}
+<div class="infos">
+  <ul>
+    {foreach from=$infos item=info}
+    <li>{$info}</li>
+    {/foreach}
+  </ul>
+</div>
+{/if}
+
+{if isset($install)}
+<form method="POST" action="{$F_ACTION}" name="install_form">
+
+  <table class="table2">
+    <tr class="throw">
+      <th colspan="2">{'Initial_config'|@translate}</th>
+    </tr>
+    <tr>
+      <td style="width: 30%">{'Default_lang'|@translate}</td>
+      <td>
+    <select name="language" onchange="document.location = 'install.php?language='+this.options[this.selectedIndex].value;">
+    {html_options options=$language_options selected=$language_selection}
+    </select>
+      </td>
+    </tr>
+  </table>
+  <table class="table2">
+    <tr class="throw">
+      <th colspan="3">{'step1_title'|@translate}</th>
+    </tr>
+    <tr>
+      <td style="width: 30%;">{'step1_host'|@translate}</td>
+      <td align=center><input type="text" name="dbhost" value="{$F_DB_HOST}" /></td>
+      <td>{'step1_host_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step1_user'|@translate}</td>
+      <td align=center><input type="text" name="dbuser" value="{$F_DB_USER}" /></td>
+      <td>{'step1_user_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step1_pass'|@translate}</td>
+      <td align=center><input type="password" name="dbpasswd" value="" /></td>
+      <td>{'step1_pass_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step1_database'|@translate}</td>
+      <td align=center><input type="text" name="dbname" value="{$F_DB_NAME}" /></td>
+      <td>{'step1_database_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step1_prefix'|@translate}</td>
+      <td align=center><input type="text" name="prefix" value="{$F_DB_PREFIX}" /></td>
+      <td>{'step1_prefix_info'|@translate}</td>
+    </tr>
+  </table>
+
+  <table class="table2">
+    <tr class="throw">
+      <th colspan="3">{'step2_title'|@translate}</th>
+    </tr>
+    <tr>
+      <td style="width: 30%;">{'install_webmaster'|@translate}</td>
+      <td align="center"><input type="text" name="admin_name" value="{$F_ADMIN}" /></td>
+      <td>{'install_webmaster_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step2_pwd'|@translate}</td>
+      <td align="center"><input type="password" name="admin_pass1" value="" /></td>
+      <td>{'step2_pwd_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'step2_pwd_conf'|@translate}</td>
+      <td align="center"><input type="password" name="admin_pass2" value="" /></td>
+      <td>{'step2_pwd_conf_info'|@translate}</td>
+    </tr>
+    <tr>
+      <td>{'conf_mail_webmaster'|@translate}</td>
+      <td align="center"><input type="text" name="admin_mail" value="{$F_ADMIN_EMAIL}" /></td>
+      <td>{'conf_mail_webmaster_info'|@translate}</td>
+    </tr>
+  </table>
+
+  <table>
+    <tr>
+      <td style="text-align: center;">
+        <input class="submit" type="submit" name="install" value="{'Start_Install'|@translate}" />
+      </td>
+    </tr>
+  </table>
+</form>
+{else}
+<p>
+  <br />
+  <input type="button" name="home" value="{'home'|@translate}" onClick="window.open('index.php');"/>
+  <input type="button" name="admin" value="{'admin'|@translate}" onClick="window.open('admin.php');"/>
+</p>
+
+<div class="infos">
+  <ul>
+    <li>{'Subscribe to Piwigo Announcements Newsletter'|@translate}</li>
+  </ul>
+</div>
+
+<p>
+  <br />
+  <input type="button" name="subscribe" value="{'Subscribe %s'|@translate|@sprintf:$F_ADMIN_EMAIL}" onClick="window.open('{$SUBSCRIBE_BASE_URL}{$F_ADMIN_EMAIL}');"/>
+</p>
+{/if}
+</div> {* content *}
+<div style="text-align: center">{$L_INSTALL_HELP}</div>
+</div> {* the_page *}
+</body>
+</html>

admin/template/goto/intro.tpl

@@ -1,12 +1,27 @@
 {* $Id$ *}
+{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
+
+<script type="text/javascript">
+jQuery().ready(function(){ldelim}
+  jQuery('.cluetip').cluetip({ldelim}
+    width: 300,
+    splitTitle: '|'
+  });
+});
+</script>
+
 <h2>{'title_default'|@translate}</h2>
 <dl style="padding-top: 30px;">
   <dt>{'Piwigo version'|@translate}</dt>
   <dd>
     <ul>
-      <li><a href="http://piwigo.org"  onclick="window.open(this.href, ''); 
+      <li><a href="{$PHPWG_URL}"  onclick="window.open(this.href, ''); 
           return false;">Piwigo</a> {$PWG_VERSION}</li>
       <li><a href="{$U_CHECK_UPGRADE}">{'Check for upgrade'|@translate}</a></li>
+{if isset($SUBSCRIBE_BASE_URL)}
+      <li><a href="{$SUBSCRIBE_BASE_URL}{$EMAIL}" onclick="window.open(this.href); return false;" class="cluetip" title="{'Piwigo Announcements Newsletter'|@translate}|{'Subscribe to Piwigo Announcements Newsletter'|@translate|htmlspecialchars|nl2br}">{'Subscribe %s to Piwigo Announcements Newsletter'|@translate|@sprintf:$EMAIL}</a></li>
+{/if}
     </ul>
   </dd>
 

admin/template/goto/maintenance.tpl

@@ -14,6 +14,7 @@
   <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'purge history summary'|@translate}</a></li>
   <li><a href="{$U_MAINT_SESSIONS}" {$TAG_INPUT_ENABLED}>{'purge sessions'|@translate}</a></li>
   <li><a href="{$U_MAINT_FEEDS}" {$TAG_INPUT_ENABLED}>{'purge never used notification feeds'|@translate}</a></li>
+  <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge search history'|@translate}</a></li>
   <li><a href="{$U_MAINT_COMPILED_TEMPLATES}" {$TAG_INPUT_ENABLED}>{'Purge compiled templates'|@translate}</a></li>
 </ul>
 

admin/template/goto/menubar.tpl

@@ -11,7 +11,7 @@
 		<td>{'Author'|@translate}</td>
 		<td>{'Name'|@translate}</td>
 		<td>{'Position'|@translate}</td>
-		<td>Hide</td>
+		<td>{'Hide'|@translate}</td>
 	</tr>
 	{foreach from=$blocks item=block name="block_loop"}
 	<tr class="{if $smarty.foreach.block_loop.index is odd}row1{else}row2{/if}">

admin/template/goto/permalinks.tpl

@@ -28,40 +28,40 @@
 
 <h3>{'Permalinks'|@translate}</h3>
 <table class="table2">
-  <tr class="throw">
-    <td>Id {$SORT_ID}</td>
-    <td>{'Category'|@translate} {$SORT_NAME}</td>
-    <td>{'Permalink'|@translate} {$SORT_PERMALINK}</td>
-  </tr>
+	<tr class="throw">
+		<td>Id {$SORT_ID}</td>
+		<td>{'Category'|@translate} {$SORT_NAME}</td>
+		<td>{'Permalink'|@translate} {$SORT_PERMALINK}</td>
+	</tr>
 {foreach from=$permalinks item=permalink name="permalink_loop"}
-  <tr class="{if $smarty.foreach.permalink_loop.index is odd}row1{else}row2{/if}">
-    <td>{$permalink.id}</td>
-    <td>{$permalink.name}</td>
-    <td>{$permalink.permalink}</td>
-  </tr>
+	<tr class="{if $smarty.foreach.permalink_loop.index is odd}row1{else}row2{/if}" style="line-height:1.5em;">
+		<td style="text-align:center;">{$permalink.id}</td>
+		<td>{$permalink.name}</td>
+		<td>{$permalink.permalink}</td>
+	</tr>
 {/foreach}
 </table>
 
 <h3>{'Permalink history'|@translate} <a name="old_permalinks"></a></h3>
 <table class="table2">
-  <tr class="throw">
-    <td>Id {$SORT_OLD_CAT_ID}</td>
-    <td>{'Category'|@translate}</td>
-    <td>{'Permalink'|@translate} {$SORT_OLD_PERMALINK}</td>
-    <td>Deleted on {$SORT_OLD_DATE_DELETED}</td>
-    <td>Last hit {$SORT_OLD_LAST_HIT}</td>
-    <td>Hit {$SORT_OLD_HIT}</td>
-    <td></td>
-  </tr>
+	<tr class="throw">
+		<td>Id {$SORT_OLD_CAT_ID}</td>
+		<td>{'Category'|@translate}</td>
+		<td>{'Permalink'|@translate} {$SORT_OLD_PERMALINK}</td>
+		<td>{'Deleted on'|@translate} {$SORT_OLD_DATE_DELETED}</td>
+		<td>{'Last hit'|@translate} {$SORT_OLD_LAST_HIT}</td>
+		<td style="width:20px;">{'Hit'|@translate} {$SORT_OLD_HIT}</td>
+		<td style="width:5px;"></td>
+	</tr>
 {foreach from=$deleted_permalinks item=permalink}
-  <tr>
-    <td>{$permalink.cat_id}</td>
-    <td>{$permalink.name}</td>
-    <td>{$permalink.permalink}</td>
-    <td>{$permalink.date_deleted}</td>
-    <td>{$permalink.last_hit}</td>
-    <td>{$permalink.hit}</td>
-    <td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" alt="[{'delete'|@translate}]" class="button"></a></td>
-  </tr>
+	<tr style="line-height:1.5em;">
+		<td style="text-align:center;">{$permalink.cat_id}</td>
+		<td>{$permalink.name}</td>
+		<td>{$permalink.permalink}</td>
+		<td>{$permalink.date_deleted}</td>
+		<td>{$permalink.last_hit}</td>
+		<td>{$permalink.hit}</td>
+		<td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" alt="[{'delete'|@translate}]" class="button"></a></td>
+	</tr>
 {/foreach}
 </table>

admin/template/goto/picture_modify.tpl

@@ -1,6 +1,7 @@
 {* $Id$ *}
 
 {include file='include/autosize.inc.tpl'}
+{include file='include/dbselect.inc.tpl'}
 {include file='include/datepicker.inc.tpl'}
 
 {literal}
@@ -17,7 +18,9 @@
   {if isset($U_JUMPTO) }
   <li><a href="{$U_JUMPTO}" title="{'jump to image'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to image'|@translate}" /></a></li>
   {/if}
+  {if !url_is_remote($path)}
   <li><a href="{$U_SYNC}" title="{'synchronize metadata'|@translate}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}" /></a></li>
+  {/if}
 </ul>
 
 <form action="{$F_ACTION}" method="post" id="properties">
@@ -83,12 +86,12 @@
 
       <tr>
         <td><strong>{'Name'|@translate}</strong></td>
-        <td><input type="text" name="name" value="{$NAME}" /></td>
+        <td><input type="text" class="large" name="name" value="{$NAME}" /></td>
       </tr>
 
       <tr>
         <td><strong>{'Author'|@translate}</strong></td>
-        <td><input type="text" name="author" value="{$AUTHOR}" /></td>
+        <td><input type="text" class="large" name="author" value="{$AUTHOR}" /></td>
       </tr>
 
       <tr>

admin/template/goto/plugins_new.tpl

@@ -1,6 +1,5 @@
 {* $Id$ *}
 {known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.dimensions" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.dimensions.packed.js"}
 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
 
 <script type="text/javascript">
@@ -15,7 +14,7 @@ jQuery().ready(function(){ldelim}
 <div class="titrePage">
 <span class="sort">
 {'Sort order'|@translate} : 
-  <select onchange="document.location = this.options[this.selectedIndex].value;" style="width:150px">
+  <select onchange="document.location = this.options[this.selectedIndex].value;">
         {html_options options=$order_options selected=$order_selected}
   </select>
 </span>
@@ -37,7 +36,7 @@ jQuery().ready(function(){ldelim}
 {foreach from=$plugins item=plugin name=plugins_loop}
   <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}">
     <td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.EXT_NAME}</a></td>
-    <td style="text-align:center;"><a href="{$plugin.VERSION_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.VER_DESC|htmlspecialchars|nl2br}">{$plugin.VERSION}</a></td>
+    <td style="text-align:center;"><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.VER_DESC|htmlspecialchars|nl2br}">{$plugin.VERSION}</a></td>
     <td>{$plugin.DATE}</td>
     <td>{$plugin.AUTHOR}</td>
     <td style="text-align:center;"><a href="{$plugin.URL_INSTALL}" onclick="return confirm('{'plugins_confirm_install'|@translate|@escape:javascript}');">{'plugins_auto_install'|@translate}</a>

admin/template/goto/plugins_update.tpl

@@ -1,6 +1,5 @@
 {* $Id$ *}
 {known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.dimensions" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.dimensions.packed.js"}
 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
 
 <script type="text/javascript">
@@ -32,7 +31,7 @@ jQuery().ready(function(){ldelim}
   <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}">
     <td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.EXT_NAME}</a></td>
     <td style="text-align:center;">{$plugin.VERSION}</td>
-    <td style="text-align:center;"><a href="{$plugin.VERSION_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.NEW_VER_DESC|htmlspecialchars|nl2br}">{$plugin.NEW_VERSION}</a></td>
+    <td style="text-align:center;"><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.NEW_VER_DESC|htmlspecialchars|nl2br}">{$plugin.NEW_VERSION}</a></td>
     <td style="text-align:center;"><a href="{$plugin.URL_UPDATE}" onclick="return confirm('{'plugins_confirm_upgrade'|@translate|@escape:javascript}');">{'plugins_auto_update'|@translate}</a>
       / <a href="{$plugin.URL_DOWNLOAD}">{'plugins_download'|@translate}</a></td>
   </tr>
@@ -54,7 +53,7 @@ jQuery().ready(function(){ldelim}
 {foreach from=$plugins_uptodate item=plugin name=plugins_loop}
   <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}">
     <td><a href="{$plugin.URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.NAME}</a></td>
-    <td style="text-align:center;">{$plugin.VERSION}</td>
+    <td style="text-align:center;"><a href="{$plugin.URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.NAME}|{$plugin.VER_DESC|htmlspecialchars|nl2br}">{$plugin.VERSION}</a></td>
   </tr>
 {/foreach}
 </table>

admin/template/goto/popuphelp.tpl

@@ -0,0 +1,12 @@
+<div id="content" class="content">
+{$HELP_CONTENT}
+</div> <!-- content -->
+
+<ul class="categoryActions">
+  <li>
+    <a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
+      <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/exit.png" class="button" alt="exit">
+    </a>
+  </li>
+</ul>
+

admin/template/goto/rating.tpl

@@ -46,7 +46,7 @@
   <td></td>
 </tr>
 {foreach from=$images item=image name=image}
-<tr valign="bottom" class="{if $smarty.foreach.image.index is odd}row1{else}row2{/if}">
+<tr valign="top" class="{if $smarty.foreach.image.index is odd}row1{else}row2{/if}">
   <td rowspan="{$image.NB_RATES_TOTAL+1}"><a href="{$image.U_URL}"><img src="{$image.U_THUMB}" alt="{$image.FILE}" title="{$image.FILE}"></a></td>
   <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.NB_RATES}/{$image.NB_RATES_TOTAL}</strong></td>
   <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.AVG_RATE}</strong></td>

admin/template/goto/site_manager.tpl

@@ -17,6 +17,7 @@
 {'remote_site_local_found'|@translate} {$local_listing.URL}
 {if isset($local_listing.CREATE)}
 <form action="{$F_ACTION}" method="post">
+  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
   <p>
     {'remote_site_local_create'|@translate}:
     <input type="hidden" name="no_check" value="1"/>
@@ -64,6 +65,7 @@
 {/if}
 
 <form action="{$F_ACTION}" method="post">
+  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
   <p>
     <label for="galleries_url" >{'site_create'|@translate}</label>
     <input type="text" name="galleries_url" id="galleries_url" />

admin/template/goto/site_update.tpl

@@ -1,5 +1,7 @@
 {* $Id$ *}
 
+{include file='include/resize.inc.tpl'}
+
 <div class="titrePage">
   <h2>{'title_update'|@translate}: <a href="{$SITE_URL}">{$SITE_URL}</a></h2>
 </div>
@@ -55,7 +57,7 @@
 {/if}
 
 {if isset($introduction)}
-<h3>{'update_default_title'|@translate}</h3>
+<h4>{'update_default_title'|@translate}</h4>
 <form action="" method="post" id="update">
 
 	<fieldset id="syncFiles">

admin/template/goto/tags.tpl

@@ -4,6 +4,7 @@
 </div>
 
 <form action="{$F_ACTION}" method="post">
+  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
 
   {if isset($EDIT_TAGS_LIST)}
   <fieldset>