Changeset 3034

Timestamp:

05/14/11 23:43:45 (12 years ago)

Author:

Moe

Message:

Contribute 1.0-alpha32: removed tests for Dotclear < 2.2

Location:

plugins/contribute

Files:

• _define.php (modified) (1 diff)
• default-templates/contribute.html (modified) (2 diffs)
• inc/lib.contribute.document.php (modified) (2 diffs)
• inc/lib.contribute.php (modified) (1 diff)
• index.php (modified) (3 diffs)

plugins/contribute/_define.php

@@ -28 +28 @@
      /* Description*/                "Allow visitors to write an entry for your blog",
      /* Author */                    "Moe (http://gniark.net/)",
-     /* Version */                   '1.0-alpha31',
+     /* Version */                   '1.0-alpha32',
      /* Permissions */               'admin'
 );

plugins/contribute/default-templates/contribute.html

@@ -286 +286 @@
                
                <tpl:ContributeIf tags="1">
-                    <p>
-                         <label for="post_tags">{{tpl:lang Tags}} ({{tpl:lang separate tags by a comma}}) ({{tpl:lang optional}})&nbsp;:</label>
-                         <!-- # avoid unnecessary spaces and line breaks -->
-                         <input type="text" name="post_tags" id="post_tags"
-                              value="<tpl:EntryTags>{{tpl:TagID}}<tpl:LoopPosition start="1" length="-1">, </tpl:LoopPosition></tpl:EntryTags>" />
-                    </p>
-                    
               <tpl:Tags type="tag">
                    <tpl:LoopPosition start="1" length="1">
@@ -308 +301 @@
                    </tpl:LoopPosition>
               </tpl:Tags>
+
+                    <p>
+                         <label for="post_tags">{{tpl:lang Tags}} ({{tpl:lang separate tags by a comma}}) ({{tpl:lang optional}})&nbsp;:</label>
+                         <!-- # avoid unnecessary spaces and line breaks -->
+                         <input type="text" name="post_tags" id="post_tags"
+                              value="<tpl:EntryTags>{{tpl:TagID}}<tpl:LoopPosition start="1" length="-1">, </tpl:LoopPosition></tpl:EntryTags>" />
+                    </p>
             </tpl:ContributeIf>
          

plugins/contribute/inc/lib.contribute.document.php

@@ -69 +69 @@
           $_ctx->contribute->selected_tags = array();
           
-          # Compatibility test
-          if (version_compare(DC_VERSION,'2.2-alpha1','>='))
-          {
-               $meta =& $core->meta;
-          } else {
-               # Metadata
-               if ($core->plugins->moduleExists('metadata'))
-               {
-                    $meta = new dcMeta($core);
-               }
-               else
-               {
-                    $meta = false;
-               }
-          }
+          # Metadata
+          $meta =& $core->meta;
           
           # My Meta
@@ -103 +90 @@
                     $mymeta_sections = array();
                     
-                    if (version_compare(DC_VERSION,'2.2-alpha1','>='))
-                    {
-                         foreach ($_ctx->contribute->mymeta->getAll() as $meta_tmp)
-                         {
-                              # ignore sections
-                              if ($meta_tmp instanceof myMetaSection)
-                              {
-                                   $mymeta[] = $meta_tmp->id;
-                                   $mymeta_sections[] = $meta_tmp->id;
-                              }
-                              elseif (((bool) $meta_tmp->enabled)
-                                   && in_array($meta_tmp->id,$mymeta_values))
-                              {
-                                   $mymeta[] = $meta_tmp->id;
-                              }
-                         }
-                         
-                         unset($meta_tmp,$mymeta_values);
-                    }
-                    else
-                    {
-                         foreach ($_ctx->contribute->mymeta->getAll() as $k => $v)
-                         {
-                              if (((bool) $v->enabled) && in_array($k,$mymeta_values))
-                              {
-                                   $mymeta[] = $k;
-                              }
-                         }
-                         
-                         unset($mymeta_values);
-                    }
+                    foreach ($_ctx->contribute->mymeta->getAll() as $meta_tmp)
+                    {
+                         # ignore sections
+                         if ($meta_tmp instanceof myMetaSection)
+                         {
+                              $mymeta[] = $meta_tmp->id;
+                              $mymeta_sections[] = $meta_tmp->id;
+                         }
+                         elseif (((bool) $meta_tmp->enabled)
+                              && in_array($meta_tmp->id,$mymeta_values))
+                         {
+                              $mymeta[] = $meta_tmp->id;
+                         }
+                    }
+                    
+                    unset($meta_tmp,$mymeta_values);
                }
                else

