sforkowany z mirror/friendica
Merge branch 'dev'
commit
b0a03c328f
2
boot.php
2
boot.php
|
@ -2,7 +2,7 @@
|
|||
|
||||
set_time_limit(0);
|
||||
|
||||
define ( 'BUILD_ID', 1030 );
|
||||
define ( 'BUILD_ID', 1031 );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.0' );
|
||||
|
||||
define ( 'EOL', "<br />\r\n" );
|
||||
|
|
18
database.sql
18
database.sql
|
@ -89,6 +89,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
|
|||
`reason` text NOT NULL,
|
||||
`info` mediumtext NOT NULL,
|
||||
`profile-id` int(11) NOT NULL DEFAULT '0',
|
||||
`bdyear` CHAR( 4 ) NOT NULL COMMENT 'birthday notify flag',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `uid` (`uid`),
|
||||
KEY `self` (`self`),
|
||||
|
@ -451,5 +452,22 @@ CREATE TABLE IF NOT EXISTS `addon` (
|
|||
) ENGINE = MYISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `event` (
|
||||
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`uid` INT NOT NULL ,
|
||||
`cid` INT NOT NULL ,
|
||||
`created` DATETIME NOT NULL ,
|
||||
`edited` DATETIME NOT NULL ,
|
||||
`start` DATETIME NOT NULL ,
|
||||
`finish` DATETIME NOT NULL ,
|
||||
`desc` TEXT NOT NULL ,
|
||||
`location` TEXT NOT NULL ,
|
||||
`type` CHAR( 255 ) NOT NULL ,
|
||||
`adjust` TINYINT( 1 ) NOT NULL DEFAULT '1',
|
||||
`allow_cid` MEDIUMTEXT NOT NULL ,
|
||||
`allow_gid` MEDIUMTEXT NOT NULL ,
|
||||
`deny_cid` MEDIUMTEXT NOT NULL ,
|
||||
`deny_gid` MEDIUMTEXT NOT NULL
|
||||
) ENGINE = MYISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
|
|
|
@ -72,6 +72,16 @@ function notifications_content(&$a) {
|
|||
'$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
|
||||
));
|
||||
|
||||
|
||||
$r = q("SELECT COUNT(*) AS `total` FROM `intro`
|
||||
WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
|
||||
intval($_SESSION['uid'])
|
||||
);
|
||||
if($r && count($r)) {
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
$a->set_pager_itemspage(20);
|
||||
}
|
||||
|
||||
$r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*
|
||||
FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
|
||||
WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
|
||||
|
@ -152,5 +162,6 @@ function notifications_content(&$a) {
|
|||
|
||||
}
|
||||
|
||||
$o .= paginate($a);
|
||||
return $o;
|
||||
}
|
||||
|
|
24
update.php
24
update.php
|
@ -277,3 +277,27 @@ function update_1028() {
|
|||
function update_1029() {
|
||||
q("ALTER TABLE `contact` ADD `info` MEDIUMTEXT NOT NULL AFTER `reason` ");
|
||||
}
|
||||
|
||||
function update_1030() {
|
||||
q("ALTER TABLE `contact` ADD `bdyear` CHAR( 4 ) NOT NULL COMMENT 'birthday notify flag' AFTER `profile-id` ");
|
||||
|
||||
q("CREATE TABLE IF NOT EXISTS `event` (
|
||||
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`uid` INT NOT NULL ,
|
||||
`cid` INT NOT NULL ,
|
||||
`created` DATETIME NOT NULL ,
|
||||
`edited` DATETIME NOT NULL ,
|
||||
`start` DATETIME NOT NULL ,
|
||||
`finish` DATETIME NOT NULL ,
|
||||
`desc` TEXT NOT NULL ,
|
||||
`location` TEXT NOT NULL ,
|
||||
`type` CHAR( 255 ) NOT NULL ,
|
||||
`adjust` TINYINT( 1 ) NOT NULL DEFAULT '1',
|
||||
`allow_cid` MEDIUMTEXT NOT NULL ,
|
||||
`allow_gid` MEDIUMTEXT NOT NULL ,
|
||||
`deny_cid` MEDIUMTEXT NOT NULL ,
|
||||
`deny_gid` MEDIUMTEXT NOT NULL
|
||||
) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
|
||||
|
||||
|
||||
}
|
Ładowanie…
Reference in New Issue