Tweeks of admin initial wiring of template.

5 files changed, 82 insertions, 284 deletions

diff --git a/admin.php b/admin.php
index 2ea8b1b..d4ad90f 100644
--- a/admin.php
+++ b/admin.php
@@ -2,8 +2,10 @@
 session_start();
 
 define('BASE', './');
-include (BASE.'functions/init.inc.php');
-include (BASE.'functions/admin_functions.php');
+require_once(BASE.'functions/init.inc.php');
+require_once(BASE.'functions/admin_functions.php');
+require_once(BASE.'functions/list_functions.php');
+require_once(BASE.'functions/template.php');
 
 // Redirect if administration is not allowed
 if ($allow_admin != "yes") {
@@ -41,241 +43,33 @@ else {
 	}
 }
 
-$calendar_name = $admin_header_lang;
-include (BASE.'includes/header.inc.php'); 
+$calendar_name = $lang['l_admin_header'];
+
+$page = new Page(BASE.'templates/'.$template.'/admin.tpl');
+
+$page->replace_tags(array(
+	'header'			=> BASE.'templates/'.$template.'/header.tpl',
+	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
+	'sidebar'			=> BASE.'templates/'.$template.'/sidebar.tpl',
+	'event_js'			=> BASE.'functions/event.js',
+	'template'			=> $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_available' 	=> '',
+	'rss_valid' 		=> '',
+	'todo_js' 			=> '',
+	'show_search' 		=> ''		
+	));
+
+$page->output();
 
 ?>
-<center>
-<table width="640" border="0" cellspacing="0" cellpadding="0" class="calborder">
-	<tr>
-		<td align="center" valign="middle">
-			<table width="100%" border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td align="left" width="120" class="navback"><?php echo '<a href="'.BASE.'"><img src="'.BASE.'styles/'.$style_sheet.'/back.gif" alt=" " border="0" align="left"></a>'; ?></td>
-					<td class="navback">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td align="center" class="navback" nowrap valign="middle"><font class="H20"><?php echo "$admin_header_lang"; ?></font></td>
-							</tr>
-						</table>
-					</td>
-					<td align="right" width="120" class="navback">	
-						<table width="120" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td><?php echo '<a class="psf" href="'.BASE.'day.php?cal='.$cal.'&amp;getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/day_on.gif" alt=" " border="0"></a></td>'; ?>
-								<td><?php echo '<a class="psf" href="'.BASE.'week.php?cal='.$cal.'&amp;getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/week_on.gif" alt=" " border="0"></a></td>'; ?>
-								<td><?php echo '<a class="psf" href="'.BASE.'month.php?cal='.$cal.'&amp;getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/month_on.gif" alt=" " border="0"></a></td>'; ?>
-								<td><?php echo '<a class="psf" href="'.BASE.'year.php?cal='.$cal.'&amp;getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/year_on.gif" alt=" " border="0"></a></td>'; ?>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
-	</tr>
-	<tr>
-		<td class="G10" align="right"><?php if ($auth_method != "none" && $is_loged_in == TRUE) { echo "<a href=\"{$HTTP_SERVER_VARS['PHP_SELF']}?action=logout\">{$logout_lang}</a>"; } ?>&nbsp;</td>
-	</tr>
-	<tr>
-		<td>
-			<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">
-				<tr>
-					<td width="2%"></td>
-					<td width="98%" valign="top" align="left">
-<?php 
 
 
 
