dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into intercept_enterprise_group

Browse Source
This commit is contained in:
Alexey Melnichuk
2015-09-23 09:54:43 +04:00
parent e5a0134ec6 e25a1409ff
commit e2edd740c3
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/devices/device_edit.php
+2
View File
@@ -217,6 +217,7 @@ require_once "resources/require.php";
//array cleanup //array cleanup
$x = 0; $x = 0;
unset($_POST["autocomplete"]);
foreach ($_POST["device_lines"] as $row) { foreach ($_POST["device_lines"] as $row) {
//unset the empty row //unset the empty row
if (strlen($row["line_number"]) == 0) { if (strlen($row["line_number"]) == 0) {
@@ -502,6 +503,7 @@ require_once "resources/require.php";
<?php <?php
//show the content //show the content
echo "<form method='post' name='frm' id='frm' action='' onsubmit='check_duplicates(); return false;'>\n"; echo "<form method='post' name='frm' id='frm' action='' onsubmit='check_duplicates(); return false;'>\n";
echo "<input style='display:none;' type='password' name='autocomplete'>";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n"; echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<td align='left' width='30%' nowrap='nowrap' valign='top'>"; echo "<td align='left' width='30%' nowrap='nowrap' valign='top'>";
app/extensions/extension_edit.php
+3 -2
View File
@@ -982,7 +982,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo "}\n"; echo "}\n";
echo "</script>"; echo "</script>";
echo "<form method='post' name='frm' action=''>\n"; echo "<form method='post' name='frm' action='' autocomplete='off'>\n";
echo "<input style='display:none;' type='password' name='autocomplete'>";
echo "<table width='100%' border='0' cellpdding='0' cellspacing='0'>\n"; echo "<table width='100%' border='0' cellpdding='0' cellspacing='0'>\n";
echo "<tr>\n"; echo "<tr>\n";
if ($action == "add") { if ($action == "add") {
@@ -1042,7 +1043,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " ".$text['label-password']."\n"; echo " ".$text['label-password']."\n";
echo "</td>\n"; echo "</td>\n";
echo "<td class='vtable' align='left'>\n"; echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='password' name='password' id='password' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" autocomplete='off' maxlength='50' value=\"$password\">\n"; echo " <input class='formfld' type='password' name='password' id='password' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" maxlength='50' value=\"$password\">\n";
echo " <br />\n"; echo " <br />\n";
echo " ".$text['description-password']."\n"; echo " ".$text['description-password']."\n";
echo "</td>\n"; echo "</td>\n";
app/xml_cdr/xml_cdr_details.php
+1 -1
View File
@@ -47,7 +47,7 @@ else {
//get the cdr string from the database //get the cdr string from the database
$sql = "select * from v_xml_cdr "; $sql = "select * from v_xml_cdr ";
if ($_GET['showall'] && permission_exists('xml_cdr_all')) { if ($_GET['showall'] && permission_exists('xml_cdr_all')) {
if ($sql_where) { $sql .= "where uuid = '$uuid' "; } $sql .= "where uuid = '$uuid' ";
} else { } else {
$sql .= "where uuid = '$uuid' and domain_uuid = '$domain_uuid' "; $sql .= "where uuid = '$uuid' and domain_uuid = '$domain_uuid' ";
} }
core/users/signup.php
+3 -3
View File
@@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2012 Portions created by the Initial Developer are Copyright (C) 2008-2015
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@@ -298,12 +298,12 @@ if (count($_POST) > 0 && check_str($_POST["persistform"]) != "1") {
echo "<table border='0' $tablewidth cellpadding='0' cellspacing='0'>"; echo "<table border='0' $tablewidth cellpadding='0' cellspacing='0'>";
echo " <tr>"; echo " <tr>";
echo " <td class='vncellreq' width='30%'>".$text['label-username']."</td>"; echo " <td class='vncellreq' width='30%'>".$text['label-username']."</td>";
echo " <td class='vtable' width='70%'><input type='text' class='formfld' autocomplete='off' name='username' value='$username'></td>"; echo " <td class='vtable' width='70%'><input style='display:none;' type='password' name='autocomplete'><input type='text' class='formfld' autocomplete='off' name='username' value='$username'></td>";
echo " </tr>"; echo " </tr>";
echo " <tr>"; echo " <tr>";
echo " <td class='vncellreq'>".$text['label-password']."</td>"; echo " <td class='vncellreq'>".$text['label-password']."</td>";
echo " <td class='vtable'><input type='password' class='formfld' autocomplete='off' name='password' id='password' value='$password' onfocus='compare_passwords();' onkeyup='compare_passwords();' onblur='compare_passwords();'></td>"; echo " <td class='vtable'><input style='display:none;' type='password' name='autocomplete'><input type='password' class='formfld' autocomplete='off' name='password' id='password' value='$password' onfocus='compare_passwords();' onkeyup='compare_passwords();' onblur='compare_passwords();'></td>";
echo " </tr>"; echo " </tr>";
echo " <tr>"; echo " <tr>";
echo " <td class='vncellreq'>".$text['label-confirm_password']."</td>"; echo " <td class='vncellreq'>".$text['label-confirm_password']."</td>";
core/users/usersupdate.php
+2 -2
View File
@@ -462,7 +462,7 @@ if (count($_POST) > 0 && $_POST["persistform"] != "1") {
echo " <td width='30%' class='vncellreq' valign='top'>".$text['label-username']."</td>"; echo " <td width='30%' class='vncellreq' valign='top'>".$text['label-username']."</td>";
echo " <td width='70%' class='vtable'>"; echo " <td width='70%' class='vtable'>";
if (if_group("admin") || if_group("superadmin")) { if (if_group("admin") || if_group("superadmin")) {
echo " <input type='txt' autocomplete='off' class='formfld' name='username' value='".$username."' required='required'>"; echo " <input type='txt' class='formfld' name='username' value='".$username."' required='required'>";
} }
else { else {
echo " ".$username; echo " ".$username;
@@ -472,7 +472,7 @@ if (count($_POST) > 0 && $_POST["persistform"] != "1") {
echo " <tr>"; echo " <tr>";
echo " <td class='vncell' valign='top'>".$text['label-password']."</td>"; echo " <td class='vncell' valign='top'>".$text['label-password']."</td>";
echo " <td class='vtable'><input type='password' autocomplete='off' class='formfld' name='password' id='password' value='' onfocus='compare_passwords();' onkeyup='compare_passwords();' onblur='compare_passwords();'></td>"; echo " <td class='vtable'><input style='display:none;' type='password' name='autocomplete'><input type='password' autocomplete='off' class='formfld' name='password' id='password' value='' onfocus='compare_passwords();' onkeyup='compare_passwords();' onblur='compare_passwords();'></td>";
echo " </tr>"; echo " </tr>";
echo " <tr>"; echo " <tr>";
echo " <td class='vncell' valign='top'>".$text['label-confirm_password']."</td>"; echo " <td class='vncell' valign='top'>".$text['label-confirm_password']."</td>";