Changeset 584

Timestamp:

12/08/08 19:12:59 (14 years ago)

Author:

vincent

google:author:

forxer

Message:

• permission
• validation XHTML

Location:

plugins/acronyms/trunk

Files:

• _admin.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• icon.png (modified) (previous)
• index.php (modified) (4 diffs)
• locales/fr/main.po (modified) (1 diff)

plugins/acronyms/trunk/_admin.php

@@ -16 +16 @@
 $_menu['Blog']->addItem(__('Acronyms Manager'),'plugin.php?p=acronyms','index.php?pf=acronyms/icon.png',
           preg_match('/plugin.php\?p=acronyms(&.*)?$/',$_SERVER['REQUEST_URI']),
-          $core->auth->check('usage,contentadmin',$core->blog->id));
+          $core->auth->check('acronyms',$core->blog->id));
+
+$core->auth->setPermissionType('acronyms',__('manage acronyms'));
 
 $core->addBehavior('coreInitWikiPost',array('acronymsBehaviors','coreInitWikiPost'));
@@ -29 +31 @@
 
           $core->wiki2xhtml->setOpt('acronyms_file',$acronyms->file);
-          $core->wiki2xhtml->acro_table = $core->wiki2xhtml->__getAcronyms();
+          $core->wiki2xhtml->acro_table = $acronyms->getList();
      }
 }

plugins/acronyms/trunk/_define.php

@@ -16 +16 @@
      /* Description*/         "Add, remove and modify acronyms for the wiki syntax.",
      /* Author */             "Vincent Garnier",
-     /* Version */            '0.1',
-     /* Permissions */        'usage,contentadmin'
+     /* Version */            '0.2',
+     /* Permissions */        'acronyms'
 );
-?>

plugins/acronyms/trunk/index.php

@@ -19 +19 @@
 
 # modfication de la liste des acronymes
-if (isset($_POST['p_edit']))
+if (!empty($_POST['p_edit']))
 {
-     $post_array = array_map('trim', $_POST);
+     $p_acronyms = !empty($_POST['p_acronyms']) && is_array($_POST['p_acronyms']) ? array_map('trim', $_POST['p_acronyms']) : array();
 
      $acronyms_list = array();
-     foreach ($post_array as $nk=>$nv)
+     foreach ($p_acronyms as $nk=>$nv)
      {
-          $prefix = substr($nk, 0, 8);
-          if (($prefix == 'acronym_') && ($nv != '')) {
-               $acronyms_list[substr($nk, 8)] = $nv;
+          if ($nv != '') {
+               $acronyms_list[$nk] = $nv;
+          }
+          else {
+               unset($acronyms_list[$nk]);
           }
      }
@@ -44 +46 @@
           $a_acro = !empty($_POST['a_acro']) ? trim($_POST['a_acro']) : '';
           $a_title = !empty($_POST['a_title']) ? trim($_POST['a_title']) : '';
-     
+
           if ($a_acro == '') {
                throw new Exception(__('You must give an acronym'));
           }
-     
+
           if ($a_title == '') {
                throw new Exception(__('You must give a title'));
           }
-     
+
           if (isset($acronyms_list[$a_acro])) {
                throw new Exception(__('This acronym already exists'));
           }
-          
+
           $acronyms_list[$a_acro] = $a_title;
           ksort($acronyms_list);
-     
+
           $acronyms->writeFile($acronyms_list);
           http::redirect($p_url.'&added=1');
@@ -97 +99 @@
           <p class="acroleft"><label for="a_acro"><?php echo __('Acronym'); ?></label>
           <?php echo form::field('a_acro',10,'',$a_acro,'',''); ?></p>
-     
+
           <p class="acroright"><label for="a_title"><?php echo __('Title'); ?></label>
           <?php echo form::field('a_title',60,'',$a_title,'',''); ?></p>
@@ -113 +115 @@
           <div id="listacro">
           <?php
+          $i = 1;
           foreach ($acronyms_list as $k=>$v)
           {
                echo
                '<p class="field">'."\n".
-               '<label for="acronym_'.$k.'"><acronym title="'.$v.'">'.html::escapeHTML($k).'</acronym></label>'."\n".
-               form::field('acronym_'.$k,60,'',html::escapeHTML($v))."\n".
+               '<label for="acronym_'.$i.'"><acronym title="'.$v.'">'.html::escapeHTML($k).'</acronym></label>'."\n".
+               form::field(array('p_acronyms['.$k.']','acronym_'.$i),60,'',html::escapeHTML($v))."\n".
                '</p>'."\n\n";
+
+               ++$i;
           }
           ?>
+          </div><!-- #listacro -->
           </fieldset>
           <p class="clear"><?php echo form::hidden('p_edit', '1');

plugins/acronyms/trunk/locales/fr/main.po

@@ -4 +4 @@
 msgid "Add, remove and modify acronyms for the wiki syntax."
 msgstr "Ajouter, supprimer et modifier les acromymes pour la syntaxe wiki."
+
+msgid "manage acronyms"
+msgstr "gérer les acronymes"
 
 msgid "Add an acronym"