summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--backend/php/src/index.php6
-rwxr-xr-xfrontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js12
2 files changed, 9 insertions, 9 deletions
diff --git a/backend/php/src/index.php b/backend/php/src/index.php
index 35752f4..58c10a9 100644
--- a/backend/php/src/index.php
+++ b/backend/php/src/index.php
@@ -702,46 +702,46 @@ error_log("message");
702 updateUserCredentials($parameters["parameters"]["credentials"], $user); 702 updateUserCredentials($parameters["parameters"]["credentials"], $user);
703 updateUserData($parameters["parameters"]["user"], $user); 703 updateUserData($parameters["parameters"]["user"], $user);
704 704
705 $otpList = $parameters["parameters"]["oneTimePasswords"]; 705 $otpList = $parameters["parameters"]["oneTimePasswords"];
706 foreach($otpList as $otpReference=>$otpData) { 706 foreach($otpList as $otpReference=>$otpData) {
707 $otpList = $otp->GetList(array(array("reference", "=", $otpReference))); 707 $otpList = $otp->GetList(array(array("reference", "=", $otpReference)));
708 $currentOtp = $otpList[0]; 708 $currentOtp = $otpList[0];
709 $currentOtp->data = $otpData; 709 $currentOtp->data = $otpData;
710 $currentOtp->Save(); 710 $currentOtp->Save();
711 } 711 }
712 712
713 $user->Save(); 713 $user->Save();
714 714
715 $result["lock"] = $user->lock; 715 $result["lock"] = $user->lock;
716 $result["result"] = "done"; 716 $result["result"] = "done";
717 717
718 //============================================================= 718 //=============================================================
719 } else if ($message == "echo") { 719 } else if ($message == "echo") {
720 $result["result"] = $parameters; 720 $result["result"] = $parameters;
721 } 721 }
722 722
723 //============================================================= 723 //=============================================================
724 } else if (isset($_SESSION['K'])) { 724 } else if (isset($_SESSION['K'])) {
725 $result["error"] = "Wrong shared secret!"; 725 $result["error"] = "Wrong shared secret!";
726 } else { 726 } else {
727 $result["result"] = "EXCEPTION"; 727 $result["result"] = "EXCEPTION";
728 $result["message"] = "Trying to communicate without an active connection"; 728 $result["message"] = "Trying to communicate without an active connection";
729 } 729 }
730 break; 730 break;
731 731
732 case "logout": 732 case "logout":
733error_log("logout"); 733error_log("logout");
734 session_destroy(); 734 session_destroy();
735 break; 735 break;
736 736
737 default: 737 default:
738error_log("default"); 738error_log("default");
739 $result["result"] = $parameters; 739 $result["result"] = $parameters;
740 break; 740 break;
741 } 741 }
742 742
743 session_write_close(); 743 session_write_close();
744 744
745 echo(json_encode($result)); 745 echo(json_encode($result));
746error_log("result: ".json_encode($result)); 746error_log("result: ".json_encode($result));
747?> 747?>
diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
index 6a4f637..6185fd6 100755
--- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
+++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
@@ -217,49 +217,49 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, {
217//MochiKit.Logging.logDebug("<<< Proxy.PHP.sendRemoteMessage - result: " + deferredResult); 217//MochiKit.Logging.logDebug("<<< Proxy.PHP.sendRemoteMessage - result: " + deferredResult);
218 218
219 return deferredResult; 219 return deferredResult;
220*/ 220*/
221 221
222 vardeferredResult; 222 vardeferredResult;
223 var parameters; 223 var parameters;
224 224
225//MochiKit.Logging.logDebug(">>> Proxy.PHP.sendRemoteMessage('" + aFunctionName + "', " + Clipperz.Base.serializeJSON(someParameters) + ") - " + this); 225//MochiKit.Logging.logDebug(">>> Proxy.PHP.sendRemoteMessage('" + aFunctionName + "', " + Clipperz.Base.serializeJSON(someParameters) + ") - " + this);
226 parameters = {}; 226 parameters = {};
227 parameters['method'] = aFunctionName; 227 parameters['method'] = aFunctionName;
228 // parameters['version'] = someParameters['version']; 228 // parameters['version'] = someParameters['version'];
229 // parameters['message'] = someParameters['message']; 229 // parameters['message'] = someParameters['message'];
230 parameters['parameters'] = Clipperz.Base.serializeJSON(someParameters); 230 parameters['parameters'] = Clipperz.Base.serializeJSON(someParameters);
231//MochiKit.Logging.logDebug("--- Proxy.PHP.sendRemoteMessage('" + Clipperz.Base.serializeJSON(parameters) + ") - " + this); 231//MochiKit.Logging.logDebug("--- Proxy.PHP.sendRemoteMessage('" + Clipperz.Base.serializeJSON(parameters) + ") - " + this);
232 deferredResult = new MochiKit.Async.Deferred(); 232 deferredResult = new MochiKit.Async.Deferred();
233 deferredResult.addCallback(MochiKit.Async.doXHR, "./php/index.php", { 233 deferredResult.addCallback(MochiKit.Async.doXHR, "./php/index.php", {
234 method:'POST', 234 method:'POST',
235 sendContent:MochiKit.Base.queryString(parameters), 235 sendContent:MochiKit.Base.queryString(parameters),
236 headers:{"Content-Type":"application/x-www-form-urlencoded"} 236 headers:{"Content-Type":"application/x-www-form-urlencoded"}
237 }); 237 });
238//deferredResult.addCallback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - 2: " + res.responseText); return res;}); 238//deferredResult.addCallback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - 2: " + res.responseText); return res;});
239//deferredResult.addErrback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - ERROR: " + res); return res;}); 239//deferredResult.addErrback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - ERROR: " + res); return res;});
240 deferredResult.addCallback(MochiKit.Async.evalJSONRequest); 240 deferredResult.addCallback(MochiKit.Async.evalJSONRequest);
241 deferredResult.addCallback(function (someValues) { 241 deferredResult.addCallback(function (someValues) {
242 if (someValues['result'] == 'EXCEPTION') { 242 if (someValues['result'] == 'EXCEPTION') {
243 throw someValues['message']; 243 throw someValues['message'];
244 } 244 }
245 return someValues; 245 return someValues;
246 }) 246 })
247 deferredResult.callback(); 247 deferredResult.callback();
248 248
249 return deferredResult; 249 return deferredResult;
250 }, 250 },
251 251
252 //========================================================================= 252 //=========================================================================
253 253
254 'isReadOnly': function() { 254 'isReadOnly': function() {
255 return false; 255 return false;
256 }, 256 },
257 257
258 //========================================================================= 258 //=========================================================================
259 __syntaxFix__: "syntax fix" 259 __syntaxFix__: "syntax fix"
260 260
261}); 261});
262 262
263//============================================================================= 263//=============================================================================
264 264
265//Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.PHP("Proxy.PHP - async test"); 265//Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.PHP("Proxy.PHP - async test");