Changeset 9350 for extensions/AdditionalPages/additional_page.php

Timestamp:

Feb 22, 2011, 3:50:46 PM (14 years ago)

Author:

patdenice

Message:

Extended description now work on page title.
Language restriction is now optionnal.

File:

• extensions/AdditionalPages/additional_page.php (modified) (5 diffs)

extensions/AdditionalPages/additional_page.php

@@ -29 +29 @@
 $identifier = $page['ap_homepage'] ? $conf['AP']['homepage'] : $tokens[1];
 
-if (function_exists('get_extended_desc'))
-  add_event_handler('AP_render_content', 'get_extended_desc');
-
 // Retrieve page data
-$query = 'SELECT id, title , content, users, groups, level, permalink, standalone
+$query = 'SELECT id, title, lang, content, users, groups, level, permalink, standalone
 FROM ' . ADD_PAGES_TABLE . '
 ';
@@ -58 +55 @@
 if (!is_admin() or (!is_admin() xor $page['ap_homepage']))
 {
+  // authorized language
+  if (!empty($row['lang']) and $row['lang'] != $user['language'])
+  {
+    if ($page['ap_homepage'] and check_random_index_redirect()) return;
+    page_forbidden(l10n('You are not authorized to access the requested page'), make_index_url());
+  }
+
   // authorized level
   if ($user['level'] < $row['level'])
   {
     if ($page['ap_homepage'] and check_random_index_redirect()) return;
-    page_forbidden(l10n('You are not authorized to access the requested page'));
+    page_forbidden(l10n('You are not authorized to access the requested page'), make_index_url());
   }
 
@@ -72 +76 @@
     {
       if ($page['ap_homepage'] and check_random_index_redirect()) return;
-      page_forbidden(l10n('You are not authorized to access the requested page'));
+      page_forbidden(l10n('You are not authorized to access the requested page'), make_index_url());
     }
   }
@@ -88 +92 @@
     {
       if ($page['ap_homepage'] and check_random_index_redirect()) return;
-      page_forbidden(l10n('You are not authorized to access the requested page'));
+      page_forbidden(l10n('You are not authorized to access the requested page'), make_index_url());
     }
   }
@@ -106 +110 @@
   'id' => $row['id'],
   'permalink' => @$row['permalink'],
-  'title' => trigger_event('AP_render_content', $row['title']),
+  'title' => trigger_event('AP_render_title', $row['title']),
   'content' => trigger_event('AP_render_content', $row['content']),
 );