diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-07 11:47:14 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-07 11:47:14 +0200 |
| commit | 46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3 (patch) | |
| tree | 78896053233f385afbdc6006eade163626048bf6 /apps/calendar | |
| parent | 7d2a68fc314bcefa69413d85e69ffd10dc34ddc5 (diff) | |
| parent | 3a184e2e1d7ae49d596e06b724ffc36382d02596 (diff) | |
| download | nextcloud-server-46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3.tar.gz nextcloud-server-46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar')
20 files changed, 58 insertions, 56 deletions
diff --git a/apps/calendar/ajax/calendar/edit.form.php b/apps/calendar/ajax/calendar/edit.form.php index 17118c5165f..77366809311 100755 --- a/apps/calendar/ajax/calendar/edit.form.php +++ b/apps/calendar/ajax/calendar/edit.form.php @@ -12,7 +12,7 @@ OCP\JSON::checkAppEnabled('calendar'); $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions(); $calendar = OC_Calendar_App::getCalendar($_GET['calendarid']); -$tmpl = new OC_Template("calendar", "part.editcalendar"); +$tmpl = new OCP\Template("calendar", "part.editcalendar"); $tmpl->assign('new', false); $tmpl->assign('calendarcolor_options', $calendarcolor_options); $tmpl->assign('calendar', $calendar); diff --git a/apps/calendar/ajax/calendar/edit.php b/apps/calendar/ajax/calendar/edit.php index 17118c5165f..77366809311 100755 --- a/apps/calendar/ajax/calendar/edit.php +++ b/apps/calendar/ajax/calendar/edit.php @@ -12,7 +12,7 @@ OCP\JSON::checkAppEnabled('calendar'); $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions(); $calendar = OC_Calendar_App::getCalendar($_GET['calendarid']); -$tmpl = new OC_Template("calendar", "part.editcalendar"); +$tmpl = new OCP\Template("calendar", "part.editcalendar"); $tmpl->assign('new', false); $tmpl->assign('calendarcolor_options', $calendarcolor_options); $tmpl->assign('calendar', $calendar); diff --git a/apps/calendar/ajax/calendar/new.form.php b/apps/calendar/ajax/calendar/new.form.php index fa30b871e42..ee46757f56b 100755 --- a/apps/calendar/ajax/calendar/new.form.php +++ b/apps/calendar/ajax/calendar/new.form.php @@ -15,7 +15,7 @@ $calendar = array( 'displayname' => '', 'calendarcolor' => '', ); -$tmpl = new OC_Template('calendar', 'part.editcalendar'); +$tmpl = new OCP\Template('calendar', 'part.editcalendar'); $tmpl->assign('new', true); $tmpl->assign('calendarcolor_options', $calendarcolor_options); $tmpl->assign('calendar', $calendar); diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php index 4b8688e3d1d..76dbef6b9df 100755 --- a/apps/calendar/ajax/calendar/new.php +++ b/apps/calendar/ajax/calendar/new.php @@ -29,7 +29,7 @@ $calendarid = OC_Calendar_Calendar::addCalendar($userid, strip_tags($_POST['name OC_Calendar_Calendar::setCalendarActive($calendarid, 1); $calendar = OC_Calendar_Calendar::find($calendarid); -$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields'); +$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields'); $tmpl->assign('calendar', $calendar); OCP\JSON::success(array( 'page' => $tmpl->fetchPage(), diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php index 586bf3db814..96312537507 100755 --- a/apps/calendar/ajax/calendar/overview.php +++ b/apps/calendar/ajax/calendar/overview.php @@ -10,6 +10,6 @@ $l10n = OC_L10N::get('calendar'); OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('calendar'); -$output = new OC_TEMPLATE("calendar", "part.choosecalendar"); +$output = new OCP\Template("calendar", "part.choosecalendar"); $output -> printpage(); ?> diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php index 408ac900912..3b1cc32b316 100755 --- a/apps/calendar/ajax/calendar/update.php +++ b/apps/calendar/ajax/calendar/update.php @@ -30,7 +30,7 @@ OC_Calendar_Calendar::editCalendar($calendarid, strip_tags($_POST['name']), null OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']); $calendar = OC_Calendar_App::getCalendar($calendarid); -$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields'); +$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields'); $tmpl->assign('calendar', $calendar); OCP\JSON::success(array( 'page' => $tmpl->fetchPage(), diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php index 91d07d3897a..f2ea84dd205 100755 --- a/apps/calendar/ajax/event/edit.form.php +++ b/apps/calendar/ajax/event/edit.form.php @@ -206,9 +206,9 @@ $repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions(); $repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions(); if($access == 'owner' || $access == 'rw'){ - $tmpl = new OC_Template('calendar', 'part.editevent'); + $tmpl = new OCP\Template('calendar', 'part.editevent'); }elseif($access == 'r'){ - $tmpl = new OC_Template('calendar', 'part.showevent'); + $tmpl = new OCP\Template('calendar', 'part.showevent'); } $tmpl->assign('eventid', $id); diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php index 42cdb81642e..f47cb6c3e2a 100755 --- a/apps/calendar/ajax/event/new.form.php +++ b/apps/calendar/ajax/event/new.form.php @@ -43,7 +43,7 @@ $repeat_bymonth_options = OC_Calendar_App::getByMonthOptions(); $repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions(); $repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions(); -$tmpl = new OC_Template('calendar', 'part.newevent'); +$tmpl = new OCP\Template('calendar', 'part.newevent'); $tmpl->assign('access', 'owner'); $tmpl->assign('calendar_options', $calendar_options); $tmpl->assign('repeat_options', $repeat_options); diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php index e686066a993..3be02d2a6db 100755 --- a/apps/calendar/ajax/import/dialog.php +++ b/apps/calendar/ajax/import/dialog.php @@ -9,7 +9,7 @@ OCP\JSON::checkLoggedIn(); OCP\App::checkAppEnabled('calendar'); -$tmpl = new OC_Template('calendar', 'part.import'); +$tmpl = new OCP\Template('calendar', 'part.import'); $tmpl->assign('path', $_POST['path']); $tmpl->assign('filename', $_POST['filename']); $tmpl->printpage(); diff --git a/apps/calendar/ajax/share/dropdown.php b/apps/calendar/ajax/share/dropdown.php index bac487f0d0b..a3b0faca4bf 100755 --- a/apps/calendar/ajax/share/dropdown.php +++ b/apps/calendar/ajax/share/dropdown.php @@ -13,6 +13,6 @@ if($calendar['userid'] != $user){ OCP\JSON::error(); exit; } -$tmpl = new OC_Template('calendar', 'share.dropdown'); +$tmpl = new OCP\Template('calendar', 'share.dropdown'); $tmpl->assign('calid', $calid); $tmpl->printPage();
\ No newline at end of file diff --git a/apps/calendar/index.php b/apps/calendar/index.php index 5aee5f6ace8..cf03a7a3cd3 100755 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -53,7 +53,7 @@ OCP\Util::addStyle('', 'jquery.multiselect'); OCP\Util::addscript('contacts','jquery.multi-autocomplete'); OCP\Util::addscript('','oc-vcategories'); OCP\App::setActiveNavigationEntry('calendar_index'); -$tmpl = new OC_Template('calendar', 'calendar', 'user'); +$tmpl = new OCP\Template('calendar', 'calendar', 'user'); $tmpl->assign('eventSources', $eventSources); $tmpl->assign('categories', $categories); if(array_key_exists('showevent', $_GET)){ diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php index 3d4174a57be..f0a9bf050fc 100755 --- a/apps/calendar/lib/object.php +++ b/apps/calendar/lib/object.php @@ -105,10 +105,11 @@ class OC_Calendar_Object{ $stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*calendar_objects (calendarid,objecttype,startdate,enddate,repeating,summary,calendardata,uri,lastmodified) VALUES(?,?,?,?,?,?,?,?,?)' ); $stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time())); + $object_id = OCP\DB::insertid('*PREFIX*calendar_objects'); OC_Calendar_Calendar::touchCalendar($id); - return OCP\DB::insertid('*PREFIX*calendar_objects'); + return $object_id; } /** @@ -124,10 +125,11 @@ class OC_Calendar_Object{ $stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*calendar_objects (calendarid,objecttype,startdate,enddate,repeating,summary,calendardata,uri,lastmodified) VALUES(?,?,?,?,?,?,?,?,?)' ); $stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time())); + $object_id = OCP\DB::insertid('*PREFIX*calendar_objects'); OC_Calendar_Calendar::touchCalendar($id); - return OCP\DB::insertid('*PREFIX*calendar_objects'); + return $object_id; } /** diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php index a53bf763324..488495aefc4 100755 --- a/apps/calendar/lib/share.php +++ b/apps/calendar/lib/share.php @@ -25,7 +25,7 @@ class OC_Calendar_Share{ }else{ $active_where = ''; } - $stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE ((share = ? AND sharetype = "user") ' . $group_where . ') AND owner <> ? ' . $permission_where . ' ' . $active_where); + $stmt = OCP\DB::prepare("SELECT * FROM *PREFIX*calendar_share_" . $type . " WHERE ((share = ? AND sharetype = 'user') " . $group_where . ") AND owner <> ? " . $permission_where . " " . $active_where); $result = $stmt->execute(array($userid, $userid)); $return = array(); while( $row = $result->fetchRow()){ @@ -160,7 +160,7 @@ class OC_Calendar_Share{ $i = 0; foreach($groups as $group){ $group_where .= ' OR '; - $group_where .= ' (share = "' . $group . '" AND sharetype = "group") '; + $group_where .= " (share = '" . $group . "' AND sharetype = 'group') "; $i++; } return $group_where; @@ -169,7 +169,7 @@ class OC_Calendar_Share{ $permission_where = ''; if(!is_null($permission)){ $permission_where = ' AND permissions = '; - $permission_where .= ($permission=='rw')?'"1"':'"0"'; + $permission_where .= ($permission=='rw')?"'1'":"'0'"; } return $permission_where; } @@ -191,7 +191,7 @@ class OC_Calendar_Share{ public static function is_editing_allowed($share, $id, $type){ $group_where = self::group_sql(OC_Group::getUserGroups($share)); $permission_where = self::permission_sql('rw'); - $stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE ((share = ? AND sharetype = "user") ' . $group_where . ') ' . $permission_where); + $stmt = OCP\DB::prepare("SELECT * FROM *PREFIX*calendar_share_" . $type . " WHERE ((share = ? AND sharetype = 'user') " . $group_where . ") " . $permission_where); $result = $stmt->execute(array($share)); if($result->numRows() == 1){ return true; @@ -211,7 +211,7 @@ class OC_Calendar_Share{ */ public static function check_access($share, $id, $type){ $group_where = self::group_sql(OC_Group::getUserGroups($share)); - $stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE (' . $type . 'id = ? AND (share = ? AND sharetype = "user") ' . $group_where . ')'); + $stmt = OCP\DB::prepare("SELECT * FROM *PREFIX*calendar_share_" . $type . " WHERE (" . $type . "id = ? AND (share = ? AND sharetype = 'user') " . $group_where . ")"); $result = $stmt->execute(array($id,$share)); $rows = $result->numRows(); if($rows > 0){ @@ -229,9 +229,9 @@ class OC_Calendar_Share{ * @return: mixed - bool if false, array with type and id if true */ public static function getElementByToken($token){ - $stmt_calendar = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . OC_Calendar_Share::CALENDAR . ' WHERE sharetype = "public" AND share = ?'); + $stmt_calendar = OCP\DB::prepare("SELECT * FROM *PREFIX*calendar_share_" . OC_Calendar_Share::CALENDAR . " WHERE sharetype = 'public' AND share = ?"); $result_calendar = $stmt_calendar->execute(array($token)); - $stmt_event = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . OC_Calendar_Share::EVENT . ' WHERE sharetype = "public" AND share = ?'); + $stmt_event = OCP\DB::prepare("SELECT * FROM *PREFIX*calendar_share_" . OC_Calendar_Share::EVENT . " WHERE sharetype = 'public' AND share = ?"); $result_event = $stmt_event->execute(array($token)); $return = array(); if($result_calendar->numRows() == 0 && $result_event->numRows() == 0){ @@ -253,7 +253,7 @@ class OC_Calendar_Share{ * @param (string) $ */ public static function set_active($share, $id, $active){ - $stmt = OCP\DB::prepare('UPDATE *PREFIX*calendar_share_calendar SET active = ? WHERE share = ? AND sharetype = "user" AND calendarid = ?'); + $stmt = OCP\DB::prepare("UPDATE *PREFIX*calendar_share_calendar SET active = ? WHERE share = ? AND sharetype = 'user' AND calendarid = ?"); $stmt->execute(array($active, $share, $id)); } }
\ No newline at end of file diff --git a/apps/calendar/settings.php b/apps/calendar/settings.php index 981df9ffafd..a18b1ca9f42 100755 --- a/apps/calendar/settings.php +++ b/apps/calendar/settings.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -$tmpl = new OC_Template( 'calendar', 'settings'); +$tmpl = new OCP\Template( 'calendar', 'settings'); $timezone=OCP\Config::getUserValue(OCP\USER::getUser(),'calendar','timezone',''); $tmpl->assign('timezone',$timezone); $tmpl->assign('timezones',DateTimeZone::listIdentifiers()); diff --git a/apps/calendar/templates/part.choosecalendar.php b/apps/calendar/templates/part.choosecalendar.php index af3b82a48fc..a140316ea07 100755 --- a/apps/calendar/templates/part.choosecalendar.php +++ b/apps/calendar/templates/part.choosecalendar.php @@ -5,7 +5,7 @@ $option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser()); for($i = 0; $i < count($option_calendars); $i++){ echo "<tr>"; - $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields'); + $tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields'); $tmpl->assign('calendar', $option_calendars[$i]); if(OC_Calendar_Share::allUsersSharedwith($option_calendars[$i]['id'], OC_Calendar_Share::CALENDAR) == array()){ $shared = false; @@ -36,7 +36,7 @@ $count = count($share); for($i = 0; $i < $count; $i++){ $share[$i]['calendar'] = OC_Calendar_App::getCalendar($share[$i]['calendarid'], false, false); echo '<tr>'; - $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields.shared'); + $tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields.shared'); $tmpl->assign('share', $share[$i]); $tmpl->printpage(); echo '</tr>'; diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php index 8848d228054..965523f847a 100755 --- a/apps/calendar/templates/part.choosecalendar.rowfields.php +++ b/apps/calendar/templates/part.choosecalendar.rowfields.php @@ -1,8 +1,8 @@ <?php echo '<td width="20px"><input id="active_' . $_['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Calendar.activation(this,' . $_['calendar']['id'] . ')"' . ($_['calendar']['active'] ? ' checked="checked"' : '') . '></td>'; echo '<td id="' . OCP\USER::getUser() . '_' . $_['calendar']['id'] . '"><label for="active_' . $_['calendar']['id'] . '">' . $_['calendar']['displayname'] . '</label></td>'; -echo '<td width="20px"><a href="#" onclick="Calendar.UI.Share.dropdown(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['id'] . '\');" title="' . $l->t("Share Calendar") . '" class="action"><img class="svg action" src="' . ((!$_['shared']) ? '../../core/img/actions/share.svg' : '../../core/img/actions/shared.svg') . '"></a></td>'; -echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['uri'] . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img class="svg action" src="../../core/img/actions/public.svg"></a></td>'; -echo '<td width="20px"><a href="export.php?calid=' . $_['calendar']['id'] . '" title="' . $l->t('Download') . '" class="action"><img class="svg action" src="../../core/img/actions/download.svg"></a></td>'; -echo '<td width="20px"><a href="#" title="' . $l->t('Edit') . '" class="action" onclick="Calendar.UI.Calendar.edit(this, ' . $_['calendar']['id'] . ');"><img class="svg action" src="../../core/img/actions/rename.svg"></a></td>'; -echo '<td width="20px"><a href="#" onclick="Calendar.UI.Calendar.deleteCalendar(\'' . $_['calendar']['id'] . '\');" title="' . $l->t('Delete') . '" class="action"><img class="svg action" src="../../core/img/actions/delete.svg"></a></td>';
\ No newline at end of file +echo '<td width="20px"><a href="#" onclick="Calendar.UI.Share.dropdown(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['id'] . '\');" title="' . $l->t("Share Calendar") . '" class="action"><img class="svg action" src="' . ((!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg')) . '"></a></td>'; +echo '<td width="20px"><a href="#" onclick="Calendar.UI.showCalDAVUrl(\'' . OCP\USER::getUser() . '\', \'' . $_['calendar']['uri'] . '\');" title="' . $l->t("CalDav Link") . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/public.svg').'"></a></td>'; +echo '<td width="20px"><a href="?app=calendar&getfile=export.php?calid=' . $_['calendar']['id'] . '" title="' . $l->t('Download') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/download.svg').'"></a></td>'; +echo '<td width="20px"><a href="#" title="' . $l->t('Edit') . '" class="action" onclick="Calendar.UI.Calendar.edit(this, ' . $_['calendar']['id'] . ');"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/rename.svg').'"></a></td>'; +echo '<td width="20px"><a href="#" onclick="Calendar.UI.Calendar.deleteCalendar(\'' . $_['calendar']['id'] . '\');" title="' . $l->t('Delete') . '" class="action"><img class="svg action" src="'.OCP\Util::imagePath('core', 'actions/delete.svg').'"></a></td>'; diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php index 9e54616190c..b3bbf7a375b 100644..100755 --- a/apps/calendar/templates/part.eventform.php +++ b/apps/calendar/templates/part.eventform.php @@ -27,7 +27,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <th width="75px"><?php echo $l->t("Category");?>:</th> <td> <input id="category" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? htmlspecialchars($_['categories']) : '' ?>"> - <a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a> + <a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a> </td> <?php if(count($_['calendar_options']) > 1) { ?> <th width="75px"> <?php echo $l->t("Calendar");?>:</th> @@ -35,7 +35,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <select style="width:140px;" name="calendar"> <?php if (!isset($_['calendar'])) {$_['calendar'] = false;} - echo html_select_options($_['calendar_options'], $_['calendar'], array('value'=>'id', 'label'=>'displayname')); + echo OCP\html_select_options($_['calendar_options'], $_['calendar'], array('value'=>'id', 'label'=>'displayname')); ?> </select> </td> @@ -101,7 +101,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <td> <select id="repeat" name="repeat"> <?php - echo html_select_options($_['repeat_options'], $_['repeat']); + echo OCP\html_select_options($_['repeat_options'], $_['repeat']); ?> </select></td> <td><input type="button" style="float:right;" class="submit" value="<?php echo $l->t("Advanced"); ?>" onclick="Calendar.UI.showadvancedoptionsforrepeating();" id="advanced_options_button"></td> @@ -114,7 +114,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <td> <select id="advanced_month_select" name="advanced_month_select"> <?php - echo html_select_options($_['repeat_month_options'], $_['repeat_month']); + echo OCP\html_select_options($_['repeat_month_options'], $_['repeat_month']); ?> </select> </td> @@ -126,7 +126,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <td> <select id="advanced_year_select" name="advanced_year_select"> <?php - echo html_select_options($_['repeat_year_options'], $_['repeat_year']); + echo OCP\html_select_options($_['repeat_year_options'], $_['repeat_year']); ?> </select> </td> @@ -138,7 +138,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <td id="weekofmonthcheckbox"> <select id="weekofmonthoptions" name="weekofmonthoptions"> <?php - echo html_select_options($_['repeat_weekofmonth_options'], $_['repeat_weekofmonth']); + echo OCP\html_select_options($_['repeat_weekofmonth_options'], $_['repeat_weekofmonth']); ?> </select> </td> @@ -151,7 +151,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <select id="weeklyoptions" name="weeklyoptions[]" multiple="multiple" style="width: 150px;" title="<?php echo $l->t("Select weekdays") ?>"> <?php if (!isset($_['weekdays'])) {$_['weekdays'] = array();} - echo html_select_options($_['repeat_weekly_options'], $_['repeat_weekdays'], array('combine'=>true)); + echo OCP\html_select_options($_['repeat_weekly_options'], $_['repeat_weekdays'], array('combine'=>true)); ?> </select> </td> @@ -164,7 +164,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <select id="byyearday" name="byyearday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>"> <?php if (!isset($_['repeat_byyearday'])) {$_['repeat_byyearday'] = array();} - echo html_select_options($_['repeat_byyearday_options'], $_['repeat_byyearday'], array('combine'=>true)); + echo OCP\html_select_options($_['repeat_byyearday_options'], $_['repeat_byyearday'], array('combine'=>true)); ?> </select><?php echo $l->t('and the events day of year.'); ?> </td> @@ -177,7 +177,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <select id="bymonthday" name="bymonthday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>"> <?php if (!isset($_['repeat_bymonthday'])) {$_['repeat_bymonthday'] = array();} - echo html_select_options($_['repeat_bymonthday_options'], $_['repeat_bymonthday'], array('combine'=>true)); + echo OCP\html_select_options($_['repeat_bymonthday_options'], $_['repeat_bymonthday'], array('combine'=>true)); ?> </select><?php echo $l->t('and the events day of month.'); ?> </td> @@ -190,7 +190,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <select id="bymonth" name="bymonth[]" multiple="multiple" title="<?php echo $l->t("Select months") ?>"> <?php if (!isset($_['repeat_bymonth'])) {$_['repeat_bymonth'] = array();} - echo html_select_options($_['repeat_bymonth_options'], $_['repeat_bymonth'], array('combine'=>true)); + echo OCP\html_select_options($_['repeat_bymonth_options'], $_['repeat_bymonth'], array('combine'=>true)); ?> </select> </td> @@ -203,7 +203,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <select id="byweekno" name="byweekno[]" multiple="multiple" title="<?php echo $l->t("Select weeks") ?>"> <?php if (!isset($_['repeat_byweekno'])) {$_['repeat_byweekno'] = array();} - echo html_select_options($_['repeat_byweekno_options'], $_['repeat_byweekno'], array('combine'=>true)); + echo OCP\html_select_options($_['repeat_byweekno_options'], $_['repeat_byweekno'], array('combine'=>true)); ?> </select><?php echo $l->t('and the events week of year.'); ?> </td> @@ -222,7 +222,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <select id="end" name="end"> <?php if($_['repeat_end'] == '') $_['repeat_end'] = 'never'; - echo html_select_options($_['repeat_end_options'], $_['repeat_end']); + echo OCP\html_select_options($_['repeat_end_options'], $_['repeat_end']); ?> </select> </td> diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php index 80375c3ef78..e93ea1af4c9 100755 --- a/apps/calendar/templates/part.import.php +++ b/apps/calendar/templates/part.import.php @@ -8,7 +8,7 @@ <?php $calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser()); $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new calendar')); -echo html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname')); +echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname')); ?> </select> <div id="newcalform" style="display: none;"> diff --git a/apps/calendar/templates/part.showevent.php b/apps/calendar/templates/part.showevent.php index cad8bd27fb7..3646baf5bb7 100644..100755 --- a/apps/calendar/templates/part.showevent.php +++ b/apps/calendar/templates/part.showevent.php @@ -23,7 +23,7 @@ echo $l->t('No categories selected'); }else{ echo '<select id="category" name="categories[]" multiple="multiple" title="' . $l->t("Select category") . '">'; - echo html_select_options($_['categories'], $_['categories'], array('combine'=>true)); + echo OCP\html_select_options($_['categories'], $_['categories'], array('combine'=>true)); echo '</select>'; } ?> @@ -99,7 +99,7 @@ <td> <select id="repeat" name="repeat"> <?php - echo html_select_options(array($_['repeat_options'][$_['repeat']]), $_['repeat']); + echo OCP\html_select_options(array($_['repeat_options'][$_['repeat']]), $_['repeat']); ?> </select></td> <td><input type="button" style="float:right;" class="submit" value="<?php echo $l->t("Advanced"); ?>" onclick="Calendar.UI.showadvancedoptionsforrepeating();" id="advanced_options_button"></td> @@ -112,7 +112,7 @@ <td> <select id="advanced_month_select" name="advanced_month_select"> <?php - echo html_select_options(array($_['repeat_month_options'][$_['repeat_month']]), $_['repeat_month']); + echo OCP\html_select_options(array($_['repeat_month_options'][$_['repeat_month']]), $_['repeat_month']); ?> </select> </td> @@ -124,7 +124,7 @@ <td> <select id="advanced_year_select" name="advanced_year_select"> <?php - echo html_select_options(array($_['repeat_year_options'][$_['repeat_year']]), $_['repeat_year']); + echo OCP\html_select_options(array($_['repeat_year_options'][$_['repeat_year']]), $_['repeat_year']); ?> </select> </td> @@ -136,7 +136,7 @@ <td id="weekofmonthcheckbox"> <select id="weekofmonthoptions" name="weekofmonthoptions"> <?php - echo html_select_options(array($_['repeat_weekofmonth_options'][$_['repeat_weekofmonth']]), $_['repeat_weekofmonth']); + echo OCP\html_select_options(array($_['repeat_weekofmonth_options'][$_['repeat_weekofmonth']]), $_['repeat_weekofmonth']); ?> </select> </td> @@ -149,7 +149,7 @@ <select id="weeklyoptions" name="weeklyoptions[]" multiple="multiple" style="width: 150px;" title="<?php echo $l->t("Select weekdays") ?>"> <?php if (!isset($_['weekdays'])) {$_['weekdays'] = array();} - echo html_select_options(array($_['repeat_weekly_options'][$_['repeat_weekdays']]), $_['repeat_weekdays'], array('combine'=>true)); + echo OCP\html_select_options(array($_['repeat_weekly_options'][$_['repeat_weekdays']]), $_['repeat_weekdays'], array('combine'=>true)); ?> </select> </td> @@ -162,7 +162,7 @@ <select id="byyearday" name="byyearday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>"> <?php if (!isset($_['repeat_byyearday'])) {$_['repeat_byyearday'] = array();} - echo html_select_options(array($_['repeat_byyearday_options'][$_['repeat_byyearday']]), $_['repeat_byyearday'], array('combine'=>true)); + echo OCP\html_select_options(array($_['repeat_byyearday_options'][$_['repeat_byyearday']]), $_['repeat_byyearday'], array('combine'=>true)); ?> </select><?php echo $l->t('and the events day of year.'); ?> </td> @@ -175,7 +175,7 @@ <select id="bymonthday" name="bymonthday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>"> <?php if (!isset($_['repeat_bymonthday'])) {$_['repeat_bymonthday'] = array();} - echo html_select_options(array($_['repeat_bymonthday_options'][$_['repeat_bymonthday']]), $_['repeat_bymonthday'], array('combine'=>true)); + echo OCP\html_select_options(array($_['repeat_bymonthday_options'][$_['repeat_bymonthday']]), $_['repeat_bymonthday'], array('combine'=>true)); ?> </select><?php echo $l->t('and the events day of month.'); ?> </td> @@ -188,7 +188,7 @@ <select id="bymonth" name="bymonth[]" multiple="multiple" title="<?php echo $l->t("Select months") ?>"> <?php if (!isset($_['repeat_bymonth'])) {$_['repeat_bymonth'] = array();} - echo html_select_options(array($_['repeat_bymonth_options'][$_['repeat_bymonth']]), $_['repeat_bymonth'], array('combine'=>true)); + echo OCP\html_select_options(array($_['repeat_bymonth_options'][$_['repeat_bymonth']]), $_['repeat_bymonth'], array('combine'=>true)); ?> </select> </td> @@ -201,7 +201,7 @@ <select id="byweekno" name="byweekno[]" multiple="multiple" title="<?php echo $l->t("Select weeks") ?>"> <?php if (!isset($_['repeat_byweekno'])) {$_['repeat_byweekno'] = array();} - echo html_select_options(array($_['repeat_byweekno_options'][$_['repeat_byweekno']]), $_['repeat_byweekno'], array('combine'=>true)); + echo OCP\html_select_options(array($_['repeat_byweekno_options'][$_['repeat_byweekno']]), $_['repeat_byweekno'], array('combine'=>true)); ?> </select><?php echo $l->t('and the events week of year.'); ?> </td> @@ -220,7 +220,7 @@ <select id="end" name="end"> <?php if($_['repeat_end'] == '') $_['repeat_end'] = 'never'; - echo html_select_options(array($_['repeat_end_options'][$_['repeat_end']]), $_['repeat_end']); + echo OCP\html_select_options(array($_['repeat_end_options'][$_['repeat_end']]), $_['repeat_end']); ?> </select> </td> diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php index b11a4ef94cf..e0dabebf257 100755 --- a/apps/calendar/templates/share.dropdown.php +++ b/apps/calendar/templates/share.dropdown.php @@ -28,7 +28,7 @@ foreach($allocusers as $ocuser){ } unset($allusers[OCP\USER::getUser()]); $allusers = array_flip($allusers); -echo html_select_options($allusers, array()); +echo OCP\html_select_options($allusers, array()); ?> </select><br> <ul id="sharewithuser_list"> @@ -54,7 +54,7 @@ $allgroups = array(); foreach($allocgroups as $ocgroup){ $allgroups[$ocgroup] = $ocgroup; } -echo html_select_options($allgroups, array()); +echo OCP\html_select_options($allgroups, array()); ?> </select><br> <ul id="sharewithgroup_list"> |