glom r1817 - in trunk: . glom/mode_design/users

[murrayc svn gnome org]

Author: murrayc
Date: Fri Dec 19 14:10:07 2008
New Revision: 1817
URL: http://svn.gnome.org/viewvc/glom?rev=1817&view=rev

Log:
2008-12-19  Murray Cumming  <murrayc murrayc com>

* glom/mode_design/users/dialog_groups_list.cc
on_button_group_delete():
* glom/mode_design/users/dialog_users_list.cc
on_button_user_delete(), on_button_user_add(),
on_button_user_new(), on_button_user_edit(): 
Add missing quotes around user and group names in SQL queries.


Modified:
   trunk/ChangeLog
   trunk/glom/mode_design/users/dialog_groups_list.cc
   trunk/glom/mode_design/users/dialog_users_list.cc

Modified: trunk/glom/mode_design/users/dialog_groups_list.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_groups_list.cc	(original)
+++ trunk/glom/mode_design/users/dialog_groups_list.cc	Fri Dec 19 14:10:07 2008
@@ -205,8 +205,8 @@
     {
       Gtk::TreeModel::Row row = *iter;
 
-      const Glib::ustring user = row[m_model_columns_groups.m_col_name];
-      if(!user.empty())
+      const Glib::ustring group = row[m_model_columns_groups.m_col_name];
+      if(!group.empty())
       {
         //TODO: Prevent deletion of standard groups
         Gtk::MessageDialog dialog(Bakery::App_Gtk::util_bold_message(_("Delete Group")), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL);
@@ -218,7 +218,7 @@
 
         if(response == Gtk::RESPONSE_OK)
         {
-          Glib::ustring strQuery = "DROP GROUP " + user;
+          Glib::ustring strQuery = "DROP GROUP \"" + group + "\"";
           const bool test = query_execute(strQuery, this);
           if(!test)
             std::cerr << "Box_DB_Table_Definition::on_adddel_delete(): DROP GROUP failed." << std::endl;

Modified: trunk/glom/mode_design/users/dialog_users_list.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_users_list.cc	(original)
+++ trunk/glom/mode_design/users/dialog_users_list.cc	Fri Dec 19 14:10:07 2008
@@ -168,7 +168,7 @@
 
           if(response == Gtk::RESPONSE_OK)
           {
-            const Glib::ustring strQuery = "DROP USER " + user;
+            const Glib::ustring strQuery = "DROP USER \"" + user + "\"";
             const bool test = query_execute(strQuery, this);
             if(!test)
               std::cerr << "Dialog_UsersList::on_button_user_delete(): DROP USER failed" << std::endl;
@@ -214,7 +214,7 @@
   if(!user.empty())
   {
     //Add it to the group:
-    const Glib::ustring strQuery = "ALTER GROUP \"" + m_combo_group->get_active_text() + "\" ADD USER " + user;
+    const Glib::ustring strQuery = "ALTER GROUP \"" + m_combo_group->get_active_text() + "\" ADD USER \"" + user + "\"";
     const bool test = query_execute(strQuery, this);
     if(!test)
       std::cerr << "Dialog_UsersList::on_button_user_add(): ALTER GROUP failed." << std::endl;
@@ -280,7 +280,7 @@
   if(!user.empty() && !password.empty())
   {
     //Create the user:
-    Glib::ustring strQuery = "CREATE USER \"" + user + "\" PASSWORD '" + password + "'" ;
+    Glib::ustring strQuery = "CREATE USER \"" + user + "\" PASSWORD '" + password + "'" ; //TODO: Escape the password.
     bool test = query_execute(strQuery, this);
     if(!test)
        std::cerr << "Dialog_UsersList::on_button_user_new(): CREATE USER failed." << std::endl;
@@ -364,7 +364,7 @@
 
       if(!user.empty() && !password.empty())
       {
-        const Glib::ustring strQuery = "ALTER USER \"" + user + "\" PASSWORD '" + password + "'" ;
+        const Glib::ustring strQuery = "ALTER USER \"" + user + "\" PASSWORD '" + password + "'" ; //TODO: Escape the password.
         const bool test = query_execute(strQuery, this);
         if(!test)
           std::cerr << "Dialog_UsersList::on_button_user_edit(): ALTER USER failed." << std::endl;