diff options
author | Aleksander Machniak <alec@alec.pl> | 2015-10-23 09:02:57 +0300 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2015-10-23 09:02:57 +0300 |
commit | 74ce01efc75fa9085436bfe79c3e6c42c2966783 (patch) | |
tree | 423571ecf76193650039fe456b332101b7aad729 /installer | |
parent | eca19d65b56d54603904fa29b7e9afead7968657 (diff) |
Q() -> rcube::Q()
Diffstat (limited to 'installer')
-rw-r--r-- | installer/index.php | 2 | ||||
-rw-r--r-- | installer/test.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/installer/index.php b/installer/index.php index 052359c02..3e9c6b7c5 100644 --- a/installer/index.php +++ b/installer/index.php @@ -164,7 +164,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) { foreach (array('Check environment', 'Create config', 'Test config') as $i => $item) { $j = $i + 1; - $link = ($RCI->step >= $j || $RCI->configured) ? '<a href="./index.php?_step='.$j.'">' . Q($item) . '</a>' : Q($item); + $link = ($RCI->step >= $j || $RCI->configured) ? '<a href="./index.php?_step='.$j.'">' . rcube::Q($item) . '</a>' : rcube::Q($item); printf('<li class="step%d%s">%s</li>', $j+1, $RCI->step > $j ? ' passed' : ($RCI->step == $j ? ' current' : ''), $link); } ?> diff --git a/installer/test.php b/installer/test.php index 72be9686c..bb7648294 100644 --- a/installer/test.php +++ b/installer/test.php @@ -325,7 +325,7 @@ if (isset($_POST['sendmail'])) { $status = mail($headers['To'], $headers['Subject'], $body, $header_str); else $status = mail($headers['To'], $headers['Subject'], $body, $header_str, '-f'.$headers['From']); - + if (!$status) $smtp_response[] = 'Mail delivery with mail() failed. Check your error logs for details'; } @@ -340,7 +340,7 @@ if (isset($_POST['sendmail'])) { else { $RCI->fail('SMTP send', 'Invalid sender or recipient'); } - + echo '</p>'; } @@ -405,7 +405,7 @@ $pass_field = new html_passwordfield(array('name' => '_pass', 'id' => 'imappass' if (isset($_POST['imaptest']) && !empty($_POST['_host']) && !empty($_POST['_user'])) { - echo '<p>Connecting to ' . Q($_POST['_host']) . '...<br />'; + echo '<p>Connecting to ' . rcube::Q($_POST['_host']) . '...<br />'; $imap_host = trim($_POST['_host']); $imap_port = $RCI->getprop('default_port'); |