From 1157e6986970654da9334446aceb3984d495cfa7 Mon Sep 17 00:00:00 2001
From: harpiain@gmail.com <harpiain@gmail.com>
Date: Sun, 18 Nov 2007 03:50:11 +0000
Subject: [PATCH] AtualizaÃ§Ã£o "Trunk"

---
 admin/config_gerais.php |  5 +++--
 include/define.php      | 52 +++++++++++++++++++++++++---------------------------
 2 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/admin/config_gerais.php b/admin/config_gerais.php
index 36b2c02..f98897a 100755
--- a/admin/config_gerais.php
+++ b/admin/config_gerais.php
@@ -27,8 +27,9 @@ else { // Inserir regras para outras verificações (ex: permissões do usuário)!
 <head>
 <title>Configurar Gerente</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<script type="text/javascript" src="../include/cacic.js"></script>
 <?
-require_once('../include/selecao_listbox.js');  
+require_once('../include/selecao_listbox.js');
 ?>
 <link rel="stylesheet"   type="text/css" href="../include/cacic.css">
 <SCRIPT LANGUAGE="JavaScript">
@@ -442,4 +443,4 @@ if ($_SESSION['cs_nivel_administracao'] == 1 || $_SESSION['cs_nivel_administraca
 </form>		  
 <p>&nbsp;</p>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/include/define.php b/include/define.php
index 364a6fa..dd83c6e 100644
--- a/include/define.php
+++ b/include/define.php
@@ -62,7 +62,9 @@ defined( 'CACIC' ) or die( 'Acesso restrito (Restricted access)!' );
  * que deverá existir na pasta "sql" do instalador 
  * Sintaxe: array( 'JUN2005'=>'Junho de 2005', 'FEV2006'=>'Fevereiro de 2006' )
  */
- $cacic_updateFromVersion = array( 'JUN2005'=>'Junho de 2005', 'v2.2.2'=>'Versão 2.2.2' );
+ $cacic_updateFromVersion = array( 'JUN2005'=>'Junho de 2005',
+                                   'v2.2.2'=>'Versão 2.2.2'
+                                 );
 
 /**
  * define a versão do PHP para o CACIC
@@ -96,44 +98,40 @@ defined( 'CACIC' ) or die( 'Acesso restrito (Restricted access)!' );
  */
  define( 'CACIC_PHPMEM', '32M');
 
+/* ******************************************************
+ *  NAO ALTERAR NADA DAQUI PARA BAIXO
+ * ******************************************************/
+
 /**
  * Atribui Idioma padrao
  */
- if(isset($cacicLang))
-    define( 'CACIC_LANG', $cacicLang);
- else 
-    define( 'CACIC_LANG', 'pt_br');
+/*
+ * CACIC application language
+ */
+ if(isset($cacic_language))
+    define( CACIC_LANGUAGE, $cacic_language );
+ else
+    define( CACIC_LANGUAGE, 'pt_br');
+
+/*
+ * CACIC application standard language
+ * (Language to be used if the above one fail)
+ */
+ define( CACIC_LANGUAGE_STANDARD, $cacic_language_standard );
 
 /**
  * Atribui CHARSET padrao
  */
  if(isset($cacicLangCS))
     define( 'CACIC_LANG_CHARSET', $cacicLangCS);
- else 
+ else
     define( 'CACIC_LANG_CHARSET', 'ISO-8859-1');
 
-/* ******************************************************
- *  NAO ALTERAR NADA DAQUI PARA BAIXO
- * ******************************************************/
-
 /*
  * path for CACIC
  */
  define(CACIC_PATH, $path_aplicacao );
- 
-/*
- * URL for CACIC
- */
- define(CACIC_URL, $url_aplicacao );
-/*
- * CACIC application language
- */
- define(CACIC_LANGUAGE, $cacic_language );
-/*
- * CACIC application standard language
- * (Language to be viewed when the one above not found)
- */
- define(CACIC_LANGUAGE_STANDARD, $cacic_language_standard );
+
 /*
  * PATH for phpTranslator class
  */
@@ -168,10 +166,10 @@ defined( 'CACIC' ) or die( 'Acesso restrito (Restricted access)!' );
  */
  $urlRequest = str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['REQUEST_URI']);
  $urlRequest = str_replace("instalador/", '', $urlRequest);
- if(isset($cacicURL))
-    define( 'CACIC_URL', $cacicURL);
+ if(isset($url_aplicacao))
+    define( CACIC_URL, $url_aplicacao);
  else 
-    define( 'CACIC_URL', "http://" . $_SERVER['SERVER_NAME'] . $urlRequest);
+    define( CACIC_URL, "http://" . $_SERVER['SERVER_NAME'] . $urlRequest);
 
 /*
  * Atribui URL de instalação do CACIC 
--
libgit2 0.21.2

