Changeset 56

Timestamp:

08/17/07 10:26:24 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk

Files:

• calendar/doc/change_log.txt (modified) (1 diff)
• contactcenter/doc/change_log.txt (modified) (1 diff)
• contactcenter/js/cc_tree.js (modified) (3 diffs)
• contactcenter/setup/setup.inc.php (modified) (1 diff)
• contactcenter/setup/tables_update.inc.php (modified) (1 diff)
• expressoMail1_2/inc/class.functions.inc.php (modified) (1 diff)
• expressoMail1_2/index.php (modified) (1 diff)

trunk/calendar/doc/change_log.txt

@@ -3 +3 @@
 Nilton Emilio Buhrer Neto.
 
+--------------------------- NOTA IMPORTANTE --------------------------
+
+A partir de Agosto de 2007, todos os registros de bugs aqui relatados foram
+transferidos para o site do ExpressoLivre, no Wiki-Trac do módulo.
+Vide: http://www.expressolivre.org/dev/wiki/calendar/changelog
+
+----------------------------------------------------------------------
 27/07/2007 - [0.9.2]
 - Implementação de funcionalidade no hook_admin. O administrador poderá 

trunk/contactcenter/doc/change_log.txt

@@ -3 +3 @@
 Nilton Emilio Buhrer Neto.
 
+--------------------------- NOTA IMPORTANTE --------------------------
 
+A partir de Agosto de 2007, todos os registros de bugs aqui relatados foram
+transferidos para o site do ExpressoLivre, no Wiki-Trac do módulo.
+Vide: http://www.expressolivre.org/dev/wiki/contactcenter/changelog
+
+----------------------------------------------------------------------
 27/02/2007 - [1.0.005]
 - Excluído o diretorio contactcenter/templates/celepar e seus arquivos foram movidos para

trunk/contactcenter/js/cc_tree.js

@@ -176 +176 @@
                                 _this.tree.getNodeById(_this.actualLevel)._select();
                                 _this.setCatalog(_this.actualLevel);
+                                _this.expandTree();
+
                         }
                 };
@@ -181 +183 @@
                 Connector.newRequest(this.name+'actual', CC_url+'get_actual_catalog', 'GET', handler);
         }
+
+        ccCatalogTree.prototype.expandTree = function() {
+                for (i=0; i < this.tree._aNodes.length; i++)
+                        this._expandSubTree(this.tree._aNodes[i]);
+        }
+
+        ccCatalogTree.prototype._expandSubTree = function(node) {
+                if ( node._children == '' ) {
+                        return;
+                }
+                if (node._children != '') {
+                        for (i = 0; i <= node._children.length; i++) {
+                                if ( node._io == false )
+                                        node.changeState();
+                                this._expandSubTree(node._children[i]);
+                        }
+                }
+        }
+
 
         ccCatalogTree.prototype._updateTree = function(level, open)
@@ -250 +271 @@
                         }
                 };
-                
                 Connector.newRequest(this.name+'update', CC_url+'get_catalog_tree&level='+level, 'GET', handler);
         }

trunk/contactcenter/setup/setup.inc.php

@@ -17 +17 @@
         $setup_info['contactcenter']['name']      = 'contactcenter';
         $setup_info['contactcenter']['title']     = 'ContactCenter';
-        $setup_info['contactcenter']['version']   = '1.0.005';
+        $setup_info['contactcenter']['version']   = '1.15';
         $setup_info['contactcenter']['app_order'] = 4;
         $setup_info['contactcenter']['enable']    = 1;

trunk/contactcenter/setup/tables_update.inc.php

@@ -56 +56 @@
                 return $GLOBALS['setup_info']['contactcenter']['currentver'];
         }
+        $test[] = '1.0.005';
+        function contactcenter_upgrade1_0_005() {
+                $GLOBALS['setup_info']['contactcenter']['currentver'] = '1.14';
+                return $GLOBALS['setup_info']['contactcenter']['currentver'];
+        }
+        $test[] = '1.14';
+        function contactcenter_upgrade1_14() {                          
+                $GLOBALS['phpgw_setup']->db->query("ALTER TABLE phpgw_cc_connections ALTER COLUMN connection_value TYPE varchar(100)");
+                $GLOBALS['setup_info']['contactcenter']['currentver'] = '1.150';
+                return $GLOBALS['setup_info']['contactcenter']['currentver'];
+        }
 ?>

