Changeset 1342 for branches/1.2/phpgwapi
- Timestamp:
- 08/19/09 11:10:14 (15 years ago)
- Location:
- branches/1.2/phpgwapi
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.2/phpgwapi/inc/class.jscalendar.inc.php
r2 r1342 31 31 $this->jscalendar_url = $GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/js/'.$path; 32 32 $this->dateformat = $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']; 33 34 if ($do_header && !str str($GLOBALS['phpgw_info']['flags']['java_script'],'jscalendar'))33 34 if ($do_header && !strpos($GLOBALS['phpgw_info']['flags']['java_script'],'jscalendar')) 35 35 { 36 36 $GLOBALS['phpgw_info']['flags']['java_script'] .= -
branches/1.2/phpgwapi/inc/class.preferences.inc.php
r54 r1342 1116 1116 // is it possible to use Trash and Sent folders - i.e. using IMAP server 1117 1117 // if not - force settings to false 1118 if (str istr($prefs['email']['mail_server_type'], 'imap') == False)1118 if (strpos($prefs['email']['mail_server_type'], 'imap') == False) 1119 1119 { 1120 1120 if (isset($prefs['email']['use_trash_folder'])) -
branches/1.2/phpgwapi/js/dftree/dftree.js
r709 r1342 224 224 { 225 225 var captionSpan; 226 if ((this.id != 'root') && (this.id != 'user') && (this.id !='local_root')){226 if ((this.id != 'root') && (this.id != 'user')){ 227 227 captionSpan = getObjectById("l"+this.id+this._myTree.name); 228 228 captionSpan.style.backgroundColor = 'white'; … … 234 234 { 235 235 var captionSpan; 236 if ((this.id != 'root') && (this.id != 'user') && (this.id !='local_root')){236 if ((this.id != 'root') && (this.id != 'user')){ 237 237 captionSpan = getObjectById("l"+this.id+this._myTree.name); 238 238 captionSpan.style.backgroundColor = ''; … … 300 300 else //Nao tem onClick 301 301 { 302 if ((this.id != 'root') && (this.id != 'user') && (this.id !='local_root')) //e nao seja raiz(root) ou pastas compartilhadas(user).302 if ((this.id != 'root') && (this.id != 'user')) //e nao seja raiz(root) ou pastas compartilhadas(user). 303 303 captionEventHandler = function () { _this._select();}; 304 304 }
Note: See TracChangeset
for help on using the changeset viewer.