diff options
| -rw-r--r-- | Zotlabs/Daemon/Cron.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 10 | ||||
| -rw-r--r-- | Zotlabs/Module/Ap_probe.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Changeaddr.php | 88 | ||||
| -rw-r--r-- | Zotlabs/Module/Network.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Ping.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 2 | ||||
| -rw-r--r-- | app/pubstream.apd | 4 | ||||
| -rw-r--r-- | doc/toc.html | 1 | ||||
| -rw-r--r-- | include/channel.php | 86 | ||||
| -rw-r--r-- | include/conversation.php | 6 | ||||
| -rw-r--r-- | include/zot.php | 4 | ||||
| -rw-r--r-- | view/css/mod_help.css | 8 | ||||
| -rwxr-xr-x | view/tpl/channel_rename.tpl | 20 | ||||
| -rwxr-xr-x | view/tpl/msg-header.tpl | 3 |
16 files changed, 228 insertions, 20 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index c84708ba4..65edbedfa 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -174,7 +174,8 @@ class Cron { // pull in some public posts - if(! get_config('system','disable_discover_tab')) + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + if(! $disable_discover_tab) Master::Summon(array('Externals')); $generation = 0; diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 1fb841008..3730f3a23 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -174,10 +174,9 @@ class Apps { if(substr($require, 0, 7) == 'config:') { $config = true; $require = ltrim($require, 'config:'); + $require = explode('=', $require); } - $toggle = (($require[0] == '!') ? 0 : 1); - switch($require) { case 'nologin': if(local_channel()) @@ -201,7 +200,7 @@ class Apps { break; default: if($config) - $unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true); + $unset = ((get_config('system', $require[0]) == $require[1]) ? false : true); else $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); if($unset) @@ -325,10 +324,9 @@ class Apps { if(substr($require, 0, 7) == 'config:') { $config = true; $require = ltrim($require, 'config:'); + $require = explode('=', $require); } - $toggle = (($require[0] == '!') ? 0 : 1); - switch($require) { case 'nologin': if(local_channel()) @@ -353,7 +351,7 @@ class Apps { break; default: if($config) - $unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true); + $unset = ((get_config('system', $require[0]) == $require[1]) ? false : true); else $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); if($unset) diff --git a/Zotlabs/Module/Ap_probe.php b/Zotlabs/Module/Ap_probe.php index 769cd4c4e..29629a8eb 100644 --- a/Zotlabs/Module/Ap_probe.php +++ b/Zotlabs/Module/Ap_probe.php @@ -30,6 +30,7 @@ class Ap_probe extends \Zotlabs\Web\Controller { $redirects = 0; $x = z_fetch_url($addr,true,$redirects, [ 'headers' => [ $headers ]]); if($x['success']) + $o .= '<pre>' . $x['header'] . '</pre>' . EOL; $o .= '<pre>' . str_replace(['\\n','\\'],["\n",''],jindent($x['body'])) . '</pre>'; } return $o; diff --git a/Zotlabs/Module/Changeaddr.php b/Zotlabs/Module/Changeaddr.php new file mode 100644 index 000000000..5cd236394 --- /dev/null +++ b/Zotlabs/Module/Changeaddr.php @@ -0,0 +1,88 @@ +<?php +namespace Zotlabs\Module; + + +class Changeaddr extends \Zotlabs\Web\Controller { + + function post() { + + if(! local_channel()) + return; + + if($_SESSION['delegate']) + return; + + if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password'])))) + return; + + if((! x($_POST,'verify')) || (! strlen(trim($_POST['verify'])))) + return; + + if($_POST['verify'] !== $_SESSION['remove_account_verify']) + return; + + + $account = \App::get_account(); + $channel = \App::get_channel(); + + $x = account_verify_password($account['account_email'],$_POST['qxz_password']); + if(! ($x && $x['account'])) + return; + + if($account['account_password_changed'] > NULL_DATE) { + $d1 = datetime_convert('UTC','UTC','now - 48 hours'); + if($account['account_password_changed'] > d1) { + notice( t('Channel name changes are not allowed within 48 hours of changing the account password.') . EOL); + return; + } + } + + $new_address = trim($_POST['newname']); + + if($new_address === $channel['channel_address']) + return; + + if($new_address === 'sys') { + notice( t('Reserved nickname. Please choose another.') . EOL); + return; + } + + if(check_webbie(array($new_address)) !== $new_address) { + notice( t('Nickname has unsupported characters or is already being used on this site.') . EOL); + return $ret; + } + + channel_change_address($channel,$new_address); + + goaway(z_root() . '/changeaddr'); + + } + + + function get() { + + if(! local_channel()) + goaway(z_root()); + + $channel = \App::get_channel(); + + $hash = random_string(); + + $_SESSION['remove_account_verify'] = $hash; + + $tpl = get_markup_template('channel_rename.tpl'); + $o .= replace_macros($tpl, array( + '$basedir' => z_root(), + '$hash' => $hash, + '$title' => t('Change channel nickname/address'), + '$desc' => array(t('WARNING: '), t('Any/all connections on other networks will be lost!')), + '$passwd' => t('Please enter your password for verification:'), + '$newname' => array('newname', t('New channel address'),$channel['channel_address'], ''), + '$submit' => t('Rename Channel') + )); + + return $o; + + } + +} diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 1954df549..36ae7f047 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -409,8 +409,9 @@ class Network extends \Zotlabs\Web\Controller { } $abook_uids = " and abook.abook_channel = " . local_channel() . " "; - - if($firehose && (! get_config('system','disable_discover_tab'))) { + + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + if($firehose && (! $disable_discover_tab)) { require_once('include/channel.php'); $sys = get_sys_channel(); $uids = " and item.uid = " . intval($sys['channel_id']) . " "; diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index f38ed510e..1a76f4f7b 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -139,7 +139,8 @@ class Ping extends \Zotlabs\Web\Controller { db_utcnow(), db_quoteinterval('3 MINUTE') ); - $notify_pubs = local_channel() ? ($vnotify & VNOTIFY_PUBS) && ! get_config('system', 'disable_discover_tab') : ! get_config('system', 'disable_discover_tab'); + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + $notify_pubs = ((local_channel()) ? ($vnotify & VNOTIFY_PUBS) && !$disable_discover_tab : !$disable_discover_tab); if($notify_pubs) { $sys = get_sys_channel(); diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index d9054dc48..5db485d21 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -16,8 +16,8 @@ class Pubstream extends \Zotlabs\Web\Controller { return login(); } - - if(get_config('system','disable_discover_tab')) + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + if($disable_discover_tab) return; $item_normal = item_normal(); diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index f3b7997cd..eb31841ed 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -560,7 +560,7 @@ class Channel { '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended'), $yes_no), '$vnotify11' => array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, '', $yes_no), '$vnotify12' => array('vnotify12', t('Unseen shared files'), ($vnotify & VNOTIFY_FILES), VNOTIFY_FILES, '', $yes_no), - '$vnotify13' => ((! get_config('system', 'disable_discover_tab')) ? array('vnotify13', t('Unseen public activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no) : array()), + '$vnotify13' => ((!get_config('system', 'disable_discover_tab')) ? array() : array('vnotify13', t('Unseen public activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no)), '$always_show_in_notices' => array('always_show_in_notices', t('Also show new wall posts, private messages and connections under Notices'), $always_show_in_notices, 1, '', $yes_no), '$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')), diff --git a/app/pubstream.apd b/app/pubstream.apd index 874e0a6cc..ebfcf38b0 100644 --- a/app/pubstream.apd +++ b/app/pubstream.apd @@ -1,6 +1,6 @@ -version: 1 +version: 2 url: $baseurl/pubstream -requires: config:!disable_discover_tab +requires: config:disable_discover_tab=0 name: Public Stream photo: icon:globe categories: Social diff --git a/doc/toc.html b/doc/toc.html index 9e34fc8d9..4da01d55d 100644 --- a/doc/toc.html +++ b/doc/toc.html @@ -85,6 +85,7 @@ tocUl.removeClass(); // Classes are automatically added to <ul> elements by something else tocUl.toc({content: "#doco-content", headings: "h3"}); tocUl.addClass('toc-content'); + tocUl.addClass('list-unstyled'); tocUl.attr('id', 'doco-side-toc'); } diff --git a/include/channel.php b/include/channel.php index f6252f094..efa39dcac 100644 --- a/include/channel.php +++ b/include/channel.php @@ -554,6 +554,92 @@ function change_channel_keys($channel) { return $ret; } +function channel_change_address($channel,$new_address) { + + $ret = array('success' => false); + + $old_address = $channel['channel_address']; + + if($new_address === 'sys') { + $ret['message'] = t('Reserved nickname. Please choose another.'); + return $ret; + } + + if(check_webbie(array($new_address)) !== $new_address) { + $ret['message'] = t('Nickname has unsupported characters or is already being used on this site.'); + return $ret; + } + + $r = q("update channel set channel_address = '%s' where channel_id = %d", + dbesc($new_address), + intval($channel['channel_id']) + ); + if(! $r) { + return $ret; + } + + $r = q("select * from channel where channel_id = %d", + intval($channel['channel_id']) + ); + + if(! $r) { + $ret['message'] = t('Unable to retrieve modified identity'); + return $ret; + } + + $r = q("update xchan set xchan_addr = '%s' where xchan_hash = '%s'", + dbesc($new_address . '@' . App::get_hostname()), + dbesc($channel['channel_hash']) + ); + + $h = q("select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ", + dbesc($channel['channel_hash']), + dbesc(z_root()) + ); + + if($h) { + foreach($h as $hv) { + if($hv['hubloc_primary']) { + q("update hubloc set hubloc_primary = 0 where hubloc_id = %d", + intval($hv['hubloc_id']) + ); + } + q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d", + intval($hv['hubloc_id']) + ); + + unset($hv['hubloc_id']); + $hv['hubloc_addr'] = $new_address . '@' . App::get_hostname(); + hubloc_store_lowlevel($hv); + } + } + + // fix apps which were stored with the actual name rather than a macro + + $r = q("select * from app where app_channel = %d and app_system = 1", + intval($channel['channel_id']) + ); + if($r) { + foreach($r as $rv) { + $replace = preg_replace('/([\=\/])(' . $old_address . ')($|[\%\/])/ism','$1' . $new_address . '$3',$rv['app_url']); + if($replace != $rv['app_url']) { + q("update app set app_url = '%s' where id = %d", + dbesc($replace), + intval($rv['id']) + ); + } + } + } + + Zotlabs\Daemon\Master::Summon(array('Notifier', 'refresh_all', $channel['channel_id'])); + + $ret['success'] = true; + return $ret; +} + + + + /** diff --git a/include/conversation.php b/include/conversation.php index 460c97efb..13ae571d6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1624,11 +1624,9 @@ function network_tabs() { // tabs $tabs = array(); - $d = get_config('system','disable_discover_tab'); - if($d === false) - $d = 1; + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; - if(! $d) { + if(! $disable_discover_tab) { $tabs[] = array( 'label' => t('Discover'), 'url' => z_root() . '/' . $cmd . '?f=&fh=1' , diff --git a/include/zot.php b/include/zot.php index 75c37836d..3e2a66734 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1344,8 +1344,10 @@ function public_recips($msg) { $include_sys = false; if($msg['message']['type'] === 'activity') { - if(! get_config('system','disable_discover_tab')) + $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; + if(! $disable_discover_tab) $include_sys = true; + $perm = 'send_stream'; if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) { diff --git a/view/css/mod_help.css b/view/css/mod_help.css index c0b0bafa3..643885c99 100644 --- a/view/css/mod_help.css +++ b/view/css/mod_help.css @@ -19,3 +19,11 @@ #doco-top-toc li { padding: 3px 0px; } + +#doco-side-toc li { + padding-left: 10px; +} + +#doco-side-toc { + padding-top: 10px; +}
\ No newline at end of file diff --git a/view/tpl/channel_rename.tpl b/view/tpl/channel_rename.tpl new file mode 100755 index 000000000..9948dc647 --- /dev/null +++ b/view/tpl/channel_rename.tpl @@ -0,0 +1,20 @@ +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-danger-wrapper" id="rename-channel-desc"> + <strong>{{$desc.0}}</strong><strong>{{$desc.1}}</strong> + </div> + <div class="section-content-tools-wrapper"> + <form action="{{$basedir}}/changeaddr" autocomplete="off" method="post" > + <input type="hidden" name="verify" value="{{$hash}}" /> + <div class="form-group" id="rename-channel-pass-wrapper"> + <label id="rename-channel-pass-label" for="rename-channel-pass">{{$passwd}}</label> + <input class="form-control" type="password" id="rename-channel-pass" autocomplete="off" name="qxz_password" value=" " /> + </div> + {{include file="field_input.tpl" field=$newname}} + <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> + </form> + </div> +</div> + diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 0e8fb0389..48bf5de4b 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -20,6 +20,7 @@ $('#jot-media').val($('#jot-media').val() + data.result.message); }, stop: function(e,data) { + preview_mail(); $('#prvmail-rotator').spin(false); }, }); @@ -36,6 +37,7 @@ $('#prvmail-rotator').spin('tiny'); $.get('linkinfo?f=&url=' + reply, function(data) { addmailtext(data); + preview_mail(); $('#prvmail-rotator').spin(false); }); } @@ -62,6 +64,7 @@ $('#prvmail-rotator').spin('tiny'); $.get('linkinfo?f=&url=' + reply, function(data) { addmailtext(data); + preview_mail(); $('#prvmail-rotator').spin(false); }); } |