Helpers refactoring

1 files changed, 29 insertions, 29 deletions

diff --git a/app/Template/config/integrations.php b/app/Template/config/integrations.php
index f9e7f537..a1299806 100644
--- a/app/Template/config/integrations.php
+++ b/app/Template/config/integrations.php
@@ -2,81 +2,81 @@
     <h2><?= t('Integration with third-party services') ?></h2>
 </div>
 
-<form method="post" action="<?= $this->u('config', 'integrations') ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('config', 'integrations') ?>" autocomplete="off">
 
-    <?= $this->formCsrf() ?>
+    <?= $this->form->csrf() ?>
 
     <h3><img src="assets/img/mailgun-icon.png"/>&nbsp;<?= t('Mailgun (incoming emails)') ?></h3>
     <div class="listing">
-    <input type="text" class="auto-select" readonly="readonly" value="<?= $this->getCurrentBaseUrl().$this->u('webhook', 'mailgun', array('token' => $values['webhook_token'])) ?>"/><br/>
+    <input type="text" class="auto-select" readonly="readonly" value="<?= $this->url->base().$this->url->href('webhook', 'mailgun', array('token' => $values['webhook_token'])) ?>"/><br/>
     <p class="form-help"><a href="http://kanboard.net/documentation/mailgun" target="_blank"><?= t('Help on Mailgun integration') ?></a></p>
     </div>
 
     <h3><img src="assets/img/sendgrid-icon.png"/>&nbsp;<?= t('Sendgrid (incoming emails)') ?></h3>
     <div class="listing">
-    <input type="text" class="auto-select" readonly="readonly" value="<?= $this->getCurrentBaseUrl().$this->u('webhook', 'sendgrid', array('token' => $values['webhook_token'])) ?>"/><br/>
+    <input type="text" class="auto-select" readonly="readonly" value="<?= $this->url->base().$this->url->href('webhook', 'sendgrid', array('token' => $values['webhook_token'])) ?>"/><br/>
     <p class="form-help"><a href="http://kanboard.net/documentation/sendgrid" target="_blank"><?= t('Help on Sendgrid integration') ?></a></p>
     </div>
 
     <h3><img src="assets/img/postmark-icon.png"/>&nbsp;<?= t('Postmark (incoming emails)') ?></h3>
     <div class="listing">
-    <input type="text" class="auto-select" readonly="readonly" value="<?= $this->getCurrentBaseUrl().$this->u('webhook', 'postmark', array('token' => $values['webhook_token'])) ?>"/><br/>
+    <input type="text" class="auto-select" readonly="readonly" value="<?= $this->url->base().$this->url->href('webhook', 'postmark', array('token' => $values['webhook_token'])) ?>"/><br/>
     <p class="form-help"><a href="http://kanboard.net/documentation/postmark" target="_blank"><?= t('Help on Postmark integration') ?></a></p>
     </div>
 
     <h3><img src="assets/img/gravatar-icon.png"/>&nbsp;<?= t('Gravatar') ?></h3>
     <div class="listing">
-        <?= $this->formCheckbox('integration_gravatar', t('Enable Gravatar images'), 1, $values['integration_gravatar'] == 1) ?>
+        <?= $this->form->checkbox('integration_gravatar', t('Enable Gravatar images'), 1, $values['integration_gravatar'] == 1) ?>
     </div>
 
     <h3><img src="assets/img/jabber-icon.png"/> <?= t('Jabber (XMPP)') ?></h3>
     <div class="listing">
-        <?= $this->formCheckbox('integration_jabber', t('Send notifications to Jabber'), 1, $values['integration_jabber'] == 1) ?>
+        <?= $this->form->checkbox('integration_jabber', t('Send notifications to Jabber'), 1, $values['integration_jabber'] == 1) ?>
 
-        <?= $this->formLabel(t('XMPP server address'), 'integration_jabber_server') ?>
-        <?= $this->formText('integration_jabber_server', $values, $errors, array('placeholder="tcp://myserver:5222"')) ?>
+        <?= $this->form->label(t('XMPP server address'), 'integration_jabber_server') ?>
+        <?= $this->form->text('integration_jabber_server', $values, $errors, array('placeholder="tcp://myserver:5222"')) ?>
         <p class="form-help"><?= t('The server address must use this format: "tcp://hostname:5222"') ?></p>
 
-        <?= $this->formLabel(t('Jabber domain'), 'integration_jabber_domain') ?>
-        <?= $this->formText('integration_jabber_domain', $values, $errors, array('placeholder="example.com"')) ?>
+        <?= $this->form->label(t('Jabber domain'), 'integration_jabber_domain') ?>
+        <?= $this->form->text('integration_jabber_domain', $values, $errors, array('placeholder="example.com"')) ?>
 
