[PHPiCalendar-Commits] phpicalendar/admin index.php,1.7,1.8

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/admin
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1548/admin

Modified Files:
	index.php 
Log Message:
update lots of files

Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/admin/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.php	23 May 2007 18:30:37 -0000	1.7
--- index.php	11 Dec 2008 21:54:52 -0000	1.8
***************
*** 6,10 ****
  header("Content-Type: text/html; charset=$charset");
  
! if (empty($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/'));
--- 6,10 ----
  header("Content-Type: text/html; charset=$charset");
  
! 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/'));
***************
*** 13,17 ****
  	}
  }
! if ($allow_admin != 'yes') {
  	exit(error('The administration menu has been turned off.', $cal, '../'));
  }
--- 13,17 ----
  	}
  }
! if ($phpiCal_config->allow_admin != 'yes') {
  	exit(error('The administration menu has been turned off.', $cal, '../'));
  }
***************
*** 49,87 ****
  $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 . '<font color="red">' . $lang['l_delete_error'] . ' ' . urldecode(substr($filename,0,-4)) . '</font><br />';
! 		} else {
! 			$delete_msg = $delete_msg . '<font color="green">' . urldecode(substr($filename,0,-4)) . ' ' . $lang['l_delete_success'] . '</font><br />';
  		}
  	}
! }
! 
! // 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 . '<font color="green">'.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_action_success'].'</font><br />';
! 		} else {
! 			$addupdate_msg = $addupdate_msg . '<font color="red">'.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_upload_error'].'</font><br />';
  		}
  	}
--- 49,88 ----
  $login_good = ($is_loged_in) ? '' : 'oops';
  $login_bad	= ((!$is_loged_in) && ($_GET['action'] == 'login')) ? 'oops' : '';
! 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 . '<font color="red">' . $lang['l_delete_error'] . ' ' . urldecode(substr($filename,0,-4)) . '</font><br />';
! 			} else {
! 				$delete_msg = $delete_msg . '<font color="green">' . urldecode(substr($filename,0,-4)) . ' ' . $lang['l_delete_success'] . '</font><br />';
! 			}
  		}
  	}
! 	
! 	// 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 . '<font color="green">'.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_action_success'].'</font><br />';
! 			} else {
! 				$addupdate_msg = $addupdate_msg . '<font color="red">'.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_upload_error'].'</font><br />';
! 			}
  		}
  	}
***************
*** 90,106 ****
  $calendar_name = $lang['l_admin_header'];
  
! $page = new Page(BASE.'templates/'.$template.'/admin.tpl');
  
  $page->replace_files(array(
! 	'header'			=> BASE.'templates/'.$template.'/header.tpl',
! 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl'
  	));
  
  $page->replace_tags(array(
! 	'version'			=> $phpicalendar_version,
  	'event_js'			=> '',
! 	'charset'			=> $charset,
! 	'default_path'		=> $default_path.'/',
! 	'template'			=> $template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
--- 91,107 ----
  $calendar_name = $lang['l_admin_header'];
  
! $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/admin.tpl');
  
  $page->replace_files(array(
! 	'header'			=> BASE.'templates/'.$phpiCal_config->template.'/header.tpl',
! 	'footer'			=> BASE.'templates/'.$phpiCal_config->template.'/footer.tpl'
  	));
  
  $page->replace_tags(array(
! 	'version'			=> $phpiCal_config->phpicalendar_version,
  	'event_js'			=> '',
! 	'charset'			=> $phpiCal_config->charset,
! 	'default_path'		=> "../".$phpiCal_config->default_path,
! 	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
***************
*** 109,113 ****
  	'current_view'		=> $current_view,
  	'sidebar_date'		=> $sidebar_date,
! 	'rss_powered'	 	=> $rss_powered,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',
--- 110,114 ----
  	'current_view'		=> $current_view,
  	'sidebar_date'		=> $sidebar_date,
! 	'rss_powered'	 	=> $phpiCal_config->rss_powered,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',
***************
*** 116,120 ****
  	'display_login'		=> $login_good,
  	'delete_msg'		=> $delete_msg,
! 	'addupdate_msg'	=> $addupdate_msg,
  	'l_day'				=> $lang['l_day'],
  	'l_week'			=> $lang['l_week'],
--- 117,121 ----
  	'display_login'		=> $login_good,
  	'delete_msg'		=> $delete_msg,
! 	'addupdate_msg'		=> $addupdate_msg,
  	'l_day'				=> $lang['l_day'],
  	'l_week'			=> $lang['l_week'],