Revert to older pixidou organization to get it working again.

exponentcms · Jul 4, 2011 · 5c4c719 · 5c4c719
1 parent 7c5e6f6
commit 5c4c719
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 59 deletions.
diff --git a/...ules/pixidou/assets/images/background.gif → ...ork/modules/pixidou/assets/background.gif b/...ules/pixidou/assets/images/background.gif → ...ork/modules/pixidou/assets/background.gif
diff --git a/...rk/modules/pixidou/assets/images/bg-h.gif → framework/modules/pixidou/assets/bg-h.gif b/...rk/modules/pixidou/assets/images/bg-h.gif → framework/modules/pixidou/assets/bg-h.gif
diff --git a/...dules/pixidou/assets/images/hue_thumb.png → ...work/modules/pixidou/assets/hue_thumb.png b/...dules/pixidou/assets/images/hue_thumb.png → ...work/modules/pixidou/assets/hue_thumb.png
diff --git a/...es/pixidou/assets/images/picker_thumb.png → ...k/modules/pixidou/assets/picker_thumb.png b/...es/pixidou/assets/images/picker_thumb.png → ...k/modules/pixidou/assets/picker_thumb.png
diff --git a/...modules/pixidou/assets/images/thumb-n.gif → framework/modules/pixidou/assets/thumb-n.gif b/...modules/pixidou/assets/images/thumb-n.gif → framework/modules/pixidou/assets/thumb-n.gif
diff --git a/framework/modules/pixidou/controllers/pixidouController.php b/framework/modules/pixidou/controllers/pixidouController.php
@@ -18,8 +18,7 @@
 ##################################################
 
 class pixidouController extends expController {
-//    public $cacheDir = "framework/modules/pixidou/images/";
-	public $cacheDir = "tmp/pixidou/";
+    public $cacheDir = "framework/modules/pixidou/images/";
     public $requires_login = array('editor','exitEditor');
 	public $codequality = 'beta';
 

diff --git a/...rk/modules/pixidou/assets/css/pixidou.css → framework/modules/pixidou/css/pixidou.css b/...rk/modules/pixidou/assets/css/pixidou.css → framework/modules/pixidou/css/pixidou.css
@@ -28,7 +28,7 @@ a:hover{
 .yui-skin-sam .yui-layout .yui-layout-unit div.yui-layout-bd {
 	border: 0px;
 	text-align: left;
-	background:transparent url(../assets/images/background.gif) repeat scroll 0pt 0px;
+	background:transparent url(../assets/background.gif) repeat scroll 0pt 0px;
 }
 
 .yui-skin-sam .yui-layout .yui-layout-hd {
@@ -40,7 +40,7 @@ a:hover{
 }
 
 .yui-skin-sam .yui-h-slider {
-	background:transparent url(../assets/images/bg-h.gif) repeat-x scroll 5px 0;
+	background:transparent url(../assets/bg-h.gif) repeat-x scroll 5px 0;
 	height:28px;
 	width:254px;
 }

diff --git a/framework/modules/pixidou/images/.htaccess b/framework/modules/pixidou/images/.htaccess
@@ -0,0 +1,3 @@
+# secure directory by disabling script execution
+AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
+Options -ExecCGI
diff --git a/framework/modules/pixidou/includes/class.upload/class.upload.php b/framework/modules/pixidou/includes/class.upload/class.upload.php
@@ -2173,8 +2173,7 @@ function upload($file, $lang = 'en_GB') {
                     $this->file_src_pathname   = $file;
                     $this->file_src_name       = basename($file);
                     $this->log .= '- local file name OK<br />';
-//                    ereg('\.([^\.]*$)', $this->file_src_name, $extension);
-                    preg_match('\.([^\.]*$)', $this->file_src_name, $extension);
+                    ereg('\.([^\.]*$)', $this->file_src_name, $extension);
                     if (is_array($extension)) {
                         $this->file_src_name_ext      = strtolower($extension[1]);
                         $this->file_src_name_body     = substr($this->file_src_name, 0, ((strlen($this->file_src_name) - strlen($this->file_src_name_ext)))-1);
@@ -2246,8 +2245,7 @@ function upload($file, $lang = 'en_GB') {
 
             if ($this->uploaded) {
                 $this->log .= '- file name OK<br />';
-//                ereg('\.([^\.]*$)', $this->file_src_name, $extension);
-                preg_match('\.([^\.]*$)', $this->file_src_name, $extension);
+                ereg('\.([^\.]*$)', $this->file_src_name, $extension);
                 if (is_array($extension)) {
                     $this->file_src_name_ext      = strtolower($extension[1]);
                     $this->file_src_name_body     = substr($this->file_src_name, 0, ((strlen($this->file_src_name) - strlen($this->file_src_name_ext)))-1);
@@ -2433,27 +2431,23 @@ function imagetransfer($src_im, $dst_im) {
         return $dst_im;
     }
 
-	/**
-	 * Merges two images
-	 *
-	 * If the output format is PNG, then we do it pixel per pixel to retain the alpha channel
-	 *
-	 * @access private
-	 * @param $dst_im
-	 * @param $src_im
-	 * @param  int      $dst_x   x-coordinate of destination point
-	 * @param  int      $dst_y   y-coordinate of destination point
-	 * @param  int      $src_x   x-coordinate of source point
-	 * @param  int      $src_y   y-coordinate of source point
-	 * @param  int      $src_w   Source width
-	 * @param  int      $src_h   Source height
-	 * @param  int      $pct     Optional percentage of the overlay, between 0 and 100 (default: 100)
-	 *
-	 * @internal param \resource $dst_img Destination image
-	 *
-	 * @internal param \resource $src_img Overlay image
-	 * @return resource Destination image
-	 */
+    /**
+     * Merges two images
+     *
+     * If the output format is PNG, then we do it pixel per pixel to retain the alpha channel
+     *
+     * @access private
+     * @param  resource $dst_img Destination image
+     * @param  resource $src_img Overlay image
+     * @param  int      $dst_x   x-coordinate of destination point 
+     * @param  int      $dst_y   y-coordinate of destination point 
+     * @param  int      $src_x   x-coordinate of source point 
+     * @param  int      $src_y   y-coordinate of source point 
+     * @param  int      $src_w   Source width 
+     * @param  int      $src_h   Source height 
+     * @param  int      $pct     Optional percentage of the overlay, between 0 and 100 (default: 100)
+     * @return resource Destination image
+     */
     function imagecopymergealpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct = 0) {
         $dst_x = (int) $dst_x;
         $dst_y = (int) $dst_y;
@@ -2680,8 +2674,7 @@ function process($server_path = null) {
             }
             if ($this->file_safe_name) { // formats the name
                 $this->file_dst_name_body = str_replace(array(' ', '-'), array('_','_'), $this->file_dst_name_body) ;
-//                $this->file_dst_name_body = ereg_replace('[^A-Za-z0-9_]', '', $this->file_dst_name_body) ;
-                $this->file_dst_name_body = preg_replace('[^A-Za-z0-9_]', '', $this->file_dst_name_body) ;
+                $this->file_dst_name_body = ereg_replace('[^A-Za-z0-9_]', '', $this->file_dst_name_body) ;
                 $this->log .= '- file name safe format<br />';
             }
 
@@ -4026,15 +4019,13 @@ function clean() {
     }
 
 
-	/**
-	 * Opens a BMP image
-	 *
-	 * This function has been written by DHKold, and is used with permission of the author
-	 *
-	 * @access public
-	 * @param $filename
-	 * @return mixed
-	 */
+    /**
+     * Opens a BMP image
+     *
+     * This function has been written by DHKold, and is used with permission of the author
+     *
+     * @access public
+     */
     function imagecreatefrombmp($filename) {
         if (! $f1 = fopen($filename,"rb")) return false;
 
@@ -4102,17 +4093,14 @@ function imagecreatefrombmp($filename) {
         fclose($f1);
         return $res;
     }
-
-	/**
-	 * Saves a BMP image
-	 *
-	 * This function has been published on the PHP website, and can be used freely
-	 *
-	 * @access public
-	 * @param $im
-	 * @param string $filename
-	 * @return bool
-	 */
+
+    /**
+     * Saves a BMP image
+     *
+     * This function has been published on the PHP website, and can be used freely
+     *
+     * @access public
+     */    
     function imagebmp(&$im, $filename = "") {      
 
         if (!$im) return false;

diff --git a/framework/modules/pixidou/includes/class.upload/upload.php b/framework/modules/pixidou/includes/class.upload/upload.php
@@ -9,7 +9,7 @@
         }
         fieldset {
             width: 50%;
-            background: url(../../assets/images/background.gif);
+            background: url(bg.gif);
             margin: 15px 0px 25px 0px;
             padding: 15px;
         }

diff --git a/framework/modules/pixidou/index.php b/framework/modules/pixidou/index.php
@@ -137,7 +137,7 @@
 					<div class="hd">Adjust contrast</div>
 					<div class="bd">
 						<div id="contrastSliderBg" class="yui-h-slider" title="Slider">
-							<div id="contrastSliderThumb" class="yui-slider-thumb"><img src="assets/images/thumb-n.gif" alt="" /></div>
+							<div id="contrastSliderThumb" class="yui-slider-thumb"><img src="assets/thumb-n.gif" alt="" /></div>
 						</div>
 						<p>Value : <span id="contrastSliderValue">0</span></p>
 					</div>
@@ -149,7 +149,7 @@
 					<div class="hd">Adjust brightness</div>
 					<div class="bd">
 						<div id="brightnessSliderBg" class="yui-h-slider" title="Slider">
-							<div id="brightnessSliderThumb" class="yui-slider-thumb"><img src="assets/imagesthumb-n.gif" alt="" /></div>
+							<div id="brightnessSliderThumb" class="yui-slider-thumb"><img src="assets/thumb-n.gif" alt="" /></div>
 						</div>
 						<p>Value : <span id="brightnessSliderValue">0</span></p>
 					</div>

diff --git a/framework/modules/pixidou/js/ui.js b/framework/modules/pixidou/js/ui.js
@@ -90,8 +90,8 @@ ui = {
         		ui.tintPicker = new YAHOO.widget.ColorPicker("tintPicker", {
 						container: ui.tintPickerPanel,
 						images: {
-							PICKER_THUMB: "assets/images/picker_thumb.png",
-							HUE_THUMB: "assets/images/hue_thumb.png"
+							PICKER_THUMB: "assets/picker_thumb.png",
+							HUE_THUMB: "assets/hue_thumb.png"
 						}
 				});
         	}

diff --git a/framework/modules/pixidou/views/pixidou/editor.tpl b/framework/modules/pixidou/views/pixidou/editor.tpl
@@ -35,7 +35,7 @@
         <title>Pixidou - Open Source AJAX Image Editor</title>
         <!-- Combo-handled YUI CSS files: -->
         <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/combo?2.6.0/build/reset-fonts/reset-fonts.css&2.6.0/build/assets/skins/sam/skin.css" />
-        <link rel="stylesheet" type="text/css" href="{$smarty.const.URL_FULL}framework/modules/pixidou/assets/css/pixidou.css" />
+        <link rel="stylesheet" type="text/css" href="{$smarty.const.URL_FULL}framework/modules/pixidou/css/pixidou.css" />
     </head>
     <body class="yui-skin-sam">
         <div id="doc3" class="yui-t7 hide">
@@ -142,7 +142,7 @@
                     <div class="hd">Adjust contrast</div>
                     <div class="bd">
                         <div id="contrastSliderBg" class="yui-h-slider" title="Slider">
-                            <div id="contrastSliderThumb" class="yui-slider-thumb"><img src="assets/images/thumb-n.gif" alt="" /></div>
+                            <div id="contrastSliderThumb" class="yui-slider-thumb"><img src="assets/thumb-n.gif" alt="" /></div>
                         </div>
                         <p>Value : <span id="contrastSliderValue">0</span></p>
                     </div>
@@ -154,7 +154,7 @@
                     <div class="hd">Adjust brightness</div>
                     <div class="bd">
                         <div id="brightnessSliderBg" class="yui-h-slider" title="Slider">
-                            <div id="brightnessSliderThumb" class="yui-slider-thumb"><img src="assets/images/thumb-n.gif" alt="" /></div>
+                            <div id="brightnessSliderThumb" class="yui-slider-thumb"><img src="assets/thumb-n.gif" alt="" /></div>
                         </div>
                         <p>Value : <span id="brightnessSliderValue">0</span></p>
                     </div>