summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-08-10 07:13:00 +0000
committerZach Copley <zach@controlyourself.ca>2009-08-10 07:13:00 +0000
commitdae74e8ff452e09f37dbd820a74437a672802bc6 (patch)
treec003a062ea27459e715d8fa1424eeb4afcb32556
parent27548c690350bdf0376d846a5e8e86477359297d (diff)
Take token field out of foreign_link
This undoes patch a49272d448d75a6ab74515352345d8baacb96f1f
-rw-r--r--classes/Foreign_link.php1
-rw-r--r--classes/laconica.ini1
-rw-r--r--db/laconica.sql3
3 files changed, 1 insertions, 4 deletions
diff --git a/classes/Foreign_link.php b/classes/Foreign_link.php
index a3a159eb5..c0b356ece 100644
--- a/classes/Foreign_link.php
+++ b/classes/Foreign_link.php
@@ -14,7 +14,6 @@ class Foreign_link extends Memcached_DataObject
public $foreign_id; // bigint(8) primary_key not_null unsigned
public $service; // int(4) primary_key not_null
public $credentials; // varchar(255)
- public $token; // varchar(255)
public $noticesync; // tinyint(1) not_null default_1
public $friendsync; // tinyint(1) not_null default_2
public $profilesync; // tinyint(1) not_null default_1
diff --git a/classes/laconica.ini b/classes/laconica.ini
index 85d5f528d..766bed75d 100644
--- a/classes/laconica.ini
+++ b/classes/laconica.ini
@@ -127,7 +127,6 @@ user_id = 129
foreign_id = 129
service = 129
credentials = 2
-token = 2
noticesync = 145
friendsync = 145
profilesync = 145
diff --git a/db/laconica.sql b/db/laconica.sql
index 8b1152cbd..2c04f680a 100644
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -291,8 +291,7 @@ create table foreign_link (
user_id int comment 'link to user on this system, if exists' references user (id),
foreign_id bigint unsigned comment 'link to user on foreign service, if exists' references foreign_user(id),
service int not null comment 'foreign key to service' references foreign_service(id),
- credentials varchar(255) comment 'auth credentials, typically a password or token secret',
- token varchar(255) comment 'access token',
+ credentials varchar(255) comment 'authc credentials, typically a password',
noticesync tinyint not null default 1 comment 'notice synchronization, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies',
friendsync tinyint not null default 2 comment 'friend synchronization, bit 1 = sync outgoing, bit 2 = sync incoming',
profilesync tinyint not null default 1 comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming',