Changes in [1153:1e48950b05af:1152:fbd922f6ed09]

Files:

• .hgsubstate (modified) (1 diff)
• CHANGELOG (modified) (2 diffs)
• admin/media_item.php (modified) (1 diff)
• admin/posts.php (modified) (1 diff)
• admin/posts_actions.php (modified) (2 diffs)
• inc/admin/default-templates/forms/form_layout.html.twig (modified) (1 diff)
• inc/core/class.dc.context.php (deleted)
• inc/core/class.dc.media.php (modified) (1 diff)
• inc/core/class.dc.template.php (deleted)
• inc/dbschema/upgrade.php (modified) (1 diff)
• inc/public/lib.urlhandlers.php (modified) (1 diff)
• inc/public/prepend.php (modified) (5 diffs)
• locales/fr/main.po (modified) (2 diffs)
• plugins/akismet/class.dc.filter.akismet.php (modified) (1 diff)
• plugins/importExport/inc/flat/class.flat.import.php (modified) (1 diff)
• plugins/tags/_admin.php (modified) (1 diff)
• themes/ductile/_config.php (modified) (7 diffs)
• themes/ductile/_public.php (modified) (3 diffs)
• themes/ductile/locales/fr/admin.po (modified) (2 diffs)
• themes/ductile/style.css (modified) (1 diff)
• themes/ductile/tpl/_simple-entry.html (modified) (1 diff)
• unit-tests/dotclearTest.php (deleted)
• unit-tests/inc/libs/clearbricks/_commonTest.php (deleted)
• unit-tests/inc/libs/clearbricks/common/_mainTest.php (deleted)
• unit-tests/inc/libs/clearbricks/common/lib.cryp.Test.php (deleted)
• unit-tests/inc/libs/clearbricks/common/lib.date.Test.php (deleted)
• unit-tests/inc/libs/clearbricks/common/lib.files.Test.php (deleted)
• unit-tests/inc/libs/clearbricks/common/lib.form.Test.combo.1.xml (deleted)
• unit-tests/inc/libs/clearbricks/common/lib.form.Test.combo.2.xml (deleted)
• unit-tests/inc/libs/clearbricks/common/lib.form.Test.php (deleted)
• unit-tests/inc/libs/clearbricks/common/lib.form.Test.render.1.xml (deleted)
• unit-tests/readme.md (deleted)

.hgsubstate

@@ -1 @@
-789e7f2b4844160f4dc7d2795cfa1e6f4fd53a5c inc/libs/clearbricks
+4f62679e0756104bdc0b49eacaed9aba68735aa5 inc/libs/clearbricks

CHANGELOG

@@ -1 @@
-Dotclear 2.5.0 - 2013-02-24
-===========================================================
-* Ductile theme may now use webfont (from Google, Adobe and similar providers)
+Dotclear 2.5.0 - 201?-??-13
+===========================================================
 * daInstaller plugin is now included in the official distribution
 * The media enhanced uploader may now be temporarily enabled or disabled
@@ -25 +24 @@
 * Adaptative compression rate for thumbnails generation
 * Add timestamp on admin information messages
-* Update to jQuery 1.8.3 and jQuery-UI 1.9.2 (custom)
+* Update to jQuery 1.8.2 and jQuery-UI 1.9 (custom)
 * Add default favicon.ico
 * Add default attributes settings for image,mp3,flv insertion

admin/media_item.php

@@ -60 +60 @@
      # Prepare directories combo box
      $dirs_combo = array();
-     foreach ($core->media->getDBDirs() as $v) {
-          $dirs_combo['/'.$v] = $v;
+     foreach ($core->media->getRootDirs() as $v) {
+          if ($v->w) {
+               $dirs_combo['/'.$v->relname] = $v->relname;
+          }
      }
      ksort($dirs_combo);

admin/posts.php

@@ -110 +110 @@
      __('Mark as unselected') => 'unselected'
 );
