Changes in [501:ead05faef1e4:503:a4f39cc10d7a]

Files:

• .hgignore (modified) (1 diff)
• admin/blog_theme.php (modified) (3 diffs)
• admin/style/default.css (modified) (1 diff)
• inc/public/prepend.php (modified) (1 diff)
• plugins/blowupConfig/_public.php (modified) (10 diffs)
• plugins/blowupConfig/index.php (modified) (19 diffs)
• plugins/blowupConfig/lib/class.blowup.config.php (modified) (27 diffs)
• themes/ductile/_config.php (added)
• themes/ductile/_define.php (added)
• themes/ductile/_prepend.php (added)
• themes/ductile/_public.php (added)
• themes/ductile/img/attach.png (added)
• themes/ductile/img/category.png (added)
• themes/ductile/img/comment.png (added)
• themes/ductile/img/download.png (added)
• themes/ductile/img/feed.png (added)
• themes/ductile/img/filet.png (added)
• themes/ductile/img/hline.png (added)
• themes/ductile/img/last-hline.png (added)
• themes/ductile/img/menu.png (added)
• themes/ductile/img/menumobile.png (added)
• themes/ductile/img/ping.png (added)
• themes/ductile/img/square.png (added)
• themes/ductile/img/square2.png (added)
• themes/ductile/img/square3.png (added)
• themes/ductile/img/sticker-about.png (added)
• themes/ductile/img/sticker-contact.png (added)
• themes/ductile/img/sticker-feed.png (added)
• themes/ductile/img/tag.png (added)
• themes/ductile/img/vline.png (added)
• themes/ductile/locales/fr/admin.po (added)
• themes/ductile/locales/fr/main.po (added)
• themes/ductile/mediaqueries.css (added)
• themes/ductile/rebase.css (added)
• themes/ductile/style.css (added)
• themes/ductile/tpl/_entry-full.html (added)
• themes/ductile/tpl/_entry-short.html (added)
• themes/ductile/tpl/_entry-title.html (added)
• themes/ductile/tpl/_footer.html (added)
• themes/ductile/tpl/_head.html (added)
• themes/ductile/tpl/_pagination.html (added)
• themes/ductile/tpl/_sidebar.html (added)
• themes/ductile/tpl/_top.html (added)
• themes/ductile/tpl/archive.html (added)
• themes/ductile/tpl/archive_month.html (added)
• themes/ductile/tpl/home.html (added)

.hgignore

@@ -1 +1 @@
 cache
-public
 inc/config.php
 \.htaccess
+public/filters
+themes/ductile/_work
+themes/ductile-work
+themes/ductile/default-templates

admin/blog_theme.php

@@ -156 +156 @@
      
      $radio_id = 'theme_'.html::escapeHTML($id);
-     if (preg_match('#^http(s)?://#',$core->blog->settings->system->themes_url)) {
-          $theme_url = http::concatURL($core->blog->settings->system->themes_url,'/'.$id);
-     } else {
-          $theme_url = http::concatURL($core->blog->url,$core->blog->settings->system->themes_url.'/'.$id);
-     }
+     $theme_url = http::concatURL($core->blog->url,$core->blog->settings->system->themes_url.'/'.$id);
      $has_conf = file_exists(path::real($core->blog->themes_path.'/'.$id).'/_config.php');
      $has_css = file_exists(path::real($core->blog->themes_path.'/'.$id).'/style.css');
