Changes in plugins/blowupConfig/lib/class.blowup.config.php [270:48858be15bda:295:120c4648cb6f]

File:

• plugins/blowupConfig/lib/class.blowup.config.php (modified) (27 diffs, 1 prop)

plugins/blowupConfig/lib/class.blowup.config.php

@@ -22 +22 @@
                'ss5' => 'Impact, Charcoal, sans-serif'
           ),
-          
+
           'serif' => array(
                's1' => 'Times, "Times New Roman", serif',
@@ -28 +28 @@
                's3' => 'Baskerville, "Palatino Linotype", serif'
           ),
-          
+
           'monospace' => array(
                'm1' => '"Andale Mono", "Courier New", monospace',
@@ -34 +34 @@
           )
      );
-     
+
      protected static $fonts_combo = array();
      protected static $fonts_list = array();
-     
+
      public static $top_images = array(
           'default' => 'Default',
@@ -55 +55 @@
           'typo' => 'Typo',
      );
-     
+
      public static function fontsList()
      {
@@ -70 +70 @@
                }
           }
-          
+
           return self::$fonts_combo;
      }
-     
+
      public static function fontDef($c)
      {
@@ -85 +85 @@
                }
           }
-          
+
           return isset(self::$fonts_list[$c]) ? self::$fonts_list[$c] : null;
      }
-     
+
      public static function adjustFontSize($s)
      {
@@ -97 +97 @@
                return $m[1].$m[2];
           }
-          
+
           return null;
      }
-     
+
      public static function adjustPosition($p)
      {
@@ -106 +106 @@
                return null;
           }
-          
+
           $p = explode(':',$p);
-          
+
           return $p[0].(count($p) == 1 ? ':0' : ':'.$p[1]);
      }
-     
+
      public static function adjustColor($c)
      {
@@ -117 +117 @@
                return '';
           }
-          
+
           $c = strtoupper($c);
-          
+
           if (preg_match('/^[A-F0-9]{3,6}$/',$c)) {
                $c = '#'.$c;
           }
-          
+
           if (preg_match('/^#[A-F0-9]{6}$/',$c)) {
                return $c;
           }
-          
+
           if (preg_match('/^#[A-F0-9]{3,}$/',$c)) {
                return '#'.substr($c,1,1).substr($c,1,1).substr($c,2,1).substr($c,2,1).substr($c,3,1).substr($c,3,1);
           }
-          
+
           return '';
      }
-     
+
+     public static function cleanCSS($css)
+     {
+          // TODO ?
+          return $css;
+     }
+
      public static function imagesPath()
      {
@@ -140 +146 @@
           return path::real($core->blog->public_path).'/blowup-images';
      }
-     
+
      public static function imagesURL()
      {
@@ -146 +152 @@
           return $core->blog->settings->system->public_url.'/blowup-images';
      }
