Changeset 6589

Timestamp:

09/07/08 07:50:49 (3 months ago)

Author:

mickecarlsson

Message:

Fixes #3167 and cleans up help text so that it does not beging with an empty line

Files:

• modules/branches/2.5/core/page.general.php (modified) (13 diffs)

modules/branches/2.5/core/page.general.php

@@ -107 +107 @@
-<table>
-        <tr><td>
-<br>
+
-<?php echo _("t: Allow the called user to transfer the call by hitting #")?><br>
-<?php echo _("T: Allow the calling user to transfer the call by hitting #")?><br>
@@ -118 +118 @@
-        </td></tr>
-        <tr><td>
-<br>
+
-<?php echo _("t: Allow the called user to transfer the call by hitting #")?><br>
-<?php echo _("T: Allow the calling user to transfer the call by hitting #")?><br>
@@ -142 +142 @@
-        </td></tr>
-        <tr><td>
-<br>
-<br>
+
+
-  </span></a>
-        </td><td align="right">
@@ -157 +157 @@
-        </td></tr>
-        <tr><td>
-<br>
+
-  <?php echo _("Override the default location where asterisk will store call recordings. Include the trailing /. Be sure to set proper permissions on the directory for the asterisk user.")?><br>
-  </span></a>
@@ -164 +164 @@
-        </td></tr>
-        <tr><td>
-<br>
+
-  <?php echo _("An optional script to be run after the call is hungup. You can include channel and MixMon variables like \${CALLFILENAME}, \${MIXMON_FORMAT} and \${MIXMON_DIR}. To ensure that you variables are properly escaped, use the following notation: ^{MY_VAR}")?><br>
-  </span></a>
@@ -175 +175 @@
-<table>
-        <tr><td>
-<br>
+
-  <?php echo _("Default number of seconds to ring phones before sending callers to voicemail. This can be set per extension/user and will have no effect on phones with no voicemail.")?><br>
-  </span></a>
@@ -182 +182 @@
-        </td></tr>
-        <tr><td>
-<br>
+
-  <?php echo _("Prefix used to dial directly to someone's voicemail. Caution should be taken in choosing this prefix to avoid conflicts with featurecodes.")?><br>
-  </span></a>
@@ -189 +189 @@
-        </td></tr>
-        <tr><td>
-
+
+
+
-        </td><td align="right">
-        <select name="VM_DDTYPE" tabindex="<?php echo ++$tabindex;?>">
@@ -206 +208 @@
-        </td></tr>
-        <tr><td>
-")?><span><?php echo _("Check this to remove the default message \"Please leave your message after the tone. When done, hang-up, or press the pound key.\" That is played after the voicemail greeting (the s option). This applies globally to all vm boxes.")?></span></a> <?php echo _("\"please leave message after tone to caller\"")?
+ \"please leave message after tone to caller\"")?><span><?php echo _("Check this to remove the default message \"Please leave your message after the tone. When done, hang-up, or press the pound key.\" That is played after the voicemail greeting (the s option). This applies globally to all vm boxes.")?></span></a
-        </td><td align="right">
-        <input type="checkbox" value="s" name="VM_OPTS" <?php  echo (($VM_OPTS || $VM_DDTYPE == "su" || $VM_DDTYPE == "bu") ? 'CHECKED' : '')?> tabindex="<?php echo ++$tabindex;?>"> 
@@ -360 +362 @@
-<table>
-        <tr><td>
-?php echo _("Extension of")?> <a class="info" href="#"><?php echo _("fax machine")?><span><?php echo _("Select 'system' to have the system receive and email faxes.<br>Selecting 'disabled' will result in incoming calls being answered more quickly.")?></span></a> <?php echo _("for receiving faxes:")?
+a class="info" href="#"><?php echo _("Extension of fax machine for receiving faxes:")?><span><?php echo _("Select 'system' to have the system receive and email faxes.<br>Selecting 'disabled' will result in incoming calls being answered more quickly.")?></span></a
-        <!--<input type="text" size="8" name="FAX_RX" value="<?php  echo $FAX_RX?>"/>-->
-        </td><td align="right">
@@ -378 +380 @@
-        </td></tr>
-        <tr><td>
-")?><span><?php echo _("Email address used if 'system' has been chosen for the fax extension above.")?></span></a> <?php echo _("to have faxes emailed to:")?
+ to have faxes emailed to:")?><span><?php echo _("Email address used if 'system' has been chosen for the fax extension above.")?></span></a
-        </td><td align="right">
-        <input type="text" size="30" name="FAX_RX_EMAIL" value="<?php  echo htmlspecialchars($FAX_RX_EMAIL)?>" tabindex="<?php echo ++$tabindex;?>"/>
-        </td></tr>
-        <tr><td>
-")?><span><?php echo _("Email address that faxes appear to come from if 'system' has been chosen for the fax extension above.")?></span></a> <?php echo _("that faxes appear to come from:")?
+ that faxes appear to come from:")?><span><?php echo _("Email address that faxes appear to come from if 'system' has been chosen for the fax extension above.")?></span></a
-        </td><td align="right">
-        <input type="text" size="30" name="FAX_RX_FROM" value="<?php  echo htmlspecialchars($FAX_RX_FROM)?>" tabindex="<?php echo ++$tabindex;?>"/>
@@ -391 +393 @@
-<table>
-        <tr><td>
-?php echo _("Country")?> <a class="info" href="#"><?php echo _("
+a class="info" href="#"><?php echo _("Country 
-        </td><td align="right">
-        <?php   if (isset($TONEZONE) && strlen($TONEZONE)) 
@@ -411 +413 @@
-<table>
-        <tr><td>
-<br>
+
-<?php echo _("** WARNING **")?><br><br>
-<?php echo _("Setting this to 'yes' will potentially allow ANYBODY to call into your Asterisk server using the SIP protocol")?><br><br>