-// If User is Not Logged In, Display The Login Page
-if ($is_loged_in == FALSE) {
-	if (isset($username)  && $username !='') {
-		$login_error =  "<font color=\"red\">$invalid_login_lang</font>";
-	} else {
-		$login_error = '';
-	}
-		
-    echo <<<EOT
-	<form action="{$HTTP_SERVER_VARS['PHP_SELF']}" method="post">
-		<table cellspacing="0" cellpadding="0">
-			<tr>
-				<td nowrap>{$username_lang}: </td>
-				<td align="left"><input type="text" name="username"></td>
-			</tr>
-			<tr>
-				<td>{$password_lang}: </td>
-				<td align="left"><input type="password" name="password"></td>
-			</tr>
-			<tr>
-				<td>&nbsp;</td>
-				<td align="left"><input type="submit" value="{$login_lang}"></td>
-			</tr>
-			<tr>
-				<td align="center" colspan="3">{$login_error}&nbsp;</td>
-			</tr>
-	    </table>
-	</form>
-EOT;
-
-
-	echo "
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>";
-
-	include (BASE.'includes/footer.inc.php');
-	
-	echo "
-	</center>
-	</body>
-	</html>";
-	
-	die();
-}
-
-
-// The user is logged in if we get here
-
-
-
-// Add or Update a calendar
-$addupdate_msg 	= '';
-$delete_msg		= '';
-if ((isset($action))  && ($action == "addupdate")) {
-	$addupdate_msg = "";
-
-	for($filenumber=1; $filenumber<6; $filenumber++) {
-		$file = $HTTP_POST_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)
-			$addupdate_msg = $addupdate_msg . "<font color=\"green\">{$cal_file_lang} {$filenumber}: {$action_success_lang}</font><br>";
-		else
-			$addupdate_msg = $addupdate_msg . "<font color=\"red\">{$cal_file_lang} {$filenumber}: {$upload_error}</font><br>";
-	}
-}
-
-// Delete a calendar
-//  Not at all secure - need to strip out path info if used by users besides admin in the future
-if ($action == "delete") {
-	$delete_msg = "";
-
-	foreach ($delete_calendar as $filename) {
-		if (!delete_cal(urldecode($filename))) {
-			$delete_msg = $delete_msg . "<font color=\"red\">" . $delete_error_lang . " " . urldecode(substr($filename,0,-4)) . "</font><br>";
-		}
-		else {
-			$delete_msg = $delete_msg . "<font color=\"green\">" . urldecode(substr($filename,0,-4)) . " " . $delete_success_lang . "</font><br>";
-		}
-	}
-}
-
-?>
-
-
-<h2><?php echo $addupdate_cal_lang; ?></h2>
-<p><?php echo $addupdate_desc_lang; ?></p>
-<form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post" enctype="multipart/form-data">
-    <input type="hidden" name="action" value="addupdate">
-	<table border="0" cellspacing="0">
-		<tr>
-			<td nowrap><?php echo $cal_file_lang; ?> 1: </td>
-			<td><input type="file" name="calfile[1]"></td>
-		</tr>
-		<tr>
-			<td nowrap><?php echo $cal_file_lang; ?> 2: </td>
-			<td><input type="file" name="calfile[2]"></td>
-		</tr>
-		<tr>
-			<td nowrap><?php echo $cal_file_lang; ?> 3: </td>
-			<td><input type="file" name="calfile[3]"></td>
-		</tr>
-		<tr>
-			<td nowrap><?php echo $cal_file_lang; ?> 4: </td>
-			<td><input type="file" name="calfile[4]"></td>
-		</tr>
-		<tr>
-			<td nowrap><?php echo $cal_file_lang; ?> 5: </td>
-			<td><input type="file" name="calfile[5]"></td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td><input type="submit" value="<?php echo $submit_lang; ?>"></td>
-		</tr>
-		<tr>
-			<td align="center" colspan="2"><?php echo $addupdate_msg; ?>&nbsp;</td>
-		</tr>
-    </table>
-</form>
-
-<h2><?php echo $delete_cal_lang; ?></h2>
-<form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post">
-	<input type="hidden" name="action" value="delete">
-	<table border="0" cellspacing="0">
-		<?php
-				
-			// Print Calendar Checkboxes
-			//
-			$COLUMNS_TO_PRINT = 3;
-			$column = 1;
-			$filelist = availableCalendarNames('', '', '', true);
-			foreach ($filelist as $file) {
-				if ($column > $COLUMNS_TO_PRINT) {
-					echo "</tr>";
-					$column = 1;
-				}
-				if ($column == 1) {
-					echo "<tr>";
-				}
-				
-				$cal_filename_tmp = substr($file,0,-4);
-				$cal_tmp = urlencode($file);
-				$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
-				
-				echo "<td align=\"left\"><input name=\"delete_calendar[]\" value=\"$cal_tmp\" type=\"checkbox\">$cal_displayname_tmp</td>\n";
-				
-				$column++;
-			}
-			// Print remaining empty columns if necessary
-			$number_of_columns = count($filelist);
-			while (gettype($number_of_columns/$COLUMNS_TO_PRINT) != "integer") {
-				echo "<td>&nbsp;</td>";
-				$number_of_columns++;
-			}
-		?>
-		</tr>
-	</table>
-	<p><input type="submit" value="<?php echo $delete_lang; ?>"></p>
-	<p><?php echo $delete_msg; ?>&nbsp;</p>
-</form>
-
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-</center>
-
-<?php include (BASE.'includes/footer.inc.php'); ?>
-
-
 
diff --git a/config.inc.php b/config.inc.php
index 68e73df..11d4deb 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -49,7 +49,7 @@ $allow_login			= 'no';				// Set to yes to prompt for login to unlock calendars.
 $phpicalendar_publishing = '';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
 
 // Administration settings
-$allow_admin			= 'no';				// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method			
+$allow_admin			= 'yes';				// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method			
 $auth_method			= 'ftp';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
 $auth_internal_username	= 'admin';			// Only used if $auth_method='internal'. The username for the administrator.
 $auth_internal_password	= 'default';		// Only used if $auth_method='internal'. The password for the administrator.
