diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php index 88bcc719a3..b663971e10 100644 --- a/app/vars/var_edit.php +++ b/app/vars/var_edit.php @@ -23,16 +23,20 @@ Contributor(s): Mark J Crane */ -include "root.php"; -require_once "resources/require.php"; -require_once "resources/check_auth.php"; -if (permission_exists('var_add') || permission_exists('var_edit')) { - //access granted -} -else { - echo "access denied"; - exit; -} + +//includes + include "root.php"; + require_once "resources/require.php"; + require_once "resources/check_auth.php"; + +//check permissions + if (permission_exists('var_add') || permission_exists('var_edit')) { + //access granted + } + else { + echo "access denied"; + exit; + } //add multi-lingual support $language = new text; @@ -62,108 +66,113 @@ else { $var_description = str_replace("''", "'", $var_description); } -if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { +//process the post + if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { - $msg = ''; - if ($action == "update") { - $var_uuid = check_str($_POST["var_uuid"]); - } + //get the uuid + if ($action == "update") { + $var_uuid = check_str($_POST["var_uuid"]); + } - //check for all required data - if (strlen($var_name) == 0) { $msg .= $text['message-required'].$text['label-name']."
\n"; } - //if (strlen($var_value) == 0) { $msg .= $text['message-required'].$text['label-value']."
\n"; } - //if (strlen($var_cat) == 0) { $msg .= $text['message-required'].$text['label-category']."
\n"; } - if (strlen($var_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."
\n"; } - if (strlen($var_order) == 0) { $msg .= $text['message-required'].$text['label-order']."
\n"; } - if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) { - require_once "resources/header.php"; - require_once "resources/persist_form_var.php"; - echo "
\n"; - echo "
\n"; - echo $msg."
"; - echo "
\n"; - persistformvar($_POST); - echo "
\n"; - require_once "resources/footer.php"; - return; - } - - //add or update the database - if ($_POST["persistformvar"] != "true") { - if ($action == "add" && permission_exists('var_add')) { - $var_uuid = uuid(); - $sql = "insert into v_vars "; - $sql .= "("; - $sql .= "var_uuid, "; - $sql .= "var_name, "; - $sql .= "var_hostname, "; - $sql .= "var_value, "; - $sql .= "var_cat, "; - $sql .= "var_enabled, "; - $sql .= "var_order, "; - $sql .= "var_description "; - $sql .= ")"; - $sql .= "values "; - $sql .= "("; - $sql .= "'$var_uuid', "; - $sql .= "'$var_name', "; - if (strlen($var_hostname) > 0) { - $sql .= "'$var_hostname', "; - } - else { - $sql .= "null, "; - } - $sql .= "'$var_value', "; - $sql .= "'$var_cat', "; - $sql .= "'$var_enabled', "; - $sql .= "'$var_order', "; - $sql .= "'".base64_encode($var_description)."' "; - $sql .= ")"; - $db->exec(check_sql($sql)); - unset($sql); - - //unset the user defined variables - $_SESSION["user_defined_variables"] = ""; - - //synchronize the configuration - save_var_xml(); - - messages::add($text['message-add']); - header("Location: vars.php"); + //check for all required data + $msg = ''; + if (strlen($var_name) == 0) { $msg .= $text['message-required'].$text['label-name']."
\n"; } + //if (strlen($var_value) == 0) { $msg .= $text['message-required'].$text['label-value']."
\n"; } + //if (strlen($var_cat) == 0) { $msg .= $text['message-required'].$text['label-category']."
\n"; } + if (strlen($var_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."
\n"; } + if (strlen($var_order) == 0) { $msg .= $text['message-required'].$text['label-order']."
\n"; } + if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) { + require_once "resources/header.php"; + require_once "resources/persist_form_var.php"; + echo "
\n"; + echo "
\n"; + echo $msg."
"; + echo "
\n"; + persistformvar($_POST); + echo "
\n"; + require_once "resources/footer.php"; return; - } //if ($action == "add") + } - if ($action == "update" && permission_exists('var_edit')) { - //update the variables - $sql = "update v_vars set "; - $sql .= "var_name = '$var_name', "; - if (strlen($var_hostname) > 0) { - $sql .= "var_hostname = '$var_hostname', "; - } - else { - $sql .= "var_hostname = null, "; - } - $sql .= "var_value = '$var_value', "; - $sql .= "var_cat = '$var_cat', "; - $sql .= "var_enabled = '$var_enabled', "; - $sql .= "var_order = '$var_order', "; - $sql .= "var_description = '".base64_encode($var_description)."' "; - $sql .= "where var_uuid = '$var_uuid' "; - $db->exec(check_sql($sql)); - unset($sql); + //add or update the database + if ($_POST["persistformvar"] != "true") { + if ($action == "add" && permission_exists('var_add')) { + //insert the variable + $var_uuid = uuid(); + $sql = "insert into v_vars "; + $sql .= "("; + $sql .= "var_uuid, "; + $sql .= "var_name, "; + $sql .= "var_hostname, "; + $sql .= "var_value, "; + $sql .= "var_cat, "; + $sql .= "var_enabled, "; + $sql .= "var_order, "; + $sql .= "var_description "; + $sql .= ")"; + $sql .= "values "; + $sql .= "("; + $sql .= "'$var_uuid', "; + $sql .= "'$var_name', "; + if (strlen($var_hostname) > 0) { + $sql .= "'$var_hostname', "; + } + else { + $sql .= "null, "; + } + $sql .= "'$var_value', "; + $sql .= "'$var_cat', "; + $sql .= "'$var_enabled', "; + $sql .= "'$var_order', "; + $sql .= "'".base64_encode($var_description)."' "; + $sql .= ")"; + $db->exec(check_sql($sql)); + unset($sql); - //unset the user defined variables - $_SESSION["user_defined_variables"] = ""; + //unset the user defined variables + $_SESSION["user_defined_variables"] = ""; - //synchronize the configuration - save_var_xml(); + //synchronize the configuration + save_var_xml(); - messages::add($text['message-update']); - header("Location: vars.php"); - return; - } //if ($action == "update") - } //if ($_POST["persistformvar"] != "true") -} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) + //set the message and redirect the user + messages::add($text['message-add']); + header("Location: vars.php"); + return; + } //if ($action == "add") + + if ($action == "update" && permission_exists('var_edit')) { + //update the variables + $sql = "update v_vars set "; + $sql .= "var_name = '$var_name', "; + if (strlen($var_hostname) > 0) { + $sql .= "var_hostname = '$var_hostname', "; + } + else { + $sql .= "var_hostname = null, "; + } + $sql .= "var_value = '$var_value', "; + $sql .= "var_cat = '$var_cat', "; + $sql .= "var_enabled = '$var_enabled', "; + $sql .= "var_order = '$var_order', "; + $sql .= "var_description = '".base64_encode($var_description)."' "; + $sql .= "where var_uuid = '$var_uuid' "; + $db->exec(check_sql($sql)); + unset($sql); + + //unset the user defined variables + $_SESSION["user_defined_variables"] = ""; + + //synchronize the configuration + save_var_xml(); + + //set the message and redirect the user + messages::add($text['message-update']); + header("Location: vars.php"); + return; + } //if ($action == "update") + } //if ($_POST["persistformvar"] != "true") + } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) //pre-populate the form if (count($_GET)>0 && $_POST["persistformvar"] != "true") { @@ -340,7 +349,20 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; @@ -391,4 +413,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //include header require_once "resources/footer.php"; -?> \ No newline at end of file + +?>
iLBC@30iiLBC using mode=30 which will win in all cases.
opus@48000h@10iOpus 48khz using 10 ms ptime (mono and stereo)
opus@48000h@20iOpus 48khz using 20 ms ptime (mono and stereo)
opus@48000h@40iOpus 48khz using 40 ms ptime
opus@16000h@10iOpus 16khz using 10 ms ptime (mono and stereo)
opus@16000h@20iOpus 16khz using 20 ms ptime (mono and stereo)
opus@16000h@40iOpus 16khz using 40 ms ptime
opus@8000h@10iOpus 8khz using 10 ms ptime (mono and stereo)
opus@8000h@20iOpus 8khz using 20 ms ptime (mono and stereo)
opus@8000h@40iOpus 8khz using 40 ms ptime
opus@8000h@60iOpus 8khz using 60 ms ptime
opus@8000h@80iOpus 8khz using 80 ms ptime
opus@8000h@100iOpus 8khz using 100 ms ptime
opus@8000h@120iOpus 8khz using 120 ms ptime
iLBC@30iiLBC using mode=30 which will win in all cases.
DVI4@8000h@20iIMA ADPCM 8kHz using 20ms ptime. (multiples of 10)
DVI4@16000h@40iIMA ADPCM 16kHz using 40ms ptime. (multiples of 10)
speex@8000h@20iSpeex 8kHz using 20ms ptime.