Dotclear


Ignore:
Files:
1 added
60 edited

Legend:

Unmodified
Added
Removed

  • .hgsubstate

    r1242 r1278  
    1 68debbf1f4b869c562e3ac3d1901d55e9ddf2f49 inc/libs/clearbricks 
     14a0351ee5d566a83ff06ca8bc9fffeb99885f545 inc/libs/clearbricks 

  • .hgtags

    r871 r1219  
    12126fce226121140735a51a8f447c80f1dacd2974ea 2.4.4 
    1313514d5121a12586b7ff320924d44028b677a01020 2.4.4 
     14baf879af43beea9764d920c2facd7226e90c5cf3 2.5.1 

  • admin/blog.php

    r1179 r1277  
    7474     '<form action="blog.php" method="post" id="blog-form" class="fieldset">'. 
    7575      
    76      $core->formNonce(). 
    7776     '<p><label class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Blog ID:').' '. 
    7877     form::field('blog_id',30,32,html::escapeHTML($blog_id)).'</label></p>'. 
    … …  
    8988     form::textarea('blog_desc',60,5,html::escapeHTML($blog_desc)).'</p>'. 
    9089      
    91      '<p><input type="submit" accesskey="s" value="'.__('Create').'" /></p>'. 
     90     '<p><input type="submit" accesskey="s" value="'.__('Create').'" />'. 
     91     $core->formNonce(). 
     92     '</p>'. 
    9293     '</form>'; 
    9394 

  • admin/blog_theme.php

    r1179 r1263  
    332332     echo 
    333333     '<h2>'.html::escapeHTML($core->blog->name). 
    334      ' &rsaquo; <a href="blog_theme.php">'.__('Blog appearance').'</a> &rsaquo; <span class="page-title">'.__('Theme configuration').'<span class="page-title"></h2>'. 
     334     ' &rsaquo; <a href="blog_theme.php">'.__('Blog appearance').'</a> &rsaquo; <span class="page-title">'.__('Theme configuration').'</span></h2>'. 
    335335     '<p><a class="back" href="blog_theme.php">'.__('back').'</a></p>'; 
    336336      

  • admin/index.php

    r1179 r1247  
    5959if (!$core->auth->user_prefs->dashboard->prefExists('quickentry')) { 
    6060     if (!$core->auth->user_prefs->dashboard->prefExists('quickentry',true)) { 
    61           $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean','',null,true); 
    62      } 
    63      $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean'); 
     61          $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean','',null,true); 
     62     } 
     63     $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean'); 
    6464} 
    6565 

  • admin/install/index.php

    r1179 r1247  
    190190          $core->auth->user_prefs->dashboard->put('doclinks',true,'boolean','',null,true); 
    191191          $core->auth->user_prefs->dashboard->put('dcnews',true,'boolean','',null,true); 
    192           $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean','',null,true); 
     192          $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean','',null,true); 
    193193 
    194194          # Add accessibility options 

  • admin/js/_media.js

    r1191 r1234  
    4040     }); 
    4141 
    42      var $container = $('#fileupload').parent().parent(); 
     42     var $container = $('#add-file-f').parent().parent(); 
    4343     var $msg,label; 
    4444 
    … …  
    7575 
    7676          $container.toggleClass('enhanced_uploader'); 
    77      }).appendTo($('#fileupload')); 
     77     }).appendTo($('#add-file-f')); 
    7878 
    7979     // Replace remove links by a POST on hidden form 

  • admin/js/_post.js

    r1140 r1256  
    7979          // Get document format and prepare toolbars 
    8080          var formatField = $('#post_format').get(0); 
     81          var last_post_format = $(formatField).val(); 
    8182          $(formatField).change(function() { 
    82                excerptTb.switchMode(this.value); 
    83                contentTb.switchMode(this.value); 
     83               // Confirm post format change 
     84               if(window.confirm(dotclear.msg.confirm_change_post_format_noconvert)){ 
     85                    excerptTb.switchMode(this.value); 
     86                    contentTb.switchMode(this.value); 
     87                    last_post_format = $(this).val(); 
     88               }else{ 
     89                    // Restore last format if change cancelled 
     90                    $(this).val(last_post_format); 
     91               } 
    8492          }); 
    8593           

  • admin/js/jquery/jquery.pageTabs.js

    r1140 r1223  
    3939                    li = document.createElement('li'); 
    4040                    a = document.createElement('a'); 
    41                     a.appendChild(document.createTextNode(this.title)); 
     41                    $(a).html(this.title); 
    4242                    this.title = ''; 
    4343                    a.href = '#'; 
    4444                    a.fn = This.showDiv; 
    4545                    a.index = this.id || i; 
     46                    li.id = "part-tabs-"+a.index; 
    4647                    a.obj = This; 
    4748                    jQuery(a).click(function() { this.fn.call(this.obj,this.index); return false; }); 

  • admin/media.php

    r1192 r1234  
    335335 
    336336     echo 
     337     '<form id="fileupload" action="'.html::escapeURL($page_url).'" method="POST" enctype="multipart/form-data">'. 
    337338     '<fieldset id="add-file-f"><legend>'.__('Add files').'</legend>'. 
    338339     '<p>'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'. 
    339      ' <form id="fileupload" action="'.html::escapeURL($page_url).'" method="POST" enctype="multipart/form-data">'. 
    340      '<div>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE). 
    341      $core->formNonce().'</div>'. 
     340     form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE). 
     341     $core->formNonce(). 
    342342     '<div class="fileupload-ctrl"><div class="files"></div></div>'; 
    343343 
    … …  
    369369 
    370370     echo 
    371      '<div>'.form::hidden(array('d'),$d).'</div>'. 
     371     form::hidden(array('d'),$d). 
    372372     '</fieldset>'. 
    373373     '</form>'. 
    … …  
    428428     $class = 'media-item media-col-'.($i%2); 
    429429      
     430     $alt = (!$f->d ? sprintf(__('Media details of %s'),$fname) :  
     431          sprintf(__('Go to %s folder'),($fname == '..' ? __('parent') : $fname))); 
    430432     $res = 
    431433     '<div class="'.$class.'"><a class="media-icon media-link" href="'.$link.'">'. 
    432      '<img src="'.$f->media_icon.'" alt="" /></a>'. 
     434     '<img src="'.$f->media_icon.'" alt="'.$alt.'" /></a>'. 
    433435     '<ul>'. 
    434436     '<li><a class="media-link" href="'.$link.'">'.$fname.'</a></li>'; 

  • admin/plugins.php

    r1182 r1271  
    233233          '<a href="plugin.php?p=daInstaller">'.__('DotAddict.org Installer').'</a>')); 
    234234 
     235echo '<p>'; 
    235236if ($is_writable) { 
    236237     echo __('To install or upgrade a plugin you generally just need to upload it '. 
    … …  
    387388echo '</div>'; 
    388389 
     390if ($core->plugins->moduleExists('daInstaller')) { 
     391     echo '<p><a href="plugin.php?p=daInstaller" class="multi-part">'.__('DotAddict.org Installer').'</a></p>'; 
     392} 
     393 
     394 
    389395# --BEHAVIOR-- pluginsToolsTabs 
    390396$core->callBehavior('pluginsToolsTabs',$core); 

  • admin/search.php

    r1179 r1276  
    7979'<p><label for="qtype1" class="classic">'.form::radio(array('qtype','qtype1'),'p',$qtype == 'p').' '.__('Search entries').'</label> '. 
    8080'<label for="qtype2" class="classic">'.form::radio(array('qtype','qtype2'),'c',$qtype == 'c').' '.__('Search comments').'</label></p>'. 
    81 '</p><input type="submit" value="'.__('Search').'" /></p>'. 
     81'<p><input type="submit" value="'.__('Search').'" /></p>'. 
    8282'</div>'. 
    8383'</form>'; 

  • admin/update.php

    r1179 r1231  
    2727 
    2828$updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions'); 
    29 $new_v = $updater->check(DC_VERSION); 
     29$new_v = $updater->check(DC_VERSION, !empty($_GET['nocache'])); 
    3030$zip_file = $new_v ? DC_BACKUP_PATH.'/'.basename($updater->getFileURL()) : ''; 
    3131$version_info = $new_v ? $updater->getInfoURL() : ''; 
    … …  
    173173if (!$core->error->flag()) { 
    174174     echo '<h2>'.__('Dotclear update').'</h2>'; 
     175      
     176     if (!empty($_GET['nocache'])) { 
     177          dcPage::message(__('Manual checking of update done successfully.')); 
     178     } 
    175179} 
    176180 
    … …  
    180184     if (empty($new_v)) 
    181185     { 
    182           echo '<p><strong>'.__('No newer Dotclear version available.').'</strong></p>'; 
     186          echo '<p><strong>'.__('No newer Dotclear version available.').'</strong></p>'. 
     187          '<form action="'.$p_url.'" method="get">'. 
     188          '<p><input type="hidden" name="nocache" value="1" />'. 
     189          '<input type="submit" value="'.__('Force checking update Dotclear').'" /></p>'. 
     190          '</form>'; 
    183191     } 
    184192     else 

  • admin/users.php

    r1179 r1237  
    106106      
    107107     echo  
    108      '<h2 class="post-title">'.__('Users').'</h2>'. 
     108     '<h2 class="page-title">'.__('Users').'</h2>'. 
    109109     '<p class="top-add"><strong><a class="button add" href="user.php">'.__('Create a new user').'</a></strong></p>'; 
    110110      

  • inc/admin/lib.dc.page.php

    r1188 r1256  
    476476          self::jsVar('dotclear.msg.confirm_change_post_format', 
    477477               __('You have unsaved changes. Switch post format will loose these changes. Proceed anyway?')). 
     478          self::jsVar('dotclear.msg.confirm_change_post_format_noconvert', 
     479               __("Warning: post format change will not convert existing content. You will need to apply new format by yourself. Proceed anyway?")). 
    478480          self::jsVar('dotclear.msg.load_enhanced_uploader', 
    479481               __('Loading enhanced uploader, please wait.')). 

  • inc/core/class.dc.blog.php

    r1244 r1278  
    203203     @param    ids       <b>mixed</b>        Comment(s) ID(s) 
    204204     @param    del       <b>boolean</b>      If comment is delete, set this to true 
    205      */ 
    206      public function triggerComments($ids,$del=false) 
     205     @param    affected_posts      <b>mixed</b>        Posts(s) ID(s) 
     206     */ 
     207     public function triggerComments($ids, $del=false, $affected_posts=null) 
    207208     { 
    208209          $co_ids = dcUtils::cleanIds($ids); 
     210          $a_ids = dcUtils::cleanIds($affected_posts); 
     211          $a_tbs = array(); 
    209212           
    210213          # a) Retrieve posts affected by comments edition 
    211           $strReq =  
    212                'SELECT post_id, comment_trackback '. 
    213                'FROM '.$this->prefix.'comment '. 
    214                'WHERE comment_id'.$this->con->in($co_ids). 
    215                'GROUP BY post_id,comment_trackback'; 
    216            
    217           $rs = $this->con->select($strReq); 
    218            
    219           $a_ids = $a_tbs = array(); 
    220           while ($rs->fetch()) { 
    221                $a_ids[] = (integer) $rs->post_id; 
    222                $a_tbs[] = (integer) $rs->comment_trackback; 
     214          if (empty($a_ids)) { 
     215               $strReq =  
     216                    'SELECT post_id, comment_trackback '. 
     217                    'FROM '.$this->prefix.'comment '. 
     218                    'WHERE comment_id'.$this->con->in($co_ids). 
     219                    'GROUP BY post_id,comment_trackback'; 
     220                
     221               $rs = $this->con->select($strReq); 
     222                
     223               while ($rs->fetch()) { 
     224                    $a_ids[] = (integer) $rs->post_id; 
     225                    $a_tbs[] = (integer) $rs->comment_trackback; 
     226               } 
    223227          } 
    224228           
    … …  
    255259          { 
    256260               $nb_comment = $nb_trackback = 0; 
     261               //$cur->nb_comment = $nb_comment; 
    257262               foreach($b_ids as $b_key => $b_id) 
    258263               { 
    … …  
    505510          $this->core->callBehavior('coreBeforeCategoryCreate',$this,$cur); 
    506511           
    507           $this->categories()->addNode($cur,$parent); 
     512          $id = $this->categories()->addNode($cur,$parent); 
     513          # Update category's cursor 
     514          $rs = $this->getCategory($id); 
     515          if (!$rs->isEmpty()) { 
     516               $cur->cat_lft = $rs->cat_lft; 
     517               $cur->cat_rgt = $rs->cat_rgt; 
     518          } 
    508519           
    509520          # --BEHAVIOR-- coreAfterCategoryCreate 
    … …  
    21812192          $co_ids = dcUtils::cleanIds($ids); 
    21822193           
    2183           if (empty($ids)) { 
     2194          if (empty($co_ids)) { 
    21842195               throw new Exception(__('No such comment ID')); 
     2196          } 
     2197           
     2198          # Retrieve posts affected by comments edition 
     2199          $affected_posts = array(); 
     2200          $strReq = 
     2201               'SELECT distinct(post_id) '. 
     2202               'FROM '.$this->prefix.'comment '. 
     2203               'WHERE comment_id'.$this->con->in($co_ids); 
     2204           
     2205          $rs = $this->con->select($strReq); 
     2206           
     2207          while ($rs->fetch()) { 
     2208               $affected_posts[] = (integer) $rs->post_id; 
    21852209          } 
    21862210           
    … …  
    22122236           
    22132237          $this->con->execute($strReq); 
    2214           $this->triggerComments($co_ids,true); 
     2238          $this->triggerComments($co_ids, true, $affected_posts); 
    22152239          $this->triggerBlog(); 
    22162240     } 
    … …  
    22672291           
    22682292          if ($cur->comment_site !== null && $cur->comment_site != '') { 
    2269                if (!preg_match('|^http(s?)://|',$cur->comment_site)) { 
     2293               if (!preg_match('|^http(s?)://|i',$cur->comment_site, $matches)) { 
    22702294                    $cur->comment_site = 'http://'.$cur->comment_site; 
     2295               }else{ 
     2296                    $cur->comment_site = strtolower($matches[0]).substr($cur->comment_site, strlen($matches[0])); 
    22712297               } 
    22722298          } 

  • inc/core/class.dc.media.php

    r1179 r1270  
    497497     @param    post_id   <b>integer</b>      Post ID 
    498498     @param    media_id  <b>integer</b>      Optionnal media ID 
    499      @return   <b>array</b> Array of fileItems 
    500      */ 
    501      public function getPostMedia($post_id,$media_id=null) 
     499     @param    return_rs <b>boolean</b>      Whether to return a resultset (true) or an array (false, default value). 
     500     @return   <b>array</b> Array or ResultSet of fileItems 
     501     */ 
     502     public function getPostMedia($post_id,$media_id=null,$return_rs=false) 
    502503     { 
    503504          $params = array( 
    … …  
    515516               $f = $this->fileRecord($rs); 
    516517               if ($f !== null) { 
    517                     $res[] = $f; 
    518                } 
    519           } 
    520            
    521           return $res; 
     518                    $res[] = $return_rs ? new ArrayObject($f) : $f; 
     519               } 
     520          } 
     521           
     522          return $return_rs ? staticRecord::newFromArray($res) : $res; 
    522523     } 
    523524      

  • inc/core/class.dc.update.php

    r1179 r1231  
    3232      
    3333     protected $cache_ttl = '-6 hours'; 
     34     protected $nocache_ttl = '-2 mins'; 
    3435     protected $forced_files = array(); 
    3536      
    … …  
    5556      *  
    5657      * @param version        string    Current version to compare 
     58      * @param nocache        boolean   Force checking 
    5759      * @return string                  Latest version if available 
    5860      */ 
    59      public function check($version) 
    60      { 
    61           $this->getVersionInfo(); 
     61     public function check($version, $nocache=false) 
     62     { 
     63          $this->getVersionInfo($nocache); 
    6264          $v = $this->getVersion(); 
    6365          if ($v && version_compare($version,$v,'<')) { 
    … …  
    6870     } 
    6971      
    70      public function getVersionInfo() 
    71      { 
     72     public function getVersionInfo($nocache=false) 
     73     { 
     74          # Check minimum time without cache (prevents from server flood) 
     75          if ($nocache && is_readable($this->cache_file) && filemtime($this->cache_file) > strtotime($this->nocache_ttl)) { 
     76               $nocache = false; 
     77          } 
     78           
    7279          # Check cached file 
    73           if (is_readable($this->cache_file) && filemtime($this->cache_file) > strtotime($this->cache_ttl)) 
     80          if (is_readable($this->cache_file) && filemtime($this->cache_file) > strtotime($this->cache_ttl) && !$nocache) 
    7481          { 
    7582               $c = @file_get_contents($this->cache_file); 

  • inc/load_plugin_file.php

    r1179 r1241  
    8686} 
    8787 
    88 http::$cache_max_age = 7200; 
     88http::$cache_max_age = (!defined('DC_CACHE_MAX_AGE') ? 604800 : DC_CACHE_MAX_AGE); 
    8989http::cache(array_merge(array($PF),get_included_files())); 
    9090 

  • inc/prepend.php

    r1218 r1233  
    123123# Constants 
    124124define('DC_ROOT',path::real(dirname(__FILE__).'/..')); 
    125 define('DC_VERSION','2.6-dev'); 
     125define('DC_VERSION','2.5.2-dev'); 
    126126define('DC_DIGESTS',dirname(__FILE__).'/digests'); 
    127127define('DC_L10N_ROOT',dirname(__FILE__).'/../locales'); 

  • inc/public/class.dc.template.php

    r1179 r1249  
    6767          $this->addValue('BlogLanguage',array($this,'BlogLanguage')); 
    6868          $this->addValue('BlogThemeURL',array($this,'BlogThemeURL')); 
     69          $this->addValue('BlogParentThemeURL',array($this,'BlogParentThemeURL')); 
    6970          $this->addValue('BlogUpdateDate',array($this,'BlogUpdateDate')); 
    7071          $this->addValue('BlogID',array($this,'BlogID')); 
    … …  
    839840      
    840841     /*dtd 
    841      <!ELEMENT tpl:BlogThemeURL - O -- Blog's current Themei URL --> 
     842     <!ELEMENT tpl:BlogThemeURL - O -- Blog's current Theme URL --> 
    842843     */ 
    843844     public function BlogThemeURL($attr) 
    … …  
    845846          $f = $this->getFilters($attr); 
    846847          return '<?php echo '.sprintf($f,'$core->blog->settings->system->themes_url."/".$core->blog->settings->system->theme').'; ?>'; 
     848     } 
     849      
     850     /*dtd 
     851     <!ELEMENT tpl:BlogParentThemeURL - O -- Blog's current Theme's parent URL --> 
     852     */ 
     853     public function BlogParentThemeURL($attr) 
     854     { 
     855          $f = $this->getFilters($attr); 
     856          $parent = '$core->themes->moduleInfo($core->blog->settings->system->theme,\'parent\')'; 
     857          return '<?php echo '.sprintf($f,'$core->blog->settings->system->themes_url."/".('."$parent".' ? '."$parent".' : $core->blog->settings->system->theme)').'; ?>'; 
    847858     } 
    848859     

  • locales/bn/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/ca/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/cs/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/da/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/de/help/blowupConfig.html

    r175 r1264  
    3535<p>Du kannst ein Bild Deiner Wahl statt des Standardbildes einsetzen.</p> 
    3636 
    37 <p>Wenn Du  "Benutzerdefiniert..." in der Bilderliste ausw&auml;hlst, dann hast Du die M&ouml;glichkeit, Dein eigenes Bild upzuloaden. <strong>Das Dateiformat muss entweder JPG der PNG sein und es muss 800px breit sein.</strong> 
     37<p>Wenn Du  "Benutzerdefiniert..." in der Bilderliste ausw&auml;hlst, dann hast Du die M&ouml;glichkeit, Dein eigenes Bild upzuloaden. <strong>Das Dateiformat muss entweder JPG der PNG sein und es muss 800px breit sein.</strong></p> 
    3838 
    3939<p>Wenn Du ein JPG-Bild uploadest, dann wird automatisch ein Rahmen um das Bild gesetzt. Dies geschieht nicht bei der Verwendung eines PNG-Bildes und die Transparenz wird ebenfalls beibehalten.</p> 

  • locales/en/main.po

    r1039 r1256  
    21542154msgstr "" 
    21552155 
     2156msgid "Warning: post format change will not convert existing content. You will need to apply new format by yourself. Proceed anyway?" 
     2157msgstr "" 
     2158 
    21562159msgid "Loading enhanced uploader, please wait." 
    21572160msgstr "" 

  • locales/eo/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/es-ar/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/es/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/eu/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/fr/help/blowupConfig.html

    r0 r1264  
    4444<p>En choisissant "Personnalisé..." parmi la liste d'images, vous pourrez 
    4545déposer votre propre image. <strong>Celle-ci doit être au format JPG ou PNG et 
    46 avoir une largeur exacte de 800 pixels.</strong> 
     46avoir une largeur exacte de 800 pixels.</strong></p> 
    4747 
    4848<p>Si vous déposez une image au format JPG, un cadre sera ajouté autours de 

  • locales/fr/main.po

    r1193 r1256  
    10381038#, fuzzy, php-format 
    10391039msgid "Path <strong>%s</strong> is not writable." 
    1040 msgstr "Le répertoire de cache %s n'est pas accessible en écriture." 
     1040msgstr "Le répertoire <strong>%s</strong> n'est pas accessible en écriture." 
    10411041 
    10421042#, fuzzy 
    … …  
    11231123#, php-format 
    11241124msgid "You can change your user language in your <a href=\"%1$s\">preferences</a> or change your blog's main language in your <a href=\"%2$s\">blog settings</a>." 
    1125 msgstr "Vous pouvez changer votre langue d'utilisateur dans vos <a href=\"%1$s\">préférences</a> ou changer la langue principale de votre blog dans vos <a href=\"%2$s\">paramètres de blog</a>." 
     1125msgstr "Vous pouvez changer votre langue d'utilisateur dans vos <a href=\"%1$s\">préférences</a> ou changer la langue principale de votre blog dans vos <a href=\"%2$s\">paramètres du blog</a>." 
    11261126 
    11271127msgid "Installed languages" 
    … …  
    11921192msgid "Media manager" 
    11931193msgstr "Gestionnaire de médias" 
     1194 
     1195msgid "Go to %s folder" 
     1196msgstr "Aller au dossier %s" 
     1197 
     1198msgid "Media details of %s" 
     1199msgstr "Détails du média %s" 
    11941200 
    11951201msgid "confirm removal" 
    … …  
    19911997msgstr "Les fichiers suivants de votre installation de Dotclear ne peuvent pas être écrits. Veuillez corriger la situation ou <a href=\"http://fr.dotclear.org/download\">mettre à jour manuellement</a>." 
    19921998 
     1999msgid "Manual checking of update done successfully." 
     2000msgstr "Vérification manuelle de mise à jour effectuée avec succès." 
     2001 
    19932002msgid "No newer Dotclear version available." 
    19942003msgstr "Aucune nouvelle version de Dotclear n'est disponible." 
    19952004 
     2005msgid "Force checking update Dotclear" 
     2006msgstr "Forcer la vérification de mise à jour de Dotclear" 
     2007 
    19962008#, php-format 
    19972009msgid "Dotclear %s is available." 
    … …  
    21302142#, fuzzy 
    21312143msgid "Go to the content" 
    2132 msgstr "Voir ce billet sur le site" 
     2144msgstr "Aller au contenu" 
    21332145 
    21342146#, fuzzy 
    21352147msgid "Go to the menu" 
    2136 msgstr "Aller sur le site" 
     2148msgstr "Aller au menu" 
    21372149 
    21382150msgid "Go to site" 
    … …  
    22522264msgstr "Vous avez des modifications non sauvegardées. Changer de format vous fera perdre ces modifications. Continuer ?" 
    22532265 
     2266msgid "Warning: post format change will not convert existing content. You will need to apply new format by yourself. Proceed anyway?" 
     2267msgstr "Attention : le changement de syntaxe ne transformera pas les balises des contenus déjà saisis. Pensez à les réadapter après cette opération. Confirmez-vous ce changement de syntaxe ?" 
     2268 
    22542269msgid "Loading enhanced uploader, please wait." 
    22552270msgstr "Chargement de l'interface avancée." 
    … …  
    25002515#, fuzzy 
    25012516msgid "You are not allowed to reset categories order" 
    2502 msgstr "Vous n'êtes pas autorisé à supprimer des catégories" 
     2517msgstr "Vous n'êtes pas autorisé à réinitialiser l'ordre des catégories" 
    25032518 
    25042519msgid "Category URL must be unique." 

  • locales/fr/plugins.po

    r1200 r1275  
    10311031"D'autre part, dans WordPress, un billet ne peut pas être sans catégorie, et " 
    10321032"une installation par défaut possède systématiquement une première catégorie " 
    1033 "nommée <i>« sans catégorie »</ i>. Si vous n'avez pas changé cette " 
     1033"nommée <i>« sans catégorie »</i>. Si vous n'avez pas changé cette " 
    10341034"catégorie, vous pouvez simplement l'ignorer lors de l'importation sur votre " 
    10351035"blog, puisque Dotclear vous permet réellement de conserver votre message " 
    … …  
    11311131 
    11321132msgid "Vacuum tables" 
    1133 msgstr "Vidage des tables" 
     1133msgstr "Optimiser les tables" 
    11341134 
    11351135msgid "Counters" 
    … …  
    11371137 
    11381138msgid "Reset comments and ping counters" 
    1139 msgstr "Remet à zéro les compteurs de commentaires et de signalements" 
     1139msgstr "Recalculer les compteurs de commentaires et de signalements" 
    11401140 
    11411141msgid "Search engine index" 
    … …  
    11461146 
    11471147msgid "Index all posts" 
    1148 msgstr "Indexation de tous les billets" 
     1148msgstr "Indexer tous les billets" 
    11491149 
    11501150msgid "Index all comments" 
    1151 msgstr "Indexation de tous les commentaires" 
     1151msgstr "Indexer tous les commentaires" 
    11521152 
    11531153msgid "Vacuum logs" 
    … …  
    11551155 
    11561156msgid "Delete all logs" 
    1157 msgstr "Suppression de tous les journaux" 
     1157msgstr "Supprimer tous les journaux" 
    11581158 
    11591159msgid "Empty templates cache directory" 
    … …  
    11611161 
    11621162msgid "Empty directory" 
    1163 msgstr "Vidage du répertoire" 
     1163msgstr "Vider le répertoire" 
    11641164 
    11651165msgid "Pages" 

  • locales/hu/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/it/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/ja/help/blowupConfig.html

    r0 r1264  
    3535<p>デフォルトで指定されているものの代わりに、リストからヘッダ画像を選ぶことができます。</p> 
    3636 
    37 <p>画像リストで「カスタム...」を選んだ場合、独自の画像をアップロードすることができます。 <strong>画像ファイルは JPG または PNG フォーマットで、横幅が正確に800ピクセルである必要があります。</strong> 
     37<p>画像リストで「カスタム...」を選んだ場合、独自の画像をアップロードすることができます。 <strong>画像ファイルは JPG または PNG フォーマットで、横幅が正確に800ピクセルである必要があります。</strong></p> 
    3838 
    3939<p>JPG画像がアップロードされた場合、画像に境界線が付加されます。 PNG画像の場合には付加されず、透過性も維持されます。</p> 

  • locales/ko/help/blowupConfig.html

    r0 r1264  
    3434<p>기본이미지 대신, 목록에 있는 머리글 이미지를 쓰실 수 있습니다.</p> 
    3535 
    36 <p>이미지 목록에서 "개성에 맞게..."를 선택하시면, 당신 자신이 보유한 이미지를 올릴 수 있습니다. <strong>이미지 파일은 JPG나 PNG 포맷이어야하고 폭은 정확히 800px 이어야 합니다.</strong> 
     36<p>이미지 목록에서 "개성에 맞게..."를 선택하시면, 당신 자신이 보유한 이미지를 올릴 수 있습니다. <strong>이미지 파일은 JPG나 PNG 포맷이어야하고 폭은 정확히 800px 이어야 합니다.</strong></p> 
    3737 
    3838<p>JPG 이미지를 올리실 때는, 윤곽선이 추가됩니다. PNG 이미지의 경우는 해당되지 않습니다. (PNG 이미지의 투명도도 또한 유지됩니다.)</p> 

  • locales/lt/help/blowupConfig.html

    r813 r1264  
    3535<p>Du kannst ein Bild Deiner Wahl statt des Standardbildes einsetzen.</p> 
    3636 
    37 <p>Wenn Du  "Benutzerdefiniert..." in der Bilderliste ausw&auml;hlst, dann hast Du die M&ouml;glichkeit, Dein eigenes Bild upzuloaden. <strong>Das Dateiformat muss entweder JPG der PNG sein und es muss 800px breit sein.</strong> 
     37<p>Wenn Du  "Benutzerdefiniert..." in der Bilderliste ausw&auml;hlst, dann hast Du die M&ouml;glichkeit, Dein eigenes Bild upzuloaden. <strong>Das Dateiformat muss entweder JPG der PNG sein und es muss 800px breit sein.</strong></p> 
    3838 
    3939<p>Wenn Du ein JPG-Bild uploadest, dann wird automatisch ein Rahmen um das Bild gesetzt. Dies geschieht nicht bei der Verwendung eines PNG-Bildes und die Transparenz wird ebenfalls beibehalten.</p> 

  • locales/nl/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/oc/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/pl/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/pt-br/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/pt/help/blowupConfig.html

    r0 r1264  
    5151<br /> 
    5252 
    53 <em>NOTA: Uma bordura aparecera a volta da imagem o formato JPG, isto não acontece com as imagem em PNG -é a transparência dos PNGs fica efectiva-</em> 
     53<em>NOTA: Uma bordura aparecera a volta da imagem o formato JPG, isto não acontece com as imagem em PNG -é a transparência dos PNGs fica efectiva-</em></p> 
    5454 
    5555<h4>Estilos pré-definidos</h4> 

  • locales/ro/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/sr/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/sv/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/te/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/tr/help/blowupConfig.html

    r0 r1264  
    3535<p>You can choose a header image among the list to use in place of the default one.</p> 
    3636 
    37 <p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong> 
     37<p>When you choose "Custom..." in the image list, you will be able to upload your own image. <strong>The image file must be in JPG or PNG format and must be precisely 800px wide.</strong></p> 
    3838 
    3939<p>If you upload a JPG image, a border will be added to the image, which is not the case with PNG images (the transparency of which will also be kept).</p> 

  • locales/zh-cn/help/blowupConfig.html

    r253 r1264  
    3535<p>您可以从列表中选择一个头部图片来取代默认的。</p> 
    3636 
    37 <p>当您在图片列表中选择“定制...”，您将可以上传自己的图片。<strong>图片必须是 JPG 或者 PNG 格式并且必须精确等于 800 像素宽。</strong> 
     37<p>当您在图片列表中选择“定制...”，您将可以上传自己的图片。<strong>图片必须是 JPG 或者 PNG 格式并且必须精确等于 800 像素宽。</strong></p> 
    3838 
    3939<p>如果您上传一个 JPG 图片，一个边框将会被添加。而 PNG 图片不会如此(透明特性也会被保留)。</p> 

  • plugins/aboutConfig/index.php

    r1179 r1274  
    8686     return 
    8787     '<tr>'. 
    88      '<td scope="raw"><label for="s_'.$id.'">'.sprintf($slabel,html::escapeHTML($id)).'</label></td>'. 
     88     '<td scope="row"><label for="s_'.$id.'">'.sprintf($slabel,html::escapeHTML($id)).'</label></td>'. 
    8989     '<td>'.$field.'</td>'. 
    9090     '<td>'.$s['type'].'</td>'. 

  • plugins/antispam/index.php

    r1207 r1274  
    204204          '<td class="nowrap">'.form::checkbox(array('filters_active[]'),$fid,$f->active, '', '', false, 'title="'.__('Active').'"').'</td>'. 
    205205          '<td class="nowrap">'.form::checkbox(array('filters_auto_del[]'),$fid,$f->auto_delete, '', '', false, 'title="'.__('Auto Del.').'"').'</td>'. 
    206           '<td class="nowrap" scope="raw">'.$f->name.'</td>'. 
     206          '<td class="nowrap" scope="row">'.$f->name.'</td>'. 
    207207          '<td class="maximal">'.$f->description.'</td>'. 
    208208          '<td class="status">'.$gui_link.'</td>'. 

  • plugins/attachments/_public.php

    r1179 r1266  
    4040          "<?php\n". 
    4141          'if ($_ctx->posts !== null && $core->media) {'."\n". 
    42                '$_ctx->attachments = new ArrayObject($core->media->getPostMedia($_ctx->posts->post_id));'."\n". 
     42          '$_ctx->attachments = $core->media->getPostMedia($_ctx->posts->post_id, null, true);'."\n". 
    4343          "?>\n". 
    4444           
    45           '<?php foreach ($_ctx->attachments as $attach_i => $attach_f) : '. 
    46           '$GLOBALS[\'attach_i\'] = $attach_i; $GLOBALS[\'attach_f\'] = $attach_f;'. 
    47           '$_ctx->file_url = $attach_f->file_url; ?>'. 
     45          '<?php $attach_i = 0; ?>'. // LEGACY 
     46          '<?php while ($_ctx->attachments->fetch()) : ?>'. 
     47           
     48          '<?php $GLOBALS[\'attach_i\'] = $attach_i; $attach_f = $_ctx->attachments; $GLOBALS[\'attach_f\'] = $attach_f;'. // LEGACY 
     49          '$_ctx->file_url = $attach_f->file_url; ?>'. // LEGACY 
    4850          $content. 
    49           '<?php endforeach; $_ctx->attachments = null; unset($attach_i,$attach_f,$_ctx->file_url); ?>'. 
     51          '<?php $attach_i++; ?>'. // LEGACY 
     52          '<?php endwhile; '. 
     53          '$_ctx->attachments = null; ?>'. 
    5054           
    5155          "<?php } ?>\n"; 
    … …  
    6064     { 
    6165          return 
    62           "<?php if (\$attach_i == 0) : ?>". 
     66          "<?php if (\$_ctx->attachments->isStart()) : ?>". 
    6367          $content. 
    6468          "<?php endif; ?>"; 
    … …  
    7175     { 
    7276          return 
    73           "<?php if (\$attach_i+1 == count(\$_ctx->attachments)) : ?>". 
     77          "<?php if (\$_ctx->attachments->isEnd()) : ?>". 
    7478          $content. 
    7579          "<?php endif; ?>"; 
    … …  
    9397          if (isset($attr['is_image'])) { 
    9498               $sign = (boolean) $attr['is_image'] ? '' : '!'; 
    95                $if[] = $sign.'$attach_f->media_image'; 
     99               $if[] = $sign.'$_ctx->attachments->media_image'; 
    96100          } 
    97101           
    98102          if (isset($attr['has_thumb'])) { 
    99103               $sign = (boolean) $attr['has_thumb'] ? '' : '!'; 
    100                $if[] = $sign.'isset($attach_f->media_thumb[\'sq\'])'; 
     104               $if[] = $sign.'isset($_ctx->attachments->media_thumb[\'sq\'])'; 
    101105          } 
    102106           
    103107          if (isset($attr['is_mp3'])) { 
    104108               $sign = (boolean) $attr['is_mp3'] ? '==' : '!='; 
    105                $if[] = '$attach_f->type '.$sign.' "audio/mpeg3"'; 
     109               $if[] = '$_ctx->attachments->type '.$sign.' "audio/mpeg3"'; 
    106110          } 
    107111           
    … …  
    109113               $sign = (boolean) $attr['is_flv'] ? '' : '!'; 
    110114               $if[] = $sign. 
    111                     '($attach_f->type == "video/x-flv" || '. 
    112                     '$attach_f->type == "video/mp4" || '. 
    113                     '$attach_f->type == "video/x-m4v")'; 
     115                    '($_ctx->attachments->type == "video/x-flv" || '. 
     116                    '$_ctx->attachments->type == "video/mp4" || '. 
     117                    '$_ctx->attachments->type == "video/x-m4v")'; 
    114118          } 
    115119           
    … …  
    127131     { 
    128132          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    129           return '<?php echo '.sprintf($f,'$attach_f->type').'; ?>'; 
     133          return '<?php echo '.sprintf($f,'$_ctx->attachments->type').'; ?>'; 
    130134     } 
    131135      
    … …  
    136140     { 
    137141          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    138           return '<?php echo '.sprintf($f,'$attach_f->media_type').'; ?>'; 
     142          return '<?php echo '.sprintf($f,'$_ctx->attachments->media_type').'; ?>'; 
    139143     } 
    140144      
    … …  
    145149     { 
    146150          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    147           return '<?php echo '.sprintf($f,'$attach_f->basename').'; ?>'; 
     151          return '<?php echo '.sprintf($f,'$_ctx->attachments->basename').'; ?>'; 
    148152     } 
    149153      
    … …  
    158162          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    159163          if (!empty($attr['full'])) { 
    160                return '<?php echo '.sprintf($f,'$attach_f->size').'; ?>'; 
    161           } 
    162           return '<?php echo '.sprintf($f,'files::size($attach_f->size)').'; ?>'; 
     164               return '<?php echo '.sprintf($f,'$_ctx->attachments->size').'; ?>'; 
     165          } 
     166          return '<?php echo '.sprintf($f,'files::size($_ctx->attachments->size)').'; ?>'; 
    163167     } 
    164168      
    … …  
    169173     { 
    170174          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    171           return '<?php echo '.sprintf($f,'$attach_f->media_title').'; ?>'; 
     175          return '<?php echo '.sprintf($f,'$_ctx->attachments->media_title').'; ?>'; 
    172176     } 
    173177      
    … …  
    180184          return 
    181185          '<?php '. 
    182           'if (isset($attach_f->media_thumb[\'sq\'])) {'. 
    183                'echo '.sprintf($f,'$attach_f->media_thumb[\'sq\']').';'. 
     186          'if (isset($_ctx->attachments->media_thumb[\'sq\'])) {'. 
     187               'echo '.sprintf($f,'$_ctx->attachments->media_thumb[\'sq\']').';'. 
    184188          '}'. 
    185189          '?>'; 
    … …  
    192196     { 
    193197          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    194           return '<?php echo '.sprintf($f,'$attach_f->file_url').'; ?>'; 
     198          return '<?php echo '.sprintf($f,'$_ctx->attachments->file_url').'; ?>'; 
    195199     } 
    196200      

  • plugins/daInstaller/index.php

    r1046 r1237  
    256256'<body>'. 
    257257infoMessages(). 
    258 '<h2>'.__('DotAddict.org Installer').'</h2>'. 
     258'<h2 class="page-title">'.__('DotAddict.org Installer').'</h2>'. 
    259259'<p>'.__('Install and update your extensions live from DotAddict.org').'</p>'; 
    260260 

  • plugins/maintenance/locales/fr/help/maintenance.html

    r207 r1272  
    1010<dl> 
    1111  <dt>Optimiser l'espace de la base de données</dt> 
    12   <dd>Au fur at à mesure des suppressions ou modifications dans vos billets, les tables de la  
     12  <dd>Au fur et à mesure des suppressions ou modifications dans vos billets, les tables de la  
    1313  base de données se fragmentent. L'opération d'optimisation permet de compacter celles-ci.<br /> 
    1414  Cette opération n'a aucun impact sur l'intégrité de vos données.<br /> 
    15   Il est fortement conseillé d'optimiser la base de données avant tout export de blog</dd> 
     15  Il est fortement conseillé d'optimiser la base de données avant tout export de blog.</dd> 
    1616   
    1717  <dt>Compteurs</dt> 

  • plugins/pages/page.php

    r1215 r1239  
    302302  dcPage::jsToolBar(). 
    303303  dcPage::jsModal(). 
     304  dcPage::jsMetaEditor(). 
    304305  dcPage::jsLoad('js/_post.js'). 
    305306  dcPage::jsConfirmClose('entry-form','comment-form'). 

  • plugins/simpleMenu/index.php

    r1179 r1273  
    389389          case 1: 
    390390               // Selection du type d'item 
    391                echo '<form id="additem" action="'.$p_url.'&add=2" method="post">'; 
     391               echo '<form id="additem" action="'.$p_url.'&amp;add=2" method="post">'; 
    392392               echo '<fieldset><legend>'.__('Select type').'</legend>'; 
    393393               echo '<p class="field"><label for="item_type" class="classic">'.__('Type of item menu:').'</label>'.form::combo('item_type',$items_combo,'').'</p>'; 
    … …  
    399399               if ($items[$item_type][1]) { 
    400400                    // Choix à faire 
    401                     echo '<form id="additem" action="'.$p_url.'&add=3" method="post">'; 
     401                    echo '<form id="additem" action="'.$p_url.'&amp;add=3" method="post">'; 
    402402                    echo '<fieldset><legend>'.$item_type_label.'</legend>'; 
    403403                    switch ($item_type) { 
    … …  
    436436          case 3: 
    437437               // Libellé et description 
    438                echo '<form id="additem" action="'.$p_url.'&add=4" method="post">'; 
     438               echo '<form id="additem" action="'.$p_url.'&amp;add=4" method="post">'; 
    439439               echo '<fieldset><legend>'.$item_type_label.($item_select_label != '' ? ' ('.$item_select_label.')' : '').'</legend>'; 
    440440               echo '<p class="field"><label for="item_label" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '. 
    … …  
    458458 
    459459if (!$step) { 
    460      echo '<form id="menuitemsappend" action="'.$p_url.'&add=1" method="post">'; 
     460     echo '<form id="menuitemsappend" action="'.$p_url.'&amp;add=1" method="post">'; 
    461461     echo '<p>'.$core->formNonce().'<input class="add" type="submit" name="appendaction" value="'.__('Add an item').'" /></p>'; 
    462462     echo '</form>'; 

  • plugins/tags/_admin.php

    r1179 r1239  
    2323$core->addBehavior('adminAfterPostUpdate',array('tagsBehaviors','setTags')); 
    2424 
     25$core->addBehavior('adminPageHeaders',array('tagsBehaviors','pageHeaders')); 
     26 
    2527$core->addBehavior('adminPostHeaders',array('tagsBehaviors','postHeaders')); 
    2628$core->addBehavior('adminPostsActionsHeaders',array('tagsBehaviors','postsActionsHeaders')); 
    … …  
    99101               } 
    100102          } 
     103     } 
     104 
     105     public static function pageHeaders() 
     106     { 
     107          $tag_url = $GLOBALS['core']->blog->url.$GLOBALS['core']->url->getURLFor('tag'); 
     108           
     109          $opts = $GLOBALS['core']->auth->getOptions(); 
     110          $type = isset($opts['tag_list_format']) ? $opts['tag_list_format'] : 'more'; 
     111           
     112          return  
     113          '<script type="text/javascript" src="index.php?pf=tags/js/jquery.autocomplete.js"></script>'. 
     114          '<script type="text/javascript" src="index.php?pf=tags/js/page.js"></script>'. 
     115          '<script type="text/javascript">'."\n". 
     116          "//<![CDATA[\n". 
     117          "metaEditor.prototype.meta_url = 'plugin.php?p=tags&m=tag_posts&amp;tag=';\n". 
     118          "metaEditor.prototype.meta_type = '".html::escapeJS($type)."';\n". 
     119          "metaEditor.prototype.text_confirm_remove = '".html::escapeJS(__('Are you sure you want to remove this %s?'))."';\n". 
     120          "metaEditor.prototype.text_add_meta = '".html::escapeJS(__('Add a %s to this entry'))."';\n". 
     121          "metaEditor.prototype.text_choose = '".html::escapeJS(__('Choose from list'))."';\n". 
     122          "metaEditor.prototype.text_all = '".html::escapeJS(__('all'))."';\n". 
     123          "metaEditor.prototype.text_separation = '';\n". 
     124          "jsToolBar.prototype.elements.tag.title = '".html::escapeJS(__('Tag'))."';\n". 
     125          "jsToolBar.prototype.elements.tag.url = '".html::escapeJS($tag_url)."';\n". 
     126          "dotclear.msg.tags_autocomplete = '".html::escapeJS(__('used in %e - frequency %p%'))."';\n". 
     127          "dotclear.msg.entry = '".html::escapeJS(__('entry'))."';\n". 
     128          "dotclear.msg.entries = '".html::escapeJS(__('entries'))."';\n". 
     129          "\n//]]>\n". 
     130          "</script>\n". 
     131          '<link rel="stylesheet" type="text/css" href="index.php?pf=tags/style.css" />'; 
    101132     } 
    102133      

  • plugins/userPref/index.php

    r1179 r1274  
    8282     return 
    8383     '<tr>'. 
    84      '<td scope="raw"><label for="s_'.$id.'">'.sprintf($slabel,html::escapeHTML($id)).'</label></td>'. 
     84     '<td scope="row"><label for="s_'.$id.'">'.sprintf($slabel,html::escapeHTML($id)).'</label></td>'. 
    8585     '<td>'.$field.'</td>'. 
    8686     '<td>'.$s['type'].'</td>'. 

  • plugins/widgets/_widgets_functions.php

    r1179 r1253  
    2929          ($w->title ? '<h2><label for="q">'.html::escapeHTML($w->title).'</label></h2>' : ''). 
    3030          '<form action="'.$core->blog->url.'" method="get">'. 
    31           '<fieldset>'. 
    3231          '<p><input type="text" size="10" maxlength="255" id="q" name="q" value="'.$value.'" /> '. 
    3332          '<input type="submit" class="submit" value="ok" /></p>'. 
    34           '</fieldset>'. 
    3533          '</form>'. 
    3634          ($w->content_only ? '' : '</div>'); 
Note: See TracChangeset for help on using the changeset viewer.

Sites map