From 8cfc0d3671c43d268d0429b2f937633bfe5994c9 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Wed, 7 Jan 2015 12:21:28 +0200
Subject: [PATCH] fixed editor filter on html and set selected editor to none
 or codemirror, also fixed comment

---
 mod_pergroup.php |  2 +-
 mod_pergroup.xml | 72 ++++++++++++++++++++++++------------------------
 pergroup.php     |  2 +-
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/mod_pergroup.php b/mod_pergroup.php
index ac3e4f7..36ef38a 100644
--- a/mod_pergroup.php
+++ b/mod_pergroup.php
@@ -10,7 +10,7 @@
 **/
 defined( '_JEXEC' ) or die;
 
-// Include the syndicate functions only once
+// Include the functions only once
 require_once __DIR__ . '/pergroup.php';
 
 // load the module class
diff --git a/mod_pergroup.xml b/mod_pergroup.xml
index 3c20491..a582c0f 100644
--- a/mod_pergroup.xml
+++ b/mod_pergroup.xml
@@ -50,13 +50,13 @@
   					<option value="1">MOD_PERGROUP_YES</option>
 				</field>
 				<field type="spacer" name="myspacer_0" label="MOD_PERGROUP_HTML_INPUT" />
-				<field name="group0-notice" label="" type="editor" width="95%" height="300" filter="safehtml"/>
+				<field name="group0-notice" label="" type="editor" width="95%" height="300" filter="raw"/>
 				<field type="spacer" name="spasor_0" label="MOD_PERGROUP_CSS_INPUT" />
-				<field name="group0-css" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group0-css" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacer_0" label="MOD_PERGROUP_JAVASCRIPT_INPUT" />
-				<field name="group0-js" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group0-js" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacur_0" label="MOD_PERGROUP_PHP_INPUT"/>
-				<field name="group0-php" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group0-php" label="" type="editor" width="95%" height="200" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="line0" hr="true" />
 				
 				<field 	name="group1" type="usergroup" multiple="true"
@@ -78,13 +78,13 @@
   					<option value="1">MOD_PERGROUP_YES</option>
 				</field>	
 				<field type="spacer" name="myspacer_1" label="MOD_PERGROUP_HTML_INPUT" />	
-				<field name="group1-notice" label="" type="editor" width="95%" height="300" filter="safehtml" />
+				<field name="group1-notice" label="" type="editor" width="95%" height="300" filter="raw" />
 				<field type="spacer" name="spasor_1" label="MOD_PERGROUP_CSS_INPUT" />
-				<field name="group1-css" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group1-css" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror"/>
 				<field type="spacer" name="spacer_1" label="MOD_PERGROUP_JAVASCRIPT_INPUT" />
-				<field name="group1-js" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group1-js" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror"/>
 				<field type="spacer" name="spacur_1" label="MOD_PERGROUP_PHP_INPUT"/>
-				<field name="group1-php" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group1-php" label="" type="editor" width="95%" height="200" filter="raw" editor="none|codemirror"/>
 				<field type="spacer" name="line1" hr="true" />
 				
 				<field 	name="group2" type="usergroup" multiple="true"
@@ -106,13 +106,13 @@
   					<option value="1">MOD_PERGROUP_YES</option>
 				</field>
 				<field type="spacer" name="myspacer_2" label="MOD_PERGROUP_HTML_INPUT" />
-				<field name="group2-notice" label="" type="editor" width="95%" height="300" filter="safehtml" />
+				<field name="group2-notice" label="" type="editor" width="95%" height="300" filter="raw" />
 				<field type="spacer" name="spasor_2" label="MOD_PERGROUP_CSS_INPUT" />
-				<field name="group2-css" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group2-css" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacer_2" label="MOD_PERGROUP_JAVASCRIPT_INPUT" />
-				<field name="group2-js" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group2-js" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacur_2" label="MOD_PERGROUP_PHP_INPUT"/>
-				<field name="group2-php" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group2-php" label="" type="editor" width="95%" height="200" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="line2" hr="true" />
 				
 				<field 	name="group3" type="usergroup" multiple="true"
@@ -134,13 +134,13 @@
   					<option value="1">MOD_PERGROUP_YES</option>
 				</field>
 				<field type="spacer" name="myspacer_3" label="MOD_PERGROUP_HTML_INPUT" />
-				<field name="group3-notice" label="" type="editor" width="95%" height="300" filter="safehtml" />
+				<field name="group3-notice" label="" type="editor" width="95%" height="300" filter="raw" />
 				<field type="spacer" name="spasor_3" label="MOD_PERGROUP_CSS_INPUT" />
-				<field name="group3-css" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group3-css" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacer_3" label="MOD_PERGROUP_JAVASCRIPT_INPUT" />
-				<field name="group3-js" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group3-js" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacur_3" label="MOD_PERGROUP_PHP_INPUT"/>
-				<field name="group3-php" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group3-php" label="" type="editor" width="95%" height="200" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="line3" hr="true" />
 				
 				<field 	name="group4" type="usergroup" multiple="true"
@@ -162,13 +162,13 @@
   					<option value="1">MOD_PERGROUP_YES</option>
 				</field>
 				<field type="spacer" name="myspacer_4" label="MOD_PERGROUP_HTML_INPUT" />
