Commit 3f54f74a authored by Michael Herold's avatar Michael Herold
Browse files

Updates code to work with new hemio\html version

parent 9c6675e7
......@@ -66,7 +66,7 @@ class CustomCreate extends Window
foreach ($types as $type => $desc)
$list->addLinkEntry(
$this->request->derive(true, true, $type)
, new html\String(sprintf('%s: %s', $type, $desc))
, new html\Str(sprintf('%s: %s', $type, $desc))
);
$fieldset = new gui\Fieldset(_('Record Type'));
......
......@@ -67,7 +67,7 @@ class Overview extends Window
, $domain['domain']
)
,
new \hemio\html\String(
new \hemio\html\Str(
sprintf('%s (%s)%s', $domain['domain'],
$domain['public_suffix'], $unmanaged))
, $domain['backend_status']
......@@ -92,7 +92,7 @@ class Overview extends Window
$list->addLinkEntry(
$this->request->derive('handle_details', $value['alias'])
,
new html\String(
new html\Str(
sprintf(
'%s %s (%s, ID: %s)'
, $value['fname']
......
......@@ -137,7 +137,7 @@ class RegisteredDetails extends Window
$dom = $domain['domain'];
$container = new form\Container;
$container->addChild(new html\String($dom));
$container->addChild(new html\Str($dom));
$servicesActive = $this->db->serviceSelect($dom)->fetchAll();
if (!empty($servicesActive)) {
......@@ -146,7 +146,7 @@ class RegisteredDetails extends Window
foreach ($servicesActive as $act) {
$li = $ul->addLine();
$li->addChild(new html\String($act['service']));
$li->addChild(new html\Str($act['service']));
$li->addChild(new gui\Progress($act['backend_status']));
}
}
......@@ -186,10 +186,10 @@ class RegisteredDetails extends Window
$rdata = (array) json_decode($record['rdata']);
ksort($rdata);
foreach ($rdata as $key => $value) {
$ul->addLine(new html\String(sprintf('%s = %s', $key, $value)));
$ul->addLine(new html\Str(sprintf('%s = %s', $key, $value)));
}
$span->addChild(new html\String($domain.' '.$record['type']));
$span->addChild(new html\Str($domain.' '.$record['type']));
$span->addChild($ul);
$list->addLinkEntry(
......
......@@ -87,7 +87,7 @@ class MailboxDetails extends Window
);
$list->addEntry(
new html\String($aliasAddr)
new html\Str($aliasAddr)
, $alias['backend_status']
, $button
);
......
......@@ -19,7 +19,7 @@
namespace hemio\edentata\module\email;
use hemio\edentata\gui;
use hemio\html\String;
use hemio\html\Str;
use hemio\html;
use hemio\form;
......@@ -80,7 +80,7 @@ class Overview extends Window
$mailboxEntry = $accounts->addLinkEntry(
$url
, new String($address)
, new Str($address)
, $mailbox['backend_status']
);
......@@ -90,7 +90,7 @@ class Overview extends Window
$ul = $mailboxEntry->addChild(new html\Ul);
while ($alias = $aliases->fetch()) {
$li = $ul->addLine(new String($alias['localpart'].'@'.$alias['domain']));
$li = $ul->addLine(new Str($alias['localpart'].'@'.$alias['domain']));
$li->addChild(new gui\Progress($alias['backend_status']));
}
}
......@@ -117,10 +117,10 @@ class Overview extends Window
$button = new gui\LinkButton($url, _('Delete'));
$span = new form\Container;
$span->addChild(new String($address));
$span->addChild(new Str($address));
$span
->addChild(new html\Ul)
->addLine(new String($redirection['destination']));
->addLine(new Str($redirection['destination']));
$redirections->addEntry(
$span
......
......@@ -19,7 +19,7 @@
namespace hemio\edentata\module\email_list;
use hemio\edentata\gui;
use hemio\html\String;
use hemio\html\Str as String;
/**
* Description of Overview
......
......@@ -53,7 +53,7 @@ class SubscribersMove extends Window
$address = $subscr->getValueUser();
if ($address !== null)
$ul->addLine(new html\String($address));
$ul->addLine(new html\Str($address));
$inputs[] = $window->getForm()->addChild(
new \hemio\form\InputHidden($subscr->getName(), $address)
......
......@@ -56,7 +56,7 @@ class SubscribersUnsubscribe extends Window {
$address = $subscr->getValueUser();
if ($address !== null)
$ul->addLine(new html\String($address));
$ul->addLine(new html\Str($address));
$inputs[] = $window->getForm()->addChild(
new \hemio\form\InputHidden($subscr->getName(), $address)
......
......@@ -59,7 +59,7 @@ class Overview extends Window
$addr = $account['node'].'@'.$account['domain'];
$list->addLinkEntry(
$this->request->derive('details', $addr)
, new \hemio\html\String($addr)
, new \hemio\html\Str($addr)
, $account['backend_status']
);
}
......
......@@ -60,15 +60,15 @@ class Overview extends Window
foreach ($users as $user) {
$container = new form\Container();
$container->addChild(new html\String($user['user']));
$container->addChild(new html\Str($user['user']));
$ul = new html\Ul();
$container->addChild($ul);
$ul->addLine(new html\String(
$ul->addLine(new html\Str(
sprintf(_('Host: %s'), $user['service_entity_name'])));
$ul->addLine(new html\String(
$ul->addLine(new html\Str(
sprintf(
_('Protocol: %s'), strtoupper($user['subservice'])
)
......
......@@ -105,7 +105,7 @@ class HttpsDetails extends Window
foreach ($chain as $data) {
$cert = new Cert($data['x509_certificate']);
$list->addEntry(new html\String(
$list->addEntry(new html\Str(
sprintf('%d. %s', $data['order'] + 1, $cert->commonName())));
}
}
......@@ -126,7 +126,7 @@ class HttpsDetails extends Window
$listNames = new gui\Listbox();
foreach ($cert->altNames() as $name)
$listNames->addEntry(new html\String($name));
$listNames->addEntry(new html\Str($name));
$o = $fieldset->addChild(new gui\Output(
_('Alternative Names')
......
......@@ -59,26 +59,26 @@ class Overview extends Window
sprintf(' [%s]', $site['subservice']);
$container->addChild(
new html\String($site['domain'].$subservice)
new html\Str($site['domain'].$subservice)
);
$ul = new html\Ul();
$container->addChild($ul);
if ($site['https'] !== null) {
$s = $ul->addLine(new html\String(_('HTTPS enabled')));
$s = $ul->addLine(new html\Str(_('HTTPS enabled')));
$s->addChild(Utils::certSummary($site['domain'], $site['port'],
$site['https'], $this->db));
}
// display port if it is not the default (80/443)
if (!Utils::defaultPort($site['port'], $site['https']))
$ul->addLine(new html\String(
$ul->addLine(new html\Str(
sprintf(_('Port: %s'), $site['port'])));
$ul->addLine(new html\String(
$ul->addLine(new html\Str(
sprintf(_('User: %s'), $site['user'])));
$ul->addLine(new html\String(
$ul->addLine(new html\Str(
sprintf(_('Host: %s'), $site['service_entity_name'])));
$listbox->addLinkEntry(
......
......@@ -69,12 +69,12 @@ class SiteCreate extends Window
foreach ($users as $user) {
$container = new form\Container();
$container->addChild(new html\String($user['user']));
$container->addChild(new html\Str($user['user']));
$ul = new html\Ul();
$container->addChild($ul);
$ul->addLine(new html\String(
$ul->addLine(new html\Str(
sprintf(_('Host: %s'), $user['service_entity_name'])));
$listbox->addLinkEntry(
......
......@@ -119,7 +119,7 @@ class SiteDetails extends Window
foreach ($aliases as $alias) {
$listbox->addEntry(
new html\String($alias['domain'])
new html\Str($alias['domain'])
, $alias['backend_status']
,
new gui\LinkButton(
......@@ -167,7 +167,7 @@ class SiteDetails extends Window
$fieldset->addChild($list);
$url = $this->request->derive('site_https', true);
$list->addEntry(new html\String($site['https']), null,
$list->addEntry(new html\Str($site['https']), null,
new gui\LinkButton($url, _('Change')));
return $fieldset;
......@@ -193,7 +193,7 @@ class SiteDetails extends Window
$cert['identifier']);
$container = new form\Container;
$container[] = new html\String($cert['identifier']);
$container[] = new html\Str($cert['identifier']);
$container[] = Utils::certSummary($domain, $port,
$cert['identifier'], $this->db);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment