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

Use preg_replace instead of escape (#6575) 

Escape broke auto matching fields use preg_replace instead.
This commit is contained in:
FusionPBX 2023-03-10 08:54:49 -08:00 committed by GitHub
parent d8a45a5872
commit b449bef03e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/access_controls/access_control_import.php
View File

@ -164,7 +164,7 @@
//loop through the lines and fields //loop through the lines and fields
$x = 0; $x = 0;
foreach ($line_fields as $line_field) { foreach ($line_fields as $line_field) {
$line_field = trim(escape(trim($line_field)), $enclosure); $line_field = preg_replace('#[^a-zA-Z0-9_]#', '', $line_field);
echo "<tr>\n"; echo "<tr>\n";
echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo $line_field; echo $line_field;

2
app/contacts/contact_import.php
View File

@ -199,7 +199,7 @@
//loop through user columns //loop through user columns
$x = 0; $x = 0;
foreach ($line_fields as $line_field) { foreach ($line_fields as $line_field) {
$line_field = trim(escape(trim($line_field)), $enclosure); $line_field = preg_replace('#[^a-zA-Z0-9_]#', '', $line_field);
echo "<tr>\n"; echo "<tr>\n";
echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo $line_field; echo $line_field;

2
app/destinations/destination_imports.php
View File

@ -709,7 +709,7 @@
//loop through user columns //loop through user columns
$x = 0; $x = 0;
foreach ($line_fields as $line_field) { foreach ($line_fields as $line_field) {
$line_field = trim(escape(trim($line_field)), $enclosure); $line_field = preg_replace('#[^a-zA-Z0-9_]#', '', $line_field);
echo "<tr>\n"; echo "<tr>\n";
echo " <td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo " <td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo $line_field; echo $line_field;

2
app/devices/device_imports.php
View File

@ -173,7 +173,7 @@
//loop through user columns //loop through user columns
$x = 0; $x = 0;
foreach ($line_fields as $line_field) { foreach ($line_fields as $line_field) {
$line_field = trim(escape(trim($line_field)), $enclosure); $line_field = preg_replace('#[^a-zA-Z0-9_]#', '', $line_field);
echo "<tr>\n"; echo "<tr>\n";
echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
//echo " ".$text['label-zzz']."\n"; //echo " ".$text['label-zzz']."\n";

2
app/extensions/extension_imports.php
View File

@ -170,7 +170,7 @@
//loop through user columns //loop through user columns
$x = 0; $x = 0;
foreach ($line_fields as $line_field) { foreach ($line_fields as $line_field) {
$line_field = trim(escape(trim($line_field)), $enclosure); $line_field = preg_replace('#[^a-zA-Z0-9_]#', '', $line_field);
echo "<tr>\n"; echo "<tr>\n";
echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
//echo " ".$text['label-zzz']."\n"; //echo " ".$text['label-zzz']."\n";

2
app/voicemails/voicemail_imports.php
View File

@ -165,7 +165,7 @@
//loop through user columns //loop through user columns
$x = 0; $x = 0;
foreach ($line_fields as $line_field) { foreach ($line_fields as $line_field) {
$line_field = trim(escape(trim($line_field)), $enclosure); $line_field = preg_replace('#[^a-zA-Z0-9_]#', '', $line_field);
echo "<tr>\n"; echo "<tr>\n";
echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
//echo " ".$text['label-zzz']."\n"; //echo " ".$text['label-zzz']."\n";

2
core/users/user_imports.php
View File

@ -167,7 +167,7 @@
//loop through user columns //loop through user columns
$x = 0; $x = 0;
foreach ($line_fields as $line_field) { foreach ($line_fields as $line_field) {
$line_field = trim(escape(trim($line_field)), $enclosure); $line_field = preg_replace('#[^a-zA-Z0-9_]#', '', $line_field);
echo "<tr>\n"; echo "<tr>\n";
echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo " <td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
//echo " ".$text['label-zzz']."\n"; //echo " ".$text['label-zzz']."\n";