3 files changed, 39 insertions, 69 deletions

diff --git a/admin/group_list.php b/admin/group_list.php
index 2d8bbfbee..c6a8ecf36 100644
--- a/admin/group_list.php
+++ b/admin/group_list.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | file          : $Id$
 // | last update   : $Date$
@@ -154,10 +154,10 @@ UPDATE '.GROUPS_TABLE.'
 
 $template->set_filenames(array('group_list' => 'admin/group_list.tpl'));
 
-$template->assign_vars(
+$template->assign(
   array(
-    'F_ADD_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=group_list',
-    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=group_list',
+    'F_ADD_ACTION' => get_root_url().'admin.php?page=group_list',
+    'U_HELP' => get_root_url().'popuphelp.php?page=group_list',
     )
   );
 
@@ -172,13 +172,12 @@ SELECT id, name, is_default
 ;';
 $result = pwg_query($query);
 
-$admin_url = PHPWG_ROOT_PATH.'admin.php?page=';
+$admin_url = get_root_url().'admin.php?page=';
 $perm_url    = $admin_url.'group_perm&group_id=';
 $del_url     = $admin_url.'group_list&delete=';
 $members_url = $admin_url.'user_list&group=';
 $toggle_is_default_url     = $admin_url.'group_list&toggle_is_default=';
 
-$num = 0;
 while ($row = mysql_fetch_array($result))
 {
   $query = '
@@ -188,10 +187,9 @@ SELECT COUNT(*)
 ;';
   list($counter) = mysql_fetch_row(pwg_query($query));
   
-  $template->assign_block_vars(
-    'group',
+  $template->append(
+    'groups',
     array(
-      'CLASS' => ($num++ % 2 == 1) ? 'row2' : 'row1',
       'NAME' => $row['name'],
       'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('is_default_group').']' : ''),
       'MEMBERS' => l10n_dec('%d member', '%d members', $counter),
diff --git a/admin/group_perm.php b/admin/group_perm.php
index c73bfbdd6..27e0e9e38 100644
--- a/admin/group_perm.php
+++ b/admin/group_perm.php
@@ -2,10 +2,9 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -132,7 +131,7 @@ $template->set_filenames(
     )
   );
 
-$template->assign_vars(
+$template->assign(
   array(
     'TITLE' =>
       sprintf(
@@ -142,10 +141,9 @@ $template->assign_vars(
         ),
     'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
     'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
-    'L_CAT_OPTIONS_INFO'=>l10n('permuser_info'),
 
     'F_ACTION' =>
-        PHPWG_ROOT_PATH.
+        get_root_url().
         'admin.php?page=group_perm&group_id='.
         $page['group']
     )
diff --git a/admin/site_manager.php b/admin/site_manager.php
index 6f848e782..7676c3091 100644
--- a/admin/site_manager.php
+++ b/admin/site_manager.php
@@ -2,10 +2,9 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -50,15 +49,14 @@ function remote_output($url)
 
   if($lines = @file($url))
   {
-    $template->assign_block_vars('remote_output', array());
     // cleaning lines from HTML tags
     foreach ($lines as $line)
     {
       $line = trim(strip_tags($line));
       if (preg_match('/^PWG-([A-Z]+)-/', $line, $matches))
       {
-        $template->assign_block_vars(
-          'remote_output.remote_line',
+        $template->append(
+          'remote_output',
           array(
             'CLASS' => 'remote'.ucfirst(strtolower($matches[1])),
             'CONTENT' => $line
@@ -117,7 +115,7 @@ 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))
+        if ( ($lines = @file($clf_url)) !== false)
         {
           $first_line = strip_tags($lines[0]);
           if (!preg_match('/^PWG-INFO-2:/', $first_line))
@@ -176,21 +174,18 @@ SELECT galleries_url
     case 'generate' :
     {
       $title = $galleries_url.' : '.l10n('remote_site_generate');
-      $template->assign_vars(array('REMOTE_SITE_TITLE'=>$title));
       remote_output($galleries_url.'create_listing_file.php?action=generate');
       break;
     }
     case 'test' :
     {
       $title = $galleries_url.' : '.l10n('remote_site_test');
-      $template->assign_vars(array('REMOTE_SITE_TITLE'=>$title));
       remote_output($galleries_url.'create_listing_file.php?action=test&version='.PHPWG_VERSION);
       break;
     }
     case 'clean' :
     {
       $title = $galleries_url.' : '.l10n('remote_site_clean');
-      $template->assign_vars(array('REMOTE_SITE_TITLE'=>$title));
       remote_output($galleries_url.'create_listing_file.php?action=clean');
       break;
     }
@@ -204,9 +199,9 @@ SELECT galleries_url
   }
 }
 
-$template->assign_vars( array(
-  'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=site_manager',
-  'F_ACTION' => PHPWG_ROOT_PATH.'admin.php'
+$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') )
   ) );
 
@@ -235,10 +230,6 @@ SELECT s.*, COUNT(c.id) AS nb_categories, SUM(c.nb_images) AS nb_images
 ';';
 $result = pwg_query($query);
 
-if (mysql_num_rows($result) > 0)
-{
-  $template->assign_block_vars('sites', array());
-}
 while ($row = mysql_fetch_array($result))
 {
   $is_remote = url_is_remote($row['galleries_url']);
@@ -250,78 +241,61 @@ while ($row = mysql_fetch_array($result))
   $update_url = PHPWG_ROOT_PATH.'admin.php';
   $update_url.= '?page=site_update';
   $update_url.= '&site='.$row['id'];
-  $template->assign_block_vars(
-    'sites.site',
+  
+  $tpl_var =
     array(
       'NAME' => $row['galleries_url'],
       'TYPE' => l10n( $is_remote ? 'site_remote' : 'site_local' ),
       'CATEGORIES' => $row['nb_categories'],
       'IMAGES' => isset($row['nb_images']) ? $row['nb_images'] : 0,
       'U_SYNCHRONIZE' => $update_url
-     )
-   );
+     );
+     
    if ($is_remote)
    {
-     $template->assign_block_vars('sites.site.remote',
+     $tpl_var['remote'] =
        array(
          'U_TEST' => $base_url.'test',
          'U_GENERATE' => $row['galleries_url'].'create_listing_file.php?action=generate',
          'U_CLEAN' => $base_url.'clean',
-         )
-       );
+         );
    }
 
   if ($row['id'] != 1)
   {
-    $template->assign_block_vars( 'sites.site.delete',
-      array('U_DELETE' => $base_url.'delete') );
+    $tpl_var['U_DELETE'] = $base_url.'delete';
   }
 
+  $plugin_links = array();
+  //$plugin_links is array of array composed of U_HREF, U_HINT & U_CAPTION
+  $plugin_links =
+    trigger_event('get_admins_site_links',
+      $plugin_links, $row['id'], $is_remote);
+  $tpl_var['plugin_links'] = $plugin_links;
+
+  $template->append('sites', $tpl_var);
+
   if ( isset($local_listing_site_url) and
        $row['galleries_url']==$local_listing_site_url )
   {
     $local_listing_site_id = $row['id'];
-    $template->assign_block_vars( 'local_listing',
+    $template->assign( 'local_listing',
         array(
           'URL' =>  $local_listing_site_url,
+          'U_SYNCHRONIZE' => $update_url.'&local_listing=1'
         )
       );
-
-    $template->assign_block_vars( 'local_listing.update',
-          array(
-            'U_SYNCHRONIZE' => $update_url.'&local_listing=1'
-            )
-        );
   }
-  
-  $plugin_links = array();
-  //$plugin_links is array of array composed of U_HREF, U_HINT & U_CAPTION
-  $plugin_links = 
-    trigger_event('get_admins_site_links',
-      $plugin_links, $row['id'], $is_remote);
-
-  // plugin_links
-  if (count($plugin_links) > 0)
-  {
-    foreach ($plugin_links as $plugin_link)
-    {
-      $template->assign_block_vars('sites.site.plugin_links.plugin_link', $plugin_link);
-    }
-  }
-
 }
 
 if ( isset($local_listing_site_url) and !isset($local_listing_site_id) )
 {
-  $template->assign_block_vars( 'local_listing',
+  $template->assign( 'local_listing',
       array(
         'URL' =>  $local_listing_site_url,
+        'CREATE' => true
       )
     );
-
-  $template->assign_block_vars( 'local_listing.create',
-        array('NAME' => $local_listing_site_url)
-      );
 }