Changeset 2566:9bf417837888 for admin/blog_pref.php

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

File:

• admin/blog_pref.php (modified) (32 diffs)

admin/blog_pref.php

@@ -25 +25 @@
      $blog_settings = $core->blog->settings;
      $blog_url = $core->blog->url;
-     
+
      $action = 'blog_pref.php';
      $redir = 'blog_pref.php';
@@ -38 +38 @@
           }
           $rs = $core->getBlog($_REQUEST['id']);
-          
+
           if (!$rs) {
                throw new Exception(__('No such blog.'));
           }
-          
+
           $blog_id = $rs->blog_id;
           $blog_status = $rs->blog_status;
@@ -48 +48 @@
           $blog_desc = $rs->blog_desc;
           $blog_settings = new dcSettings($core,$blog_id);
-          $blog_url = $rs->blog_url ; 
+          $blog_url = $rs->blog_url ;
      }
      catch (Exception $e)
@@ -54 +54 @@
           $core->error->add($e->getMessage());
      }
-     
+
      $action = 'blog.php';
      $redir = 'blog.php?id=%s';
@@ -150 +150 @@
      if ($core->auth->isSuperAdmin()) {
           $cur->blog_id = $_POST['blog_id'];
-          $cur->blog_url = preg_replace('/\?+$/','?',$_POST['blog_url']); 
+          $cur->blog_url = preg_replace('/\?+$/','?',$_POST['blog_url']);
           if (in_array($_POST['blog_status'],$status_combo)) {
                $cur->blog_status = (integer) $_POST['blog_status'];
@@ -157 +157 @@
      $cur->blog_name = $_POST['blog_name'];
      $cur->blog_desc = $_POST['blog_desc'];
-     
+
      $media_img_t_size = abs((integer) $_POST['media_img_t_size']);
      if ($media_img_t_size < 0) { $media_img_t_size = 100; }
-     
+
      $media_img_s_size = abs((integer) $_POST['media_img_s_size']);
      if ($media_img_s_size < 0) { $media_img_s_size = 240; }
-     
+
      $media_img_m_size = abs((integer) $_POST['media_img_m_size']);
      if ($media_img_m_size < 0) { $media_img_m_size = 448; }
-     
+
      $nb_post_per_page = abs((integer) $_POST['nb_post_per_page']);
      if ($nb_post_per_page <= 1) { $nb_post_per_page = 1; }
-     
+
      $nb_post_per_feed = abs((integer) $_POST['nb_post_per_feed']);
      if ($nb_post_per_feed <= 1) { $nb_post_per_feed = 1; }
-     
+
      $nb_comment_per_feed = abs((integer) $_POST['nb_comment_per_feed']);
      if ($nb_comment_per_feed <= 1) { $nb_comment_per_feed = 1; }
-     
+
      try
      {
           if ($cur->blog_id != null && $cur->blog_id != $blog_id) {
                $rs = $core->getBlog($cur->blog_id);
-               
+
                if ($rs) {
                     throw new Exception(__('This blog ID is already used.'));
                }
           }
-          
+
           # --BEHAVIOR-- adminBeforeBlogUpdate
           $core->callBehavior('adminBeforeBlogUpdate',$cur,$blog_id);
-          
+
           if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$_POST['lang'])) {
                throw new Exception(__('Invalid language code'));
           }
-          
+
           $core->updBlog($blog_id,$cur);
-          
+
           # --BEHAVIOR-- adminAfterBlogUpdate
           $core->callBehavior('adminAfterBlogUpdate',$cur,$blog_id);
-          
+
           if ($cur->blog_id != null && $cur->blog_id != $blog_id) {
                if ($blog_id == $core->blog->id) {
@@ -206 +206 @@
                     $blog_settings = new dcSettings($core,$cur->blog_id);
                }
-               
+
                $blog_id = $cur->blog_id;
           }
-          
-          
+
+
           $blog_settings->addNameSpace('system');
-          
+
           $blog_settings->system->put('editor',$_POST['editor']);
           $blog_settings->system->put('copyright_notice',$_POST['copyright_notice']);
@@ -230 +230 @@
           $blog_settings->system->put('enable_xmlrpc',!empty($_POST['enable_xmlrpc']));
           $blog_settings->system->put('note_title_tag',$_POST['note_title_tag']);
-          
+
           $blog_settings->system->put('nb_post_per_page',$nb_post_per_page);
           $blog_settings->system->put('use_smilies',!empty($_POST['use_smilies']));
@@ -245 +245 @@
           $blog_settings->system->put('nb_comment_per_feed',$nb_comment_per_feed);
           $blog_settings->system->put('short_feed_items',!empty($_POST['short_feed_items']));
-          
+
           if (isset($_POST['robots_policy'])) {
                $blog_settings->system->put('robots_policy',$_POST['robots_policy']);
           }
-          
+
           # --BEHAVIOR-- adminBeforeBlogSettingsUpdate
           $core->callBehavior('adminBeforeBlogSettingsUpdate',$blog_settings);
-          
+
           if ($core->auth->isSuperAdmin() && in_array($_POST['url_scan'],$url_scan_combo)) {
                $blog_settings->system->put('url_scan',$_POST['url_scan']);
@@ -293 +293 @@
      dcPage::jsConfirmClose('blog-form').
      dcPage::jsLoad('js/_blog_pref.js').
-     
-     
+
+
      # --BEHAVIOR-- adminBlogPreferencesHeaders
      $core->callBehavior('adminBlogPreferencesHeaders').
-     
+
      dcPage::jsPageTabs(),
      $breadcrumb
@@ -307 +307 @@
           dcPage::success(__('Blog has been successfully created.'));
      }
-     
+
      if (!empty($_GET['upd'])) {
           dcPage::success(__('Blog has been successfully updated.'));
      }
-     
+
      echo
      '<div class="multi-part" id="params" title="'.__('Parameters').'">'.
      '<h3 class="out-of-screen-if-js">'.__('Parameters').'</h3>'.
      '<form action="'.$action.'" method="post" id="blog-form">';
-     
+
      echo
      '<div class="fieldset"><h4>'.__('Blog details').'</h4>'.
      $core->formNonce();
-     
+
      if ($core->auth->isSuperAdmin())
      {
@@ -329 +329 @@
           '<p class="form-note warn">'.__('Please note that changing your blog ID may require changes in your public index.php file.').'</p>';
      }
-     
+
      echo
      '<p><label for="blog_name" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Blog name:').'</label>'.
      form::field('blog_name',30,255,html::escapeHTML($blog_name)).'</p>';
