Changeset 9934

Timestamp:

Mar 30, 2011, 10:54:23 AM (14 years ago)

Author:

patdenice

Message:

Move ws function in separate file.

Location:

extensions/regenerateThumbnails

Files:

• element_set_global_action.tpl (modified) (1 diff)
• js/jquery.ajaxmanager.js (deleted)
• main.inc.php (modified) (1 diff)
• ws_functions.inc.php (added)

extensions/regenerateThumbnails/element_set_global_action.tpl

@@ -1 +1 @@
 {combine_script id='jquery.progressBar' path='plugins/regenerateThumbnails/js/jquery.progressbar.min.js' load='footer'}
-{combine_script id='jquery.ajaxmanager' path='plugins/regenerateThumbnails/js/jquery.ajaxmanager.js' load='footer'}
+{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'}
 
 {footer_script require='jquery.progressBar,jquery.ajaxmanager'}

extensions/regenerateThumbnails/main.inc.php

@@ -43 +43 @@
 function add_regenerate_thumbnails_method($arr)
 {
-  global $conf;
-
-  $service = &$arr[0];
-  $service->addMethod(
-    'pwg.images.regenerateThumbnail',
-    'ws_images_regenerateThumbnail',
-    array(
-      'image_id'  => array(),
-      'maxwidth'  => array('default'=>$conf['upload_form_thumb_maxwidth']),
-      'maxheight' => array('default'=>$conf['upload_form_thumb_maxheight']),
-      'quality'   => array('default'=>$conf['upload_form_thumb_quality']),
-      'square'    => array('default'=>@$conf['upload_form_thumb_square']),
-    ),
-    'Regenerate a thumbnail with given arguments.'
-  );
-}
-
-function ws_images_regenerateThumbnail($params, &$service)
-{
-  global $conf;
-
-  if (!is_admin())
-    return new PwgError(401, 'Access denied');
-
-  $query='
-SELECT id, path
-FROM '.IMAGES_TABLE.'
-WHERE id = '.(int)$params['image_id'].'
-;';
-
-  $image = pwg_db_fetch_assoc(pwg_query($query));
-  if ($image == null)
-    return new PwgError(404, "image_id not found");
-
-  include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
-
-  if ($params['square'] == 'true' or $params['square'] == 'false')
-    $params['square'] = get_boolean($params['square']);
-  if (!$params['square'])
-    remove_event_handler('upload_thumbnail_resize', 'upload_square_resize', 40);
-  
-  trigger_event(
-    'upload_thumbnail_resize',
-    false,
-    $image['path'],
-    file_path_for_type($image['path'], 'thumb'),
-    $params['maxwidth'],
-    $params['maxheight'],
-    $params['quality'],
-    true
-    );
-
-  return true;
+  include_once(REGENERATE_THUMBNAILS_PATH.'ws_functions.inc.php');
 }