plugins/contribute/inc/lib.contribute.php

@@ -87 +87 @@
           if (!is_array($mymeta_values)) {$mymeta_values = array();}
           
-          if (version_compare(DC_VERSION,'2.2-alpha1','>='))
+          foreach ($mymeta->getAll() as $meta)
           {
-               foreach ($mymeta->getAll() as $meta)
+               # section
+               if ($meta instanceof myMetaSection)
                {
-                    # section
-                    if ($meta instanceof myMetaSection)
+                    $active = in_array($meta->id,$mymeta_values);
+                    
+                    $array[] = array(
+                         'id' => $meta->id,
+                         'type' => 'section',
+                         'prompt' => $meta->prompt,
+                         'active' => $active
+                    );
+               }
+               elseif ($meta->enabled)
+               {
+                    $active = in_array($meta->id,$mymeta_values);
+                    
+                    if ($meta->getMetaTypeId() == 'list')
                     {
-                         $active = in_array($meta->id,$mymeta_values);
-                         
+                         $values = $meta->values;
+                    }
+                    else
+                    {
+                         $values = '';
+                    }
+                    
+                    if ($all || $active)
+                    {
                          $array[] = array(
                               'id' => $meta->id,
-                              'type' => 'section',
+                              'type' => $meta->getMetaTypeId(),
                               'prompt' => $meta->prompt,
+                              'default' => $meta->default,
+                              'values' => $values,
                               'active' => $active
                          );
                     }
-                    elseif ($meta->enabled)
-                    {
-                         $active = in_array($meta->id,$mymeta_values);
-                         
-                         if ($meta->getMetaTypeId() == 'list')
-                         {
-                              $values = $meta->values;
-                         }
-                         else
-                         {
-                              $values = '';
-                         }
-                         
-                         if ($all || $active)
-                         {
-                              $array[] = array(
-                                   'id' => $meta->id,
-                                   'type' => $meta->getMetaTypeId(),
-                                   'prompt' => $meta->prompt,
-                                   'default' => $meta->default,
-                                   'values' => $values,
-                                   'active' => $active
-                              );
-                         }
-                    }
                }
           }
-          else
-          {
-               foreach ($mymeta->getAll() as $k => $v)
-               {
-                    if ($v->enabled)
-                    {
-                         $active = in_array($k,$mymeta_values);
-                         if ($all || $active)
-                         {
-                              $array[] = array(
-                                   'id' => $k,
-                                   'type' => $v->type,
-                                   'prompt' => $v->prompt,
-                                   'values' => $v->values,
-                                   'active' => $active
-                              );
-                         }
-                    }
-               }
-          }
-          
+
           return(staticRecord::newFromArray($array));
      }

plugins/contribute/index.php

@@ -45 +45 @@
           
           $settings->put('contribute_help',
-               base64_encode($_POST['contribute_help']),'String','Help');
+               base64_encode($_POST['contribute_help']),'string','Help');
           $settings->put('contribute_default_post',
                $_POST['contribute_default_post'],'integer','Default post');
@@ -346 +346 @@
                          __('My Meta'));
                          echo(' ');
-                         if (version_compare(DC_VERSION,'2.2-alpha1','>='))
-                         {
-                              printf(__('It requires the %s plugin.'),__('My Meta'));
-                         }
-                         else
-                         {
-                              printf(__('It requires the %s and %s plugins.'),
-                              __('Metadata'),__('My Meta'));
-                         }
+                         printf(__('It requires the %s plugin.'),__('My Meta'));
                     ?>
                     </label>
@@ -360 +352 @@
                
                <?php
-                    if (((version_compare(DC_VERSION,'2.2-alpha1','>='))
-                         OR ($core->plugins->moduleExists('metadata')))
-                         && $core->plugins->moduleExists('mymeta'))
+                    if ($core->plugins->moduleExists('mymeta'))
                     {
                          $mymeta = new myMeta($core);