From 7f082bdef30682b7c79be5c81cf77ad2dc558839 Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Mon, 4 Apr 2016 19:51:22 -0600
Subject: [PATCH] Add a missing permission on backup.

---
 app/backup/index.php                          | 161 +++++++++---------
 .../resources/scripts/dialplan/dialplan.lua   |   2 +-
 2 files changed, 82 insertions(+), 81 deletions(-)

diff --git a/app/backup/index.php b/app/backup/index.php
index fb31d009c2..e6e98b5998 100644
--- a/app/backup/index.php
+++ b/app/backup/index.php
@@ -164,89 +164,90 @@ else {
 	echo "	<tr>\n";
 	echo "		<td width='50%' valign='top'>\n";
 
-		echo "<b>".$text['header-backup']."</b>\n";
-		echo "<br><br>";
-		echo $text['description-backup']."\n";
-		echo "<br><br><br>";
-		echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
-		echo "<tr>\n";
-		echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-source_paths']."\n";
-		echo "</td>\n";
-		echo "<td width='70%' class='vtable' align='left'>\n";
-		foreach ($_SESSION['backup']['path'] as $backup_path) {
-			echo $backup_path."<br>\n";
-		}
-		echo "</td>";
-		echo "</tr>";
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-file_format']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<select class='formfld' name='file_format' id='file_format'>";
-		echo "		<option value='tgz' ".(($file_format == 'tgz') ? 'selected' : null).">TAR GZIP</option>";
-		echo "		<option value='tbz' ".(($file_format == 'tbz') ? 'selected' : null).">TAR BZIP</option>";
-		echo "		<option value='rar' ".(($file_format == 'rar') ? 'selected' : null).">RAR</option>";
-		echo "		<option value='zip' ".(($file_format == 'zip') ? 'selected' : null).">ZIP</option>";
-		echo "	</select>";
-		echo "</td>";
-		echo "</tr>";
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-target_type']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<select class='formfld' name='target_type' id='target_type' onchange=\"(this.selectedIndex == 0) ? toggle_target('btn_script','btn_download') : toggle_target('btn_download','btn_script');\">";
-		echo "		<option value='download'>".$text['option-file_download']."</option>";
-		echo "		<option value='script' ".(($target_type == 'script') ? 'selected' : null).">".$text['option-command']."</option>";
-		echo "	</select>";
-		echo "</td>";
-		echo "</tr>";
-		echo "</table>";
-		echo "<div id='command' ".(($command == '') ? "style='display: none;'" : null).">";
-		echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
-		echo "<tr>\n";
-		echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-command']."\n";
-		echo "</td>\n";
-		echo "<td width='70%' class='vtable' align='left'>\n";
-		echo "	<textarea class='formfld' style='width: 100%; height: 200px; font-family: courier;'>".$command."</textarea>";
-		echo "</td>";
-		echo "</tr>";
-		echo "</table>";
-		echo "</div>";
-		echo "<br>";
-		echo "<div align='right'>";
-		echo "<input type='button' id='btn_script' class='btn' ".(($target_type != 'script') ? "style='display: none;'" : null)." value='".$text['button-generate']."' onclick=\"document.location.href='".PROJECT_PATH."/app/backup/index.php?a=script&file_format='+document.getElementById('file_format').options[document.getElementById('file_format').selectedIndex].value;\">";
-		echo "<input type='button' id='btn_download' class='btn' ".(($target_type == 'script') ? "style='display: none;'" : null)." value='".$text['button-download']."' onclick=\"document.location.href='".PROJECT_PATH."/app/backup/index.php?a=download&file_format='+document.getElementById('file_format').options[document.getElementById('file_format').selectedIndex].value;\">";
-		echo "</div>";
-		echo "<br><br>";
+	echo "<b>".$text['header-backup']."</b>\n";
+	echo "<br><br>";
+	echo $text['description-backup']."\n";
+	echo "<br><br><br>";
+	echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
+	echo "<tr>\n";
+	echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-source_paths']."\n";
+	echo "</td>\n";
+	echo "<td width='70%' class='vtable' align='left'>\n";
+	foreach ($_SESSION['backup']['path'] as $backup_path) {
+		echo $backup_path."<br>\n";
+	}
+	echo "</td>";
+	echo "</tr>";
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-file_format']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='file_format' id='file_format'>";
+	echo "		<option value='tgz' ".(($file_format == 'tgz') ? 'selected' : null).">TAR GZIP</option>";
+	echo "		<option value='tbz' ".(($file_format == 'tbz') ? 'selected' : null).">TAR BZIP</option>";
+	echo "		<option value='rar' ".(($file_format == 'rar') ? 'selected' : null).">RAR</option>";
+	echo "		<option value='zip' ".(($file_format == 'zip') ? 'selected' : null).">ZIP</option>";
+	echo "	</select>";
+	echo "</td>";
+	echo "</tr>";
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-target_type']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='target_type' id='target_type' onchange=\"(this.selectedIndex == 0) ? toggle_target('btn_script','btn_download') : toggle_target('btn_download','btn_script');\">";
+	echo "		<option value='download'>".$text['option-file_download']."</option>";
+	echo "		<option value='script' ".(($target_type == 'script') ? 'selected' : null).">".$text['option-command']."</option>";
+	echo "	</select>";
+	echo "</td>";
+	echo "</tr>";
+	echo "</table>";
+	echo "<div id='command' ".(($command == '') ? "style='display: none;'" : null).">";
+	echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
+	echo "<tr>\n";
+	echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-command']."\n";
+	echo "</td>\n";
+	echo "<td width='70%' class='vtable' align='left'>\n";
+	echo "	<textarea class='formfld' style='width: 100%; height: 200px; font-family: courier;'>".$command."</textarea>";
+	echo "</td>";
+	echo "</tr>";
+	echo "</table>";
+	echo "</div>";
+	echo "<br>";
+	echo "<div align='right'>";
+	echo "<input type='button' id='btn_script' class='btn' ".(($target_type != 'script') ? "style='display: none;'" : null)." value='".$text['button-generate']."' onclick=\"document.location.href='".PROJECT_PATH."/app/backup/index.php?a=script&file_format='+document.getElementById('file_format').options[document.getElementById('file_format').selectedIndex].value;\">";
+	echo "<input type='button' id='btn_download' class='btn' ".(($target_type == 'script') ? "style='display: none;'" : null)." value='".$text['button-download']."' onclick=\"document.location.href='".PROJECT_PATH."/app/backup/index.php?a=download&file_format='+document.getElementById('file_format').options[document.getElementById('file_format').selectedIndex].value;\">";
+	echo "</div>";
+	echo "<br><br>";
 
-	echo "		</td>\n";
-	echo "		<td width='20'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n";
-	echo "		<td width='50%' valign='top'>\n";
-
-		echo "<b>".$text['header-restore']."</b>\n";
-		echo "<br><br>";
+	if (permission_exists("backup_upload")) {
+		echo "		</td>\n";
+		echo "		<td width='20'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n";
+		echo "		<td width='50%' valign='top'>\n";
+		echo "			<b>".$text['header-restore']."</b>\n";
+		echo "			<br><br>";
 		echo $text['description-restore']."\n";
-		echo "<br><br><br>";
-		echo "<div align='center'>";
-		echo "<form name='frmrestore' method='post' enctype='multipart/form-data' action=''>";
-		echo "<input type='hidden' name='a' value='restore'>";
-		echo "<table>";
-		echo "	<tr>";
-		echo "		<td nowrap>".$text['label-select_backup']."&nbsp;</td>";
-		echo "		<td><input type='file' class='formfld fileinput' name='backup_file'></td>";
-		echo "		<td><input type='submit' class='btn' value='".$text['button-restore']."'></td>";
-		echo "	</tr>";
-		echo "</table>";
-		echo "<br>";
-		echo "<span style='font-weight: bold; text-decoration: underline; color: #000;'>".$text['description-restore_warning']."</span>";
-		echo "</form>\n";
-		echo "</div>";
+		echo "			<br><br><br>";
+		echo "			<div align='center'>";
+		echo "				<form name='frmrestore' method='post' enctype='multipart/form-data' action=''>";
+		echo "				<input type='hidden' name='a' value='restore'>";
+		echo "				<table>";
+		echo "				<tr>";
+		echo "					<td nowrap>".$text['label-select_backup']."&nbsp;</td>";
+		echo "					<td><input type='file' class='formfld fileinput' name='backup_file'></td>";
+		echo "					<td><input type='submit' class='btn' value='".$text['button-restore']."'></td>";
+		echo "				</tr>";
+		echo "				</table>";
+		echo "				<br>";
+		echo "				<span style='font-weight: bold; text-decoration: underline; color: #000;'>".$text['description-restore_warning']."</span>";
+		echo "				</form>\n";
+		echo "			</div>";
+		echo "		</td>\n";
+	}
 
-	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "</table>\n";
 	echo "<br><br>";
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua b/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
index e777d26e3e..9f82aa59e7 100644
--- a/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
+++ b/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
@@ -27,7 +27,7 @@
 	local cache = require"resources.functions.cache"
 	local log = require"resources.functions.log"["xml_handler"]
 
--- needed for cli-command xml_locate dialplan
+--needed for cli-command xml_locate dialplan
 	if (call_context == nil) then
 		call_context = "public";
 	end