new privatekey2 branch with privatekey changes

5 files changed, 17 insertions, 4 deletions

diff --git a/data/schema/6.sql b/data/schema/6.sql
index 0c208ad..e4acd53 100644
--- a/data/schema/6.sql
+++ b/data/schema/6.sql
@@ -13,3 +13,7 @@ CREATE TABLE `sc_users_sslclientcerts` (
   PRIMARY KEY ( `id` ) ,
   UNIQUE (`id`)
 ) CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+ALTER TABLE `sc_users` ADD `privateKey` VARCHAR(33) NULL;
+CREATE INDEX `privateKey` ON `sc_users` (`privateKey`);
+
diff --git a/data/tables.sql b/data/tables.sql
index d53945e..dd4e924 100644
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -84,8 +84,9 @@ CREATE TABLE `sc_users_sslclientcerts` (
   `sslClientIssuerDn` VARCHAR( 1024 ) NOT NULL ,
   `sslName` VARCHAR( 64 ) NOT NULL ,
   `sslEmail` VARCHAR( 64 ) NOT NULL ,
+  `privateKey` varchar(33) default NULL,
   PRIMARY KEY ( `id` ) ,
-  UNIQUE (`id`)
+  UNIQUE KEY `privateKey` (`privateKey`)
 ) CHARACTER SET utf8 COLLATE utf8_general_ci;
 
 -- 
diff --git a/data/templates/editprofile.tpl.php b/data/templates/editprofile.tpl.php
index cc74f04..76f608a 100644
--- a/data/templates/editprofile.tpl.php
+++ b/data/templates/editprofile.tpl.php
@@ -28,6 +28,14 @@ $this->includeTemplate($GLOBALS['top_include']);
     <td><input type="text" name="pMail" size="75" value="<?php echo filter($objectUser->getEmail(), 'xml'); ?>" /></td>
     <td>← <?php echo T_('Required'); ?></td>
 </tr>
+<tr>
+    <th align="left"><?php echo T_('Private RSS Feed'); ?></th>
+    <td><input type="checkbox" id="pEnablePrivateKey" name="pEnablePrivateKey" value="true" <?php echo $privateKeyIsEnabled;?> />
+        <label for="pEnablePrivateKey"><?php echo T_('Enable'); ?></label>&nbsp;&nbsp;&nbsp;
+        <input type="text" id="pPrivateKey" name="pPrivateKey" size="40" value="<?php echo $privateKey;?>" readonly="readonly" />
+        <input type="submit" name="submittedPK" value="<?php echo T_('Generate New Key'); ?>" />
+    </td>
+</tr>
 </table>
 
 <h3><?php echo T_('Personal Details'); ?></h3>
diff --git a/data/templates/rss.tpl.php b/data/templates/rss.tpl.php
index e6e66f7..6be5425 100644
--- a/data/templates/rss.tpl.php
+++ b/data/templates/rss.tpl.php
@@ -3,7 +3,7 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n";
 ?>
 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <channel>
-    <title><?php echo htmlspecialchars($feedtitle); ?></title>
+    <title><?php echo $feedtitle; ?></title>
     <link><?php echo htmlspecialchars($feedlink); ?></link>
     <description><?php echo htmlspecialchars($feeddescription); ?></description>
     <pubDate><?php echo date('r'); ?></pubDate>
@@ -23,4 +23,4 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n";
     </item>
 <?php endforeach; ?>
 </channel>
-</rss>
\ No newline at end of file
+</rss>
diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php
index bdd4b1a..738b71e 100644
--- a/data/templates/top.inc.php
+++ b/data/templates/top.inc.php
@@ -12,7 +12,7 @@ if (isset($rsschannels)) {
 	$size = count($rsschannels);
 	for ($i = 0; $i < $size; $i++) {
 		echo '  <link rel="alternate" type="application/rss+xml" title="'
-            . htmlspecialchars($rsschannels[$i][0]) . '"'
+            . $rsschannels[$i][0] . '"'
             . ' href="'. $rsschannels[$i][1] .'" />';
 	}
 }