diff --git a/languages/english.inc.php b/languages/english.inc.php
index c3934d4..6a41ce3 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -100,23 +100,25 @@ $lang['l_delete_cal']		= 'Delete a Calendar';
 $lang['l_logout']			= 'Logout';
 $lang['l_cal_file']			= 'Calendar File';
 $lang['l_php_error']		= 'PHP Error';
-$upload_error_gen_lang	= 'There was a problem with your upload.';
-$upload_error_lang[0]	= 'There was a problem with your upload.';
-$upload_error_lang[1]	= 'The file you are trying to upload is too big.';
-$upload_error_lang[2]	= 'The file you are trying to upload is too big.';
-$upload_error_lang[3]	= 'The file you are trying upload was only partially uploaded.';
-$upload_error_lang[4]	= 'You must select a file for upload.';
-$upload_error_type_lang = 'Only .ics files may be uploaded.';
-$copy_error_lang		= 'Failed to copy file';
-$delete_error_lang		= 'Failed to delete file';
-$delete_success_lang	= 'was deleted successfully.';
-$action_success_lang	= 'Your action was successful.';
-$submit_lang			= 'Submit';
-$delete_lang			= 'Delete';
+$upload_error_gen_lang		= 'There was a problem with your upload.';
+$upload_error_lang[0]		= 'There was a problem with your upload.';
+$upload_error_lang[1]		= 'The file you are trying to upload is too big.';
+$upload_error_lang[2]		= 'The file you are trying to upload is too big.';
+$upload_error_lang[3]			= 'The file you are trying upload was only partially uploaded.';
+$upload_error_lang[4]			= 'You must select a file for upload.';
+$lang['l_upload_error_type'] 	= 'Only .ics files may be uploaded.';
+$lang['l_copy_error']			= 'Failed to copy file';
+$lang['l_delete_error']			= 'Failed to delete file';
+$lang['l_delete_success']		= 'was deleted successfully.';
+$lang['l_action_success']		= 'Your action was successful.';
+$lang['l_submit']				= 'Submit';
+$lang['l_delete']				= 'Delete';
 $all_cal_comb_lang		= 'All calendars combined';
 
 // New for 2.0
-$lang['l_legend']		= 'Legend';
+$lang['l_legend']			= 'Legend';
+$lang['l_admin_subhead']	= 'Manage your calendars from this page';
+$lang['l_prefs_subhead']	= 'Sets a cookie for visiting this site';
 
 // - navigation
 $back_lang = 'Back';
diff --git a/templates/default/admin.tpl b/templates/default/admin.tpl
index ccea1b8..acf3169 100644
--- a/templates/default/admin.tpl
+++ b/templates/default/admin.tpl
@@ -1,29 +1,24 @@
 {HEADER}
 <center>
-<table border="0" width="700" cellspacing="0" cellpadding="0">
+<table border="0" width="520" cellspacing="0" cellpadding="0" class="calborder">
 	<tr>
 		<td>
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td align="left" width="120" class="navback"><a href="{BACK_PAGE}"><img src="templates/{TEMPLATE}/images/back.gif" alt="{L_BACK}" border="0" align="left"></a></td>
-					<td class="navback">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td align="center" class="navback" nowrap valign="middle"><font class="H20">{L_ADMIN_HEADER}</font></td>
-							</tr>
-						</table>
-					</td>
-					<td align="right" width="120" class="navback">	
+				<tr valign="top">
+					<td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_ADMIN_HEADER}</span><br /><span class="V9G">{L_ADMIN_SUBHEAD}</span></div></td>
+					<td valign="top" align="right" width="120" class="navback">	
+						<div style="padding-top: 3px;">
 						<table width="120" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0"></a></td>
-								<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0"></a></td>
-								<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0"></a></td>
-								<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0"></a></td>
+							<tr valign="top">
+								<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td>
+								<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td>
+								<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td>
+								<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td>
 							</tr>
 						</table>
+						</div>
 					</td>
-				</tr>
+				</tr>  			
 			</table>
 		</td>
 	</tr>
@@ -31,9 +26,9 @@
 		<td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
 	</tr>
 	<tr>
-		<td class="G10" align="right">
+		<td align="right">
 			<!-- switch logged_in on -->
-			<a href="admin.php?action=logout\">{LOGOUT_LANG}</a>&nbsp;
+			<a href="admin.php?action=logout\">{L_LOGOUT}</a>&nbsp;
 			<!-- switch logged_in off -->
 		</td>
 	</tr>
@@ -45,23 +40,23 @@
 					<td width="98%" valign="top" align="left">
 
 						<!-- switch login_error on -->
