Changeset 1738
- Timestamp:
- 12/02/09 14:56:13 (14 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/controller.php
r1247 r1738 11 11 // Explode action from cExecuteForm function 12 12 $cExecuteFormReturn = false; 13 if( $_POST['_action']) {13 if( isset( $_POST['_action'] ) ) { 14 14 if($_FILES) { 15 15 $count_files = $_POST['countFiles']; -
trunk/expressoMail1_2/inc/class.db_functions.inc.php
r1308 r1738 69 69 } 70 70 71 $result = array( ); 71 72 while($this->db->next_record()){ 72 73 $row = $this->db->row(); … … 109 110 // Searching uid (LDAP), if exists related Ids for sharing groups. 110 111 // Save into user session. It will used before send mail (verify permission). 111 if(! $_SESSION['phpgw_info']['expressomail']['user']['cc_related_ids'][$group['owner']] && $ldap){112 if(!isset($_SESSION['phpgw_info']['expressomail']['user']['cc_related_ids'][$group['owner']]) && isset($ldap)){ 112 113 $_SESSION['phpgw_info']['expressomail']['user']['cc_related_ids'][$group['owner']] = $ldap -> uidnumber2uid($group['owner']); 113 114 } -
trunk/phpgwapi/inc/class.db.inc.php
r1280 r1738 202 202 if ($this->Port) $Host .= ':'.$this->Port; 203 203 break; 204 } 205 206 if ( ! isset( $GLOBALS[ 'phpgw' ] ) ) 207 { 208 $GLOBALS[ 'phpgw' ] = new stdClass; 209 $GLOBALS[ 'phpgw' ]->ADOdb = NULL; 204 210 } 205 211 … … 226 232 return 0; // in case error-reporting = 'no' 227 233 } 228 $connect = $GLOBALS['phpgw_info']['server']['db_persistent']? 'PConnect' : 'Connect';234 $connect = ( isset( $GLOBALS['phpgw_info']['server']['db_persistent'] ) && $GLOBALS['phpgw_info']['server']['db_persistent'] ) ? 'PConnect' : 'Connect'; 229 235 if (!$this->Link_ID->$connect($Host, $User, $Password, $Database)) 230 236 {
Note: See TracChangeset
for help on using the changeset viewer.