Changeset 567

Timestamp:

09/13/06 19:24:04 (7 years ago)

Author:

koto

Message:

ExtendedFileManager update:

- EFM now supports new way of passing configuration variables to backend introduced in changeset:565
- updated Readme.txt to encourage the new way
- added German translation (by sven schomacker)
- added support for editing 'title' attributes for inserted images (new config options 'images_enable_alt' and 'images_enable_title')

Location:

trunk/plugins/ExtendedFileManager

Files:

• Readme.txt (modified) (3 diffs)
• assets/images.js (modified) (2 diffs)
• assets/manager.js (modified) (2 diffs)
• config.inc.php (modified) (2 diffs)
• extended-file-manager.js (modified) (4 diffs)
• lang/de.js (added)
• manager.php (modified) (4 diffs)

trunk/plugins/ExtendedFileManager/Readme.txt

@@ -36 +36 @@
 * Can be used to insert link to non-image files like pdf or zip.
 * You can specify image margin / padding / background and border colors
+** You may edit Alt/title tags for inserted images
 
 Installation :
@@ -52 +53 @@
 // only snippets of code from initializing file shown below
 
-<?php
-
-    // define backend configuration for both plugins
-    
-    $IMConfig = array();
-    $IMConfig['images_dir'] = '<images dir>';
-    $IMConfig['images_url'] = '<images url>';
-    $IMConfig['thumbnail_prefix'] = 't_';
-    $IMConfig['thumbnail_dir'] = 't';
-    $IMConfig['resized_prefix'] = 'resized_';
-    $IMConfig['resized_dir'] = '';
-    $IMConfig['tmp_prefix'] = '_tmp';
-    $IMConfig['max_filesize_kb_image'] = 2000;
-    // maximum size for uploading files in 'insert image' mode (2000 kB here)
-
-    $IMConfig['max_filesize_kb_link'] = 5000;
-    // maximum size for uploading files in 'insert link' mode (2000 kB here)
-
-    // Maximum upload folder size in Megabytes.
-    // Use 0 to disable limit
-
-    $IMConfig['max_foldersize_mb'] = 0;
-    $IMConfig['allowed_image_extensions'] = array("jpg","gif","png");
-    $IMConfig['allowed_link_extensions'] = array("jpg","gif","pdf","ip","txt",
-                                                 "psd","png","html","swf",
-                                                 "xml","xls");
-
-    $IMConfig = serialize($IMConfig);
-    if(!isset($_SESSION['Xinha:ImageManager']))
-    {
-      $_SESSION['Xinha:ImageManager'] = uniqid('secret_code');
-    }
-
-?>
 
   xinha_plugins = xinha_plugins ? xinha_plugins :
@@ -101 +68 @@
 
 // pass the configuration to plugins
