diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-18 22:53:43 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-18 22:53:43 -0700 |
| commit | 905432c7ae738ff69090bf8cc912c42d2cea5ab2 (patch) | |
| tree | e56f13d7450ca9dc2dac3d94e5de3a30b2237c7e /Zotlabs | |
| parent | 3355210878c6af1d4ee1719d223e83dd9e086ddc (diff) | |
| download | volse-hubzilla-905432c7ae738ff69090bf8cc912c42d2cea5ab2.tar.gz volse-hubzilla-905432c7ae738ff69090bf8cc912c42d2cea5ab2.tar.bz2 volse-hubzilla-905432c7ae738ff69090bf8cc912c42d2cea5ab2.zip | |
text clarifications
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Dav.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Storage/BasicAuth.php | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php index 549c992cc..d65ad3405 100644 --- a/Zotlabs/Module/Dav.php +++ b/Zotlabs/Module/Dav.php @@ -64,6 +64,7 @@ class Dav extends \Zotlabs\Web\Controller { $auth = new \Zotlabs\Storage\BasicAuth(); + $auth->setRealm(ucfirst(\Zotlabs\Project\System::get_platform_name()) . 'WebDAV'); // $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function($userName,$password) { // if(account_verify_password($userName,$password)) diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index a6293e842..1f5c55067 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -1062,11 +1062,11 @@ class Settings extends \Zotlabs\Web\Controller { '$lbl_p2macro' => t('Advanced Privacy Settings'), - '$expire' => array('expire',t('Expire other channel content after this many days'),$expire,sprintf( t('0 or blank to use the website limit. The website expires after %d days.'),intval($sys_expire))), + '$expire' => array('expire',t('Expire other channel content after this many days'),$expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf( t('This website expires after %d days.'),intval($sys_expire)) : t('This website does not expire imported content.')) . ' ' . t('The website limit takes precedence if lower than your limit.')), '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), - '$aclselect' => populate_acl($perm_defaults, false, \PermissionDescription::fromDescription(t('Use my default audience setting for the type of post'))), + '$aclselect' => populate_acl($perm_defaults, false, \PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), '$suggestme' => $suggestme, '$group_select' => $group_select, '$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()), diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php index 02c4117da..121a9c3a1 100644 --- a/Zotlabs/Storage/BasicAuth.php +++ b/Zotlabs/Storage/BasicAuth.php @@ -79,7 +79,6 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic { /** * @brief Validates a username and password. * - * Guest access is granted with the password "+++". * * @see \Sabre\DAV\Auth\Backend\AbstractBasic::validateUserPass * @param string $username |