-$combo_action[__('Change')] = array(
-     __('Change category') => 'category',
-     __('Change language') => 'lang');
+$combo_action[__('Change')] = array(__('Change category') => 'category');
 if ($core->auth->check('admin',$core->blog->id))
 {

admin/posts_actions.php

@@ -157 +157 @@
           {
                $core->error->add($e->getMessage());
-          }
-     }
-     elseif ($action == 'lang' && isset($_POST['new_lang']))
-     {
-          $new_lang = $_POST['new_lang'];
-          try
-          {
-               $cur = $core->con->openCursor($core->prefix.'post');
-               $cur->post_lang = $new_lang;
-               $cur->update('WHERE post_id '.$core->con->in($posts_ids));
-               
-               http::redirect($redir);
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessages());
           }
      }
@@ -273 +257 @@
      '</form>';
 }
-elseif ($action == 'lang')
-{
-     echo '<h2 class="page-title">'.__('Change language for entries').'</h2>';
-     
-     # lang list
-     # Languages combo
-     $rs = $core->blog->getLangs(array('order'=>'asc'));
-     $all_langs = l10n::getISOcodes(0,1);
-     $lang_combo = array('' => '', __('Most used') => array(), __('Available') => l10n::getISOcodes(1,1));
-     while ($rs->fetch()) {
-          if (isset($all_langs[$rs->post_lang])) {
-               $lang_combo[__('Most used')][$all_langs[$rs->post_lang]] = $rs->post_lang;
-               unset($lang_combo[__('Available')][$all_langs[$rs->post_lang]]);
-          } else {
-               $lang_combo[__('Most used')][$rs->post_lang] = $rs->post_lang;
-          }
-     }
-     unset($all_langs);
-     unset($rs);
-     
-     echo
-     '<form action="posts_actions.php" method="post">'.
-     '<p><label for="new_lang" class="classic">'.__('Entry lang:').' '.
-     form::combo('new_lang',$lang_combo,'').
-     '</label> ';
-     
-     echo
-     $hidden_fields.
-     $core->formNonce().
-     form::hidden(array('action'),'lang').
-     '<input type="submit" value="'.__('Save').'" /></p>'.
-     '</form>';
-
-}
 elseif ($action == 'author' && $core->auth->check('admin',$core->blog->id))
 {

inc/admin/default-templates/forms/form_layout.html.twig

@@ -57 +57 @@
           <label for="{{name}}" class="classic">
      {% endif %}
-    <input type="checkbox" {{ block('field_attr') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
+    <input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
      {% if label is not empty %}
           {{ label }}</label>

inc/core/class.dc.media.php

@@ -821 +821 @@
           $this->callFileHandler(files::getMimeType($media_file),'remove',$f);
      }
-
-     /**
-     * Root directories
-     *
-     * Returns an array of directory under {@link $root} directory.
-     *
-     * @uses fileItem
-     * @return array
-     */
-     public function getDBDirs()
-     {
-          $media_dir = $this->relpwd ? $this->relpwd : '.';
-          
-          $strReq =
-          'SELECT distinct media_dir '.
-          'FROM '.$this->table.' '.
-          "WHERE media_path = '".$this->path."'";
-          $rs = $this->con->select($strReq);
-          while ($rs->fetch()) {
-               if (is_dir($this->root.'/'.$rs->media_dir))
-                    $dir[] = $rs->media_dir;
-          }
-          
-          return $dir;
-     }
      
      /**

inc/dbschema/upgrade.php

@@ -305 +305 @@
                     $core->con->execute($strReq);
                }
-
-               if (version_compare($version,'2.5','<='))
-               {
-                    # Try to disable daInstaller plugin if it has been installed outside the default plugins directory
-                    $path = explode(PATH_SEPARATOR,DC_PLUGINS_ROOT);
-                    $default = path::real(dirname(__FILE__).'/../../plugins/');
-                    foreach ($path as $root)
-                    {
-                         if (!is_dir($root) || !is_readable($root)) {
-                              continue;
-                         }
-                         if (substr($root,-1) != '/') {
-                              $root .= '/';
-                         }
-                         if (($p = @dir($root)) === false) {
-                              continue;
-                         }
-                         if(path::real($root) == $default) {
-                              continue;
-                         }
-                         if (($d = @dir($root.'daInstaller')) === false) {
-                              continue;
-                         }
-                         $f = $root.'/daInstaller/_disabled';
-                         if (!file_exists($f))
-                         {
-                              @file_put_contents($f,'');
-                         }
-                    }
-               }
                
                $core->setVersion('core',DC_VERSION);

inc/public/lib.urlhandlers.php

@@ -86 +86 @@
                $_ctx->nb_entry_per_page = $core->blog->settings->system->nb_post_per_page;
           }
-          
-          // Break public template here for now 
-          // just to check if template engine is well loaded.
-          $core->tpl->display($tpl.'.twig');
-          // To be continued...
           
           $tpl_file = $core->tpl->getFilePath($tpl);

inc/public/prepend.php

@@ -55 +55 @@
 } catch (Exception $e) {}
 
-# Add public default templates path
-$core->tpl->getLoader()->addPath(dirname(__FILE__).'/default-templates');
-# Set public context
-$_ctx = new dcPublicContext($core);
-$core->tpl->addExtension($_ctx);
-
-/*
 # Creating template context
 $_ctx = new context();
@@ -71 +64 @@
           ,640);
 }
-*/
+
 # Loading locales
 $_lang = $core->blog->settings->system->lang;
@@ -127 +120 @@
 
 # --BEHAVIOR-- publicPrepend
-$core->callBehavior('publicPrepend',$core,$_ctx);
+$core->callBehavior('publicPrepend',$core);
 
 # Prepare the HTTP cache thing
@@ -134 +127 @@
 $mod_ts[] = $core->blog->upddt;
 
-
-# Add parent theme path
-if ($__parent_theme && is_dir($core->blog->themes_path.'/'.$__parent_theme.'/tpl')) {
-     $core->tpl->getLoader()->addPath($core->blog->themes_path.'/'.$__parent_theme.'/tpl');
-}
-# Add theme path at the begining of path list
-if (is_dir($core->blog->themes_path.'/'.$__theme.'/tpl')) {
-     $core->tpl->getLoader()->prependPath($core->blog->themes_path.'/'.$__theme.'/tpl');
-}
-/*
 $__theme_tpl_path = array(
      $core->blog->themes_path.'/'.$__theme.'/tpl'
@@ -155 +138 @@
      dirname(__FILE__).'/default-templates',
      $core->tpl->getPath());
-*/
+
 $core->url->mode = $core->blog->settings->system->url_scan;
 

locales/fr/main.po

@@ -1738 +1738 @@
 msgstr "Changer la catégorie"
 
-msgid "Change language"
-msgstr "Changer la langue"
-
 msgid "Change author"
 msgstr "Changer l'auteur"
@@ -1764 +1761 @@
 msgid "Change category for entries"
 msgstr "Changer la catégorie des billets"
-
-msgid "Change language for entries"
-msgstr "Changer la langue des billets"
 
 msgid "Change author for entries"

plugins/akismet/class.dc.filter.akismet.php

@@ -151 +151 @@
           
           $res .=
-          '<p><a href="http://akismet.com/">'.__('Get your own API key').'</a></p>'.
+          '<p><a href="http://wordpress.com/api-keys/">'.__('Get your own API key').'</a></p>'.
           '<p><input type="submit" value="'.__('Save').'" />'.
           $this->core->formNonce().'</p>'.

plugins/importExport/inc/flat/class.flat.import.php

@@ -790 +790 @@
           $strReq = 'SELECT media_id '.
                     'FROM '.$this->prefix.'media '.
-                    "WHERE media_path = '".$this->con->escape($this->cur_media->media_path)."' ".
-                    "AND media_file = '".$this->con->escape($this->cur_media->media_file)."' ";
+                    "WHERE media_path = '".$this->cur_media->media_path."' ".
+                    "AND media_file = '".$this->cur_media->media_file."' ";
           
           $rs = $this->con->select($strReq);

plugins/tags/_admin.php

@@ -105 +105 @@
           $tag_url = $GLOBALS['core']->blog->url.$GLOBALS['core']->url->getURLFor('tag');
           
-          $opts = $GLOBALS['core']->auth->getOptions();
+          $opts = $GLOBALS['core']->blog->url.$GLOBALS['core']->auth->getOptions();
           $type = isset($opts['tag_list_format']) ? $opts['tag_list_format'] : 'more';
           

themes/ductile/_config.php

@@ -44 +44 @@
 }
 
+
+
 $contexts = array(
      'default' => __('Home (first page)'),
@@ -65 +67 @@
      __('Impact') => 'Impact',
      __('Monospace') => 'Monospace'
-);
-
-$webfont_apis = array(
-     __('none') => '',
-     __('javascript (Adobe)') => 'js',
-     __('stylesheet (Google)') => 'css'
 );
 
@@ -229 +225 @@
      'subtitle_hidden' => null,
      'logo_src' => null,
-     'preview_not_mandatory' => null,
      // CSS
      'body_font' => null,
-     'body_webfont_family' => null,
-     'body_webfont_url' => null,
-     'body_webfont_api' => null,
      'alternate_font' => null,
-     'alternate_webfont_family' => null,
-     'alternate_webfont_url' => null,
-     'alternate_webfont_api' => null,
      'blog_title_w' => null,
      'blog_title_s' => null,
@@ -338 +327 @@
                $ductile_user['subtitle_hidden'] = (integer) !empty($_POST['subtitle_hidden']);
                $ductile_user['logo_src'] = $_POST['logo_src'];
-               $ductile_user['preview_not_mandatory'] = (integer) !empty($_POST['preview_not_mandatory']);
 
                $ductile_stickers = array();
@@ -380 +368 @@
           if ($conf_tab == 'css') {
                $ductile_user['body_font'] = $_POST['body_font'];
-               $ductile_user['body_webfont_family'] = $_POST['body_webfont_family'];
-               $ductile_user['body_webfont_url'] = $_POST['body_webfont_url'];
-               $ductile_user['body_webfont_api'] = $_POST['body_webfont_api'];
-
                $ductile_user['alternate_font'] = $_POST['alternate_font'];
-               $ductile_user['alternate_webfont_family'] = $_POST['alternate_webfont_family'];
-               $ductile_user['alternate_webfont_url'] = $_POST['alternate_webfont_url'];
-               $ductile_user['alternate_webfont_api'] = $_POST['alternate_webfont_api'];
 
                $ductile_user['blog_title_w'] = (integer) !empty($_POST['blog_title_w']);
@@ -512 +493 @@
 echo '</fieldset>';
 
-echo '<fieldset><legend>'.__('Miscellaneous options').'</legend>';
-echo '<p class="field"><label for="preview_not_mandatory">'.__('Comment preview is not mandatory:').' '.
-form::checkbox('preview_not_mandatory',1,$ductile_user['preview_not_mandatory']).'</label>'.'</p>';
-echo '</fieldset>';
-
 echo '<input type="hidden" name="conf_tab" value="html">';
 echo '<p class="clear">'.form::hidden('ds_order','').'<input type="submit" value="'.__('Save').'" />'.$core->formNonce().'</p>';
@@ -531 +507 @@
 echo '<h3>'.__('General settings').'</h3>';
 
-echo '<fieldset><legend>'.__('Fonts').'</legend>';
-
-echo '<div class="two-cols">';
-echo '<div class="col">';
-echo
+echo '<fieldset><legend>'.__('Fonts').'</legend>'.
 '<p class="field"><label for="body_font">'.__('Main:').' '.
 form::combo('body_font',$fonts,$ductile_user['body_font']).'</label>'.
 (!empty($ductile_user['body_font']) ? ' '.fontDef($ductile_user['body_font']) : '').
 '</p>'.
-'<p class="form-note">'.__('Set main font to default to use webfont below.').'</p> '.
-'<p class="field"><label for="body_webfont_family">'.__('Webfont family:').'</label> '.
-form::field('body_webfont_family',25,255,$ductile_user['body_webfont_family']).'</p>'.
-'<p class="field"><label for="body_webfont_url">'.__('Webfont URL:').'</label> '.
-form::field('body_webfont_url',50,255,$ductile_user['body_webfont_url']).'</p>'.
-'<p class="field"><label for="body_webfont_url">'.__('Webfont API:').' '.
-form::combo('body_webfont_api',$webfont_apis,$ductile_user['body_webfont_api']).'</label>'.'</p>';
-echo '</div>';
-echo '<div class="col">';
-echo
+
 '<p class="field"><label for="alternate_font">'.__('Secondary:').' '.
 form::combo('alternate_font',$fonts,$ductile_user['alternate_font']).'</label>'.
 (!empty($ductile_user['alternate_font']) ? ' '.fontDef($ductile_user['alternate_font']) : '').
 '</p>'.
-'<p class="form-note">'.__('Set secondary font to default to use webfont below.').'</p> '.
-'<p class="field"><label for="alternate_webfont_family">'.__('Webfont family:').'</label> '.
-form::field('alternate_webfont_family',25,255,$ductile_user['alternate_webfont_family']).'</p>'.
-'<p class="field"><label for="alternate_webfont_url">'.__('Webfont URL:').'</label> '.
-form::field('alternate_webfont_url',50,255,$ductile_user['alternate_webfont_url']).'</p>'.
-'<p class="field"><label for="alternate_webfont_api">'.__('Webfont API:').' '.
-form::combo('alternate_webfont_api',$webfont_apis,$ductile_user['alternate_webfont_api']).'</label>'.'</p>';
-echo '</div>';
-echo '</div>';
-echo '</fieldset>';
+'</fieldset>';
 
 echo '<div class="two-cols">';

themes/ductile/_public.php

@@ -23 +23 @@
 $core->tpl->addValue('ductileNbEntryPerPage',array('tplDuctileTheme','ductileNbEntryPerPage'));
 $core->tpl->addValue('ductileLogoSrc',array('tplDuctileTheme','ductileLogoSrc'));
-$core->tpl->addBlock('IfPreviewIsNotMandatory',array('tplDuctileTheme','IfPreviewIsNotMandatory'));
 
 class tplDuctileTheme
@@ -176 +175 @@
           
           return $img_url;
-     }
-
-     public static function IfPreviewIsNotMandatory($attr,$content)
-     {
-          $s = $GLOBALS['core']->blog->settings->themes->get($GLOBALS['core']->blog->settings->system->theme.'_style');
-          if ($s !== null) {
-               $s = @unserialize($s);
-               if (is_array($s)) {
-                    if (isset($s['preview_not_mandatory'])) {
-                         if ($s['preview_not_mandatory']) {
-                              return $content;
-                         }
-                    }
-               }
-          }
-          return '';
      }
 
@@ -267 +250 @@
                $core->blog->settings->system->themes_url.'/'.$core->blog->settings->system->theme.
                '/ductile.js"></script>'."\n";
-
-          echo self::ductileWebfontHelper();
-     }
-
-     public static function ductileWebfontHelper()
-     {
-          $s = $GLOBALS['core']->blog->settings->themes->get($GLOBALS['core']->blog->settings->system->theme.'_style');
-
-          if ($s === null) {
-               return;
-          }
-
-          $s = @unserialize($s);
-          if (!is_array($s)) {
-               return;
-          }
-
-          $ret = '';
-          $css = array();
-          $uri = array();
-          if (!isset($s['body_font']) || ($s['body_font'] == '')) {
-               // See if webfont defined for main font
-               if (isset($s['body_webfont_api']) && isset($s['body_webfont_family']) && isset($s['body_webfont_url'])) {
-                    $uri[] = $s['body_webfont_url'];
-                    switch ($s['body_webfont_api']) {
-                         case 'js':
-                              $ret .= sprintf('<script type="text/javascript" src="%s"></script>',$s['body_webfont_url'])."\n";
-                              break;
-                         case 'css':
-                              $ret .= sprintf('<link type="text/css" href="%s" rel="stylesheet" />',$s['body_webfont_url'])."\n";
-                              break;
-                    }
-                    # Main font
-                    $selectors = 'body, .supranav li a span, #comments.me, a.comment-number';
-                    self::prop($css,$selectors,'font-family',$s['body_webfont_family']);
-               }
-          }
-          if (!isset($s['alternate_font']) || ($s['alternate_font'] == '')) {
-               // See if webfont defined for secondary font
-               if (isset($s['alternate_webfont_api']) && isset($s['alternate_webfont_family']) && isset($s['alternate_webfont_url'])) {
-                    if (!in_array($s['alternate_webfont_url'], $uri)) {
-                         switch ($s['alternate_webfont_api']) {
-                              case 'js':
-                                   $ret .= sprintf('<script type="text/javascript" src="%s"></script>',$s['alternate_webfont_url'])."\n";
-                                   break;
-                              case 'css':
-                                   $ret .= sprintf('<link type="text/css" href="%s" rel="stylesheet" />',$s['alternate_webfont_url'])."\n";
-                                   break;
-                         }
-                    }
-                    # Secondary font
-                    $selectors = '#blogdesc, .supranav, #content-info, #subcategories, #comments-feed, #sidebar h2, #sidebar h3, #footer';
-                    self::prop($css,$selectors,'font-family',$s['alternate_webfont_family']);
-               }
-          }
-          # Style directives
-          $res = '';
-          foreach ($css as $selector => $values) {
-               $res .= $selector." {\n";
-               foreach ($values as $k => $v) {
-                    $res .= $k.':'.$v.";\n";
-               }
-               $res .= "}\n";
-          }
-          if ($res != '') {
-               $ret .= '<style type="text/css">'."\n".$res.'</style>'."\n";
-          }
-
-          return $ret;
      }
      

