privatekey -> privateKey everywhere

4 files changed, 11 insertions, 11 deletions

diff --git a/www/bookmarks.php b/www/bookmarks.php
index 44119db..7056fa6 100644
--- a/www/bookmarks.php
+++ b/www/bookmarks.php
@@ -276,7 +276,7 @@ if ($templatename == 'editbookmark.tpl') {
                 $tplVars['rsschannels'],
                 array(
                     filter($sitename . $rssTitle. sprintf(T_(': (private) ')) . $currentUsername),
-                    createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&privatekey='.$currentUser->getPrivateKey())
+                    createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&privateKey='.$currentUser->getPrivateKey())
                 )
             );
         }
diff --git a/www/index.php b/www/index.php
index 2fa21f8..f270f73 100644
--- a/www/index.php
+++ b/www/index.php
@@ -52,7 +52,7 @@ if ($userservice->isLoggedOn()) {
             $tplVars['rsschannels'],
             array(
                 filter(sprintf(T_('%s: Recent bookmarks (+private) %s'), $sitename, $currentUsername)),
-                createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&privatekey='.$currentUser->getPrivateKey())
+                createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&privateKey='.$currentUser->getPrivateKey())
             )
         );
     }
diff --git a/www/rss.php b/www/rss.php
index b8f6948..d888726 100644
--- a/www/rss.php
+++ b/www/rss.php
@@ -64,9 +64,9 @@ if (!isset($rssEntries) || $rssEntries <= 0) {
     $rssEntries = $maxRssEntries;
 }
 
-$privatekey = null;
-if (isset($_GET['privatekey'])) {
-    $privatekey = $_GET['privatekey'];
+$privateKey = null;
+if (isset($_GET['privateKey'])) {
+    $privateKey = $_GET['privateKey'];
 }
 
 $userid    = null;
@@ -83,10 +83,10 @@ if ($user && $user != 'all') {
     } else {
         if ($userinfo = $userservice->getUserByUsername($user)) {
             $userid =& $userinfo[$userservice->getFieldName('primary')];
-            /* if user is not logged in and has valid privatekey */
+            /* if user is not logged in and has valid privateKey */
             if (!$userservice->isLoggedOn()) {
-                if ($privatekey != null) {
-                    if (!$userservice->loginPrivateKey($privatekey)) {
+                if ($privateKey != null) {
+                    if (!$userservice->loginPrivateKey($privateKey)) {
                         $tplVars['error'] = sprintf(T_('Failed to Autenticate User with username %s using private key'), $user);
                         header('Content-type: text/html; charset=utf-8');
                         $templateservice->loadTemplate('error.404.tpl', $tplVars);
@@ -106,8 +106,8 @@ if ($user && $user != 'all') {
     }
     $pagetitle .= ": ". $user;
 } else {
-    if ($privatekey != null) {
-        if (!$userservice->loginPrivateKey($privatekey)) {
+    if ($privateKey != null) {
+        if (!$userservice->loginPrivateKey($privateKey)) {
             $tplVars['error'] = sprintf(T_('Failed to Autenticate User with username %s using private key'), $user);
             header('Content-type: text/html; charset=utf-8');
             $templateservice->loadTemplate('error.404.tpl', $tplVars);
diff --git a/www/tags.php b/www/tags.php
index 09725e4..fca8a04 100644
--- a/www/tags.php
+++ b/www/tags.php
@@ -77,7 +77,7 @@ if ($userservice->isLoggedOn()) {
             $tplVars['rsschannels'],
             array(
                 filter($sitename .': Tags: '. $cat . sprintf(T_(': (private) ')) . $currentUsername),
-                createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&amp;privatekey='.$currentUser->getPrivateKey())
+                createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&amp;privateKey='.$currentUser->getPrivateKey())
             )
         );
     }