author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2011-10-04 23:23:06 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2011-10-04 23:23:06 (UTC) |
commit | bf22713a7251a2b32700a67456a086a283dbe33a (patch) (unidiff) | |
tree | a56970d0131dace77edc68b122effe04db78f213 | |
parent | d6f7343c97ab28c88ade2b4e4edf0ac29f7c5117 (diff) | |
download | clipperz-bf22713a7251a2b32700a67456a086a283dbe33a.zip clipperz-bf22713a7251a2b32700a67456a086a283dbe33a.tar.gz clipperz-bf22713a7251a2b32700a67456a086a283dbe33a.tar.bz2 |
Fixed code indentation
-rw-r--r-- | backend/php/src/index.php | 6 | ||||
-rwxr-xr-x | frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js | 12 |
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 | |||
@@ -723,9 +723,9 @@ error_log("message"); | |||
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 | ||
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 | |||
@@ -238,12 +238,12 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, { | |||
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; |