diff options
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 12 | ||||
| -rw-r--r-- | Zotlabs/Module/Home.php | 15 | ||||
| -rw-r--r-- | Zotlabs/Module/Login.php | 11 | ||||
| -rw-r--r-- | include/text.php | 4 | ||||
| -rw-r--r-- | view/pdl/mod_rmagic.pdl | 6 | ||||
| -rw-r--r-- | view/tpl/login.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/register.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/rmagic.tpl | 14 |
8 files changed, 49 insertions, 22 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index ae4cc02c6..1f7d4be0c 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1718,9 +1718,9 @@ class Activity { return; } - $name = $person_obj['name'] ?? ''; + $name = ((isset($person_obj['name'])) ? escape_tags($person_obj['name']) : ''); if (!$name) { - $name = $person_obj['preferredUsername'] ?? ''; + $name = ((isset($person_obj['preferredUsername'])) ? escape_tags($person_obj['preferredUsername']) : ''); } if (!$name) { $name = t('Unknown'); @@ -1729,13 +1729,11 @@ class Activity { $webfinger_addr = ((isset($person_obj['webfinger'])) ? str_replace('acct:', '', $person_obj['webfinger']) : ''); $hostname = ''; $baseurl = ''; - $site_url = ''; $m = parse_url($url); if ($m) { - $hostname = $m['host']; - $baseurl = $m['scheme'] . '://' . $m['host'] . ((isset($m['port'])) ? ':' . $m['port'] : ''); - $site_url = $m['scheme'] . '://' . $m['host']; + $hostname = unparse_url($m, ['host']); + $baseurl = unparse_url($m, ['scheme', 'host', 'port']); } if (!$webfinger_addr && !empty($person_obj['preferredUsername']) && $hostname) { @@ -1837,7 +1835,7 @@ class Activity { q("UPDATE site SET site_update = '%s', site_dead = 0 WHERE site_url = '%s'", dbesc(datetime_convert()), - dbesc($site_url) + dbesc($baseurl) ); // update existing xchan record diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php index 691ca1af9..3ac445f9f 100644 --- a/Zotlabs/Module/Home.php +++ b/Zotlabs/Module/Home.php @@ -100,14 +100,25 @@ class Home extends Controller { goaway($frontpage); } + $o .= '<div class="generic-content-wrapper">'; + $sitename = Config::Get('system', 'sitename'); - if ($sitename) - $o .= '<h1 class="home-welcome">' . sprintf(t('Welcome to %s'), $sitename) . '</h1>'; + if ($sitename) { + $o .= '<div class="section-title-wrapper">'; + $o .= '<h2 class="">' . sprintf(t('Welcome to %s'), $sitename) . '</h2>'; + $o .= '</div>'; + + } + + $o .= '<div class="section-content-wrapper">'; $loginbox = Config::Get('system', 'login_on_homepage'); if (intval($loginbox) || $loginbox === false) $o .= login(true); + $o .= '</div>'; + $o .= '</div>'; + return $o; } diff --git a/Zotlabs/Module/Login.php b/Zotlabs/Module/Login.php index 721ac15ac..269990a54 100644 --- a/Zotlabs/Module/Login.php +++ b/Zotlabs/Module/Login.php @@ -10,7 +10,16 @@ class Login extends \Zotlabs\Web\Controller { if(remote_channel() && $_SESSION['atoken']) goaway(z_root()); - return login(true); + $o = '<div class="generic-content-wrapper">'; + $o .= '<div class="section-title-wrapper">'; + $o .= '<h2 class="">' . t('Login') . '</h2>'; + $o .= '</div>'; + $o .= '<div class="section-content-wrapper">'; + $o .= login(true); + $o .= '</div>'; + $o .= '</div>'; + + return $o; } } diff --git a/include/text.php b/include/text.php index 5c433f23c..7692a6f3e 100644 --- a/include/text.php +++ b/include/text.php @@ -3841,7 +3841,7 @@ function featured_sort($a,$b) { function unpunify($s) { - if (function_exists('idn_to_utf8') && isset($s)) { + if (function_exists('idn_to_utf8') && !empty($s)) { return idn_to_utf8($s); } return $s; @@ -3849,7 +3849,7 @@ function unpunify($s) { function punify($s) { - if (function_exists('idn_to_ascii') && isset($s)) { + if (function_exists('idn_to_ascii') && !empty($s)) { return idn_to_ascii($s); } return $s; diff --git a/view/pdl/mod_rmagic.pdl b/view/pdl/mod_rmagic.pdl new file mode 100644 index 000000000..3065703de --- /dev/null +++ b/view/pdl/mod_rmagic.pdl @@ -0,0 +1,6 @@ +[region=aside] +[widget=notifications][var=sys_only]1[/var][/widget] +[/region] +[region=content] +$content +[/region] diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index ead524193..778a48cc0 100644 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,17 +1,18 @@ <form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> - <div class="login-wrapper d-grid gap-2"> + <div> {{include file="field_input.tpl" field=$lname}} {{include file="field_password.tpl" field=$lpassword}} {{include file="field_checkbox.tpl" field=$remember_me}} <button type="submit" name="submit" class="btn btn-primary">{{$login}}</button> - {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" class="register-link float-end">{{$register.desc}}</a>{{/if}} {{if $lostlink}}<a href="lostpass" title="{{$lostpass}}" class="lost-pass-link">{{$lostlink}}</a>{{/if}} <hr> <a href="rmagic" class="btn btn-outline-success">{{$remote_login}}</a> + {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" class="register-link float-end">{{$register.desc}}</a>{{/if}} + </div> {{foreach $hiddens as $k=>$v}} - <input type="hidden" name="{{$k}}" value="{{$v}}" /> + <input type="hidden" name="{{$k}}" value="{{$v}}" /> {{/foreach}} </form> {{if $login_page}} diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index cc2b8e47b..98cf84845 100644 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -39,7 +39,7 @@ {{include file="field_input.tpl" field=$name}} </div> <div class="position-relative"> - <div id="nick-hub" class="position-absolute" style="top: 2.3rem; right: 0.75rem;"><span class="text-muted">{{$nickhub}}</span></div> + <div id="nick-hub" class="position-absolute" style="top: 2rem; right: 0.75rem;"><span class="text-muted">{{$nickhub}}</span></div> <div id="nick-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.75rem;"><div class="spinner s"></div></div> {{include file="field_input.tpl" field=$nickname}} </div> diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl index bc181c323..e852223e0 100644 --- a/view/tpl/rmagic.tpl +++ b/view/tpl/rmagic.tpl @@ -1,9 +1,11 @@ -<div class="generic-content-wrapper-styled"> - <h3>{{$title}}</h3> - <form action="rmagic" method="post" > - <div class="mb-3"> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> + <form action="rmagic" method="post" > {{include file="field_input.tpl" field=$address}} <input class="btn btn-primary" type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" /> - </div> - </form> + </form> + </div> </div> |