Correct Unix format file and some LowerCaseConstant

master
Brice Maron 2012-10-12 22:16:39 +00:00
parent 0353171ca0
commit e95b004c2b
2 changed files with 3 additions and 3 deletions

View File

@ -7,8 +7,8 @@
*/
OCP\User::checkLoggedIn();
OCP\App::checkAppEnabled('calendar');
$cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
$event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
$cal = isset($_GET['calid']) ? $_GET['calid'] : null;
$event = isset($_GET['eventid']) ? $_GET['eventid'] : null;
if(isset($cal)) {
$calendar = OC_Calendar_App::getCalendar($cal, true);
if(!$calendar) {

View File

@ -382,7 +382,7 @@ class OC_Calendar_App{
$last_modified = @$vevent->__get('LAST-MODIFIED');
$lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;
$staticoutput = array('id'=>(int)$event['id'],
'title' => ($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'),
'title' => ($event['summary']!=null || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'),
'description' => isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'',
'lastmodified'=>$lastmodified,
'allDay'=>$allday);