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

[<xa...@us...>]

Revision: 30725
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=30725&view=rev
Author:   xavidp
Date:     2010-11-16 14:59:09 +0000 (Tue, 16 Nov 2010)

Log Message:
-----------
[FIX]Pref for plugin r is added (besides rr) so that it can be enabled/disabled again by tiki admin panels. A few strings updated to reflect current behavior, and wikisyntax hidden at advanced section (hidden by default). Doc page will be the same for both plugins

Modified Paths:
--------------
    mods/trunk/wiki-plugins/r/lib/wiki-plugins/wikiplugin_r.php
    mods/trunk/wiki-plugins/r/lib/wiki-plugins/wikiplugin_rr.php

Modified: mods/trunk/wiki-plugins/r/lib/wiki-plugins/wikiplugin_r.php
===================================================================
--- mods/trunk/wiki-plugins/r/lib/wiki-plugins/wikiplugin_r.php	2010-11-16 14:27:32 UTC (rev 30724)
+++ mods/trunk/wiki-plugins/r/lib/wiki-plugins/wikiplugin_r.php	2010-11-16 14:59:09 UTC (rev 30725)
@@ -24,8 +24,9 @@
 
 /**
  * This plugin is just an alias to wikiplugin_rr.php. The only difference
- * is that while wikiplugin_rr.php accepts unsecure R commands this one
- * only accepts secure R commands. For a list of accepted commands see 
+ * is that while wikiplugin_rr.php accepts unsecure R commands (once validated
+ * the plugin call by a tiki admin), this one only accepts secure R commands,
+ * without the need of any validation. For a list of accepted commands see 
  * checkCommands() on wikiplugin_rr.php
  * 
  * Probably the same functionality could be achieved using Plugin Alias feature
@@ -35,6 +36,7 @@
 	$info = array(
 		'name' => tra('R syntax'),
 		'documentation' => 'PluginR',
+		'prefs' => array( 'wikiplugin_r' ),
 		'description' => tra('Parses R syntax and shows the output either from the code introduced between the plugin tags or from the file attached to a tracker item sent through PluginTracker. It can also be combined with Pretty Trackers to edit params from the script through web forms.'),
 	);
 

Modified: mods/trunk/wiki-plugins/r/lib/wiki-plugins/wikiplugin_rr.php
===================================================================
--- mods/trunk/wiki-plugins/r/lib/wiki-plugins/wikiplugin_rr.php	2010-11-16 14:27:32 UTC (rev 30724)
+++ mods/trunk/wiki-plugins/r/lib/wiki-plugins/wikiplugin_rr.php	2010-11-16 14:59:09 UTC (rev 30725)
@@ -7,25 +7,19 @@
 //	
 // $Id: wikiplugin_r.php 29338 2010-09-17 11:35:11Z xavidp $
 /* 
-
 From the R Plugin for Mediawiki
-
 (C) 2006- Sigbert Klinke (si...@wi...), Markus Cozowicz, Michael Cassin
-
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA 
-
 */
 
 function wikiplugin_rr_info() {
 	return array(
 		'name' => tra('R syntax'),
-		'documentation' => 'PluginRR',
-		'description' => tra('Parses R syntax and shows the output either from the code introduced between the plugin tags or from the file attached to a tracker item sent through PluginTracker. It can also be combined with Pretty Trackers to edit params from the script through web forms.'),
-		'prefs' => array( 'wikiplugin_r' ),
+		'documentation' => 'PluginR',
+		'description' => tra('Same as PluginR, but allowing the execution of potentially dangerous commands once the admin has validated the plugin call.'),
+		'prefs' => array( 'wikiplugin_rr' ),
 		'validate' => 'all',
 		'params' => array(
 			'attId' => array(
@@ -50,6 +44,7 @@
 				'name' => tra('wikisyntax'),
 				'description' => tra('Choose whether the output should be parsed as wiki syntax (Optional). Options: 0 (no parsing, default), 1 (parsing)'),
 				'filter' => 'int',
+				'advanced' => true,
 			),
 			'width' => array(
 				'required' => false,


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