mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 02:35:12 +00:00
structure for channel unions
This commit is contained in:
parent
6519433301
commit
edc5566f79
7 changed files with 34 additions and 10 deletions
2
boot.php
2
boot.php
|
@ -45,7 +45,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' );
|
|||
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
|
||||
define ( 'ZOT_REVISION', 1 );
|
||||
|
||||
define ( 'DB_UPDATE_VERSION', 1073 );
|
||||
define ( 'DB_UPDATE_VERSION', 1074 );
|
||||
|
||||
define ( 'EOL', '<br />' . "\r\n" );
|
||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||
|
|
|
@ -48,7 +48,7 @@ function validate_channelname($name) {
|
|||
|
||||
|
||||
function create_dir_account() {
|
||||
create_account(array(
|
||||
create_identity(array(
|
||||
'account_id' => 'xxx', // This will create an identity with an (integer) account_id of 0, but account_id is required
|
||||
'nickname' => 'dir',
|
||||
'name' => 'Directory',
|
||||
|
|
|
@ -1422,9 +1422,10 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = 1, $suppress_
|
|||
// Self censored, make it so
|
||||
// These are not translated, so the German "erwachsenen" keyword will not censor the directory profile. Only the English form - "adult".
|
||||
|
||||
|
||||
if(in_arrayi('nsfw',$clean) || in_arrayi('adult',$clean)) {
|
||||
q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s' limit 1",
|
||||
intval(XCHAN_FLAGS_CENSORED),
|
||||
intval(XCHAN_FLAGS_SELFCENSORED),
|
||||
dbesc($hash)
|
||||
);
|
||||
}
|
||||
|
|
|
@ -835,6 +835,18 @@ CREATE TABLE IF NOT EXISTS `site` (
|
|||
KEY `site_sellpage` (`site_sellpage`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `source` (
|
||||
`src_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`src_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`src_channel_xchan` char(255) NOT NULL DEFAULT '',
|
||||
`src_xchan` char(255) NOT NULL DEFAULT '',
|
||||
`src_patt` mediumtext NOT NULL,
|
||||
PRIMARY KEY (`src_id`),
|
||||
KEY `src_channel_id` (`src_channel_id`),
|
||||
KEY `src_channel_xchan` (`src_channel_xchan`),
|
||||
KEY `src_xchan` (`src_xchan`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `spam` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`uid` int(11) NOT NULL,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1073 );
|
||||
define( 'UPDATE_VERSION' , 1074 );
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -820,3 +820,19 @@ ADD INDEX ( `xtag_flags` ) ");
|
|||
return UPDATE_SUCCESS;
|
||||
return UPDATE_FAILED;
|
||||
}
|
||||
|
||||
function update_r1073() {
|
||||
$r1 = q("CREATE TABLE IF NOT EXISTS `source` (
|
||||
`src_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`src_channel_id` INT UNSIGNED NOT NULL DEFAULT '0',
|
||||
`src_channel_xchan` CHAR( 255 ) NOT NULL DEFAULT '',
|
||||
`src_xchan` CHAR( 255 ) NOT NULL DEFAULT '',
|
||||
`src_patt` MEDIUMTEXT NOT NULL DEFAULT ''
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ");
|
||||
|
||||
$r2 = q("ALTER TABLE `source` ADD INDEX ( `src_channel_id` ), ADD INDEX ( `src_channel_xchan` ), ADD INDEX ( `src_xchan` ) ");
|
||||
|
||||
if($r1 && $r2)
|
||||
return UPDATE_SUCCESS;
|
||||
return UPDATE_FAILED;
|
||||
}
|
||||
|
|
|
@ -164,11 +164,6 @@ function zfinger_init(&$a) {
|
|||
|
||||
$ret['locations'] = array();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$x = zot_get_hubloc(array($e['channel_hash']));
|
||||
if($x && count($x)) {
|
||||
foreach($x as $hub) {
|
||||
|
|
|
@ -1 +1 @@
|
|||
2013-09-25.447
|
||||
2013-09-26.448
|
||||
|
|
Loading…
Reference in a new issue