trunk/expressoMail1_2/inc/class.functions.inc.php

@@ -22 +22 @@
                 }
                                 
-                function getFilesJs($excludeFiles = '', $update_version = ''){
+                function getFilesJs($includeFiles = '', $update_version = ''){
                         
                         $files = $this -> getDirContents('js');
                         $str_files = '';
                         
-                        if($excludeFiles) {
-                                $excludeFiles = explode(",",trim($excludeFiles));
+                        if($includeFiles) {
+                                $includeFiles = explode(",",trim($includeFiles));
                                 // Bug fixed for array_search function
-                                $excludeFiles[count($excludeFiles)] = $excludeFiles[0];
-                                $excludeFiles[0] = null;
+                                $includeFiles[count($includeFiles)] = $includeFiles[0];
+                                $includeFiles[0] = null;
+                                // End Bug fixed.
                         }                                                                                                               
-                        for($i = 0; $i < count($files); $i++) {
-                                
+                        for($i = 0; $i < count($files); $i++) {                         
                                 if(count(explode('.js',$files[$i])) > 1) {
-                                        if(!$excludeFiles || ($excludeFiles && !array_search(trim($files[$i]),$excludeFiles))){ 
+                                        if($includeFiles  && array_search(trim($files[$i]),$includeFiles)){     
                                                 $str_files .= "<script src='".$files[$i]."?".$update_version."' type='text/javascript'></script>";                                              
                                         }

trunk/expressoMail1_2/index.php

@@ -61 +61 @@
         $GLOBALS['phpgw']->common->phpgw_footer();
 
-        // Include JS Files
+
         $obj = createobject("expressoMail1_2.functions");
         echo "<script src='inc/load_lang.php?".$update_version."' type='text/javascript'></script>";    
-        echo $obj -> getFilesJs("js/html2xhtml.js," .
-                                                        "js/ccQuickAdd.js,".
-                                                        "js/color_palette.js,".
-                                                        "js/QuickCatalogSearch.js,".
-                                                        "js/QuickSearchUser.js,".
-                                                        "js/preferences.js,".
-                                                        "js/search.js,".
-                                                        "js/filters.js,".
-                                                        "js/filter.js,".
-                                                        // Fix Firefox problem with loadScript.
-                                                        ($_GET['to'] ? "" : "js/rich_text_editor.js,").
-                                                        "js/connector.js,".
-                                                        "js/globals.js,".
-                                                        "js/TreeS.js,".
-                                                        "js/TreeShow.js,".
-                                                        "js/sharemailbox.js,".
-                                                        "js/sniff_browser.js",
+        
+        // INCLUDE the JS Files: 
+        echo $obj -> getFilesJs("js/abas.js," .
+                                                        "js/common_functions.js," .
+                                                        "js/doiMenuData.js," .
+                                                        "js/drag_area.js," .
+                                                        "js/draw_api.js," .
+                                                        "js/DropDownContacts.js," .
+                                                        "js/InfoContact.js," .
+                                                        "js/main.js," .
+                                                        "js/rich_text_editor.js," .                                                     
+                                                        "js/wfolders.js,",
                                                         $GLOBALS['phpgw_info']['flags']['update_version']);
 
-        // Is IE ??
-        //echo "<SCRIPT>if ((!is_gecko) && (!is_ie6up)) {alert('OPSS !! Desculpe, mas seu navegador não suporta este WebMail. Instale o Mozilla FireFox 1.0+ ou Internet Explorer 6.0+. No momento, utilize a versão antiga do WebMail.');window.location=\"../email/\";}</SCRIPT>";
-        
         // Get Preferences or redirect to preferences page.
         $GLOBALS['phpgw']->preferences->read_repository();