Changeset 48

Timestamp:

03/21/05 17:46:51 (8 years ago)

Author:

yermol

Message:

now uses PHP_SELF to figure out installation directory URL.
changed plugin to plugin and f to function everywhere.
updated README.

Location:

trunk/plugins/ImageManager

Files:

• Classes/ImageManager.php (modified) (1 diff)
• README.txt (modified) (3 diffs)
• assets/editorFrame.js (modified) (4 diffs)
• assets/images.js (modified) (2 diffs)
• backend.php (modified) (3 diffs)
• config.inc.php (modified) (3 diffs)
• editor.php (modified) (1 diff)
• image-manager.js (modified) (4 diffs)
• images.php (modified) (2 diffs)
• manager.php (modified) (2 diffs)

trunk/plugins/ImageManager/Classes/ImageManager.php

@@ -554 +554 @@
                 //well, no thumbnail was found, so ask the thumbs.php
                 //to generate the thumbnail on the fly.
-                Return $IMConfig['backend_url'] . 'f=thumbs&img='.rawurlencode($relative);
+                Return $IMConfig['backend_url'] . '__function=thumbs&img='.rawurlencode($relative);
         }
 

trunk/plugins/ImageManager/README.txt

@@ -23 +23 @@
 
 ------------------------------------------------------------------------------
-To get this working check see config.inc.php for configuration values.
+If you have GD installed and configured in PHP this should work out of the 
+box. 
 
-Most likely you will need to adjust images_dir and images_url if you have
-not unpacked Xinha in your DOCUMENT_ROOT.
+For production use see config.inc.php for configuration values. You will 
+want to adjust images_dir and images_url for your application.
 
 For demo purposes ImageManager is set up to view images in the
@@ -39 +40 @@
 
 --------------------------------------------------------------------------------
-
-
-
-I've  packaged  this  up to be distributed with Xinha. In order
-for  this  to  work  as  is, you either have to unpack Xinha in
-DOCUMENT_ROOT  or you will need to edit config.inc.php to match
-your install.
 
 By  default this ImageManager is set up to browse some graphics
@@ -68 +62 @@
 Request URLs are of the form:
 
- <config backend URL>(?|&)plugin=ImageManager&f=<function>&arg=value&arg=value
+ <config backend URL>(?|&)__plugin=ImageManager&__function=<function>&arg=value&arg=value
 
 The default URL is plugins/xinha/backend.php.

trunk/plugins/ImageManager/assets/editorFrame.js

@@ -34 +34 @@
                   // a trailing &
 
-        var url = _backend_url + "f=editorFrame&img="+currentImageFile+"&action=crop&params="+parseInt(t_cx.value)+','+parseInt(t_cy.value)+','+ parseInt(t_cw.value)+','+parseInt(t_ch.value);
+        var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=crop&params="+parseInt(t_cx.value)+','+parseInt(t_cy.value)+','+ parseInt(t_cw.value)+','+parseInt(t_ch.value);
 
         //alert(url);
@@ -43 +43 @@
     else if (action == 'scale')
     {
-        var url = _backend_url + "f=editorFrame&img="+currentImageFile+"&action=scale&params="+parseInt(s_sw.value)+','+parseInt(s_sh.value);
+        var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=scale&params="+parseInt(s_sw.value)+','+parseInt(s_sh.value);
         //alert(url);
         location.href = url;
@@ -53 +53 @@
 
         if(flip.value == 'hoz' || flip.value == 'ver') 
-            location.href = _backend_url + "f=editorFrame&img="+currentImageFile+"&action=flip&params="+flip.value;
+            location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=flip&params="+flip.value;
         else if (isNaN(parseFloat(r_ra.value))==false)
-            location.href = _backend_url + "f=editorFrame&img="+currentImageFile+"&action=rotate&params="+parseFloat(r_ra.value);
+            location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=rotate&params="+parseFloat(r_ra.value);
     }
     else if(action == 'save') {
@@ -71 +71 @@
             var filename = encodeURI(s_file.value);
             var quality = parseInt(s_quality.value);
-            var url = _backend_url + "f=editorFrame&img="+currentImageFile+"&action=save&params="+format[0]+","+quality+"&file="+filename;
+            var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=save&params="+format[0]+","+quality+"&file="+filename;
             //alert(url);
             location.href = url;

trunk/plugins/ImageManager/assets/images.js

@@ -20 +20 @@
                 // assume it has a trailing &
 
-                location.href = _backend_url + "f=images&dir="+newDir;
+                location.href = _backend_url + "__function=images&dir="+newDir;
         }
 
