aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-17 20:52:18 -0700
committerFriendika <info@friendika.com>2011-08-17 20:52:18 -0700
commitc30f523c6200ef84c506940b5f86b49ff2c7cf6e (patch)
tree2f9787a5040cd679bc212094748eb02ab41239bb
parentff723caae3208b6f6da555d2a5b8375b4d74fd73 (diff)
downloadvolse-hubzilla-c30f523c6200ef84c506940b5f86b49ff2c7cf6e.tar.gz
volse-hubzilla-c30f523c6200ef84c506940b5f86b49ff2c7cf6e.tar.bz2
volse-hubzilla-c30f523c6200ef84c506940b5f86b49ff2c7cf6e.zip
more d* infrastructure for relaying signed messages and storing non-connected people details
-rw-r--r--boot.php2
-rw-r--r--database.sql24
-rw-r--r--mod/like.php6
-rw-r--r--mod/wall_upload.php2
-rw-r--r--update.php27
5 files changed, 52 insertions, 9 deletions
diff --git a/boot.php b/boot.php
index 158054884..09d9f4ef8 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once("include/pgettext.php");
define ( 'FRIENDIKA_VERSION', '2.2.1075' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
-define ( 'DB_UPDATE_VERSION', 1079 );
+define ( 'DB_UPDATE_VERSION', 1080 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
diff --git a/database.sql b/database.sql
index 89c4b4267..ae036fc74 100644
--- a/database.sql
+++ b/database.sql
@@ -521,7 +521,18 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
`url` CHAR( 255 ) NOT NULL ,
`name` CHAR( 255 ) NOT NULL ,
`photo` CHAR( 255 ) NOT NULL ,
-`request` CHAR( 255 ) NOT NULL
+`request` CHAR( 255 ) NOT NULL,
+`nick` CHAR( 255 ) NOT NULL ,
+`addr` CHAR( 255 ) NOT NULL ,
+`notify` CHAR( 255 ) NOT NULL ,
+`poll` CHAR( 255 ) NOT NULL ,
+`confirm` CHAR( 255 ) NOT NULL ,
+`priority` TINYINT( 1 ) NOT NULL ,
+`network` CHAR( 32 ) NOT NULL ,
+`alias` CHAR( 255 ) NOT NULL ,
+`pubkey` TEXT NOT NULL ,
+INDEX ( `addr` ),
+INDEX ( `network` )
) ENGINE = MYISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `ffinder` (
@@ -581,3 +592,14 @@ CREATE TABLE IF NOT EXISTS `guid` (
INDEX ( `guid` )
) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `sign` (
+`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`iid` INT UNSIGNED NOT NULL ,
+`signed_text` MEDIUMTEXT NOT NULL ,
+`signature` TEXT NOT NULL ,
+`signer` CHAR( 255 ) NOT NULL ,
+INDEX ( `iid` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+
diff --git a/mod/like.php b/mod/like.php
index 966fe500b..287630212 100644
--- a/mod/like.php
+++ b/mod/like.php
@@ -19,14 +19,10 @@ function like_content(&$a) {
switch($verb) {
case 'like':
- $activity = ACTIVITY_LIKE;
- break;
- case 'dislike':
- $activity = ACTIVITY_DISLIKE;
- break;
case 'unlike':
$activity = ACTIVITY_LIKE;
break;
+ case 'dislike':
case 'undislike':
$activity = ACTIVITY_DISLIKE;
break;
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index dd2197d7c..b34f2cf6b 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -55,7 +55,7 @@ function wall_upload_post(&$a) {
if(($maximagesize) && ($filesize > $maximagesize)) {
echo sprintf( t('Image exceeds size limit of %d'), $maximagesize) . EOL;
@unlink($src);
- return;
+ killme();
}
$imagedata = @file_get_contents($src);
diff --git a/update.php b/update.php
index 256ab48e8..3586aa5fd 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1079 );
+define( 'UPDATE_VERSION' , 1080 );
/**
*
@@ -646,3 +646,28 @@ function update_1077() {
function update_1078() {
q("ALTER TABLE `item` ADD `guid` CHAR( 64 ) NOT NULL AFTER `id` , ADD INDEX ( `guid` ) ");
}
+
+function update_1079() {
+ q("CREATE TABLE IF NOT EXISTS `sign` (
+ `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+ `iid` INT UNSIGNED NOT NULL ,
+ `signed_text` MEDIUMTEXT NOT NULL ,
+ `signature` TEXT NOT NULL ,
+ `signer` CHAR( 255 ) NOT NULL ,
+ INDEX ( `iid` )
+ ) ENGINE = MYISAM ");
+
+ q("ALTER TABLE `fcontact` ADD `nick` CHAR( 255 ) NOT NULL ,
+ ADD `addr` CHAR( 255 ) NOT NULL ,
+ ADD `notify` CHAR( 255 ) NOT NULL ,
+ ADD `poll` CHAR( 255 ) NOT NULL ,
+ ADD `confirm` CHAR( 255 ) NOT NULL ,
+ ADD `priority` TINYINT( 1 ) NOT NULL ,
+ ADD `network` CHAR( 32 ) NOT NULL ,
+ ADD `alias` CHAR( 255 ) NOT NULL ,
+ ADD `pubkey` TEXT NOT NULL ,
+ ADD INDEX ( `addr` ) ,
+ ADD INDEX ( `network` ) ");
+
+}
+