*** /tmp/fckeditor/fckeditor.admin.inc	2008-09-23 06:21:21.000000000 +1000
--- fckeditor/fckeditor.admin.inc	2008-10-08 12:27:20.000000000 +1100
***************
*** 149,160 ****
    $edit =& $form_state['values'];
    drupal_set_message(t('Your FCKeditor profile has been created.'));
    $settings = fckeditor_admin_values_to_settings($edit);
!   db_query('INSERT INTO {fckeditor_settings} (name, settings) VALUES ("%s", "%s")', $edit['name'], $settings);
    fckeditor_rebuild_selectors($edit['name']);
    if (!empty($edit['rids'])) {
      foreach (array_keys($edit['rids']) as $rid) {
        if ($edit['rids'][$rid]!=0) {
!         db_query('INSERT INTO {fckeditor_role} (name, rid) VALUES ("%s", %d)', $edit['name'], $rid);
        }
      }
    }
--- 149,160 ----
    $edit =& $form_state['values'];
    drupal_set_message(t('Your FCKeditor profile has been created.'));
    $settings = fckeditor_admin_values_to_settings($edit);
!   db_query("INSERT INTO {fckeditor_settings} (name, settings) VALUES ('%s', '%s')", $edit['name'], $settings);
    fckeditor_rebuild_selectors($edit['name']);
    if (!empty($edit['rids'])) {
      foreach (array_keys($edit['rids']) as $rid) {
        if ($edit['rids'][$rid]!=0) {
!         db_query("INSERT INTO {fckeditor_role} (name, rid) VALUES ('%s', %d)", $edit['name'], $rid);
        }
      }
    }
***************
*** 191,197 ****
    }
  
    if (empty($profile->name)) {
!     $result = db_query('SELECT DISTINCT(rid) FROM {fckeditor_role}');
      while (($data = db_fetch_object($result))) {
        if ((empty($profile->rids) || !in_array($data->rid, array_keys((array) $profile->rids))) && !form_get_errors()) {
          unset($roles[$data->rid]);
--- 191,197 ----
    }
  
    if (empty($profile->name)) {
!     $result = db_query("SELECT DISTINCT(rid) FROM {fckeditor_role}");
      while (($data = db_fetch_object($result))) {
        if ((empty($profile->rids) || !in_array($data->rid, array_keys((array) $profile->rids))) && !form_get_errors()) {
          unset($roles[$data->rid]);
***************
*** 729,736 ****
    $edit =& $form_state['values'];
  
    if (isset($edit['_profile'])) {
!     db_query('DELETE FROM {fckeditor_settings} WHERE name = "%s"', $edit['_profile']->name);
!     db_query('DELETE FROM {fckeditor_role} WHERE name = "%s"', $edit['_profile']->name);
      drupal_set_message(t('Your FCKeditor profile has been updated.'));
    }
    else {
--- 729,736 ----
    $edit =& $form_state['values'];
  
    if (isset($edit['_profile'])) {
!     db_query("DELETE FROM {fckeditor_settings} WHERE name = '%s'", $edit['_profile']->name);
!     db_query("DELETE FROM {fckeditor_role} WHERE name = '%s'", $edit['_profile']->name);
      drupal_set_message(t('Your FCKeditor profile has been updated.'));
    }
    else {
***************
*** 738,749 ****
    }
  
    $settings = fckeditor_admin_values_to_settings($edit);
!   db_query('INSERT INTO {fckeditor_settings} (name, settings) VALUES ("%s", "%s")', $edit['name'], $settings);
    fckeditor_rebuild_selectors($edit['name']);
    if (!empty($edit['rids'])) {
      foreach (array_keys($edit['rids']) as $rid) {
        if ($edit['rids'][$rid]!=0) {
!         db_query('INSERT INTO {fckeditor_role} (name, rid) VALUES ("%s", %d)', $edit['name'], $rid);
        }
      }
    }
--- 738,749 ----
    }
  
    $settings = fckeditor_admin_values_to_settings($edit);
!   db_query("INSERT INTO {fckeditor_settings} (name, settings) VALUES ('%s', '%s')", $edit['name'], $settings);
    fckeditor_rebuild_selectors($edit['name']);
    if (!empty($edit['rids'])) {
      foreach (array_keys($edit['rids']) as $rid) {
        if ($edit['rids'][$rid]!=0) {
!         db_query("INSERT INTO {fckeditor_role} (name, rid) VALUES ('%s', %d)", $edit['name'], $rid);
        }
      }
    }
***************
*** 917,924 ****
    }
  
    if (isset($edit['_profile'])) {
!     db_query('DELETE FROM {fckeditor_settings} WHERE name = "%s"', $edit['_profile']->name);
!     db_query('DELETE FROM {fckeditor_role} WHERE name = "%s"', $edit['_profile']->name);
    }
  
    //strip whitespaces
--- 917,924 ----
    }
  
    if (isset($edit['_profile'])) {
!     db_query("DELETE FROM {fckeditor_settings} WHERE name = '%s'", $edit['_profile']->name);
!     db_query("DELETE FROM {fckeditor_role} WHERE name = '%s'", $edit['_profile']->name);
    }
  
    //strip whitespaces
***************
*** 937,943 ****
    $edit['fckeditor_local_path'] = trim(rtrim($edit['fckeditor_local_path'], "/"));
  
    $settings = fckeditor_admin_values_to_settings($edit);
!   db_query('INSERT INTO {fckeditor_settings} (name, settings) VALUES ("%s", "%s")', $edit['name'], $settings);
    fckeditor_rebuild_selectors($edit['name']);
  
    drupal_set_message(t('FCKeditor global profile has been saved.'));
--- 937,943 ----
    $edit['fckeditor_local_path'] = trim(rtrim($edit['fckeditor_local_path'], "/"));
  
    $settings = fckeditor_admin_values_to_settings($edit);
!   db_query("INSERT INTO {fckeditor_settings} (name, settings) VALUES ('%s', '%s')", $edit['name'], $settings);
    fckeditor_rebuild_selectors($edit['name']);
  
    drupal_set_message(t('FCKeditor global profile has been saved.'));
***************
*** 1017,1026 ****
   */
  function fckeditor_rebuild_selectors($name = NULL) {
    if ($name == NULL) {
!     $result = db_query('SELECT * FROM {fckeditor_settings}');
    }
    else {
!     $result = db_query('SELECT * FROM {fckeditor_settings} WHERE name = "%s"', $name);
    }
  
    while (($data = db_fetch_object($result))) {
--- 1017,1026 ----
   */
  function fckeditor_rebuild_selectors($name = NULL) {
    if ($name == NULL) {
!     $result = db_query("SELECT * FROM {fckeditor_settings}");
    }
    else {
!     $result = db_query("SELECT * FROM {fckeditor_settings} WHERE name = '%s'", $name);
    }
  
    while (($data = db_fetch_object($result))) {
***************
*** 1119,1124 ****
   * Remove a profile from the database.
   */
  function fckeditor_profile_delete($name) {
!   db_query('DELETE FROM {fckeditor_settings} WHERE name = "%s"', $name);
!   db_query('DELETE FROM {fckeditor_role} WHERE name = "%s"', $name);
  }
--- 1119,1124 ----
   * Remove a profile from the database.
   */
  function fckeditor_profile_delete($name) {
!   db_query("DELETE FROM {fckeditor_settings} WHERE name = '%s'", $name);
!   db_query("DELETE FROM {fckeditor_role} WHERE name = '%s'", $name);
  }