diff options
| author | Bart Visscher <bart@thisnet.nl> | 2011-09-18 23:31:56 +0400 |
|---|---|---|
| committer | Bart Visscher <bart@thisnet.nl> | 2011-09-18 23:31:56 +0400 |
| commit | e990ef35426b7dde59ec74eb1568a8cfbd69f316 (patch) | |
| tree | 9b4a276885378540812ce93c3cddcc73a00ba3b0 /apps/calendar | |
| parent | 8966ed5a004a9b830f093355170d381566d58554 (diff) | |
Move some common code to OC_Util
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
Diffstat (limited to 'apps/calendar')
| -rw-r--r-- | apps/calendar/export.php | 7 | ||||
| -rw-r--r-- | apps/calendar/index.php | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/apps/calendar/export.php b/apps/calendar/export.php index f03a5d23e68..d5ca5eeedad 100644 --- a/apps/calendar/export.php +++ b/apps/calendar/export.php @@ -18,14 +18,11 @@ * MA 02111-1307 USA * *************************************************/ require_once ("../../lib/base.php"); -if(!OC_USER::isLoggedIn()) { - header("Location: " . OC_HELPER::linkTo("", "index.php")); - exit; -} +OC_Util::checkLoggedIn(); $cal = $_GET["calid"]; $calendar = OC_Calendar_Calendar::findCalendar($cal); if($calendar["userid"] != OC_User::getUser()){ - header("Location: " . OC_HELPER::linkTo("", "index.php")); + header( 'Location: '.OC_Helper::linkTo('', 'index.php')); exit; } $calobjects = OC_Calendar_Object::all($cal); diff --git a/apps/calendar/index.php b/apps/calendar/index.php index c9fc9889d40..c93ea93bb6c 100644 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -18,10 +18,7 @@ * MA 02111-1307 USA * *************************************************/ require_once ("../../lib/base.php"); -if(!OC_USER::isLoggedIn()) { - header("Location: " . OC_HELPER::linkTo("", "index.php")); - exit; -} +OC_Util::checkLoggedIn(); // Create default calendar ... $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser()); if( count($calendars) == 0){ |