From 13b02aa849399917f52ef78f427ff54275650e01 Mon Sep 17 00:00:00 2001
From: Beech Rintoul <beech@FreeBSD.org>
Date: Tue, 25 Dec 2007 11:15:45 +0000
Subject: - New port phpdeadlock-1.0.1 - Web-based user authentication/password
 protection system

PR:		ports/117122
Submitted by:	Greg Larkin <glarkin@sourcehosting.net> (maintainer)
Approved by:	linimon (mentor)
---
 .../files/patch-deadlock_admin_bulkemail.php       | 167 +++++++++++++++
 .../files/patch-deadlock_admin_editconfig.php      | 223 +++++++++++++++++++++
 .../files/patch-deadlock_admin_edituser.php        |  87 ++++++++
 .../files/patch-deadlock_admin_inactiveusers.php   |  33 +++
 .../files/patch-deadlock_admin_index.php           |  65 ++++++
 .../files/patch-deadlock_admin_login.php           |  25 +++
 .../files/patch-deadlock_admin_newuser.php         | 105 ++++++++++
 .../files/patch-deadlock_admin_useraccept.php      |  50 +++++
 .../files/patch-deadlock_admin_userinfo.php        |  86 ++++++++
 .../files/patch-deadlock_admin_userlist.php        |  33 +++
 .../files/patch-deadlock_admin_userrequests.php    |  33 +++
 .../files/patch-deadlock_install_install.php       | 129 ++++++++++++
 security/phpdeadlock/files/pkg-message.in          |  31 +++
 13 files changed, 1067 insertions(+)
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_bulkemail.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_editconfig.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_edituser.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_inactiveusers.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_index.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_login.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_newuser.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_useraccept.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_userinfo.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_userlist.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_admin_userrequests.php
 create mode 100644 security/phpdeadlock/files/patch-deadlock_install_install.php
 create mode 100644 security/phpdeadlock/files/pkg-message.in

(limited to 'security/phpdeadlock/files')