-     
+
      if ($core->auth->isSuperAdmin())
      {
@@ -339 +339 @@
           '<p><label for="blog_url" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Blog URL:').'</label>'.
           form::field('blog_url',50,255,html::escapeHTML($blog_url)).'</p>'.
-          
+
           '<p><label for="url_scan">'.__('URL scan method:').'</label>'.
           form::combo('url_scan',$url_scan_combo,$blog_settings->system->url_scan).'</p>';
-          
+
           try
           {
@@ -385 +385 @@
           form::combo('blog_status',$status_combo,$blog_status).'</p>';
      }
-     
+
      echo
      '<p class="area"><label for="blog_desc">'.__('Blog description:').'</label>'.
      form::textarea('blog_desc',60,5,html::escapeHTML($blog_desc)).'</p>'.
      '</div>';
-     
-     
+
+
      echo
      '<div class="fieldset"><h4>'.__('Blog configuration').'</h4>'.
@@ -399 +399 @@
      form::field('editor',30,255,html::escapeHTML($blog_settings->system->editor)).
      '</p>'.
-     
+
      '<p><label for="lang">'.__('Default language:').'</label>'.
      form::combo('lang',$lang_combo,$blog_settings->system->lang,'l10n').
      '</p>'.
-     
+
      '<p><label for="blog_timezone">'.__('Blog timezone:').'</label>'.
      form::combo('blog_timezone',dt::getZones(true,true),html::escapeHTML($blog_settings->system->blog_timezone)).
@@ -412 +412 @@
      '</p>'.
      '</div>'.
