Voicemail - Import: Button updates, token integration.
This commit is contained in:
@@ -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) 2019
|
Portions created by the Initial Developer are Copyright (C) 2019-2020
|
||||||
the Initial Developer. All Rights Reserved.
|
the Initial Developer. All Rights Reserved.
|
||||||
|
|
||||||
Contributor(s):
|
Contributor(s):
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
//includes
|
//includes
|
||||||
include "root.php";
|
require_once "root.php";
|
||||||
require_once "resources/require.php";
|
require_once "resources/require.php";
|
||||||
require_once "resources/check_auth.php";
|
require_once "resources/check_auth.php";
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
$text = $language->get();
|
$text = $language->get();
|
||||||
|
|
||||||
//built in str_getcsv requires PHP 5.3 or higher, this function can be used to reproduct the functionality but requirs PHP 5.1.0 or higher
|
//built in str_getcsv requires PHP 5.3 or higher, this function can be used to reproduct the functionality but requirs PHP 5.1.0 or higher
|
||||||
if(!function_exists('str_getcsv')) {
|
if (!function_exists('str_getcsv')) {
|
||||||
function str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\") {
|
function str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\") {
|
||||||
$fp = fopen("php://memory", 'r+');
|
$fp = fopen("php://memory", 'r+');
|
||||||
fputs($fp, $input);
|
fputs($fp, $input);
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
|
|
||||||
//copy the csv file
|
//copy the csv file
|
||||||
//$_POST['submit'] == "Upload" &&
|
//$_POST['submit'] == "Upload" &&
|
||||||
if ( is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('voicemail_import')) {
|
if (is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('voicemail_import')) {
|
||||||
if ($_POST['type'] == 'csv') {
|
if ($_POST['type'] == 'csv') {
|
||||||
move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name']);
|
move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name']);
|
||||||
$save_msg = "Uploaded file to ".$_SESSION['server']['temp']['dir']."/". htmlentities($_FILES['ulfile']['name']);
|
$save_msg = "Uploaded file to ".$_SESSION['server']['temp']['dir']."/". htmlentities($_FILES['ulfile']['name']);
|
||||||
@@ -93,9 +93,14 @@
|
|||||||
$x = 0;
|
$x = 0;
|
||||||
include ("app/voicemails/app_config.php");
|
include ("app/voicemails/app_config.php");
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($apps[0]['db'] as $table) {
|
foreach ($apps[0]['db'] as $table) {
|
||||||
//get the table name and parent name
|
//get the table name and parent name
|
||||||
$table_name = $table["table"]['name'];
|
if (is_array($table["table"]['name'])) {
|
||||||
|
$table_name = $table["table"]['name']['text'];
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$table_name = $table["table"]['name'];
|
||||||
|
}
|
||||||
$parent_name = $table["table"]['parent'];
|
$parent_name = $table["table"]['parent'];
|
||||||
|
|
||||||
//remove the v_ table prefix
|
//remove the v_ table prefix
|
||||||
@@ -129,47 +134,43 @@
|
|||||||
//match the column names to the field names
|
//match the column names to the field names
|
||||||
if (strlen($delimiter) > 0 && file_exists($_SESSION['file']) && $action != 'import') {
|
if (strlen($delimiter) > 0 && file_exists($_SESSION['file']) && $action != 'import') {
|
||||||
|
|
||||||
//form to match the fields to the column names
|
//create token
|
||||||
|
$object = new token;
|
||||||
|
$token = $object->create($_SERVER['PHP_SELF']);
|
||||||
|
|
||||||
|
//include header
|
||||||
$document['title'] = $text['title-voicemail_import'];
|
$document['title'] = $text['title-voicemail_import'];
|
||||||
require_once "resources/header.php";
|
require_once "resources/header.php";
|
||||||
|
|
||||||
echo "<form action='voicemail_imports.php' method='POST' enctype='multipart/form-data' name='frmUpload' onSubmit=''>\n";
|
//form to match the fields to the column names
|
||||||
|
echo "<form name='frmUpload' method='post' enctype='multipart/form-data'>\n";
|
||||||
|
|
||||||
|
echo "<div class='action_bar' id='action_bar'>\n";
|
||||||
|
echo " <div class='heading'><b>".$text['header-voicemail_import']."</b></div>\n";
|
||||||
|
echo " <div class='actions'>\n";
|
||||||
|
echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'style'=>'margin-right: 15px;','link'=>'voicemails.php']);
|
||||||
|
echo button::create(['type'=>'submit','label'=>$text['button-import'],'icon'=>$_SESSION['theme']['button_icon_import']]);
|
||||||
|
echo " </div>\n";
|
||||||
|
echo " <div style='clear: both;'></div>\n";
|
||||||
|
echo "</div>\n";
|
||||||
|
|
||||||
|
echo $text['description-import']."\n";
|
||||||
|
echo "<br /><br />\n";
|
||||||
|
|
||||||
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 " <td valign='top' align='left' nowrap='nowrap'>\n";
|
|
||||||
echo " <b>".$text['header-import']."</b><br />\n";
|
|
||||||
echo " </td>\n";
|
|
||||||
echo " <td valign='top' align='right'>\n";
|
|
||||||
echo " <input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='voicemails.php'\" value='".$text['button-back']."'>\n";
|
|
||||||
echo " <input name='submit' type='submit' class='btn' id='import' value=\"".$text['button-import']."\">\n";
|
|
||||||
echo " </td>\n";
|
|
||||||
echo " </tr>\n";
|
|
||||||
echo " <tr>\n";
|
|
||||||
echo " <td colspan='2' align='left'>\n";
|
|
||||||
echo " ".$text['description-import']."\n";
|
|
||||||
echo " </td>\n";
|
|
||||||
echo " </tr>\n";
|
|
||||||
|
|
||||||
//echo "<tr>\n";
|
|
||||||
//echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-import']."</b></td>\n";
|
|
||||||
//echo "<td width='70%' align='right'>\n";
|
|
||||||
//echo " <input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='voicemails.php'\" value='".$text['button-back']."'>\n";
|
|
||||||
//echo "</td>\n";
|
|
||||||
//echo "</tr>\n";
|
|
||||||
|
|
||||||
//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(trim($line_field), $enclosure);
|
$line_field = trim(trim($line_field), $enclosure);
|
||||||
echo "<tr>\n";
|
echo "<tr>\n";
|
||||||
echo "<td 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";
|
||||||
echo $line_field;
|
echo $line_field;
|
||||||
echo "</td>\n";
|
echo " </td>\n";
|
||||||
echo "<td class='vtable' align='left'>\n";
|
echo " <td width='70%' class='vtable' align='left'>\n";
|
||||||
echo " <select class='formfld' style='' name='fields[$x]'>\n";
|
echo " <select class='formfld' style='' name='fields[$x]'>\n";
|
||||||
echo " <option value=''></option>\n";
|
echo " <option value=''></option>\n";
|
||||||
foreach($schema as $row) {
|
foreach($schema as $row) {
|
||||||
echo " <optgroup label='".$row['table']."'>\n";
|
echo " <optgroup label='".$row['table']."'>\n";
|
||||||
foreach($row['fields'] as $field) {
|
foreach($row['fields'] as $field) {
|
||||||
@@ -178,31 +179,30 @@
|
|||||||
$selected = "selected='selected'";
|
$selected = "selected='selected'";
|
||||||
}
|
}
|
||||||
if ($field !== 'domain_uuid') {
|
if ($field !== 'domain_uuid') {
|
||||||
echo " <option value='".$row['table'].".".$field."' ".$selected.">".$field."</option>\n";
|
echo " <option value='".$row['table'].".".$field."' ".$selected.">".$field."</option>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo " </optgroup>\n";
|
echo " </optgroup>\n";
|
||||||
}
|
}
|
||||||
echo " </select>\n";
|
echo " </select>\n";
|
||||||
//echo "<br />\n";
|
//echo "<br />\n";
|
||||||
//echo $text['description-zzz']."\n";
|
//echo $text['description-zzz']."\n";
|
||||||
echo " </td>\n";
|
echo " </td>\n";
|
||||||
echo " </tr>\n";
|
echo "</tr>\n";
|
||||||
$x++;
|
$x++;
|
||||||
}
|
}
|
||||||
|
|
||||||
echo " <tr>\n";
|
echo "</table>\n";
|
||||||
echo " <td colspan='2' valign='top' align='right' nowrap='nowrap'>\n";
|
echo "<br /><br />\n";
|
||||||
echo " <input name='action' type='hidden' value='import'>\n";
|
|
||||||
echo " <input name='from_row' type='hidden' value='$from_row'>\n";
|
echo "<input name='action' type='hidden' value='import'>\n";
|
||||||
echo " <input name='data_delimiter' type='hidden' value='$delimiter'>\n";
|
echo "<input name='from_row' type='hidden' value='$from_row'>\n";
|
||||||
echo " <input name='data_enclosure' type='hidden' value='$enclosure'>\n";
|
echo "<input name='data_delimiter' type='hidden' value='$delimiter'>\n";
|
||||||
echo " <input type='submit' class='btn' id='import' value=\"".$text['button-import']."\">\n";
|
echo "<input name='data_enclosure' type='hidden' value='$enclosure'>\n";
|
||||||
echo " </td>\n";
|
echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
|
||||||
echo " </tr>\n";
|
|
||||||
|
|
||||||
echo " </table>\n";
|
|
||||||
echo "</form>\n";
|
echo "</form>\n";
|
||||||
|
|
||||||
require_once "resources/footer.php";
|
require_once "resources/footer.php";
|
||||||
|
|
||||||
//normalize the column names
|
//normalize the column names
|
||||||
@@ -230,8 +230,13 @@
|
|||||||
//upload the csv
|
//upload the csv
|
||||||
if (file_exists($_SESSION['file']) && $action == 'import') {
|
if (file_exists($_SESSION['file']) && $action == 'import') {
|
||||||
|
|
||||||
//form to match the fields to the column names
|
//validate the token
|
||||||
//require_once "resources/header.php";
|
$token = new token;
|
||||||
|
if (!$token->validate($_SERVER['PHP_SELF'])) {
|
||||||
|
message::add($text['message-invalid_token'],'negative');
|
||||||
|
header('Location: extension_imports.php');
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
//user selected fields
|
//user selected fields
|
||||||
$fields = $_POST['fields'];
|
$fields = $_POST['fields'];
|
||||||
@@ -292,7 +297,6 @@
|
|||||||
$database->app_name = 'voicemails';
|
$database->app_name = 'voicemails';
|
||||||
$database->app_uuid = 'b523c2d2-64cd-46f1-9520-ca4b4098e044';
|
$database->app_uuid = 'b523c2d2-64cd-46f1-9520-ca4b4098e044';
|
||||||
$database->save($array);
|
$database->save($array);
|
||||||
//$message = $database->message;
|
|
||||||
|
|
||||||
//clear the array
|
//clear the array
|
||||||
unset($array);
|
unset($array);
|
||||||
@@ -301,56 +305,58 @@
|
|||||||
$row_id = 0;
|
$row_id = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
} //if ($from_row <= $row_id)
|
} //if ($from_row <= $row_number)
|
||||||
$row_number++;
|
$row_number++;
|
||||||
$row_id++;
|
$row_id++;
|
||||||
} //end while
|
} //end while
|
||||||
fclose($handle);
|
fclose($handle);
|
||||||
|
|
||||||
//save to the data
|
//save to the data
|
||||||
if (is_array($array)) {
|
if (is_array($array)) {
|
||||||
$database = new database;
|
$database = new database;
|
||||||
$database->app_name = 'voicemails';
|
$database->app_name = 'voicemails';
|
||||||
$database->app_uuid = 'b523c2d2-64cd-46f1-9520-ca4b4098e044';
|
$database->app_uuid = 'b523c2d2-64cd-46f1-9520-ca4b4098e044';
|
||||||
$database->save($array);
|
$database->save($array);
|
||||||
//$message = $database->message;
|
unset($array);
|
||||||
}
|
}
|
||||||
|
|
||||||
//send the redirect header
|
//send the redirect header
|
||||||
header("Location: voicemails.php");
|
header("Location: voicemails.php");
|
||||||
return;
|
exit;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//create token
|
||||||
|
$object = new token;
|
||||||
|
$token = $object->create($_SERVER['PHP_SELF']);
|
||||||
|
|
||||||
//include the header
|
//include the header
|
||||||
$document['title'] = $text['title-voicemail_import'];
|
$document['title'] = $text['title-voicemail_import'];
|
||||||
require_once "resources/header.php";
|
require_once "resources/header.php";
|
||||||
|
|
||||||
//begin the content
|
//show content
|
||||||
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
|
echo "<form name='frmUpload' method='post' enctype='multipart/form-data'>\n";
|
||||||
echo " <tr>\n";
|
|
||||||
echo " <td valign='top' align='left' width='30%' nowrap='nowrap'>\n";
|
|
||||||
echo " <b>".$text['header-voicemail_import']."</b><br />\n";
|
|
||||||
echo " ".$text['description-import']."\n";
|
|
||||||
echo " </td>\n";
|
|
||||||
echo " <td valign='top' width='70%' align='right'>\n";
|
|
||||||
echo " <input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='voicemails.php'\" value='".$text['button-back']."'>\n";
|
|
||||||
//echo " <input name='submit' type='submit' class='btn' id='import' value=\"".$text['button-import']."\">\n";
|
|
||||||
echo " </td>\n";
|
|
||||||
echo " </tr>\n";
|
|
||||||
echo "</table>";
|
|
||||||
|
|
||||||
echo "<br />\n";
|
echo "<div class='action_bar' id='action_bar'>\n";
|
||||||
|
echo " <div class='heading'><b>".$text['header-voicemail_import']."</b></div>\n";
|
||||||
|
echo " <div class='actions'>\n";
|
||||||
|
echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'style'=>'margin-right: 15px;','link'=>'voicemails.php']);
|
||||||
|
echo button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>$_SESSION['theme']['button_icon_upload']]);
|
||||||
|
echo " </div>\n";
|
||||||
|
echo " <div style='clear: both;'></div>\n";
|
||||||
|
echo "</div>\n";
|
||||||
|
|
||||||
echo "<form action='' method='POST' enctype='multipart/form-data' name='frmUpload' onSubmit=''>\n";
|
echo $text['description-import']."\n";
|
||||||
echo " <table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
|
echo "<br /><br />\n";
|
||||||
|
|
||||||
|
echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
|
||||||
|
|
||||||
echo "<tr>\n";
|
echo "<tr>\n";
|
||||||
echo "<td 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-import_data']."\n";
|
echo " ".$text['label-import_data']."\n";
|
||||||
echo "</td>\n";
|
echo "</td>\n";
|
||||||
echo "<td class='vtable' align='left'>\n";
|
echo "<td width='70%' class='vtable' align='left'>\n";
|
||||||
echo " <textarea name='data' id='data' rows='7' class='formfld' style='width: 100%;' wrap='off'>$data</textarea>\n";
|
echo " <textarea name='data' id='data' class='formfld' style='width: 100%; min-height: 150px;' wrap='off'>$data</textarea>\n";
|
||||||
echo "<br />\n";
|
echo "<br />\n";
|
||||||
echo $text['description-import_data']."\n";
|
echo $text['description-import_data']."\n";
|
||||||
echo "</td>\n";
|
echo "</td>\n";
|
||||||
@@ -412,18 +418,12 @@
|
|||||||
echo "</td>\n";
|
echo "</td>\n";
|
||||||
echo "</tr>\n";
|
echo "</tr>\n";
|
||||||
|
|
||||||
echo " <tr>\n";
|
echo "</table>\n";
|
||||||
echo " <td valign='bottom'>\n";
|
|
||||||
echo " \n";
|
|
||||||
echo " </td>\n";
|
|
||||||
echo " <td valign='bottom' align='right' nowrap>\n";
|
|
||||||
echo " <input name='type' type='hidden' value='csv'>\n";
|
|
||||||
echo " <br />\n";
|
|
||||||
echo " <input name='submit' type='submit' class='btn' id='import' value=\"".$text['button-import']."\">\n";
|
|
||||||
echo " </td>\n";
|
|
||||||
echo " </tr>\n";
|
|
||||||
echo " </table>\n";
|
|
||||||
echo "<br><br>";
|
echo "<br><br>";
|
||||||
|
|
||||||
|
echo "<input name='type' type='hidden' value='csv'>\n";
|
||||||
|
echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
|
||||||
|
|
||||||
echo "</form>";
|
echo "</form>";
|
||||||
|
|
||||||
//include the footer
|
//include the footer
|
||||||
|
|||||||
Reference in New Issue
Block a user