diff --git a/security/phpdeadlock/files/patch-deadlock_admin_bulkemail.php b/security/phpdeadlock/files/patch-deadlock_admin_bulkemail.php
new file mode 100644
index 000000000000..77292bb4028b
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_bulkemail.php
@@ -0,0 +1,167 @@
+--- ./deadlock/admin/bulkemail.php.orig	Wed Aug  2 20:28:00 2006
++++ deadlock/admin/bulkemail.php	Thu Oct 11 15:23:48 2007
+@@ -174,13 +174,13 @@
+       <table width="91%" height="107" border="0" align="center">
+       <tr>
+         <td width="13%" height="20"><span class="style5">Subject:</span></td>
+-        <td width="87%"><span class="style2"><?=$_POST['subject']?></span></td>
++        <td width="87%"><span class="style2"><?php echo $_POST['subject']?></span></td>
+       </tr>
+       <tr>
+         <td height="21" colspan="2"><span class="style5">Message:</span></td>
+         </tr>
+       <tr>
+-        <td colspan="2"><div class="style2"><?=nl2br(htmlentities($_POST['message']."\n\n".$_POST['footer']))?></div></td>
++        <td colspan="2"><div class="style2"><?php echo nl2br(htmlentities($_POST['message']."\n\n".$_POST['footer']))?></div></td>
+         </tr>
+     </table>
+ 
+@@ -189,7 +189,7 @@
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
+@@ -211,7 +211,7 @@
+ ***********************************************/
+ </script>
+ <script type="text/javascript">
+-<? if((isset($_GET['type']) && $_GET['type']=='html') && isset($_GET['editor'])): ?>
++<?php if((isset($_GET['type']) && $_GET['type']=='html') && isset($_GET['editor'])): ?>
+ function insertAtCursor(myField, myValue){
+ 	// Get the editor instance that we want to interact with.
+ 	var oEditor = FCKeditorAPI.GetInstance('message') ;
+@@ -225,7 +225,7 @@
+ 	else
+ 		alert( 'You must be on WYSIWYG mode!' ) ;
+ }
+-<? else: ?>
++<?php else: ?>
+ function insertAtCursor(myField, myValue) {
+ 	//IE support
+ 	if (document.selection) {
+@@ -245,7 +245,7 @@
+ 	}
+ 	myField.focus();
+ }
+-<? endif; ?>
++<?php endif; ?>
+ function changeeditor(){
+ 	if(document.mailer.enableeditor.checked == true){
+ 		window.location = './bulkemail.php?type=html&editor=1';
+@@ -279,7 +279,7 @@
+       <strong>Codes:</strong>    &lt;%FirstName%&gt;, &lt;%LastName%&gt;, &lt;%Email%&gt;, &lt;%Username%&gt;, &lt;%RegistrationDate%&gt;, &lt;%RemovalURL%&gt; </td>
+   </tr>
+   <tr>
+-    <td height="275" colspan="2"><? if (!empty($errors)){ ?><table width="95%" height="24" border="0" align="center">
++    <td height="275" colspan="2"><?php if (!empty($errors)){ ?><table width="95%" height="24" border="0" align="center">
+       <tr>
+         <td height="20">
+ 		<div class="style9"><ul>
+@@ -291,45 +291,45 @@
+ 		</ul></div></td>
+       </tr>
+     </table>
+-      <? } else { print '<br />'; } ?>
+-	  <form action="<?=$_SERVER['PHP_SELF']?>" method="post" name="mailer">
++      <?php } else { print '<br />'; } ?>
++	  <form action="<?php echo $_SERVER['PHP_SELF']?>" method="post" name="mailer">
+       <table width="100%" border="0" align="center">
+       <tr>
+         <td class="style5">Send To<a href="#" class="hintanchor" onmouseover="showhint('Please specify who you would like this email to be sent to. You may either select &quot;All Users&quot; or a specific user.', this, event, '150px')">[?]</a>:</td>
+         <td><select name="to">
+-        <option value="//all//"<?=$select_default?>>All Users</option>
+-        <?=generate_user_menu($mysql['prefix'],$selected_user)?>
++        <option value="//all//"<?php echo $select_default?>>All Users</option>
++        <?php echo generate_user_menu($mysql['prefix'],$selected_user)?>
+         </select></td>
+       </tr>
+       <tr>
+         <td width="45%" class="style5">Email Subject<a href="#" class="hintanchor" onmouseover="showhint('Please enter the subject of the email you wish to send.', this, event, '150px')">[?]</a>:</td>
+-        <td width="55%"><input name="subject" type="text" id="subject"<? if(isset($_POST['subject'])) print ' value="'.$_POST['subject'].'"'; ?> /></td>
++        <td width="55%"><input name="subject" type="text" id="subject"<?php if(isset($_POST['subject'])) print ' value="'.$_POST['subject'].'"'; ?> /></td>
+       </tr>
+       <tr>
+         <td height="22" class="style5">Email Type<a href="#" class="hintanchor" onmouseover="showhint('If you want your email to be in HTML, select HTML, otherwise select Plain Text. Changing this will clear the whole form.', this, event, '150px')">[?]</a>:</td>
+         <td height="22" class="style2">
+-		<label><input name="type" type="radio" onclick="window.location='<?=$textlocation?>'" value="text"<? if(!isset($_GET['type']) || $_GET['type']!='html') print ' checked="checked"'; ?> />Plain Text</label>
+-        <label><input name="type" type="radio" onclick="window.location='<?=$htmllocation?>'" value="html"<? if(isset($_GET['type']) && $_GET['type']=='html') print ' checked="checked"'; ?> />HTML</label>
++		<label><input name="type" type="radio" onclick="window.location='<?php echo $textlocation?>'" value="text"<?php if(!isset($_GET['type']) || $_GET['type']!='html') print ' checked="checked"'; ?> />Plain Text</label>
++        <label><input name="type" type="radio" onclick="window.location='<?php echo $htmllocation?>'" value="html"<?php if(isset($_GET['type']) && $_GET['type']=='html') print ' checked="checked"'; ?> />HTML</label>
+ 		</td>
+       </tr>
+-      <? if(isset($_GET['type']) && $_GET['type']=='html'): ?>
++      <?php if(isset($_GET['type']) && $_GET['type']=='html'): ?>
+       <tr>
+         <td height="22" class="style5">Enable HTML Editor:<a href="#" class="hintanchor" onmouseover="showhint('Select this box if you wish to enable the WYSIWYG editor. Changing the value here will reset the form.', this, event, '150px')">[?]</a>:</td>
+         <td height="22" class="style2">
+-		<input type="checkbox" id="enableeditor" name="enableeditor" value="1" onchange="changeeditor()"<? if(isset($_GET['editor'])) print ' checked="checked"'; ?> />
++		<input type="checkbox" id="enableeditor" name="enableeditor" value="1" onchange="changeeditor()"<?php if(isset($_GET['editor'])) print ' checked="checked"'; ?> />
+ 		</td>
+       </tr>
+-      <? endif; ?>
++      <?php endif; ?>
+       <tr>
+         <td height="22" colspan="2" class="style5">Email Message<a href="#" class="hintanchor" onmouseover="showhint('Please enter your message here. This will appear in the body of the email.', this, event, '150px')">[?]</a>: </td>
+         </tr>
+-      <? //if((!isset($_GET['type']) || $_GET['type']!='html') && (!isset($_GET['editor']))): ?><tr>
+-        <td height="19" colspan="2" class="style2 style13"><div align="center"><strong>Insert:</strong> <a href="javascript:insertAtCursor(document.mailer.message, '<?='<%FirstName%>'?>')">First Name</a> | <a href="javascript:insertAtCursor(document.mailer.message, '<?='<%LastName%>'?>')">Last Name</a> | <a href="javascript:insertAtCursor(document.mailer.message, '<?='<%Email%>'?>')">Email</a> | <a href="javascript:insertAtCursor(document.mailer.message, '<?='<%Username%>'?>')">Username</a> | <a href="javascript:insertAtCursor(document.mailer.message, '<?='<%RegistrationDate%>'?>')">Date Registered</a> | 
+-            <a href="javascript:insertAtCursor(document.mailer.message, '<?='<%RemovalURL%>'?>')">Removal URL</a></div></td>
+-      </tr><? //endif; ?>
++      <?php //if((!isset($_GET['type']) || $_GET['type']!='html') && (!isset($_GET['editor']))): ?><tr>
++        <td height="19" colspan="2" class="style2 style13"><div align="center"><strong>Insert:</strong> <a href="javascript:insertAtCursor(document.mailer.message, '<?php echo '<%FirstName%>'?>')">First Name</a> | <a href="javascript:insertAtCursor(document.mailer.message, '<?php echo '<%LastName%>'?>')">Last Name</a> | <a href="javascript:insertAtCursor(document.mailer.message, '<?php echo '<%Email%>'?>')">Email</a> | <a href="javascript:insertAtCursor(document.mailer.message, '<?php echo '<%Username%>'?>')">Username</a> | <a href="javascript:insertAtCursor(document.mailer.message, '<?php echo '<%RegistrationDate%>'?>')">Date Registered</a> | 
++            <a href="javascript:insertAtCursor(document.mailer.message, '<?php echo '<%RemovalURL%>'?>')">Removal URL</a></div></td>
++      </tr><?php //endif; ?>
+       <tr>
+         <td colspan="2" class="style2">
+-<? 
++<?php 
+ if((isset($_GET['type']) && $_GET['type']=='html') && isset($_GET['editor'])):
+ $oFCKeditor = new FCKeditor('message') ;
+ $oFCKeditor->BasePath = '../fckeditor/';
+@@ -339,27 +339,27 @@
+ $oFCKeditor->Create() ;
+ else:
+ ?> 
+-        <textarea name="message" cols="60" rows="10" id="message"><? if(isset($_POST['message'])) print $_POST['message']; ?></textarea>
+-<? endif; ?>
++        <textarea name="message" cols="60" rows="10" id="message"><?php if(isset($_POST['message'])) print $_POST['message']; ?></textarea>
++<?php endif; ?>
+         </td>
+         </tr>
+-      <? if(!isset($_GET['type'])): ?>
++      <?php if(!isset($_GET['type'])): ?>
+ 	  <tr>
+         <td height="20" colspan="2" class="style5">Footer<a href="#" class="hintanchor" onmouseover="showhint('Whatever is entered in this field will be directly attached to your message.', this, event, '150px')">[?]</a>:</td>
+         </tr>
+       
+       <tr>
+         <td colspan="2"><span class="style2">
+-          <textarea name="footer" cols="60" rows="5" id="footer"><?=$config['bulk_email_footer']?></textarea>
++          <textarea name="footer" cols="60" rows="5" id="footer"><?php echo $config['bulk_email_footer']?></textarea>
+         </span></td>
+         </tr>
+       <tr>
+-      <? endif; ?>
++      <?php endif; ?>
+         <td>&nbsp;</td>
+         <td><div align="right">
+           <input type="hidden" name="submit" value="1" />
+           <input type="submit" value="Submit" />
+-            <input type="button" value="Reset" onclick="window.location='<?=$_SERVER['PHP_SELF']?>'" />
++            <input type="button" value="Reset" onclick="window.location='<?php echo $_SERVER['PHP_SELF']?>'" />
+         </div></td>
+       </tr>
+     </table>
+@@ -368,7 +368,7 @@
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
diff --git a/security/phpdeadlock/files/patch-deadlock_admin_editconfig.php b/security/phpdeadlock/files/patch-deadlock_admin_editconfig.php
new file mode 100644
index 000000000000..8c6b88a6f727
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_editconfig.php
@@ -0,0 +1,223 @@
+--- ./deadlock/admin/editconfig.php.orig	Sun Aug 20 02:05:01 2006
++++ deadlock/admin/editconfig.php	Thu Oct 11 15:23:48 2007
+@@ -332,23 +332,23 @@
+   </tr>
+   <tr>
+     <td height="19" colspan="2"><br /><span class="style2">
+-    <? if(isset($updatedoptions)): ?>
++    <?php if(isset($updatedoptions)): ?>
+       The following options were updated:<br />
+ 	  <?php
+ 	  foreach($updatedoptions as $option){
+ 	  	print '- '.$option.'<br />';
+ 	  }
+ 	  ?>
+-	 <? else: ?>
++	 <?php else: ?>
+ 	 No options were updated.<br />
+-	 <? endif; ?> 
++	 <?php endif; ?> 
+       <br />
+       If you are not redirected within 5 seconds, <a href="./index.php">click here</a>...</span><br />
+     <br /><br /></td>
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
+@@ -407,7 +407,7 @@
+     <td height="28" colspan="2" class="style2">This page allows you to modify settings which are used throughout Deadlock to customize various features. Once you are finished making changes, click submit to update the settings. If there are any errors, nothing is changed. </td>
+   </tr>
+   <tr>
+-    <td colspan="2"><? if (!empty($errors)){ ?>
++    <td colspan="2"><?php if (!empty($errors)){ ?>
+       <br /><table width="100%" border="0" align="center">
+       <tr>
+         <td height="20">
+@@ -421,8 +421,8 @@
+ 		</ul></div></td>
+       </tr>
+     </table>
+-      <? } else { print '<br />'; } ?>
+-	  <form action="<?=$_SERVER['PHP_SELF']?>" method="post">
++      <?php } else { print '<br />'; } ?>
++	  <form action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
+ 	  <table width="100%" height="100%" border="0" align="center">
+   <tr>
+     <td width="100%">		 
+@@ -431,7 +431,7 @@
+ 	        <table width="100%" border="0">
+ 	          <tr>
+ 	            <td width="123"><span class="style5">Protected Area</span><span class="style5">: </span></td>
+-                <td width="242"><input type="text" name="protected_area_name" value="<?=ConfigTextField(@$_POST['protected_area_name'],$config['protected_area_name'])?>" />
++                <td width="242"><input type="text" name="protected_area_name" value="<?php echo ConfigTextField(@$_POST['protected_area_name'],$config['protected_area_name'])?>" />
+                 <a href="#" class="hintanchor" onmouseover="showhint('Enter a name for your protected area. The value entered here will be shown in the login box. This cannot be left blank.', this, event, '150px')">[?]</a></td>
+               </tr>
+ 	        </table>
+@@ -442,12 +442,12 @@
+ 	        <table width="100%" border="0">
+ 	          <tr>
+ 	            <td width="123"><span class="style5">Admin Email</span><span class="style5">: </span></td>
+-                <td width="242"><input type="text" name="admin_email" value="<?=ConfigTextField(@$_POST['admin_email'],$config['admin_email'])?>" />
++                <td width="242"><input type="text" name="admin_email" value="<?php echo ConfigTextField(@$_POST['admin_email'],$config['admin_email'])?>" />
+                 <a href="#" class="hintanchor" onmouseover="showhint('Enter the administrator\'s email address. This will be used in the from field of outgoing messages.', this, event, '150px')">[?]</a></td>
+               </tr>
+ 	          <tr>
+ 	            <td class="style5">System Email:</td>
+-                <td><input type="text" name="system_email" value="<?=ConfigTextField(@$_POST['system_email'],$config['system_messages_email'])?>" />
++                <td><input type="text" name="system_email" value="<?php echo ConfigTextField(@$_POST['system_email'],$config['system_messages_email'])?>" />
+                 <span class="style5"><a href="#" class="hintanchor" onmouseover="showhint('Enter the system\'s email address. This will primarily be used for sending emails to the administrator.', this, event, '150px')">[?]</a></span></td>
+               </tr>
+ 	          </table>
+@@ -458,20 +458,20 @@
+ 	          <tr>
+ 	            <td width="151" height="22" class="style5">Welcome Users: </td>
+                 <td width="282">
+-                  <label class="style2"><input name="user_welcome_email" type="radio" value="true"<?=ConfigRadioCheck(@$_POST['user_welcome_email'],$config['user_welcome_email'],'on')?> />On</label>
+-                  <label class="style2"><input type="radio" name="user_welcome_email" value="false"<?=ConfigRadioCheck(@$_POST['user_welcome_email'],$config['user_welcome_email'],'off')?> />Off</label>
++                  <label class="style2"><input name="user_welcome_email" type="radio" value="true"<?php echo ConfigRadioCheck(@$_POST['user_welcome_email'],$config['user_welcome_email'],'on')?> />On</label>
++                  <label class="style2"><input type="radio" name="user_welcome_email" value="false"<?php echo ConfigRadioCheck(@$_POST['user_welcome_email'],$config['user_welcome_email'],'off')?> />Off</label>
+                   <a href="#" class="hintanchor" onmouseover="showhint('Send a welcome email to new users. If admin verification is enabled, this email will tell the user that their account is pending verification.', this, event, '150px')">[?]</a></td>
+               </tr>
+ 	          <tr>
+ 	            <td height="22" class="style5">New User Notify: </td>
+-	            <td><label class="style2"><input name="admin_user_email" type="radio" value="true"<?=ConfigRadioCheck(@$_POST['admin_user_email'],$config['admin_user_email'],'on')?> />On</label>
+-                  <label class="style2"><input type="radio" name="admin_user_email" value="false"<?=ConfigRadioCheck(@$_POST['admin_user_email'],$config['admin_user_email'],'off')?> />Off</label>
++	            <td><label class="style2"><input name="admin_user_email" type="radio" value="true"<?php echo ConfigRadioCheck(@$_POST['admin_user_email'],$config['admin_user_email'],'on')?> />On</label>
++                  <label class="style2"><input type="radio" name="admin_user_email" value="false"<?php echo ConfigRadioCheck(@$_POST['admin_user_email'],$config['admin_user_email'],'off')?> />Off</label>
+                   <a href="#" class="hintanchor" onmouseover="showhint('If this option is enabled, the administrator will receive an email when a user registers.', this, event, '150px')">[?]</a></td>
+ 	            </tr>
+ 	          <tr>
+ 	            <td height="22" class="style5">Status Change Email: </td>
+-	            <td><label class="style2"><input name="email_user_accept" type="radio" value="true"<?=ConfigRadioCheck(@$_POST['email_user_accept'],$config['email_user_accept'],'on')?> />On</label>
+-                  <label class="style2"><input type="radio" name="email_user_accept" value="false"<?=ConfigRadioCheck(@$_POST['email_user_accept'],$config['email_user_accept'],'off')?> />Off</label>
++	            <td><label class="style2"><input name="email_user_accept" type="radio" value="true"<?php echo ConfigRadioCheck(@$_POST['email_user_accept'],$config['email_user_accept'],'on')?> />On</label>
++                  <label class="style2"><input type="radio" name="email_user_accept" value="false"<?php echo ConfigRadioCheck(@$_POST['email_user_accept'],$config['email_user_accept'],'off')?> />Off</label>
+ 				  <a href="#" class="hintanchor" onmouseover="showhint('If this option is enabled, Deadlock will send the user an email when the administrator approves or denies a request. This is only applicable if admin validation is enabled.', this, event, '150px')">[?]</a></td>
+ 	            </tr>
+         </table>
+@@ -484,27 +484,27 @@
+ 	          <tr>
+ 	            <td width="32%" class="style5">Date Format: </td>
+                 <td width="68%"><select name="date_format" id="date_format">
+-                  <?=ConfigDateSelects(@$_POST['date_format'],$config['date_format'])?>
++                  <?php echo ConfigDateSelects(@$_POST['date_format'],$config['date_format'])?>
+                   </select>
+                 <a href="#" class="hintanchor" onmouseover="showhint('Anywhere a date is shown, for example a user registration date, this is the format the date will be shown in.', this, event, '150px')">[?]</a> </td>
+               </tr>
+ 	          <tr>
+ 	            <td class="style5">Phone Digits: </td>
+-                <td><input name="phone_digits" type="text" size="4" maxlength="2" value="<?=ConfigTextField(@$_POST['phone_digits'],$config['phone_digits'])?>" />
++                <td><input name="phone_digits" type="text" size="4" maxlength="2" value="<?php echo ConfigTextField(@$_POST['phone_digits'],$config['phone_digits'])?>" />
+                 <a href="#" class="hintanchor" onmouseover="showhint('Set this to how many digits should be required for a phone number. Usually this should be 10.', this, event, '150px')">[?]</a></td>
+               </tr>
+ 	          
+ 	          <tr>
+ 	            <td class="style5">Required Fields: </td>
+                 <td>
+-                  <label class="style2"><input type="checkbox" name="require_phone" value="true" <?=ConfigCheckboxCheck(@$_POST['submit'],@$_POST['require_phone'],$config['optional_fields_phone'])?>/>Phone</label>
+-                  <label class="style2"><input type="checkbox" name="require_country" value="true" <?=ConfigCheckboxCheck(@$_POST['submit'],@$_POST['require_country'],$config['optional_fields_country'])?>/>Country</label>
++                  <label class="style2"><input type="checkbox" name="require_phone" value="true" <?php echo ConfigCheckboxCheck(@$_POST['submit'],@$_POST['require_phone'],$config['optional_fields_phone'])?>/>Phone</label>
++                  <label class="style2"><input type="checkbox" name="require_country" value="true" <?php echo ConfigCheckboxCheck(@$_POST['submit'],@$_POST['require_country'],$config['optional_fields_country'])?>/>Country</label>
+                 <a href="#" class="hintanchor" onmouseover="showhint('Select the checkboxes next to the fields that are required in order for a user to register.', this, event, '150px')">[?]</a></td>
+               </tr>
+ 	          <tr>
+                 <td class="style5">Validation:</td>
+ 	            <td><select name="validation">
+-                    <?=ConfigVerificationSelects(@$_POST['validation'],$config['verify_email'],$config['require_admin_accept'])?>
++                    <?php echo ConfigVerificationSelects(@$_POST['validation'],$config['verify_email'],$config['require_admin_accept'])?>
+                   </select>
+                   <a href="#" class="hintanchor" onmouseover="showhint('Email validation will require a user to validate their email address before they are able to access the protected area. Admin approval will make it so that you must approve accounts before they are able to access the protected area. If both are enabled, you will be asked to approve accounts after they have validated their email address.', this, event, '200px')">[?]</a></td>
+ 	            </tr>
+@@ -518,25 +518,25 @@
+ 	          <tr>
+ 	            <td width="40%" class="style5">Deadlock URL:</td>
+                 <td>
+-                <input name="deadlock_url" type="text" id="deadlock_url" value="<?=ConfigTextField(@$_POST['deadlock_url'],$config['deadlock_url'])?>" /><a href="#" class="hintanchor" onmouseover="showhint('This is the URL to the root directory of Deadlock. On most installations this will be http://www.yoursite.com/deadlock/. Do NOT include a trailing forwardslash!', this, event, '200px')">[?]</a></td>
++                <input name="deadlock_url" type="text" id="deadlock_url" value="<?php echo ConfigTextField(@$_POST['deadlock_url'],$config['deadlock_url'])?>" /><a href="#" class="hintanchor" onmouseover="showhint('This is the URL to the root directory of Deadlock. On most installations this will be http://www.yoursite.com/deadlock/. Do NOT include a trailing forwardslash!', this, event, '200px')">[?]</a></td>
+               </tr>
+ 	          <tr>
+ 	            <td class="style5">Protected Area URL:</td>
+-                <td><input name="protected_url" type="text" id="protected_url" value="<?=ConfigTextField(@$_POST['protected_url'],$config['protected_area_url'])?>" /><a href="#" class="hintanchor" onmouseover="showhint('Enter the URL to your protected area. Please include a trailing forward slash.', this, event, '150px')">[?]</a></td>
++                <td><input name="protected_url" type="text" id="protected_url" value="<?php echo ConfigTextField(@$_POST['protected_url'],$config['protected_area_url'])?>" /><a href="#" class="hintanchor" onmouseover="showhint('Enter the URL to your protected area. Please include a trailing forward slash.', this, event, '150px')">[?]</a></td>
+               </tr>
+ 	          <tr>
+ 	            <td class="style5">Htpasswd Path:</td>
+-                <td><input name="htpasswd_path" type="text" id="htpasswd_path" value="<?=ConfigTextField(@$_POST['htpasswd_path'],$config['htpasswd_path'])?>" /><a href="#" class="hintanchor" onmouseover="showhint('Enter the path to your htpasswd file. This must be relevant to the document root. For example, if the URL to your protected area is http://www.example.com/protected/, in this field you would most likely enter &quot;/protected/.htpasswd&quot;.', this, event, '200px')">[?]</a></td>
++                <td><input name="htpasswd_path" type="text" id="htpasswd_path" value="<?php echo ConfigTextField(@$_POST['htpasswd_path'],$config['htpasswd_path'])?>" /><a href="#" class="hintanchor" onmouseover="showhint('Enter the path to your htpasswd file. This must be relevant to the document root. For example, if the URL to your protected area is http://www.example.com/protected/, in this field you would most likely enter &quot;/protected/.htpasswd&quot;.', this, event, '200px')">[?]</a></td>
+               </tr>
+ 	          <tr>
+ 	            <td class="style5">&nbsp;</td>
+ 	            <td class="style2">Relative?
+-                  <input name="htpasswd_relative" type="checkbox" value="true" <?=ConfigCheckboxCheck(@$_POST['submit'],@$_POST['htpasswd_relative'],$config['htpasswd_relative'])?>/>
++                  <input name="htpasswd_relative" type="checkbox" value="true" <?php echo ConfigCheckboxCheck(@$_POST['submit'],@$_POST['htpasswd_relative'],$config['htpasswd_relative'])?>/>
+                   <a href="#" class="hintanchor" onmouseover="showhint('If this box is checked, the path entered above should be relative to the document root. If this box is not checked, the path above should be a full path.', this, event, '150px')">[?]</a></td>
+ 	            </tr>
+ 	          <tr>
+ 	            <td class="style5">Htaccess Path:</td>
+-                <td><input name="htaccess_path" type="text" id="htaccess_path" value="<?=ConfigTextField(@$_POST['htaccess_path'],$config['htaccess_path'])?>" /><a href="#" class="hintanchor" onmouseover="showhint('Enter the path to your htaccess file. This must be relevant to the document root. For example, if the URL to your protected area is http://www.example.com/protected/, in this field you would most likely enter &quot;/protected/.htaccess&quot;.', this, event, '200px')">[?]</a></td>
++                <td><input name="htaccess_path" type="text" id="htaccess_path" value="<?php echo ConfigTextField(@$_POST['htaccess_path'],$config['htaccess_path'])?>" /><a href="#" class="hintanchor" onmouseover="showhint('Enter the path to your htaccess file. This must be relevant to the document root. For example, if the URL to your protected area is http://www.example.com/protected/, in this field you would most likely enter &quot;/protected/.htaccess&quot;.', this, event, '200px')">[?]</a></td>
+               </tr>
+         </table>
+ 		</fieldset>
+@@ -565,32 +565,32 @@
+ 	          <tr>
+ 	            <td width="40%" class="style5">Debug Mode: </td>
+                 <td>
+-                  <label class="style2"><input name="debug_mode" type="radio" value="true"<?=ConfigRadioCheck(@$_POST['debug_mode'],$config['debug_mode'],'on')?> />On</label>
+-                  <label class="style2"><input type="radio" name="debug_mode" value="false"<?=ConfigRadioCheck(@$_POST['debug_mode'],$config['debug_mode'],'off')?> />Off</label>
++                  <label class="style2"><input name="debug_mode" type="radio" value="true"<?php echo ConfigRadioCheck(@$_POST['debug_mode'],$config['debug_mode'],'on')?> />On</label>
++                  <label class="style2"><input type="radio" name="debug_mode" value="false"<?php echo ConfigRadioCheck(@$_POST['debug_mode'],$config['debug_mode'],'off')?> />Off</label>
+                 <a href="#" class="hintanchor" onmouseover="showhint('If there is an internal progrm error, and this option is enabled, the error will be displayed so that the person viewing the page can see it. This is not reccomeded unless you know what you are doing.', this, event, '200px')">[?]</a></td>
+               </tr>
+ 	          <tr>
+ 	            <td width="40%" class="style5">Authentication Type:</td>
+                 <td class="style2">
+ 				  <select name="auth_type">
+-				  <?=ConfigAuthTypeSelects(@$_POST['auth_type'],$config['digest_auth'])?>
++				  <?php echo ConfigAuthTypeSelects(@$_POST['auth_type'],$config['digest_auth'])?>
+ 				  </select>
+                   <a href="#" class="hintanchor" onmouseover="showhint('Please select the type of authentication you would like to use for your protected area. Digest is by far more secure, but some older browsers do not support it. If you are unable to get digest working, it is possible that either your brower, or your server does not support it.', this, event, '200px')">[?]</a></td>
+               </tr>
+               <tr>
+ 	            <td width="40%" class="style5">401 Error Page:</td>
+-                <td class="style2"><input name="err_401_doc" type="text" id="err_401_doc" value="<?=ConfigTextField(@$_POST['err_401_doc'],$config['err_401_doc'])?>" /><a href="#" class="hintanchor" onmouseover="showhint('This is the page that will be displayed when someone enters and invalid login. This path must be relative to your document root. If you want to keep the default error page, leave this field blank.', this, event, '200px')">[?]</a></td>
++                <td class="style2"><input name="err_401_doc" type="text" id="err_401_doc" value="<?php echo ConfigTextField(@$_POST['err_401_doc'],$config['err_401_doc'])?>" /><a href="#" class="hintanchor" onmouseover="showhint('This is the page that will be displayed when someone enters and invalid login. This path must be relative to your document root. If you want to keep the default error page, leave this field blank.', this, event, '200px')">[?]</a></td>
+               </tr>
+                 <td class="style5">Prune Inactive Users:</td>
+-	            <td><label class="style2"><input name="prune_inactive_users" type="radio" value="true"<?=ConfigRadioCheck(@$_POST['prune_inactive_users'],$config['prune_inactive_users'],'on')?> />On</label>
+-                    <label class="style2"><input type="radio" name="prune_inactive_users" value="false"<?=ConfigRadioCheck(@$_POST['prune_inactive_users'],$config['prune_inactive_users'],'off')?> />Off</label>
++	            <td><label class="style2"><input name="prune_inactive_users" type="radio" value="true"<?php echo ConfigRadioCheck(@$_POST['prune_inactive_users'],$config['prune_inactive_users'],'on')?> />On</label>
++                    <label class="style2"><input type="radio" name="prune_inactive_users" value="false"<?php echo ConfigRadioCheck(@$_POST['prune_inactive_users'],$config['prune_inactive_users'],'off')?> />Off</label>
+                   <a href="#" class="hintanchor" onmouseover="showhint('Users that have not validated their email address after 72 hours will automatically be removed.', this, event, '200px')">[?]</a></td>
+ 	            </tr>
+ 	          <tr>
+ 	            <td height="23" colspan="2" valign="bottom" class="style5">Default Bulk Email Footer<a href="#" class="hintanchor" onmouseover="showhint('This is the deafult footer that will appear on the bulk mail page.', this, event, '150px')">[?]</a>: </td>
+ 	            </tr>
+ 	          <tr>
+-	            <td colspan="2" class="style5"><textarea name="footer" cols="50" rows="6" ><? if(isset($_POST['footer'])) print $_POST['footer']; else print $config['bulk_email_footer']; ?></textarea></td>
++	            <td colspan="2" class="style5"><textarea name="footer" cols="50" rows="6" ><?php if(isset($_POST['footer'])) print $_POST['footer']; else print $config['bulk_email_footer']; ?></textarea></td>
+ 	            </tr>
+         </table>
+ 		</fieldset></td>
+@@ -599,7 +599,7 @@
+ 		<div align="center"><br />
+ 	        	<input type="hidden" name="submit" value="1" />
+ 	            <input type="submit" value="Update Changed Options" />
+-	            <input type="button" onclick="window.location='<?=$_SERVER['PHP_SELF']?>'" value="Reset" />
++	            <input type="button" onclick="window.location='<?php echo $_SERVER['PHP_SELF']?>'" value="Reset" />
+ 	            <br />
+         </div>
+               </div>
+@@ -609,7 +609,7 @@
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
diff --git a/security/phpdeadlock/files/patch-deadlock_admin_edituser.php b/security/phpdeadlock/files/patch-deadlock_admin_edituser.php
new file mode 100644
index 000000000000..6ec31ec3ed85
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_edituser.php
@@ -0,0 +1,87 @@
+--- ./deadlock/admin/edituser.php.orig	Tue Aug 15 13:23:21 2006
++++ deadlock/admin/edituser.php	Thu Oct 11 15:23:48 2007
+@@ -173,7 +173,7 @@
+     <td height="28" colspan="2" class="style2">To edit a user, change the values in the below form, then click Update. All fields are required except for those marked &quot;optional&quot;. </td>
+   </tr>
+   <tr>
+-    <td height="275" colspan="2"><? if (!empty($errors)){ ?><table width="95%" height="24" border="0" align="center">
++    <td height="275" colspan="2"><?php if (!empty($errors)){ ?><table width="95%" height="24" border="0" align="center">
+       <tr>
+         <td height="20">
+ 		<div class="style9"><ul>
+@@ -185,27 +185,27 @@
+ 		</ul></div></td>
+       </tr>
+     </table>
+-      <? } else { print '<br />'; } ?>
+-	  <form action="<?=$_SERVER['PHP_SELF']?>?<?=$_SERVER['QUERY_STRING']?>" method="post">
++      <?php } else { print '<br />'; } ?>
++	  <form action="<?php echo $_SERVER['PHP_SELF']?>?<?php echo $_SERVER['QUERY_STRING']?>" method="post">
+       <table width="73%" border="0" align="center">
+       <tr>
+         <td width="47%" class="style5">First Name:</td>
+-        <td width="53%"><input name="firstname" maxlength="15" type="text" id="firstname" value="<? if(isset($_POST['firstname'])) print $_POST['firstname']; else print $firstname ?>" /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your first name. This must be 1-15 characters and alphanumeric.', this, event, '150px')">[?]</a></td>
++        <td width="53%"><input name="firstname" maxlength="15" type="text" id="firstname" value="<?php if(isset($_POST['firstname'])) print $_POST['firstname']; else print $firstname ?>" /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your first name. This must be 1-15 characters and alphanumeric.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+         <td class="style5">Last Name: </td>
+-        <td><input name="lastname" maxlength="15" type="text" id="lastname" value="<? if(isset($_POST['lastname'])) print $_POST['lastname']; else print $lastname ?>" /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your last name. This must be 1-15 characters and alphanumeric.', this, event, '150px')">[?]</a></td>
++        <td><input name="lastname" maxlength="15" type="text" id="lastname" value="<?php if(isset($_POST['lastname'])) print $_POST['lastname']; else print $lastname ?>" /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your last name. This must be 1-15 characters and alphanumeric.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+         <td class="style5">Email:</td>
+-        <td><input name="email" type="text" id="email" value="<? if(isset($_POST['email'])) print $_POST['email']; else print $email ?>" /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your email address. This email address must be valid.', this, event, '150px')">[?]</a></td>
++        <td><input name="email" type="text" id="email" value="<?php if(isset($_POST['email'])) print $_POST['email']; else print $email ?>" /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your email address. This email address must be valid.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+-        <td class="style5">Phone<? if($config['optional_fields_phone']=="false") print ' (optional)'; ?>: </td>
+-        <td><input name="phone" type="text" id="phone" value="<? if(isset($_POST['phone'])) print $_POST['phone']; else print $phone ?>" /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your phone number. This should be <?=$config['phone_digits']?> digits and contain only numbers.', this, event, '150px')">[?]</a></td>
++        <td class="style5">Phone<?php if($config['optional_fields_phone']=="false") print ' (optional)'; ?>: </td>
++        <td><input name="phone" type="text" id="phone" value="<?php if(isset($_POST['phone'])) print $_POST['phone']; else print $phone ?>" /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your phone number. This should be <?php echo $config['phone_digits']?> digits and contain only numbers.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+-        <td class="style5">Country<? if($config['optional_fields_country']=="false") print ' (optional)'; ?>:</td>
++        <td class="style5">Country<?php if($config['optional_fields_country']=="false") print ' (optional)'; ?>:</td>
+         <td>
+ <?php
+ if(isset($_POST['country'])){
+@@ -221,7 +221,7 @@
+ 
+       <tr>
+         <td class="style5">Username:</td>
+-        <td><input type="text" disabled="disabled" value="<?=$username?>" /><a href="#" class="hintanchor" onMouseover="showhint('Please choose a username. This must be alphanumeric and contain 5-10 characters.', this, event, '150px')"></a></td>
++        <td><input type="text" disabled="disabled" value="<?php echo $username?>" /><a href="#" class="hintanchor" onMouseover="showhint('Please choose a username. This must be alphanumeric and contain 5-10 characters.', this, event, '150px')"></a></td>
+       </tr>
+       <tr>
+         <td class="style5"> New Password:</td>
+@@ -237,7 +237,7 @@
+       </tr>
+       <tr>
+         <td class="style2">Notify User:</td>
+-        <td class="style2"><input name="notify_user" type="checkbox" id="notify_user" value="1" <? if(($config['user_welcome_email']=="true" && !isset($_POST['submit'])) || isset($_POST['welcome_user'])) print 'checked="checked" '; ?>/>
++        <td class="style2"><input name="notify_user" type="checkbox" id="notify_user" value="1" <?php if(($config['user_welcome_email']=="true" && !isset($_POST['submit'])) || isset($_POST['welcome_user'])) print 'checked="checked" '; ?>/>
+           <a href="#" class="hintanchor" onmouseover="showhint('Check this box if you would like to notify the user of these changes.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+@@ -246,7 +246,7 @@
+       </tr>
+       <tr>
+         <td>&nbsp;</td>
+-        <td><input type="hidden" name="submit" value="1" /><input type="hidden" name="username" value="<?=$username?>" /><input type="submit" value="Update" /> <input type="button" onclick="window.location='./userinfo.php?user=<?=$username?>'" value="Back" /></td>
++        <td><input type="hidden" name="submit" value="1" /><input type="hidden" name="username" value="<?php echo $username?>" /><input type="submit" value="Update" /> <input type="button" onclick="window.location='./userinfo.php?user=<?php echo $username?>'" value="Back" /></td>
+       </tr>
+     </table>
+ 	<br />
+@@ -254,10 +254,10 @@
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
+-</html><? 
++</html><?php 
+ }
+ ?>
diff --git a/security/phpdeadlock/files/patch-deadlock_admin_inactiveusers.php b/security/phpdeadlock/files/patch-deadlock_admin_inactiveusers.php
new file mode 100644
index 000000000000..859cc7e4d552
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_inactiveusers.php
@@ -0,0 +1,33 @@
+--- ./deadlock/admin/inactiveusers.php.orig	Sun Aug  6 17:39:58 2006
++++ deadlock/admin/inactiveusers.php	Thu Oct 11 15:23:49 2007
+@@ -145,10 +145,10 @@
+   </tr>
+   <tr>
+     <td height="19" colspan="2"><br />
+-        <form id="form1" name="form1" method="get" action="<?=$_SERVER['PHP_SELF']?>">
++        <form id="form1" name="form1" method="get" action="<?php echo $_SERVER['PHP_SELF']?>">
+           <span class="style2">Search:</span>
+           <input type="text" name="search" />
+-          <input type="submit" value="Go" /><? if(!empty($_GET['search'])): ?><input type="button" value="View All" onclick="window.location='<?=$_SERVER['PHP_SELF']?>'" /><? endif; ?>
++          <input type="submit" value="Go" /><?php if(!empty($_GET['search'])): ?><input type="button" value="View All" onclick="window.location='<?php echo $_SERVER['PHP_SELF']?>'" /><?php endif; ?>
+         </form>
+         <br />
+       <table width="100%" border="0">
+@@ -158,14 +158,14 @@
+           <td width="28%" class="style5">Email</td>
+           <td width="21%" class="style5">Actions</td>
+         </tr>
+-       <?=$userlist?>
++       <?php echo $userlist?>
+       </table><br />
+-      <? if($count > 0): ?><div align="center"><span class="style2">Page:</span> <span class="style5"><?=$pagelist?></span></div><br /><? endif; ?>
++      <?php if($count > 0): ?><div align="center"><span class="style2">Page:</span> <span class="style5"><?php echo $pagelist?></span></div><br /><?php endif; ?>
+     <br /></td>
+   </tr>
+ 
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
diff --git a/security/phpdeadlock/files/patch-deadlock_admin_index.php b/security/phpdeadlock/files/patch-deadlock_admin_index.php
new file mode 100644
index 000000000000..45d01fad0b87
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_index.php
@@ -0,0 +1,65 @@
+--- ./deadlock/admin/index.php.orig	Mon Jul 31 01:58:55 2006
++++ deadlock/admin/index.php	Thu Oct 11 15:23:49 2007
+@@ -119,18 +119,18 @@
+       </tr>
+       <tr>
+         <td width="40%" class="style2">Active Members:</td>
+-        <td width="60%" class="style2"><a href="./userlist.php"><?=$currentmembers?></a>
++        <td width="60%" class="style2"><a href="./userlist.php"><?php echo $currentmembers?></a>
+           <a href="#" class="hintanchor" onmouseover="showhint('This is the number of registered and approved members currently in the database.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+         <td class="style2">Pending Requests:</td>
+-        <td class="style2"><?=$pendingmembers?>
+-          <a href="#" class="hintanchor" onmouseover="showhint('<?=$pendinghintbox?>', this, event, '150px')">[?]</a></td>
++        <td class="style2"><?php echo $pendingmembers?>
++          <a href="#" class="hintanchor" onmouseover="showhint('<?php echo $pendinghintbox?>', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+         <td class="style2">Inactive Users:</td>
+-        <td class="style2"><?=$inactivemembers?>
+-          <a href="#" class="hintanchor" onmouseover="showhint('<?=$inactivehintbox?>', this, event, '150px')">[?]</a></td>
++        <td class="style2"><?php echo $inactivemembers?>
++          <a href="#" class="hintanchor" onmouseover="showhint('<?php echo $inactivehintbox?>', this, event, '150px')">[?]</a></td>
+       </tr>
+     </table>
+       <br />
+@@ -140,31 +140,31 @@
+         </tr>
+         <tr>
+           <td width="40%" class="style2">Version:</td>
+-          <td width="60%"><span class="style11"><?=$this_version?></span> <a href="#" class="hintanchor" onmouseover="showhint('This is the version of Deadlock in which is installed on your server.', this, event, '150px')">[?]</a></td>
++          <td width="60%"><span class="style11"><?php echo $this_version?></span> <a href="#" class="hintanchor" onmouseover="showhint('This is the version of Deadlock in which is installed on your server.', this, event, '150px')">[?]</a></td>
+         </tr>
+         <tr>
+           <td class="style2">Current Version:</td>
+-          <td><span class="style11"><?=$latestversion?></span> <a href="#" class="hintanchor" onmouseover="showhint('This is the current version of Deadlock available for download.', this, event, '150px')">[?]</a></td>
++          <td><span class="style11"><?php echo $latestversion?></span> <a href="#" class="hintanchor" onmouseover="showhint('This is the current version of Deadlock available for download.', this, event, '150px')">[?]</a></td>
+         </tr>
+         <tr>
+           <td height="20" class="style2">Status:</td>
+-          <td><?=$upgrade?> <a href="#" class="hintanchor" onmouseover="showhint('<?=$statushint?>', this, event, '150px')">[?]</a></td>
++          <td><?php echo $upgrade?> <a href="#" class="hintanchor" onmouseover="showhint('<?php echo $statushint?>', this, event, '150px')">[?]</a></td>
+         </tr>
+     </table></td>
+     <td height="171" valign="top"><span class="style2"><span class="style5">Navigation Menu</span><br />
+ <a href="./index.php">Home</a><br />
+ <a href="./userlist.php">Manage Users</a><br />
+-<? if($config['require_admin_accept']=='true'): ?><a href="./userrequests.php">User Requests</a><br /><? endif; ?>
+-<? if($config['verify_email']=='true'): ?><a href="./inactiveusers.php">Inactive Users</a><br /><? endif; ?>
++<?php if($config['require_admin_accept']=='true'): ?><a href="./userrequests.php">User Requests</a><br /><?php endif; ?>
++<?php if($config['verify_email']=='true'): ?><a href="./inactiveusers.php">Inactive Users</a><br /><?php endif; ?>
+ <a href="./bulkemail.php">Bulk Email</a><br />
+ <br />
+ <a href="./editconfig.php">Configuration</a><br />
+-<a href="<?=htmlentities($config['protected_area_url'])?>">My Protected Area</a><br />
++<a href="<?php echo htmlentities($config['protected_area_url'])?>">My Protected Area</a><br />
+ <a href="./login.php?cmd=logout">Logout</a></span></td>
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
diff --git a/security/phpdeadlock/files/patch-deadlock_admin_login.php b/security/phpdeadlock/files/patch-deadlock_admin_login.php
new file mode 100644
index 000000000000..886697b52bf6
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_login.php
@@ -0,0 +1,25 @@
+--- ./deadlock/admin/login.php.orig	Mon Jul 31 01:58:55 2006
++++ deadlock/admin/login.php	Thu Oct 11 15:23:49 2007
+@@ -94,11 +94,11 @@
+     <td height="20" colspan="2" class="style2"><strong><a href="./index.php">Top</a>: Admin Panel Login </strong></td>
+   </tr>
+   <tr>
+-    <td height="22" colspan="2" class="style2"><?=$message?></td>
++    <td height="22" colspan="2" class="style2"><?php echo $message?></td>
+   </tr>
+   <tr>
+     <td height="19" colspan="2"><br /><br/><div align="center">
+-      <form id="form1" name="form1" method="post" action="<?=$_SERVER['PHP_SELF']?>?<?=$_SERVER['QUERY_STRING']?>">
++      <form id="form1" name="form1" method="post" action="<?php echo $_SERVER['PHP_SELF']?>?<?php echo $_SERVER['QUERY_STRING']?>">
+         <span class="style2">Password:</span>
+         <input name="password" type="password" id="password" />
+         <input type="submit" value="Login" />
+@@ -107,7 +107,7 @@
+     </div><br/><br/><br/></td>
+   </tr>
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
diff --git a/security/phpdeadlock/files/patch-deadlock_admin_newuser.php b/security/phpdeadlock/files/patch-deadlock_admin_newuser.php
new file mode 100644
index 000000000000..03390904f954
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_newuser.php
@@ -0,0 +1,105 @@
+--- ./deadlock/admin/newuser.php.orig	Sat Aug  5 04:05:16 2006
++++ deadlock/admin/newuser.php	Thu Oct 11 15:23:49 2007
+@@ -103,7 +103,7 @@
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+-<META HTTP-EQUIV="Refresh" CONTENT="5; URL=./userinfo.php?user=<?=htmlentities($_POST['username'])?>">
++<META HTTP-EQUIV="Refresh" CONTENT="5; URL=./userinfo.php?user=<?php echo htmlentities($_POST['username'])?>">
+ <title>Deadlock - User Created Successfully</title>
+ <link href="../images/admin.css" rel="stylesheet" type="text/css" media="all" />
+ </head>
+@@ -120,15 +120,15 @@
+     <td height="20" colspan="2" class="style2"><strong><a href="./index.php">Top</a>: User Created Successfully </strong></td>
+   </tr>
+   <tr>
+-    <td height="28" colspan="2" class="style2">The user <?=htmlentities($_POST['username'])?> was created successfully! Please wait while your are redirected to the user's profile.</td>
++    <td height="28" colspan="2" class="style2">The user <?php echo htmlentities($_POST['username'])?> was created successfully! Please wait while your are redirected to the user's profile.</td>
+   </tr>
+   <tr>
+     <td height="19" colspan="2"><br />
+-      <span class="style2">If you are not redirected within 5 seconds, <a href="./userinfo.php?user=<?=htmlentities($_POST['username'])?>">click here</a>...</span><br /><br /><br /></td>
++      <span class="style2">If you are not redirected within 5 seconds, <a href="./userinfo.php?user=<?php echo htmlentities($_POST['username'])?>">click here</a>...</span><br /><br /><br /></td>
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
+@@ -169,7 +169,7 @@
+     <td height="28" colspan="2" class="style2">To add a user, fill in the required fields below. A welcome email will be sent to the email address provided once the account has been created. </td>
+   </tr>
+   <tr>
+-    <td height="275" colspan="2"><? if (!empty($errors)){ ?><table width="95%" height="24" border="0" align="center">
++    <td height="275" colspan="2"><?php if (!empty($errors)){ ?><table width="95%" height="24" border="0" align="center">
+       <tr>
+         <td height="20">
+ 		<div class="style9"><ul>
+@@ -181,27 +181,27 @@
+ 		</ul></div></td>
+       </tr>
+     </table>
+-      <? } else { print '<br />'; } ?>
+-	  <form action="<?=$_SERVER['PHP_SELF']?>" method="post">
++      <?php } else { print '<br />'; } ?>
++	  <form action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
+       <table width="73%" border="0" align="center">
+       <tr>
+         <td width="47%" class="style5">First Name:</td>
+-        <td width="53%"><input name="firstname" maxlength="15" type="text" id="firstname"<? if(isset($_POST['firstname'])) print ' value="'.$_POST['firstname'].'"'; ?> /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your first name. This must be 1-15 characters and alphanumeric.', this, event, '150px')">[?]</a></td>
++        <td width="53%"><input name="firstname" maxlength="15" type="text" id="firstname"<?php if(isset($_POST['firstname'])) print ' value="'.$_POST['firstname'].'"'; ?> /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your first name. This must be 1-15 characters and alphanumeric.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+         <td class="style5">Last Name: </td>
+-        <td><input name="lastname" maxlength="15" type="text" id="lastname"<? if(isset($_POST['lastname'])) print ' value="'.$_POST['lastname'].'"'; ?> /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your last name. This must be 1-15 characters and alphanumeric.', this, event, '150px')">[?]</a></td>
++        <td><input name="lastname" maxlength="15" type="text" id="lastname"<?php if(isset($_POST['lastname'])) print ' value="'.$_POST['lastname'].'"'; ?> /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your last name. This must be 1-15 characters and alphanumeric.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+         <td class="style5">Email:</td>
+-        <td><input name="email" type="text" id="email"<? if(isset($_POST['email'])) print ' value="'.$_POST['email'].'"'; ?> /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your email address. This email address must be valid.', this, event, '150px')">[?]</a></td>
++        <td><input name="email" type="text" id="email"<?php if(isset($_POST['email'])) print ' value="'.$_POST['email'].'"'; ?> /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your email address. This email address must be valid.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+-        <td class="style5">Phone<? if($config['optional_fields_phone']=="false") print ' (optional)'; ?>: </td>
+-        <td><input name="phone" type="text" id="phone"<? if(isset($_POST['phone'])) print ' value="'.$_POST['phone'].'"'; ?> /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your phone number. This should be <?=$config['phone_digits']?> digits and contain only numbers.', this, event, '150px')">[?]</a></td>
++        <td class="style5">Phone<?php if($config['optional_fields_phone']=="false") print ' (optional)'; ?>: </td>
++        <td><input name="phone" type="text" id="phone"<?php if(isset($_POST['phone'])) print ' value="'.$_POST['phone'].'"'; ?> /><a href="#" class="hintanchor" onMouseover="showhint('Please enter your phone number. This should be <?php echo $config['phone_digits']?> digits and contain only numbers.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+-        <td class="style5">Country<? if($config['optional_fields_country']=="false") print ' (optional)'; ?>:</td>
++        <td class="style5">Country<?php if($config['optional_fields_country']=="false") print ' (optional)'; ?>:</td>
+         <td>
+ <?php
+ if(isset($_POST['country'])){
+@@ -216,7 +216,7 @@
+         </tr>
+       <tr>
+         <td class="style5">Username:</td>
+-        <td><input name="username" maxlength="15" type="text" id="username"<? if(isset($_POST['username'])) print ' value="'.$_POST['username'].'"'; ?> /><a href="#" class="hintanchor" onMouseover="showhint('Please choose a username. This must be alphanumeric and contain 5-10 characters.', this, event, '150px')">[?]</a></td>
++        <td><input name="username" maxlength="15" type="text" id="username"<?php if(isset($_POST['username'])) print ' value="'.$_POST['username'].'"'; ?> /><a href="#" class="hintanchor" onMouseover="showhint('Please choose a username. This must be alphanumeric and contain 5-10 characters.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+         <td class="style5">Password:</td>
+@@ -227,9 +227,9 @@
+         <td><input name="password2" maxlength="10" type="password" id="password2" /><a href="#" class="hintanchor" onMouseover="showhint('Please confirm the password you entered above.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+-        <td class="style2"><input name="welcome_user" type="checkbox" id="welcome_user" value="1" <? if(($config['user_welcome_email']=="true" && !isset($_POST['submit'])) || isset($_POST['welcome_user'])) print 'checked="checked" '; ?>/>
++        <td class="style2"><input name="welcome_user" type="checkbox" id="welcome_user" value="1" <?php if(($config['user_welcome_email']=="true" && !isset($_POST['submit'])) || isset($_POST['welcome_user'])) print 'checked="checked" '; ?>/>
+         Send welcome email<a href="#" class="hintanchor2" onMouseover="showhint('Check this box if you would like to send a welcome email to the above email address.', this, event, '150px')">[?]</a></td>
+-        <td class="style2"><input name="notify_admin" type="checkbox" id="notify_admin" value="checkbox" <? if(($config['admin_user_email']=="true" && !isset($_POST['submit'])) || isset($_POST['notify_admin'])) print 'checked="checked" '; ?>/>
++        <td class="style2"><input name="notify_admin" type="checkbox" id="notify_admin" value="checkbox" <?php if(($config['admin_user_email']=="true" && !isset($_POST['submit'])) || isset($_POST['notify_admin'])) print 'checked="checked" '; ?>/>
+ Notify administrator<a href="#" class="hintanchor2" onmouseover="showhint('Check this box if you would like to send the administrator a notification email with this user\'s information.', this, event, '150px')">[?]</a></td>
+       </tr>
+       <tr>
+@@ -245,7 +245,7 @@
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
diff --git a/security/phpdeadlock/files/patch-deadlock_admin_useraccept.php b/security/phpdeadlock/files/patch-deadlock_admin_useraccept.php
new file mode 100644
index 000000000000..0ba4793fe084
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_useraccept.php
@@ -0,0 +1,50 @@
+--- ./deadlock/admin/useraccept.php.orig	Mon Jul 31 01:58:55 2006
++++ deadlock/admin/useraccept.php	Thu Oct 11 15:23:49 2007
+@@ -117,7 +117,7 @@
+     <td height="20" colspan="2" class="style2"><strong><a href="./index.php">Top</a>: User Updated Successfully </strong></td>
+   </tr>
+   <tr>
+-    <td height="28" colspan="2" class="style2">The user &quot;<?=htmlentities($_GET['user'])?>&quot; was updated successfully! Please wait while your are redirected to the user request list.</td>
++    <td height="28" colspan="2" class="style2">The user &quot;<?php echo htmlentities($_GET['user'])?>&quot; was updated successfully! Please wait while your are redirected to the user request list.</td>
+   </tr>
+   <tr>
+     <td height="19" colspan="2"><br />
+@@ -125,17 +125,17 @@
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
+ </html>
+-<? else: ?>
++<?php else: ?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+-<META HTTP-EQUIV="Refresh" CONTENT="5; URL=./userinfo.php?user=<?=htmlentities($_GET['user'])?>">
++<META HTTP-EQUIV="Refresh" CONTENT="5; URL=./userinfo.php?user=<?php echo htmlentities($_GET['user'])?>">
+ <title>Deadlock - User Updated Successfully</title>
+ <link href="../images/admin.css" rel="stylesheet" type="text/css" media="all" />
+ </head>
+@@ -152,7 +152,7 @@
+     <td height="20" colspan="2" class="style2"><strong><a href="./index.php">Top</a>: User Update Failed </strong></td>
+   </tr>
+   <tr>
+-    <td height="28" colspan="2" class="style2">The user <?=htmlentities($_GET['user'])?> was unable to be updated. Please make sure MySQL is running and setup correctly. Please wait while your are redirected to the request list.</td>
++    <td height="28" colspan="2" class="style2">The user <?php echo htmlentities($_GET['user'])?> was unable to be updated. Please make sure MySQL is running and setup correctly. Please wait while your are redirected to the request list.</td>
+   </tr>
+   <tr>
+     <td height="19" colspan="2"><br />
+@@ -160,7 +160,7 @@
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
diff --git a/security/phpdeadlock/files/patch-deadlock_admin_userinfo.php b/security/phpdeadlock/files/patch-deadlock_admin_userinfo.php
new file mode 100644
index 000000000000..801c14a2d3ef
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_userinfo.php
@@ -0,0 +1,86 @@
+--- ./deadlock/admin/userinfo.php.orig	Mon Jul 31 01:58:55 2006
++++ deadlock/admin/userinfo.php	Thu Oct 11 15:23:49 2007
+@@ -127,53 +127,53 @@
+       <table width="70%" border="0">
+       <tr>
+         <td width="31%" class="style5">Full Name:</td>
+-        <td width="69%" class="style2"><?=$name?></td>
++        <td width="69%" class="style2"><?php echo $name?></td>
+       </tr>
+       <tr>
+         <td class="style5">Username:</td>
+-        <td class="style2"><?=$username?></td>
++        <td class="style2"><?php echo $username?></td>
+       </tr>
+       <tr>
+         <td class="style5">Email Address: </td>
+-        <td class="style2"><? if($status=='2'): ?><a href="./bulkemail.php?user=<?=$username?>"><?=$email?></a><? else: print $email; endif; ?></td>
++        <td class="style2"><?php if($status=='2'): ?><a href="./bulkemail.php?user=<?php echo $username?>"><?php echo $email?></a><?php else: print $email; endif; ?></td>
+       </tr>
+       <tr>
+         <td class="style5">Country:</td>
+-        <td class="style2"><?=$country?></td>
++        <td class="style2"><?php echo $country?></td>
+       </tr>
+       <tr>
+         <td class="style5">Phone:</td>
+-        <td class="style2"><?=FormatPhoneNumber($phone)?></td>
++        <td class="style2"><?php echo FormatPhoneNumber($phone)?></td>
+       </tr>
+       <tr>
+         <td class="style5">Date Registered:</td>
+-        <td class="style2"><?=$RegistrationDate?></td>
++        <td class="style2"><?php echo $RegistrationDate?></td>
+       </tr>
+       <tr>
+         <td class="style5">Status:</td>
+-        <td class="style2"><?=$statustext?></td>
++        <td class="style2"><?php echo $statustext?></td>
+       </tr>
+     </table>
+       <br />
+-      <? if($status=='1'): ?>
+-      <input name="Button" type="button" value="Accept" onclick="acceptuser('<?=$username?>')" />
+-      <input name="Button" type="button" value="Decline" onclick="denyuser('<?=$username?>')" />
+-      <? else: ?>
+-      <input name="Button" type="button" value="Delete" onclick="deleteuser('<?=$username?>')" />
+-      <input type="submit" value="Edit" onclick="window.location='./edituser.php?user=<?=$username?>'" />
+-      <? endif; ?>
++      <?php if($status=='1'): ?>
++      <input name="Button" type="button" value="Accept" onclick="acceptuser('<?php echo $username?>')" />
++      <input name="Button" type="button" value="Decline" onclick="denyuser('<?php echo $username?>')" />
++      <?php else: ?>
++      <input name="Button" type="button" value="Delete" onclick="deleteuser('<?php echo $username?>')" />
++      <input type="submit" value="Edit" onclick="window.location='./edituser.php?user=<?php echo $username?>'" />
++      <?php endif; ?>
+       <br />
+ 
+   <span class="style2"><br />
+       <br /><a href="./userlist.php">&lt;&lt; Back to user list</a><br/><br/><br/></span></td>
+   </tr>
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
+ </html>
+-<? else: ?>
++<?php else: ?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+@@ -211,9 +211,9 @@
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
+ </html>
+-<? endif; ?>
+\ No newline at end of file
++<?php endif; ?>
+\ No newline at end of file
diff --git a/security/phpdeadlock/files/patch-deadlock_admin_userlist.php b/security/phpdeadlock/files/patch-deadlock_admin_userlist.php
new file mode 100644
index 000000000000..cce75e392138
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_userlist.php
@@ -0,0 +1,33 @@
+--- ./deadlock/admin/userlist.php.orig	Sun Aug  6 17:40:16 2006
++++ deadlock/admin/userlist.php	Thu Oct 11 15:23:49 2007
+@@ -139,10 +139,10 @@
+   </tr>
+   <tr>
+     <td height="19" colspan="2"><br />
+-        <form id="form1" name="form1" method="get" action="<?=$_SERVER['PHP_SELF']?>">
++        <form id="form1" name="form1" method="get" action="<?php echo $_SERVER['PHP_SELF']?>">
+           <span class="style2">Search:</span>
+           <input type="text" name="search" />
+-          <input type="submit" value="Go" /><? if(!empty($_GET['search'])): ?><input type="button" value="View All" onclick="window.location='<?=$_SERVER['PHP_SELF']?>'" /><? endif; ?>
++          <input type="submit" value="Go" /><?php if(!empty($_GET['search'])): ?><input type="button" value="View All" onclick="window.location='<?php echo $_SERVER['PHP_SELF']?>'" /><?php endif; ?>
+         </form>
+         <br />
+         <a href="./newuser.php" class="style2">Create New User&gt;&gt;</a><br /><br />
+@@ -153,14 +153,14 @@
+           <td width="28%" class="style5">Email</td>
+           <td width="21%" class="style5">Actions</td>
+         </tr>
+-       <?=$userlist?>
++       <?php echo $userlist?>
+       </table><br />
+-      <? if($count > 0): ?><div align="center"><span class="style2">Page:</span> <span class="style5"><?=$pagelist?></span></div><br /><? endif; ?>
++      <?php if($count > 0): ?><div align="center"><span class="style2">Page:</span> <span class="style5"><?php echo $pagelist?></span></div><br /><?php endif; ?>
+     <br /></td>
+   </tr>
+ 
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
diff --git a/security/phpdeadlock/files/patch-deadlock_admin_userrequests.php b/security/phpdeadlock/files/patch-deadlock_admin_userrequests.php
new file mode 100644
index 000000000000..a071522ee6ee
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_admin_userrequests.php
@@ -0,0 +1,33 @@
+--- ./deadlock/admin/userrequests.php.orig	Sun Aug  6 17:40:38 2006
++++ deadlock/admin/userrequests.php	Thu Oct 11 15:23:49 2007
+@@ -143,10 +143,10 @@
+   </tr>
+   <tr>
+     <td height="19" colspan="2"><br />
+-        <form id="form1" name="form1" method="get" action="<?=$_SERVER['PHP_SELF']?>">
++        <form id="form1" name="form1" method="get" action="<?php echo $_SERVER['PHP_SELF']?>">
+           <span class="style2">Search:</span>
+           <input type="text" name="search" />
+-          <input type="submit" value="Go" /><? if(!empty($_GET['search'])): ?><input type="button" value="View All" onclick="window.location='<?=$_SERVER['PHP_SELF']?>'" /><? endif; ?>
++          <input type="submit" value="Go" /><?php if(!empty($_GET['search'])): ?><input type="button" value="View All" onclick="window.location='<?php echo $_SERVER['PHP_SELF']?>'" /><?php endif; ?>
+         </form>
+         <br />
+       <table width="100%" border="0">
+@@ -156,14 +156,14 @@
+           <td width="28%" class="style5">Email</td>
+           <td width="21%" class="style5">Actions</td>
+         </tr>
+-<?=$userlist?>
++<?php echo $userlist?>
+       </table><br />
+-      <? if($count > 0): ?><div align="center"><span class="style2">Page:</span> <span class="style5"><?=$pagelist?></span></div><br /><? endif; ?>
++      <?php if($count > 0): ?><div align="center"><span class="style2">Page:</span> <span class="style5"><?php echo $pagelist?></span></div><br /><?php endif; ?>
+     <br /></td>
+   </tr>
+   
+   <tr>
+-    <td height="21" colspan="2" class="footercell"><div align="center"><?show_footer($software_signature)?></div></td>
++    <td height="21" colspan="2" class="footercell"><div align="center"><?phpshow_footer($software_signature)?></div></td>
+   </tr>
+ </table>
+ </body>
diff --git a/security/phpdeadlock/files/patch-deadlock_install_install.php b/security/phpdeadlock/files/patch-deadlock_install_install.php
new file mode 100644
index 000000000000..149dd566c573
--- /dev/null
+++ b/security/phpdeadlock/files/patch-deadlock_install_install.php
@@ -0,0 +1,129 @@
+--- ./deadlock/install/install.php.orig	Sun Aug 20 02:30:18 2006
++++ deadlock/install/install.php	Thu Oct 11 15:23:49 2007
+@@ -109,7 +109,7 @@
+     <td height="20" colspan="2" class="style2"><strong>Installation Step 1</strong></td>
+   </tr>
+   <tr>
+-    <td colspan="2" class="style2">Welcome to the Deadlock installation script. This script will guide you through the entire setup process.<br /><br /><?=$dbconfigpermissions?></td>
++    <td colspan="2" class="style2">Welcome to the Deadlock installation script. This script will guide you through the entire setup process.<br /><br /><?php echo $dbconfigpermissions?></td>
+   </tr>
+   <tr>
+     <td colspan="2">
+@@ -122,7 +122,7 @@
+ </table>
+ </body>
+ </html>
+-<?
++<?php
+ elseif($currentstep=='2'):
+ if(!is_writable('../db_config.php')) die('Deadlock found that db_config.php is not writable. Did you skip step 1?');
+ 
+@@ -214,7 +214,7 @@
+     <td colspan="2" class="style2">Here you need to specify your MySQL database information, so that we can create the db_config.php file containing your database settings. </td>
+   </tr>
+   <tr>
+-    <td colspan="2"><? if (!empty($errors)){ ?>
++    <td colspan="2"><?php if (!empty($errors)){ ?>
+       <table width="95%" height="24" border="0" align="center">
+       <tr>
+         <td height="20">
+@@ -227,10 +227,10 @@
+ 		</ul></div></td>
+       </tr>
+     </table>
+-      <? } else { print '<br />'; } ?>
++      <?php } else { print '<br />'; } ?>
+       <br />
+     <br />
+-    <form id="form1" name="form1" method="post" action="<?=$_SERVER['PHP_SELF']?>?<?=$_SERVER['QUERY_STRING']?>">
++    <form id="form1" name="form1" method="post" action="<?php echo $_SERVER['PHP_SELF']?>?<?php echo $_SERVER['QUERY_STRING']?>">
+       <table width="70%" border="0" align="center">
+         <tr>
+           <td class="style5">MySQL Host:</td>
+@@ -273,7 +273,7 @@
+ </table>
+ </body>
+ </html>
+-<?
++<?php
+ elseif($currentstep=='3'):
+ if(!file_exists('../db_config.php')) die('db_config.php does not yet exist. Did you skip step 2?');
+ if(!defined('DEADLOCK_INSTALLED')){
+@@ -468,7 +468,7 @@
+ </table>
+ </body>
+ </html>
+-<?
++<?php
+ exit;
+ 	}
+ }
+@@ -504,7 +504,7 @@
+     <td colspan="2" class="style2">Here we need to specify settings required in order for Deadlock to function properly. Clicking Submit will create the database tables, provided there are no errors.</td>
+   </tr>
+   <tr>
+-    <td colspan="2"><? if (!empty($errors)){ ?>
++    <td colspan="2"><?php if (!empty($errors)){ ?>
+       <table width="95%" height="24" border="0" align="center">
+       <tr>
+         <td height="20">
+@@ -517,25 +517,25 @@
+ 		</ul></div></td>
+       </tr>
+     </table>
+-      <? } else { print '<br />'; } ?>
++      <?php } else { print '<br />'; } ?>
+       <br />
+     <br />
+-    <form id="form1" name="form1" method="post" action="<?=$_SERVER['PHP_SELF']?>?<?=$_SERVER['QUERY_STRING']?>">
++    <form id="form1" name="form1" method="post" action="<?php echo $_SERVER['PHP_SELF']?>?<?php echo $_SERVER['QUERY_STRING']?>">
+       <table width="70%" border="0" align="center">
+         <tr>
+           <td class="style5">Path to Htpasswd:</td>
+-          <td><input name="htpasswd_path" type="text" id="htpasswd_path" value="<? if(isset($_POST['htpasswd_path'])) print $_POST['htpasswd_path']; else print "/protected/.htpasswd"; ?>" />
++          <td><input name="htpasswd_path" type="text" id="htpasswd_path" value="<?php if(isset($_POST['htpasswd_path'])) print $_POST['htpasswd_path']; else print "/protected/.htpasswd"; ?>" />
+             <a href="#" class="hintanchor" onmouseover="showhint('Enter the path to your htpasswd file. This must be relative to the document root. For example, if the URL to your protected area is http://www.example.com/protected/, in this field you would most likely enter &quot;/protected/.htpasswd&quot;.', this, event, '150px')">[?]</a></td>
+         </tr>
+         <tr>
+           <td class="style5">&nbsp;</td>
+           <td class="style2">Relative? 
+-            <input name="htpasswd_relative" type="checkbox" value="true"<? if($htpasswd_relative){ print ' checked="checked"'; } elseif(!isset($_POST['submit'])) { print ' checked="checked"'; } ?> />
++            <input name="htpasswd_relative" type="checkbox" value="true"<?php if($htpasswd_relative){ print ' checked="checked"'; } elseif(!isset($_POST['submit'])) { print ' checked="checked"'; } ?> />
+             <a href="#" class="hintanchor" onmouseover="showhint('If this box is checked, the path entered above must be relative to your document root. If this box is not checked, the path above must be a full path.', this, event, '150px')">[?]</a></td>
+         </tr>
+         <tr>
+           <td width="48%" class="style5">Path to Htaccess:</td>
+-          <td width="52%"><input name="htaccess_path" type="text" id="htaccess_path" value="<? if(isset($_POST['htaccess_path'])) print $_POST['htaccess_path']; else print "/protected/.htaccess"; ?>" />
++          <td width="52%"><input name="htaccess_path" type="text" id="htaccess_path" value="<?php if(isset($_POST['htaccess_path'])) print $_POST['htaccess_path']; else print "/protected/.htaccess"; ?>" />
+             <a href="#" class="hintanchor" onmouseover="showhint('Enter the path to your htaccess file. This MUST be relative to the document root and MUST be within your protected area. For example, if the URL to your protected area is http://www.example.com/protected/, in this field you would most likely enter &quot;/protected/.haccess&quot;. This file MUST be in your protected area directory for Deadlock to function properly!', this, event, '200px')">[?]</a></td>
+         </tr>
+         <tr>
+@@ -544,17 +544,17 @@
+         </tr>
+         <tr>
+           <td class="style5">Protected URL:</td>
+-          <td><input name="protected_area_url" type="text" id="protected_area_url" value="<? if(isset($_POST['protected_area_url'])) print $_POST['protected_area_url']; else print "http://".$_SERVER['HTTP_HOST']."/protected/"; ?>" />
++          <td><input name="protected_area_url" type="text" id="protected_area_url" value="<?php if(isset($_POST['protected_area_url'])) print $_POST['protected_area_url']; else print "http://".$_SERVER['HTTP_HOST']."/protected/"; ?>" />
+ 		  <a href="#" class="hintanchor" onmouseover="showhint('Enter the URL to your protected area.', this, event, '150px')">[?]</a></td>
+         </tr>
+         <tr>
+           <td class="style5">Deadlock URL:</td>
+-          <td><input name="deadlock_url" type="text" id="deadlock_url" value ="<? if(isset($_POST['deadlock_url'])) print $_POST['deadlock_url']; else print "http://".$_SERVER['HTTP_HOST'].str_replace('/install','',dirname($_SERVER['REQUEST_URI'])); ?>" />
++          <td><input name="deadlock_url" type="text" id="deadlock_url" value ="<?php if(isset($_POST['deadlock_url'])) print $_POST['deadlock_url']; else print "http://".$_SERVER['HTTP_HOST'].str_replace('/install','',dirname($_SERVER['REQUEST_URI'])); ?>" />
+ 		  <a href="#" class="hintanchor" onmouseover="showhint('This is the URL to the root directory of Deadlock. On most installations this will be http://www.yoursite.com/deadlock. Do NOT include a trailing forwardslash!', this, event, '150px')">[?]</a></td>
+         </tr>
+         <tr>
+           <td class="style5">Admin Email: </td>
+-          <td><input name="admin_email" type="text" id="admin_email" value="<? if(isset($_POST['admin_email'])) print $_POST['admin_email']; else print "admin@example.com"; ?>" />
++          <td><input name="admin_email" type="text" id="admin_email" value="<?php if(isset($_POST['admin_email'])) print $_POST['admin_email']; else print "admin@example.com"; ?>" />
+ 		  <a href="#" class="hintanchor" onmouseover="showhint('Enter your email address.', this, event, '150px')">[?]</a></td>
+         </tr>
+         <tr>
+@@ -573,4 +573,4 @@
+ </table>
+ </body>
+ </html>
+-<? endif; ?>
+\ No newline at end of file
++<?php endif; ?>
+\ No newline at end of file
diff --git a/security/phpdeadlock/files/pkg-message.in b/security/phpdeadlock/files/pkg-message.in
new file mode 100644
index 000000000000..9e9bd89d76b0
--- /dev/null
+++ b/security/phpdeadlock/files/pkg-message.in
@@ -0,0 +1,31 @@
+*************************************************
+Post-installation instructions:
+
+o Add the following lines to your httpd.conf or
+  an included .conf file:
+
+    Alias /%%DLURL%%/ "%%PREFIX%%/%%DLDIR%%/"
+    AddType application/x-httpd-php .php
+    DirectoryIndex index.php
+
+    <Directory "%%PREFIX%%/www/data/protected">
+        AllowOverride AuthConfig
+    </Directory>
+
+  NB: The directory "%%PREFIX%%/www/data/protected"
+      is the default, but can be changed in the
+      Deadlock administrator area.
+
+o Restart your web server
+
+o Create a new MySQL database and a user account
+  with access to it that Deadlock can use to store
+  user accounts and configuration information
+
+o Browse to http://localhost/%%DLURL%%/ to
+  complete the installation
+
+o Note that the default admin password is "password".
+  Browse to http://localhost/%%DLURL%%/admin/
+  after installation, log in, and change it.
+*************************************************
-- 
cgit v1.2.3