@@ -216 +212 @@
 {
      echo
-     '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Blog appearance').'</span></h2>';
+     '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.__('Blog appearance').'</h2>';
      
      if (!empty($_GET['upd'])) {
@@ -333 +329 @@
      echo
      '<h2>'.html::escapeHTML($core->blog->name).
-     ' &rsaquo; <a href="blog_theme.php">'.__('Blog appearance').'</a> &rsaquo; <span class="page-title">'.__('Theme configuration').'<span class="page-title"></h2>'.
+     ' &rsaquo; <a href="blog_theme.php">'.__('Blog appearance').'</a> &rsaquo; '.__('Theme configuration').'</h2>'.
      '<p><a class="back" href="blog_theme.php">'.__('back').'</a></p>';
      
      try
      {
-          # Let theme configuration set their own form(s) if required
-          $standalone_config = (boolean) $core->themes->moduleInfo($core->blog->settings->system->theme,'standalone_config');
-
-          if (!$standalone_config)
+          # Let theme configuration set their own form(s)
+          $managed = (boolean) $core->callBehavior('adminThemeConfigManaged');
+          
+          if (!$managed)
                echo '<form id="theme_config" action="blog_theme.php?conf=1" method="post" enctype="multipart/form-data">';
 
           include $theme_conf_file;
 
-          if (!$standalone_config)
+          if (!$managed)
                echo
                '<p class="clear"><input type="submit" value="'.__('Save').'" />'.
                $core->formNonce().'</p>'.
                '</form>';
-
      }
      catch (Exception $e)

admin/style/default.css

@@ -1179 +1179 @@
 p.field {
      position: relative;
-
+     
 }
 p.field label {

inc/public/prepend.php

@@ -113 +113 @@
 $core->themes->loadNsFile($__theme,'public');
 
+# Loading translations for selected theme
+if ($__parent_theme) {
+     $core->themes->loadModuleL10N($__parent_theme,$_lang,'main');
+}
+$core->themes->loadModuleL10N($__theme,$_lang,'main');
+
 # --BEHAVIOR-- publicPrepend
 $core->callBehavior('publicPrepend',$core);

plugins/blowupConfig/_public.php

@@ -25 +25 @@
           echo '<style type="text/css">'."\n".self::blowUpStyleHelper()."\n</style>\n";
      }
-     
+
      public static function blowUpStyleHelper()
      {
           $s = $GLOBALS['core']->blog->settings->themes->blowup_style;
-          
+
           if ($s === null) {
                return;
           }
-          
+
           $s = @unserialize($s);
           if (!is_array($s)) {
                return;
           }
-          
+
           $css = array();
-          
+
           /* Sidebar position
           ---------------------------------------------- */
@@ -48 +48 @@
                $css['#sidebar']['float'] = 'left';
           }
-          
+
           /* Properties
           ---------------------------------------------- */
           self::prop($css,'body','background-color',$s['body_bg_c']);
-          
+
           self::prop($css,'body','color',$s['body_txt_c']);
           self::prop($css,'.post-tags li a:link, .post-tags li a:visited, .post-info-co a:link, .post-info-co a:visited','color',$s['body_txt_c']);
           self::prop($css,'#page','font-size',$s['body_txt_s']);
           self::prop($css,'body','font-family',blowupConfig::fontDef($s['body_txt_f']));
-          
+
           self::prop($css,'.post-content, .post-excerpt, #comments dd, #pings dd, dd.comment-preview','line-height',$s['body_line_height']);
-          
+
           if (!$s['blog_title_hide'])
           {
@@ -65 +65 @@
                self::prop($css,'#top h1','font-size',$s['blog_title_s']);
                self::prop($css,'#top h1','font-family',blowupConfig::fontDef($s['blog_title_f']));
-               
+
                if ($s['blog_title_a'] == 'right' || $s['blog_title_a'] == 'left') {
                     $css['#top h1'][$s['blog_title_a']] = '0px';
                     $css['#top h1']['width'] = 'auto';
                }
-               
+
                if ($s['blog_title_p'])
                {
@@ -92 +92 @@
           }
           self::prop($css,'#top','height',$s['top_height']);
-          
+
           self::prop($css,'.day-date','color',$s['date_title_c']);
           self::prop($css,'.day-date','font-family',blowupConfig::fontDef($s['date_title_f']));
           self::prop($css,'.day-date','font-size',$s['date_title_s']);
-          
+
           self::prop($css,'a','color',$s['body_link_c']);
           self::prop($css,'a:visited','color',$s['body_link_v_c']);
           self::prop($css,'a:hover, a:focus, a:active','color',$s['body_link_f_c']);
-          
+
           self::prop($css,'#comment-form input, #comment-form textarea','color',$s['body_link_c']);
           self::prop($css,'#comment-form input.preview','color',$s['body_link_c']);
@@ -108 +108 @@
           self::prop($css,'#comment-form input.submit:hover','background',$s['body_link_f_c']);
           self::prop($css,'#comment-form input.submit:hover','border-color',$s['body_link_f_c']);
-          
+
           self::prop($css,'#sidebar','font-family',blowupConfig::fontDef($s['sidebar_text_f']));
           self::prop($css,'#sidebar','font-size',$s['sidebar_text_s']);
           self::prop($css,'#sidebar','color',$s['sidebar_text_c']);
-          
+
           self::prop($css,'#sidebar h2','font-family',blowupConfig::fontDef($s['sidebar_title_f']));
           self::prop($css,'#sidebar h2','font-size',$s['sidebar_title_s']);
           self::prop($css,'#sidebar h2','color',$s['sidebar_title_c']);
-          
+
           self::prop($css,'#sidebar h3','font-family',blowupConfig::fontDef($s['sidebar_title2_f']));
           self::prop($css,'#sidebar h3','font-size',$s['sidebar_title2_s']);
           self::prop($css,'#sidebar h3','color',$s['sidebar_title2_c']);
-          
+
           self::prop($css,'#sidebar ul','border-top-color',$s['sidebar_line_c']);
           self::prop($css,'#sidebar li','border-bottom-color',$s['sidebar_line_c']);
           self::prop($css,'#topnav ul','border-bottom-color',$s['sidebar_line_c']);
-          
+
           self::prop($css,'#sidebar li a','color',$s['sidebar_link_c']);
           self::prop($css,'#sidebar li a:visited','color',$s['sidebar_link_v_c']);
@@ -132 +132 @@
           self::prop($css,'#search .submit:hover','background',$s['sidebar_link_f_c']);
           self::prop($css,'#search .submit:hover','border-color',$s['sidebar_link_f_c']);
-          
+
           self::prop($css,'.post-title','color',$s['post_title_c']);
           self::prop($css,'.post-title a, .post-title a:visited','color',$s['post_title_c']);
           self::prop($css,'.post-title','font-family',blowupConfig::fontDef($s['post_title_f']));
           self::prop($css,'.post-title','font-size',$s['post_title_s']);
-          
+
           self::prop($css,'#comments dd','background-color',$s['post_comment_bg_c']);
           self::prop($css,'#comments dd','color',$s['post_comment_c']);
           self::prop($css,'#comments dd.me','background-color',$s['post_commentmy_bg_c']);
           self::prop($css,'#comments dd.me','color',$s['post_commentmy_c']);
-          
+
           self::prop($css,'#prelude, #prelude a','color',$s['prelude_c']);
-          
+
           self::prop($css,'#footer p','background-color',$s['footer_bg_c']);
           self::prop($css,'#footer p','color',$s['footer_c']);
@@ -150 +150 @@
           self::prop($css,'#footer p','font-family',blowupConfig::fontDef($s['footer_f']));
           self::prop($css,'#footer p a','color',$s['footer_l_c']);
-          
+
           /* Images
           ------------------------------------------------------ */
@@ -164 +164 @@
           self::backgroundImg($css,'#comments dt.me',$s['post_commentmy_bg_c'],'commentmy-t.png');
           self::backgroundImg($css,'#comments dd.me',$s['post_commentmy_bg_c'],'commentmy-b.png');
-          
+
           $res = '';
           foreach ($css as $selector => $values) {
@@ -173 +173 @@
                $res .= "}\n";
           }
+
+          $res .= $s['extra_css'];
+
           return $res;
      }
-     
+
      protected static function prop(&$css,$selector,$prop,$value)
      {
@@ -182 +185 @@
           }
      }
