Changeset 1914

Timestamp:

01/05/10 08:37:12 (14 years ago)

Author:

amuller

Message:

Ticket #670 - Implementação de pref. obrig. por grupo

Location:

sandbox/expresso2.2

Files:

• phpgwapi/inc/class.preferences.inc.php (modified) (6 diffs)
• preferences/inc/class.uiconfig.inc.php (added)
• preferences/js/config.js (added)
• preferences/js/connector.js (added)
• preferences/preferences.php (modified) (3 diffs)
• preferences/templates/default/preferences.tpl (modified) (1 diff)

sandbox/expresso2.2/phpgwapi/inc/class.preferences.inc.php

@@ -222 +222 @@
                                 $this->session = array();
                         }
+                        $groups = $GLOBALS['phpgw']->accounts->membership();
+                        foreach($groups as $group)
+                                $gids .= ",".$group['account_id'];
+                        $account_id = (int)$this->account_id;
+
                         $this->db->query("SELECT * FROM phpgw_preferences"
-                                . " WHERE preference_owner IN (-1,-2," . (int)$this->account_id . ')',__LINE__,__FILE__);
+                                . " WHERE preference_owner IN (-1,-2," . $account_id . $gids . ')',__LINE__,__FILE__);
 
                         $this->forced = $this->default = $this->user = array();
@@ -244 +249 @@
                                                 $this->default[$app] = $value;
                                                 break;
-                                        default:        // user
+                                        case $account_id: //user
                                                 $this->user[$app] = $value;
+                                                break;
+                                        default: // group
+                                                $this->group[$app] = $value;
                                                 break;
                                 }
@@ -273 +281 @@
                                 }
                         }
+                        // now set/force forced values for groups
+                        //
+                        foreach($this->group as $app => $values)
+                        {
+                                foreach($values as $var => $value)
+                                {
+                                        $this->data[$app][$var] = $value;
+                                }
+                        }
+
                         // now set/force forced values
                         //
@@ -532 +550 @@
                 @note the user prefs for saveing are in $this->user not in $this->data, which are the effectiv prefs only
                 */
-                function save_repository($update_session_info = False,$type='user')
+                function save_repository($update_session_info = False,$type='user',$account_id = null)
                 {
                         switch($type)
                         {
                                 case 'forced':
-                                        $account_id = -1;
+                                        if ($account_id == null)
+                                                $account_id = -1;
                                         $prefs = &$this->forced;
                                         break;
@@ -554 +573 @@
                         {
                                 $this->db->transaction_begin();
-                                //$this->db->query("DELETE FROM phpgw_preferences WHERE preference_owner='$account_id'",
-                                $this->db->query("DELETE FROM phpgw_preferences WHERE preference_owner='$account_id' and preference_app <> 'jabberit_messenger'",
-                                        __LINE__,__FILE__
-                                );
-
                                 foreach($prefs as $app => $value)
                                 {
@@ -566 +580 @@
                                         }
                                         $this->quote($value);
-                                        $value = $this->db->db_addslashes(serialize($value));   // this addslashes is for the database
+                                        $value = $this->db->db_addslashes(serialize($value));    // this addslashes is for the database
                                         $app = $this->db->db_addslashes($app);
 
-                                        $this->db->query($sql = "INSERT INTO phpgw_preferences"
-                                                . " (preference_owner,preference_app,preference_value)"
-                                                . " VALUES ($account_id,'$app','$value')",__LINE__,__FILE__);
+                                        $query = "SELECT (preference_owner, preference_app) FROM phpgw_preferences WHERE preference_owner = '".$account_id."' AND preference_app = '".$app."'";
+
+                                        $this->db->query($query, __LINE__, __FILE__);
+
+                                        if(!$this->db->next_record())
+                                        {
+                                                // Insert Db
+                                                $query = "INSERT INTO phpgw_preferences(preference_owner,preference_app, preference_value) ".
+                                                        "VALUES('".$account_id."','".$app."','".$value."')";
+                                        }
+                                        else
+                                        {      
+                                                // Update Db
+                                                $query = "UPDATE phpgw_preferences SET preference_value = '".$value."' WHERE ".
+                                                        "preference_owner = '".$account_id."' AND preference_app = '".$app."'";
+                                        }
+                                        $this->db->query($query, __LINE__, __FILE__);                
                                 }
                                 $this->db->transaction_commit();

sandbox/expresso2.2/preferences/preferences.php

@@ -345 +345 @@
         function process_array(&$repository,$array,$notifys,$prefix='')
         {
+                $group_id = ($_POST['group']*1);        
                 $_appname = check_app();
 
@@ -397 +398 @@
                 {
                         return $error;
-                }
-                
-                $GLOBALS['phpgw']->preferences->save_repository(True,$GLOBALS['type']);
+                }       
+                $GLOBALS['phpgw']->preferences->save_repository(True,$GLOBALS['type'],$group_id);
                 
                 return False;
@@ -590 +590 @@
                 $t->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
         }
+        if ($GLOBALS['type'] == 'forced')
+        {
+                $select_groups = '<script src="js/config.js"></script>
+                                  <script src="js/connector.js"></script>
+                                <td>'.lang('groups').':<input type="text" value="" size="30" onkeyup="search_user(this)">
+                                <span id="span_searching1"></span></td>
+                                <td><select name="group" id="searchu" style="width: 200px;" size="5" id="search"></td>';
+                $t->set_var('select_groups',$select_groups);
+        }
         $t->set_var('lang_submit', lang('save'));
         $t->set_var('lang_cancel', lang('cancel'));

sandbox/expresso2.2/preferences/templates/default/preferences.tpl

@@ -9 +9 @@
  {rows}
  <!-- END list -->
+  <tr>
+   {select_groups}
+  </tr>
   <tr height="30" valign="bottom">
   <td align="left">