Index: ckeditor.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ckeditor/ckeditor.install,v
retrieving revision 1.2.2.9
diff -u -r1.2.2.9 ckeditor.install
--- ckeditor.install	18 Jun 2010 11:29:33 -0000	1.2.2.9
+++ ckeditor.install	9 Sep 2010 14:35:37 -0000
@@ -451,6 +451,25 @@
 }
 
 /**
+ *	Implementation of hook_update_N().
+ *
+ *	Delete all plus signs from profiles name
+ */
+ 
+function ckeditor_update_6100(){
+	
+	$ret = array();
+	
+	$ret[] = update_sql( "UPDATE {ckeditor_role} SET name = REPLACE(name,'+','')");
+	$ret[] = update_sql( "UPDATE {ckeditor_role} SET name = REPLACE(name,'/','')");
+	$ret[] = update_sql( "UPDATE {ckeditor_settings} SET name = REPLACE(name,'+','')");
+	$ret[] = update_sql( "UPDATE {ckeditor_settings} SET name = REPLACE(name,'/','')");
+	
+	return $ret;
+	
+}
+
+/**
  * Implementation of hook_uninstall().
  */
 function ckeditor_uninstall() {
Index: includes/ckeditor.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ckeditor/includes/ckeditor.admin.inc,v
retrieving revision 1.2.2.18
diff -u -r1.2.2.18 ckeditor.admin.inc
--- includes/ckeditor.admin.inc	18 Jun 2010 11:05:24 -0000	1.2.2.18
+++ includes/ckeditor.admin.inc	9 Sep 2010 09:49:04 -0000
@@ -193,6 +193,7 @@
   }
 
   if (empty($profile->name)) {
+  
     $result = db_query("SELECT DISTINCT(rid) FROM {ckeditor_role}");
     while (($data = db_fetch_object($result))) {
       if ((empty($profile->rids) || !in_array($data->rid, array_keys((array) $profile->rids))) && !form_get_errors()) {
@@ -907,6 +908,9 @@
   if (!$edit['name']) {
     form_set_error('name', t('You must give a profile name.'));
   }
+  elseif (!preg_match('/^[A-Za-z0-9_]+$/', $edit['name'])) {
+	form_set_error('name', t('Enter valid profile name. Only alphanumeric and underscore characters are allowed.'));
+  }
   elseif ($edit['name'] == 'CKEditor Global Profile') {
     form_set_error('name', t('This profile name is reserved. Please choose a different name.'));
   }