svn merge -r1366:1371 from branch 1.6 into trunk

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

1 files changed, 4 insertions, 264 deletions

diff --git a/index.php b/index.php
index c48242e68..474543a0d 100644
--- a/index.php
+++ b/index.php
@@ -168,24 +168,14 @@ else
     array('URL' => $url )
     );
 }
+// include menubar
+include(PHPWG_ROOT_PATH.'include/menubar.inc.php');
 
 $template->assign_vars(
   array(
-    'NB_PICTURE' => $user['nb_total_images'],
     'TITLE' => $template_title,
-    'USERNAME' => $user['username'],
-    'TOP_NUMBER' => $conf['top_number'],
-    'MENU_CATEGORIES_CONTENT' => get_categories_menu(),
-
-    'F_IDENTIFY' => get_root_url().'identification.php',
-    'T_RECENT' => $icon_recent,
-
-    'U_HOME' => make_index_URL(),
-    'U_REGISTER' => get_root_url().'register.php',
-    'U_LOST_PASSWORD' => get_root_url().'password.php',
-    'U_LOGOUT' => add_url_params(make_index_URL(), array('act'=>'logout') ),
-    'U_ADMIN'=> get_root_url().'admin.php',
-    'U_PROFILE'=> get_root_url().'profile.php',
+    'TOP_NUMBER' => $conf['top_number'],	// still used ?
+    'T_RECENT' => $icon_recent,			// still used ?
     )
   );
 
@@ -198,256 +188,6 @@ if ('search' == $page['section'])
       )
     );
 }
