remake of Remote sites and synchronize: final integration and old cod…

…e cleanup fix: xml getAttribute always decodes html entities and added encodeAttribute function git-svn-id: http://piwigo.org/svn/trunk@1058 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Feb 28, 2006 · 4cd5b05 · 4cd5b05
1 parent d4646f3
commit 4cd5b05
Show file tree

Hide file tree

Showing 18 changed files with 1,760 additions and 3,415 deletions.
diff --git a/admin.php b/admin.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | 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-2006 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -81,7 +81,7 @@
     'U_CAT_VISIBLE'=> $opt_link.'visible',
     'U_CAT_STATUS'=> $opt_link.'status',
     'U_CAT_OPTIONS'=> $link_start.'cat_options',
-    'U_CAT_UPDATE'=> $link_start.'update',
+    'U_CAT_UPDATE'=> $link_start.'site_update&amp;site=1',
     'U_WAITING'=> $link_start.'waiting',
     'U_COMMENTS'=> $link_start.'comments',
     'U_RATING'=> $link_start.'rating',
@@ -105,7 +105,7 @@
       )
     );
 }
-  
+
 //------------------------------------------------------------- content display
 $page['errors'] = array();
 $page['infos']  = array();

diff --git a/admin/cat_modify.php b/admin/cat_modify.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | 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-2006 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -258,7 +258,6 @@
     array('CATEGORY_DIR'=>preg_replace('/\/$/',
                                        '',
                                        get_complete_dir($category['id']))));
-  $template->assign_block_vars('upload' ,array());
 }
 else
 {
@@ -300,7 +299,8 @@
     );
 }
 
-if (is_numeric($category['site_id']) and $category['site_id'] != 1)
+$category['cat_dir'] = get_complete_dir($_GET['cat_id']);
+if (is_numeric($category['site_id']) and url_is_remote($category['cat_dir']) )
 {
   $query = '
 SELECT galleries_url
@@ -311,6 +311,11 @@
   $template->assign_block_vars('server', array('SITE_URL' => $galleries_url));
 }
 
+if (!$category['is_virtual'] and !url_is_remote($category['cat_dir']) )
+{
+  $template->assign_block_vars('upload' ,array());
+}
+
 //----------------------------------------------------------- sending html code
 $template->assign_var_from_handle('ADMIN_CONTENT', 'categories');
 ?>