Changeset 937

Timestamp:

01/20/08 23:13:25 (5 years ago)

Author:

ray

Message:

#1132 [ExtendedFileManager] new Version

Location:

trunk

Files:

• XinhaCore.js (modified) (1 diff)
• XinhaLoader.js (modified) (1 diff)
• examples/XinhaConfig.js (modified) (3 diffs)
• plugins/ExtendedFileManager/assets/EditorContent.js (modified) (24 diffs)
• plugins/ExtendedFileManager/assets/dragTableCols.js (added)
• plugins/ExtendedFileManager/assets/editor.css (modified) (4 diffs)
• plugins/ExtendedFileManager/assets/editor.js (modified) (8 diffs)
• plugins/ExtendedFileManager/assets/editorFrame.css (modified) (1 diff)
• plugins/ExtendedFileManager/assets/editorFrame.js (modified) (4 diffs)
• plugins/ExtendedFileManager/assets/imagelist.css (modified) (2 diffs)
• plugins/ExtendedFileManager/assets/manager.css (modified) (1 diff)
• plugins/ExtendedFileManager/assets/manager.js (modified) (5 diffs)
• plugins/ExtendedFileManager/assets/popup.js (modified) (1 diff)
• plugins/ExtendedFileManager/assets/wz_jsgraphics.js (modified) (6 diffs)
• plugins/ExtendedFileManager/config.inc.php (modified) (4 diffs)
• plugins/ExtendedFileManager/editor.php (added)
• plugins/ExtendedFileManager/editorFrame.php (modified) (2 diffs)
• plugins/ExtendedFileManager/extended-file-manager.js (modified) (5 diffs)
• plugins/ExtendedFileManager/images.php (modified) (12 diffs)
• plugins/ExtendedFileManager/lang/de.js (modified) (2 diffs)
• plugins/ExtendedFileManager/manager.php (modified) (7 diffs)
• plugins/ImageManager/Classes/GD.php (modified) (9 diffs)
• plugins/ImageManager/Classes/IM.php (modified) (2 diffs)
• plugins/ImageManager/Classes/ImageEditor.php (modified) (7 diffs)
• plugins/ImageManager/editor.php (modified) (1 diff)

trunk/XinhaCore.js

@@ -5341 +5341 @@
 };
 
+/** Adds a function that is executed in the moment the DOM is ready, but as opposed to window.onload before images etc. have been loaded
+*   http://dean.edwards.name/weblog/2006/06/again/
+*  @public
+*  @author Dean Edwards/Matthias Miller/ John Resig / Raimund Meyer
+*  @param {Function}  func the function to be executed
+*  @param {Window}    scope the window that is listened to
+*/
+Xinha.addOnloadHandler = function (func, scope)
+{
+ scope = scope ? scope : window;
+
+ var init = function ()
+ {
+   // quit if this function has already been called
+   if (arguments.callee.done) return;
+   // flag this function so we don't do the same thing twice
+   arguments.callee.done = true;
+   // kill the timer
+   if (_timer) clearInterval(_timer);
+
+   func();
+ }
+ if (Xinha.is_ie)
+ {
+   scope.document.write("<sc"+"ript id=__ie_onload defer src=javascript:void(0)><\/script>");
+   var script = scope.document.getElementById("__ie_onload");
+      script.onreadystatechange = function()
+   {
+     if (this.readyState == "loaded") // We want this as early as possible, so I changed 'complete' to 'loaded', because otherwise it fired even after window.onload
+     {
+                this.parentNode.removeChild(script);
+       init(); // call the onload handler
+     }
+   };
+ }
+ else if (/applewebkit|KHTML/i.test(navigator.userAgent) ) /* Safari/WebKit/KHTML */
+ {
+   var _timer = scope.setInterval(function()
+   {
+     if (/loaded|complete/.test(scope.document.readyState))
+     {
+       init(); // call the onload handler
+     }
+   }, 10);
+ }
+ else /* for Mozilla/Opera9 */
+ {
+   scope.document.addEventListener("DOMContentLoaded", init, false);
+
+ }
+ Xinha._addEvent(scope, 'load', init); // incase anything went wrong
+};
+
 /**
  * Adds a standard "DOM-0" event listener to an element.

trunk/XinhaLoader.js

@@ -174 +174 @@
   }
 }
+Xinha.addOnloadHandler = function (func)
+{
+  // Dean Edwards/Matthias Miller/John Resig 
+  // http://dean.edwards.name/weblog/2006/06/again/
+  
+  var init = function ()
+  {
+    // quit if this function has already been called
+    if (arguments.callee.done) return;
+    // flag this function so we don't do the same thing twice
+    arguments.callee.done = true;
+    // kill the timer
+    if (_timer) clearInterval(_timer);
+    
+    func.call();
+  }
+  if (Xinha.is_ie)
+  {
+    document.write("<sc"+"ript id=__ie_onload defer src=javascript:void(0)><\/script>");
+    var script = document.getElementById("__ie_onload");
+    script.onreadystatechange = function()
+    {
+      if (this.readyState == "complete")
+      {
+        init(); // call the onload handler
+      }
+    };
+  }
+  else if (/WebKit/i.test(navigator.userAgent))
+  {
+    var _timer = setInterval(function()
+    {
+      if (/loaded|complete/.test(document.readyState))
+      {
+        init(); // call the onload handler
+      }
+    }, 10);
+  }
+  else /* for Mozilla/Opera9 */
+  {
+    document.addEventListener("DOMContentLoaded", init, false);  
+  }
+}

trunk/examples/XinhaConfig.js

@@ -16 +16 @@
    * current page will just be skipped.
    ************************************************************************/
-  
+
   xinha_editors = xinha_editors ? xinha_editors :
   [
@@ -64 +64 @@
 
    xinha_config = xinha_config ? xinha_config() : new Xinha.Config();
-   
         
    // To adjust the styling inside the editor, we can load an external stylesheet like this
@@ -109 +108 @@
 }
 
-Xinha._addEvent(window,'load', xinha_init); // this executes the xinha_init function on page load 
-                                            // and does not interfere with window.onload properties set by other scripts
+Xinha.addOnloadHandler(xinha_init); // this executes the xinha_init function on page load
+                                     // and does not interfere with window.onload properties set by other scripts
+

trunk/plugins/ExtendedFileManager/assets/EditorContent.js

@@ -4 +4 @@
  * Version: Updated on 08-01-2005 by Afru
  * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
+ * Version: Updated on 04-11-2007 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  * http://www.afrusoft.com/htmlarea
  */
@@ -47 +48 @@
    if(el) {e=(document.layers)?el:el.style;
    var xx=parseInt(x+ox+a),yy=parseInt(y+oy+b);
-   //alert(xx+":"+yy);
    if(navigator.appName=="Netscape" && parseInt(navigator.appVersion)>4){xx+="px";yy+="px";}
    if(navigator.appVersion.indexOf("MSIE 5")>-1 && navigator.appVersion.indexOf("Mac")>-1){
@@ -53 +53 @@
     xx+="px";yy+="px";}e.left=xx;e.top=yy;}
     pic_x = parseInt(xx); pic_y = parseInt(yy);
-    //alert(xx+":"+yy);
     }
 }
@@ -65 +64 @@
 function init_resize()
 {
-    if(mode == "scale")
-    {
+    //if(mode == "scale")
+    //{
         P7_Snap('theImage','ant',0,0);
 
@@ -88 +87 @@
         drawBoundHandle();
         jg_doc.paint();
-    }
+    //}
 }
 
@@ -99 +98 @@
     if (markerImg.src.indexOf("img/t_white.gif")>0)
         toggleMarker() ;
+        var theImage = document.getElementById('theImage');
+        theImage._width = theImage.width;
+        theImage._height = theImage.height;
 }
 
@@ -141 +143 @@
 function toggleMarker()
 {
-    //alert("Toggle");
     if (ant == null)
         ant = MM_findObj("ant");
@@ -163 +164 @@
     if (dragapproved)
     {
-        //z.style.left=ns6? temp1+e.clientX-x: temp1+event.clientX-x
-        //z.style.top=ns6? temp2+e.clientY-y : temp2+event.clientY-y
-        var w = ns6? temp1+e.clientX - x : temp1+event.clientX - x;
-        var h = ns6? temp2+e.clientY - y : temp2+event.clientY - y;
-
-        //alert(canvas.style.left);
-        /*if (status !=null)
-        {
-            status.innerHTML  = "x:"+x+" y:"+y+" w:"+w+" h:"+h+" can_h:"+pic_height;
-            status.innerHTML += " can_w:"+pic_width+" px:"+pic_x+" py:"+pic_y;
-            status.innerHTML += " pix:"+image.style.left+" piy:"+image.style.top+" obj:"+obj.id;
-        }*/
-
-        /*jg_doc.clear();
-        jg_doc.fillRectPattern(0,0,Math.abs(w),Math.abs(h),pattern);
-        jg_doc.paint();
-*/
+        var w = ns6? temp1+e.pageX - x : temp1+event.clientX + document.body.scrollLeft- x;
+        var h = ns6? temp2+e.pageY - y : temp2+event.clientY  + document.body.scrollTop - y;
+
         if (ant != null)
         {
@@ -218 +205 @@
         var dy =ns6? oa_y + e.clientY-y : oa_y + event.clientY-y
 
-        /*if (status !=null)
-        {
-            status.innerHTML  = "x:"+x+" y:"+y+" dx:"+dx+" dy:"+dy;
-        }*/
-
         ant.style.left = dx;
         ant.style.top = dy;
@@ -232 +214 @@
 }
 
-//Code add for constraints by Frédéric Klee <fklee@isuisse.com>
+//Code add for constraints by Frédéric Klee <fklee@isuisse.com>
 function moveHandle(e)
 {
@@ -370 +352 @@
                 content.height = 0;
             }
-            //alert(content.width+":"+content.height);
         }
         resizeHandle = firedobj.id;
-
-        /*if(status!=null) {
-            status.innerHTML  = " obj:"+firedobj.id;
-        }*/
 
         x=ns6? e.clientX: event.clientX
@@ -411 +388 @@
                 content.height = 0;
             }
-            //alert(content.width+":"+content.height);
         }
 
@@ -440 +416 @@
         temp1=parseInt(z.style.left+0)
         temp2=parseInt(z.style.top+0)
-        x=ns6? e.clientX: event.clientX
-        y=ns6? e.clientY: event.clientY
+          
+        x=ns6? e.pageX: event.clientX + document.body.scrollLeft
+        y=ns6? e.pageY: event.clientY + document.body.scrollTop
         document.onmousemove=move
         return false
@@ -453 +430 @@
                 canvas = MM_findObj("imgCanvas");
 
-            x=ns6? e.clientX: event.clientX
-            y=ns6? e.clientY: event.clientY
-
-                //jg_doc.draw
+            x=ns6? e.pageX: event.clientX + document.body.scrollLeft
+            y=ns6? e.pageY: event.clientY + document.body.scrollTop
+
             dragapproved=true
             document.onmousemove=measure
@@ -468 +444 @@
     if (dragapproved)
     {
-        mx2 = ns6? e.clientX : event.clientX;
-        my2 = ns6? e.clientY : event.clientY;
+        mx2 = ns6? e.pageX : event.clientX + document.body.scrollLeft;
+        my2 = ns6? e.pageY : event.clientY + document.body.scrollTop;
 
         jg_doc.clear();
@@ -569 +545 @@
     jg_doc.drawHandleBox(ax-4, ay+ah/2-4,8,8,"w-resize"); //left middle
     jg_doc.drawHandleBox(ax+aw-4, ay+ah/2-4,8,8,"e-resize"); //right middle
-
-    //jg_doc.paint();
 }
 
@@ -578 +552 @@
         return false;
     }
-
+    var zoom = 100 / parseInt( window.parent.document.getElementById('zoom').value, 10 );
     if(mode == "measure") {
-        //alert(pic_x);
+
         mx1 = x - pic_x;
         my1 = y - pic_y;
@@ -599 +573 @@
 
         if (m_sx != null && !isNaN(mx1))
-            m_sx.value = mx1+"px";
+            m_sx.value = mx1 * zoom +"px";
         if (m_sy != null && !isNaN(my1))
-            m_sy.value = my1+"px";
+            m_sy.value = my1 * zoom+"px";
         if(m_w != null && !isNaN(mw))
-            m_w.value = mw + "px";
+            m_w.value = mw * zoom + "px";
         if(m_h != null && !isNaN(mh))
-            m_h.value = mh + "px";
+            m_h.value = mh * zoom + "px";
 
         if(m_d != null && !isNaN(md))
-            m_d.value = md + "px";
+            m_d.value = md * zoom + "px";
         if(m_a != null && !isNaN(ma))
             m_a.value = ma + "";
@@ -615 +589 @@
             r_ra.value = ma;
 
-        //alert("mx1:"+mx1+" my1"+my1);
         return false;
     }
@@ -644 +617 @@
     if(mode == 'crop') {
         if(t_cx != null)
-            t_cx.value = cx;
+            t_cx.value = cx * zoom ;
         if (t_cy != null)
-            t_cy.value = cy;
+            t_cy.value = cy * zoom ;
         if(t_cw != null)
-            t_cw.value = cw;
+            t_cw.value = cw * zoom ;
         if (t_ch != null)
-            t_ch.value = ch;
+            t_ch.value = ch * zoom ;
     }
     else if(mode == 'scale') {
@@ -662 +635 @@
         }
         if (s_sw != null)
-            s_sw.value = sw;
+            s_sw.value = sw * zoom ;
         if (s_sh != null)
-            s_sh.value = sh;
-    }
-
+            s_sh.value = sh * zoom ;
+    }
 }
 
@@ -698 +670 @@
                 content.height = ah-1;
             }
-            //alert(content.width+":"+content.height);
         }
         if(mode == "crop") {
@@ -718 +689 @@
         }
         else if(mode == "scale") {
-            //alert("Resizing: iw:"+image.width+" nw:"+aw);
             document.theImage.height = ah;
             document.theImage.width = aw;
@@ -725 +695 @@
 
             P7_Snap('theImage','ant',0,0);
-
-            //alert("After Resizing: iw:"+image.width+" nw:"+aw);
         }
 

trunk/plugins/ExtendedFileManager/assets/editor.css

@@ -8 +8 @@
                 #indicator
                 {
-                        width: 25px;
+                        width: 20px;
                         height: 20px;
                         background-color: #eef;                 
                         padding: 15px 20px;
-                        position: absolute;
-                        left: 0; top: 0;
                 }
                 * html #indicator