-     
+
      protected static function backgroundImg(&$css,$selector,$value,$image)
      {

plugins/blowupConfig/index.php

@@ -24 +24 @@
      'body_bg_c' => null,
      'body_bg_g' => 'light',
-     
+
      'body_txt_f' => null,
      'body_txt_s' => null,
      'body_txt_c' => null,
      'body_line_height' => null,
-     
+
      'top_image' => 'default',
      'top_height' => null,
      'uploaded' => null,
-     
+
      'blog_title_hide' => null,
      'blog_title_f' => null,
@@ -40 +40 @@
      'blog_title_a' => null,
      'blog_title_p' => null,
-     
+
      'body_link_c' => null,
      'body_link_f_c' => null,
      'body_link_v_c' => null,
-     
+
      'sidebar_position' => null,
      'sidebar_text_f' => null,
@@ -59 +59 @@
      'sidebar_link_f_c' => null,
      'sidebar_link_v_c' => null,
-     
+
      'date_title_f' => null,
      'date_title_s' => null,
      'date_title_c' => null,
-     
+
      'post_title_f' => null,
      'post_title_s' => null,
@@ -71 +71 @@
      'post_commentmy_bg_c' => null,
      'post_commentmy_c' => null,
-     
+
      'prelude_c' => null,
      'footer_f' => null,
@@ -78 +78 @@
      'footer_l_c' => null,
      'footer_bg_c' => null,
+
+     'extra_css' => null
 );
 
