[PHPiCalendar-Commits] phpicalendar/functions init.inc.php,1.85,1.86

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15145/phpicalendar/functions

Modified Files:
	init.inc.php 
Log Message:
add Pick Multiple to lang files..other minor changes

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** init.inc.php	23 Feb 2006 22:40:56 -0000	1.85
--- init.inc.php	16 Mar 2006 00:20:53 -0000	1.86
***************
*** 3,7 ****
  // uncomment when developing, comment for shipping version
  //error_reporting (E_ERROR | E_WARNING | E_PARSE);
! 
  // Older versions of PHP do not define $_SERVER. Define it here instead.
  if (!isset($_SERVER) && isset($_SERVER)) {
--- 3,7 ----
  // uncomment when developing, comment for shipping version
  //error_reporting (E_ERROR | E_WARNING | E_PARSE);
! error_reporting(0);
  // Older versions of PHP do not define $_SERVER. Define it here instead.
  if (!isset($_SERVER) && isset($_SERVER)) {
***************
*** 44,47 ****
--- 44,51 ----
    $template = $user_template["$cpath"]; 
  }
+ #set up specific webcals for a particular cpath
+ if (is_array($more_webcals[$cpath])){
+ 	array_merge($list_webcals, $more_webcals["$cpath"]);
+ }
  include_once(BASE.'error.php');
  include_once(BASE.'functions/calendar_functions.php');
***************
*** 57,62 ****
  
  // Grab the action (login or logout).
! $action = '';
! if (isset($_REQUEST['action']))	$action = $_REQUEST['action'];
  	
  // Login and/or logout.
--- 61,67 ----
  
  // Grab the action (login or logout).
! if (isset($_GET['action']))			$action = $_GET['action'];
! else if (isset($_POST['action']))		$action = $_POST['action'];
! else											$action = '';
  	
  // Login and/or logout.