summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/Avatar.php12
-rw-r--r--classes/Confirm_address.php8
-rw-r--r--classes/Consumer.php2
-rw-r--r--classes/Nonce.php2
-rw-r--r--classes/Notice.php3
-rw-r--r--classes/Profile.php14
-rw-r--r--classes/Queue_item.php6
-rw-r--r--classes/Remember_me.php4
-rw-r--r--classes/Remote_profile.php6
-rw-r--r--classes/Reply.php3
-rw-r--r--classes/Sms_carrier.php2
-rw-r--r--classes/Subscription.php6
-rw-r--r--classes/Token.php4
-rw-r--r--classes/User.php18
-rw-r--r--classes/User_openid.php2
15 files changed, 46 insertions, 46 deletions
diff --git a/classes/Avatar.php b/classes/Avatar.php
index 180777053..9d7d7f770 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -4,18 +4,18 @@
*/
require_once 'DB/DataObject.php';
-class Avatar extends DB_DataObject
+class Avatar extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
public $__table = 'avatar'; // table name
public $profile_id; // int(4) primary_key not_null
- public $original; // tinyint(1)
+ public $original; // tinyint(1)
public $width; // int(4) primary_key not_null
public $height; // int(4) primary_key not_null
public $mediatype; // varchar(32) not_null
- public $filename; // varchar(255)
+ public $filename; // varchar(255)
public $url; // varchar(255) unique_key
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@@ -27,7 +27,7 @@ class Avatar extends DB_DataObject
###END_AUTOCODE
# We clean up the file, too
-
+
function delete() {
$filename = $this->filename;
if (parent::delete()) {
@@ -36,8 +36,8 @@ class Avatar extends DB_DataObject
}
# Create and save scaled version of this avatar
- # XXX: maybe break into different methods
-
+ # XXX: maybe break into different methods
+
function scale($size) {
$image_s = imagecreatetruecolor($size, $size);
diff --git a/classes/Confirm_address.php b/classes/Confirm_address.php
index d6d0d7796..7b2962925 100644
--- a/classes/Confirm_address.php
+++ b/classes/Confirm_address.php
@@ -4,7 +4,7 @@
*/
require_once 'DB/DataObject.php';
-class Confirm_address extends DB_DataObject
+class Confirm_address extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -15,8 +15,8 @@ class Confirm_address extends DB_DataObject
public $address; // varchar(255) not_null
public $address_extra; // varchar(255) not_null
public $address_type; // varchar(8) not_null
- public $claimed; // datetime()
- public $sent; // datetime()
+ public $claimed; // datetime()
+ public $sent; // datetime()
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
/* Static get */
@@ -24,6 +24,6 @@ class Confirm_address extends DB_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
-
+
function sequenceKey() { return array(false, false); }
}
diff --git a/classes/Consumer.php b/classes/Consumer.php
index 6f4513f33..4b7cb414b 100644
--- a/classes/Consumer.php
+++ b/classes/Consumer.php
@@ -4,7 +4,7 @@
*/
require_once 'DB/DataObject.php';
-class Consumer extends DB_DataObject
+class Consumer extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
diff --git a/classes/Nonce.php b/classes/Nonce.php
index 987e8d1e8..1a3f35868 100644
--- a/classes/Nonce.php
+++ b/classes/Nonce.php
@@ -4,7 +4,7 @@
*/
require_once 'DB/DataObject.php';
-class Nonce extends DB_DataObject
+class Nonce extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
diff --git a/classes/Notice.php b/classes/Notice.php
index a00114f95..5a500a3aa 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/
require_once 'DB/DataObject.php';
-class Notice extends DB_DataObject
+class Notice extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -34,7 +34,6 @@ class Notice extends DB_DataObject
public $profile_id; // int(4) not_null
public $uri; // varchar(255) unique_key
public $content; // varchar(140)
- public $rendered; // text()
public $url; // varchar(255)
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
diff --git a/classes/Profile.php b/classes/Profile.php
index 0cf1397c7..827339a60 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -24,19 +24,19 @@ if (!defined('LACONICA')) { exit(1); }
*/
require_once 'DB/DataObject.php';
-class Profile extends DB_DataObject
+class Profile extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
public $__table = 'profile'; // table name
public $id; // int(4) primary_key not_null
- public $nickname; // varchar(64) multiple_key not_null
- public $fullname; // varchar(255) multiple_key
+ public $nickname; // varchar(64) not_null
+ public $fullname; // varchar(255)
public $profileurl; // varchar(255)
- public $homepage; // varchar(255) multiple_key
- public $bio; // varchar(140) multiple_key
- public $location; // varchar(255) multiple_key
+ public $homepage; // varchar(255)
+ public $bio; // varchar(140)
+ public $location; // varchar(255)
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@@ -133,7 +133,7 @@ class Profile extends DB_DataObject
}
return true;
}
-
+
function getBestName() {
return ($this->fullname) ? $this->fullname : $this->nickname;
}
diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index 964013f2c..4a7aeebe2 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -4,7 +4,7 @@
*/
require_once 'DB/DataObject.php';
-class Queue_item extends DB_DataObject
+class Queue_item extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -12,13 +12,13 @@ class Queue_item extends DB_DataObject
public $__table = 'queue_item'; // table name
public $notice_id; // int(4) primary_key not_null
public $created; // datetime() not_null
- public $claimed; // datetime()
+ public $claimed; // datetime()
/* Static get */
function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Queue_item',$k,$v); }
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
-
+
function sequenceKey() { return array(false, false); }
}
diff --git a/classes/Remember_me.php b/classes/Remember_me.php
index 92a1e4617..31a09ab41 100644
--- a/classes/Remember_me.php
+++ b/classes/Remember_me.php
@@ -4,7 +4,7 @@
*/
require_once 'DB/DataObject.php';
-class Remember_me extends DB_DataObject
+class Remember_me extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -19,6 +19,6 @@ class Remember_me extends DB_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
-
+
function sequenceKey() { return array(false, false); }
}
diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index e5613125d..216c989e7 100644
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/
require_once 'DB/DataObject.php';
-class Remote_profile extends DB_DataObject
+class Remote_profile extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -32,8 +32,8 @@ class Remote_profile extends DB_DataObject
public $__table = 'remote_profile'; // table name
public $id; // int(4) primary_key not_null
public $uri; // varchar(255) unique_key
- public $postnoticeurl; // varchar(255)
- public $updateprofileurl; // varchar(255)
+ public $postnoticeurl; // varchar(255)
+ public $updateprofileurl; // varchar(255)
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
diff --git a/classes/Reply.php b/classes/Reply.php
index 8e26f1684..507782391 100644
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -4,7 +4,7 @@
*/
require_once 'DB/DataObject.php';
-class Reply extends DB_DataObject
+class Reply extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -12,6 +12,7 @@ class Reply extends DB_DataObject
public $__table = 'reply'; // table name
public $notice_id; // int(4) primary_key not_null
public $profile_id; // int(4) primary_key not_null
+ public $replied_id; // int(4)
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
public $replied_id; // int(4)
diff --git a/classes/Sms_carrier.php b/classes/Sms_carrier.php
index 5fb741731..45bb29cff 100644
--- a/classes/Sms_carrier.php
+++ b/classes/Sms_carrier.php
@@ -4,7 +4,7 @@
*/
require_once 'DB/DataObject.php';
-class Sms_carrier extends DB_DataObject
+class Sms_carrier extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
diff --git a/classes/Subscription.php b/classes/Subscription.php
index 2a1037d2b..dd7b0f3db 100644
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/
require_once 'DB/DataObject.php';
-class Subscription extends DB_DataObject
+class Subscription extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -32,8 +32,8 @@ class Subscription extends DB_DataObject
public $__table = 'subscription'; // table name
public $subscriber; // int(4) primary_key not_null
public $subscribed; // int(4) primary_key not_null
- public $token; // varchar(255)
- public $secret; // varchar(255)
+ public $token; // varchar(255)
+ public $secret; // varchar(255)
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
diff --git a/classes/Token.php b/classes/Token.php
index a91b19f8e..cd14fbfff 100644
--- a/classes/Token.php
+++ b/classes/Token.php
@@ -4,7 +4,7 @@
*/
require_once 'DB/DataObject.php';
-class Token extends DB_DataObject
+class Token extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -14,7 +14,7 @@ class Token extends DB_DataObject
public $tok; // char(32) primary_key not_null
public $secret; // char(32) not_null
public $type; // tinyint(1) not_null
- public $state; // tinyint(1)
+ public $state; // tinyint(1)
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
diff --git a/classes/User.php b/classes/User.php
index ab550b8e1..b928b69ca 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
require_once 'DB/DataObject.php';
require_once 'Validate.php';
-class User extends DB_DataObject
+class User extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -32,14 +32,14 @@ class User extends DB_DataObject
public $__table = 'user'; // table name
public $id; // int(4) primary_key not_null
public $nickname; // varchar(64) unique_key
- public $password; // varchar(255)
+ public $password; // varchar(255)
public $email; // varchar(255) unique_key
public $jabber; // varchar(255) unique_key
- public $jabbernotify; // tinyint(1)
- public $updatefrompresence; // tinyint(1)
+ public $jabbernotify; // tinyint(1)
+ public $updatefrompresence; // tinyint(1)
public $sms; // varchar(64) unique_key
- public $carrier; // int(4)
- public $smsnotify; // tinyint(1)
+ public $carrier; // int(4)
+ public $smsnotify; // tinyint(1)
public $uri; // varchar(255) unique_key
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@@ -69,7 +69,7 @@ class User extends DB_DataObject
}
# 'update' won't write key columns, so we have to do it ourselves.
-
+
function updateKeys(&$orig) {
$parts = array();
foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') as $k) {
@@ -82,11 +82,11 @@ class User extends DB_DataObject
return true;
}
$toupdate = implode(', ', $parts);
- $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate .
+ $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate .
' WHERE id = ' . $this->id;
return $this->query($qry);
}
-
+
function allowed_nickname($nickname) {
# XXX: should already be validated for size, content, etc.
static $blacklist = array('rss', 'xrds', 'doc', 'main',
diff --git a/classes/User_openid.php b/classes/User_openid.php
index 67f6f3b2e..b199685f8 100644
--- a/classes/User_openid.php
+++ b/classes/User_openid.php
@@ -4,7 +4,7 @@
*/
require_once 'DB/DataObject.php';
-class User_openid extends DB_DataObject
+class User_openid extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */