Changeset 579

Timestamp:

09/19/06 19:35:56 (7 years ago)

Author:

ray

Message:

ExtendedFileManager updates:

*to complete cofigurability through js directories can now be set for images and files individually (optional & backwards compatible)

* linkfile button can be disabled (xinha_config.ExtendedFileManager.use_linker =false)

* relocated button from the end of toolbar next to createlink

* insert image/link with double click

* preview img didn't have src when no image selected, which showed a "image not found icon" in IE

* slight modifications and updates in Readme.txt (kicked out afru's website. The domain isn't even registered anymore)

Location:

trunk/plugins/ExtendedFileManager

Files:

• Classes/ExtendedFileManager.php (modified) (3 diffs)
• Readme.txt (modified) (8 diffs)
• config.inc.php (modified) (2 diffs)
• demo_images/Readme.txt (added)
• editor.php (modified) (4 diffs)
• editorFrame.php (modified) (3 diffs)
• extended-file-manager.js (modified) (2 diffs)
• images.php (modified) (4 diffs)
• img/1x1_transparent.gif (added)
• manager.php (modified) (1 diff)
• thumbs.php (modified) (2 diffs)

trunk/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php

@@ -54 +54 @@
         function getImagesDir()
         {
-                Return $this->config['images_dir'];
+                if ($this->mode == 'link' && isset($this->config['files_dir']))
+                        Return $this->config['files_dir'];
+                else Return $this->config['images_dir'];
         }
 
@@ -63 +65 @@
         function getImagesURL()
         {
-                Return $this->config['images_url'];
+                if ($this->mode == 'link' && isset($this->config['files_url']))
+                                Return $this->config['files_url'];
+                else Return $this->config['images_url'];
         }
 
@@ -657 +661 @@
                 //well, no thumbnail was found, so ask the thumbs.php
                 //to generate the thumbnail on the fly.
-                Return $IMConfig['backend_url'] . '__function=thumbs&img='.rawurlencode($relative);
+                Return $IMConfig['backend_url'] . '__function=thumbs&img='.rawurlencode($relative)."&mode=$this->mode";
         }
 

trunk/plugins/ExtendedFileManager/Readme.txt

@@ -1 +1 @@
 Package : Extended File Manager EFM 1.1.1
-Plugin url : http://www.afrusoft.com/htmlarea
+
 Version 1.1 created from 1.0 beta by Krzysztof Kotowicz <koto@webworkers.pl>
 
@@ -6 +6 @@
 ----------
 
-Extended File Manager is an advanced plugin for HtmlArea 3.0 
+Extended File Manager is an advanced plugin for Xinha 
 
 It works in two different modes.
@@ -12 +12 @@
 2). Insert File Link Mode.
 
-In Insert Image Mode, it replaces the basic insert image functionality of HtmlArea with its advanced image manager.
+In Insert Image Mode, it replaces the basic insert image functionality of Xinha with its advanced image manager.
 
 If Insert File Link Mode is enabled, a new icon will be added to the toolbar with advanced file linking capability.
@@ -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
+* You may edit Alt/title tags for inserted images
+
+(Most of the features can be enabled/disabled as needed)
 
 Installation :
@@ -46 +48 @@
 Plugin may be configured via xinha_config.ExtendedFileManager object.
 Look into ImageManager plugin documentation as this plugin uses almost identical
-settings. 
-
-The plugin may share the same config array as ImageManager plugin - just specify
-the same storage location like this:
+settings. All available options can be found in the file config.inc.php.
 
 // only snippets of code from initializing file shown below
@@ -67 +66 @@
 ...
 
