diff options
author | Jim Hu <jimhu@users.sourceforge.net> | 2008-12-28 20:13:01 +0000 |
---|---|---|
committer | Jim Hu <jimhu@users.sourceforge.net> | 2008-12-28 20:13:01 +0000 |
commit | 217454e76e29f9161e2cd49181b67097341755c2 (patch) | |
tree | c240583848611a1696ef7992e82a3c413ec89cce | |
parent | d482264b6af8598ce50677ac6a8f781e219b7d6f (diff) | |
download | phpicalendar-217454e76e29f9161e2cd49181b67097341755c2.tar.gz phpicalendar-217454e76e29f9161e2cd49181b67097341755c2.tar.bz2 phpicalendar-217454e76e29f9161e2cd49181b67097341755c2.zip |
remove admin.tpl from alternative template folders
-rw-r--r-- | functions/date_functions.php | 8 | ||||
-rw-r--r-- | includes/event.php | 10 | ||||
-rw-r--r-- | templates/green/admin.tpl | 132 | ||||
-rw-r--r-- | templates/grey/admin.tpl | 132 | ||||
-rw-r--r-- | templates/red/admin.tpl | 132 | ||||
-rw-r--r-- | templates/tan/admin.tpl | 132 |
6 files changed, 9 insertions, 537 deletions
diff --git a/functions/date_functions.php b/functions/date_functions.php index fa8cdd9..ec70fa6 100644 --- a/functions/date_functions.php +++ b/functions/date_functions.php @@ -166,10 +166,10 @@ function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $lin # for iCal pseudo tag <http> comptability if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$matches)) { $full_event_text = $matches[1] . $matches[2]; - $event_text = $matches[2]; + $event_text = $matches[2]; } else { $full_event_text = $event_text; - $event_text = strip_tags($event_text, '<b><i><u><img>'); + $event_text = strip_tags($event_text, '<b><i><u><img>'); } if (!empty($event_text)) { @@ -180,8 +180,8 @@ function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $lin if ((!(ereg("([[:alpha:]]+://[^<>[:space:]]+)", $full_event_text, $res))) || ($arr['description'])) { $escaped_date = addslashes($event_date); $escaped_time = addslashes($time); - $escaped_uid = addslashes($uid); - $event_data = addslashes(serialize ($master_array[$event_date][$time][$uid])); + $escaped_uid = addslashes($uid); + $event_data = addslashes(serialize ($master_array[$event_date][$time][$uid])); // fix for URL-length bug in IE: populate and submit a hidden form on click static $popup_data_index = 0; $return = " diff --git a/includes/event.php b/includes/event.php index a198469..8d57ae9 100644 --- a/includes/event.php +++ b/includes/event.php @@ -7,7 +7,7 @@ require_once(BASE.'functions/template.php'); # information for the popup is sent via $_POST by a javascript snippet in # in function openevent() from functions/date_functions.php # character encoding has been problematic with popups. -$event = unserialize($_POST['event_data']); +$event = unserialize(stripslashes($_POST['event_data'])); $organizer = unserialize($event['organizer']); $attendee = unserialize($event['attendee']); @@ -19,11 +19,11 @@ if ($_POST['time'] == -1) { $event_times = date($timeFormat, $event['start_unixtime']) . ' - ' . date($timeFormat, $event['end_unixtime']); } -$event['event_text'] = stripslashes(urldecode($event['event_text'])); -$event['description'] = stripslashes(urldecode($event['description'])); -$event['location'] = stripslashes(urldecode($event['location'])); +$event['event_text'] = urldecode($event['event_text']); +$event['description'] = urldecode($event['description']); +$event['location'] = urldecode($event['location']); $display =''; -if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']); +if (isset($event['description'])) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']); if (isset($organizer) && is_array($organizer)) { $i=0; diff --git a/templates/green/admin.tpl b/templates/green/admin.tpl deleted file mode 100644 index b83860b..0000000 --- a/templates/green/admin.tpl +++ /dev/null @@ -1,132 +0,0 @@ -{HEADER} -<center> -<table border="0" width="600" cellspacing="0" cellpadding="0" class="calborder"> - <tr> - <td> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr valign="top"> - <td align="left" width="400" class="title"><h1>{L_ADMIN_HEADER}</h1><span class="V9G">{L_ADMIN_SUBHEAD}</span></td> - <td align="right" width="120" class="navback"> - <div style="padding-top: 3px;"> - <table width="120" border="0" cellpadding="0" cellspacing="0"> - <tr valign="top"> - <td><a class="psf" href="../day.php?cal={CAL}&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}&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}&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}&getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> - </tr> - </table> - </div> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" " /></td> - </tr> - <tr> - <td align="right"> - <!-- switch logged_in2 on --> - <a href="index.php?action=logout">{L_LOGOUT}</a> - <!-- switch logged_in2 off --> - </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"> - <!-- switch login_error on --> - <font color="red">{L_INVALID_LOGIN}</font><br /><br /> - <!-- switch login_error off --> - - <!-- switch display_login on --> - <form action="index.php?action=login" method="post"> - <table cellspacing="0" cellpadding="0"> - <tr> - <td nowrap>{L_USERNAME}: </td> - <td align="left"><input type="text" name="username"></td> - </tr> - <tr> - <td>{L_PASSWORD}: </td> - <td align="left"><input type="password" name="password"></td> - </tr> - <tr> - <td> </td> - <td align="left"><input type="submit" value="{L_LOGIN}"></td> - </tr> - <!-- - <tr> - <td align="center" colspan="3">{LOGIN_ERROR} </td> - </tr> - --> - </table> - </form> - <!-- switch display_login off --> - - - <!-- switch logged_in on --> - <b>{L_ADDUPDATE_CAL}</b><br /> - {L_ADDUPDATE_DESC}<br /><br /> - <form action="index.php" method="post" enctype="multipart/form-data"> - <input type="hidden" name="action" value="addupdate"> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="G10B"> - <tr> - <td nowrap>{L_CAL_FILE} 1: </td> - <td><input type="file" name="calfile[1]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 2: </td> - <td><input type="file" name="calfile[2]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 3: </td> - <td><input type="file" name="calfile[3]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 4: </td> - <td><input type="file" name="calfile[4]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 5: </td> - <td><input type="file" name="calfile[5]"></td> - </tr> - <tr> - <td> </td> - <td><input type="submit" value="{L_SUBMIT}"></td> - </tr> - <tr> - <td align="center" colspan="2">{ADDUPDATE_MSG} </td> - </tr> - </table> - </form> - - <b>{L_DELETE_CAL}</b> - <form action="index.php" method="post"> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="G10B"> - {DELETE_TABLE} - </table> - <input type="hidden" name="action" value="delete"> - <p><input type="submit" value="{L_DELETE}"></p> - <p>{DELETE_MSG} </p> - </form> - - <!-- switch logged_in off --> - </td> - </tr> - </table> - </td> - </tr> -</table> -<table width="600" 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/grey/admin.tpl b/templates/grey/admin.tpl deleted file mode 100644 index b83860b..0000000 --- a/templates/grey/admin.tpl +++ /dev/null @@ -1,132 +0,0 @@ -{HEADER} -<center> -<table border="0" width="600" cellspacing="0" cellpadding="0" class="calborder"> - <tr> - <td> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr valign="top"> - <td align="left" width="400" class="title"><h1>{L_ADMIN_HEADER}</h1><span class="V9G">{L_ADMIN_SUBHEAD}</span></td> - <td align="right" width="120" class="navback"> - <div style="padding-top: 3px;"> - <table width="120" border="0" cellpadding="0" cellspacing="0"> - <tr valign="top"> - <td><a class="psf" href="../day.php?cal={CAL}&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}&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}&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}&getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> - </tr> - </table> - </div> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" " /></td> - </tr> - <tr> - <td align="right"> - <!-- switch logged_in2 on --> - <a href="index.php?action=logout">{L_LOGOUT}</a> - <!-- switch logged_in2 off --> - </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"> - <!-- switch login_error on --> - <font color="red">{L_INVALID_LOGIN}</font><br /><br /> - <!-- switch login_error off --> - - <!-- switch display_login on --> - <form action="index.php?action=login" method="post"> - <table cellspacing="0" cellpadding="0"> - <tr> - <td nowrap>{L_USERNAME}: </td> - <td align="left"><input type="text" name="username"></td> - </tr> - <tr> - <td>{L_PASSWORD}: </td> - <td align="left"><input type="password" name="password"></td> - </tr> - <tr> - <td> </td> - <td align="left"><input type="submit" value="{L_LOGIN}"></td> - </tr> - <!-- - <tr> - <td align="center" colspan="3">{LOGIN_ERROR} </td> - </tr> - --> - </table> - </form> - <!-- switch display_login off --> - - - <!-- switch logged_in on --> - <b>{L_ADDUPDATE_CAL}</b><br /> - {L_ADDUPDATE_DESC}<br /><br /> - <form action="index.php" method="post" enctype="multipart/form-data"> - <input type="hidden" name="action" value="addupdate"> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="G10B"> - <tr> - <td nowrap>{L_CAL_FILE} 1: </td> - <td><input type="file" name="calfile[1]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 2: </td> - <td><input type="file" name="calfile[2]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 3: </td> - <td><input type="file" name="calfile[3]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 4: </td> - <td><input type="file" name="calfile[4]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 5: </td> - <td><input type="file" name="calfile[5]"></td> - </tr> - <tr> - <td> </td> - <td><input type="submit" value="{L_SUBMIT}"></td> - </tr> - <tr> - <td align="center" colspan="2">{ADDUPDATE_MSG} </td> - </tr> - </table> - </form> - - <b>{L_DELETE_CAL}</b> - <form action="index.php" method="post"> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="G10B"> - {DELETE_TABLE} - </table> - <input type="hidden" name="action" value="delete"> - <p><input type="submit" value="{L_DELETE}"></p> - <p>{DELETE_MSG} </p> - </form> - - <!-- switch logged_in off --> - </td> - </tr> - </table> - </td> - </tr> -</table> -<table width="600" 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/red/admin.tpl b/templates/red/admin.tpl deleted file mode 100644 index b83860b..0000000 --- a/templates/red/admin.tpl +++ /dev/null @@ -1,132 +0,0 @@ -{HEADER} -<center> -<table border="0" width="600" cellspacing="0" cellpadding="0" class="calborder"> - <tr> - <td> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr valign="top"> - <td align="left" width="400" class="title"><h1>{L_ADMIN_HEADER}</h1><span class="V9G">{L_ADMIN_SUBHEAD}</span></td> - <td align="right" width="120" class="navback"> - <div style="padding-top: 3px;"> - <table width="120" border="0" cellpadding="0" cellspacing="0"> - <tr valign="top"> - <td><a class="psf" href="../day.php?cal={CAL}&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}&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}&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}&getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> - </tr> - </table> - </div> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" " /></td> - </tr> - <tr> - <td align="right"> - <!-- switch logged_in2 on --> - <a href="index.php?action=logout">{L_LOGOUT}</a> - <!-- switch logged_in2 off --> - </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"> - <!-- switch login_error on --> - <font color="red">{L_INVALID_LOGIN}</font><br /><br /> - <!-- switch login_error off --> - - <!-- switch display_login on --> - <form action="index.php?action=login" method="post"> - <table cellspacing="0" cellpadding="0"> - <tr> - <td nowrap>{L_USERNAME}: </td> - <td align="left"><input type="text" name="username"></td> - </tr> - <tr> - <td>{L_PASSWORD}: </td> - <td align="left"><input type="password" name="password"></td> - </tr> - <tr> - <td> </td> - <td align="left"><input type="submit" value="{L_LOGIN}"></td> - </tr> - <!-- - <tr> - <td align="center" colspan="3">{LOGIN_ERROR} </td> - </tr> - --> - </table> - </form> - <!-- switch display_login off --> - - - <!-- switch logged_in on --> - <b>{L_ADDUPDATE_CAL}</b><br /> - {L_ADDUPDATE_DESC}<br /><br /> - <form action="index.php" method="post" enctype="multipart/form-data"> - <input type="hidden" name="action" value="addupdate"> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="G10B"> - <tr> - <td nowrap>{L_CAL_FILE} 1: </td> - <td><input type="file" name="calfile[1]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 2: </td> - <td><input type="file" name="calfile[2]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 3: </td> - <td><input type="file" name="calfile[3]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 4: </td> - <td><input type="file" name="calfile[4]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 5: </td> - <td><input type="file" name="calfile[5]"></td> - </tr> - <tr> - <td> </td> - <td><input type="submit" value="{L_SUBMIT}"></td> - </tr> - <tr> - <td align="center" colspan="2">{ADDUPDATE_MSG} </td> - </tr> - </table> - </form> - - <b>{L_DELETE_CAL}</b> - <form action="index.php" method="post"> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="G10B"> - {DELETE_TABLE} - </table> - <input type="hidden" name="action" value="delete"> - <p><input type="submit" value="{L_DELETE}"></p> - <p>{DELETE_MSG} </p> - </form> - - <!-- switch logged_in off --> - </td> - </tr> - </table> - </td> - </tr> -</table> -<table width="600" 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/tan/admin.tpl b/templates/tan/admin.tpl deleted file mode 100644 index b83860b..0000000 --- a/templates/tan/admin.tpl +++ /dev/null @@ -1,132 +0,0 @@ -{HEADER} -<center> -<table border="0" width="600" cellspacing="0" cellpadding="0" class="calborder"> - <tr> - <td> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr valign="top"> - <td align="left" width="400" class="title"><h1>{L_ADMIN_HEADER}</h1><span class="V9G">{L_ADMIN_SUBHEAD}</span></td> - <td align="right" width="120" class="navback"> - <div style="padding-top: 3px;"> - <table width="120" border="0" cellpadding="0" cellspacing="0"> - <tr valign="top"> - <td><a class="psf" href="../day.php?cal={CAL}&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}&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}&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}&getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> - </tr> - </table> - </div> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" " /></td> - </tr> - <tr> - <td align="right"> - <!-- switch logged_in2 on --> - <a href="index.php?action=logout">{L_LOGOUT}</a> - <!-- switch logged_in2 off --> - </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"> - <!-- switch login_error on --> - <font color="red">{L_INVALID_LOGIN}</font><br /><br /> - <!-- switch login_error off --> - - <!-- switch display_login on --> - <form action="index.php?action=login" method="post"> - <table cellspacing="0" cellpadding="0"> - <tr> - <td nowrap>{L_USERNAME}: </td> - <td align="left"><input type="text" name="username"></td> - </tr> - <tr> - <td>{L_PASSWORD}: </td> - <td align="left"><input type="password" name="password"></td> - </tr> - <tr> - <td> </td> - <td align="left"><input type="submit" value="{L_LOGIN}"></td> - </tr> - <!-- - <tr> - <td align="center" colspan="3">{LOGIN_ERROR} </td> - </tr> - --> - </table> - </form> - <!-- switch display_login off --> - - - <!-- switch logged_in on --> - <b>{L_ADDUPDATE_CAL}</b><br /> - {L_ADDUPDATE_DESC}<br /><br /> - <form action="index.php" method="post" enctype="multipart/form-data"> - <input type="hidden" name="action" value="addupdate"> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="G10B"> - <tr> - <td nowrap>{L_CAL_FILE} 1: </td> - <td><input type="file" name="calfile[1]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 2: </td> - <td><input type="file" name="calfile[2]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 3: </td> - <td><input type="file" name="calfile[3]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 4: </td> - <td><input type="file" name="calfile[4]"></td> - </tr> - <tr> - <td nowrap>{L_CAL_FILE} 5: </td> - <td><input type="file" name="calfile[5]"></td> - </tr> - <tr> - <td> </td> - <td><input type="submit" value="{L_SUBMIT}"></td> - </tr> - <tr> - <td align="center" colspan="2">{ADDUPDATE_MSG} </td> - </tr> - </table> - </form> - - <b>{L_DELETE_CAL}</b> - <form action="index.php" method="post"> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="G10B"> - {DELETE_TABLE} - </table> - <input type="hidden" name="action" value="delete"> - <p><input type="submit" value="{L_DELETE}"></p> - <p>{DELETE_MSG} </p> - </form> - - <!-- switch logged_in off --> - </td> - </tr> - </table> - </td> - </tr> -</table> -<table width="600" 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} - - |