Changeset 1999 for trunk/phpgwapi

Timestamp:

02/10/10 15:37:22 (14 years ago)

Author:

amuller

Message:

Ticket #490 - #690 - Merge branches Expresso 2.2 com Trunk

Location:

trunk/phpgwapi

Files:

• expressoAjax (added)
• expressoAjax/coder.js (added)
• expressoAjax/dom.js (added)
• expressoAjax/dragdrop.js (added)
• expressoAjax/expressoAjax.js (added)
• expressoAjax/lang.js (added)
• expressoAjax/xtools.js (added)
• inc/class.common.inc.php (modified) (1 diff)
• inc/class.preferences.inc.php (modified) (6 diffs)
• templates/default/css/azul.css (modified) (1 diff)

trunk/phpgwapi/inc/class.common.inc.php

@@ -1219 +1219 @@
                         {
                                 echo parse_navbar();
-                        }
+                        } 
+                        echo "<script type='text/javascript' src='../phpgwapi/expressoAjax/expressoAjax.js'></script>";
+
                 }
 

trunk/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();

trunk/phpgwapi/templates/default/css/azul.css

@@ -12 +12 @@
     border-bottom: 1px solid #D3DCE3;
     
+}
+
+.conteudo {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 10px;
+    font-weight: normal;
+    color: #000033;
+    padding: 1px;
+    border-left:1px solid #4A79B1;
+    width:99.5%;
+    overflow: none;
+    -moz-border-radius: 0px 0px 6px 6px;
+}
+
+.whiteSpace{
+        width: 2px;
+}
+.menu
+{
+    text-decoration: none;
+    text-align: center;
+/*    font: bold 13px Lucidatypewriter,monospace;*/
+    height: 20px;    
+    width:220px;
+        background-color:#c8d7ea;
+
+/*    background-color: #F7F7F7;*/
+    margin-bottom: 0px;
+    border: 1px solid #f4f7fc;
+    border-bottom: 1px solid #4a79b1;
+    padding:0px 5px 0px 0px;
+    -moz-border-radius: 9px 9px 0px 0px;
+    -moz-user-select: none;
+    cursor: pointer;
+}
+
+.last_menu
+{
+        border-bottom: 1px solid #4a79b1;
+        -moz-border-radius: 0px 0px 0px 0px;
+}
+
+.menu-sel
+{
+    text-decoration: none;
+    text-align: center;
+    font: bold 13px Lucidatypewriter,monospace;
+    color:#0000FF;
+    height: 20px;
+    width:220px;
+    background-color:#F7F7F7;
+    margin-bottom: 0px;
+    border: 1px solid #4a79b1;
+    border-bottom: 0px;
+    padding:0px 5px 0px 0px;
+    -moz-border-radius: 9px 9px 0px 0px;
+    -moz-user-select: none;
+    cursor: pointer;    
 }