Changeset 1485

Timestamp:

09/23/09 17:28:52 (14 years ago)

Author:

JcDenis

Message:

noodles 0.5:

• Fixed DC 2.1.6 URL handlers ending
• Fixed image size in js
• Removed url prefix settings as myUrlHandlers does it perfectly
• Added _uninstall.php feature

Location:

plugins/noodles

Files:

• _define.php (modified) (1 diff)
• _prepend.php (modified) (1 diff)
• _public.php (modified) (3 diffs)
• _uninstall.php (added)
• default-templates/js/jquery.noodles.js (modified) (1 diff)
• index.php (modified) (2 diffs)
• release.txt (added)

plugins/noodles/_define.php

@@ -17 +17 @@
      /* Description*/         "Add users gravatars everywhere",
      /* Author */             "JC Denis",
-     /* Version */            '0.4',
+     /* Version */            '0.5',
      /* Permissions */        'admin'
      //* Priority */          10000000
 );
-     /* date */          #20090816
+     /* date */          #20090923
 ?>

plugins/noodles/_prepend.php

@@ -13 +13 @@
 if (!defined('DC_RC_PATH')){return;}
 
-$GLOBALS['__autoload']['noodlesImg'] = dirname(__FILE__).'/inc/lib.noodles.img.php';
+global $__autoload, $core;
 
-$n_m = $GLOBALS['core']->blog->settings->noodles_module_prefix;
-$n_m = $n_m ? $n_m : 'noodles';
-$GLOBALS['core']->url->register('noodlesmodule',$n_m,'^'.$n_m.'/(.+)$',
+$__autoload['noodlesImg'] = dirname(__FILE__).'/inc/lib.noodles.img.php';
+
+$core->url->register('noodlesmodule','noodles','^noodles/(.+)$',
      array('urlNoodles','noodles'));
-
-$n_r = $GLOBALS['core']->blog->settings->noodles_service_prefix;
-$n_r = $n_r ? $n_r : 'noodle';
-$GLOBALS['core']->url->register('noodlesservice',$n_r,'^'.$n_r.'/$',
+$core->url->register('noodlesservice','noodle','^noodle/$',
      array('urlNoodles','service'));
-
-unset($n_m,$n_r);
 
 if (!is_callable(array('libImagePath','getArray')))
      require dirname(__FILE__).'/inc/lib.image.path.php';
-
 ?>

plugins/noodles/_public.php

@@ -150 +150 @@
           if (!$core->blog->settings->noodles_active) {
                self::p404();
-               exit;
+               return;
           }
 
           if (!preg_match('#^(.*?)$#',$args,$m)) {
                self::p404();
-               exit;
+               return;
           }
 
@@ -161 +161 @@
           if (strstr($f,"..") !== false) {
                self::p404();
-               exit;
+               return;
           }
 
@@ -167 +167 @@
           if (!in_array(files::getExtension($f),$allowed_types)) {
                self::p404();
-               exit;
+               return;
           }
 
           self::serveDocument($args);
-          exit;
+          return;
      }
 }

plugins/noodles/default-templates/js/jquery.noodles.js

@@ -31 +31 @@
                     if(data.find('rsp').attr('status')=='ok' && $(data).find('noodle').attr('src')){
 
+                         var size = $(data).find('noodle').attr('size')+'px';
                          var res = $('<img src="'+$(data).find('noodle').attr('src')+'" alt="" />');
-                         $(res).addClass('noodles-'+imgId).height($(data).find('noodle').attr('size')).width($(data).find('noodle').attr('size'));
+                         $(res).addClass('noodles-'+imgId).height(size).width(size);
 
                          if (imgPlace=='append')

plugins/noodles/index.php

@@ -74 +74 @@
           $core->blog->settings->put('noodles_active',$_POST['noodles_active'],
                'boolean','noodles plugin enabled',true,false);
-          $core->blog->settings->put('noodles_module_prefix',$_POST['noodles_module_prefix'],
-               'string','noodles default avatar base url',true,false);
-          $core->blog->settings->put('noodles_service_prefix',$_POST['noodles_service_prefix'],
-               'string','noodles default service base url',true,false);
 
           # Destination image according to libImagePath()
@@ -239 +235 @@
 '<tr><th colspan="2">'.__('URL prefix').'</th></tr>'.
 '<tr><td>'.__('Files').'</td><td>'.
-form::field(array('noodles_module_prefix'),50,50,
-     $core->url->getBase('noodlesmodule')).'</td></tr>'.
-'<tr><td>'.__('Service').'</td><td>'.
-form::field(array('noodles_service_prefix'),50,50,
-     $core->url->getBase('noodlesservice')).'</td></tr>'.
 '</table>'.
 '</div>'.