Changeset 9935

Timestamp:

Mar 30, 2011, 12:14:02 PM (13 years ago)

Author:

patdenice

Message:

 

Location:

extensions/autoupdate/trunk

Files:

• ajax (deleted)
• main.inc.php (modified) (2 diffs)
• template/autoupdate.js (modified) (6 diffs)
• template/head.tpl (modified) (1 diff)
• ws_functions.inc.php (added)

extensions/autoupdate/trunk/main.inc.php

@@ -23 +23 @@
 }
 
-if (script_basename() == 'admin')
- add_event_handler('get_admin_plugin_menu_links', 'check_for_auto_upgrade');
+add_event_handler('get_admin_plugin_menu_links', 'check_for_auto_upgrade');
+add_event_handler('ws_add_methods', 'add_ws_autoupdate_methods');
 
 function check_for_auto_upgrade($plugin_menu_links)
@@ -56 +56 @@
   return $plugin_menu_links;
 }
+
+function add_ws_autoupdate_methods($arr)
+{
+  include_once(AUTOUPDATE_PATH.'ws_functions.inc.php');
+}
 ?>

extensions/autoupdate/trunk/template/autoupdate.js

@@ -12 +12 @@
 
 function resetIgnored() {
-  jQuery.post(
-    "plugins/autoupdate/ajax/ignore_list.php",
-    { reset: true, pwg_token: pwg_token },
-    function(data) {
-      if (data == "ok") {
+  jQuery.ajax({
+    type: 'GET',
+    url: 'ws.php',
+    dataType: 'json',
+    data: { method: 'pwg.extensions.ignoreUpdates', reset: true, pwg_token: pwg_token, format: 'json' },
+    success: function(data) {
+      if (data['stat'] == 'ok') {
         jQuery(".pluginBox, fieldset").show();
         jQuery("#update_all").show();
@@ -25 +27 @@
       }
     }
-  );
+  });
 };
 
@@ -57 +59 @@
   jQuery('.autoupdate_bar').toggle();
   jQuery.ajax({
-    type: 'POST',
-    url: 'plugins/autoupdate/ajax/update_'+type+'.php',
-    data: { id: id, revision: revision, pwg_token: pwg_token },
+    type: 'GET',
+    url: 'ws.php',
+    data: { method: 'pwg.'+type+'s.update', id: id, revision: revision, pwg_token: pwg_token, format: 'json' },
     success: function(data) {
-      if (data['result']) {
+      if (data['stat'] == 'ok') {
         jQuery("#"+type+"_"+id).remove();
         checkFieldsets();
         jQuery.jGrowl(
-          data['msg'],
+          data['result'],
           {
             theme:  'success',
@@ -77 +79 @@
       } else {
         jQuery.jGrowl(
-          data['msg'],
+          data['result'],
           {
             theme:  'error',
@@ -105 +107 @@
 
 function ignoreExtension(type, id) {
-  jQuery.post(
-    "plugins/autoupdate/ajax/ignore_list.php",
-    { type: type+'s', id: id, pwg_token: pwg_token },
-    function(data) {
-      if (data == "ok") {
+  jQuery.ajax({
+    type: 'GET',
+    url: 'ws.php',
+    dataType: 'json',
+    data: { method: 'pwg.extensions.ignoreUpdates', type: type+'s', id: id, pwg_token: pwg_token, format: 'json' },
+    success: function(data) {
+      if (data['stat'] == 'ok') {
         jQuery("#"+type+"_"+id).hide();
         jQuery("#reset_ignore").show();
@@ -115 +119 @@
       }
     }
-  );
+  });
 };

extensions/autoupdate/trunk/template/head.tpl

@@ -5 +5 @@
 var up_to_date = '{"Gallery and extensions are up to date"|@translate|@escape:"javascript"}';
 
-window.onload = function () {ldelim}
-  jQuery.ajax({ldelim}
+{literal}
+window.onload = function () {
+  jQuery.ajax({
     type: 'GET',
-    url: 'plugins/autoupdate/ajax/check_updates.php',
-    dataType: 'text',
+    url: 'ws.php',
+    dataType: 'json',
+    data: { method: 'pwg.extensions.checkUpdates', format: 'json' },
     timeout: 10000,  // 10 sec timeout
-    success: function (data) {ldelim}
-      var reg = new RegExp("^(error|piwigo_upgrade|ext_upgrade|up_to_date)$","i");
-      if (!data.match(reg))
+    success: function (data) {
+      if (data['stat'] == 'ok')
+        jQuery('#autoupdate').html(eval(data['result']));
+      else
         jQuery('#autoupdate').html(error);
-      else
-        jQuery('#autoupdate').html(eval(data));
     },
-    error: function() {ldelim}
+    error: function() {
      jQuery('#autoupdate').html(error);
     }
   });
 }
-{/footer_script}
+{/literal}{/footer_script}
 <p id="autoupdate"><img src="plugins/autoupdate/template/ajax-loader.gif"> &nbsp; {'Checking upgrades for gallery and plugins...'|@translate}</p>