aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-05 15:35:53 -0700
committerFriendika <info@friendika.com>2011-10-05 15:35:53 -0700
commitb1e5dfad3cb3881bb2e5655ede1b64adaff32dcc (patch)
tree8cf2137c4c34b73959ada8da6d2f26d85ca190ca /mod
parent09fcfe2fe7f0a208b3c5fb391e3d5a1a003c141f (diff)
downloadvolse-hubzilla-b1e5dfad3cb3881bb2e5655ede1b64adaff32dcc.tar.gz
volse-hubzilla-b1e5dfad3cb3881bb2e5655ede1b64adaff32dcc.tar.bz2
volse-hubzilla-b1e5dfad3cb3881bb2e5655ede1b64adaff32dcc.zip
clean up w3c validation and layout for priv mail and lang selector
Diffstat (limited to 'mod')
-rw-r--r--mod/dfrn_notify.php7
-rw-r--r--mod/item.php2
2 files changed, 6 insertions, 3 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 07de64160..53179eaf1 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -451,9 +451,12 @@ function dfrn_notify_post(&$a) {
if($is_reply) {
- // was the top-level post for this reply written by somebody on this site? Specifically, the recipient?
+ // was the top-level post for this reply written by somebody on this site?
+ // Specifically, the recipient?
- $r = q("select `item`.`id` from `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` where `contact`.`self` = 1 AND `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
+ $r = q("select `item`.`id` from `item`
+ LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ WHERE `contact`.`self` = 1 AND `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
dbesc($parent_uri),
intval($importer['importer_uid'])
);
diff --git a/mod/item.php b/mod/item.php
index b8c0683aa..08c5e68b8 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -703,7 +703,7 @@ function item_post(&$a) {
else
$signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $myaddr;
- $authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha'));
+ $authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha256'));
q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
intval($post_id),