add Pick Multiple to lang files..other minor changes

5 files changed, 13 insertions, 3 deletions

diff --git a/config.inc.php b/config.inc.php
index 96fe1ea..1949ffc 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -79,6 +79,8 @@ $list_webcals[] = '';						// or webcal:// and the filename should contain the .
 $list_webcals[] = '';						// $allow_webcals does *not* need to be "yes" for these to show up and work
 // add more lines as necessary
 
+#$more_webcals['cpath'][] = ''				//add webcals that will show up only for a particular cpath.
+
 $locked_cals[] = '';						// Fill in-between the quotes the names of the calendars you wish to hide
 $locked_cals[] = '';						// unless unlocked by a username/password login. This should be the
 $locked_cals[] = '';						// exact calendar filename without the .ics suffix.
diff --git a/functions/init.inc.php b/functions/init.inc.php
index 394a272..4ebd0f6 100644
--- a/functions/init.inc.php
+++ b/functions/init.inc.php
@@ -2,7 +2,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)) {
 	$_SERVER = &$_SERVER;
@@ -43,6 +43,10 @@ if($_REQUEST['cpath']){
 if (isset($user_template["$cpath"])){ 
   $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');
 include_once(BASE.'functions/userauth_functions.php');
@@ -56,8 +60,9 @@ if ($cookie_uri == '') {
 if ($bleed_time == '') $bleed_time = -1;
 
 // Grab the action (login or logout).
-$action = '';
-if (isset($_REQUEST['action']))	$action = $_REQUEST['action'];
+if (isset($_GET['action']))			$action = $_GET['action'];
+else if (isset($_POST['action']))		$action = $_POST['action'];
+else											$action = '';
 	
 // Login and/or logout.
 list($username, $password, $invalid_login) = user_login();
diff --git a/languages/english.inc.php b/languages/english.inc.php
index f976a90..fb1e014 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -43,6 +43,7 @@ $lang['l_gomonth'] 			= 'Go to This Month';
 $lang['l_goyear'] 			= 'Go to This Year';
 $lang['l_search'] 			= 'Search'; // the verb
 $lang['l_results'] 			= 'Search Results';
+$lang['l_pick_multiple'] 	= 'Pick multiple';
 $lang['l_query'] 			= 'Query'; // will be followed by the search query
 $lang['l_no_results'] 		= 'No events found';
 $lang['l_goprint'] 			= 'Printer Friendly';
diff --git a/languages/spanish.inc.php b/languages/spanish.inc.php
index e83b3b8..a7bac28 100644
--- a/languages/spanish.inc.php
+++ b/languages/spanish.inc.php
@@ -42,6 +42,7 @@ $lang['l_gomonth'] 			= 'Ir a este Mes';
 $lang['l_goyear'] 			= 'Ir a este Año';

 $lang['l_search'] 			= 'Buscar'; // the verb

 $lang['l_results'] 			= 'Resultados de la búsqueda';

+$lang['l_pick_multiple'] 	= 'Pick multiple';

 $lang['l_query'] 			= 'Consulta: '; // will be followed by the search query

 $lang['l_no_results'] 		= 'Ningún evento encontrado';

 $lang['l_goprint'] 		= 'Formato de impresión';

diff --git a/languages/swedish.inc.php b/languages/swedish.inc.php
index c202214..c6e0a2e 100644
--- a/languages/swedish.inc.php
+++ b/languages/swedish.inc.php
@@ -43,6 +43,7 @@ $lang['l_gomonth'] 			= 'Gå till denna Månad';
 $lang['l_goyear'] 			= 'Gå till detta År';
 $lang['l_search'] 			= 'Sök'; // the verb
 $lang['l_results'] 			= 'Resultat av Sökning';
+$lang['l_pick_multiple'] 	= 'Pick multiple';
 $lang['l_query'] 			= 'Sökord'; // will be followed by the search query
 $lang['l_no_results'] 		= 'Inga kalenderhändelser funna';
 $lang['l_goprint'] 			= 'Utskriftsvänlig';