-						<font color="red">{INVALID_LOGIN_LANG}</font>
+						<font color="red">{L_INVALID_LOGIN}</font>
 						<!-- switch login_error off -->
 	
 						<!-- switch display_login on -->
 						<form action="admin.php" method="post">
 							<table cellspacing="0" cellpadding="0">
 								<tr>
-									<td nowrap>{USERNAME_LANG}: </td>
+									<td nowrap>{L_USERNAME}: </td>
 									<td align="left"><input type="text" name="username"></td>
 								</tr>
 								<tr>
-									<td>{PASSWORD_LANG}: </td>
+									<td>{L_PASSWORD}: </td>
 									<td align="left"><input type="password" name="password"></td>
 								</tr>
 								<tr>
 									<td>&nbsp;</td>
-									<td align="left"><input type="submit" value="{$login_lang}"></td>
+									<td align="left"><input type="submit" value="{L_LOGIN}"></td>
 								</tr>
 								<tr>
 									<td align="center" colspan="3">{LOGIN_ERROR}&nbsp;</td>
@@ -74,36 +69,36 @@
 						<!-- switch logged_in on -->
 						
 						<!-- switch action_message on -->
-						<font color="green">{CAL_FILE_LANG} {FILENUMBER}: {ACTION_MSG}</font><br>
+						<font color="green">{L_CAL_FILE} {FILENUMBER}: {ACTION_MSG}</font><br>
 						<!-- switch action_message off -->
-						<h2>{ADDUPDATE_CAL_LANG}</h2>
-						<p>{ADDUPDATE_DESC_LANG}</p>
+						<b>{L_ADDUPDATE_CAL}</b>
+						<p>{L_ADDUPDATE_DESC}</p>
 						<form action="admin.php" method="post" enctype="multipart/form-data">
 							<input type="hidden" name="action" value="addupdate">
 							<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">
 								<tr>
-									<td nowrap>{CAL_FILE_LANG} 1: </td>
+									<td nowrap>{L_CAL_FILE} 1: </td>
 									<td><input type="file" name="calfile[1]"></td>
 								</tr>
 								<tr>
-									<td nowrap>{CAL_FILE_LANG} 2: </td>
+									<td nowrap>{L_CAL_FILE} 2: </td>
 									<td><input type="file" name="calfile[2]"></td>
 								</tr>
 								<tr>
-									<td nowrap>{CAL_FILE_LANG} 3: </td>
+									<td nowrap>{L_CAL_FILE} 3: </td>
 									<td><input type="file" name="calfile[3]"></td>
 								</tr>
 								<tr>
-									<td nowrap>{CAL_FILE_LANG} 4: </td>
+									<td nowrap>{L_CAL_FILE} 4: </td>
 									<td><input type="file" name="calfile[4]"></td>
 								</tr>
 								<tr>
-									<td nowrap>{CAL_FILE_LANG} 5: </td>
+									<td nowrap>{L_CAL_FILE} 5: </td>
 									<td><input type="file" name="calfile[5]"></td>
 								</tr>
 								<tr>
 									<td>&nbsp;</td>
-									<td><input type="submit" value="{SUBMIT_LANG}"></td>
+									<td><input type="submit" value="{L_SUBMIT}"></td>
 								</tr>
 								<tr>
 									<td align="center" colspan="2">{ADDUPDATE_MSG} &nbsp;</td>
@@ -111,11 +106,11 @@
 							</table>
 						</form>
 						
-						<h2>{DELETE_CAL_LANG}</h2>
+						<b>{L_DELETE_CAL}</b>
 						<form action="admin.php" method="post">
 							{DELETE_TABLE}
 							<input type="hidden" name="action" value="delete">
-							<p><input type="submit" value="{DELETE_LANG}"></p>
+							<p><input type="submit" value="{L_DELETE}"></p>
 							<p>{DELETE_MSG} &nbsp;</p>
 						</form>
 						
@@ -126,6 +121,13 @@
 		</td>
 	</tr>
 </table>
+<table width="520" 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>
 {FOOTER}
 
 
diff --git a/templates/default/preferences.tpl b/templates/default/preferences.tpl
index 0914c4a..1cac501 100644
--- a/templates/default/preferences.tpl
+++ b/templates/default/preferences.tpl
@@ -5,7 +5,7 @@
 		<td>
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr valign="top">
-					<td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_PREFERENCES}</span><br /><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></div></td>
+					<td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_PREFERENCES}</span><br /><span class="V9G">{L_PREFS_SUBHEAD}</span></div></td>
 					<td valign="top" align="right" width="120" class="navback">	
 						<div style="padding-top: 3px;">
 						<table width="120" border="0" cellpadding="0" cellspacing="0">