@@ -21 +19 @@
                 #tools
                 {
-                        width: 600px;
-                        height: 50px;
                         background-color: #eef;
                         padding: 0;
-                        position: absolute;
-                        left: 63px;
                         border-left: 1px solid white;
                         border-bottom: 1px solid white;
@@ -32 +26 @@
                 #toolbar
                 {
-                        width: 53px;
-                        height: 435px;
                         background-color: #eef;
-                        float: left;
                         text-align: center;
                         padding: 5px;
-                        position: absolute;
-                        top: 50px;
                         border-top: 1px solid white;
                         border-right: 1px solid white;
+                        vertical-align: top;
+                        width:50px;
                 }
                 
                 #contents
                 {
-                        width: 600px;
-                        height: 445px;
-                        position: absolute;
-                        left: 64px; top: 51px;
+                        position: relative;
                 }
                 
                 #editor
                 {
-                        width: 600px;
-                        height: 445px;
+                        width: 100%;
+                        height: 100%;
                 }
 
@@ -120 +108 @@
                         vertical-align: middle;
                 }
-                #tools #tool_inputs
+                #tools .tool_inputs
                 {
                         padding-top: 10px;

trunk/plugins/ExtendedFileManager/assets/editor.js

@@ -4 +4 @@
  * Version: Updated on 08-01-2005 by Afru
  * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  */
 
@@ -40 +40 @@
 
         //constraints on the scale,
-        //code by Frédéric Klee <fklee@isuisse.com>
+        //code by Frédéric Klee <fklee@isuisse.com>
         if(action == 'scale')
         {
             var theImage = editor.window.document.getElementById('theImage');
-            orginal_width = theImage.width ;
-            orginal_height = theImage.height;
+            orginal_width = theImage._width ;
+            orginal_height = theImage._height;
 
             var w = document.getElementById('sw');
@@ -52 +52 @@
             h.value = orginal_height ;
         }
-
+                if ( action == 'save' )
+                {
+                        var formatSelect = document.getElementById('save_format');
+                        var format = document.getElementById('save_filename').value.match(/\.(gif|png|jpe?g)/i)[1].toLowerCase();
+                        switch ( format )
+                        {
+                                case 'png':
+                                        formatSelect.selectedIndex = '3';
+                                break;
+                                case 'gif':
+                                        formatSelect.selectedIndex = '4';
+                                break;
+                                default:
+                                        formatSelect.selectedIndex = '0';
+                                break;
+                        }
+                        formatSelect.onchange();
+                }
     }
 }
@@ -70 +87 @@
 }
 
-//Togggle constraints, by Frédéric Klee <fklee@isuisse.com>
+//Togggle constraints, by Frédéric Klee <fklee@isuisse.com>
 function toggleConstraints()
 {
@@ -92 +109 @@
 }
 
-//check the constraints, by Frédéric Klee <fklee@isuisse.com>
+//check the constraints, by Frédéric Klee <fklee@isuisse.com>
 function checkConstrains(changed)
 {
@@ -133 +150 @@
 }
 
+function rotateSubActionSelect(selection)
+{
+        var value = selection.options[selection.selectedIndex].value;
+        
+        var rotate_preset_select = document.getElementById('rotate_preset_select');
+        var flip = document.getElementById('flip');
+        var angle = document.getElementById('ra').parentNode;
+        
+        switch (value)
+        {
+                case 'rotate':
+                        rotate_preset_select.style.display = '';
+                        flip.style.display = 'none';
+                        angle.style.display = '';
+                break;
+                case 'flip':
+                        rotate_preset_select.style.display = 'none';
+                        flip.style.display = '';
+                        angle.style.display = 'none';
+                break;
+        }
+}
 function rotatePreset(selection)
 {
@@ -148 +187 @@
 
     var values = selected.split(",");
+        if ( values[0] != 'jpeg' ) document.getElementById('slider').style.display = 'none';
+        else document.getElementById('slider').style.display = 'inline';
     if(values.length >1) {
         updateSlider(parseInt(values[1]));
     }
 
+}
+function zoom()
+{
+        var theImage = editor.window.document.getElementById('theImage');
+        var value = document.getElementById('zoom').value;
+        theImage.width = theImage._width * parseInt( value, 10 ) / 100; 
+        theImage.height = theImage._height * parseInt( value, 10 )/ 100;
+        editor.reset();
+        editor.pic_width = null;
+        editor.pic_height = null;
 }
 function addEvent(obj, evType, fn)
@@ -160 +211 @@
 }
 
-init = function()
-{
-    var bottom = document.getElementById('bottom');
+var init = function()
+{
     if(window.opener)
     {
-        __dlg_init(null, {width: 673, height: 531});
+        __xinha_dlg_init();
         __dlg_translate('ExtendedFileManager');
     }
-}
-
-addEvent(window, 'load', init);
+        addEvent(window, 'resize', winOnResize);
+        try { window.moveTo(0,0); } catch (e) {}
+        window.resizeTo(window.screen.availWidth,window.screen.availHeight);
+        winOnResize();
+}
+function winOnResize ()
+{
+        if ( typeof editor.reset == 'function' && typeof editor.ant != 'undefined'  ) editor.reset();
+        var win = Xinha.viewportSize(window);
+        document.getElementById("contents").style.height = win.y - parseInt(document.getElementById("indicator").offsetHeight,10) - 5 + 'px';
+}
+Xinha.addOnloadHandler( init, window );

trunk/plugins/ExtendedFileManager/assets/editorFrame.css

@@ -7 +7 @@
 .handleBox{ z-index:105; }
 .error { font-size:large; font-weight:bold; color:#c00; font-family: Helvetica, sans-serif; } 
+
+#n-resize  {cursor: n-resize  }
+#s-resize  {cursor: s-resize  }
+#w-resize  {cursor: w-resize  }
+#e-resize  {cursor: e-resize  }
+#nw-resize {cursor: nw-resize }
+#sw-resize {cursor: sw-resize }
+#ne-resize {cursor: ne-resize }
+#se-resize {cursor: se-resize }

trunk/plugins/ExtendedFileManager/assets/editorFrame.js

@@ -4 +4 @@
  * Version: Updated on 08-01-2005 by Afru
  * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  * http://www.afrusoft.com/htmlarea
  */
@@ -49 +50 @@
     else if (action == 'rotate')
     {
-        var flip = topDoc.getElementById('flip');
+        var rotate_sub_action = topDoc.getElementById('rotate_sub_action');
 
-        if(flip.value == 'hoz' || flip.value == 'ver')
-            location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=flip&params="+flip.value;
+        if(rotate_sub_action.value == 'flip')
+            location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=flip&params="+topDoc.getElementById('flip').value;
         else if (isNaN(parseFloat(r_ra.value))==false)
             location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=rotate&params="+parseFloat(r_ra.value);
@@ -69 +70 @@
         {
             var filename = encodeURI(s_file.value);
-            var quality = parseInt(s_quality.value);
-            var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=save&params="+format[0]+","+quality+"&file="+filename;
-            //alert(url);
-            location.href = url;
+                        var quality = parseInt(s_quality.value);
+                        var format = s_format.value.split(",");
+                        var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=save&params="+format[0]+","+quality+"&file="+filename;
+                location.href = url;
         }
     }
+        else if (action == 'preview') {
+                var s_format = topDoc.getElementById('save_format');
+        var s_quality = topDoc.getElementById('quality');
+                var quality = parseInt(s_quality.value);
+                var format = s_format.value.split(",");
+                var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=preview&params="+format[0]+","+quality+"&file="+filename;
+        location.href = url;
+        }
 }
 
@@ -90 +99 @@
     jg_doc = new jsGraphics("imgCanvas"); // draw directly into document
     jg_doc.setColor("#000000"); // black
-
+        
     initEditor();
+        if (window.parent.document.getElementById('zoom').value != '100') window.parent.zoom();
+        reset();
+        window.parent.document.getElementById('filesize').innerHTML = fileSize; 
 };
 

trunk/plugins/ExtendedFileManager/assets/imagelist.css

@@ -30 +30 @@
   padding:5px;
   text-decoration:none;
+  overflow:hidden;
 }
 
@@ -42 +43 @@
 }
 
-.listview { width:100% }
+.listview { width:100%; }
 .listview td, .listview th { text-align:left; font-size:small; }
-.listview td.actions { text-align: right; }
+.listview td.actions { text-align: right;width:111px }
 .listview td.actions img { border:0; }
 
-.listview thead th {background-color: ButtonFace; border: 1px solid threedface; border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; padding-top:2px; padding-bottom:2px; padding-left: 5px; padding-right: 5px; font-size: 9pt; font-family: "MS Sans Serif", Geneva, sans-serif;}
-.listview tbody td, .listview tbody th {padding-top:2px; padding-left: 3px; font-size: 9pt; font-family: "MS Sans Serif", Geneva, sans-serif;}
+.listview thead th {background-color: ButtonFace; border: 1px solid threedface; border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; padding-top:2px; padding-bottom:2px; padding-left: 5px; padding-right: 5px; font-size: 9pt; font-family: "MS Sans Serif", "Bitstream Vera Sans", Geneva, Sans, sans-serif;font-weight:normal}
+.listview tbody td, .listview tbody th {overflow:hidden; padding-top:2px; padding-left: 3px; font-size: 9pt;  font-family: "MS Sans Serif", "Bitstream Vera Sans", Geneva, Sans, sans-serif;}
 .listview tbody a, listview tbody a:visited { font-weight: normal; text-decoration: none; color: #000; border:0px; padding:2px;}
 .listview tbody a:hover { background-color:#0B256B; color:#fff;}
 
-.listview tbody tr:hover {background-color: rgb(221,221,255);
+.listview tbody tr:hover {background-color: rgb(221,221,255)};

trunk/plugins/ExtendedFileManager/assets/manager.css

@@ -18 +18 @@
 .buttons { width: 70px; text-align: center; }
 .clearboth{ clear: both; }
-#messages { position: relative; left: 175px; top: 115px; background-color: white; width:200px;  float: left; margin-top: -52px; border: 1px solid #ccc; text-align: center; padding: 15px; }
+#messages {opacity:0.8;filter:Alpha(opacity=85);position:relative;height:20px;margin-bottom:-30px;background-color: white;  border: none; text-align: center; padding: 5px; }
 #message  { font-size: 15px; font-weight: bold; color: #69c; }
 iframe { border:1px inset; border-right:none; border-left:none; border-bottom:none; }
-
+#controls {padding-bottom:10px;}
 table { margin-top:10px; }
 th, td { padding-right:3px; text-align:left; font-family:small-caption,helvetica,sans-serif; }

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -5 +5 @@
  * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
  * Version: Updated on 17-11-2006 by Raimund Meyer
- * Package: ExtendedFileManager (EFM 1.1.3)
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  * http://www.afrusoft.com/htmlarea
  */
@@ -46 +47 @@
 }
 
-//initialise the form
-
-if (manager_mode == "link")
-{
-    var offsetForInputs = (Xinha.is_ie) ? 165 : 150;
-}
-else
-{
-    var offsetForInputs = (Xinha.is_ie) ? 230 : 210;
-}   
-
-var h =  100 // space above files 
-       + 250 // files iframe
-       + offsetForInputs; 
-
-var win_dim = {width:650,height:h};
-window.resizeTo(win_dim.width,win_dim.height);
-if (!Xinha.is_ie)
-{
-  var x = opener.screenX + (opener.outerWidth - win_dim.width) / 2;
-  var y = opener.screenY + (opener.outerHeight - win_dim.height) / 2;
-}
-else
-{//IE does not have window.outer... , so center it on the screen at least
-  var x =  (self.screen.availWidth - win_dim.width) / 2;
-  var y =  (self.screen.availHeight - win_dim.height) / 2;      
-}
-window.moveTo(x,y);
-
-init = function ()
-{
-    
-    
-    __dlg_init(null,  {width:650,height:h});
-
+function init ()
+{
+        if (typeof imgManager == 'undefined' )
+        {
+                setTimeout(init,10); // sometimes we are too hasty
+                return;
+        }
+        
+        var w = 650;
+        var h = 200;
+        
+        window.resizeTo(w,h);
+        var pageSize = Xinha.pageSize (window);
+
+        h = pageSize['y'] + 60;
+        
+        window.resizeTo(w,h);
+        if ( Xinha.ie_version == 7 )
+        {
+                window.resizeBy( 0, 40);
+                h += 40;
+        }
+        if (!Xinha.is_ie)
+        {
+          var x = opener.screenX + (opener.outerWidth - w) / 2;
+          var y = opener.screenY + (opener.outerHeight -h) / 2;
+        }
+        else
+        {//IE does not have window.outer... , so center it on the screen at least
+          var x =  (self.screen.availWidth -w) / 2;
+          var y =  (self.screen.availHeight - h) / 2;   
+        }
+        window.moveTo(x,y);
+        
+        __xinha_dlg_init();
     __dlg_translate('ExtendedFileManager');
 
@@ -221 +222 @@
         }
     }
+        iframeUrl = window.location.href.replace(_backend_url ,iframeUrl );
         if ( startDir )
-    {
-         Xinha._addEvent(imgManager,'load', function () {
-                changeDir(startDir);
-                var dirPath = document.getElementById('dirPath');
-                for(var i = 0; i < dirPath.options.length; i++)
-                {
-                    if(dirPath.options[i].value == encodeURIComponent(startDir))
-                    {
-                        dirPath.options[i].selected = true;
-                        break;
-                    }
-                }
-            } );
-    }
+        {
+                iframeUrl += '&dir=' + startDir;
+                var dirPath = document.getElementById('dirPath');
+                for(var i = 0; i < dirPath.options.length; i++)
+                {
+                        if(dirPath.options[i].value == encodeURIComponent(startDir))
+                        {
+                                dirPath.options[i].selected = true;
+                                break;
+                        }
+                }
+        };
+        imgManager.location.replace( iframeUrl );
+
     if (manager_mode == 'image' && typeof Xinha.colorPicker != "undefined" && document.getElementById('f_backgroundColor') && document.getElementById('f_backgroundColor').type == 'text') {
       // Hookup color pickers
@@ -249 +251 @@
       new Xinha.colorPicker.InputBinding(document.getElementById('f_borderColor'),pickerConfig);
     }
+        setTimeout(function() { addEvent(window, 'resize', resize); }, 500);
 }
 
@@ -548 +551 @@
 {
         var win = Xinha.viewportSize(window);
-        document.getElementById('imgManager').style.height = parseInt( win.y - 130 - offsetForInputs, 10 ) + 'px';
-        
+        var m = document.getElementById('messages');
+        var messagesHeight = (m && m.style.display != 'none' ) ?  parseInt( document.getElementById('messages').offsetHeight, 10 ) : 0;
+        document.getElementById('imgManager').style.height = parseInt( win.y - 130 - document.getElementById('controls').offsetHeight, 10 ) - messagesHeight  + 'px';
         return true;
 }
-addEvent(window, 'resize', resize);
-if (Xinha.is_gecko)
-{// this runs the init function (translation) before all the images in the iframe have loaded
-        document.addEventListener("DOMContentLoaded", init, false);
-}
-else
-{
-        addEvent(window, 'load', init);
-}
+
+Xinha.addOnloadHandler( init, window );

trunk/plugins/ExtendedFileManager/assets/popup.js

@@ -16 +16 @@
         opener.Dialog._return(null);
 }
