Changeset 5441
- Timestamp:
- 01/27/12 19:21:30 (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoCalendar/setup/tables_current.inc.php
r5415 r5441 122 122 'tzid' => array('type' => 'varchar', 'precision' => '50' ,'nullable' => True), 123 123 'transp' => array( 'type' => 'int', 'precision' => '2', 'nullable' => FALSE , 'default' => 0 ), 124 'sequence' => array( 'type' => 'int', 'precision' => '8', 'nullable' => FALSE , 'default' => 0 ) ,124 'sequence' => array( 'type' => 'int', 'precision' => '8', 'nullable' => FALSE , 'default' => 0 ) 125 125 ), 126 126 'pk' => array('id'), -
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r5437 r5441 353 353 DAViCalAdapter::deleteEvent($uri['id'], array('calendar' => $v['calendar_name'])); 354 354 } 355 355 356 356 /* Seta o participante como rejeitado */ 357 357 Controller::update(array('concept' => 'participant'), array('status' => STATUS_CANCELLED) , 358 358 array('filter' => 359 359 array('AND', 360 array('=' , 'user' , $_SESSION['wallet']['user']['uidNumber']),360 array('=' , 'user' ,Config::me('uidNumber') ), 361 361 array('=' , 'schedulable' , $uri['id'] ) 362 362 ))); -
trunk/prototype/services/OpenLDAP.php
r5437 r5441 147 147 $result .= self::parseFilter( $criteria['filter'] , $map); 148 148 } 149 149 150 150 return $result; 151 151 } … … 154 154 { 155 155 $result = ''; 156 157 $op = self::parseOperator( array_shift( $filter ));158 156 $as = array_shift( $filter ); 157 $op = self::parseOperator( $as ); 158 159 159 if( is_array($filter[0]) ) 160 160 { … … 167 167 } 168 168 else if( isset($map[$filter[0]]) ) 169 { 170 if($as === '*') $filter[1] = str_replace (' ', '* *', $filter[1]); 171 169 172 $fil = $op[0].$map[$filter[0]].$op[1].$filter[1].$op[2]; 173 } 170 174 else 171 175 return ''; -
trunk/prototype/services/PostgreSQL.php
r5437 r5441 8 8 9 9 public function find ( $uri, $justthese = false, $criteria = false ){ 10 10 11 11 $map = Config::get($uri['concept'], 'PostgreSQL.mapping'); 12 12 … … 38 38 39 39 public function replace ( $uri, $data, $criteria = false ){ 40 41 return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$ uri['concept']).' '.self::parseCriteria($criteria , $uri['concept']));40 $map = Config::get($uri['concept'], 'PostgreSQL.mapping'); 41 return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$map).' '.self::parseCriteria($criteria , $map)); 42 42 } 43 43 44 44 public function update ( $uri, $data ){ 45 return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$uri['concept']).' WHERE id = \''. addslashes( $uri['id']) .'\''); 45 $map = Config::get($uri['concept'], 'PostgreSQL.mapping'); 46 return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$map).' WHERE id = \''. addslashes( $uri['id']) .'\''); 46 47 } 47 48 … … 145 146 } 146 147 147 private static function parseUpdateData( $data , $concept){ 148 149 $map = Config::get($concept, 'PostgreSQL.mapping'); 150 148 private static function parseUpdateData( $data , &$map){ 149 151 150 $d = array(); 152 151 foreach ($data as $i => $v) … … 192 191 */ 193 192 194 $result .= 'WHERE '.self::parseFilter( $criteria['filter'] , $map);193 $result .= 'WHERE ('.self::parseFilter( $criteria['filter'] , $map).')'; 195 194 } 196 195 /* … … 236 235 237 236 foreach( $filter as $i => $f ) 238 $nested[] = self::parseFilter( $f , $map); 239 240 return( '('.implode( ' '.$op.' ', $nested ).')' ); 237 if( $n = self::parseFilter( $f , $map)) 238 $nested[] = $n; 239 240 241 return (count($nested) > 0 ) ? '('.implode( ' '.$op.' ', $nested ).')' : ''; 241 242 } 242 243 243 244 if(isset($map[$filter[0]]))245 244 if(!isset($map[$filter[0]])) return ''; 245 246 $filter[0] = $map[$filter[0]]; 246 247 247 248 $igSuffix = $igPrefix = ''; -
trunk/prototype/services/iCal.php
r5437 r5441 482 482 483 483 /* Verifica se este usuario é um usuario interno do ldap */ 484 $intUser = Controller::find( array( 'concept' => 'user', 'service' => 'OpenLDAP' ) , array('uidNumber') ,array( 'filter' => array('OR' , array('=' , 'mail' , $mailUser ), array('=' , 'mailAlternateAddress' , $mailUser ) )) ); 485 486 if( !is_array($intUser) || count($intUser) < 1 ) 487 $intUser = Controller::find( array( 'concept' => 'user' ,'service' => 'PostgreSQL') , array('uidNumber') ,array( 'filter' => array('=' , 'mail' , $mailUser )) ); 488 484 $intUser = Controller::find( array( 'concept' => 'user' ) , array('id','isExternal') ,array( 'filter' => array('OR' , array('=' , 'mail' , $mailUser ), array('=' , 'mailAlternateAddress' , $mailUser ) )) ); 489 485 490 486 $user = null; 491 487 if( $intUser && count($intUser) > 0 ) 492 488 { 493 $participant['isExternal'] = 0;489 $participant['isExternal'] = isset($intUser[0]['isExternal']) ? $intUser[0]['isExternal'] : 0; 494 490 $participant['user'] = $intUser[0]['id']; 495 491 } … … 525 521 526 522 /* Verifica se este usuario é um usuario interno do ldap */ 527 $intUser = Controller::find( array( 'concept' => 'user' ,'service' => 'OpenLDAP') , array('uidNumber') ,array( 'filter' => array('OR' , array('=' , 'mail' , $mailUser ), array('=' , 'mailAlternateAddress' , $mailUser ) )) ); 528 529 if( !is_array($intUser) || count($intUser) < 1 ) 530 $intUser = Controller::find( array( 'concept' => 'user' ,'service' => 'PostgreSQL') , array('uidNumber') ,array( 'filter' => array('=' , 'mail' , $mailUser )) ); 531 523 $intUser = Controller::find( array( 'concept' => 'user' ) , array('id','isExternal') ,array( 'filter' => array('OR' , array('=' , 'mail' , $mailUser ), array('=' , 'mailAlternateAddress' , $mailUser ) )) ); 524 532 525 $user = null; 533 526 if( $intUser && count($intUser) > 0 ) 534 527 { 535 $participant['isExternal'] = 0;528 $participant['isExternal'] = isset($intUser[0]['isExternal']) ? $intUser[0]['isExternal'] : 0; 536 529 $participant['user'] = $intUser[0]['id']; 537 530 }
Note: See TracChangeset
for help on using the changeset viewer.