- Timestamp:
- 03/08/13 11:50:57 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r7973 r7980 169 169 public function schedulableSecurity(&$uri, &$params, &$criteria, $original) 170 170 { 171 171 172 if( !isset($criteria['filter'][1]) || !$criteria['filter'][1] == 'uid') 172 173 { … … 763 764 } 764 765 } 766 } 767 768 static function autoImportCalendar(&$uri, &$params, &$criteria, $original){ 769 $autoCommit = Controller::service('PostgreSQL')->execResultSql('Select config_value FROM phpgw_config WHERE config_app = \'expressoCalendar\' AND config_name = \'expressoCalendar_autoImportCalendars\''); 770 771 772 if(isset($autoCommit[0]) && $autoCommit[0]['config_value'] == 'true') 773 { 774 if(isset($original['properties']) && isset($original['properties']['user']) && isset($original['properties']['isOrganizer']) && $original['properties']['isOrganizer'] != '1') 775 { 776 $defaultCalendar = Controller::find(array('concept' => 'modulePreference'), array('value') , array('filter' => array( 'and' , array('=' , 'name' , 'dafaultImportCalendar') , array('=' , 'module' , 'expressoCalendar') , array('=' , 'user' , $original['properties']['user']) )) ); 777 if(isset($defaultCalendar[0]) && $defaultCalendar[0]['value'] > 0) 778 { 779 Controller::create(array('concept' => 'calendarToSchedulable'), 780 array('schedulable' => $original['properties']['schedulable'], 781 'calendar' => $defaultCalendar[0]['value'] 782 ) 783 ); 784 } 785 } 786 } 765 787 } 766 788 … … 1392 1414 1393 1415 Controller::delete(array('concept' => 'calendar', 'id' => $signature['calendar'])); 1394 1395 $permissions = Controller::find(array('concept' => 'calendarToPermission'), array('id'), array('filter' => array('=', 'calendar', $signature['calendar']))); 1396 1397 1398 1416 1417 $autoCommit = Controller::service('PostgreSQL')->execResultSql('Select config_value FROM phpgw_config WHERE config_app = \'expressoCalendar\' AND config_name = \'expressoCalendar_autoImportCalendars\''); 1418 if(isset($autoCommit[0]) && $autoCommit[0]['config_value'] == 'true') 1419 { 1420 $defaultCalendar = Controller::find(array('concept' => 'modulePreference'), array('value','id') , array('filter' => array( 'and' , array('=' , 'name' , 'dafaultImportCalendar') , array('=' , 'module' , 'expressoCalendar') , array('=' , 'user' , $original['properties']['user']) )) ); 1421 if(isset($defaultCalendar[0]) && $defaultCalendar[0]['value'] == $signature['calendar'] ) 1422 { 1423 Controller::delete(array('concept' => 'modulePreference', 'id' => $defaultCalendar[0]['id'])); 1424 } 1425 } 1426 1427 $permissions = Controller::find(array('concept' => 'calendarToPermission'), array('id'), array('filter' => array('=', 'calendar', $signature['calendar']))); 1428 1399 1429 if($permissions && count($permissions) > 0){ 1400 1430 $ids = array(); … … 1543 1573 } 1544 1574 1545 DAViCalAdapter::importCollection($v->url, $calCreated['id']); 1575 if($i == 0) 1576 { 1577 $pref = array(); 1578 $pref['user'] = $_SESSION['wallet']['user']['uidNumber']; 1579 $pref['value'] = $calCreated['id']; 1580 $pref['name'] = 'dafaultImportCalendar' ; 1581 $pref['module'] = 'expressoCalendar'; 1582 Controller::create(array('concept' => 'modulePreference'), $pref); 1583 } 1584 1546 1585 } 1547 1586 } else { … … 1565 1604 1566 1605 $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig); 1606 1607 1608 $pref = array(); 1609 $pref['user'] = $_SESSION['wallet']['user']['uidNumber']; 1610 $pref['value'] = $calCreated['id']; 1611 $pref['name'] = 'dafaultImportCalendar' ; 1612 $pref['module'] = 'expressoCalendar'; 1613 Controller::create(array('concept' => 'modulePreference'), $pref); 1614 1615 1567 1616 } 1568 1617
Note: See TracChangeset
for help on using the changeset viewer.