themes/ductile/locales/fr/admin.po

@@ -65 +65 @@
 msgstr "Complet"
 
-msgid "Miscellaneous options"
-msgstr "Options diverses"
-
-msgid "Comment preview is not mandatory:"
-msgstr "Prévisualisation du commentaire optionnelle :"
-
 msgid "Presentation"
 msgstr "Présentation"
@@ -116 +110 @@
 msgstr "Secondaire :"
 
-msgid "none"
-msgstr "aucune"
-
-msgid "javascript (Adobe)"
-msgstr "javascript (Adobe)"
-
-msgid "stylesheet (Google)"
-msgstr "feuille de style (Google)"
-
-msgid "Set main font to default to use webfont below."
-msgstr "Mettre la police de caractère principale à Défaut pour utiliser la fonte web ci-dessous."
-
-msgid "Set secondary font to default to use webfont below."
-msgstr "Mettre la police de caractère secondaire à Défaut pour utiliser la fonte web ci-dessous."
-
-msgid "Webfont family:"
-msgstr "Famille"
-
-msgid "Webfont URL:"
-msgstr "URL de la fonte web"
-
-msgid "Webfont API:"
-msgstr "Type d'API"
-
 msgid "Ductile primary"
 msgstr "Principale de Ductile"

themes/ductile/style.css

@@ -621 +621 @@
 #sidebar li {
      padding-left: 16px;
-     background: transparent url(img/squares.png) no-repeat -133px 7px;
+     background: transparent url(img/squares.png) no-repeat -133px .5em;
      }
 #sidebar ul li ul li {
-     background: transparent url(img/squares.png) no-repeat -70px -59px;
+     background: transparent url(img/squares.png) no-repeat -70px center;
      }
 #sidebar ul li ul li ul li {
-     background: transparent url(img/squares.png) no-repeat 0 -126px;
+     background: transparent url(img/squares.png) no-repeat 0 center;
      }
 #sidebar .syndicate li {

themes/ductile/tpl/_simple-entry.html

@@ -164 +164 @@
                <p class="buttons">
                     <input type="submit" class="preview" name="preview" value="{{tpl:lang preview}}" />
-                    <tpl:IfPreviewIsNotMandatory>
+                    <tpl:IfCommentPreview>
                          <input type="submit" class="submit" value="{{tpl:lang send}}" />
-                    </tpl:IfPreviewIsNotMandatory>
+                    </tpl:IfCommentPreview>
                </p>
           </fieldset>