Changeset 6410 for branches/2.1/include/section_init.inc.php

Timestamp:

May 28, 2010, 9:55:03 PM (14 years ago)

Author:

rvelices

Message:

• merged the linkroot integration with the existing gallery_url (unique $confgallery_url used for RSS, mail homepage root in the browse path)
• added an option $confdebug_mail - if set all outgoing mails are saved into local_data_dir

File:

• branches/2.1/include/section_init.inc.php (modified) (11 diffs)

branches/2.1/include/section_init.inc.php

@@ -220 +220 @@
 if ('categories' == $page['section'])
 {
-  $page['title'] = '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>';
-
   if (isset($page['category']))
   {
@@ -233 +231 @@
               'main_page_category_description'
             ),
-        'title'             =>
-          $page['title'].$conf['level_separator'].get_cat_display_name($page['category']['upper_names'], '', false),
-        )
-      );
-  }
+        'title'             => get_cat_display_name($page['category']['upper_names'], '', false),
+        )
+      );
+  }
+  else
+    $page['title'] = ''; // will be set later
 
   if
@@ -337 +336 @@
       $page,
       array(
-        'title' => '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>'.$conf['level_separator'].get_tags_content_title(),
+        'title' => get_tags_content_title(),
         'items' => $items,
         )
@@ -359 +358 @@
       array(
         'items' => $search_result['items'],
-        'title' => '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.duplicate_index_url(array('start'=>0)).'">'
+        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
                   .l10n('Search results').'</a>',
         )
@@ -374 +373 @@
       $page,
       array(
-        'title' => '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>'.$conf['level_separator'].l10n('Favorites')
-            )
+        'title' => l10n('Favorites')
+      )
     );
 
@@ -454 +453 @@
       $page,
       array(
-        'title' => '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.duplicate_index_url(array('start'=>0)).'">'
+        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
                   .l10n('Recent pictures').'</a>',
         'items' => array_from_query($query, 'id'),
@@ -468 +467 @@
       $page,
       array(
-        'title' => '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>'.$conf['level_separator'].l10n('Recent categories'),
+        'title' => l10n('Recent categories'),
         )
       );
@@ -492 +491 @@
       $page,
       array(
-        'title' => '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.duplicate_index_url(array('start'=>0)).'">'
+        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
                   .$conf['top_number'].' '.l10n('Most visited').'</a>',
         'items' => array_from_query($query, 'id'),
@@ -518 +517 @@
       $page,
       array(
-        'title' => '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.duplicate_index_url(array('start'=>0)).'">'
+        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
                   .$conf['top_number'].' '.l10n('Best rated').'</a>',
         'items' => array_from_query($query, 'id'),
@@ -541 +540 @@
       $page,
       array(
-        'title' => '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.duplicate_index_url(array('start'=>0)).'">'
+        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
                     .l10n('Random pictures').'</a>',
         'items' => array_from_query($query, 'id'),
@@ -557 +556 @@
   include_once( PHPWG_ROOT_PATH.'include/functions_calendar.inc.php' );
   initialize_calendar();
+}
+
+// title update
+if (isset($page['title']))
+{
+  if (!empty($page['title']))
+        {
+          $page['title'] = $conf['level_separator'].$page['title'];
+        }
+  $page['title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'.$page['title'];
 }