aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-11-22 12:26:33 -0800
committerfriendica <info@friendica.com>2014-11-22 12:26:33 -0800
commit86b6861aaeec44d4cc9c0e180915dae7fcaf6a97 (patch)
treea4a126cf558d7edad376135f57a4171589d70e18
parentb16f93883077a3637d055a4c70a28ef0c994efec (diff)
parentab5bf1b7d69f4027f595eef56cf4d99207b8b46e (diff)
downloadvolse-hubzilla-86b6861aaeec44d4cc9c0e180915dae7fcaf6a97.tar.gz
volse-hubzilla-86b6861aaeec44d4cc9c0e180915dae7fcaf6a97.tar.bz2
volse-hubzilla-86b6861aaeec44d4cc9c0e180915dae7fcaf6a97.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--doc/hidden_configs.bb2
-rwxr-xr-xinclude/dba/dba_driver.php2
-rwxr-xr-xinclude/items.php3
-rw-r--r--include/text.php7
-rw-r--r--mod/profile_photo.php2
5 files changed, 13 insertions, 3 deletions
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 7b7a688c4..da5134123 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -100,6 +100,8 @@ This document assumes you're an administrator.
the main logs as well.
[b]system > hide_in_statistics[/b]
Tell the red statistics servers to completely hide this hub in hub lists.
+ [b]system > reserved_channels[/b]
+ Don't allow members to register channels with this comma separated list of names (no spaces)
#include doc/macros/main_footer.bb;
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index 1bb45b06d..a62a5e6e2 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -341,6 +341,8 @@ function dbesc_array_cb(&$item, $key) {
if(is_string($item)) {
if($item == '0000-00-00 00:00:00' && ACTIVE_DBTYPE == DBTYPE_POSTGRES)
$item = '0001-01-01 00:00:00';
+ else if($item == '0001-01-01 00:00:00' && ACTIVE_DBTYPE == DBTYPE_MYSQL)
+ $item = '0000-00-00 00:00:00';
$item = dbesc($item);
}
}
diff --git a/include/items.php b/include/items.php
index 477b5197e..c488e1953 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1094,7 +1094,8 @@ function encode_item($item,$mirror = false) {
$x['message_parent'] = $item['thr_parent'];
$x['created'] = $item['created'];
$x['edited'] = $item['edited'];
- $x['expires'] = $item['expires'];
+ // always send 0's over the wire
+ $x['expires'] = (($item['expires'] == '0001-01-01 00:00:00') ? '0000-00-00 00:00:00' : $item['expires']);
$x['commented'] = $item['commented'];
$x['mimetype'] = $item['mimetype'];
$x['title'] = $item['title'];
diff --git a/include/text.php b/include/text.php
index 22a1a78c4..ce729ac1b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1815,8 +1815,13 @@ function legal_webbie($s) {
function check_webbie($arr) {
+ $reservechan = get_config('system','reserved_channels');
+ if(strlen($reservechan))
+ $taken = explode(',', $reservechan);
+ else
+ $taken = array();
+
$str = '';
- $taken = array();
if(count($arr)) {
foreach($arr as $x) {
$y = legal_webbie($x);
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 24439d404..e9dad6f51 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -33,7 +33,7 @@ function profile_photo_set_profile_perms($profileid = '') {
if (intval($profile['is_default']) != 1) {
$r0 = q("SELECT channel_hash FROM channel WHERE channel_id = %d LIMIT 1", intval(local_user()) );
- $r1 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = %d ", intval($profile['id'])); //Should not be needed in future. Catches old int-profile-ids.
+ $r1 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%d' ", intval($profile['id'])); //Should not be needed in future. Catches old int-profile-ids.
$r2 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%s'", dbesc($profile['profile_guid']));
$allowcid = "<" . $r0[0]['channel_hash'] . ">";
foreach ($r1 as $entry) {