+function __dlg_init( bottom, win_dim ) {
+  __xinha_dlg_init(win_dim);
+}
 
+function __xinha_dlg_init( win_dim ) {
+  if(window.__dlg_init_done) return true;
+  
+  if(window.opener._editor_skin) {
+    var head = document.getElementsByTagName("head")[0];
+    var link = document.createElement("link");
+    link.type = "text/css";
+    link.href = window.opener._editor_url + 'skins/' + window.opener._editor_skin + '/skin.css';
+    link.rel = "stylesheet";
+    head.appendChild(link);
+  }
+        window.dialogArguments = opener.Dialog._arguments;
+
+    Xinha.addDom0Event(document.body, 'keypress', __dlg_close_on_esc);
+  window.__dlg_init_done = true;
+}
 function __dlg_translate(context) {
     var types = ["span", "option", "td", "th", "button", "div", "label", "a","img", "legend"];

trunk/plugins/ExtendedFileManager/assets/wz_jsgraphics.js

@@ -1 +1 @@
 /***********************************************************************
-** Title.........:  Javascript Graphics
-** Version.......:  1.0
-** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
 ** Filename......:  wz_jsgraphics.js
-** Last changed..:  31 Aug 2003  
-** Notes.........:  Modified for Image Editor, added extra commands
+** Last changed..:  2 November 2007 by Raimund Meyer updated to new version  
+** Notes.........:  Modified by Xiang Wei ZHUO <wei@zhuo.org> for Image Editor, added extra commands l. 690-740
 **/ 
 
 /* This notice must be untouched at all times.
 
-wz_jsgraphics.js    v. 2.03
+wz_jsgraphics.js    v. 3.02
 The latest version is available at
 http://www.walterzorn.com
@@ -16 +13 @@
 or http://www.walterzorn.de
 
-Copyright (c) 2002-2003 Walter Zorn. All rights reserved.
-Created 3. 11. 2002 by Walter Zorn <walter@kreuzotter.de>
-Last modified: 11. 6. 2003
+Copyright (c) 2002-2004 Walter Zorn. All rights reserved.
+Created 3. 11. 2002 by Walter Zorn (Web: http://www.walterzorn.com )
+Last modified: 26. 10. 2007
+
+Performance optimizations for Internet Explorer
+by Thomas Frank and John Holdsworth.
+fillPolygon method implemented by Matthieu Haller.
 
 High Performance JavaScript Graphics Library.
 Provides methods
 - to draw lines, rectangles, ellipses, polygons
-  with specifiable line thickness,
-- to fill rectangles and ellipses
+        with specifiable line thickness,
+- to fill rectangles, polygons, ellipses and arcs
 - to draw text.
 NOTE: Operations, functions and branching have rather been optimized
 to efficiency and speed than to shortness of source code.
 
-This program is free software;
-you can redistribute it and/or modify it under the terms of the
-GNU General Public License as published by the Free Software Foundation;
-either version 2 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License
-at http://www.gnu.org/copyleft/gpl.html for more details.
+LICENSE: LGPL
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License (LGPL) as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA,
+or see http://www.gnu.org/copyleft/lesser.html
 */
 
-var jg_ihtm, jg_ie, jg_dom, jg_n4 = (document.layers && typeof document.classes != "undefined");
-
-function chkDHTM(x, i)
-{
-    x = document.body || null;
-    jg_ie = (x && typeof x.insertAdjacentHTML != "undefined");
-    jg_dom = (x && !jg_ie &&
-        typeof x.appendChild != "undefined" &&
-        typeof document.createRange != "undefined" &&
-        typeof (i = document.createRange()).setStartBefore != "undefined" &&
-        typeof i.createContextualFragment != "undefined");
-    jg_ihtm = (!jg_ie && !jg_dom && x && typeof x.innerHTML != "undefined");
-}
-
-function pntDoc()
-{
-    this.wnd.document.write(this.htm);
-    this.htm = '';
-}
-
-function pntCnvDom()
-{
-    var x = document.createRange();
-    x.setStartBefore(this.cnv);
-    x = x.createContextualFragment(this.htm);
-    this.cnv.appendChild(x);
-    this.htm = '';
-}
-
-function pntCnvIe()
-{
-    this.cnv.insertAdjacentHTML("BeforeEnd", this.htm);
-    this.htm = '';
-}
-
-function pntCnvIhtm()
-{
-    this.cnv.innerHTML += this.htm;
-    this.htm = '';
-}
-
-function pntCnv()
-{
-    this.htm = '';
-}
-
-function mkDiv(x, y, w, h)
-{
-    this.htm += '<div style="position:absolute;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+w+'px,'+h+'px,0);'+
-        'overflow:hidden;background-color:' + this.color + ';'+
-        '"><\/div>';
-
-    //alert(this.htm);
-}
-
-function mkDivPrint(x, y, w, h)
-{
-    this.htm += '<div style="position:absolute;'+
-        'border-left:' + w + 'px solid ' + this.color + ';'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+w+'px,'+h+'px,0);'+
-        'overflow:hidden;background-color:' + this.color + ';'+
-        '"><\/div>';
-}
-
-function mkLyr(x, y, w, h)
-{
-    this.htm += '<layer '+
-        'left="' + x + '" '+
-        'top="' + y + '" '+
-        'width="' + w + '" '+
-        'height="' + h + '" '+
-        'bgcolor="' + this.color + '"><\/layer>\n';
-}
-
-function mkLbl(txt, x, y)
-{
-    this.htm += '<div style="position:absolute;white-space:nowrap;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'font-family:' +  this.ftFam + ';'+
-        'font-size:' + this.ftSz + ';'+
-        'color:' + this.color + ';' + this.ftSty + '">'+
-        txt +
-        '<\/div>';
-}
-
-function mkLin(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1;
-
-    if (dx >= dy)
-    {
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx,
-        ox = x;
-        while ((dx--) > 0)
-        {
-            ++x;
-            if (p > 0)
-            {
-                this.mkDiv(ox, y, x-ox, 1);
-                y += yIncr;
-                p += pru;
-                ox = x;
-            }
-            else p += pr;
-        }
-        this.mkDiv(ox, y, x2-ox+1, 1);
-    }
-
-    else
-    {
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy,
-        oy = y;
-        if (y2 <= y1)
-        {
-            while ((dy--) > 0)
-            {
-                if (p > 0)
-                {
-                    this.mkDiv(x++, y, 1, oy-y+1);
-                    y += yIncr;
-                    p += pru;
-                    oy = y;
-                }
-                else
-                {
-                    y += yIncr;
-                    p += pr;
-                }
-            }
-            this.mkDiv(x2, y2, 1, oy-y2+1);
-        }
-        else
-        {
-            while ((dy--) > 0)
-            {
-                y += yIncr;
-                if (p > 0)
-                {
-                    this.mkDiv(x++, oy, 1, y-oy);
-                    p += pru;
-                    oy = y;
-                }
-                else p += pr;
-            }
-            this.mkDiv(x2, oy, 1, y2-oy+1);
-        }
-    }
-}
-
-function mkLin2D(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1;
-
-
-    var s = this.stroke;
-    if (dx >= dy)
-    {
-        if (s-0x3 > 0)
-        {
-            var _s = (s*dx*Math.sqrt(1+dy*dy/(dx*dx))-dx-(s>>1)*dy) / dx;
-            _s = (!(s-0x4)? Math.ceil(_s) : Math.round(_s)) + 1;
-        }
-        else var _s = s;
-        var ad = Math.ceil(s/2);
-
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx,
-        ox = x;
-        while ((dx--) > 0)
-        {
-            ++x;
-            if (p > 0)
-            {
-                this.mkDiv(ox, y, x-ox+ad, _s);
-                y += yIncr;
-                p += pru;
-                ox = x;
-            }
-            else p += pr;
-        }
-        this.mkDiv(ox, y, x2-ox+ad+1, _s);
-    }
-
-    else
-    {
-        if (s-0x3 > 0)
-        {
-            var _s = (s*dy*Math.sqrt(1+dx*dx/(dy*dy))-(s>>1)*dx-dy) / dy;
-            _s = (!(s-0x4)? Math.ceil(_s) : Math.round(_s)) + 1;
-        }
-        else var _s = s;
-        var ad = Math.round(s/2);
-
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy,
-        oy = y;
-        if (y2 <= y1)
-        {
-            ++ad;
-            while ((dy--) > 0)
-            {
-                if (p > 0)
-                {
-                    this.mkDiv(x++, y, _s, oy-y+ad);
-                    y += yIncr;
-                    p += pru;
-                    oy = y;
-                }
-                else
-                {
-                    y += yIncr;
-                    p += pr;
-                }
-            }
-            this.mkDiv(x2, y2, _s, oy-y2+ad);
-        }
-        else
-        {
-            while ((dy--) > 0)
-            {
-                y += yIncr;
-                if (p > 0)
-                {
-                    this.mkDiv(x++, oy, _s, y-oy+ad);
-                    p += pru;
-                    oy = y;
-                }
-                else p += pr;
-            }
-            this.mkDiv(x2, oy, _s, y2-oy+ad+1);
-        }
-    }
-}
-
-function mkLinDott(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1,
-    drw = true;
-    if (dx >= dy)
-    {
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx;
-        while ((dx--) > 0)
-        {
-            if (drw) this.mkDiv(x, y, 1, 1);
-            drw = !drw;
-            if (p > 0)
-            {
-                y += yIncr;
-                p += pru;
-            }
-            else p += pr;
-            ++x;
-        }
-        if (drw) this.mkDiv(x, y, 1, 1);
-    }
-
-    else
-    {
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy;
-        while ((dy--) > 0)
-        {
-            if (drw) this.mkDiv(x, y, 1, 1);
-            drw = !drw;
-            y += yIncr;
-            if (p > 0)
-            {
-                ++x;
-                p += pru;
-            }
-            else p += pr;
-        }
-        if (drw) this.mkDiv(x, y, 1, 1);
-    }
-}
-
-function mkOv(left, top, width, height)
-{
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = (height&1)+1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    ox = 0, oy = b,
-    aa = (a*a)<<1, bb = (b*b)<<1,
-    st = (aa>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa*((b<<1)-1),
-    w, h;
-    while (y > 0)
-    {
-        if (st < 0)
-        {
-            st += bb*((x<<1)+0x3);
-            tt += (bb<<1)*(++x);
-        }
-        else if (tt < 0)
-        {
-            st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-            tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-            w = x-ox;
-            h = oy-y;
-            if (w&0x2 && h&0x2)
-            {
-                this.mkOvQds(cx, cy, -x+0x2, ox+wod, -oy, oy-1+hod, 1, 1);
-                this.mkOvQds(cx, cy, -x+1, x-1+wod, -y-1, y+hod, 1, 1);
-            }
-            else this.mkOvQds(cx, cy, -x+1, ox+wod, -oy, oy-h+hod, w, h);
-            ox = x;
-            oy = y;
-        }
-        else
-        {
-            tt -= aa*((y<<1)-0x3);
-            st -= (aa<<1)*(--y);
-        }
-    }
-    this.mkDiv(cx-a, cy-oy, a-ox+1, (oy<<1)+hod);
-    this.mkDiv(cx+ox+wod, cy-oy, a-ox+1, (oy<<1)+hod);
-}
-
-function mkOv2D(left, top, width, height)
-{
-    var s = this.stroke;
-    width += s-1;
-    height += s-1;
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = (height&1)+1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    aa = (a*a)<<1, bb = (b*b)<<1,
-    st = (aa>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa*((b<<1)-1);
-
-
-    if (s-0x4 < 0 && (!(s-0x2) || width-0x33 > 0 && height-0x33 > 0))
-    {
-        var ox = 0, oy = b,
-        w, h,
-        pxl, pxr, pxt, pxb, pxw;
-        while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-                tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-                w = x-ox;
-                h = oy-y;
-
-                if (w-1)
-                {
-                    pxw = w+1+(s&1);
-                    h = s;
-                }
-                else if (h-1)
-                {
-                    pxw = s;
-                    h += 1+(s&1);
-                }
-                else pxw = h = s;
-                this.mkOvQds(cx, cy, -x+1, ox-pxw+w+wod, -oy, -h+oy+hod, pxw, h);
-                ox = x;
-                oy = y;
-            }
-            else
-            {
-                tt -= aa*((y<<1)-0x3);
-                st -= (aa<<1)*(--y);
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, s, (oy<<1)+hod);
-        this.mkDiv(cx+a+wod-s+1, cy-oy, s, (oy<<1)+hod);
-    }
-
-
-    else
-    {
-        var _a = (width-((s-1)<<1))>>1,
-        _b = (height-((s-1)<<1))>>1,
-        _x = 0, _y = _b,
-        _aa = (_a*_a)<<1, _bb = (_b*_b)<<1,
-        _st = (_aa>>1)*(1-(_b<<1)) + _bb,
-        _tt = (_bb>>1) - _aa*((_b<<1)-1),
-
-        pxl = new Array(),
-        pxt = new Array(),
-        _pxb = new Array();
-        pxl[0] = 0;
-        pxt[0] = b;
-        _pxb[0] = _b-1;
-        while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-                pxl[pxl.length] = x;
-                pxt[pxt.length] = y;
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-                tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-                pxl[pxl.length] = x;
-                pxt[pxt.length] = y;
-            }
-            else
-            {
-                tt -= aa*((y<<1)-0x3);
-                st -= (aa<<1)*(--y);
-            }
-
-            if (_y > 0)
-            {
-                if (_st < 0)
-                {
-                    _st += _bb*((_x<<1)+0x3);
-                    _tt += (_bb<<1)*(++_x);
-                    _pxb[_pxb.length] = _y-1;
-                }
-                else if (_tt < 0)
-                {
-                    _st += _bb*((_x<<1)+0x3) - (_aa<<1)*(_y-1);
-                    _tt += (_bb<<1)*(++_x) - _aa*(((_y--)<<1)-0x3);
-                    _pxb[_pxb.length] = _y-1;
-                }
-                else
-                {
-                    _tt -= _aa*((_y<<1)-0x3);
-                    _st -= (_aa<<1)*(--_y);
-                    _pxb[_pxb.length-1]--;
-                }
-            }
-        }
-
-        var ox = 0, oy = b,
-        _oy = _pxb[0],
-        l = pxl.length,
-        w, h;
-        for (var i = 0; i < l; i++)
-        {
-            if (typeof _pxb[i] != "undefined")
-            {
-                if (_pxb[i] < _oy || pxt[i] < oy)
-                {
-                    x = pxl[i];
-                    this.mkOvQds(cx, cy, -x+1, ox+wod, -oy, _oy+hod, x-ox, oy-_oy);
-                    ox = x;
-                    oy = pxt[i];
-                    _oy = _pxb[i];
-                }
-            }
-            else
-            {
-                x = pxl[i];
-                this.mkDiv(cx-x+1, cy-oy, 1, (oy<<1)+hod);
-                this.mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
-                ox = x;
-                oy = pxt[i];
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, 1, (oy<<1)+hod);
-        this.mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
-    }
-}
-
-function mkOvDott(left, top, width, height)
-{
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = height&1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    aa2 = (a*a)<<1, aa4 = aa2<<1, bb = (b*b)<<1,
-    st = (aa2>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa2*((b<<1)-1),
-    drw = true;
-    while (y > 0)
-    {
-        if (st < 0)
-        {
-            st += bb*((x<<1)+0x3);
-            tt += (bb<<1)*(++x);
-        }
-        else if (tt < 0)
-        {
-            st += bb*((x<<1)+0x3) - aa4*(y-1);
-            tt += (bb<<1)*(++x) - aa2*(((y--)<<1)-0x3);
-        }
-        else
-        {
-            tt -= aa2*((y<<1)-0x3);
-            st -= aa4*(--y);
-        }
-        if (drw) this.mkOvQds(cx, cy, -x, x+wod, -y, y+hod, 1, 1);
-        drw = !drw;
-    }
-}
-
-function mkRect(x, y, w, h)
-{
-    var s = this.stroke;
-    this.mkDiv(x, y, w, s);
-    this.mkDiv(x+w, y, s, h);
-    this.mkDiv(x, y+h, w+s, s);
-    this.mkDiv(x, y+s, s, h-s);
-}
-
-function mkRectDott(x, y, w, h)
-{
-    this.drawLine(x, y, x+w, y);
-    this.drawLine(x+w, y, x+w, y+h);
-    this.drawLine(x, y+h, x+w, y+h);
-    this.drawLine(x, y, x, y+h);
+
+var jg_ok, jg_ie, jg_fast, jg_dom, jg_moz;
+
+
+function _chkDHTM(x, i)
+{
+        x = document.body || null;
+        jg_ie = x && typeof x.insertAdjacentHTML != "undefined" && document.createElement;
+        jg_dom = (x && !jg_ie &&
+                typeof x.appendChild != "undefined" &&
+                typeof document.createRange != "undefined" &&
+                typeof (i = document.createRange()).setStartBefore != "undefined" &&
+                typeof i.createContextualFragment != "undefined");
+        jg_fast = jg_ie && document.all && !window.opera;
+        jg_moz = jg_dom && typeof x.style.MozOpacity != "undefined";
+        jg_ok = !!(jg_ie || jg_dom);
+}
+
+function _pntCnvDom()
+{
+        var x = this.wnd.document.createRange();
+        x.setStartBefore(this.cnv);
+        x = x.createContextualFragment(jg_fast? this._htmRpc() : this.htm);
+        if(this.cnv) this.cnv.appendChild(x);
+        this.htm = "";
+}
+
+function _pntCnvIe()
+{
+        if(this.cnv) this.cnv.insertAdjacentHTML("BeforeEnd", jg_fast? this._htmRpc() : this.htm);
+        this.htm = "";
+}
+
+function _pntDoc()
+{
+        this.wnd.document.write(jg_fast? this._htmRpc() : this.htm);
+        this.htm = '';
+}
+
+function _pntN()
+{
+        ;
+}
+
+function _mkDiv(x, y, w, h)
+{
+        this.htm += '<div style="position:absolute;'+
+                'left:' + x + 'px;'+
+                'top:' + y + 'px;'+
+                'width:' + w + 'px;'+
+                'height:' + h + 'px;'+
+                'clip:rect(0,'+w+'px,'+h+'px,0);'+
+                'background-color:' + this.color +
+                (!jg_moz? ';overflow:hidden' : '')+
+                ';"><\/div>';
+}
+
+function _mkDivIe(x, y, w, h)
+{
+        this.htm += '%%'+this.color+';'+x+';'+y+';'+w+';'+h+';';
+}
+
+function _mkDivPrt(x, y, w, h)
+{
+        this.htm += '<div style="position:absolute;'+
+                'border-left:' + w + 'px solid ' + this.color + ';'+
+                'left:' + x + 'px;'+
+                'top:' + y + 'px;'+
+                'width:0px;'+
+                'height:' + h + 'px;'+
+                'clip:rect(0,'+w+'px,'+h+'px,0);'+
+                'background-color:' + this.color +
+                (!jg_moz? ';overflow:hidden' : '')+
+                ';"><\/div>';
+}
+
+var _regex =  /%%([^;]+);([^;]+);([^;]+);([^;]+);([^;]+);/g;
+function _htmRpc()
+{
+        return this.htm.replace(
+                _regex,
+                '<div style="overflow:hidden;position:absolute;background-color:'+
+                '$1;left:$2;top:$3;width:$4;height:$5"></div>\n');
+}
+
+function _htmPrtRpc()
+{
+        return this.htm.replace(
+                _regex,
+                '<div style="overflow:hidden;position:absolute;background-color:'+
+                '$1;left:$2;top:$3;width:$4;height:$5;border-left:$4px solid $1"></div>\n');
+}
+
+function _mkLin(x1, y1, x2, y2)
+{
+        if(x1 > x2)
+        {
+                var _x2 = x2;
+                var _y2 = y2;
+                x2 = x1;
+                y2 = y1;
+                x1 = _x2;
+                y1 = _y2;
+        }
+        var dx = x2-x1, dy = Math.abs(y2-y1),
+        x = x1, y = y1,
+        yIncr = (y1 > y2)? -1 : 1;
+
+        if(dx >= dy)
+        {
+                var pr = dy<<1,
+                pru = pr - (dx<<1),
+                p = pr-dx,
+                ox = x;
+                while(dx > 0)
+                {--dx;
+                        ++x;
+                        if(p > 0)
+                        {
+                                this._mkDiv(ox, y, x-ox, 1);
+                                y += yIncr;
+                                p += pru;
+                                ox = x;
+                        }
+                        else p += pr;
+                }
+                this._mkDiv(ox, y, x2-ox+1, 1);
+        }
+
+        else
+        {
+                var pr = dx<<1,
+                pru = pr - (dy<<1),
+                p = pr-dy,
+                oy = y;
+                if(y2 <= y1)
+                {
+                        while(dy > 0)
+                        {--dy;
+                                if(p > 0)
+                                {
+                                        this._mkDiv(x++, y, 1, oy-y+1);
+                                        y += yIncr;
+                                        p += pru;
+                                        oy = y;
+                                }
+                                else
+                                {
+                                        y += yIncr;
+                                        p += pr;
+                                }
+                        }
+                        this._mkDiv(x2, y2, 1, oy-y2+1);
+                }
+                else
+                {
+                        while(dy > 0)
+                        {--dy;
+                                y += yIncr;
+                                if(p > 0)
+                                {
+                                        this._mkDiv(x++, oy, 1, y-oy);
+                                        p += pru;
+                                        oy = y;
+                                }
+                                else p += pr;
+                        }
+                        this._mkDiv(x2, oy, 1, y2-oy+1);
+                }
+        }
+}
+
+function _mkLin2D(x1, y1, x2, y2)
+{
+        if(x1 > x2)
+        {
+                var _x2 = x2;
+                var _y2 = y2;
+                x2 = x1;
+                y2 = y1;
+                x1 = _x2;
+                y1 = _y2;
+        }
+        var dx = x2-x1, dy = Math.abs(y2-y1),
+        x = x1, y = y1,
+        yIncr = (y1 > y2)? -1 : 1;
+
+        var s = this.stroke;
+        if(dx >= dy)
+        {
+                if(dx > 0 && s-3 > 0)
+                {
+                        var _s = (s*dx*Math.sqrt(1+dy*dy/(dx*dx))-dx-(s>>1)*dy) / dx;
+                        _s = (!(s-4)? Math.ceil(_s) : Math.round(_s)) + 1;
+                }
+                else var _s = s;
+                var ad = Math.ceil(s/2);
+
+                var pr = dy<<1,
+                pru = pr - (dx<<1),
+                p = pr-dx,
+                ox = x;
+                while(dx > 0)
+                {--dx;
+                        ++x;
+                        if(p > 0)
+                        {
+                                this._mkDiv(ox, y, x-ox+ad, _s);
+                                y += yIncr;
+                                p += pru;
+                                ox = x;
+                        }
+                        else p += pr;
+                }
+                this._mkDiv(ox, y, x2-ox+ad+1, _s);
+        }
+
+        else
+        {
+                if(s-3 > 0)
+                {
+                        var _s = (s*dy*Math.sqrt(1+dx*dx/(dy*dy))-(s>>1)*dx-dy) / dy;
+                        _s = (!(s-4)? Math.ceil(_s) : Math.round(_s)) + 1;
+                }
+                else var _s = s;
+                var ad = Math.round(s/2);
+
+                var pr = dx<<1,
+                pru = pr - (dy<<1),
+                p = pr-dy,
+                oy = y;
+                if(y2 <= y1)
+                {
+                        ++ad;
+                        while(dy > 0)
+                        {--dy;
+                                if(p > 0)
+                                {
+                                        this._mkDiv(x++, y, _s, oy-y+ad);
+                                        y += yIncr;
+                                        p += pru;
+                                        oy = y;
+                                }
+                                else
+                                {
+                                        y += yIncr;
+                                        p += pr;
+                                }
+                        }
+                        this._mkDiv(x2, y2, _s, oy-y2+ad);
+                }
+                else
+                {
+                        while(dy > 0)
+                        {--dy;
+                                y += yIncr;
+                                if(p > 0)
+                                {
+                                        this._mkDiv(x++, oy, _s, y-oy+ad);
+                                        p += pru;
+                                        oy = y;
+                                }
+                                else p += pr;
+                        }
+                        this._mkDiv(x2, oy, _s, y2-oy+ad+1);
+                }
+        }
+}
+
+function _mkLinDott(x1, y1, x2, y2)
+{
+        if(x1 > x2)
+        {
+                var _x2 = x2;
+                var _y2 = y2;
+                x2 = x1;
+                y2 = y1;
+                x1 = _x2;
+                y1 = _y2;
+        }
+        var dx = x2-x1, dy = Math.abs(y2-y1),
+        x = x1, y = y1,
+        yIncr = (y1 > y2)? -1 : 1,
+        drw = true;
+        if(dx >= dy)
+        {
+                var pr = dy<<1,
+                pru = pr - (dx<<1),
+                p = pr-dx;
+                while(dx > 0)
+                {--dx;
+                        if(drw) this._mkDiv(x, y, 1, 1);
+                        drw = !drw;
+                        if(p > 0)
+                        {
+                                y += yIncr;
+                                p += pru;
+                        }
+                        else p += pr;
+                        ++x;
+                }
+        }
+        else
+        {
+                var pr = dx<<1,
+                pru = pr - (dy<<1),
+                p = pr-dy;
+                while(dy > 0)
+                {--dy;
+                        if(drw) this._mkDiv(x, y, 1, 1);
+                        drw = !drw;
+                        y += yIncr;
+                        if(p > 0)
+                        {
+                                ++x;
+                                p += pru;
+                        }
+                        else p += pr;
+                }
+        }
+        if(drw) this._mkDiv(x, y, 1, 1);
+}
+
+function _mkOv(left, top, width, height)
+{
+        var a = (++width)>>1, b = (++height)>>1,
+        wod = width&1, hod = height&1,
+        cx = left+a, cy = top+b,
+        x = 0, y = b,
+        ox = 0, oy = b,
+        aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+        st = (aa2>>1)*(1-(b<<1)) + bb2,
+        tt = (bb2>>1) - aa2*((b<<1)-1),
+        w, h;
+        while(y > 0)
+        {
+                if(st < 0)
+                {
+                        st += bb2*((x<<1)+3);
+                        tt += bb4*(++x);
+                }
+                else if(tt < 0)
+                {
+                        st += bb2*((x<<1)+3) - aa4*(y-1);
+                        tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                        w = x-ox;
+                        h = oy-y;
+                        if((w&2) && (h&2))
+                        {
+                                this._mkOvQds(cx, cy, x-2, y+2, 1, 1, wod, hod);
+                                this._mkOvQds(cx, cy, x-1, y+1, 1, 1, wod, hod);
+                        }
+                        else this._mkOvQds(cx, cy, x-1, oy, w, h, wod, hod);
+                        ox = x;
+                        oy = y;
+                }
+                else
+                {
+                        tt -= aa2*((y<<1)-3);
+                        st -= aa4*(--y);
+                }
+        }
+        w = a-ox+1;
+        h = (oy<<1)+hod;
+        y = cy-oy;
+        this._mkDiv(cx-a, y, w, h);
+        this._mkDiv(cx+ox+wod-1, y, w, h);
+}
+
+function _mkOv2D(left, top, width, height)
+{
+        var s = this.stroke;
+        width += s+1;
+        height += s+1;
+        var a = width>>1, b = height>>1,
+        wod = width&1, hod = height&1,
+        cx = left+a, cy = top+b,
+        x = 0, y = b,
+        aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+        st = (aa2>>1)*(1-(b<<1)) + bb2,
+        tt = (bb2>>1) - aa2*((b<<1)-1);
+
+        if(s-4 < 0 && (!(s-2) || width-51 > 0 && height-51 > 0))
+        {
+                var ox = 0, oy = b,
+                w, h,
+                pxw;
+                while(y > 0)
+                {
+                        if(st < 0)
+                        {
+                                st += bb2*((x<<1)+3);
+                                tt += bb4*(++x);
+                        }
+                        else if(tt < 0)
+                        {
+                                st += bb2*((x<<1)+3) - aa4*(y-1);
+                                tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                                w = x-ox;
+                                h = oy-y;
+
+                                if(w-1)
+                                {
+                                        pxw = w+1+(s&1);
+                                        h = s;
+                                }
+                                else if(h-1)
+                                {
+                                        pxw = s;
+                                        h += 1+(s&1);
+                                }
+                                else pxw = h = s;
+                                this._mkOvQds(cx, cy, x-1, oy, pxw, h, wod, hod);
+                                ox = x;
+                                oy = y;
+                        }
+                        else
+                        {
+                                tt -= aa2*((y<<1)-3);
+                                st -= aa4*(--y);
+                        }
+                }
+                this._mkDiv(cx-a, cy-oy, s, (oy<<1)+hod);
+                this._mkDiv(cx+a+wod-s, cy-oy, s, (oy<<1)+hod);
+        }
+
+        else
+        {
+                var _a = (width-(s<<1))>>1,
+                _b = (height-(s<<1))>>1,
+                _x = 0, _y = _b,
+                _aa2 = (_a*_a)<<1, _aa4 = _aa2<<1, _bb2 = (_b*_b)<<1, _bb4 = _bb2<<1,
+                _st = (_aa2>>1)*(1-(_b<<1)) + _bb2,
+                _tt = (_bb2>>1) - _aa2*((_b<<1)-1),
+
+                pxl = new Array(),
+                pxt = new Array(),
+                _pxb = new Array();
+                pxl[0] = 0;
+                pxt[0] = b;
+                _pxb[0] = _b-1;
+                while(y > 0)
+                {
+                        if(st < 0)
+                        {
+                                pxl[pxl.length] = x;
+                                pxt[pxt.length] = y;
+                                st += bb2*((x<<1)+3);
+                                tt += bb4*(++x);
+                        }
+                        else if(tt < 0)
+                        {
+                                pxl[pxl.length] = x;
+                                st += bb2*((x<<1)+3) - aa4*(y-1);
+                                tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                                pxt[pxt.length] = y;
+                        }
+                        else
+                        {
+                                tt -= aa2*((y<<1)-3);
+                                st -= aa4*(--y);
+                        }
+
+                        if(_y > 0)
+                        {
+                                if(_st < 0)
+                                {
+                                        _st += _bb2*((_x<<1)+3);
+                                        _tt += _bb4*(++_x);
+                                        _pxb[_pxb.length] = _y-1;
+                                }
+                                else if(_tt < 0)
+                                {
+                                        _st += _bb2*((_x<<1)+3) - _aa4*(_y-1);
+                                        _tt += _bb4*(++_x) - _aa2*(((_y--)<<1)-3);
+                                        _pxb[_pxb.length] = _y-1;
+                                }
+                                else
+                                {
+                                        _tt -= _aa2*((_y<<1)-3);
+                                        _st -= _aa4*(--_y);
+                                        _pxb[_pxb.length-1]--;
+                                }
+                        }
+                }
+
+                var ox = -wod, oy = b,
+                _oy = _pxb[0],
+                l = pxl.length,
+                w, h;
+                for(var i = 0; i < l; i++)
+                {
+                        if(typeof _pxb[i] != "undefined")
+                        {
+                                if(_pxb[i] < _oy || pxt[i] < oy)
+                                {
+                                        x = pxl[i];
+                                        this._mkOvQds(cx, cy, x, oy, x-ox, oy-_oy, wod, hod);
+                                        ox = x;
+                                        oy = pxt[i];
+                                        _oy = _pxb[i];
+                                }
+                        }
+                        else
+                        {
+                                x = pxl[i];
+                                this._mkDiv(cx-x, cy-oy, 1, (oy<<1)+hod);
+                                this._mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
+                                ox = x;
+                                oy = pxt[i];
+                        }
+                }
+                this._mkDiv(cx-a, cy-oy, 1, (oy<<1)+hod);
+                this._mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
+        }
+}
+
+function _mkOvDott(left, top, width, height)
+{
+        var a = (++width)>>1, b = (++height)>>1,
+        wod = width&1, hod = height&1, hodu = hod^1,
+        cx = left+a, cy = top+b,
+        x = 0, y = b,
+        aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+        st = (aa2>>1)*(1-(b<<1)) + bb2,
+        tt = (bb2>>1) - aa2*((b<<1)-1),
+        drw = true;
+        while(y > 0)
+        {
+                if(st < 0)
+                {
+                        st += bb2*((x<<1)+3);
+                        tt += bb4*(++x);
+                }
+                else if(tt < 0)
+                {
+                        st += bb2*((x<<1)+3) - aa4*(y-1);
+                        tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                }
+                else
+                {
+                        tt -= aa2*((y<<1)-3);
+                        st -= aa4*(--y);
+                }
+                if(drw && y >= hodu) this._mkOvQds(cx, cy, x, y, 1, 1, wod, hod);
+                drw = !drw;
+        }
+}
+
+function _mkRect(x, y, w, h)
+{
+        var s = this.stroke;
+        this._mkDiv(x, y, w, s);
+        this._mkDiv(x+w, y, s, h);
+        this._mkDiv(x, y+h, w+s, s);
+        this._mkDiv(x, y+s, s, h-s);
+}
+
+function _mkRectDott(x, y, w, h)
+{
+        this.drawLine(x, y, x+w, y);
+        this.drawLine(x+w, y, x+w, y+h);
+        this.drawLine(x, y+h, x+w, y+h);
+        this.drawLine(x, y, x, y+h);
 }
 
 function jsgFont()
 {
-    this.PLAIN = 'font-weight:normal;';
-    this.BOLD = 'font-weight:bold;';
-    this.ITALIC = 'font-style:italic;';
-    this.ITALIC_BOLD = this.ITALIC + this.BOLD;
-    this.BOLD_ITALIC = this.ITALIC_BOLD;
+        this.PLAIN = 'font-weight:normal;';
+        this.BOLD = 'font-weight:bold;';
+        this.ITALIC = 'font-style:italic;';
+        this.ITALIC_BOLD = this.ITALIC + this.BOLD;
+        this.BOLD_ITALIC = this.ITALIC_BOLD;
 }
 var Font = new jsgFont();
@@ -622 +626 @@
 function jsgStroke()
 {
-    this.DOTTED = -1;
-}
-
+        this.DOTTED = -1;
+}
 var Stroke = new jsgStroke();
 
-function jsGraphics(id, wnd)
-{
-    this.setColor = new Function('arg', 'this.color = arg;');
-
-
+function jsGraphics(cnv, wnd)
+{
+        this.setColor = function(x)
+        {
+                this.color = x.toLowerCase();
+        };
+
+        this.setStroke = function(x)
+        {
+                this.stroke = x;
+                if(!(x+1))
+                {
+                        this.drawLine = _mkLinDott;
+                        this._mkOv = _mkOvDott;
+                        this.drawRect = _mkRectDott;
+                }
+                else if(x-1 > 0)
+                {
+                        this.drawLine = _mkLin2D;
+                        this._mkOv = _mkOv2D;
+                        this.drawRect = _mkRect;
+                }
+                else
+                {
+                        this.drawLine = _mkLin;
+                        this._mkOv = _mkOv;
+                        this.drawRect = _mkRect;
+                }
+        };
+
+        this.setPrintable = function(arg)
+        {
+                this.printable = arg;
+                if(jg_fast)
+                {
+                        this._mkDiv = _mkDivIe;
+                        this._htmRpc = arg? _htmPrtRpc : _htmRpc;
+                }
+                else this._mkDiv = arg? _mkDivPrt : _mkDiv;
+        };
+
+        this.setFont = function(fam, sz, sty)
+        {
+                this.ftFam = fam;
+                this.ftSz = sz;
+                this.ftSty = sty || Font.PLAIN;
+        };
+
+        this.drawPolyline = this.drawPolyLine = function(x, y)
+        {
+                for (var i=x.length - 1; i;)
+                {--i;
+                        this.drawLine(x[i], y[i], x[i+1], y[i+1]);
+                }
+        };
+/************** Xinha added *******************************************/
+        
+        this.setColor = new Function('arg', 'this.color = arg;');
     this.getColor = new Function('return this.color');
 
-    this.setStroke = function(x)
-    {
-        this.stroke = x;
-        if (!(x+1))
-        {
-            this.drawLine = mkLinDott;
-            this.mkOv = mkOvDott;
-            this.drawRect = mkRectDott;
-        }
-        else if (x-1 > 0)
-        {
-            this.drawLine = mkLin2D;
-            this.mkOv = mkOv2D;
-            this.drawRect = mkRect;
-        }
-        else
-        {
-            this.drawLine = mkLin;
-            this.mkOv = mkOv;
-            this.drawRect = mkRect;
-        }
-    };
-
-
-
-    this.setPrintable = function(arg)
-    {
-        this.printable = arg;
-        this.mkDiv = jg_n4? mkLyr : arg? mkDivPrint : mkDiv;
-    };
-
-
-
-    this.setFont = function(fam, sz, sty)
-    {
-        this.ftFam = fam;
-        this.ftSz = sz;
-        this.ftSty = sty || Font.PLAIN;
-    };
-
-
-
-    this.drawPolyline = this.drawPolyLine = function(x, y, s)
-    {
-        var i = x.length-1; while (i >= 0)
-            this.drawLine(x[i], y[i], x[--i], y[i]);
-    };
-
-
-
-    this.fillRect = function(x, y, w, h)
-    {
-        this.mkDiv(x, y, w, h);
-    };
-
-
+        this.fillRect = function(x, y, w, h)
+        {
+                this._mkDiv(x, y, w, h);
+        };
+        
     this.fillRectPattern = function(x, y, w, h, url)
     {
@@ -704 +709 @@
             'z-index:100;"><\/div>';
         //alert(this.htm);
-    }
+    };
 
     this.drawHandle = function(x, y, w, h, cursor)
@@ -718 +723 @@
         "cursor: '" + cursor + "';"+
         '" class="handleBox" id="' + cursor + '" ><\/div>';
-    }
-
-    this.drawHandleBox = function(x, y, w, h, cursor)
+    };
+        
+        this.drawHandleBox = function(x, y, w, h, cursor)
     {
         
@@ -732 +737 @@
         "cursor: '" + cursor + "';"+
         '" class="handleBox" id="' + cursor + '" ><\/div>';
-
-        
-    }
-
-    this.drawPolygon = function(x, y)
-    {
-        this.drawPolyline(x, y);
-        this.drawLine(x[x.length-1], y[x.length-1], x[0], y[0]);
     };
 
