update main.js

Author: playec

www/cgi-bin/pw.cgi

@@ -203,7 +203,7 @@ case "$task" in
 
             echo "Status: 400 Bad Request"
             echo ""
-            echo "{\"output\":\"Invalid token!\""
+            echo "{\"output\":\"Invalid token!\"}"
             exit 1
 
         fi
@@ -250,7 +250,7 @@ case "$task" in
 
             echo "Status: 400 Bad Request"
             echo ""
-            echo "{\"output\":\"Invalid token!\""
+            echo "{\"output\":\"Invalid token!\"}"
             exit 1
 
         fi
@@ -273,7 +273,7 @@ case "$task" in
 
             echo "Status: 400 Bad Request"
             echo ""
-            echo "{\"output\":\"Invalid token!\""
+            echo "{\"output\":\"Invalid token!\"}"
             exit 1
 
         fi
@@ -329,7 +329,7 @@ case "$task" in
 
             echo "Status: 400 Bad Request"
             echo ""
-            echo "{\"output\":\"Invalid token!\""
+            echo "{\"output\":\"Invalid token!\"}"
             exit 1
 
         fi
@@ -348,7 +348,7 @@ case "$task" in
 
             echo "Status: 400 Bad Request"
             echo ""
-            echo "{\"output\":\"Invalid token!\""
+            echo "{\"output\":\"Invalid token!\"}"
             exit 1
 
         fi
@@ -370,13 +370,18 @@ case "$task" in
     "remove")
 
         if ! [ "$token" = "$stoken" ]; then
-            rm -f /usr/bin/pppwn
-            rm -rf /root/*
-            rm -rf /www/pppwn
-            rm -f /www/pppwn.html
-            rm -f /www/cgi-bin/pw.cgi
-            echo "{\"output\":\"Uninstalled!\"}"
+             echo "Status: 400 Bad Request"
+             echo ""
+             echo "{\"output\":\"Invalid token!\"}"
+             exit 1
         fi
+
+        rm -f /usr/bin/pppwn
+        rm -rf /root/*
+        rm -rf /www/pppwn
+        rm -f /www/pppwn.html
+        rm -f /www/cgi-bin/pw.cgi
+        echo "{\"output\":\"Uninstalled!\"}"
 
     ;;
     "connect")
@@ -385,7 +390,7 @@ case "$task" in
 
             echo "Status: 400 Bad Request"
             echo ""
-            echo "{\"output\":\"Invalid token!\""
+            echo "{\"output\":\"Invalid token!\"}"
             exit 1
 
         fi
@@ -411,7 +416,7 @@ case "$task" in
 
             echo "Status: 400 Bad Request"
             echo ""
-            echo "{\"output\":\"Invalid token!\""
+            echo "{\"output\":\"Invalid token!\"}"
             exit 1
 
         fi

www/pppwn/main.js

@@ -137,11 +137,8 @@ var appView = Backbone.View.extend({
             }).then(function(){
                 document.cookie = 'token=; path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;';
                 $.modal.close();
-            }).catch(function(error){
-                $.modal.close();
-                $.modal(function(modal){
-                    modal.content(self.templates.msg({message: err.responseText}));
-                });
+            }).catch(function(err){
+                $.modal.content(self.templates.msg({message: err.responseJSON.output}));
             });
 
         },
@@ -169,10 +166,7 @@ var appView = Backbone.View.extend({
                     $.modal.close();
                 });
             }).catch(function(err){
-                $.modal.close();
-                $.modal(function(modal){
-                    modal.content(self.templates.msg({message: err.responseText}));
-                });
+                $.modal.content(self.templates.msg({message: err.responseJSON.output}));
             });
 
         },
@@ -190,13 +184,10 @@ var appView = Backbone.View.extend({
                     task:'remove',
                     token:this.webToken
                 }
-            }).then(function(){
-                location.assign('/');
+            }).then(function(res){
+                location.assign("/");
             }).catch(function(err){
-                $.modal.close();
-                $.modal(function(modal){
-                    modal.content(self.templates.msg({message: err.responseText}));
-                });
+                $.modal.content(self.templates.msg({message: err.responseJSON.output}));
             });
 
         },
@@ -259,7 +250,6 @@ var appView = Backbone.View.extend({
         }
 
         res.catch(function(err) {
-            $.modal.close();
             $.modal(function(modal){
                 modal.content(self.templates.msg({message: err.responseJSON.output}));
             });