-     
+
      public static function canWriteImages($create=false)
      {
           global $core;
-          
+
           $public = path::real($core->blog->public_path);
           $imgs = self::imagesPath();
-          
+
           if (!function_exists('imagecreatetruecolor') || !function_exists('imagepng') || !function_exists('imagecreatefrompng')) {
                $core->error->add(__('At least one of the following functions is not available: '.
@@ -159 +165 @@
                return false;
           }
-          
+
           if (!is_dir($public)) {
                $core->error->add(__('The \'public\' directory does not exist.'));
                return false;
           }
-          
+
           if (!is_dir($imgs)) {
                if (!is_writable($public)) {
@@ -175 +181 @@
                return true;
           }
-          
+
           if (!is_writable($imgs)) {
                $core->error->add(sprintf(__('The \'%s\' directory cannot be modified.'),'public/blowup-images'));
                return false;
           }
-          
+
           return true;
      }
-     
+
      public static function uploadImage($f)
      {
@@ -189 +195 @@
                throw new Exception(__('Unable to create images.'));
           }
-          
+
           $name = $f['name'];
           $type = files::getMimeType($name);
-          
+
           if ($type != 'image/jpeg' && $type != 'image/png') {
                throw new Exception(__('Invalid file type.'));
           }
-          
+
           $dest = self::imagesPath().'/uploaded'.($type == 'image/png' ? '.png' : '.jpg');
-          
+
           if (@move_uploaded_file($f['tmp_name'],$dest) === false) {
                throw new Exception(__('An error occurred while writing the file.'));
           }
-          
+
           $s = getimagesize($dest);
           if ($s[0] != 800) {
                throw new Exception(__('Uploaded image is not 800 pixels wide.'));
           }
-          
+
           return $dest;
      }
-     
+
      public static function createImages(&$config,$uploaded)
      {
@@ -219 +225 @@
           $comment_color_my = $config['post_commentmy_bg_c'];
           $top_image = $config['top_image'];
-          
+
           $config['top_height'] = null;
-          
+
           if ($top_image != 'custom' && !isset(self::$top_images[$top_image])) {
                $top_image = 'default';
@@ -228 +234 @@
                $uploaded = null;
           }
-          
+
           if (!self::canWriteImages(true)) {
                throw new Exception(__('Unable to create images.'));
           }
-          
+
           $body_fill = array(
                'light' => dirname(__FILE__).'/../alpha-img/gradient-l.png',
@@ -238 +244 @@
                'dark' => dirname(__FILE__).'/../alpha-img/gradient-d.png'
           );
-          
+
           $body_g = isset($body_fill[$gradient]) ? $body_fill[$gradient] : false;
-          
+
           if ($top_image == 'custom' && $uploaded) {
                $page_t = $uploaded;
@@ -246 +252 @@
                $page_t = dirname(__FILE__).'/../alpha-img/page-t/'.$top_image.'.png';
           }
-          
+
           $body_bg = dirname(__FILE__).'/../alpha-img/body-bg.png';
           $page_t_mask = dirname(__FILE__).'/../alpha-img/page-t/image-mask.png';
@@ -254 +260 @@
           $default_bg = '#e0e0e0';
           $default_prelude = '#ededed';
-          
+
           self::dropImage(basename($body_bg));
           self::dropImage('page-t.png');
@@ -260 +266 @@
           self::dropImage(basename($comment_t));
           self::dropImage(basename($comment_b));
-          
+
           $body_color = self::adjustColor($body_color);
           $prelude_color = self::adjustColor($prelude_color);
           $comment_color = self::adjustColor($comment_color);
-          
+
           if ($top_image || $body_color || $gradient != 'light' || $prelude_color || $uploaded)
           {
@@ -271 +277 @@
                }
                $body_color = sscanf($body_color,'#%2X%2X%2X');
-               
+
                # Create body gradient with color
                $d_body_bg = imagecreatetruecolor(50,180);
                $fill = imagecolorallocate($d_body_bg,$body_color[0],$body_color[1],$body_color[2]);
                imagefill($d_body_bg,0,0,$fill);
-               
+
                # User choosed a gradient
                if ($body_g) {
@@ -284 +290 @@
                     imagedestroy($s_body_bg);
                }
-               
+
                if (!$prelude_color) {
                     $prelude_color = $default_prelude;
                }
                $prelude_color = sscanf($prelude_color,'#%2X%2X%2X');
-               
+
                $s_prelude = imagecreatetruecolor(50,30);
                $fill = imagecolorallocate($s_prelude,$prelude_color[0],$prelude_color[1],$prelude_color[2]);
                imagefill($s_prelude,0,0,$fill);
                imagecopy($d_body_bg,$s_prelude,0,0,0,0,50,30);
-               
+
                imagepng($d_body_bg,self::imagesPath().'/'.basename($body_bg));
           }
-          
+
           if ($top_image || $body_color || $gradient != 'light')
           {
@@ -304 +310 @@
                $size = $size[1];
                $type = files::getMimeType($page_t);
-               
+
                $d_page_t = imagecreatetruecolor(800,$size);
-               
+
                if ($type == 'image/png') {
                     $s_page_t = @imagecreatefrompng($page_t);
@@ -312 +318 @@
                     $s_page_t = @imagecreatefromjpeg($page_t);
                }
-               
+
                if (!$s_page_t) {
                     throw new exception(__('Unable to open image.'));
                }
-               
+
                $fill = imagecolorallocate($d_page_t,$body_color[0],$body_color[1],$body_color[2]);
                imagefill($d_page_t,0,0,$fill);
-               
+
                if ($type == 'image/png')
                {
@@ -331 +337 @@
                     # JPEG, we add image and a frame with rounded corners
                     imagecopy($d_page_t,$s_page_t,0,0,0,0,800,$size);
-                    
+
                     imagecopy($d_page_t,$d_body_bg,0,0,0,50,8,4);
                     imagecopy($d_page_t,$d_body_bg,0,4,0,54,4,4);
                     imagecopy($d_page_t,$d_body_bg,792,0,0,50,8,4);
                     imagecopy($d_page_t,$d_body_bg,796,4,0,54,4,4);
-                    
+
                     $mask = imagecreatefrompng($page_t_mask);
                     imagealphablending($mask,true);
                     imagecopy($d_page_t,$mask,0,0,0,0,800,11);
                     imagedestroy($mask);
-                    
+
                     $fill = imagecolorallocate($d_page_t,255,255,255);
                     imagefilledrectangle($d_page_t,0,11,3,$size-1,$fill);
@@ -347 +353 @@
                     imagefilledrectangle($d_page_t,0,$size-9,799,$size-1,$fill);
                }
-               
+
                $config['top_height'] = ($size).'px';
-               
+
                imagepng($d_page_t,self::imagesPath().'/page-t.png');
-               
+
                imagedestroy($d_body_bg);
                imagedestroy($d_page_t);
                imagedestroy($s_page_t);
-               
+
                # Create bottom image with color
                $d_page_b = imagecreatetruecolor(800,8);
                $fill = imagecolorallocate($d_page_b,$body_color[0],$body_color[1],$body_color[2]);
                imagefill($d_page_b,0,0,$fill);
-               
+
                $s_page_b = imagecreatefrompng($page_b);
                imagealphablending($s_page_b,true);
                imagecopy($d_page_b,$s_page_b,0,0,0,0,800,160);
-               
+
                imagepng($d_page_b,self::imagesPath().'/'.basename($page_b));
-               
+
                imagedestroy($d_page_b);
                imagedestroy($s_page_b);
           }
-          
+
           if ($comment_color) {
                self::commentImages($comment_color,$comment_t,$comment_b,basename($comment_t),basename($comment_b));
@@ -378 +384 @@
           }
      }
-     
+
      protected static function commentImages($comment_color,$comment_t,$comment_b,$dest_t,$dest_b)
      {
           $comment_color = sscanf($comment_color,'#%2X%2X%2X');
-               
+
           $d_comment_t = imagecreatetruecolor(500,25);
           $fill = imagecolorallocate($d_comment_t,$comment_color[0],$comment_color[1],$comment_color[2]);
           imagefill($d_comment_t,0,0,$fill);
-          
+
           $s_comment_t = imagecreatefrompng($comment_t);
           imagealphablending($s_comment_t,true);
           imagecopy($d_comment_t,$s_comment_t,0,0,0,0,500,25);
-          
+
           imagepng($d_comment_t,self::imagesPath().'/'.$dest_t);
           imagedestroy($d_comment_t);
           imagedestroy($s_comment_t);
-          
+
           $d_comment_b = imagecreatetruecolor(500,7);
           $fill = imagecolorallocate($d_comment_b,$comment_color[0],$comment_color[1],$comment_color[2]);
           imagefill($d_comment_b,0,0,$fill);
-          
+
           $s_comment_b = imagecreatefrompng($comment_b);
           imagealphablending($s_comment_b,true);
           imagecopy($d_comment_b,$s_comment_b,0,0,0,0,500,7);
-          
+
           imagepng($d_comment_b,self::imagesPath().'/'.$dest_b);
           imagedestroy($d_comment_b);
           imagedestroy($s_comment_b);
      }
-     
+
      public static function dropImage($img)
      {