Changeset 7228 for branches/2.4/prototype/rest
- Timestamp:
- 09/17/12 14:30:47 (12 years ago)
- Location:
- branches/2.4
- Files:
-
- 2 deleted
- 4 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4
- Property svn:mergeinfo changed
-
branches/2.4/prototype/rest/catalog/DynamicContactResource.php
r6819 r7228 331 331 private function isEnabledDynamicContacts($user){ 332 332 333 //recuperando as preferencias (suas preferencias, preferencia padrão, preferencia obrigatoria)334 //dos contatos dinamicos335 $sql = 'SELECT preference_owner, preference_value '. 333 //recuperando as preferencias (suas preferencias, preferencia padrão, preferencia obrigatoria) 334 //dos contatos dinamicos 335 $sql = 'SELECT preference_owner, preference_value '. 336 336 'FROM phpgw_preferences '. 337 337 'WHERE preference_app = \'expressoMail\' AND '. 338 'preference_owner in (-1,-2, ' . $user . ')'; 339 340 $preferences = Controller::service('PostgreSQL')->execResultSql($sql); 341 342 $array = array(); 343 if(count($preferences) > 0){ 344 foreach($preferences as $preference){ 345 //recupera a preferencia 346 $preference_value = unserialize( $preference['preference_value'] ); 347 348 //gera um array com o owner e o valor da preferencia: 349 //true: SIM (1) 350 //false: NAO (0) 351 //null: escolha pelo usuario/ usar padrao / sem padrao 352 $value = null; 353 if(isset($preference_value['use_dynamic_contacts'])){ 354 $value = (isset($preference_value['use_dynamic_contacts'])) ? $preference_value['use_dynamic_contacts'] == '1' : false; 355 } 356 $array[ $preference['preference_owner'] ] = $value; 357 338 'preference_owner in (-1,-2, ' . $user . ')'; 339 340 $preferences = Controller::service('PostgreSQL')->execResultSql($sql); 341 342 $array = array(); 343 if(count($preferences) > 0){ 344 foreach($preferences as $preference){ 345 //recupera a preferencia 346 $preference_value = unserialize( $preference['preference_value'] ); 347 348 //gera um array com o owner e o valor da preferencia: 349 //true: SIM (1) 350 //false: NAO (0) 351 //null: escolha pelo usuario/ usar padrao / sem padrao 352 $value = null; 353 if(isset($preference_value['use_dynamic_contacts'])){ 354 $value = (isset($preference_value['use_dynamic_contacts'])) ? $preference_value['use_dynamic_contacts'] == '1' : false; 355 } 356 $array[ $preference['preference_owner'] ] = $value; 357 } 358 358 } 359 //preferencia obrigatoria (SIM) 360 if(array_key_exists(-1,$array) && $array[-1]){ 361 return true; 362 } 363 //preferencia do user (SIM) 364 else if(array_key_exists($user,$array) && $array[$user] ){ 365 return true; 366 } 367 //preferencia padrao (SIM) escolhida pelo user 368 else if(array_key_exists($user, $array) && $array[$user] === null && 369 array_key_exists(-2, $array) && $array[-2]){ 370 return true; 371 } 372 return false; 359 360 //preferencia obrigatoria (SIM) 361 if(array_key_exists(-1,$array) && $array[-1]){ 362 return true; 363 } 364 //preferencia do user (SIM) 365 else if(array_key_exists($user,$array) && $array[$user] ){ 366 return true; 367 } 368 //preferencia padrao (SIM) escolhida pelo user 369 else if(array_key_exists($user, $array) && $array[$user] === null && 370 array_key_exists(-2, $array) && $array[-2]){ 371 return true; 372 } 373 return false; 373 374 } 374 375 } -
branches/2.4/prototype/rest/catalog/DynamicContactsResource.php
r6819 r7228 290 290 private function isEnabledDynamicContacts($user){ 291 291 292 //recuperando as preferencias (suas preferencias, preferencia padrão, preferencia obrigatoria) 293 //dos contatos dinamicos 294 $sql = 'SELECT preference_owner, preference_value '. 295 'FROM phpgw_preferences '. 296 'WHERE preference_app = \'expressoMail\' AND '. 297 'preference_owner in (-1,-2, ' . $user . ')'; 298 299 $preferences = Controller::service('PostgreSQL')->execResultSql($sql); 300 301 $array = array(); 302 if(count($preferences) > 0){ 303 foreach($preferences as $preference){ 304 //recupera a preferencia 305 $preference_value = unserialize( $preference['preference_value'] ); 306 307 //gera um array com o owner e o valor da preferencia: 308 //true: SIM (1) 309 //false: NAO (0) 310 //null: escolha pelo usuario/ usar padrao / sem padrao 311 $value = null; 312 if(isset($preference_value['use_dynamic_contacts'])){ 313 $value = (isset($preference_value['use_dynamic_contacts'])) ? $preference_value['use_dynamic_contacts'] == '1' : false; 314 } 315 $array[ $preference['preference_owner'] ] = $value; 316 } 317 } 318 319 //preferencia obrigatoria (SIM) 320 if(array_key_exists(-1,$array) && $array[-1]){ 321 return true; 292 //recuperando as preferencias (suas preferencias, preferencia padrão, preferencia obrigatoria) 293 //dos contatos dinamicos 294 $sql = 'SELECT preference_owner, preference_value '. 295 'FROM phpgw_preferences '. 296 'WHERE preference_app = \'expressoMail\' AND '. 297 'preference_owner in (-1,-2, ' . $user . ')'; 298 299 $preferences = Controller::service('PostgreSQL')->execResultSql($sql); 300 301 $array = array(); 302 if(count($preferences) > 0){ 303 foreach($preferences as $preference){ 304 //recupera a preferencia 305 $preference_value = unserialize( $preference['preference_value'] ); 306 307 //gera um array com o owner e o valor da preferencia: 308 //true: SIM (1) 309 //false: NAO (0) 310 //null: escolha pelo usuario/ usar padrao / sem padrao 311 $value = null; 312 if(isset($preference_value['use_dynamic_contacts'])){ 313 $value = (isset($preference_value['use_dynamic_contacts'])) ? $preference_value['use_dynamic_contacts'] == '1' : false; 322 314 } 323 //preferencia do user (SIM) 324 else if(array_key_exists($user,$array) && $array[$user] ){ 325 return true; 326 } 327 //preferencia padrao (SIM) escolhida pelo user 328 else if(array_key_exists($user, $array) && $array[$user] === null && 329 array_key_exists(-2, $array) && $array[-2]){ 330 return true; 331 } 332 return false; 315 $array[ $preference['preference_owner'] ] = $value; 316 } 317 } 318 319 //preferencia obrigatoria (SIM) 320 if(array_key_exists(-1,$array) && $array[-1]){ 321 return true; 322 } 323 //preferencia do user (SIM) 324 else if(array_key_exists($user,$array) && $array[$user] ){ 325 return true; 326 } 327 //preferencia padrao (SIM) escolhida pelo user 328 else if(array_key_exists($user, $array) && $array[$user] === null && 329 array_key_exists(-2, $array) && $array[-2]){ 330 return true; 331 } 332 return false; 333 333 } 334 334 -
branches/2.4/prototype/rest/catalog/UserContactsResource.php
r6819 r7228 282 282 283 283 $d = new Data(); 284 $i = new Item($request->resources, (($value['user'] == Config::me("uidNumber")) ? ' ContactsResource' : 'SharedContactResource'), $value['id']);284 $i = new Item($request->resources, (($value['user'] == Config::me("uidNumber")) ? 'PersonalContactResource' : 'SharedContactResource'), $value['id']); 285 285 $d->setName('id'); 286 286 $d->setValue($value['id']); … … 487 487 private function isEnabledDynamicContacts($user){ 488 488 489 //recuperando as preferencias (suas preferencias, preferencia padrão, preferencia obrigatoria) 490 //dos contatos dinamicos 491 489 //recuperando as preferencias (suas preferencias, preferencia padrão, preferencia obrigatoria) 490 //dos contatos dinamicos 491 $sql = 'SELECT preference_owner, preference_value '. 492 492 'FROM phpgw_preferences '. 493 493 'WHERE preference_app = \'expressoMail\' AND '. 494 'preference_owner in (-1,-2, ' . $user . ')'; 495 496 $preferences = Controller::service('PostgreSQL')->execResultSql($sql); 497 498 $array = array(); 499 if(count($preferences) > 0){ 500 foreach($preferences as $preference){ 501 //recupera a preferencia 502 $preference_value = unserialize( $preference['preference_value'] ); 503 504 //gera um array com o owner e o valor da preferencia: 505 //true: SIM (1) 506 //false: NAO (0) 507 //null: escolha pelo usuario/ usar padrao / sem padrao 508 $value = null; 509 if(isset($preference_value['use_dynamic_contacts'])){ 510 $value = (isset($preference_value['use_dynamic_contacts'])) ? $preference_value['use_dynamic_contacts'] == '1' : false; 511 } 512 $array[ $preference['preference_owner'] ] = $value; 513 } 494 'preference_owner in (-1,-2, ' . $user . ')'; 495 496 $preferences = Controller::service('PostgreSQL')->execResultSql($sql); 497 498 $array = array(); 499 if(count($preferences) > 0){ 500 foreach($preferences as $preference){ 501 //recupera a preferencia 502 $preference_value = unserialize( $preference['preference_value'] ); 503 504 //gera um array com o owner e o valor da preferencia: 505 //true: SIM (1) 506 //false: NAO (0) 507 //null: escolha pelo usuario/ usar padrao / sem padrao 508 $value = null; 509 if(isset($preference_value['use_dynamic_contacts'])){ 510 $value = (isset($preference_value['use_dynamic_contacts'])) ? $preference_value['use_dynamic_contacts'] == '1' : false; 511 } 512 $array[ $preference['preference_owner'] ] = $value; 513 } 514 514 } 515 //preferencia obrigatoria (SIM) 516 if(array_key_exists(-1,$array) && $array[-1]){ 517 return true; 518 } 519 //preferencia do user (SIM) 520 else if(array_key_exists($user,$array) && $array[$user] ){ 521 return true; 522 } 523 //preferencia padrao (SIM) escolhida pelo user 524 else if(array_key_exists($user, $array) && $array[$user] === null && 525 array_key_exists(-2, $array) && $array[-2]){ 526 return true; 527 } 528 return false; 515 516 //preferencia obrigatoria (SIM) 517 if(array_key_exists(-1,$array) && $array[-1]){ 518 return true; 519 } 520 //preferencia do user (SIM) 521 else if(array_key_exists($user,$array) && $array[$user] ){ 522 return true; 523 } 524 //preferencia padrao (SIM) escolhida pelo user 525 else if(array_key_exists($user, $array) && $array[$user] === null && 526 array_key_exists(-2, $array) && $array[-2]){ 527 return true; 528 } 529 return false; 529 530 } 530 531 }
Note: See TracChangeset
for help on using the changeset viewer.