Merge remote branch 'ether/develop' into translateplugins

doc/api/http_api.md

@@ -407,3 +407,12 @@ sends a custom message of type `msg` to the pad
 *Example returns:*
   * `{code: 0, message:"ok", data: {}}`
   * `{code: 1, message:"padID does not exist", data: null}`
+
+#### checkToken()
+ * API >= 1
+
+returns ok when api token is valid
+
+*Example returns:*
+  * `{"code":0,"message":"ok","data":null}`
+  * `{"code":4,"message":"no or wrong API Key","data":null}`

src/locales/en.ini

@@ -36,7 +36,7 @@ pad.settings.globalView = Global View
 pad.settings.language = Language:
 pad.importExport.import_export = Import/Export
 pad.importExport.import = Upload any text file or document
-pad.importExport.successful = Successful!
+pad.importExport.importSuccessful = Successful!
 pad.importExport.export = Export current pad as:
 pad.importExport.exporthtml = HTML
 pad.importExport.exportplain = Plain text

src/node/db/API.js

@@ -548,6 +548,19 @@ exports.sendClientsMessage = function (padID, msg, callback) {
   } );
 }
 
+/**
+checkToken() returns ok when api token is valid
+
+Example returns:
+
+{"code":0,"message":"ok","data":null}
+{"code":4,"message":"no or wrong API Key","data":null}
+*/
+exports.checkToken = function(callback)
+{
+  callback();
+}
+
 
 /******************************/
 /** INTERNAL HELPER FUNCTIONS */

src/node/handler/APIHandler.js

@@ -68,6 +68,7 @@ var version =
   , "isPasswordProtected"       : ["padID"]
   , "listAuthorsOfPad"          : ["padID"]
   , "padUsersCount"             : ["padID"]
+  , "checkToken"                : []
   }
 , "1.1":
   { "createGroup"               : []
@@ -102,6 +103,7 @@ var version =
   , "padUsers"                  : ["padID"]
   , "sendClientsMessage"        : ["padID", "msg"]
   , "listAllGroups"             : []
+  , "checkToken"                : []
   }
 };
 

src/templates/pad.html

@@ -42,7 +42,7 @@
               if(language) document.documentElement.lang = language[1];
             })();
         </script>
-        <script type="text/javascript" src="../static/js/l10n.js" async></script>
+        <script type="text/javascript" src="../static/js/l10n.js"></script>
 
         <% e.begin_block("styles"); %>
         <link href="../static/css/pad.css" rel="stylesheet">
@@ -266,7 +266,7 @@
                         <div class="importmessage" id="importmessagefail"></div>
                     </div>
                     <div id="import"></div>
-                    <div class="importmessage" id="importmessagesuccess" data-l10n-id="pad.importExport.successful"></div>
+                    <div class="importmessage" id="importmessagesuccess" data-l10n-id="pad.importExport.importSuccessful"></div>
                     <div class="importformdiv" id="importformsubmitdiv">
                         <input type="hidden" name="padId" value="blpmaXT35R">
                         <span class="nowrap">

src/templates/timeslider.html

@@ -41,7 +41,7 @@
       if(language) document.documentElement.lang = language[1];
     })();
   </script>
-  <script type="text/javascript" src="../../static/js/l10n.js" async></script>
+  <script type="text/javascript" src="../../static/js/l10n.js"></script>
   <link rel="stylesheet" href="../../static/css/pad.css">
   <link rel="stylesheet" href="../../static/css/timeslider.css">
   <link rel="stylesheet" href="../../static/custom/timeslider.css">