-//-------------------------------------------------------------- external links
-if (count($conf['links']) > 0)
-{
-  $template->assign_block_vars('links', array());
-
-  foreach ($conf['links'] as $url => $label)
-  {
-    $template->assign_block_vars(
-      'links.link',
-      array(
-        'URL' => $url,
-        'LABEL' => $label
-        )
-      );
-  }
-}
-//------------------------------------------------------------------------ tags
-if ('tags' == $page['section'])
-{
-  $template->assign_block_vars('tags', array());
-
-  // display tags associated to currently tagged items, less current tags
-  $tags = array();
-
-  if ( !empty($page['items']) )
-  {
-    $query = '
-SELECT tag_id, name, url_name, count(*) counter
-  FROM '.IMAGE_TAG_TABLE.'
-    INNER JOIN '.TAGS_TABLE.' ON tag_id = id
-  WHERE image_id IN ('.implode(',', $items).')
-    AND tag_id NOT IN ('.implode(',', $page['tag_ids']).')
-  GROUP BY tag_id
-  ORDER BY name ASC
-;';
-    $result = pwg_query($query);
-    while($row = mysql_fetch_array($result))
-    {
-      array_push($tags, $row);
-    }
-  }
-
-  $tags = add_level_to_tags($tags);
-
-  foreach ($tags as $tag)
-  {
-    $template->assign_block_vars(
-      'tags.tag',
-      array(
-        'URL_ADD' => make_index_URL(
-          array(
-            'tags' => array_merge(
-              $page['tags'],
-              array(
-                array(
-                  'id' => $tag['tag_id'],
-                  'url_name' => $tag['url_name'],
-                  ),
-                )
-              )
-            )
-          ),
-
-        'URL' => make_index_URL(
-          array(
-            'tags' => array(
-              array(
-                'id' => $tag['tag_id'],
-                'url_name' => $tag['url_name'],
-                ),
-              )
-            )
-          ),
-
-        'NAME' => $tag['name'],
-
-        'TITLE' => l10n('See pictures linked to this tag only'),
-
-        'TITLE_ADD' => sprintf(
-          l10n('%d pictures are also linked to current tags'),
-          $tag['counter']
-          ),
-
-        'CLASS' => 'tagLevel'.$tag['level']
-        )
-      );
-  }
-}
-//---------------------------------------------------------- special categories
-// favorites categories
-if ( !$user['is_the_guest'] )
-{
-  $template->assign_block_vars('username', array());
-
-  $template->assign_block_vars(
-    'special_cat',
-    array(
-      'URL' => make_index_URL(array('section' => 'favorites')),
-      'TITLE' => $lang['favorite_cat_hint'],
-      'NAME' => $lang['favorite_cat']
-      ));
-}
-// most visited
-$template->assign_block_vars(
-  'special_cat',
-  array(
-    'URL' => make_index_URL(array('section' => 'most_visited')),
-    'TITLE' => $lang['most_visited_cat_hint'],
-    'NAME' => $lang['most_visited_cat']
-    ));
-// best rated
-if ($conf['rate'])
-{
-  $template->assign_block_vars(
-    'special_cat',
-    array(
-      'URL' => make_index_URL(array('section' => 'best_rated')),
-      'TITLE' => $lang['best_rated_cat_hint'],
-      'NAME' => $lang['best_rated_cat']
-      )
-    );
-}
-// random
-$template->assign_block_vars(
-  'special_cat',
-  array(
-    'URL' => get_root_url().'random.php',
-    'TITLE' => $lang['random_cat_hint'],
-    'NAME' => $lang['random_cat']
-    ));
-// recent pics
-$template->assign_block_vars(
-  'special_cat',
-  array(
-    'URL' => make_index_URL(array('section' => 'recent_pics')),
-    'TITLE' => $lang['recent_pics_cat_hint'],
-    'NAME' => $lang['recent_pics_cat']
-    ));
-// recent cats
-$template->assign_block_vars(
-  'special_cat',
-  array(
-    'URL' => make_index_URL(array('section' => 'recent_cats')),
-    'TITLE' => $lang['recent_cats_cat_hint'],
-    'NAME' => $lang['recent_cats_cat']
-    ));
-
-// calendar
-$template->assign_block_vars(
-  'special_cat',
-  array(
-    'URL' =>
-      make_index_URL(
-        array(
-          'chronology_field' => ($conf['calendar_datefield']=='date_available'
-                                  ? 'posted' : 'created'),
-           'chronology_style'=> 'monthly',
-           'chronology_view' => 'calendar'
-        )
-      ),
-    'TITLE' => $lang['calendar_hint'],
-    'NAME' => $lang['calendar']
-    )
-  );
-//--------------------------------------------------------------------- summary
-
-if ($user['is_the_guest'])
-{
-  $template->assign_block_vars('register', array());
-  $template->assign_block_vars('login', array());
-
-  $template->assign_block_vars('quickconnect', array());
-  if ($conf['authorize_remembering'])
-  {
-    $template->assign_block_vars('quickconnect.remember_me', array());
-  }
-}
-else
-{
-  $template->assign_block_vars('hello', array());
-
-  if (is_autorize_status(ACCESS_CLASSIC))
-  {
-    $template->assign_block_vars('profile', array());
-  }
-
-  // the logout link has no meaning with Apache authentication : it is not
-  // possible to logout with this kind of authentication.
-  if (!$conf['apache_authentication'])
-  {
-    $template->assign_block_vars('logout', array());
-  }
-
-  if (is_admin())
-  {
-    $template->assign_block_vars('admin', array());
-  }
-}
-
-// tags link
-$template->assign_block_vars(
-  'summary',
-  array(
-    'TITLE' => l10n('See available tags'),
-    'NAME' => l10n('Tags'),
-    'U_SUMMARY'=> get_root_url().'tags.php',
-    )
-  );
-
-// search link
-$template->assign_block_vars(
-  'summary',
-  array(
-    'TITLE'=>$lang['hint_search'],
-    'NAME'=>$lang['search'],
-    'U_SUMMARY'=> get_root_url().'search.php',
-    'REL'=> 'rel="search"'
-    )
-  );
-
-// comments link
-$template->assign_block_vars(
-  'summary',
-  array(
-    'TITLE'=>$lang['hint_comments'],
-    'NAME'=>$lang['comments'],
-    'U_SUMMARY'=> get_root_url().'comments.php',
-    )
-  );
-
-// about link
-$template->assign_block_vars(
-  'summary',
-  array(
-    'TITLE'     => $lang['about_page_title'],
-    'NAME'      => $lang['About'],
-    'U_SUMMARY' => get_root_url().'about.php',
-    )
-  );
-
-// notification
-$template->assign_block_vars(
-  'summary',
-  array(
-    'TITLE'=>l10n('notification'),
-    'NAME'=>l10n('Notification'),
-    'U_SUMMARY'=> get_root_url().'notification.php',
-    'REL'=> 'rel="nofollow"'
-    )
-  );
 
 if (isset($page['category']) and is_admin())
 {