@@ -108 +110 @@
           $blowup_user['body_txt_c'] = blowupConfig::adjustColor($_POST['body_txt_c']);
           $blowup_user['body_line_height'] = blowupConfig::adjustFontSize($_POST['body_line_height']);
-          
+
           $blowup_user['blog_title_hide'] = (integer) !empty($_POST['blog_title_hide']);
           $update_blog_title = !$blowup_user['blog_title_hide'] && (
@@ -115 +117 @@
                !empty($_POST['blog_title_p'])
           );
-          
+
           if ($update_blog_title)
           {
@@ -124 +126 @@
                $blowup_user['blog_title_p'] = blowupConfig::adjustPosition($_POST['blog_title_p']);
           }
-          
+
           $blowup_user['body_link_c'] = blowupConfig::adjustColor($_POST['body_link_c']);
           $blowup_user['body_link_f_c'] = blowupConfig::adjustColor($_POST['body_link_f_c']);
           $blowup_user['body_link_v_c'] = blowupConfig::adjustColor($_POST['body_link_v_c']);
-          
+
           $blowup_user['sidebar_text_f'] = $_POST['sidebar_text_f'];
           $blowup_user['sidebar_text_s'] = blowupConfig::adjustFontSize($_POST['sidebar_text_s']);
@@ -142 +144 @@
           $blowup_user['sidebar_link_f_c'] = blowupConfig::adjustColor($_POST['sidebar_link_f_c']);
           $blowup_user['sidebar_link_v_c'] = blowupConfig::adjustColor($_POST['sidebar_link_v_c']);
-          
+
           $blowup_user['sidebar_position'] = ($_POST['sidebar_position'] == 'left') ? 'left' : null;
-          
+
           $blowup_user['date_title_f'] = $_POST['date_title_f'];
           $blowup_user['date_title_s'] = blowupConfig::adjustFontSize($_POST['date_title_s']);
           $blowup_user['date_title_c'] = blowupConfig::adjustColor($_POST['date_title_c']);
-          
+
           $blowup_user['post_title_f'] = $_POST['post_title_f'];
           $blowup_user['post_title_s'] = blowupConfig::adjustFontSize($_POST['post_title_s']);
@@ -154 +156 @@
           $blowup_user['post_comment_c'] = blowupConfig::adjustColor($_POST['post_comment_c']);
           $blowup_user['post_commentmy_c'] = blowupConfig::adjustColor($_POST['post_commentmy_c']);
