Changeset 27042 for extensions/linked_pages/include/functions.inc.php

Timestamp:

Jan 29, 2014, 9:31:33 PM (10 years ago)

Author:

mistic100

Message:

update for Piwigo 2.6 + use underscore for admin

File:

• extensions/linked_pages/include/functions.inc.php (modified) (6 diffs)

extensions/linked_pages/include/functions.inc.php

@@ -25 +25 @@
   global $page, $user, $template, $conf;
   
-  if ( isset($page['section']) and $page['section']=='categories' and isset($page['category']) )
+  if (isset($page['section']) and $page['section']=='categories' and isset($page['category']))
   {
     $where_clauses = array('category_id = '.$page['category']['id']);
@@ -50 +50 @@
   WHERE user_id = '.$user['id'].'
 ;';
-        $user_groups = array_from_query($query, 'group_id');
+        $user_groups = query2array($query, null, 'group_id');
       }
     }
@@ -78 +78 @@
     while ($row = pwg_db_fetch_assoc($result))
     {
-      if ( !is_admin() and $conf['AP']['group_perm'] and !empty($row['groups']) )
+      if (!is_admin() and $conf['AP']['group_perm'] and !empty($row['groups']))
       {
         $authorized = false;
@@ -91 +91 @@
         if (!$authorized) continue;
       }
-        
       
       $row['U_PAGE'] = make_index_url(array('section'=>'page')).'/'.(isset($row['permalink']) ? $row['permalink'] : $row['page_id']);
@@ -99 +98 @@
     
     $template->assign('LINKEDPAGES_PATH', LINKEDPAGES_PATH);
-    $template->set_prefilter('index', 'linked_pages_prefilter_index');
+    $template->set_filename('linked_pages_content', realpath(LINKEDPAGES_PATH . 'template/index_menu.tpl'));
+    $template->assign('PLUGIN_INDEX_CONTENT_BEGIN', $template->parse('linked_pages_content',true).$template->get_template_vars('PLUGIN_INDEX_CONTENT_BEGIN'));
     
   }
-  else if ( isset($page['section']) and $page['section']=='additional_page' and isset($page['additional_page']) )
+  else if (isset($page['section']) and $page['section']=='additional_page' and isset($page['additional_page']))
   {
     $where_clauses = array('page_id = '.$page['additional_page']['id']);
@@ -150 +150 @@
   }
 }
-
-function linked_pages_prefilter_index($content)
-{
-  $search = '#(</div>{\* <!-- titrePage --> \*}|<div id="subcontent">|<div class="subcontent">)#';
-  $replace = "$1\n".file_get_contents(LINKEDPAGES_PATH . 'template/index_menu.tpl');
-  return preg_replace($search, $replace, $content);
-}
-
-
-?>