From 9c705dc135dff435c0cb59dec4ebf3d0d1620d2c Mon Sep 17 00:00:00 2001 From: Jim Hu Date: Thu, 11 Dec 2008 21:54:52 +0000 Subject: update lots of files --- admin/index.php | 89 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 44 deletions(-) (limited to 'admin') diff --git a/admin/index.php b/admin/index.php index 11108cc..ef85465 100644 --- a/admin/index.php +++ b/admin/index.php @@ -5,14 +5,14 @@ require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$charset"); -if (empty($default_path)) { +if (empty($phpiCal_config->default_path)) { if (isset($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'on' ) { $default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/admin/')); } else { $default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/admin/')); } } -if ($allow_admin != 'yes') { +if ($phpiCal_config->allow_admin != 'yes') { exit(error('The administration menu has been turned off.', $cal, '../')); } @@ -48,74 +48,75 @@ if ($auth_method == 'server') { $login_good = ($is_loged_in) ? '' : 'oops'; $login_bad = ((!$is_loged_in) && ($_GET['action'] == 'login')) ? 'oops' : ''; - -// Delete a calendar -// Not at all secure - need to strip out path info if used by users besides admin in the future -$delete_msg = ''; -if ($_POST['action'] == 'delete') { - foreach ($delete_calendar as $filename) { - if (!delete_cal(urldecode($filename))) { - $delete_msg = $delete_msg . '' . $lang['l_delete_error'] . ' ' . urldecode(substr($filename,0,-4)) . '
'; - } else { - $delete_msg = $delete_msg . '' . urldecode(substr($filename,0,-4)) . ' ' . $lang['l_delete_success'] . '
'; +if(is_loggedin()){ + // Delete a calendar + // Not at all secure - need to strip out path info if used by users besides admin in the future + $delete_msg = ''; + if ($_POST['action'] == 'delete') { + foreach ($delete_calendar as $filename) { + if (!delete_cal(urldecode($filename))) { + $delete_msg = $delete_msg . '' . $lang['l_delete_error'] . ' ' . urldecode(substr($filename,0,-4)) . '
'; + } else { + $delete_msg = $delete_msg . '' . urldecode(substr($filename,0,-4)) . ' ' . $lang['l_delete_success'] . '
'; + } } } -} - -// Add or Update a calendar -$addupdate_msg = ''; -if ((isset($_POST['action'])) && ($_POST['action'] == 'addupdate')) { - for ($filenumber = 1; $filenumber < 6; $filenumber++) { - $file = $_FILES['calfile']; - $addupdate_success = FALSE; - - if (!is_uploaded_file_v4($file['tmp_name'][$filenumber])) { - $upload_error = get_upload_error($file['error'][$filenumber]); - } elseif (!is_uploaded_ics($file['name'][$filenumber])) { - $upload_error = $upload_error_type_lang; - } elseif (!copy_cal($file['tmp_name'][$filenumber], $file['name'][$filenumber])) { - $upload_error = $copy_error_lang . " " . $file['tmp_name'][$filenumber] . " - " . $calendar_path . "/" . $file['name'][$filenumber]; - } else { - $addupdate_success = TRUE; - } - - if ($addupdate_success == TRUE) { - $addupdate_msg = $addupdate_msg . ''.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_action_success'].'
'; - } else { - $addupdate_msg = $addupdate_msg . ''.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_upload_error'].'
'; + + // Add or Update a calendar + $addupdate_msg = ''; + if ((isset($_POST['action'])) && ($_POST['action'] == 'addupdate')) { + for ($filenumber = 1; $filenumber < 6; $filenumber++) { + $file = $_FILES['calfile']; + $addupdate_success = FALSE; + + if (!is_uploaded_file_v4($file['tmp_name'][$filenumber])) { + $upload_error = get_upload_error($file['error'][$filenumber]); + } elseif (!is_uploaded_ics($file['name'][$filenumber])) { + $upload_error = $upload_error_type_lang; + } elseif (!copy_cal($file['tmp_name'][$filenumber], $file['name'][$filenumber])) { + $upload_error = $copy_error_lang . " " . $file['tmp_name'][$filenumber] . " - " . $calendar_path . "/" . $file['name'][$filenumber]; + } else { + $addupdate_success = TRUE; + } + + if ($addupdate_success == TRUE) { + $addupdate_msg = $addupdate_msg . ''.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_action_success'].'
'; + } else { + $addupdate_msg = $addupdate_msg . ''.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_upload_error'].'
'; + } } } } $calendar_name = $lang['l_admin_header']; -$page = new Page(BASE.'templates/'.$template.'/admin.tpl'); +$page = new Page(BASE.'templates/'.$phpiCal_config->template.'/admin.tpl'); $page->replace_files(array( - 'header' => BASE.'templates/'.$template.'/header.tpl', - 'footer' => BASE.'templates/'.$template.'/footer.tpl' + 'header' => BASE.'templates/'.$phpiCal_config->template.'/header.tpl', + 'footer' => BASE.'templates/'.$phpiCal_config->template.'/footer.tpl' )); $page->replace_tags(array( - 'version' => $phpicalendar_version, + 'version' => $phpiCal_config->phpicalendar_version, 'event_js' => '', - 'charset' => $charset, - 'default_path' => $default_path.'/', - 'template' => $template, + 'charset' => $phpiCal_config->charset, + 'default_path' => "../".$phpiCal_config->default_path, + 'template' => $phpiCal_config->template, 'cal' => $cal, 'getdate' => $getdate, 'calendar_name' => $calendar_name, 'display_date' => $display_date, 'current_view' => $current_view, 'sidebar_date' => $sidebar_date, - 'rss_powered' => $rss_powered, + 'rss_powered' => $phpiCal_config->rss_powered, 'rss_available' => '', 'rss_valid' => '', 'show_search' => '', 'login_error' => $login_bad, 'display_login' => $login_good, 'delete_msg' => $delete_msg, - 'addupdate_msg' => $addupdate_msg, + 'addupdate_msg' => $addupdate_msg, 'l_day' => $lang['l_day'], 'l_week' => $lang['l_week'], 'l_month' => $lang['l_month'], -- cgit v1.2.3