-          
-          
+
+
           $blowup_user['footer_f'] = $_POST['footer_f'];
           $blowup_user['footer_s'] = blowupConfig::adjustFontSize($_POST['footer_s']);
@@ -161 +163 @@
           $blowup_user['footer_l_c'] = blowupConfig::adjustColor($_POST['footer_l_c']);
           $blowup_user['footer_bg_c'] = blowupConfig::adjustColor($_POST['footer_bg_c']);
-          
+
+
+          $blowup_user['extra_css'] = blowupConfig::cleanCSS($_POST['extra_css']);
+
           if ($can_write_images)
           {
@@ -168 +173 @@
                     $uploaded = blowupConfig::imagesPath().'/'.$blowup_user['uploaded'];
                }
-               
+
                if (!empty($_FILES['upfile']) && !empty($_FILES['upfile']['name'])) {
                     files::uploadStatus($_FILES['upfile']);
@@ -174 +179 @@
                     $blowup_user['uploaded'] = basename($uploaded);
                }
-               
+
                $blowup_user['top_image'] = in_array($_POST['top_image'],$top_images) ? $_POST['top_image'] : 'default';
-               
+
                $blowup_user['body_bg_c'] = blowupConfig::adjustColor($_POST['body_bg_c']);
                $blowup_user['body_bg_g'] = in_array($_POST['body_bg_g'],$gradient_types) ? $_POST['body_bg_g'] : '';
@@ -184 +189 @@
                blowupConfig::createImages($blowup_user,$uploaded);
           }
-          
+
           $core->blog->settings->addNamespace('themes');
           $core->blog->settings->themes->put('blowup_style',serialize($blowup_user));
           $core->blog->triggerBlog();
-          
+
           http::redirect($p_url.'&upd=1');
      }
@@ -233 +238 @@
 
 echo '<form id="theme_config" action="'.$p_url.'" method="post" enctype="multipart/form-data">';
-          
+
 echo '<fieldset><legend>'.__('General').'</legend>';
 
@@ -240 +245 @@
      '<p class="field"><label for="body_bg_c">'.__('Background color:').' '.
      form::field('body_bg_c',7,7,$blowup_user['body_bg_c'],'colorpicker').'</label></p>'.
-     
+
      '<p class="field"><label for="body_bg_g">'.__('Background color fill:').' '.
      form::combo('body_bg_g',$gradient_types,$blowup_user['body_bg_g']).'</label></p>';
@@ -304 +309 @@
           $preview_image = 'index.php?pf=blowupConfig/alpha-img/page-t/'.$blowup_user['top_image'].'.png';
      }
-     
+
      echo
      '<fieldset><legend>'.__('Top image').'</legend>'.
@@ -310 +315 @@
      form::combo('top_image',$top_images,($blowup_user['top_image'] ? $blowup_user['top_image'] : 'default')).'</label></p>'.
      '<p>'.__('Choose "Custom..." to upload your own image.').'</p>'.
-     
+
      '<p id="uploader"><label for="upfile">'.__('Add your image:').
      ' ('.sprintf(__('JPEG or PNG file, 800 pixels wide, maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.
      '<input type="file" name="upfile" id="upfile" size="35" />'.
      '</label></p>'.
-     
+
      '<h3>'.__('Preview').'</h3>'.
      '<div class="grid" style="width:800px;border:1px solid #ccc;">'.
@@ -425 +430 @@
 '</fieldset>';
 
+echo
+'<fieldset><legend>'.__('Additional CSS').'</legend>'.
+'<p>'.form::textarea('extra_css',72,5,html::escapeHTML($blowup_user['extra_css']),'maximal','',false,'title="'.__('Additional CSS').'"').'</p>'.
+'</fieldset>';
+
+
+
 // Import / Export configuration
 $tmp_array = array();

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)
      {