Dotclear

Changeset 1280:d9627cb1cb02


Ignore:
Timestamp:
08/06/13 10:03:57 (12 years ago)
Author:
Dsls
Branch:
default
Message:

Backed out merge changeset: 48c827f9db99

Backed out merge revision to its first parent (5ceeeb6f5454)

Files:
1 deleted
60 edited

Legend:

Unmodified
Added
Removed

  • .hgsubstate

    r1278 r1280  
    1 4a0351ee5d566a83ff06ca8bc9fffeb99885f545 inc/libs/clearbricks 
     168debbf1f4b869c562e3ac3d1901d55e9ddf2f49 inc/libs/clearbricks 

  • .hgtags

    r1219 r1280  
    12126fce226121140735a51a8f447c80f1dacd2974ea 2.4.4 
    1313514d5121a12586b7ff320924d44028b677a01020 2.4.4 
    14 baf879af43beea9764d920c2facd7226e90c5cf3 2.5.1 

  • admin/blog.php

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

  • admin/blog_theme.php

    r1263 r1280  
    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></h2>'. 
     334     ' &rsaquo; <a href="blog_theme.php">'.__('Blog appearance').'</a> &rsaquo; <span class="page-title">'.__('Theme configuration').'<span class="page-title"></h2>'. 
    335335     '<p><a class="back" href="blog_theme.php">'.__('back').'</a></p>'; 
    336336      

  • admin/index.php

    r1247 r1280  
    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',false,'boolean','',null,true); 
    62      } 
    63      $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean'); 
     61          $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean','',null,true); 
     62     } 
     63     $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean'); 
    6464} 
    6565 

  • admin/install/index.php

    r1247 r1280  
    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',false,'boolean','',null,true); 
     192          $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean','',null,true); 
    193193 
    194194          # Add accessibility options 

  • admin/js/_media.js

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

  • admin/js/_post.js

    r1256 r1280  
    7979          // Get document format and prepare toolbars 
    8080          var formatField = $('#post_format').get(0); 
    81           var last_post_format = $(formatField).val(); 
    8281          $(formatField).change(function() { 
    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                } 
     82               excerptTb.switchMode(this.value); 
     83               contentTb.switchMode(this.value); 
    9284          }); 
    9385           

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

    r1223 r1280  
    3939                    li = document.createElement('li'); 
    4040                    a = document.createElement('a'); 
    41                     $(a).html(this.title); 
     41                    a.appendChild(document.createTextNode(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; 
    4746                    a.obj = This; 
    4847                    jQuery(a).click(function() { this.fn.call(this.obj,this.index); return false; }); 

  • admin/media.php

    r1234 r1280  
    335335 
    336336     echo 
    337      '<form id="fileupload" action="'.html::escapeURL($page_url).'" method="POST" enctype="multipart/form-data">'. 
    338337     '<fieldset id="add-file-f"><legend>'.__('Add files').'</legend>'. 
    339338     '<p>'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'. 
    340      form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE). 
    341      $core->formNonce(). 
     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>'. 
    342342     '<div class="fileupload-ctrl"><div class="files"></div></div>'; 
    343343 
    … …  
    369369 
    370370     echo 
    371      form::hidden(array('d'),$d). 
     371     '<div>'.form::hidden(array('d'),$d).'</div>'. 
    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))); 
    432430     $res = 
    433431     '<div class="'.$class.'"><a class="media-icon media-link" href="'.$link.'">'. 
    434      '<img src="'.$f->media_icon.'" alt="'.$alt.'" /></a>'. 
     432     '<img src="'.$f->media_icon.'" alt="" /></a>'. 
    435433     '<ul>'. 
    436434     '<li><a class="media-link" href="'.$link.'">'.$fname.'</a></li>'; 

  • admin/plugins.php

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

  • admin/search.php

    r1276 r1280  
    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

    r1231 r1280  
    2727 
    2828$updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions'); 
    29 $new_v = $updater->check(DC_VERSION, !empty($_GET['nocache'])); 
     29$new_v = $updater->check(DC_VERSION); 
    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      } 
    179175} 
    180176 
    … …  
    184180     if (empty($new_v)) 
    185181     { 
    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>'; 
     182          echo '<p><strong>'.__('No newer Dotclear version available.').'</strong></p>'; 
    191183     } 
    192184     else 

  • admin/users.php

    r1237 r1280  
    106106      
    107107     echo  
    108      '<h2 class="page-title">'.__('Users').'</h2>'. 
     108     '<h2 class="post-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

    r1256 r1280  
    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?")). 
    480478          self::jsVar('dotclear.msg.load_enhanced_uploader', 
    481479               __('Loading enhanced uploader, please wait.')). 

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

    r1278 r1280  
    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      @param    affected_posts      <b>mixed</b>        Posts(s) ID(s) 
    206      */ 
    207      public function triggerComments($ids, $del=false, $affected_posts=null) 
     205     */ 
     206     public function triggerComments($ids,$del=false) 
    208207     { 
    209208          $co_ids = dcUtils::cleanIds($ids); 
    210           $a_ids = dcUtils::cleanIds($affected_posts); 
    211           $a_tbs = array(); 
    212209           
    213210          # a) Retrieve posts affected by comments edition 
    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                } 
     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; 
    227223          } 
    228224           
    … …  
    259255          { 
    260256               $nb_comment = $nb_trackback = 0; 
    261                //$cur->nb_comment = $nb_comment; 
    262257               foreach($b_ids as $b_key => $b_id) 
    263258               { 
    … …  
    510505          $this->core->callBehavior('coreBeforeCategoryCreate',$this,$cur); 
    511506           
    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           } 
     507          $this->categories()->addNode($cur,$parent); 
    519508           
    520509          # --BEHAVIOR-- coreAfterCategoryCreate 
    … …  
    21922181          $co_ids = dcUtils::cleanIds($ids); 
    21932182           
    2194           if (empty($co_ids)) { 
     2183          if (empty($ids)) { 
    21952184               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; 
    22092185          } 
    22102186           
    … …  
    22362212           
    22372213          $this->con->execute($strReq); 
    2238           $this->triggerComments($co_ids, true, $affected_posts); 
     2214          $this->triggerComments($co_ids,true); 
    22392215          $this->triggerBlog(); 
    22402216     } 
    … …  
    22912267           
    22922268          if ($cur->comment_site !== null && $cur->comment_site != '') { 
    2293                if (!preg_match('|^http(s?)://|i',$cur->comment_site, $matches)) { 
     2269               if (!preg_match('|^http(s?)://|',$cur->comment_site)) { 
    22942270                    $cur->comment_site = 'http://'.$cur->comment_site; 
    2295                }else{ 
    2296                     $cur->comment_site = strtolower($matches[0]).substr($cur->comment_site, strlen($matches[0])); 
    22972271               } 
    22982272          } 

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

    r1270 r1280  
    497497     @param    post_id   <b>integer</b>      Post ID 
    498498     @param    media_id  <b>integer</b>      Optionnal media ID 
    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) 
     499     @return   <b>array</b> Array of fileItems 
     500     */ 
     501     public function getPostMedia($post_id,$media_id=null) 
    503502     { 
    504503          $params = array( 
    … …  
    516515               $f = $this->fileRecord($rs); 
    517516               if ($f !== null) { 
    518                     $res[] = $return_rs ? new ArrayObject($f) : $f; 
    519                } 
    520           } 
    521            
    522           return $return_rs ? staticRecord::newFromArray($res) : $res; 
     517                    $res[] = $f; 
     518               } 
     519          } 
     520           
     521          return $res; 
    523522     } 
    524523      

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

    r1231 r1280  
    3232      
    3333     protected $cache_ttl = '-6 hours'; 
    34      protected $nocache_ttl = '-2 mins'; 
    3534     protected $forced_files = array(); 
    3635      
    … …  
    5655      *  
    5756      * @param version        string    Current version to compare 
    58       * @param nocache        boolean   Force checking 
    5957      * @return string                  Latest version if available 
    6058      */ 
    61      public function check($version, $nocache=false) 
    62      { 
    63           $this->getVersionInfo($nocache); 
     59     public function check($version) 
     60     { 
     61          $this->getVersionInfo(); 
    6462          $v = $this->getVersion(); 
    6563          if ($v && version_compare($version,$v,'<')) { 
    … …  
    7068     } 
    7169      
    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            
     70     public function getVersionInfo() 
     71     { 
    7972          # Check cached file 
    80           if (is_readable($this->cache_file) && filemtime($this->cache_file) > strtotime($this->cache_ttl) && !$nocache) 
     73          if (is_readable($this->cache_file) && filemtime($this->cache_file) > strtotime($this->cache_ttl)) 
    8174          { 
    8275               $c = @file_get_contents($this->cache_file); 

  • inc/load_plugin_file.php

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

  • inc/prepend.php

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

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

    r1249 r1280  
    6767          $this->addValue('BlogLanguage',array($this,'BlogLanguage')); 
    6868          $this->addValue('BlogThemeURL',array($this,'BlogThemeURL')); 
    69           $this->addValue('BlogParentThemeURL',array($this,'BlogParentThemeURL')); 
    7069          $this->addValue('BlogUpdateDate',array($this,'BlogUpdateDate')); 
    7170          $this->addValue('BlogID',array($this,'BlogID')); 
    … …  
    840839      
    841840     /*dtd 
    842      <!ELEMENT tpl:BlogThemeURL - O -- Blog's current Theme URL --> 
     841     <!ELEMENT tpl:BlogThemeURL - O -- Blog's current Themei URL --> 
    843842     */ 
    844843     public function BlogThemeURL($attr) 
    … …  
    846845          $f = $this->getFilters($attr); 
    847846          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)').'; ?>'; 
    858847     } 
    859848     

  • locales/bn/help/blowupConfig.html

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

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

  • locales/eo/help/blowupConfig.html

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     46avoir une largeur exacte de 800 pixels.</strong> 
    4747 
    4848<p>Si vous déposez une image au format JPG, un cadre sera ajouté autours de 

  • locales/fr/main.po

    r1256 r1280  
    10381038#, fuzzy, php-format 
    10391039msgid "Path <strong>%s</strong> is not writable." 
    1040 msgstr "Le répertoire <strong>%s</strong> n'est pas accessible en écriture." 
     1040msgstr "Le répertoire de cache %s 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 du 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 de blog</a>." 
    11261126 
    11271127msgid "Installed languages" 
    … …  
    11921192msgid "Media manager" 
    11931193msgstr "Gestionnaire de médias" 
    1194  
    1195 msgid "Go to %s folder" 
    1196 msgstr "Aller au dossier %s" 
    1197  
    1198 msgid "Media details of %s" 
    1199 msgstr "Détails du média %s" 
    12001194 
    12011195msgid "confirm removal" 
    … …  
    19971991msgstr "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>." 
    19981992 
    1999 msgid "Manual checking of update done successfully." 
    2000 msgstr "Vérification manuelle de mise à jour effectuée avec succès." 
    2001  
    20021993msgid "No newer Dotclear version available." 
    20031994msgstr "Aucune nouvelle version de Dotclear n'est disponible." 
    20041995 
    2005 msgid "Force checking update Dotclear" 
    2006 msgstr "Forcer la vérification de mise à jour de Dotclear" 
    2007  
    20081996#, php-format 
    20091997msgid "Dotclear %s is available." 
    … …  
    21422130#, fuzzy 
    21432131msgid "Go to the content" 
    2144 msgstr "Aller au contenu" 
     2132msgstr "Voir ce billet sur le site" 
    21452133 
    21462134#, fuzzy 
    21472135msgid "Go to the menu" 
    2148 msgstr "Aller au menu" 
     2136msgstr "Aller sur le site" 
    21492137 
    21502138msgid "Go to site" 
    … …  
    22642252msgstr "Vous avez des modifications non sauvegardées. Changer de format vous fera perdre ces modifications. Continuer ?" 
    22652253 
    2266 msgid "Warning: post format change will not convert existing content. You will need to apply new format by yourself. Proceed anyway?" 
    2267 msgstr "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  
    22692254msgid "Loading enhanced uploader, please wait." 
    22702255msgstr "Chargement de l'interface avancée." 
    … …  
    25152500#, fuzzy 
    25162501msgid "You are not allowed to reset categories order" 
    2517 msgstr "Vous n'êtes pas autorisé à réinitialiser l'ordre des catégories" 
     2502msgstr "Vous n'êtes pas autorisé à supprimer des catégories" 
    25182503 
    25192504msgid "Category URL must be unique." 

  • locales/fr/plugins.po

    r1275 r1280  
    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 "Optimiser les tables" 
     1133msgstr "Vidage des tables" 
    11341134 
    11351135msgid "Counters" 
    … …  
    11371137 
    11381138msgid "Reset comments and ping counters" 
    1139 msgstr "Recalculer les compteurs de commentaires et de signalements" 
     1139msgstr "Remet à zéro les compteurs de commentaires et de signalements" 
    11401140 
    11411141msgid "Search engine index" 
    … …  
    11461146 
    11471147msgid "Index all posts" 
    1148 msgstr "Indexer tous les billets" 
     1148msgstr "Indexation de tous les billets" 
    11491149 
    11501150msgid "Index all comments" 
    1151 msgstr "Indexer tous les commentaires" 
     1151msgstr "Indexation de tous les commentaires" 
    11521152 
    11531153msgid "Vacuum logs" 
    … …  
    11551155 
    11561156msgid "Delete all logs" 
    1157 msgstr "Supprimer tous les journaux" 
     1157msgstr "Suppression de tous les journaux" 
    11581158 
    11591159msgid "Empty templates cache directory" 
    … …  
    11611161 
    11621162msgid "Empty directory" 
    1163 msgstr "Vider le répertoire" 
     1163msgstr "Vidage du répertoire" 
    11641164 
    11651165msgid "Pages" 

  • locales/hu/help/blowupConfig.html

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

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

  • locales/ko/help/blowupConfig.html

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

  • locales/lt/help/blowupConfig.html

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    5454 
    5555<h4>Estilos pré-definidos</h4> 

  • locales/ro/help/blowupConfig.html

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

    r1264 r1280  
    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></p> 
     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> 
    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

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

  • plugins/aboutConfig/index.php

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

  • plugins/antispam/index.php

    r1274 r1280  
    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="row">'.$f->name.'</td>'. 
     206          '<td class="nowrap" scope="raw">'.$f->name.'</td>'. 
    207207          '<td class="maximal">'.$f->description.'</td>'. 
    208208          '<td class="status">'.$gui_link.'</td>'. 

  • plugins/attachments/_public.php

    r1266 r1280  
    4040          "<?php\n". 
    4141          'if ($_ctx->posts !== null && $core->media) {'."\n". 
    42           '$_ctx->attachments = $core->media->getPostMedia($_ctx->posts->post_id, null, true);'."\n". 
     42               '$_ctx->attachments = new ArrayObject($core->media->getPostMedia($_ctx->posts->post_id));'."\n". 
    4343          "?>\n". 
    4444           
    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 
     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; ?>'. 
    5048          $content. 
    51           '<?php $attach_i++; ?>'. // LEGACY 
    52           '<?php endwhile; '. 
    53           '$_ctx->attachments = null; ?>'. 
     49          '<?php endforeach; $_ctx->attachments = null; unset($attach_i,$attach_f,$_ctx->file_url); ?>'. 
    5450           
    5551          "<?php } ?>\n"; 
    … …  
    6460     { 
    6561          return 
    66           "<?php if (\$_ctx->attachments->isStart()) : ?>". 
     62          "<?php if (\$attach_i == 0) : ?>". 
    6763          $content. 
    6864          "<?php endif; ?>"; 
    … …  
    7571     { 
    7672          return 
    77           "<?php if (\$_ctx->attachments->isEnd()) : ?>". 
     73          "<?php if (\$attach_i+1 == count(\$_ctx->attachments)) : ?>". 
    7874          $content. 
    7975          "<?php endif; ?>"; 
    … …  
    9793          if (isset($attr['is_image'])) { 
    9894               $sign = (boolean) $attr['is_image'] ? '' : '!'; 
    99                $if[] = $sign.'$_ctx->attachments->media_image'; 
     95               $if[] = $sign.'$attach_f->media_image'; 
    10096          } 
    10197           
    10298          if (isset($attr['has_thumb'])) { 
    10399               $sign = (boolean) $attr['has_thumb'] ? '' : '!'; 
    104                $if[] = $sign.'isset($_ctx->attachments->media_thumb[\'sq\'])'; 
     100               $if[] = $sign.'isset($attach_f->media_thumb[\'sq\'])'; 
    105101          } 
    106102           
    107103          if (isset($attr['is_mp3'])) { 
    108104               $sign = (boolean) $attr['is_mp3'] ? '==' : '!='; 
    109                $if[] = '$_ctx->attachments->type '.$sign.' "audio/mpeg3"'; 
     105               $if[] = '$attach_f->type '.$sign.' "audio/mpeg3"'; 
    110106          } 
    111107           
    … …  
    113109               $sign = (boolean) $attr['is_flv'] ? '' : '!'; 
    114110               $if[] = $sign. 
    115                     '($_ctx->attachments->type == "video/x-flv" || '. 
    116                     '$_ctx->attachments->type == "video/mp4" || '. 
    117                     '$_ctx->attachments->type == "video/x-m4v")'; 
     111                    '($attach_f->type == "video/x-flv" || '. 
     112                    '$attach_f->type == "video/mp4" || '. 
     113                    '$attach_f->type == "video/x-m4v")'; 
    118114          } 
    119115           
    … …  
    131127     { 
    132128          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    133           return '<?php echo '.sprintf($f,'$_ctx->attachments->type').'; ?>'; 
     129          return '<?php echo '.sprintf($f,'$attach_f->type').'; ?>'; 
    134130     } 
    135131      
    … …  
    140136     { 
    141137          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    142           return '<?php echo '.sprintf($f,'$_ctx->attachments->media_type').'; ?>'; 
     138          return '<?php echo '.sprintf($f,'$attach_f->media_type').'; ?>'; 
    143139     } 
    144140      
    … …  
    149145     { 
    150146          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    151           return '<?php echo '.sprintf($f,'$_ctx->attachments->basename').'; ?>'; 
     147          return '<?php echo '.sprintf($f,'$attach_f->basename').'; ?>'; 
    152148     } 
    153149      
    … …  
    162158          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    163159          if (!empty($attr['full'])) { 
    164                return '<?php echo '.sprintf($f,'$_ctx->attachments->size').'; ?>'; 
    165           } 
    166           return '<?php echo '.sprintf($f,'files::size($_ctx->attachments->size)').'; ?>'; 
     160               return '<?php echo '.sprintf($f,'$attach_f->size').'; ?>'; 
     161          } 
     162          return '<?php echo '.sprintf($f,'files::size($attach_f->size)').'; ?>'; 
    167163     } 
    168164      
    … …  
    173169     { 
    174170          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    175           return '<?php echo '.sprintf($f,'$_ctx->attachments->media_title').'; ?>'; 
     171          return '<?php echo '.sprintf($f,'$attach_f->media_title').'; ?>'; 
    176172     } 
    177173      
    … …  
    184180          return 
    185181          '<?php '. 
    186           'if (isset($_ctx->attachments->media_thumb[\'sq\'])) {'. 
    187                'echo '.sprintf($f,'$_ctx->attachments->media_thumb[\'sq\']').';'. 
     182          'if (isset($attach_f->media_thumb[\'sq\'])) {'. 
     183               'echo '.sprintf($f,'$attach_f->media_thumb[\'sq\']').';'. 
    188184          '}'. 
    189185          '?>'; 
    … …  
    196192     { 
    197193          $f = $GLOBALS['core']->tpl->getFilters($attr); 
    198           return '<?php echo '.sprintf($f,'$_ctx->attachments->file_url').'; ?>'; 
     194          return '<?php echo '.sprintf($f,'$attach_f->file_url').'; ?>'; 
    199195     } 
    200196      

  • plugins/daInstaller/index.php

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

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

    r1272 r1280  
    1010<dl> 
    1111  <dt>Optimiser l'espace de la base de données</dt> 
    12   <dd>Au fur et à mesure des suppressions ou modifications dans vos billets, les tables de la  
     12  <dd>Au fur at à 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

    r1239 r1280  
    302302  dcPage::jsToolBar(). 
    303303  dcPage::jsModal(). 
    304   dcPage::jsMetaEditor(). 
    305304  dcPage::jsLoad('js/_post.js'). 
    306305  dcPage::jsConfirmClose('entry-form','comment-form'). 

  • plugins/simpleMenu/index.php

    r1273 r1280  
    389389          case 1: 
    390390               // Selection du type d'item 
    391                echo '<form id="additem" action="'.$p_url.'&amp;add=2" method="post">'; 
     391               echo '<form id="additem" action="'.$p_url.'&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.'&amp;add=3" method="post">'; 
     401                    echo '<form id="additem" action="'.$p_url.'&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.'&amp;add=4" method="post">'; 
     438               echo '<form id="additem" action="'.$p_url.'&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.'&amp;add=1" method="post">'; 
     460     echo '<form id="menuitemsappend" action="'.$p_url.'&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

    r1239 r1280  
    2323$core->addBehavior('adminAfterPostUpdate',array('tagsBehaviors','setTags')); 
    2424 
    25 $core->addBehavior('adminPageHeaders',array('tagsBehaviors','pageHeaders')); 
    26  
    2725$core->addBehavior('adminPostHeaders',array('tagsBehaviors','postHeaders')); 
    2826$core->addBehavior('adminPostsActionsHeaders',array('tagsBehaviors','postsActionsHeaders')); 
    … …  
    10199               } 
    102100          } 
    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" />'; 
    132101     } 
    133102      

  • plugins/userPref/index.php

    r1274 r1280  
    8282     return 
    8383     '<tr>'. 
    84      '<td scope="row"><label for="s_'.$id.'">'.sprintf($slabel,html::escapeHTML($id)).'</label></td>'. 
     84     '<td scope="raw"><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

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

Sites map