-if (xinha_config.ImageManager) {
-    xinha_config.ImageManager.backend_config = '<?php echo jsaddslashes($IMConfig)?>';
-    xinha_config.ImageManager.backend_config_hash = '<?php echo sha1($IMConfig . $_SESSION['Xinha:ImageManager'])?>';
+if (xinha_config.ExtendedFileManager) {
+            with (xinha_config.ExtendedFileManager)
+        {
+            <?php
+
+            // define backend configuration for the plugin
+            $IMConfig = array();
+            $IMConfig['images_dir'] = '<images dir>';
+            $IMConfig['images_url'] = '<images url>';
+            $IMConfig['thumbnail_prefix'] = 't_';
+            $IMConfig['thumbnail_dir'] = 't';
+            $IMConfig['resized_prefix'] = 'resized_';
+            $IMConfig['resized_dir'] = '';
+            $IMConfig['tmp_prefix'] = '_tmp';
+            $IMConfig['max_filesize_kb_image'] = 2000;
+            // maximum size for uploading files in 'insert image' mode (2000 kB here)
+
+            $IMConfig['max_filesize_kb_link'] = 5000;
+            // maximum size for uploading files in 'insert link' mode (2000 kB here)
+
+            // Maximum upload folder size in Megabytes.
+            // Use 0 to disable limit
+            $IMConfig['max_foldersize_mb'] = 0;
+            
+            $IMConfig['allowed_image_extensions'] = array("jpg","gif","png");
+            $IMConfig['allowed_link_extensions'] = array("jpg","gif","pdf","ip","txt",
+                                                         "psd","png","html","swf",
+                                                         "xml","xls");
+
+            require_once '/path/to/xinha/contrib/php-xinha.php';
+            xinha_pass_to_php_backend($IMConfig);
+            
+            ?>
+        }
 }
-
-if (xinha_config.ExtendedFileManager) {
-    xinha_config.ExtendedFileManager.backend_config = '<?php echo jsaddslashes($IMConfig)?>';
-    xinha_config.ExtendedFileManager.backend_config_hash = '<?php echo sha1($IMConfig . $_SESSION['Xinha:ImageManager'])?>';
-}
-
 
 =====

trunk/plugins/ExtendedFileManager/assets/images.js

@@ -73 +73 @@
     topDoc.getElementById('f_url').value = '';
     topDoc.getElementById('f_alt').value = '';
+    topDoc.getElementById('f_title').value = '';
     topDoc.getElementById('f_width').value = '';
     topDoc.getElementById('f_margin').value = '';
@@ -113 +114 @@
     {
         var obj = topDoc.getElementById('f_url');  obj.value = filename;
-        var obj = topDoc.getElementById('f_alt'); obj.value = alt;
+        obj = topDoc.getElementById('f_alt'); obj.value = alt;
+        obj = topDoc.getElementById('f_title'); obj.value = alt;
 
         if(width==0 && height==0) toggleImageProperties(true);

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -102 +102 @@
         document.getElementById("f_url").value = param["f_url"];
         document.getElementById("f_alt").value = param["f_alt"];
+        document.getElementById("f_title").value = param["f_title"];
         document.getElementById("f_border").value = param["f_border"];
         document.getElementById("f_width").value = param["f_width"];
@@ -217 +218 @@
     {
         // pass data back to the calling window
-        var fields = ["f_url", "f_alt", "f_align", "f_border", "f_margin", "f_padding", "f_height", "f_width", "f_borderColor", "f_backgroundColor"];
+        var fields = ["f_url", "f_alt", "f_title", "f_align", "f_border", "f_margin", "f_padding", "f_height", "f_width", "f_borderColor", "f_backgroundColor"];
         var param = new Object();
         for (var i in fields)

trunk/plugins/ExtendedFileManager/config.inc.php

@@ -203 +203 @@
 $IMConfig['use_color_pickers'] = true;
 
+$IMConfig['images_enable_alt'] = false;
+$IMConfig['images_enable_title'] = true;
+
 /*
   Possible values: true, false
@@ -254 +257 @@
 
 
-// If config specified from front end, merge it
-if(isset($_REQUEST['backend_config']))
+// Standard PHP Backend Data Passing
+//  if data was passed using xinha_pass_to_php_backend() we merge the items
+//  provided into the Config
+require_once(realpath(dirname(__FILE__) . '/../../contrib/php-xinha.php'));
+if($passed_data = xinha_read_passed_data())
+{
+  $IMConfig = array_merge($IMConfig, $passed_data);
+  $IMConfig['backend_url'] .= xinha_passed_data_querystring() . '&';
+}
+// Deprecated config passing, don't use this way any more!
+elseif(isset($_REQUEST['backend_config']))
 {
   if(get_magic_quotes_gpc()) {

trunk/plugins/ExtendedFileManager/extended-file-manager.js

@@ -63 +63 @@
 {
   'backend'    : _editor_url + 'plugins/ExtendedFileManager/backend.php?__plugin=ExtendedFileManager&',
+  'backend_data' : null,
+  // deprecated keys, use passing data through e.g. xinha_pass_to_php_backend()
   'backend_config'     : null,
   'backend_config_hash': null,
@@ -84 +86 @@
             f_url    : HTMLArea.is_ie ? image.src : image.getAttribute("src"),
             f_alt    : image.alt,
+            f_title  : image.title,
             f_border : image.style.borderWidth ? image.style.borderWidth : image.border,
             f_align  : image.align,
@@ -115 +118 @@
       manager += '&backend_config_secret_key_location='
         + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_secret_key_location);
+    }
+
+    if(editor.config.ExtendedFileManager.backend_data != null)
+    {
+        for ( var i in editor.config.ExtendedFileManager.backend_data )
+        {
+            manager += '&' + i + '=' + encodeURIComponent(editor.config.ExtendedFileManager.backend_data[i]);
+        }
     }
 
@@ -151 +162 @@
             {
                 case "f_alt"    : img.alt    = value; break;
+                case "f_title"  : img.title = value; break;
                 case "f_border" :
                     img.style.borderWidth = /[^0-9]/.test(value) ? value : (parseInt(value || "0") + 'px');

trunk/plugins/ExtendedFileManager/manager.php

@@ -94 +94 @@
 </table>
 </fieldset>
-<!-- temp -->
-<!-- /temp -->
 <!-- image properties -->
         <table class="inputTable">
@@ -101 +99 @@
                         <td align="right" nowrap><label for="f_url"><?php if($insertMode=='image') echo 'File Name'; else echo 'URL';?></label></td>
                         <td colspan="5"><input type="text" id="<?php if($insertMode=='image') echo 'f_url'; else echo 'f_href';?>" class="largelWidth" value="" /></td>
-            <td rowspan="5" colspan="2" valign="top"><?php if($insertMode=='image') { ?>
+<?php // calculate number of table rows to span for the preview cell
+$num_rows = 3; // filename & upload & disk info message
+if ($insertMode == 'image' && $IMConfig['images_enable_alt'])
+    $num_rows++;
+if ($insertMode == 'link' || $IMConfig['images_enable_title'])
+    $num_rows++;
+?>
+            <td rowspan="<?php echo $num_rows ?>" colspan="2" valign="top"><?php if($insertMode=='image') { ?>
             <div style="padding:4px;background-color:#CCC;border:1px inset;width: 100px; height: 100px;">
             <img src="" id="f_preview" />
@@ -114 +119 @@
 <input type="text" name="f_other_target" id="f_other_target" style="visibility:hidden; width:120px;" />
             <?php } ?></td>
-                </tr>
-                <tr>
-                        <td align="right"><label for="f_alt"><?php if($insertMode=='image') echo 'Alt'; else echo 'Title (tooltip)';?></label></td>
-                        <td colspan="5"><input type="text" id="<?php if($insertMode=='image') echo 'f_alt'; else echo 'f_title';?>" class="largelWidth" value="" /></td>
-                </tr>
+            </tr>
+<?php if($insertMode == 'image' && $IMConfig['images_enable_alt']) { ?>
+                <tr>
+                        <td align="right"><label for="f_alt">Alt</label></td>
+                        <td colspan="5"><input type="text" id="f_alt" class="largelWidth" value="" /></td>
+        </tr>
+<?php } else {
+        $hidden_fields[] = 'f_alt';
+      }
+      if ($insertMode == 'link' || $IMConfig['images_enable_title']) { ?>
+      <tr>
+                        <td align="right"><label for="f_title">Title (tooltip)</label></td>
+                        <td colspan="5"><input type="text" id="f_title" class="largelWidth" value="" /></td>
+      </tr>
+<?php } else { 
+        $hidden_fields[] = 'f_title';
+      } ?>
                 <tr>
 <?php
@@ -141 +158 @@
                 </tr>
                 <tr>
-                 <td></td>
-                 <td colspan="5"> <span id="diskmesg"></span></td>
+                 <td>tu<?php if (!empty($hidden_fields)) foreach ($hidden_fields as $hf) echo "<input type=\"hidden\" id=\"{$hf}\" name=\"{$hf}\" value=\"\" />"; ?></td>
+                 <td colspan="5"><span id="diskmesg"></span></td>
       </tr>
 <tr>
                         <td align="right"><?php if($insertMode=='image') { ?> <label for="f_width">Width</label><?php }?></td>
 
-                        <td><?php if($insertMode=='image') { ?> <input type="text" id="f_width" class="smallWidth" value="" onchange="javascript:checkConstrains('width');"/><?php } else echo "&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp&nbsp;&nbsp;&nbsp";?></td>
+                        <td><?php if($insertMode=='image') { ?> <input type="text" id="f_width" class="smallWidth" value="" onchange="javascript:checkConstrains('width');"/><?php } else echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";?></td>
 
                         <td rowspan="2"><?php if($insertMode=='image') { ?><img src="<?php print $IMConfig['base_url'];?>img/locked.gif" id="imgLock" width="25" height="32" alt="Constrained Proportions" />