add login to month view

9 files changed, 211 insertions, 10 deletions

diff --git a/functions/userauth_functions.php b/functions/userauth_functions.php
index 3808653..2875fd4 100644
--- a/functions/userauth_functions.php
+++ b/functions/userauth_functions.php
@@ -96,7 +96,7 @@ function user_login() {
 	}
 	
 	// Check to make sure the username and password is valid.
-	if (!array_key_exists("$username:$password", $phpiCal_config->locked_map)) {
+	if (!array_key_exists("$username:$password", $locked_map)) {
 		// Remember the invalid login, because we may want to display
 		// a message elsewhere or check validity.
 		return array($username, $password, true);
diff --git a/includes/login.php b/includes/login.php
index e7713c1..83a7f1c 100644
--- a/includes/login.php
+++ b/includes/login.php
@@ -1,7 +1,7 @@
 <?php
 	// Hide the login block if logged in, there are no lock usernames,
 	// or if authenticated via HTTP.
-	if ($username == '' && $allow_login == 'yes' &&	!isset($_SERVER['PHP_AUTH_USER'])) {
+	if ($username == '' && $phpiCal_config->allow_login == 'yes' &&	!isset($_SERVER['PHP_AUTH_USER'])) {
 		// Set the login table width if not set.
 		if (!isset($login_width)) $login_width = "100%";
 
diff --git a/month.php b/month.php
index 989fe9e..b931740 100644
--- a/month.php
+++ b/month.php
@@ -46,6 +46,12 @@ $list_jumps 	= list_jumps();
 $list_calcolors = list_calcolors();
 $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
 
+// login/logout
+$is_logged_in = ($username != '' && !$invalid_login) ? true : false;
+$show_user_login = (!$is_logged_in && $phpiCal_config->allow_login == 'yes');
+$login_querys = login_querys();
+$logout_querys = logout_querys();
+
 $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/month.tpl');
 
 $page->replace_files(array(
@@ -74,7 +80,12 @@ $page->replace_tags(array(
 	'next_month' 		=> $next_month,
 	'prev_month'	 	=> $prev_month,
 	'show_goto' 		=> '',
-	'is_logged_in' 		=> '',
+	'show_user_login'	=> $show_user_login,
+	'invalid_login'		=> $invalid_login,
+	'login_querys'		=> $login_querys,
+	'is_logged_in' 		=> $is_logged_in,
+	'username'			=> $username,
+	'logout_querys'		=> $logout_querys,
 	'list_jumps' 		=> $list_jumps,
 	'list_icals' 		=> $list_icals,
 	'list_icals_pick'	=> $list_icals_pick,
diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl
index 111fa35..7a51c29 100644
--- a/templates/default/calendar_nav.tpl
+++ b/templates/default/calendar_nav.tpl
@@ -65,6 +65,44 @@
 						<img src="images/spacer.gif" width="20" height="1" alt=" " />
 					</td>
 					<td width="160" valign="top">
+					<!-- switch show_user_login on -->
+					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
+					<input type="hidden" name="action" value="login" />
+					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
+						<tr>
+							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
+						</tr>
+						<!-- switch invalid_login on -->
+						<tr>
+							<td colspan="2" bgcolor="#FFFFFF" align="left">
+								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
+									<font color="red">{L_INVALID_LOGIN}</font>
+								</div>
+							</td>
+						</tr>
+						<!-- switch invalid_login off -->
+						<tr>
+							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
+							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
+						</tr>
+						<tr>
+							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
+							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
+						</tr>
+						<tr>
+							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+						</tr>
+					</table>
+					</form>
+					<table width="100%" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+							<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+							<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						</tr>
+					</table>
+					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
+					<!-- switch show_user_login off -->
 						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
 							<tr>
 								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
@@ -82,7 +120,7 @@
 										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
 										<!-- switch display_download off -->
 										<!-- switch is_logged_in on -->
-										<a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a>
+										<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
 										<!-- switch is_logged_in off -->
 									</div>
 								</td>
diff --git a/templates/green/calendar_nav.tpl b/templates/green/calendar_nav.tpl
index 111fa35..7a51c29 100644
--- a/templates/green/calendar_nav.tpl
+++ b/templates/green/calendar_nav.tpl
@@ -65,6 +65,44 @@
 						<img src="images/spacer.gif" width="20" height="1" alt=" " />
 					</td>
 					<td width="160" valign="top">
+					<!-- switch show_user_login on -->
+					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
+					<input type="hidden" name="action" value="login" />
+					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
+						<tr>
+							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
+						</tr>
+						<!-- switch invalid_login on -->
+						<tr>
+							<td colspan="2" bgcolor="#FFFFFF" align="left">
+								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
+									<font color="red">{L_INVALID_LOGIN}</font>
+								</div>
+							</td>
+						</tr>
+						<!-- switch invalid_login off -->
+						<tr>
+							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
+							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
+						</tr>
+						<tr>
+							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
+							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
+						</tr>
+						<tr>
+							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+						</tr>
+					</table>
+					</form>
+					<table width="100%" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+							<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+							<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						</tr>
+					</table>
+					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
+					<!-- switch show_user_login off -->
 						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
 							<tr>
 								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
@@ -82,7 +120,7 @@
 										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
 										<!-- switch display_download off -->
 										<!-- switch is_logged_in on -->
-										<a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a>
+										<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
 										<!-- switch is_logged_in off -->
 									</div>
 								</td>
diff --git a/templates/grey/calendar_nav.tpl b/templates/grey/calendar_nav.tpl
index 111fa35..7a51c29 100644
--- a/templates/grey/calendar_nav.tpl
+++ b/templates/grey/calendar_nav.tpl
@@ -65,6 +65,44 @@
 						<img src="images/spacer.gif" width="20" height="1" alt=" " />
 					</td>
 					<td width="160" valign="top">
+					<!-- switch show_user_login on -->
+					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
+					<input type="hidden" name="action" value="login" />
+					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
+						<tr>
+							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
+						</tr>
+						<!-- switch invalid_login on -->
+						<tr>
+							<td colspan="2" bgcolor="#FFFFFF" align="left">
+								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
+									<font color="red">{L_INVALID_LOGIN}</font>
+								</div>
+							</td>
+						</tr>
+						<!-- switch invalid_login off -->
+						<tr>
+							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
+							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
+						</tr>
+						<tr>
+							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
+							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
+						</tr>
+						<tr>
+							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+						</tr>
+					</table>
+					</form>
+					<table width="100%" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+							<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+							<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						</tr>
+					</table>
+					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
+					<!-- switch show_user_login off -->
 						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
 							<tr>
 								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
@@ -82,7 +120,7 @@
 										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
 										<!-- switch display_download off -->
 										<!-- switch is_logged_in on -->
-										<a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a>
+										<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
 										<!-- switch is_logged_in off -->
 									</div>
 								</td>
diff --git a/templates/red/calendar_nav.tpl b/templates/red/calendar_nav.tpl
index 111fa35..7a51c29 100644
--- a/templates/red/calendar_nav.tpl
+++ b/templates/red/calendar_nav.tpl
@@ -65,6 +65,44 @@
 						<img src="images/spacer.gif" width="20" height="1" alt=" " />
 					</td>
 					<td width="160" valign="top">
+					<!-- switch show_user_login on -->
+					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
+					<input type="hidden" name="action" value="login" />
+					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
+						<tr>
+							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
+						</tr>
+						<!-- switch invalid_login on -->
+						<tr>
+							<td colspan="2" bgcolor="#FFFFFF" align="left">
+								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
+									<font color="red">{L_INVALID_LOGIN}</font>
+								</div>
+							</td>
+						</tr>
+						<!-- switch invalid_login off -->
+						<tr>
+							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
+							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
+						</tr>
+						<tr>
+							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
+							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
+						</tr>
+						<tr>
+							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+						</tr>
+					</table>
+					</form>
+					<table width="100%" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+							<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+							<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						</tr>
+					</table>
+					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
+					<!-- switch show_user_login off -->
 						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
 							<tr>
 								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
@@ -82,7 +120,7 @@
 										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
 										<!-- switch display_download off -->
 										<!-- switch is_logged_in on -->
-										<a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a>
+										<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
 										<!-- switch is_logged_in off -->
 									</div>
 								</td>
diff --git a/templates/tan/calendar_nav.tpl b/templates/tan/calendar_nav.tpl
index 111fa35..7a51c29 100644
--- a/templates/tan/calendar_nav.tpl
+++ b/templates/tan/calendar_nav.tpl
@@ -65,6 +65,44 @@
 						<img src="images/spacer.gif" width="20" height="1" alt=" " />
 					</td>
 					<td width="160" valign="top">
+					<!-- switch show_user_login on -->
+					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
+					<input type="hidden" name="action" value="login" />
+					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
+						<tr>
+							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
+						</tr>
+						<!-- switch invalid_login on -->
+						<tr>
+							<td colspan="2" bgcolor="#FFFFFF" align="left">
+								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
+									<font color="red">{L_INVALID_LOGIN}</font>
+								</div>
+							</td>
+						</tr>
+						<!-- switch invalid_login off -->
+						<tr>
+							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
+							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
+						</tr>
+						<tr>
+							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
+							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
+						</tr>
+						<tr>
+							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+						</tr>
+					</table>
+					</form>
+					<table width="100%" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+							<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+							<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						</tr>
+					</table>
+					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
+					<!-- switch show_user_login off -->
 						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
 							<tr>
 								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
@@ -82,7 +120,7 @@
 										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
 										<!-- switch display_download off -->
 										<!-- switch is_logged_in on -->
-										<a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a>
+										<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
 										<!-- switch is_logged_in off -->
 									</div>
 								</td>
diff --git a/year.php b/year.php
index 7bec7a7..9bcf802 100644
--- a/year.php
+++ b/year.php
@@ -36,7 +36,7 @@ $list_icals_pick = display_ical_list(availableCalendars($username, $password, $p
 
 // login/logout
 $is_logged_in = ($username != '' && !$invalid_login) ? true : false;
-$show_user_login = (!$is_logged_in && $allow_login == 'yes');
+$show_user_login = (!$is_logged_in && $phpiCal_config->allow_login == 'yes');
 $login_querys = login_querys();
 $logout_querys = logout_querys();
 
@@ -78,7 +78,7 @@ $page->replace_tags(array(
 	'next_year'			=> $next_year,
 	'prev_year'			=> $prev_year,
 	'show_goto' 		=> '',
-	'show_user_login'	=> $phpiCal_config->show_user_login,
+	'show_user_login'	=> $show_user_login,
 	'invalid_login'		=> $invalid_login,
 	'login_querys'		=> $login_querys,
 	'is_logged_in' 		=> $is_logged_in,