-
-
-    this.drawEllipse = this.drawOval = function(x, y, w, h)
-    {
-        this.mkOv(x, y, w, h);
-    };
-
-
-
-    this.fillEllipse = this.fillOval = function(left, top, w, h)
-    {
-        var a = (w -= 1)>>1, b = (h -= 1)>>1,
-        wod = (w&1)+1, hod = (h&1)+1,
-        cx = left+a, cy = top+b,
-        x = 0, y = b,
-        ox = 0, oy = b,
-        aa2 = (a*a)<<1, aa4 = aa2<<1, bb = (b*b)<<1,
-        st = (aa2>>1)*(1-(b<<1)) + bb,
-        tt = (bb>>1) - aa2*((b<<1)-1),
-        pxl, dw, dh;
-        if (w+1) while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - aa4*(y-1);
-                pxl = cx-x;
-                dw = (x<<1)+wod;
-                tt += (bb<<1)*(++x) - aa2*(((y--)<<1)-0x3);
-                dh = oy-y;
-                this.mkDiv(pxl, cy-oy, dw, dh);
-                this.mkDiv(pxl, cy+oy-dh+hod, dw, dh);
-                ox = x;
-                oy = y;
-            }
-            else
-            {
-                tt -= aa2*((y<<1)-0x3);
-                st -= aa4*(--y);
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, w+1, (oy<<1)+hod);
-    };
-
-    this.drawString = mkLbl;
-
-    this.clear = function()
-    {
-        this.htm = "";
-        if (this.cnv) this.cnv.innerHTML = this.defhtm;
-        
-    };
-
-    this.mkOvQds = function(cx, cy, xl, xr, yt, yb, w, h)
-    {
-        this.mkDiv(xr+cx, yt+cy, w, h);
-        this.mkDiv(xr+cx, yb+cy, w, h);
-        this.mkDiv(xl+cx, yb+cy, w, h);
-        this.mkDiv(xl+cx, yt+cy, w, h);
-    };
-
-    this.setStroke(1);
-    this.setPrintable(false);
-    this.setFont('verdana,geneva,helvetica,sans-serif', String.fromCharCode(0x31, 0x32, 0x70, 0x78), Font.PLAIN);
-    this.color = '#000000';
-    this.htm = '';
-    this.wnd = wnd || window;
-
-    if (!(jg_ie || jg_dom || jg_ihtm)) chkDHTM();
-    if (typeof id != 'string' || !id) this.paint = pntDoc;
-    else
-    {
-        this.cnv = document.all? (this.wnd.document.all[id] || null)
-            : document.getElementById? (this.wnd.document.getElementById(id) || null)
-            : null;
-        this.defhtm = (this.cnv && this.cnv.innerHTML)? this.cnv.innerHTML : '';
-        this.paint = jg_dom? pntCnvDom : jg_ie? pntCnvIe : jg_ihtm? pntCnvIhtm : pntCnv;
-    }
-}
+/************** end Xinha added *******************************************/
+        this.drawPolygon = function(x, y)
+        {
+                this.drawPolyline(x, y);
+                this.drawLine(x[x.length-1], y[x.length-1], x[0], y[0]);
+        };
+
+        this.drawEllipse = this.drawOval = function(x, y, w, h)
+        {
+                this._mkOv(x, y, w, h);
+        };
+
+        this.fillEllipse = this.fillOval = function(left, top, w, h)
+        {
+                var a = w>>1, b = h>>1,
+                wod = w&1, hod = h&1,
+                cx = left+a, cy = top+b,
+                x = 0, y = b, oy = b,
+                aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+                st = (aa2>>1)*(1-(b<<1)) + bb2,
+                tt = (bb2>>1) - aa2*((b<<1)-1),
+                xl, dw, dh;
+                if(w) while(y > 0)
+                {
+                        if(st < 0)
+                        {
+                                st += bb2*((x<<1)+3);
+                                tt += bb4*(++x);
+                        }
+                        else if(tt < 0)
+                        {
+                                st += bb2*((x<<1)+3) - aa4*(y-1);
+                                xl = cx-x;
+                                dw = (x<<1)+wod;
+                                tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                                dh = oy-y;
+                                this._mkDiv(xl, cy-oy, dw, dh);
+                                this._mkDiv(xl, cy+y+hod, dw, dh);
+                                oy = y;
+                        }
+                        else
+                        {
+                                tt -= aa2*((y<<1)-3);
+                                st -= aa4*(--y);
+                        }
+                }
+                this._mkDiv(cx-a, cy-oy, w, (oy<<1)+hod);
+        };
+
+        this.fillArc = function(iL, iT, iW, iH, fAngA, fAngZ)
+        {
+                var a = iW>>1, b = iH>>1,
+                iOdds = (iW&1) | ((iH&1) << 16),
+                cx = iL+a, cy = iT+b,
+                x = 0, y = b, ox = x, oy = y,
+                aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+                st = (aa2>>1)*(1-(b<<1)) + bb2,
+                tt = (bb2>>1) - aa2*((b<<1)-1),
+                // Vars for radial boundary lines
+                xEndA, yEndA, xEndZ, yEndZ,
+                iSects = (1 << (Math.floor((fAngA %= 360.0)/180.0) << 3))
+                                | (2 << (Math.floor((fAngZ %= 360.0)/180.0) << 3))
+                                | ((fAngA >= fAngZ) << 16),
+                aBndA = new Array(b+1), aBndZ = new Array(b+1);
+                
+                // Set up radial boundary lines
+                fAngA *= Math.PI/180.0;
+                fAngZ *= Math.PI/180.0;
+                xEndA = cx+Math.round(a*Math.cos(fAngA));
+                yEndA = cy+Math.round(-b*Math.sin(fAngA));
+                _mkLinVirt(aBndA, cx, cy, xEndA, yEndA);
+                xEndZ = cx+Math.round(a*Math.cos(fAngZ));
+                yEndZ = cy+Math.round(-b*Math.sin(fAngZ));
+                _mkLinVirt(aBndZ, cx, cy, xEndZ, yEndZ);
+
+                while(y > 0)
+                {
+                        if(st < 0) // Advance x
+                        {
+                                st += bb2*((x<<1)+3);
+                                tt += bb4*(++x);
+                        }
+                        else if(tt < 0) // Advance x and y
+                        {
+                                st += bb2*((x<<1)+3) - aa4*(y-1);
+                                ox = x;
+                                tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                                this._mkArcDiv(ox, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
+                                oy = y;
+                        }
+                        else // Advance y
+                        {
+                                tt -= aa2*((y<<1)-3);
+                                st -= aa4*(--y);
+                                if(y && (aBndA[y] != aBndA[y-1] || aBndZ[y] != aBndZ[y-1]))
+                                {
+                                        this._mkArcDiv(x, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
+                                        ox = x;
+                                        oy = y;
+                                }
+                        }
+                }
+                this._mkArcDiv(x, 0, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
+                if(iOdds >> 16) // Odd height
+                {
+                        if(iSects >> 16) // Start-angle > end-angle
+                        {
+                                var xl = (yEndA <= cy || yEndZ > cy)? (cx - x) : cx;
+                                this._mkDiv(xl, cy, x + cx - xl + (iOdds & 0xffff), 1);
+                        }
+                        else if((iSects & 0x01) && yEndZ > cy)
+                                this._mkDiv(cx - x, cy, x, 1);
+                }
+        };
+
+/* fillPolygon method, implemented by Matthieu Haller.
+This javascript function is an adaptation of the gdImageFilledPolygon for Walter Zorn lib.
+C source of GD 1.8.4 found at http://www.boutell.com/gd/
+
+THANKS to Kirsten Schulz for the polygon fixes!
+
+The intersection finding technique of this code could be improved
+by remembering the previous intertersection, and by using the slope.
+That could help to adjust intersections to produce a nice
+interior_extrema. */
+        this.fillPolygon = function(array_x, array_y)
+        {
+                var i;
+                var y;
+                var miny, maxy;
+                var x1, y1;
+                var x2, y2;
+                var ind1, ind2;
+                var ints;
+
+                var n = array_x.length;
+                if(!n) return;
+
+                miny = array_y[0];
+                maxy = array_y[0];
+                for(i = 1; i < n; i++)
+                {
+                        if(array_y[i] < miny)
+                                miny = array_y[i];
+
+                        if(array_y[i] > maxy)
+                                maxy = array_y[i];
+                }
+                for(y = miny; y <= maxy; y++)
+                {
+                        var polyInts = new Array();
+                        ints = 0;
+                        for(i = 0; i < n; i++)
+                        {
+                                if(!i)
+                                {
+                                        ind1 = n-1;
+                                        ind2 = 0;
+                                }
+                                else
+                                {
+                                        ind1 = i-1;
+                                        ind2 = i;
+                                }
+                                y1 = array_y[ind1];
+                                y2 = array_y[ind2];
+                                if(y1 < y2)
+                                {
+                                        x1 = array_x[ind1];
+                                        x2 = array_x[ind2];
+                                }
+                                else if(y1 > y2)
+                                {
+                                        y2 = array_y[ind1];
+                                        y1 = array_y[ind2];
+                                        x2 = array_x[ind1];
+                                        x1 = array_x[ind2];
+                                }
+                                else continue;
+
+                                 //  Modified 11. 2. 2004 Walter Zorn
+                                if((y >= y1) && (y < y2))
+                                        polyInts[ints++] = Math.round((y-y1) * (x2-x1) / (y2-y1) + x1);
+
+                                else if((y == maxy) && (y > y1) && (y <= y2))
+                                        polyInts[ints++] = Math.round((y-y1) * (x2-x1) / (y2-y1) + x1);
+                        }
+                        polyInts.sort(_CompInt);
+                        for(i = 0; i < ints; i+=2)
+                                this._mkDiv(polyInts[i], y, polyInts[i+1]-polyInts[i]+1, 1);
+                }
+        };
+
+        this.drawString = function(txt, x, y)
+        {
+                this.htm += '<div style="position:absolute;white-space:nowrap;'+
+                        'left:' + x + 'px;'+
+                        'top:' + y + 'px;'+
+                        'font-family:' +  this.ftFam + ';'+
+                        'font-size:' + this.ftSz + ';'+
+                        'color:' + this.color + ';' + this.ftSty + '">'+
+                        txt +
+                        '<\/div>';
+        };
+
+/* drawStringRect() added by Rick Blommers.
+Allows to specify the size of the text rectangle and to align the
+text both horizontally (e.g. right) and vertically within that rectangle */
+        this.drawStringRect = function(txt, x, y, width, halign)
+        {
+                this.htm += '<div style="position:absolute;overflow:hidden;'+
+                        'left:' + x + 'px;'+
+                        'top:' + y + 'px;'+
+                        'width:'+width +'px;'+
+                        'text-align:'+halign+';'+
+                        'font-family:' +  this.ftFam + ';'+
+                        'font-size:' + this.ftSz + ';'+
+                        'color:' + this.color + ';' + this.ftSty + '">'+
+                        txt +
+                        '<\/div>';
+        };
+
+        this.drawImage = function(imgSrc, x, y, w, h, a)
+        {
+                this.htm += '<div style="position:absolute;'+
+                        'left:' + x + 'px;'+
+                        'top:' + y + 'px;'+
+                        'width:' +  w + 'px;'+
+                        'height:' + h + 'px;">'+
+                        '<img src="' + imgSrc + '" width="' + w + '" height="' + h + '"' + (a? (' '+a) : '') + '>'+
+                        '<\/div>';
+        };
+
+        this.clear = function()
+        {
+                this.htm = "";
+                if(this.cnv) this.cnv.innerHTML = "";
+        };
+
+        this._mkOvQds = function(cx, cy, x, y, w, h, wod, hod)
+        {
+                var xl = cx - x, xr = cx + x + wod - w, yt = cy - y, yb = cy + y + hod - h;
+                if(xr > xl+w)
+                {
+                        this._mkDiv(xr, yt, w, h);
+                        this._mkDiv(xr, yb, w, h);
+                }
+                else
+                        w = xr - xl + w;
+                this._mkDiv(xl, yt, w, h);
+                this._mkDiv(xl, yb, w, h);
+        };
+        
+        this._mkArcDiv = function(x, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects)
+        {
+                var xrDef = cx + x + (iOdds & 0xffff), y2, h = oy - y, xl, xr, w;
+
+                if(!h) h = 1;
+                x = cx - x;
+
+                if(iSects & 0xff0000) // Start-angle > end-angle
+                {
+                        y2 = cy - y - h;
+                        if(iSects & 0x00ff)
+                        {
+                                if(iSects & 0x02)
+                                {
+                                        xl = Math.max(x, aBndZ[y]);
+                                        w = xrDef - xl;
+                                        if(w > 0) this._mkDiv(xl, y2, w, h);
+                                }
+                                if(iSects & 0x01)
+                                {
+                                        xr = Math.min(xrDef, aBndA[y]);
+                                        w = xr - x;
+                                        if(w > 0) this._mkDiv(x, y2, w, h);
+                                }
+                        }
+                        else
+                                this._mkDiv(x, y2, xrDef - x, h);
+                        y2 = cy + y + (iOdds >> 16);
+                        if(iSects & 0xff00)
+                        {
+                                if(iSects & 0x0100)
+                                {
+                                        xl = Math.max(x, aBndA[y]);
+                                        w = xrDef - xl;
+                                        if(w > 0) this._mkDiv(xl, y2, w, h);
+                                }
+                                if(iSects & 0x0200)
+                                {
+                                        xr = Math.min(xrDef, aBndZ[y]);
+                                        w = xr - x;
+                                        if(w > 0) this._mkDiv(x, y2, w, h);
+                                }
+                        }
+                        else
+                                this._mkDiv(x, y2, xrDef - x, h);
+                }
+                else
+                {
+                        if(iSects & 0x00ff)
+                        {
+                                if(iSects & 0x02)
+                                        xl = Math.max(x, aBndZ[y]);
+                                else
+                                        xl = x;
+                                if(iSects & 0x01)
+                                        xr = Math.min(xrDef, aBndA[y]);
+                                else
+                                        xr = xrDef;
+                                y2 = cy - y - h;
+                                w = xr - xl;
+                                if(w > 0) this._mkDiv(xl, y2, w, h);
+                        }
+                        if(iSects & 0xff00)
+                        {
+                                if(iSects & 0x0100)
+                                        xl = Math.max(x, aBndA[y]);
+                                else
+                                        xl = x;
+                                if(iSects & 0x0200)
+                                        xr = Math.min(xrDef, aBndZ[y]);
+                                else
+                                        xr = xrDef;
+                                y2 = cy + y + (iOdds >> 16);
+                                w = xr - xl;
+                                if(w > 0) this._mkDiv(xl, y2, w, h);
+                        }
+                }
+        };
+
+        this.setStroke(1);
+        this.setFont("verdana,geneva,helvetica,sans-serif", "12px", Font.PLAIN);
+        this.color = "#000000";
+        this.htm = "";
+        this.wnd = wnd || window;
+
+        if(!jg_ok) _chkDHTM();
+        if(jg_ok)
+        {
+                if(cnv)
+                {
+                        if(typeof(cnv) == "string")
+                                this.cont = document.all? (this.wnd.document.all[cnv] || null)
+                                        : document.getElementById? (this.wnd.document.getElementById(cnv) || null)
+                                        : null;
+                        else if(cnv == window.document)
+                                this.cont = document.getElementsByTagName("body")[0];
+                        // If cnv is a direct reference to a canvas DOM node
+                        // (option suggested by Andreas Luleich)
+                        else this.cont = cnv;
+                        // Create new canvas inside container DIV. Thus the drawing and clearing
+                        // methods won't interfere with the container's inner html.
+                        // Solution suggested by Vladimir.
+                        this.cnv = this.wnd.document.createElement("div");
+                        this.cnv.style.fontSize=0;
+                        this.cont.appendChild(this.cnv);
+                        this.paint = jg_dom? _pntCnvDom : _pntCnvIe;
+                }
+                else
+                        this.paint = _pntDoc;
+        }
+        else
+                this.paint = _pntN;
+
+        this.setPrintable(false);
+}
+
+function _mkLinVirt(aLin, x1, y1, x2, y2)
+{
+        var dx = Math.abs(x2-x1), dy = Math.abs(y2-y1),
+        x = x1, y = y1,
+        xIncr = (x1 > x2)? -1 : 1,
+        yIncr = (y1 > y2)? -1 : 1,
+        p,
+        i = 0;
+        if(dx >= dy)
+        {
+                var pr = dy<<1,
+                pru = pr - (dx<<1);
+                p = pr-dx;
+                while(dx > 0)
+                {--dx;
+                        if(p > 0)    //  Increment y
+                        {
+                                aLin[i++] = x;
+                                y += yIncr;
+                                p += pru;
+                        }
+                        else p += pr;
+                        x += xIncr;
+                }
+        }
+        else
+        {
+                var pr = dx<<1,
+                pru = pr - (dy<<1);
+                p = pr-dy;
+                while(dy > 0)
+                {--dy;
+                        y += yIncr;
+                        aLin[i++] = x;
+                        if(p > 0)    //  Increment x
+                        {
+                                x += xIncr;
+                                p += pru;
+                        }
+                        else p += pr;
+                }
+        }
+        for(var len = aLin.length, i = len-i; i;)
+                aLin[len-(i--)] = x;
+};
+
+function _CompInt(x, y)
+{
+        return(x - y);
+}
+

trunk/plugins/ExtendedFileManager/config.inc.php

@@ -26 +26 @@
  */
 
-if(empty($insertMode))
-    $insertMode="image";
+if(isset($_REQUEST['mode'])) $insertMode=$_REQUEST['mode'];
+        if(!isset($insertMode)) $insertMode="image";
 
 /**
@@ -65 +65 @@
 /*
  The URL to the above path, the web browser needs to be able to see it.
- It can be protected via .htaccess on apache or directory permissions on IIS,
- check you web server documentation for futher information on directory protection
- If this directory needs to be publicly accessiable, remove scripting capabilities
- for this directory (i.e. disable PHP, Perl, CGI). We only want to store assets
- in this directory and its subdirectories.
+ Please remove scripting capabilities in this directory
+ for this directory (i.e. disable PHP, Perl, CGI; see .htaccess file in demo_images folder).
 */
 $IMConfig['images_url'] = str_replace( array("backend.php","manager.php"), "", $_SERVER["PHP_SELF"] ) . $IMConfig['images_dir'];
 //$IMConfig['files_url'] = 'url/to/files_dir';
 
+/*
+  Format of the Date Modified in list view.
+  It has to be a string understood by the PHP date() function (for possible values see http://http://php.net/manual/en/function.date.php)
+*/
+$IMConfig['date_format'] = "d.m.y H:i";
 /*
   Possible values: true, false
@@ -123 +125 @@
  GD does not require the following definition.
 */
-define('IMAGE_TRANSFORM_LIB_PATH', 'C:/"Program Files"/ImageMagick-5.5.7-Q16/');
+define('IMAGE_TRANSFORM_LIB_PATH', '/usr/bin/');
+//define('IMAGE_TRANSFORM_LIB_PATH', 'C:/"Program Files"/ImageMagick-5.5.7-Q16/');
 
 
@@ -288 +291 @@
   "max"  - the maximum allowed by the server (the value is retrieved from the server configuration).
 */
-$IMConfig['max_filesize_kb_image'] = 2000000;
+$IMConfig['max_filesize_kb_image'] = 200;
 
 $IMConfig['max_filesize_kb_link'] = 5000;

trunk/plugins/ExtendedFileManager/editorFrame.php

@@ -5 +5 @@
  * Version: Updated on 08-01-2005 by Afru
  * Version: Updated on 21-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  * http://www.afrusoft.com/htmlarea
  */
@@ -38 +39 @@
 
         var mode = "<?php echo $editor->getAction(); ?>" //crop, scale, measure
-
-var currentImageFile = "<?php if(count($imageInfo)>0) echo rawurlencode($imageInfo['file']); ?>";
+        var currentImageFile = "<?php if(count($imageInfo)>0) echo rawurlencode($imageInfo['file']); ?>";
+        var fileSize = "<?php echo (round($imageInfo['filesize'] / 1024,1)).' KB' ?>";
+        
 
 <?php if ($editor->isFileSaved() == 1) { ?>

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

@@ -1 +1 @@
 /**
  * ExtendedFileManager extended-file-manager.js file.
- * Authors: Wei Zhuo, Afru
+ * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz, Raimund Meyer
  * Modified by: Krzysztof Kotowicz <koto@webworkers.pl>
  * Version: Updated on 08-01-2005 by Afru
  * Version: Modified on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
+ * Version: Updated on 29-10-2006 by Raimund Meyer
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  */
 
@@ -35 +36 @@
         cfg.addToolbarElement("linkfile", "createlink", 1);
         };
-    }
+
+    var manager = editor.config.ExtendedFileManager.backend + '__function=manager';
+    if(cfg.ExtendedFileManager.backend_config != null)
+    {
+      manager += '&backend_config='
+        + encodeURIComponent(cfg.ExtendedFileManager.backend_config);
+      manager += '&backend_config_hash='
+        + encodeURIComponent(cfg.ExtendedFileManager.backend_config_hash);
+      manager += '&backend_config_secret_key_location='
+        + encodeURIComponent(cfg.ExtendedFileManager.backend_config_secret_key_location);
+    }
+
+    if(cfg.ExtendedFileManager.backend_data != null)
+    {
+        for ( var i in cfg.ExtendedFileManager.backend_data )
+        {
+            manager += '&' + i + '=' + encodeURIComponent(cfg.ExtendedFileManager.backend_data[i]);
+        }
+    }
+    cfg.ExtendedFileManager.manager = manager;
+}
 
 ExtendedFileManager._pluginInfo = {
     name          : "ExtendedFileManager",
-    version       : "1.1.1",
-    developer     : "Afru, Krzysztof Kotowicz",
-    developer_url : "http://www.afrusoft.com/htmlarea/",
+    version       : "1.4",
+    developer     : "Afru, Krzysztof Kotowicz, Raimund Meyer",
+    developer_url : "http://xinha.org",
     license       : "htmlArea"
 };
