diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-17 21:24:07 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-17 21:24:07 -0700 |
| commit | 656ec585b22e62b496fe96002ee8ca7f9fd02d64 (patch) | |
| tree | a5c49ace5fdc41e9a9ab4ffb065e7d3cc5914f7b | |
| parent | 9497c6c0f7470800a54b0c8f60467f675b32c5ed (diff) | |
| parent | 64a49eb54ac93b9fb3ba4f65894c60dba5620048 (diff) | |
| download | volse-hubzilla-656ec585b22e62b496fe96002ee8ca7f9fd02d64.tar.gz volse-hubzilla-656ec585b22e62b496fe96002ee8ca7f9fd02d64.tar.bz2 volse-hubzilla-656ec585b22e62b496fe96002ee8ca7f9fd02d64.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | Zotlabs/Module/Register.php | 6 | ||||
| -rw-r--r-- | include/security.php | 4 | ||||
| -rw-r--r-- | view/js/main.js | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index d4573156c..9a364e154 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -27,7 +27,7 @@ class Register extends \Zotlabs\Web\Controller { $result = check_account_email($_REQUEST['email']); break; case 'password_check.json': - $result = check_account_password($_REQUEST['password']); + $result = check_account_password($_REQUEST['password1']); break; default: break; @@ -231,8 +231,8 @@ class Register extends \Zotlabs\Web\Controller { $enable_tos = 1 - intval(get_config('system','no_termsofservice')); $email = array('email', t('Your email address'), ((x($_REQUEST,'email')) ? strip_tags(trim($_REQUEST['email'])) : "")); - $password = array('password', t('Choose a password'), ((x($_REQUEST,'password')) ? trim($_REQUEST['password']) : "")); - $password2 = array('password2', t('Please re-enter your password'), ((x($_REQUEST,'password2')) ? trim($_REQUEST['password2']) : "")); + $password = array('password', t('Choose a password'), ''); + $password2 = array('password2', t('Please re-enter your password'), ''); $invite_code = array('invite_code', t('Please enter your invitation code'), ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "")); $name = array('name', t('Name or caption'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"')); $nickhub = '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')); diff --git a/include/security.php b/include/security.php index 16c6f1680..450cc4f69 100644 --- a/include/security.php +++ b/include/security.php @@ -114,9 +114,9 @@ function atoken_xchan($atoken) { 'atoken_id' => $atoken['atoken_id'], 'xchan_hash' => substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_name'], 'xchan_name' => $atoken['atoken_name'], - 'xchan_addr' => t('guest:') . $atoken['atoken_name'] . '@' . \App::get_hostname(), + 'xchan_addr' => 'guest:' . $atoken['atoken_name'] . '@' . \App::get_hostname(), 'xchan_network' => 'unknown', - 'xchan_url' => z_root(), + 'xchan_url' => z_root() . '/guest/' . substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_name'], 'xchan_hidden' => 1, 'xchan_photo_mimetype' => 'image/jpeg', 'xchan_photo_l' => get_default_profile_photo(300), diff --git a/view/js/main.js b/view/js/main.js index 0aeb4d36d..3455de5c2 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1000,6 +1000,13 @@ function notify_popup_loader(notifyType) { }); } }); + + setTimeout(function() { + if(notify_menu.hasClass('show')) { + console.log('updating ' + notifyType + ' notifications...'); + setTimeout(notify_popup_loader, updateInterval, notifyType); + } + }, 1000); } |