From 7c65b69da5bc5467560e73281b66b81bdc252974 Mon Sep 17 00:00:00 2001
From: Leandro Arndt <leandro.arndt@cgu.gov.br>
Date: Sat, 23 Jan 2016 20:08:38 -0200
Subject: [PATCH] Correções e melhorias no script de configuração

---
 instalar/index.php | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
 1 file changed, 51 insertions(+), 38 deletions(-)

diff --git a/instalar/index.php b/instalar/index.php
index 3a189d4..820644d 100644
--- a/instalar/index.php
+++ b/instalar/index.php
@@ -10,27 +10,36 @@ if ( (is_writable("../inc/config.php") and is_writable("../restrito/inc/config.p
 	if ($_SERVER['REQUEST_METHOD'] == "POST") {
 		$erro = false;
 		
+		$nome = $_POST["nome"];
+		$codigo = $_POST["codigo"];
+		(substr($_POST["sitelink"], -1) != "/") ? $sitelink = $_POST["sitelink"]."/" : $sitelink = $_POST["sitelink"];
+		if (substr($_POST["urlsistema"], -1) != "/") {
+			if ($_POST["urlsistema"] != "") {
+				$urlsistema = $_POST["urlsistema"]."/";
+			} else {
+				$urlsistema = $sitelink;
+			}
+		} else {
+			$urlsistema = $_POST["urlsistema"];
+		}
+		$dbhost = $_POST["dbhost"];
+		$dbuser = $_POST["dbuser"];
+		$dbpass = $_POST["dbpass"];
+		$dbname = $_POST["dbname"];
+		$phpmailer = $_POST["phpmailer"] == "phpmailer" ? "true" : "false";
+		$smtphost = $_POST["smtpport"] != "" ? $_POST["smtphost"].":".$_POST["smtpport"] : $_POST["smtphost"];
+		$smtpauth = $_POST["smtpauth"] == "smtpauth" ? "true" : "false";
+		$smtpuser = $_POST["smtpuser"];
+		$smtppwd = $_POST["smtppwd"];
+
+		
 		// Verifica os campos obrigatórios
-		if ($_POST["nome"] and $_POST["codigo"] and $_POST["sitelink"] and $_POST["urlsistema"] and
-			$_POST["dbhost"] and $_POST["dbuser"] and $_POST["dbpass"] and $_POST["dbname"] and
-			((!$_POST["phpmailer"]) or ($_POST["smtphost"] and
-				(!($_POST["smtpauth"]) or ($_POST["smtpuser"] and $_POST["smtppwd"]))
+		if ($nome and $codigo and $sitelink and $urlsistema and
+			$dbhost and $dbuser and $dbpass and $dbname and
+			((!$phpmailer) or ($smtphost and
+				(!($smtpauth) or ($smtpuser and $smtppwd))
 			))
-		) {
-			$nome = $_POST["nome"];
-			$codigo = $_POST["codigo"];
-			($_POST["sitelink"][strlen($_POST["sitelink"]-1)] != "/") ? $sitelink = $_POST["sitelink"]."/" : $sitelink = $_POST["sitelink"];
-			($_POST["urlsistema"][strlen($_POST["urlsistema"]-1)] != "/") ? $urlsistema = $_POST["urlsistema"]."/" : $urlsistema = $_POST["urlsistema"];
-			$dbhost = $_POST["dbhost"];
-			$dbuser = $_POST["dbuser"];
-			$dbpass = $_POST["dbpass"];
-			$dbname = $_POST["dbname"];
-			$phpmailer = $_POST["phpmailer"] == "phpmailer" ? "true" : "false";
-			$smtphost = $_POST["$smtpport"] != "" ? $_POST["smtphost"].":".$_POST["smtpport"] : $_POST["smtphost"];
-			$smtpauth = $_POST["smtpauth"] == "smtpauth" ? "true" : "false";
-			$smtpuser = $_POST["smtpuser"];
-			$smtppwd = $_POST["smtppwd"];
-			
+		) {			
 			try {
 				$config = fopen("../inc/config.php", "w");
 				fwrite($config, <<<CONF
@@ -112,20 +121,23 @@ CONF
 		    );
                 fclose($config);
             } catch(Exceptipon $e) {
-            	$erro = "não foi possível escrever os arquivos de configuração ($e)";
+            	$erro = "n&atilde;o foi poss&iacute;vel escrever os arquivos de configura&ccedil;&atilde;o ($e)";
             }
 		} else {
-			$erro = "campos obrigatórios não preenchidos";			
+			$erro = "campos obrigat&oacute;rios n&atilde;o preenchidos";			
 		}
 	
 		// Se a configuração foi bem sucedida, passa à próxima etapa	
 		if (!$erro) {
-			header("Location: $urlsistemainstalar/bd.php");
+			header("Location: ".$urlsistema."instalar/bd.php");
 			die();
 		} else {
-			echo "<script language='javascript'>alert('Erro na configuração do sistema: $erro.');</script>";
+			echo "<script language='javascript'>e = document.createElement('span');e.innerHTML = 'Erro na configura&ccedil;&atilde;o do sistema: $erro.';alert(e.textContent);</script>"; // Dessa maneira conseguimos exibir os caracteres especiais
 		}
-}
+	} else { // GET
+    	$nome = "e-SIC Livre";
+        $codigo = "esiclivre";
+    }
 
 include("../inc/topo.php");
 
@@ -135,37 +147,38 @@ include("../inc/topo.php");
 <div id="principal">
 	<h1>Instala&ccedil;&atilde;o do e-SIC Livre</h1>
     <h2>Passo 1 de 2</h2>
+    <h3>Configura&ccedil;&atilde;o do sistema</h3>
 	<form action="index.php" method="post">
 		<fieldset>
 			<legend>Informa&ccedil;&otilde;es do sistema</legend>
 			<table>
-				<tr><td><label for="nome">Nome do sistema:<small>*</small></label></td><td><input type="text" name="nome" id="nome" value="e-SIC Livre"></td></tr>
-				<tr><td><label for="codigo">C&oacute;digo dos <em>cookies</em> de sess&atilde;o:<small>*</small></label></td><td><input type="text" name="codigo" id="codigo" value="esiclivre"></td></tr>
-				<tr><td><label for="sitelink">URL do <em>site</em> principal:<small>*</small></label></td><td><input type="text" name="sitelink" id="sitelink" value=""></td></tr>
-				<tr><td><label for="urlsistema">URL da raiz do sistema:<small>*</small></label></td><td><input type="text" name="urlsistema" id="urlsistema" value=""></td></tr>
+				<tr><td><label for="nome">Nome do sistema:<small>*</small></label></td><td><input type="text" name="nome" id="nome" value="<?php echo $nome;?>"></td></tr>
+				<tr><td><label for="codigo">C&oacute;digo dos <em>cookies</em> de sess&atilde;o:<small>*</small></label></td><td><input type="text" name="codigo" id="codigo" value="<?php echo $codigo;?>"></td></tr>
+				<tr><td><label for="sitelink">URL do <em>site</em> principal:<small>*</small></label></td><td><input type="text" name="sitelink" id="sitelink" value="<?php echo $sitelink;?>"></td></tr>
+				<tr><td><label for="urlsistema">URL da raiz do sistema:<small>*</small></label></td><td><input type="text" name="urlsistema" id="urlsistema" value="<?php echo $urlsistema;?>"></td></tr>
 			</table>
 		</fieldset>
 		
 		<fieldset>
 			<legend>Banco de dados</legend>
 			<table>
-				<tr><td><label for="dbhost">Endere&ccedil;o do servidor:<small>*</small></label></td><td><input type="text" name="dbhost" id="dbhost" value=""></td></tr>
-				<tr><td><label for="dbuser"></label>Usu&aacute;rio:<small>*</small></td><td><input type="text" name="dbuser" id="dbuser" value=""></td></tr>
-				<tr><td><label for="dbpass">Senha:<small>*</small></label></td><td><input type="password" name="dbpass" id="dbpass" value=""></td></tr>
-				<tr><td><label for="dbname">Nome do banco de dados:<small>*</small></label></td><td><input type="text" name="dbname" id="dbname" value=""></td></tr>
+				<tr><td><label for="dbhost">Endere&ccedil;o do servidor:<small>*</small></label></td><td><input type="text" name="dbhost" id="dbhost" value="<?php echo $dbhost;?>"></td></tr>
+				<tr><td><label for="dbuser"></label>Usu&aacute;rio:<small>*</small></td><td><input type="text" name="dbuser" id="dbuser" value="<?php echo $dbuser;?>"></td></tr>
+				<tr><td><label for="dbpass">Senha:<small>*</small></label></td><td><input type="password" name="dbpass" id="dbpass" value="<?php echo $dbpass;?>"></td></tr>
+				<tr><td><label for="dbname">Nome do banco de dados:<small>*</small></label></td><td><input type="text" name="dbname" id="dbname" value="<?php echo $dbname;?>"></td></tr>
 			</table>
 		</fieldset>
 		
 		<fieldset>
 			<legend>Envio de e-mail</legend>
 			<table>
-				<tr><td><label for="phpmailer">Usar o PHP Mailer?</label></td><td><input type="checkbox" name="phpmailer" id="phpmailer" value="phpmailer"></td></tr>
+				<tr><td><label for="phpmailer">Usar o PHP Mailer?</label></td><td><input type="checkbox" name="phpmailer" id="phpmailer" value="phpmailer" <?php if ($phpmailer != "") {echo "checked=\"true\"";}?>"></td></tr>
 				<tr><td colspan="2">Se usar o PHP Mailer, preencha os campos a seguir:</td></tr>
-				<tr><td><label for="smtphost">Servidor de e-mail:</label></td><td><input type="text" name="smtphost" id="smtphost" value=""></td></tr>
-				<tr><td><label for="smtpport"></label>Porta de SMTP:</td><td><input type="text" name="smtpport" id="smtpport" value=""></td></tr>
-				<tr><td><label for="smtpauth"></label>Necess&aacute;rio autenticar?</td><td><input type="checkbox" name="smtpauth" id="smtpauth" value="smtpauth"></td></tr>
-				<tr><td><label for="smtpuser"></label>Usu&aacute;rio do servidor de e-mail:</td><td><input type="text" name="smtpuser" id="smtpuser" value=""></td></tr>
-				<tr><td><label for="smtppwd"></label>Senha do usu&aacute;rio do servidor de e-mail:</td><td><input type="password" name="smtppwd" id="smtppwd" value=""></td></tr>
+				<tr><td><label for="smtphost">Servidor de e-mail:</label></td><td><input type="text" name="smtphost" id="smtphost" value="<?php echo $_POST["smtphost"];?>"></td></tr>
+				<tr><td><label for="smtpport"></label>Porta de SMTP:</td><td><input type="text" name="smtpport" id="smtpport" value="<?php echo $_POST["smtpport"];?>"></td></tr>
+				<tr><td><label for="smtpauth"></label>Necess&aacute;rio autenticar?</td><td><input type="checkbox" name="smtpauth" id="smtpauth" value="smtpauth" <?php if ($smtpauth != "") {echo "checked=\"true\"";}?>"></td></tr>
+				<tr><td><label for="smtpuser"></label>Usu&aacute;rio do servidor de e-mail:</td><td><input type="text" name="smtpuser" id="smtpuser" value="<?php echo $smtpuser;?>"></td></tr>
+				<tr><td><label for="smtppwd"></label>Senha do usu&aacute;rio do servidor de e-mail:</td><td><input type="password" name="smtppwd" id="smtppwd" value="<?php echo $smtppwd;?>"></td></tr>
 			</table>
 		</fieldset>
         <p><small>*Campos obrigat&oacute;rios.</small></p>
--
libgit2 0.21.2