-     
+
      '<div class="col">'.
      '<p><label for="post_url_format">'.__('New post URL format:').'</label>'.
@@ -421 +421 @@
      form::combo('note_title_tag',$note_title_tag_combo,$blog_settings->system->note_title_tag).
      '</p>'.
-          
+
      '<p><label for="enable_xmlrpc" class="classic">'.'</label>'.
      form::checkbox('enable_xmlrpc','1',$blog_settings->system->enable_xmlrpc).
@@ -427 +427 @@
 
      echo
-          '<p class="form-note info">'.__('XML/RPC interface allows you to edit your blog with an external client.').'</p>'; 
+          '<p class="form-note info">'.__('XML/RPC interface allows you to edit your blog with an external client.').'</p>';
 
      if ($blog_settings->system->enable_xmlrpc) {
@@ -448 +448 @@
      '<br class="clear" />'. //Opera sucks
      '</div>';
-     
+
      echo
      '<div class="fieldset"><h4>'.__('Comments and trackbacks').'</h4>'.
@@ -457 +457 @@
      '<p><label for="allow_comments" class="classic">'.
      form::checkbox('allow_comments','1',$blog_settings->system->allow_comments).
-     __('Accept comments').'</label></p>'.   
+     __('Accept comments').'</label></p>'.
      '<p><label for="comments_pub" class="classic">'.
      form::checkbox('comments_pub','1',!$blog_settings->system->comments_pub).
-     __('Moderate comments').'</label></p>'. 
+     __('Moderate comments').'</label></p>'.
      '<p><label for="comments_ttl" class="classic">'.sprintf(__('Leave comments open for %s days').'.',
      form::field('comments_ttl',2,3,$blog_settings->system->comments_ttl)).
      '</label></p>'.
-     '<p class="form-note">'.__('No limit: leave blank.').'</p>'.     
+     '<p class="form-note">'.__('No limit: leave blank.').'</p>'.
      '<p><label for="wiki_comments" class="classic">'.
      form::checkbox('wiki_comments','1',$blog_settings->system->wiki_comments).
      __('Wiki syntax for comments').'</label></p>'.
      '</div>'.
-     
+
      '<div class="col">'.
      '<p><label for="allow_trackbacks" class="classic">'.
      form::checkbox('allow_trackbacks','1',$blog_settings->system->allow_trackbacks).
-     __('Accept trackbacks').'</label></p>'. 
+     __('Accept trackbacks').'</label></p>'.
      '<p><label for="trackbacks_pub" class="classic">'.
      form::checkbox('trackbacks_pub','1',!$blog_settings->system->trackbacks_pub).
-     __('Moderate trackbacks').'</label></p>'.    
+     __('Moderate trackbacks').'</label></p>'.
      '<p><label for="trackbacks_ttl" class="classic">'.sprintf(__('Leave trackbacks open for %s days').'.',
      form::field('trackbacks_ttl',2,3,$blog_settings->system->trackbacks_ttl)).'</label></p>'.
-     '<p class="form-note">'.__('No limit: leave blank.').'</p>'.     
+     '<p class="form-note">'.__('No limit: leave blank.').'</p>'.
      '<p><label for="comments_nofollow" class="classic">'.
      form::checkbox('comments_nofollow','1',$blog_settings->system->comments_nofollow).
@@ -489 +489 @@
      '<br class="clear" />'. //Opera sucks
      '</div>';
-     
+
      echo
      '<div class="fieldset"><h4>'.__('Blog presentation').'</h4>'.
@@ -505 +505 @@
      '</p>'.
      '<p class="chosen form-note">'.__('Sample:').' '.dt::str(html::escapeHTML($blog_settings->system->time_format)).'</p>'.
-     
+
      '<p><label for="use_smilies" class="classic">'.
      form::checkbox('use_smilies','1',$blog_settings->system->use_smilies).
      __('Display smilies on entries and comments').'</label></p>'.
      '</div>'.
-     
+
      '<div class="col">'.
      '<p><label for="nb_post_per_page" class="classic">'.sprintf(__('Display %s entries per page'),
      form::field('nb_post_per_page',2,3,$blog_settings->system->nb_post_per_page)).
      '</label></p>'.
-     
+
      '<p><label for="nb_post_per_feed" class="classic">'.sprintf(__('Display %s entries per feed'),
      form::field('nb_post_per_feed',2,3,$blog_settings->system->nb_post_per_feed)).
      '</label></p>'.
-     
+
      '<p><label for="nb_comment_per_feed" class="classic">'.sprintf(__('Display %s comments per feed'),
      form::field('nb_comment_per_feed',2,3,$blog_settings->system->nb_comment_per_feed)).
      '</label></p>'.
-     
+
      '<p><label for="short_feed_items" class="classic">'.
      form::checkbox('short_feed_items','1',$blog_settings->system->short_feed_items).
      __('Truncate feeds').'</label></p>'.
-     
+
      '<p><label for="inc_subcats" class="classic">'.
      form::checkbox('inc_subcats','1',$blog_settings->system->inc_subcats).
@@ -535 +535 @@
      '<br class="clear" />'. //Opera sucks
      '</div>';
-     
+
      echo
      '<div class="fieldset"><h4 id="medias-settings">'.__('Media and images').'</h4>'.
@@ -547 +547 @@
      '<p class="field"><label for="media_img_t_size">Thumbnail</label> '.
      form::field('media_img_t_size',3,3,$blog_settings->system->media_img_t_size).'</p>'.
-     
+
      '<p class="field"><label for="media_img_s_size">Small</label> '.
      form::field('media_img_s_size',3,3,$blog_settings->system->media_img_s_size).'</p>'.
-     
+
      '<p class="field"><label for="media_img_m_size">Medium</label> '.
      form::field('media_img_m_size',3,3,$blog_settings->system->media_img_m_size).'</p>'.
      '</div>'.
-     
+
      '<div class="col">'.
      '<h5>'.__('Default image insertion attributes').'</h5>'.
@@ -579 +579 @@
 
      '</div>';
-     
+
      echo
      '<div class="fieldset"><h4>'.__('Search engines robots policy').'</h4>';
-     
+
      $i = 0;
      foreach ($robots_policy_options as $k => $v)
@@ -590 +590 @@
           $i++;
      }