-// pass the configuration to plugins
+//If you don't want to add a button for linking files and use only the advanced ImageManager
+xinha_config.ExtendedFileManager.use_linker = false;
+// pass the configuration to plugin
 if (xinha_config.ExtendedFileManager) {
             with (xinha_config.ExtendedFileManager)
@@ -77 +78 @@
             $IMConfig['images_dir'] = '<images dir>';
             $IMConfig['images_url'] = '<images url>';
+            $IMConfig['files_dir'] = '<files dir>';
+            $IMConfig['files_url'] = '<files url>';
             $IMConfig['thumbnail_prefix'] = 't_';
             $IMConfig['thumbnail_dir'] = 't';
@@ -86 +89 @@
 
             $IMConfig['max_filesize_kb_link'] = 5000;
-            // maximum size for uploading files in 'insert link' mode (2000 kB here)
+            // maximum size for uploading files in 'insert link' mode (5000 kB here)
 
             // Maximum upload folder size in Megabytes.

trunk/plugins/ExtendedFileManager/config.inc.php

@@ -60 +60 @@
 */
 $IMConfig['images_dir'] = 'demo_images';
+//You may set a different directory for the link mode; if you don't, the above setting will be used for both modes
+//$IMConfig['files_dir'] = 'demo_files';
 
 /*
@@ -69 +71 @@
  in this directory and its subdirectories.
 */
-if ($insertMode == 'image')
-        $IMConfig['images_url'] = str_replace( "backend.php", "", $_SERVER["PHP_SELF"] ) . "demo_images";
-else if($insertMode == "link")
-        $IMConfig['images_url'] = str_replace( "manager.php", "", $_SERVER["PHP_SELF"] ) . "demo_images";
+$IMConfig['images_url'] = str_replace( "backend.php", "", $_SERVER["PHP_SELF"] ) . "demo_images";
+//$IMConfig['files_url'] = 'url/to/files_dir';
+
 /*
   Possible values: true, false

trunk/plugins/ExtendedFileManager/editor.php

@@ -8 +8 @@
  * http://www.afrusoft.com/htmlarea
  */
+if(isset($_REQUEST['mode'])) $insertMode=$_REQUEST['mode'];
+        if(!isset($insertMode)) $insertMode="image";
 
 require_once('config.inc.php');
@@ -13 +15 @@
 require_once('../ImageManager/Classes/ImageEditor.php');
 
-$manager = new ExtendedFileManager($IMConfig);
+$manager = new ExtendedFileManager($IMConfig,$insertMode);
 $editor = new ImageEditor($manager);
 
@@ -29 +31 @@
 /*<![CDATA[*/
 
-    var _backend_url = "<?php print $IMConfig['backend_url']; ?>";
+    var _backend_url = "<?php print $IMConfig['backend_url']."&mode=$insertMode"; ?>&";
 
         if(window.opener)
@@ -142 +144 @@
 </div>
 <div id="contents">
-<iframe src="<?php print $IMConfig['backend_url']; ?>__function=editorFrame&img=<?php if(isset($_GET['img'])) echo rawurlencode($_GET['img']); ?>" name="editor" id="editor"  scrolling="auto" title="Image Editor" frameborder="0"></iframe>
+<iframe src="<?php print $IMConfig['backend_url']; ?>__function=editorFrame&img=<?php if(isset($_GET['img'])) echo rawurlencode($_GET['img']); ?>&mode=<?php echo $insertMode ?>" name="editor" id="editor"  scrolling="auto" title="Image Editor" frameborder="0"></iframe>
 </div>
 <div id="bottom"></div>

trunk/plugins/ExtendedFileManager/editorFrame.php

@@ -8 +8 @@
  * http://www.afrusoft.com/htmlarea
  */
+if(isset($_REQUEST['mode'])) $insertMode=$_REQUEST['mode'];
+        if(!isset($insertMode)) $insertMode="image";
 
 require_once('config.inc.php');
@@ -13 +15 @@
 require_once('../ImageManager/Classes/ImageEditor.php');
 
-$manager = new ExtendedFileManager($IMConfig);
+$manager = new ExtendedFileManager($IMConfig,$insertMode);
 $editor = new ImageEditor($manager);
 $imageInfo = $editor->processImage();
@@ -26 +28 @@
 <script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/EditorContent.js"></script>
 <script type="text/javascript">
-    var _backend_url = "<?php print $IMConfig['backend_url']; ?>";
+    var _backend_url = "<?php print $IMConfig['backend_url']."&mode=$insertMode"; ?>&";
 
     if(window.top)

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

@@ -39 +39 @@
     var toolbar = cfg.toolbar;
     var self = this;
-
-    cfg.registerButton({
-        id        : "linkfile",
-        tooltip   : HTMLArea._lc("Insert File Link",'ExtendedFileManager'),
-        image     : _editor_url + 'plugins/ExtendedFileManager/img/ed_linkfile.gif',
-        textMode  : false,
-        action    : function(editor) {
-                editor._linkFile();
-              }
-        });
-    cfg.toolbar.push([ "linkfile" ]);
-};
+    
+    if (cfg.ExtendedFileManager.use_linker) {
+        cfg.registerButton({
+            id        : "linkfile",
+            tooltip   : HTMLArea._lc("Insert File Link",'ExtendedFileManager'),
+            image     : _editor_url + 'plugins/ExtendedFileManager/img/ed_linkfile.gif',
+            textMode  : false,
+            action    : function(editor) {
+                    editor._linkFile();
+                  }
+            });
+        cfg.addToolbarElement("linkfile", "createlink", 1);
+        };
+    }
 
 ExtendedFileManager._pluginInfo = {
@@ -62 +64 @@
 HTMLArea.Config.prototype.ExtendedFileManager =
 {
+  'use_linker': true,
   'backend'    : _editor_url + 'plugins/ExtendedFileManager/backend.php?__plugin=ExtendedFileManager&',
   'backend_data' : null,

trunk/plugins/ExtendedFileManager/images.php

@@ -108 +108 @@
                 <tr>
                           <td><img src="<?php print $IMConfig['base_url']; if(is_file('icons/'.$file['ext'].'_small.gif')) echo "icons/".$file['ext']."_small.gif"; else echo $IMConfig['default_listicon']; ?>" alt="" /></td>
-                  <th><a href="#" class="thumb" style="cursor: pointer;" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo preg_replace('#\..{3,4}$#', '', $entry); ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>" <?php if ($insertMode == 'image') { ?> onmouseover="showPreview('<?php echo $file['relative'];?>')" onmouseout="showPreview(window.parent.document.getElementById('f_url').value)" <?php } ?> >
+                  <th><a href="#" class="thumb" style="cursor: pointer;" ondblclick="this.onclick();window.top.onOK();" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo preg_replace('#\..{3,4}$#', '', $entry); ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>" <?php if ($insertMode == 'image') { ?> onmouseover="showPreview('<?php echo $file['relative'];?>')" onmouseout="showPreview(window.parent.document.getElementById('f_url').value)" <?php } ?> >
                                 <?php
                                 if(strlen($entry)>$maxNameLength) echo substr($entry,0,$maxNameLength)."..."; else echo $entry;
@@ -162 +162 @@
                         ?>
                 <div class="thumb_holder" id="holder_<?php echo asc2hex($entry) ?>">
-                  <a href="#" class="thumb" style="cursor: pointer;" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo preg_replace('#\..{3,4}$#', '', $entry); ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>">
+                  <a href="#" class="thumb" style="cursor: pointer;" ondblclick="this.onclick();window.top.onOK();" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo preg_replace('#\..{3,4}$#', '', $entry); ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>">
                     <img src="<?php print $manager->getThumbnail($file['relative']); ?>" alt="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>" />
                   </a>
@@ -203 +203 @@
 {
 ?>
-<div class="error"><span>Invalid base directory:</span> <?php echo $manager->config['images_dir']; ?></div>
+<div class="error"><span>Invalid base directory:</span> <?php echo $manager->getImagesDir(); ?></div>
 <?php
 }
@@ -296 +296 @@
         function editImage(image) 
         {
-                var url = "<?php print $IMConfig['backend_url']; ?>__function=editor&img="+image;
+                var url = "<?php print $IMConfig['backend_url']; ?>__function=editor&img="+image+"&mode=<?php print $insertMode ?>";
         Dialog(url, function(param)
                 {

trunk/plugins/ExtendedFileManager/manager.php

@@ -152 +152 @@
             <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" />
+            <img src="<?php print $IMConfig['base_url'];?>img/1x1_transparent.gif" id="f_preview" />
             </div>
             <?php } else if($insertMode=="link" && $IMConfig['link_enable_target'] !== false) {?><label for="f_align">Target Window</label>

trunk/plugins/ExtendedFileManager/thumbs.php

@@ -10 +10 @@
  * http://www.afrusoft.com/htmlarea
  */
+if(isset($_REQUEST['mode'])) $insertMode=$_REQUEST['mode'];
+if(!isset($insertMode)) $insertMode="image";
 
 require_once('config.inc.php');
@@ -19 +21 @@
         exit();
 
-
-$manager = new ExtendedFileManager($IMConfig);
+$manager = new ExtendedFileManager($IMConfig,$insertMode);
 
 //get the image and the full path to the image