Integration of PHP backend with /beta and /gamma front ends

Fixed PHP backend and /beta code to handle request and data format compatible with /gamma.
At the moment adding/deleting/editing records seem to work fine.

1 files changed, 13 insertions, 6 deletions

diff --git a/frontend/gamma/js/Clipperz/Async.js b/frontend/gamma/js/Clipperz/Async.js
index 7c9d783..97d8ecf 100644
--- a/frontend/gamma/js/Clipperz/Async.js
+++ b/frontend/gamma/js/Clipperz/Async.js
@@ -1,216 +1,222 @@
 /*
 
 Copyright 2008-2011 Clipperz Srl
 
 This file is part of Clipperz Community Edition.
 Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
 * Clipperz Community Edition is free software: you can redistribute
   it and/or modify it under the terms of the GNU Affero General Public
   License as published by the Free Software Foundation, either version
   3 of the License, or (at your option) any later version.
 
 * Clipperz Community Edition is distributed in the hope that it will
   be useful, but WITHOUT ANY WARRANTY; without even the implied
   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
   License along with Clipperz Community Edition.  If not, see
   <http://www.gnu.org/licenses/>.
 
 */
 
 //Clipperz.Async = MochiKit.Async;
 
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.Async) == 'undefined') { Clipperz.Async = {}; }
 
 Clipperz.Async.VERSION = "0.1";
 Clipperz.Async.NAME = "Clipperz.Async";
 
 Clipperz.Async.Deferred = function(aName, args) {
         args = args || {};
 
         Clipperz.Async.Deferred.superclass.constructor.call(this, args.canceller);
 
         this._args = args;
         this._name = aName || "Anonymous deferred";
         this._count = 0;
         this._shouldTrace = ((CLIPPERZ_DEFERRED_TRACING_ENABLED === true) || (args.trace === true));
         this._vars = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.Async.Deferred, MochiKit.Async.Deferred, {
 
         'name': function () {
                 return this._name;
         },
 
         'args': function () {
                 return this._args;
         },
 
         //-----------------------------------------------------------------------------
 
         'callback': function (aValue) {
                 if (this._shouldTrace) {
-                        Clipperz.log("CALLBACK " + this._name, aValue);
+                        //Clipperz.log("CALLBACK " + this._name, aValue);
+                        console.log("CALLBACK " + this._name, aValue);
                 }
 
                 if (this.chained == false) {
                         var message;
                         
                         message = "ERROR [" + this._name + "]";
                         this.addErrback(function(aResult) {
                                 if (! (aResult instanceof MochiKit.Async.CancelledError)) {
                                         Clipperz.log(message, aResult);
                                 }
                                 return aResult;
                         });
 
                         if (this._shouldTrace) {
                                 var resultMessage;
 
                                 resultMessage = "RESULT   " + this._name + " <==";
         //                      this.addCallback(function(aResult) {
                                 Clipperz.Async.Deferred.superclass.addCallback.call(this, function(aResult) {
-                                        Clipperz.log(resultMessage, aResult);
+                                        //Clipperz.log(resultMessage, aResult);
+                                        console.log(resultMessage, aResult);
 
                                         return aResult;
                                 });
                         }
                 }
 
                 if (CLIPPERZ_DEFERRED_CALL_LOGGING_ENABLED === true) {
                         Clipperz.log("callback " + this._name, this);
                 }
 
                 return Clipperz.Async.Deferred.superclass.callback.apply(this, arguments);
         },
 
         //-----------------------------------------------------------------------------
 
         'addCallback': function () {
                 var message;
                 
                 if (this._shouldTrace) {
                         this._count ++;
                         message = "[" + this._count + "] " + this._name + " ";
         //              this.addBoth(function(aResult) {Clipperz.log(message + "-->", aResult); return aResult;});
                         this.addCallbacks(
-                                function(aResult) {Clipperz.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
-                                function(aResult) {Clipperz.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
+                                //function(aResult) {Clipperz.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
+                                function(aResult) {console.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
+                                //function(aResult) {Clipperz.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
+                                function(aResult) {console.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
                         );
                 }
 
                 Clipperz.Async.Deferred.superclass.addCallback.apply(this, arguments);
 
                 if (this._shouldTrace) {
         //              this.addBoth(function(aResult) {Clipperz.log(message + "<--", aResult); return aResult;});
                         this.addCallbacks(
-                                function(aResult) {Clipperz.log("-OK- " + message + "<--", aResult); return aResult;},
-                                function(aResult) {Clipperz.log("FAIL " + message + "<--", aResult); return aResult;}
+                                //function(aResult) {Clipperz.log("-OK- " + message + "<--", aResult); return aResult;},
+                                function(aResult) {console.log("-OK- " + message + "<--", aResult); return aResult;},
+                                //function(aResult) {Clipperz.log("FAIL " + message + "<--", aResult); return aResult;}
+                                function(aResult) {console.log("FAIL " + message + "<--", aResult); return aResult;}
                         );
                 }
         },
 
         //=============================================================================
 
         'addCallbackPass': function() {
                 var passFunction;
 
                 passFunction = MochiKit.Base.partial.apply(null, arguments);
 
                 this.addCallback(function() {
                         var result;
 
                         result = arguments[arguments.length -1];
                         passFunction();
 
                         return result;
                 });
         },
 
         //-----------------------------------------------------------------------------
 
         'addErrbackPass': function() {
                 var passFunction;
 
                 passFunction = MochiKit.Base.partial.apply(null, arguments);
 
                 this.addErrback(function() {
                         var result;
 
                         result = arguments[arguments.length -1];
                         passFunction();
 
                         return result;
                 });
         },
 
         //-----------------------------------------------------------------------------
 
         'addBothPass': function() {
                 var passFunction;
 
                 passFunction = MochiKit.Base.partial.apply(null, arguments);
 
                 this.addBoth(function() {
                         var result;
 
                         result = arguments[arguments.length -1];
                         passFunction();
 
                         return result;
                 });
         },
 
         //-----------------------------------------------------------------------------
 
         'addIf': function (aThenBlock, anElseBlock) {
                 this.addCallback(MochiKit.Base.bind(function (aValue) {
                         var deferredResult;
 
                         if (!MochiKit.Base.isUndefinedOrNull(aValue) && aValue) {
                                 deferredResult = Clipperz.Async.callbacks(this._name + " <then>", aThenBlock, null, aValue);
                         } else {
                                 deferredResult = Clipperz.Async.callbacks(this._name + " <else>", anElseBlock, null, aValue);
                         }
                         
                         return deferredResult;
                 }))
         },
 
         //-----------------------------------------------------------------------------
 
         'addMethod': function () {
                 this.addCallback(MochiKit.Base.method.apply(this, arguments));
         },
 
         //-----------------------------------------------------------------------------
 
         'addMethodcaller': function () {
                 this.addCallback(MochiKit.Base.methodcaller.apply(this, arguments));
         },
 
         //=============================================================================
 
         'addLog': function (aLog) {
                 if (CLIPPERZ_DEFERRED_LOGGING_ENABLED) {
                         this.addBothPass(function(res) {Clipperz.log(aLog + " ", res);});
         //              this.addBothPass(function(res) {console.log(aLog + " ", res);});
                 }
         },
 
         //=============================================================================
         
         'acquireLock': function (aLock) {
         //      this.addCallback(function (aResult) {
@@ -313,192 +319,193 @@ Clipperz.Async.DeferredSynchronizer = function(aName, someMethods) {
                                 result = MochiKit.Async.fail(someResults);
                         }
                 } else {
                         result = MochiKit.Async.fail(cancels[0]);
                 }
 
                 return result;
         }/*, this._methodResults */);
         
         return this;
 }
 
 MochiKit.Base.update(Clipperz.Async.DeferredSynchronizer.prototype, {
 
         //-----------------------------------------------------------------------------
 
         'name': function() {
                 return this._name;
         },
 
         //-----------------------------------------------------------------------------
 
         'methods': function() {
                 return this._methods;
         },
         
         'methodResults': function() {
                 return this._methodResults;
         },
 
         //-----------------------------------------------------------------------------
 
         'result': function() {
                 return this._result;
         },
 
         //-----------------------------------------------------------------------------
 
         'numberOfMethodsDone':function() {
                 return this._numberOfMethodsDone;
         },
 
         'incrementNumberOfMethodsDone': function() {
                 this._numberOfMethodsDone ++;
         },
 
         //-----------------------------------------------------------------------------
         
         'run': function(args, aValue) {
                 var deferredResults;
                 var i, c;
                 
                 deferredResults = [];
                 args = args || {};
 
                 c = this.methods().length;
                 for (i=0; i<c; i++) {
                         var deferredResult;
                                 varmethodCalls;
                         var ii, cc;
 
 //console.log("TYPEOF", typeof(this.methods()[i]));
                         if (typeof(this.methods()[i]) == 'function') {
                                 methodCalls = [ this.methods()[i] ];
                         } else {
                                 methodCalls = this.methods()[i];
                         }
                         
                         cc = methodCalls.length;
                         deferredResult = new Clipperz.Async.Deferred("Clipperz.Async.DeferredSynchronizer.run => " + this.name() + "[" + i + "]", args);
                         for (ii=0; ii<cc; ii++) {
                                 deferredResult.addCallback(methodCalls[ii]);
                         }
                         deferredResult.addBoth(MochiKit.Base.method(this, 'handleMethodCallDone', i));
 
                         deferredResults.push(deferredResult);
                 }
                 
                 for (i=0; i<c; i++) {
                         deferredResults[i].callback(aValue);
                 }
                 
                 return this.result();
         },
         
         //-----------------------------------------------------------------------------
 
         'handleMethodCallDone': function(anIndexValue, aResult) {
                 this.incrementNumberOfMethodsDone();
                 this.methodResults()[anIndexValue] = aResult;
                 
                 if (this.numberOfMethodsDone() < this.methods().length) {
                                 //nothing to do here other than possibly log something
                 } else if (this.numberOfMethodsDone() == this.methods().length) {
                         this.result().callback();
                 } else if (this.numberOfMethodsDone() > this.methods().length) {
+                        alert("Clipperz.Async.Deferred.handleMethodCallDone -> WTF!");
                                 //WTF!!! :(
                 }
                 
         },
 
         //-----------------------------------------------------------------------------
 
         __syntaxFix__: "syntax fix"
 });
 
 //#############################################################################
 
 MochiKit.Base.update(Clipperz.Async, {
 
         'callbacks': function (aName, someFunctions, someArguments, aCallbackValue) {
                 var deferredResult;
                 var i, c;
                 
                 deferredResult = new Clipperz.Async.Deferred(aName, someArguments);
                 c = someFunctions.length;
                 for (i=0; i<c; i++) {
                         deferredResult.addCallback(someFunctions[i]);
                 }
                 deferredResult.callback(aCallbackValue);
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'forkAndJoin': function (aName, someMethods, args) {
                 return MochiKit.Base.partial(function (aName, someMethods, args, aValue) {
                         var synchronizer;
                                 varresult;
                 
                         args = args || {};
                         synchronizer = new Clipperz.Async.DeferredSynchronizer(aName, someMethods);
                         result = synchronizer.run(args, aValue);
                 
                         return result;
                 }, aName, someMethods, args);
         },
         
         //-------------------------------------------------------------------------
 
         'collectResults': function(aName, someRequests, args) {
                 return MochiKit.Base.partial(function(aName, someRequests, args, aValue) {
                         var deferredResult;
                         var requestKeys;
                         var methods;
 
                         requestKeys = MochiKit.Base.keys(someRequests);
                         methods = MochiKit.Base.values(someRequests);
 
                         deferredResult = new Clipperz.Async.Deferred(aName, args);
                         deferredResult.addCallback(Clipperz.Async.forkAndJoin(aName + " [inner forkAndJoin]", methods, args));
                         deferredResult.addBoth(function(someResults) {
                                 var returnFunction;
                                 var results;
                                 var i,c;
                                 var result;
 
                                 if (someResults instanceof MochiKit.Async.CancelledError) {
                                         returnFunction = MochiKit.Async.fail;
                                         result = someResults;
                                 } else {
                                         if (someResults instanceof Error) {
                                                 returnFunction = MochiKit.Async.fail;
                                                 results = someResults['message'];
                                         } else {
                                                 returnFunction = MochiKit.Async.succeed;
                                                 results = someResults;
                                         }
 
                                         result = {};
                         
                                         c = requestKeys.length;
                                         for (i=0; i<c; i++) {
                                                 result[requestKeys[i]] = results[i];
                                         }
                                 } 
 
                                 return returnFunction.call(null, result);
                         });
                         deferredResult.callback(aValue);
                 
                         return deferredResult;
                 }, aName, someRequests, args);
         },
 
         //-------------------------------------------------------------------------
 
         'collectAll': function (someDeferredObjects) {
                 var deferredResult;
                 
                 deferredResult = new MochiKit.Async.DeferredList(someDeferredObjects, false, false, false);