aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-09-27 02:45:16 +0100
committerThomas Willingham <founder@kakste.com>2013-09-27 02:45:16 +0100
commit8d92d21135aeadb9a2bf498a8697d2d3694abcd1 (patch)
tree9cf5ad40d036b09f30aacc66f3627b25a28cbfd8
parentd6607f2093414afd3cbba58021a92b01d3c356fd (diff)
parent8e94e79c7bfc4253efb17f32246bdafd498a3aed (diff)
downloadvolse-hubzilla-8d92d21135aeadb9a2bf498a8697d2d3694abcd1.tar.gz
volse-hubzilla-8d92d21135aeadb9a2bf498a8697d2d3694abcd1.tar.bz2
volse-hubzilla-8d92d21135aeadb9a2bf498a8697d2d3694abcd1.zip
Merge branch 'master' of https://github.com/friendica/red
-rwxr-xr-xboot.php2
-rw-r--r--include/identity.php2
-rwxr-xr-xinclude/items.php6
-rw-r--r--include/zot.php3
-rw-r--r--install/database.sql12
-rw-r--r--install/update.php18
-rw-r--r--mod/zfinger.php5
-rw-r--r--version.inc2
8 files changed, 39 insertions, 11 deletions
diff --git a/boot.php b/boot.php
index b2ce372bb..3dbd7193e 100755
--- a/boot.php
+++ b/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' );
diff --git a/include/identity.php b/include/identity.php
index 98209c8ae..d6b6735f6 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -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',
diff --git a/include/items.php b/include/items.php
index 4aecf9174..25bcf0253 100755
--- a/include/items.php
+++ b/include/items.php
@@ -98,6 +98,10 @@ function can_comment_on_post($observer_xchan,$item) {
return true;
break;
case 'public':
+ # We don't allow public comments yet, until a policy
+ # for dealing with anonymous comments is in place with
+ # a means to moderate comments. Until that time, return
+ # false.
return false;
break;
case 'contacts':
@@ -3874,4 +3878,4 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
}
return $items;
-} \ No newline at end of file
+}
diff --git a/include/zot.php b/include/zot.php
index 0290bc402..0658f1738 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -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)
);
}
diff --git a/install/database.sql b/install/database.sql
index 44e211630..c92428975 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -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,
diff --git a/install/update.php b/install/update.php
index d2d6a0cb7..13f4fc63b 100644
--- a/install/update.php
+++ b/install/update.php
@@ -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;
+}
diff --git a/mod/zfinger.php b/mod/zfinger.php
index 49d07a40c..3671da56e 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -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) {
diff --git a/version.inc b/version.inc
index 280942cd9..f88a7aa92 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-09-25.447
+2013-09-26.448