Changeset 2596:62f32566c15f

Timestamp:

12/02/13 15:27:54 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Check all required fields in blog creation, removes unnecessary notice, fixes #1616

Files:

• admin/blog.php (modified) (3 diffs)
• inc/core/class.dc.core.php (modified) (1 diff)

admin/blog.php

@@ -21 +21 @@
 
 # Create a blog
-if (!isset($_POST['id']) && !empty($_POST['blog_id']))
+if (!isset($_POST['id']) && (isset($_POST['create'])))
 {
      $cur = $core->con->openCursor($core->prefix.'blog');
@@ -84 +84 @@
      '<p class="form-note">'.__('At least 2 characters using letters, numbers or symbols.').'</p> ';
 
-     if ($blog_id) {
-          echo
-          '<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 class="required" for="blog_name"><abbr title="'.__('Required field').'">*</abbr> '.__('Blog name:').'</label> '.
@@ -99 +94 @@
      form::textarea('blog_desc',60,5,html::escapeHTML($blog_desc)).'</p>'.
 
-     '<p><input type="submit" accesskey="s" value="'.__('Create').'" /></p>'.
+     '<p><input type="submit" accesskey="s" name="create" value="'.__('Create').'" /></p>'.
      '</form>';
 

inc/core/class.dc.core.php

@@ -989 +989 @@
      private function getBlogCursor($cur)
      {
-          if ($cur->blog_id !== null
-          && !preg_match('/^[A-Za-z0-9._-]{2,}$/',$cur->blog_id)) {
+          if (($cur->blog_id !== null
+               && !preg_match('/^[A-Za-z0-9._-]{2,}$/',$cur->blog_id)) ||
+               (!$cur->blog_id)) {
                throw new Exception(__('Blog ID must contain at least 2 characters using letters, numbers or symbols.'));
           }
 
-          if ($cur->blog_name !== null && $cur->blog_name == '') {
+          if (($cur->blog_name !== null && $cur->blog_name == '') ||
+               (!$cur->blog_name)) {
                throw new Exception(__('No blog name'));
           }
 
-          if ($cur->blog_url !== null && $cur->blog_url == '') {
+          if (($cur->blog_url !== null && $cur->blog_url == '') ||
+               (!$cur->blog_url)) {
                throw new Exception(__('No blog URL'));
           }