Changeset 620

Timestamp:

12/31/08 02:11:59 (15 years ago)

Author:

Moe

Message:

Contribute 1.0-alpha6 :

• added editable fields on the post edit page
• added filter to My Meta values

Location:

plugins/contribute

Files:

• _admin.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• _public.php (modified) (7 diffs)
• index.php (modified) (1 diff)

plugins/contribute/_admin.php

@@ -46 +46 @@
      public static function adminBeforePostUpdate($cur,$post_id)
      {
+          $meta = new dcMeta($GLOBALS['core']);
+          
+          try
+          {
+               if (isset($_POST['contribute_author']))
+               {
+                    $meta->delPostMeta($post_id,'contribute_author');
+                    $meta->setPostMeta($post_id,'contribute_author',
+                         $_POST['contribute_author']);
+               }
+               
+               if (isset($_POST['contribute_mail']))
+               {
+                    $meta->delPostMeta($post_id,'contribute_mail');
+                    $meta->setPostMeta($post_id,'contribute_mail',
+                         $_POST['contribute_mail']);
+               }
+               
+               if (isset($_POST['contribute_site']))
+               {
+                    $meta->delPostMeta($post_id,'contribute_site');
+                    $meta->setPostMeta($post_id,'contribute_site',
+                         $_POST['contribute_site']);
+               }    
+          }
+          catch (Exception $e)
+          {
+               $core->error->add($e->getMessage());
+          }
+          
           if (isset($_POST['contribute_delete_author'])
                && ($_POST['contribute_delete_author'] == '1'))
           {
-               $meta = new dcMeta($GLOBALS['core']);
-               
                try
                {
@@ -76 +104 @@
           $site = ($post) ? $meta->getMetaStr($post->post_meta,'contribute_site') : '';
           
-          $infos = array();
+          $str = '';
           
           if (!empty($author))
-          {
-               // fixme : display fields
-               $infos[] = sprintf(__('Post submitted by %s'),$author);
-
-               if (!empty($mail))
-               {
-                    $infos[] = sprintf(__('Email address : %s'),'<a href="mailto:'.$mail.'">'.$mail.'</a>');
-               }
+          {         
+               $str .=  '<p>'.
+               '<label class="classic" for="contribute_author">'.
+               __('Author:').
+               form::field('contribute_author',10,255,html::escapeHTML($author),'maximal').
+               '</label>'.
+               '</p>';
+               
                if (!empty($site))
                {
-                    # prevent malformed URLs
-                    # inspirated by /dotclear/inc/clearbricks/net.http/class.net.http.php
-                    $parsed_url = @parse_url($site);
-                    if ($parsed_url != false)
-                    {
-                         $host = '['.$parsed_url['host'].']';
-                    }
-                    else
-                    {
-                         $host = '';
-                    }
-                    $infos[] = sprintf(__('Website : %s'),'<a href="'.$site.'">'.$host.'</a>');
-               }
-               if (!empty($infos))
-               {
-                    $infos = '<ul><li>'.implode('</li><li>',$infos).'</li></ul>';
+                    $link = '<br />'.'<a href="mailto:'.html::escapeHTML($mail).'">'.
+                         __('send email').'</a>';
                }
                else
                {
-                    $infos = '';
-               }              
+                    $link = '';
+               }
+               
+               $str .=  '<p>'.
+               '<label class="classic" for="contribute_mail">'.
+               __('Email:').
+               form::field('contribute_mail',10,255,html::escapeHTML($mail),'maximal').
+               '</label>'.
+               $link.
+               '</p>';
+               
+               # prevent malformed URLs
+               # inspirated by /dotclear/inc/clearbricks/net.http/class.net.http.php
+               if (!empty($site))
+               {
+                    $parsed_url = @parse_url($site);
+                    $host = (($parsed_url != false) ? '['.$parsed_url['host'].']' : '');
+                    $link = '<br />'.
+                         '<a href="'.html::escapeHTML($site).'">'.$host.'</a>';
+               }
+               else
+               {
+                    $link = '';
+               }
+               
+               $str .=  '<p>'.
+               '<label class="classic" for="contribute_site">'.
+               __('Web site:').
+               form::field('contribute_site',10,255,html::escapeHTML($site),'maximal').
+               '</label>'.
+               $link.
+               '</p>';
                
                echo
                '<div id="planet-infos">'.'<h3>'.('Contribute').'</h3>'.
-               $infos.
+               $str.
                '<p>'.
                '<label class="classic" for="contribute_delete_author">'.

plugins/contribute/_define.php

@@ -26 +26 @@
      /* Description*/                "Allow visitors to contribute to your blog",
      /* Author */                    "Moe (http://gniark.net/)",
-     /* Version */                   '1.0-alpha5',
+     /* Version */                   '1.0-alpha6',
      /* Permissions */               'admin'
 );

plugins/contribute/_public.php

@@ -48 +48 @@
           $_ctx->contribute->selected_tags = array();
           
+          # Metadata
           if ($core->plugins->moduleExists('metadata'))
           {
@@ -57 +58 @@
           }
           
+          # My Meta
           if ($core->plugins->moduleExists('mymeta'))
           {
@@ -129 +131 @@
                               }
                          }
+                         # /My Meta
                     }
                     # empty post
@@ -157 +160 @@
                          # My Meta
                          $post->mymeta = array();
+                         # /My Meta
                          
                          # formats
@@ -169 +173 @@
                               
                               if ((isset($_POST['post_format']))
-                              && in_array($_POST['post_format'],$core->getFormaters()))
+                                   && in_array($_POST['post_format'],$core->getFormaters()))
                               {
                                    $post->post_format = $_POST['post_format'];
@@ -324 +328 @@
                               foreach ($_ctx->contribute->mymeta->getAll() as $k => $v)
                               {
-                                   if ($v->enabled)
+                                   if ($v->enabled && isset($_POST['mymeta_'.$k])
+                                        && in_array($k,$mymeta_values))
                                    {
-                                        if (isset($_POST['mymeta_'.$k]))
-                                        {
-                                             if (in_array($k,$mymeta_values))
-                                             {
-                                                  $post->mymeta[$k] = $_POST['mymeta_'.$k];
-                                             }
-                                        }
+                                        $post->mymeta[$k] = $_POST['mymeta_'.$k];
                                    }
                               }
@@ -483 +482 @@
                                         && ($core->blog->settings->contribute_allow_mymeta === true))
                                    {
-                                        $_ctx->contribute->mymeta->setMeta($post_id,$_POST);
-                                        // fixme : filter My Meta values
+                                        foreach ($_ctx->contribute->mymeta->getAll() as $k => $v)
+                                        {
+                                             if ($v->enabled && isset($_POST['mymeta_'.$k])
+                                                  && in_array($k,$mymeta_values))
+                                             {
+                                                  $meta->setPostMeta($post_id,$k,$_POST['mymeta_'.$k]);
+                                             }
+                                        }
                                    }
+                                   # /My Meta
                               }
-                              
-                              
-                              
-                              $separator = '?';
-                              if ($core->blog->settings->url_scan == 'query_string')
-                              {$separator = '&';}
                               
                               # send email notification

plugins/contribute/index.php

@@ -182 +182 @@
                     <?php echo(__('Only the users with the following permissions on this blog are shown:')); ?>
                </p>
-               <ul class="form-note">
+               <ul>
                     <li><!-- usage --><?php echo(__('manage their own entries and comments')); ?></li>
                </ul>