-        <?= $this->formLabel(t('Username'), 'integration_jabber_username') ?>
-        <?= $this->formText('integration_jabber_username', $values, $errors) ?>
+        <?= $this->form->label(t('Username'), 'integration_jabber_username') ?>
+        <?= $this->form->text('integration_jabber_username', $values, $errors) ?>
 
-        <?= $this->formLabel(t('Password'), 'integration_jabber_password') ?>
-        <?= $this->formPassword('integration_jabber_password', $values, $errors) ?>
+        <?= $this->form->label(t('Password'), 'integration_jabber_password') ?>
+        <?= $this->form->password('integration_jabber_password', $values, $errors) ?>
 
-        <?= $this->formLabel(t('Jabber nickname'), 'integration_jabber_nickname') ?>
-        <?= $this->formText('integration_jabber_nickname', $values, $errors) ?>
+        <?= $this->form->label(t('Jabber nickname'), 'integration_jabber_nickname') ?>
+        <?= $this->form->text('integration_jabber_nickname', $values, $errors) ?>
 
-        <?= $this->formLabel(t('Multi-user chat room'), 'integration_jabber_room') ?>
-        <?= $this->formText('integration_jabber_room', $values, $errors, array('placeholder="myroom@conference.example.com"')) ?>
+        <?= $this->form->label(t('Multi-user chat room'), 'integration_jabber_room') ?>
+        <?= $this->form->text('integration_jabber_room', $values, $errors, array('placeholder="myroom@conference.example.com"')) ?>
 
         <p class="form-help"><a href="http://kanboard.net/documentation/jabber" target="_blank"><?= t('Help on Jabber integration') ?></a></p>
     </div>
 
     <h3><img src="assets/img/hipchat-icon.png"/> <?= t('Hipchat') ?></h3>
     <div class="listing">
-        <?= $this->formCheckbox('integration_hipchat', t('Send notifications to Hipchat'), 1, $values['integration_hipchat'] == 1) ?>
+        <?= $this->form->checkbox('integration_hipchat', t('Send notifications to Hipchat'), 1, $values['integration_hipchat'] == 1) ?>
 
-        <?= $this->formLabel(t('API URL'), 'integration_hipchat_api_url') ?>
-        <?= $this->formText('integration_hipchat_api_url', $values, $errors) ?>
+        <?= $this->form->label(t('API URL'), 'integration_hipchat_api_url') ?>
+        <?= $this->form->text('integration_hipchat_api_url', $values, $errors) ?>
 
-        <?= $this->formLabel(t('Room API ID or name'), 'integration_hipchat_room_id') ?>
-        <?= $this->formText('integration_hipchat_room_id', $values, $errors) ?>
+        <?= $this->form->label(t('Room API ID or name'), 'integration_hipchat_room_id') ?>
+        <?= $this->form->text('integration_hipchat_room_id', $values, $errors) ?>
 
-        <?= $this->formLabel(t('Room notification token'), 'integration_hipchat_room_token') ?>
-        <?= $this->formText('integration_hipchat_room_token', $values, $errors) ?>
+        <?= $this->form->label(t('Room notification token'), 'integration_hipchat_room_token') ?>
+        <?= $this->form->text('integration_hipchat_room_token', $values, $errors) ?>
 
         <p class="form-help"><a href="http://kanboard.net/documentation/hipchat" target="_blank"><?= t('Help on Hipchat integration') ?></a></p>
     </div>
 
     <h3><i class="fa fa-slack fa-fw"></i>&nbsp;<?= t('Slack') ?></h3>
     <div class="listing">
-        <?= $this->formCheckbox('integration_slack_webhook', t('Send notifications to a Slack channel'), 1, $values['integration_slack_webhook'] == 1) ?>
+        <?= $this->form->checkbox('integration_slack_webhook', t('Send notifications to a Slack channel'), 1, $values['integration_slack_webhook'] == 1) ?>
 
-        <?= $this->formLabel(t('Webhook URL'), 'integration_slack_webhook_url') ?>
-        <?= $this->formText('integration_slack_webhook_url', $values, $errors) ?>
+        <?= $this->form->label(t('Webhook URL'), 'integration_slack_webhook_url') ?>
+        <?= $this->form->text('integration_slack_webhook_url', $values, $errors) ?>
 
         <p class="form-help"><a href="http://kanboard.net/documentation/slack" target="_blank"><?= t('Help on Slack integration') ?></a></p>
     </div>