-				<field name="group4-notice" label="" type="editor" width="95%" height="300" filter="safehtml" />
+				<field name="group4-notice" label="" type="editor" width="95%" height="300" filter="raw" />
 				<field type="spacer" name="spasor_4" label="MOD_PERGROUP_CSS_INPUT" />
-				<field name="group4-css" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group4-css" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacer_4" label="MOD_PERGROUP_JAVASCRIPT_INPUT" />
-				<field name="group4-js" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group4-js" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacur_4" label="MOD_PERGROUP_PHP_INPUT"/>
-				<field name="group4-php" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group4-php" label="" type="editor" width="95%" height="200" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="line4" hr="true" />
 				
 				<field 	name="group5" type="usergroup" multiple="true"
@@ -190,13 +190,13 @@
   					<option value="1">MOD_PERGROUP_YES</option>
 				</field>
 				<field type="spacer" name="myspacer_5" label="MOD_PERGROUP_HTML_INPUT" />
-				<field name="group5-notice" label="" type="editor" width="95%" height="300" filter="safehtml" />
+				<field name="group5-notice" label="" type="editor" width="95%" height="300" filter="raw" />
 				<field type="spacer" name="spasor_5" label="MOD_PERGROUP_CSS_INPUT" />
-				<field name="group5-css" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group5-css" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacer_5" label="MOD_PERGROUP_JAVASCRIPT_INPUT" />
-				<field name="group5-js" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group5-js" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacur_5" label="MOD_PERGROUP_PHP_INPUT"/>
-				<field name="group5-php" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group5-php" label="" type="editor" width="95%" height="200" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="line5" hr="true" />
 				
 				<field 	name="group6" type="usergroup" multiple="true"
@@ -218,13 +218,13 @@
   					<option value="1">MOD_PERGROUP_YES</option>
 				</field>
 				<field type="spacer" name="myspacer_6" label="MOD_PERGROUP_HTML_INPUT" />
-				<field name="group6-notice" label="" type="editor" width="95%" height="300" filter="safehtml" />
+				<field name="group6-notice" label="" type="editor" width="95%" height="300" filter="raw" />
 				<field type="spacer" name="spasor_6" label="MOD_PERGROUP_CSS_INPUT" />
-				<field name="group6-css" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group6-css" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacer_6" label="MOD_PERGROUP_JAVASCRIPT_INPUT" />
-				<field name="group6-js" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group6-js" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacur_6" label="MOD_PERGROUP_PHP_INPUT"/>
-				<field name="group6-php" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group6-php" label="" type="editor" width="95%" height="200" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="line6" hr="true" />
 				
 				<field 	name="group7" type="usergroup" multiple="true"
@@ -246,13 +246,13 @@
   					<option value="1">MOD_PERGROUP_YES</option>
 				</field>
 				<field type="spacer" name="myspacer_7" label="MOD_PERGROUP_HTML_INPUT" />
-				<field name="group7-notice" label="" type="editor" width="95%" height="300" filter="safehtml" />
+				<field name="group7-notice" label="" type="editor" width="95%" height="300" filter="raw" />
 				<field type="spacer" name="spasor_7" label="MOD_PERGROUP_CSS_INPUT" />
-				<field name="group7-css" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group7-css" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacer_7" label="MOD_PERGROUP_JAVASCRIPT_INPUT" />
-				<field name="group7-js" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group7-js" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacur_7" label="MOD_PERGROUP_PHP_INPUT"/>
-				<field name="group7-php" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group7-php" label="" type="editor" width="95%" height="200" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="line7" hr="true" />
 				
 				<field 	name="group8" type="usergroup" multiple="true"
@@ -274,13 +274,13 @@
   					<option value="1">MOD_PERGROUP_YES</option>
 				</field>
 				<field type="spacer" name="myspacer_8" label="MOD_PERGROUP_HTML_INPUT" />
-				<field name="group8-notice" label="" type="editor" width="95%" height="300" filter="safehtml" />
+				<field name="group8-notice" label="" type="editor" width="95%" height="300" filter="raw" />
 				<field type="spacer" name="spasor_8" label="MOD_PERGROUP_CSS_INPUT" />
-				<field name="group8-css" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group8-css" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacer_8" label="MOD_PERGROUP_JAVASCRIPT_INPUT" />
-				<field name="group8-js" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group8-js" label="" type="editor" width="95%" height="100" filter="raw" editor="none|codemirror" />
 				<field type="spacer" name="spacur_8" label="MOD_PERGROUP_PHP_INPUT"/>
-				<field name="group8-php" label="" type="editor" width="95%" height="100" filter="raw" />
+				<field name="group8-php" label="" type="editor" width="95%" height="200" filter="raw" editor="none|codemirror" />
 				
 			</fieldset>
 			<fieldset
diff --git a/pergroup.php b/pergroup.php
index 23a2bfc..5b2eacb 100644
--- a/pergroup.php
+++ b/pergroup.php
@@ -165,7 +165,7 @@ class perGroup
 			$group_js 		= $this->params->get('group'.$id.'-js');
 			if ($group_js){
 				if (!$this->jQuery_set){
-					$this->document->addScript(JURI::base().'modules/mod_perGroup/js/jquery.js');
+					$this->document->addScript(JURI::base().'modules/mod_pergroup/js/jquery.js');
 					$this->jQuery_set = true;
 				}
 				$script = ''.$group_js.'';