@@ -26 +26 @@
         function newFolder(dir, newDir) 
         {
-                location.href = _backend_url + "f=images&dir="+dir+"&newDir="+newDir;
+                location.href = _backend_url + "__function=images&dir="+dir+"&newDir="+newDir;
         }
 

trunk/plugins/ImageManager/backend.php

@@ -20 +20 @@
 * entry point. backend.php expects at least two URL variable parameters: 
 *
-* plugin=ImageManager   for future expansion; identify the plugin being requested.
-* f=thumbs|images|editorFrame|editor|manager  function being called.
+* __plugin=ImageManager   for future expansion; identify the plugin being requested.
+* __function=thumbs|images|editorFrame|editor|manager  function being called.
 *
 * Having a single entry point that strictly adheres to a defined interface will 
@@ -56 +56 @@
 // used by ImageManager is in the same files as the PHP code ...)
 
-if ( @$formVars[ "plugin" ] != "ImageManager" )
+if ( @$formVars[ "__plugin" ] != "ImageManager" )
         {
         // not for us.
@@ -69 +69 @@
 // function request.
 
-_ddt( __FILE__, __LINE__, "backend.php(): handling function '" . $formVars[ "f" ] . "' base_dir is '" . $IMConfig["base_dir"] . "'" );
+_ddt( __FILE__, __LINE__, "backend.php(): handling function '" . $formVars[ "__function" ] . "' base_dir is '" . $IMConfig["base_dir"] . "'" );
 
-switch ( @$formVars[ "f" ] )
+switch ( @$formVars[ "__function" ] )
         {
 

trunk/plugins/ImageManager/config.inc.php

@@ -22 +22 @@
 * URL to use for unified backend.
 *
-* The ?plugin=ImageManager& is required. 
-*/
-
-$IMConfig['backend_url'] = "backend.php?plugin=ImageManager&";
+* The ?__plugin=ImageManager& is required. 
+*/
+
+$IMConfig['backend_url'] = "backend.php?__plugin=ImageManager&";
 
 /**
@@ -77 +77 @@
 // $IMConfig['images_url'] = "/url/to/above";
 
-// try to figure out the URL of the images directory. We're assuming it's not
-// symlinked.
-
-$IMConfig['images_url'] = "/xinha/plugins/ImageManager/demo_images";
+// try to figure out the URL of the sample images directory. For your installation
+// you will probably want to keep images in another directory.
+
+$IMConfig['images_url'] = str_replace( "backend.php", "", $_SERVER["PHP_SELF"] ) . "demo_images";
 
 // -------------------------------------------------------------------------
@@ -250 +250 @@
 
 // uncomment to send debug messages to a local file
-// _setDebugLog( "/tmp/debug_log.txt" );
+_setDebugLog( "/tmp/debug_log.txt" );
 
 // turn debugging on everywhere.
-// _ddtOn();
+_ddtOn();
 
 // END

trunk/plugins/ImageManager/editor.php

@@ -141 +141 @@
 </div>
 <div id="contents">
-<iframe src="<? print $IMConfig['backend_url']; ?>f=editorFrame&img=<? if(isset($_GET['img'])) echo rawurlencode($_GET['img']); ?>" name="editor" id="editor"  scrolling="auto" title="Image Editor" frameborder="0"></iframe>
+<iframe src="<? print $IMConfig['backend_url']; ?>__function=editorFrame&img=<? if(isset($_GET['img'])) echo rawurlencode($_GET['img']); ?>" name="editor" id="editor"  scrolling="auto" title="Image Editor" frameborder="0"></iframe>
 </div>
 <div id="bottom"></div>

trunk/plugins/ImageManager/image-manager.js

@@ -44 +44 @@
 HTMLArea.Config.prototype.ImageManager =
 {
-  'backend' : _editor_url + 'plugins/ImageManager/backend.php?plugin=ImageManager&',
+  'backend' : _editor_url + 'plugins/ImageManager/backend.php?__plugin=ImageManager&',
   'images_url' : _editor_url + 'plugins/ImageManager/demo_images'
 }
@@ -62 +62 @@
 
         // the selection will have the absolute url to the image. 
-        // We need to coerce it to be relative to the images directory.
+        // coerce it to be relative to the images directory.
         //
         // FIXME: we have the correct URL, but how to get it to select?
+        // FIXME: need to do the same for MSIE.
 
         if ( image )
@@ -78 +79 @@
                         var image_src = image.getAttribute("src");
 
-                        // alert( "images_url is '" + editor.config.ImageManager.images_url + "'" );
+                        // strip off any http://blah prefix
 
-                        var image_regex = new RegExp( editor.config.ImageManager.images_url );
+                        var images_url = editor.config.ImageManager.images_url.replace( /https?:\/\/[^\/]*/, "" );
+
+                        // alert( "images_url is '" + images_url + "'" );
+
+                        var image_regex = new RegExp( images_url );
 
                         // alert(" regex is '" + image_regex.source + "'" );
@@ -110 +115 @@
         // alert( "backend is '" + editor.config.ImageManager.backend + "'" );
 
-        var manager = editor.config.ImageManager.backend + 'f=manager';
+        var manager = editor.config.ImageManager.backend + '__function=manager';
 
         Dialog(manager, function(param) {

trunk/plugins/ImageManager/images.php

@@ -68 +68 @@
                 <a href="javascript:;" onclick="selectImage('<? echo $file['relative'];?>', '<? echo $entry; ?>', <? echo $file['image'][0];?>, <? echo $file['image'][1]; ?>);"title="<? echo $entry; ?> - <? echo Files::formatSize($file['stat']['size']); ?>"><img src="<? print $manager->getThumbnail($file['relative']); ?>" alt="<? echo $entry; ?> - <? echo Files::formatSize($file['stat']['size']); ?>"/></a>
                 </td></tr><tr><td class="edit">
-                        <a href="<? print $IMConfig['backend_url']; ?>f=images&dir=<? echo $relative; ?>&amp;delf=<? echo rawurlencode($file['relative']);?>" title="Trash" onclick="return confirmDeleteFile('<? echo $entry; ?>');"><img src="<? print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash"/></a><a href="javascript:;" title="Edit" onclick="editImage('<? echo rawurlencode($file['relative']);?>');"><img src="<? print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit"/></a>
+                        <a href="<? print $IMConfig['backend_url']; ?>__function=images&dir=<? echo $relative; ?>&amp;delf=<? echo rawurlencode($file['relative']);?>" title="Trash" onclick="return confirmDeleteFile('<? echo $entry; ?>');"><img src="<? print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash"/></a><a href="javascript:;" title="Edit" onclick="editImage('<? echo rawurlencode($file['relative']);?>');"><img src="<? print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit"/></a>
                 <? if($file['image']){ echo $file['image'][0].'x'.$file['image'][1]; } else echo $entry;?>
                 </td></tr></table></td> 
@@ -192 +192 @@
         function editImage(image) 
         {
-                var url = "<? print $IMConfig['backend_url']; ?>f=editor&img="+image;
+                var url = "<? print $IMConfig['backend_url']; ?>__function=editor&img="+image;
                 Dialog(url, function(param) 
                 {

trunk/plugins/ImageManager/manager.php

@@ -49 +49 @@
 <? // we have to propagate our values through forms ?>
 
-<input type="hidden" name="plugin" value="ImageManager">
-<input type="hidden" name="f" value="images">
+<input type="hidden" name="__plugin" value="ImageManager">
+<input type="hidden" name="__function" value="images">
 
 <fieldset><legend>Image Manager</legend>
@@ -66 +66 @@
 <? } ?>
         <div id="messages" style="display: none;"><span id="message"></span><img SRC="<? print $IMConfig['base_url']; ?>img/dots.gif" width="22" height="12" alt="..." /></div>
-        <iframe src="<? print $IMConfig['backend_url']; ?>f=images" name="imgManager" id="imgManager" class="imageFrame" scrolling="auto" title="Image Selection" frameborder="0"></iframe>
+        <iframe src="<? print $IMConfig['backend_url']; ?>__function=images" name="imgManager" id="imgManager" class="imageFrame" scrolling="auto" title="Image Selection" frameborder="0"></iframe>
 </div>
 </fieldset>