-     
+
      echo '</div>';
-     
-     
+
+
      # --BEHAVIOR-- adminBlogPreferencesForm
      $core->callBehavior('adminBlogPreferencesForm',$core,$blog_settings);
-     
+
      echo
      '<p><input type="submit" accesskey="s" value="'.__('Save').'" />'.
@@ -602 +602 @@
      '</p>'.
      '</form>';
-     
+
      if ($core->auth->isSuperAdmin() && $blog_id != $core->blog->id)
      {
@@ -618 +618 @@
           }
      }
-     
+
      echo '</div>';
-     
+
      #
      # Users on the blog (with permissions)
-     
+
      $blog_users = $core->getBlogPermissions($blog_id,$core->auth->isSuperAdmin());
      $perm_types = $core->auth->getPermissionsTypes();
-     
+
      echo
      '<div class="multi-part" id="users" title="'.__('Users').'">'.
      '<h3 class="out-of-screen-if-js">'.__('Users on this blog').'</h3>';
-     
+
      if (empty($blog_users))
      {
@@ -664 +664 @@
 
                     if ($core->auth->isSuperAdmin()) {
-                         echo 
+                         echo
                          '<p>'.__('Email:').' '.
                          ($v['email'] != '' ? '<a href="mailto:'.$v['email'].'">'.$v['email'].'</a>' : __('(none)')).
@@ -703 +703 @@
                          }
                     }
-                    echo 
+                    echo
                     '</ul>';
-                    
+
                     if (!$v['super'] && $core->auth->isSuperAdmin()) {
-                         echo 
+                         echo
                          '<form action="users_actions.php" method="post">'.
                          '<p class="change-user-perm"><input type="submit" class="reset" value="'.__('Change permissions').'" />'.
@@ -725 +725 @@
           }
      }
-     
+
      echo '</div>';
 }
@@ -731 +731 @@
 dcPage::helpBlock('core_blog_pref');
 dcPage::close();
-?>