@@ -97 +118 @@
 
     }
-
-    var manager = editor.config.ExtendedFileManager.backend + '__function=manager';
-    if(editor.config.ExtendedFileManager.backend_config != null)
-    {
-      manager += '&backend_config='
-        + encodeURIComponent(editor.config.ExtendedFileManager.backend_config);
-      manager += '&backend_config_hash='
-        + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_hash);
-      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]);
-        }
-    }
-
-    Dialog(manager, function(param){
+    Dialog(this.config.ExtendedFileManager.manager, function(param){
         if (!param)
         {   // user must have pressed Cancel
@@ -247 +248 @@
         };
 
-    var manager = _editor_url + 'plugins/ExtendedFileManager/manager.php?mode=link';
-    if(editor.config.ExtendedFileManager.backend_config != null)
-    {
-       manager += '&backend_config='
-               + encodeURIComponent(editor.config.ExtendedFileManager.backend_config);
-       manager += '&backend_config_hash='
-               + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_hash);
-       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]);
-        }
-    }
-
-
-    Dialog(manager, function(param){
+    Dialog(this.config.ExtendedFileManager.manager+'&mode=link', function(param){
         if (!param)
             return false;
@@ -304 +285 @@
         editor.updateToolbar();
     }, outparam);
-
 };
 

trunk/plugins/ExtendedFileManager/images.php

@@ -6 +6 @@
  * Version: Updated on 04-07-2006 by Krzysztof Kotowicz
  * Version: Updated on 29-10-2006 by Raimund Meyer
- * Package: ExtendedFileManager (EFM 1.1.3)
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  * http://www.afrusoft.com/htmlarea
  */
@@ -15 +16 @@
 require_once('config.inc.php');
 require_once('Classes/ExtendedFileManager.php');
-
+$backend_url_enc = htmlspecialchars( $IMConfig['backend_url'] );
 //default path is /
 $relative = '/';
@@ -67 +68 @@
 function drawDirs_Files($list, &$manager) 
 {
-        global $relative, $afruViewType, $IMConfig, $insertMode;
+        global $relative, $afruViewType, $IMConfig, $insertMode,$backend_url_enc;
 
     switch ($afruViewType) {
@@ -73 +74 @@
                 $maxNameLength = 30;
                 ?>
-            <table class="listview">
+            <table class="listview" id="listview">
             <thead>
-            <tr><th colspan="2">Name</th><th>Size</th><th>Image Size</th><th>Date Modified</th><th>&nbsp;</th></tr></thead>
+            <tr><th>Name</th><th>Size</th><th>Image Size</th><th>Date Modified</th><th>&nbsp;</th></tr></thead>
             <tbody>
             <?php
@@ -82 +83 @@
                 { ?>
                         <tr>
-                        <td><img src="<?php print $IMConfig['base_url'];?>icons/folder_small.gif" alt="" /></td>
-                        <th nowrap="nowrap"><a href="<?php print $IMConfig['backend_url']; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" onclick="updateDir('<?php echo $path; ?>')" title="<?php echo $dir['entry']; ?>">
+                        <td><span width="20px"><img src="<?php print $IMConfig['base_url'];?>icons/folder_small.gif" alt="" /></span>
+                                <a href="<?php print $backend_url_enc; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" onclick="updateDir('<?php echo $path; ?>')" title="<?php echo $dir['entry']; ?>">
                         <?php
                         if(strlen($dir['entry'])>$maxNameLength) echo substr($dir['entry'],0,$maxNameLength)."..."; else echo $dir['entry'];
                         ?>
                         </a></th>
-                        <td colspan="2" nowrap="nowrap">Folder</td>
-
-                        <td nowrap="nowrap"><?php echo date("d.m.y H:i",$dir['stat']['mtime']); ?></td>
-
-                        <td class="actions" nowrap="nowrap">
-                                <a href="<?php print $IMConfig['backend_url']; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo $relative; ?>&amp;deld=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteDir('<?php echo $dir['entry']; ?>', <?php echo $dir['count']; ?>);" style="border:0px;"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" border="0" /></a>
+                        <td colspan="2" >Folder</td>
+
+                        <td ><?php echo date($IMConfig['date_format'],$dir['stat']['mtime']); ?></td>
+
+                        <td class="actions" >
+                                <a href="<?php print $backend_url_enc; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo $relative; ?>&amp;deld=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteDir('<?php echo $dir['entry']; ?>', <?php echo $dir['count']; ?>);" style="border:0px;"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" border="0" /></a>
                                 <?php if ($IMConfig['allow_rename']) { ?>
                                             <a href="#" title="Rename" onclick="renameDir('<?php echo rawurlencode($dir['entry']);?>'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_rename.gif" height="15" width="15" alt="Rename" border="0" /></a>
@@ -113 +114 @@
                         ?>
                 <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;" 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 } ?> >
+                          <td><span width="20px"><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="" /></span>
+                                        <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;
                                 ?>
-                  </a></th>
+                  </a></td>
                   <td><?php echo Files::formatSize($file['stat']['size']); ?></td>
                   <td><?php if($file['image'][0] > 0){ echo $file['image'][0].'x'.$file['image'][1]; } ?></td>
-                          <td nowrap="nowrap"><?php echo date("d.m.y H:i",$file['stat']['mtime']); ?></td>
+                          <td ><?php echo date($IMConfig['date_format'],$file['stat']['mtime']); ?></td>
                   <td class="actions">
                     <?php if($IMConfig['img_library'] && $IMConfig['allow_edit_image'] && $file['image'][0] > 0) { ?>
                     <a href="javascript:;" title="Edit" onclick="editImage('<?php echo rawurlencode($file['relative']);?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit" border="0" /></a>
                     <?php }  ?>  
-                    <a href="<?php print $IMConfig['backend_url']; ?>__function=images&amp;dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>&amp;mode=<?php echo $insertMode;?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" border="0" /></a>
+                    <a href="<?php print $backend_url_enc; ?>__function=images&amp;dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>&amp;mode=<?php echo $insertMode;?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" border="0" /></a>
                                 <?php if ($IMConfig['allow_rename']) { ?>
                     <a href="#" title="Rename" onclick="renameFile('<?php echo rawurlencode($file['relative']);?>'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_rename.gif" height="15" width="15" alt="Rename" border="0" /></a>
@@ -151 +152 @@
                 { ?>
     <div class="dir_holder">
-      <a class="dir" href="<?php print $IMConfig['backend_url'];?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" onclick="updateDir('<?php echo $path; ?>')" title="<?php echo $dir['entry']; ?>"><img src="<?php print $IMConfig['base_url'];?>img/folder.gif" height="80" width="80" alt="<?php echo $dir['entry']; ?>" /></a>
+      <a class="dir" href="<?php print $backend_url_enc;?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" onclick="updateDir('<?php echo $path; ?>')" title="<?php echo $dir['entry']; ?>"><img src="<?php print $IMConfig['base_url'];?>img/folder.gif" height="80" width="80" alt="<?php echo $dir['entry']; ?>" /></a>
 
       <div class="fileName">
@@ -160 +161 @@
       </div>
       <div class="edit">
-        <a href="<?php print $IMConfig['backend_url'];?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo $relative; ?>&amp;deld=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteDir('<?php echo $dir['entry']; ?>', <?php echo $dir['count']; ?>);"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" /></a>
+        <a href="<?php print $backend_url_enc;?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo $relative; ?>&amp;deld=<?php echo rawurlencode($path); ?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteDir('<?php echo $dir['entry']; ?>', <?php echo $dir['count']; ?>);"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" /></a>
         <?php if ($IMConfig['allow_rename']) { ?>
                     <a href="#" title="Rename" onclick="renameDir('<?php echo rawurlencode($dir['entry']);?>'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_rename.gif" height="15" width="15" alt="Rename" border="0" /></a>
@@ -194 +195 @@
                     <a href="javascript:;" title="Edit" onclick="editImage('<?php echo rawurlencode($file['relative']);?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit" /></a>
                         <?php $thisFileNameLength -= 3; } ?>
-                    <a href="<?php print $IMConfig['backend_url']; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" /></a>
+                    <a href="<?php print $backend_url_enc; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" /></a>
                                 <?php if ($IMConfig['allow_rename']) { ?>
                     <a href="#" title="Rename" onclick="renameFile('<?php echo rawurlencode($file['relative']);?>'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_rename.gif" height="15" width="15" alt="Rename" /></a>
@@ -264 +265 @@
                 var topDoc = window.top.document;
                 var messages = topDoc.getElementById('messages');
-                if(messages)
+                if (messages)
+                {
                         messages.style.display = "none";
+                }
+                //window.parent.resize();
         }
 
@@ -273 +277 @@
         
                 hideMessage();
-
-                <?php
+                <?php if ($afruViewType == 'listview')
+                        print "var d = new dragTableCols('listview');";
+                
                 if(isset($uploadStatus) && !is_numeric($uploadStatus) && !is_bool($uploadStatus))
                 echo "alert(i18n('$uploadStatus'));";
@@ -375 +380 @@
 //-->
 </script>
-
+<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/dragTableCols.js"></script>
 </head>
 

trunk/plugins/ExtendedFileManager/lang/de.js

@@ -27 +27 @@
   "Rotate": "Drehen",
   "Measure": "Maße",
-  "Marker": "Marker",
+  "Marker": "Rahmen",
+  "Toggle marker color" : "Farbe der Markierung umschalten",
   "Save": "Speichern",
   "Filename:": "Dateiname:",
@@ -113 +114 @@
   "Could not create destination folder.":"Konnte Zielordner nicht erstellen.",
   "Destination file/folder already exists.":"Zieldatei/-ordner existiert bereits",
-  "File pasted OK.": "File pasted OK."
+  "File pasted OK.": "File pasted OK.",
+  
+  "Filesize:" : "Dateigröße:"
 };

trunk/plugins/ExtendedFileManager/manager.php

@@ -6 +6 @@
  * Version: Updated on 04-07-2006 by Krzysztof Kotowicz
  * Version: Updated on 29-10-2006 by Raimund Meyer
- * Package: ExtendedFileManager (EFM 1.1.3)
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  * http://www.afrusoft.com/htmlarea
  */
@@ -105 +106 @@
         ?>
         
+        var iframeUrl = '<?php print $IMConfig['backend_url']; ?>__function=images&mode=<?php echo $insertMode;?>&viewtype=<?php echo $IMConfig['view_type'] ?>';
+
 /* ]]> */
 </script>
@@ -111 +114 @@
 <body class="dialog" >
 <div class="title">Insert <?php echo ($insertMode == 'image' ? 'Image' : 'File Link') ?></div>
-<form action="<?php print $IMConfig['backend_url']; ?>" id="uploadForm" method="post" enctype="multipart/form-data">
+<form action="<?php print htmlspecialchars($IMConfig['backend_url']); ?>" id="uploadForm" method="post" enctype="multipart/form-data">
 <input type="hidden" name="__plugin" value="ExtendedFileManager" />
 <input type="hidden" name="__function" value="images" />
@@ -119 +122 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
 <tr>
-<td nowrap style="padding:10px;">
+<td nowrap="nowrap" style="padding:10px;">
 
         <label for="dirPath">Directory</label>
@@ -137 +140 @@
 <span id="pasteBtn"></span>
 
-        <select name="viewtype" id="viewtype" onChange="updateView()">
-        <option value="thumbview" <?php if($IMConfig['view_type']=="thumbview") echo "selected";?> >Thumbnail View</option>
-        <option value="listview" <?php if($IMConfig['view_type']=="listview") echo "selected";?> >List View</option>
+        <select name="viewtype" id="viewtype" onchange="updateView()">
+        <option value="thumbview" <?php if($IMConfig['view_type']=="thumbview") echo 'selected="selected"';?> >Thumbnail View</option>
+        <option value="listview" <?php if($IMConfig['view_type']=="listview") echo 'selected="selected"';?> >List View</option>
         </select>
 </td>
@@ -145 +148 @@
 <tr><td style="padding:10px; padding-top:0px;">
         <div id="messages"><span id="message">Loading</span><img src="<?php print $IMConfig['base_url'];?>img/dots.gif" width="22" height="12" alt="..." /></div>
-        <iframe src="<?php print $IMConfig['backend_url']; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;viewtype=<?php echo $IMConfig['view_type'] ?>" name="imgManager" id="imgManager" class="imageFrame" scrolling="auto" title="Image Selection" frameborder="0"></iframe>
+        <iframe src="about:blank" name="imgManager" id="imgManager" class="imageFrame" scrolling="auto" title="Image Selection" frameborder="0"></iframe>
 </td></tr>
 </table>
 </fieldset>
 <!-- image properties -->
+<div id="controls">
         <table class="inputTable">
                 <tr>
-                        <td align="right" nowrap><label for="f_url"><?php if($insertMode=='image') echo 'File Name'; else echo 'URL';?></label></td>
+                        <td align="right" nowrap="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="<?php echo $num_rows ?>" colspan="2" valign="top" align="center"><?php if($insertMode=='image') { ?>
@@ -274 +278 @@
           <button type="button" class="buttons" onclick="return onCancel();">Cancel</button>
     </div>
+</div>
 </form>
 </body>

trunk/plugins/ImageManager/Classes/GD.php

@@ -83 +83 @@
         $this->_get_image_details($image);
         $functionName = 'ImageCreateFrom' . $this->type;
+                
                 if(function_exists($functionName))
                 {
                         $this->imageHandle = $functionName($this->image);
+                        if ( $this->type == 'png')
+                        {
+                                imageAlphaBlending($this->imageHandle, false);
+                                imageSaveAlpha($this->imageHandle, true);
+                        }
                 }
     } // End load
@@ -158 +164 @@
     {
         if(function_exists('imagerotate')) {
-            $white = imagecolorallocate ($this->imageHandle, 255, 255, 255);
+            $white = imagecolorallocatealpha ($this->imageHandle, 255, 255, 255, 127);
                         $this->imageHandle = imagerotate($this->imageHandle, $angle, $white);
             return true;
@@ -165 +171 @@
         if ( $options==null ){
             $autoresize = true;
-            $color_mask = array(255,255,0);
+            $color_mask = array(105,255,255);
         } else {
             extract( $options );
@@ -240 +246 @@
         }
 
-        $img2   = @imagecreate($width2,$height2);
+        $img2   = @$this->newImgPreserveAlpha( imagecreateTrueColor($width2,$height2) );
 
         if ( !is_resource($img2) ){
@@ -253 +259 @@
         imagepalettecopy($img2,$img);
 
-        $mask   = imagecolorresolve($img2,$color_mask[0],$color_mask[1],$color_mask[2]);
-
+       $mask = imagecolorallocatealpha ($img2,$color_mask[0],$color_mask[1],$color_mask[2],127);
         // use simple lines copy for axes angles
         switch((int)($angle)){
@@ -344 +349 @@
         }
         if(function_exists('ImageCreateTrueColor')){
-            $new_img =ImageCreateTrueColor($new_x,$new_y);
+           $new_img = $this->newImgPreserveAlpha( ImageCreateTrueColor($new_x,$new_y) );
         } else {
             $new_img =ImageCreate($new_x,$new_y);
         }
+
         if(function_exists('ImageCopyResampled')){
             ImageCopyResampled($new_img, $this->imageHandle, 0, 0, 0, 0, $new_x, $new_y, $this->img_x, $this->img_y);
@@ -353 +359 @@
             ImageCopyResized($new_img, $this->imageHandle, 0, 0, 0, 0, $new_x, $new_y, $this->img_x, $this->img_y);
         }
+
         $this->old_image = $this->imageHandle;
         $this->imageHandle = $new_img;
@@ -373 +380 @@
     {
         if(function_exists('ImageCreateTrueColor')){
-            $new_img =ImageCreateTrueColor($new_width,$new_height);
+            $new_img =  $this->newImgPreserveAlpha(ImageCreateTrueColor($new_width,$new_height));
         } else {
             $new_img =ImageCreate($new_width,$new_height);
@@ -434 +441 @@
         ImageGammaCorrect($this->imageHandle, 1.0, $outputgamma);
     }
+        function paletteToTrueColorWithTransparency()
+        {
+                $oldImg = $this->imageHandle;
+                $newImg = $this->newImgPreserveAlpha( imagecreatetruecolor($this->img_x,$this->img_y) );
+                imagecopy($newImg,$oldImg,0,0,0,0,$this->img_x,$this->img_y);
+
+                $this->imageHandle = $newImg;
+        }
+        
+        function newImgPreserveAlpha($newImg)
+        {
+                if ( $this->type == 'jpeg') return $newImg;
+                
+                // Turn off transparency blending (temporarily)
+                imagealphablending($newImg, false);
+                
+                // Create a new transparent color for image
+                if ( $transparent = imagecolortransparent($this->imageHandle) >= 0 )
+                {
+                        if (imageistruecolor($this->imageHandle))
+                        {
+                                $red = ($transparent & 0xFF0000) >> 16;
+                                $green = ($transparent & 0x00FF00) >> 8;
+                                $blue = ($transparent & 0x0000FF);
+                                $color_values = array('red' => $red, 'green' => $green, 'blue' => $blue);
+                        }
+                        else
+                        {
+                                $color_values = imagecolorsforindex($this->imageHandle,$transparent);
+
+                        }
+                        $color_values = imagecolorsforindex($this->imageHandle,$transparent);
+                        $color = imagecolorallocatealpha($newImg, $color_values['red'],$color_values['green'],$color_values['blue'], 127);
+                        $colort = imagecolorallocate($newImg, $color_values['red'],$color_values['green'],$color_values['blue']);
+                }
+                else
+                {
+                        $color = imagecolorallocatealpha($newImg, 252, 2, 252, 127);
+                        $colort = imagecolorallocate($newImg, 252, 2, 252);
+                }
+                imagecolortransparent($newImg,$colort);
+                
+                // Completely fill the background of the new image with allocated color.
+                imagefill($newImg, 0, 0, $color);
+                
+                // Restore transparency blending
+                imagesavealpha($newImg, true);
+                
+                return $newImg;
+        }
+        
+        function preserveTransparencyForPalette()
+        {
+                $new_img = imagecreatetruecolor($this->img_x,$this->img_y);
+                $truecolor = imageistruecolor($this->imageHandle);
+                $transparent = imagecolorallocate($new_img, 252,2,252); // nasty pinkish purple that hopefully doesn't exist in the image
+
+                imagecolortransparent($new_img, $transparent);
+                for ($i=0;$i<$this->img_y;$i++)
+                {
+                        for ($j=0;$j<$this->img_x;$j++)
+                        {
+                                $c = imagecolorat($this->imageHandle,$j, $i);
+                                if ($truecolor)
+                                {
+                                        $a = ($c >> 24) & 0xFF;
+                                        $r = ($c >> 16) & 0xFF;
+                                        $g = ($c >> 8) & 0xFF;
+                                        $b = $c & 0xFF;
+                                        $color_values = array('red' => $r, 'green' => $g, 'blue' => $b, 'alpha' => $a);
+                                }
+                                else
+                                {
+                                        $color_values = imagecolorsforindex($this->imageHandle,$transparent);
+                                }
+                                if ($color_values['alpha'] >= 126)
+                                {
+                                        imagesetpixel($new_img, $j, $i, $transparent);
+                                }
+                                else
+                                {
+                                        imagesetpixel($new_img, $j, $i, $c);
+                                }
+                        }
+                }
+                $this->imageHandle = $new_img;
+        }
 
     /**

trunk/plugins/ImageManager/Classes/IM.php

@@ -179 +179 @@
         $this->command['gamma'] = "-gamma $outputgamma";
     }
-
+        
+        function reduce_colors($number = 256)
+        {
+                 $this->command['colors'] = "-colors $number";
+        }
     /**
      * Save the image file
@@ -214 +218 @@
         if ($type == '') {
             header('Content-type: image/' . $this->type);
-            passthru(IMAGE_TRANSFORM_LIB_PATH . 'convert ' . implode(' ', $this->command) . " -quality $quality "  . escapeshellarg($this->image) . ' ' . strtoupper($this->type) . ":-");
+            passthru(IMAGE_TRANSFORM_LIB_PATH . '  ' . implode(' ', $this->command) . " -quality $quality "  . escapeshellarg($this->image) . ' ' . strtoupper($this->type) . ":-");
         } else {
             header('Content-type: image/' . $type);

trunk/plugins/ImageManager/Classes/ImageEditor.php

@@ -95 +95 @@
                         $image['file'] = $relative;
                         $image['fullpath'] = $fullpath;
+                        $image['filesize'] = @filesize($fullpath);
                 }
 
@@ -119 +120 @@
                         $params = $_GET['params'];
 
-                $values =  explode(',',$params,4);
+                $values =  explode(',',$params);
                 $saveFile = $this->getSaveFileName($values[0]);
 
                 $img = Image_Transform::factory(IMAGE_CLASS);
                 $img->load($fullpath);
-
+                if ( is_callable($img,'paletteToTrueColorWithTransparency') && !imageistruecolor( $img->imageHandle))
+                {
+                        $img->paletteToTrueColorWithTransparency();
+                }
                 switch ($action) 
                 {
@@ -154 +158 @@
                                         //we need to make the relative path once more.
                                         $newSaveFile = $this->makeRelative($relative, $newSaveFile);
-          $image['saveFile'] = $newSaveFile;
+                                $image['saveFile'] = $newSaveFile;
                                         $newSaveFullpath = $this->manager->getFullPath($newSaveFile);
+                                        if ( $values[0] == 'gif' && is_callable(array($img, 'preserveTransparencyForPalette')))
+                                        {
+                                                $img->preserveTransparencyForPalette();
+                                        }
                                         $img->save($newSaveFullpath, $values[0], $quality);
                                         if(is_file($newSaveFullpath))
@@ -163 +171 @@
                                 }
                                 break;
+                                case 'preview':
+                                        $quality = intval($values[1]);
+                                        
+                                        
+                                        $image['file'] = $relative;
+                                        $image['fullpath'] = $fullpath;
+                                        
+                                        //create the tmp image file
+                                        $filename = $this->createUnique($fullpath);
+                                        $newRelative = $this->makeRelative($relative, $filename);
+                                        $newFullpath = $this->manager->getFullPath($newRelative);
+                                        $newURL = $this->manager->getFileURL($newRelative);
+                                        
+                                        
+                                        if ( $values[0] == 'gif' && is_callable(array($img, 'preserveTransparencyForPalette')))
+                                        {
+                                                $img->preserveTransparencyForPalette();
+                                        }
+                                        $img->save($newFullpath, $values[0] );
+                                        $img->free();
+                        
+                                        //get the image information
+                                        $imgInfo = @getimagesize($newFullpath);
+                                
+                                        $image['src'] = $newURL;
+                                $image['width'] = $imgInfo[0];
+                                        $image['height'] = $imgInfo[1];
+                                        $image['dimensions'] = $imgInfo[3];
+                                        $image['file'] = $relative;
+                                        $image['fullpath'] = $fullpath;
+                                        $image['filesize'] = @filesize($newFullpath);
+
+                                        Return $image;
+        
+                                break;
                 }
                 
@@ -170 +213 @@
                 $newFullpath = $this->manager->getFullPath($newRelative);
                 $newURL = $this->manager->getFileURL($newRelative);
-                
+
                 //save the file.
-                $img->save($newFullpath);
+                $img->save($newFullpath, 'png' );
                 $img->free();
 
@@ -179 +222 @@
 
                 $image['src'] = $newURL;
-    $image['width'] = $imgInfo[0];
-    $image['height'] = $imgInfo[1];
+        $image['width'] = $imgInfo[0];
+                $image['height'] = $imgInfo[1];
                 $image['dimensions'] = $imgInfo[3];
                 $image['file'] = $newRelative;
                 $image['fullpath'] = $newFullpath;
-
+                $image['filesize'] = @filesize($newFullpath);
+                $image['type'] = image_type_to_mime_type($imgInfo[2]);
+                
                 Return $image;
         
@@ -418 +463 @@
 
                 $fullpath = $this->manager->getFullPath($relative);
-
+ 
                 $type = $this->getImageType($fullpath);
                 if($type != 'gif')
                         Return 0;
 
-                if(function_exists('ImageCreateFrom'+$type)
-                        && function_exists('image'+$type))
+                if(function_exists('ImageCreateFrom'.$type)
+                        && function_exists('image'.$type))
                         Return 1;
                 else

trunk/plugins/ImageManager/editor.php

@@ -25 +25 @@
         <link href="<?php print $IMConfig['base_url'];?>assets/editor.css" rel="stylesheet" type="text/css" />  
 <script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/slider.js"></script>
+<script type="text/javascript" src="../../popups/popup.js"></script>
 <script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/popup.js"></script>
 <script type="text/javascript">