From 789f280d3e656f5e81253f32ef45c8bf506a0d46 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Paour Date: Sat, 30 Jul 2005 13:28:57 +0000 Subject: [PATCH] 2005-07-30 Pierre-Luc Paour (1.4.2-b23) * Now using the new format for the remote controller URL in G2. * G2 now supports album-properties. --- ChangeLog | 5 +++++ com/gallery/GalleryRemote/GalleryComm2.java | 4 ---- com/gallery/GalleryRemote/GalleryComm2_5.java | 13 ++++++++++--- defaults.properties | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 649b2e0..67013b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-07-30 Pierre-Luc Paour (1.4.2-b23) + + * Now using the new format for the remote controller URL in G2. + * G2 now supports album-properties. + 2005-07-30 Pierre-Luc Paour (1.4.2-b22) * Fixed setting of titles/summaries with G2. diff --git a/com/gallery/GalleryRemote/GalleryComm2.java b/com/gallery/GalleryRemote/GalleryComm2.java index 316c58c..26b86b8 100644 --- a/com/gallery/GalleryRemote/GalleryComm2.java +++ b/com/gallery/GalleryRemote/GalleryComm2.java @@ -196,10 +196,6 @@ public void albumInfo(StatusUpdate su, Album a, boolean async) { /** * Causes the GalleryComm instance to create a new album as a child of * the specified album (or at the root if album is null) - * - * @param su an instance that implements the StatusUpdate interface. - * @param a if null, create the album in the root of the gallery; otherwise - * create as a child of the given album */ public String newAlbum(StatusUpdate su, Album parentAlbum, String newAlbumName, String newAlbumTitle, diff --git a/com/gallery/GalleryRemote/GalleryComm2_5.java b/com/gallery/GalleryRemote/GalleryComm2_5.java index 0bc444a..5fc4d94 100644 --- a/com/gallery/GalleryRemote/GalleryComm2_5.java +++ b/com/gallery/GalleryRemote/GalleryComm2_5.java @@ -19,13 +19,14 @@ public class GalleryComm2_5 extends GalleryComm2 { private static final String MODULE = "GalComm2_5"; /** Remote scriptname that provides version 2 of the protocol on the server. */ - public static final String SCRIPT_NAME = "main.php?g2_controller=remote.GalleryRemote&g2_form[cmd]=no-op"; + public static final String SCRIPT_NAME = "main.php?g2_controller=remote:GalleryRemote&g2_form[cmd]=no-op"; public static final boolean ZEND_DEBUG = false; private static int[] capabilities2; private static int[] capabilities3; private static int[] capabilities4; + private static int[] capabilities6; protected GalleryComm2_5(Gallery g) { super(g); @@ -39,10 +40,14 @@ protected GalleryComm2_5(Gallery g) { capabilities4 = new int[]{CAPA_UPLOAD_FILES, CAPA_FETCH_ALBUMS, CAPA_UPLOAD_CAPTION, CAPA_FETCH_HIERARCHICAL/*, CAPA_ALBUM_INFO*/, CAPA_NEW_ALBUM, CAPA_FETCH_ALBUMS_PRUNE, CAPA_FETCH_ALBUM_IMAGES}; + capabilities6 = new int[]{CAPA_UPLOAD_FILES, CAPA_FETCH_ALBUMS, CAPA_UPLOAD_CAPTION, + CAPA_FETCH_HIERARCHICAL, CAPA_ALBUM_INFO, CAPA_NEW_ALBUM, CAPA_FETCH_ALBUMS_PRUNE, + CAPA_FETCH_ALBUM_IMAGES}; Arrays.sort(capabilities2); Arrays.sort(capabilities3); Arrays.sort(capabilities4); + Arrays.sort(capabilities6); g.setGalleryVersion(2); } @@ -73,7 +78,7 @@ public NVPair[] fudgeFormParameters(NVPair form_data[]) { } } - form_data_modified[form_data.length] = new NVPair("g2_controller", "remote.GalleryRemote"); + form_data_modified[form_data.length] = new NVPair("g2_controller", "remote:GalleryRemote"); if (ZEND_DEBUG) { form_data_modified[form_data.length + 1] = new NVPair("start_debug", "1"); @@ -91,7 +96,9 @@ public NVPair[] fudgeFormParameters(NVPair form_data[]) { } void handleCapabilities() { - if (serverMinorVersion >= 4) { + if (serverMinorVersion >= 6) { + capabilities = capabilities6; + } else if (serverMinorVersion >= 4) { capabilities = capabilities4; } else if (serverMinorVersion >= 3) { capabilities = capabilities3; diff --git a/defaults.properties b/defaults.properties index ebacaab..ea7beae 100644 --- a/defaults.properties +++ b/defaults.properties @@ -245,6 +245,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p # # --- Do not edit below this line --- # -version=1.4.2-b22 +version=1.4.2-b23 releaseDate=2005/07/30 aboutText=Gallery Remote\n \n \nA part of the Gallery Open-Source Project\nhttp://gallery.sourceforge.net\n \n \nMaintained by:\n \nPierre-Luc Paour\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\nAmedeo Paglione\nChris Schwerdt\nSeth Ladd\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor