[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[32911] trunk/lib/wiki-plugins

[<lph...@us...>]

Revision: 32911
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32911&view=rev
Author:   lphuberdeau
Date:     2011-02-18 22:00:57 +0000 (Fri, 18 Feb 2011)

Log Message:
-----------
[MOD]?\194?\160Removing check duplicate parameter, making it always enabled, simplifying logic

Modified Paths:
--------------
    trunk/lib/wiki-plugins/wikiplugin_footnote.php
    trunk/lib/wiki-plugins/wikiplugin_footnotearea.php

Modified: trunk/lib/wiki-plugins/wikiplugin_footnote.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_footnote.php	2011-02-18 21:59:10 UTC (rev 32910)
+++ trunk/lib/wiki-plugins/wikiplugin_footnote.php	2011-02-18 22:00:57 UTC (rev 32911)
@@ -13,12 +13,6 @@
  *
  * {FOOTNOTE()/}
  */
-function wikiplugin_footnote_help()
-{
-	return tra('Inserts a superscripted footnote number next to text and takes in footnote as parameter')
-						. ':<br />~np~{FOOTNOTE()}insert footnote here{FOOTNOTE}~/np~' 
-						;
-}
 
 function wikiplugin_footnote_info()
 {
@@ -36,18 +30,6 @@
 				'description' => tra('Tag to existing footnote'),
 				'default' => ''
 			),
-			'checkDuplicate' => array(
-				'required' => false,
-				'name' => tra('CheckDuplicate'),
-				'description' => tra('Check for duplicate footnotes'),
-				'filter' => 'alpha',
-				'default' => '',
-				'options' => array(
-					array('text' => '', 'value' => ''), 
-					array('text' => tra('Yes'), 'value' => 'y'), 
-					array('text' => tra('No'), 'value' => 'n')
-				)
-			)
 		)
 	);
 }
@@ -56,31 +38,21 @@
 {
 	if (! isset($GLOBALS['footnoteCount'])) {
 		$GLOBALS['footnoteCount'] = 0;
+		$GLOBALS['footnotesData'] = array();
 	}
 
-	if (empty($params)) {
-		$GLOBALS['footnoteCount']++;
-		$footnoteCount = $GLOBALS['footnoteCount'];
-		$GLOBALS['footnotesData'][] = trim($data);
-	} else {
-		extract($params, EXTR_SKIP);
-		if (!empty($sameas)) {
-			$footnoteCount = $sameas;
-		} else {
-			if (ucfirst($checkDuplicate) == 'Y') {
-				foreach($GLOBALS["footnotesData"] as $key => $value) {
-					if ( strcmp(trim($data), $value) == 0 ) {
-						$footnoteCount = $key + 1;
-						break;
-					}
-				}
-			}
-		}   // else for if (!empty($sameas
-	}    // else for if (empty($params
+	if (! empty($data)) {
+		$data = trim($data);
+		if (! isset($GLOBALS['footnotesData'][$data])) {
+			$GLOBALS['footnotesData'][$data] = ++$GLOBALS['footnoteCount'];
+		}
 
-	$html = '{SUP()}'
-				. "<a id=\"ref_footnote$footnoteCount\" href=\"#footnote$footnoteCount\">$footnoteCount</a>"
-				.	'{SUP}';
+		$number = $GLOBALS['footnotesData'][$data];
+	} elseif (isset($params['sameas'])) {
+		$number = $params['sameas'];
+	}
 
+	$html = '{SUP()}~np~' . "<a id=\"ref_footnote$number\" href=\"#footnote$number\">$number</a>" . '~/np~{SUP}';
+
 	return $html;
 }

Modified: trunk/lib/wiki-plugins/wikiplugin_footnotearea.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_footnotearea.php	2011-02-18 21:59:10 UTC (rev 32910)
+++ trunk/lib/wiki-plugins/wikiplugin_footnotearea.php	2011-02-18 22:00:57 UTC (rev 32911)
@@ -24,6 +24,7 @@
 		'description' => tra('Create automatically numbered footnotes (together with PluginFootnote)'),
 		'prefs' => array('wikiplugin_footnotearea'),
 		'icon' => 'pics/icons/text_horizontalrule.png',
+		'format' => 'html',
 		'params' => array(),
 	);
 }
@@ -33,11 +34,10 @@
 	$html = '<div class="footnotearea">';
 	$html .= '<hr />';
 
-	foreach($GLOBALS["footnotesData"] as $key => $value){
-		$noteId = $key + 1;
-		$html .= '<div class="onefootnote" id="footnote' . $noteId . '">';
-		$html .= '<a href="#ref_footnote' . $noteId . '">'. $noteId . '.</a> ';
-		$html .= $value;
+	foreach($GLOBALS["footnotesData"] as $data => $number){
+		$html .= '<div class="onefootnote" id="footnote' . $number . '">';
+		$html .= '<a href="#ref_footnote' . $number . '">'. $number . '.</a> ';
+		$html .= '~/np~' . $data . '~np~';
 		$html .= '</div>';
 	}
 	$html .= '</div>';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.