From 073cbe16c8c14c2011ba256cbcadc084951a2b02 Mon Sep 17 00:00:00 2001
From: harpiain@gmail.com <harpiain@gmail.com>
Date: Mon, 28 Apr 2008 01:13:55 +0000
Subject: [PATCH] Gerente "trunk" atualizado

---
 include/define.php                  |  2 +-
 instalador/classes/install.ajax.php | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/define.php b/include/define.php
index 82881fd..d692e8f 100644
--- a/include/define.php
+++ b/include/define.php
@@ -108,7 +108,7 @@ defined( 'CACIC' ) or die( 'Acesso restrito (Restricted access)!' );
 /*
  * CACIC application language
  */
- if(isset($cacic_language))
+ if(isset($cacic_language) and !empty($cacic_language))
     define( 'CACIC_LANGUAGE', $cacic_language );
  else
     define( 'CACIC_LANGUAGE', 'pt_BR');
diff --git a/instalador/classes/install.ajax.php b/instalador/classes/install.ajax.php
index a9c82b2..acf3577 100644
--- a/instalador/classes/install.ajax.php
+++ b/instalador/classes/install.ajax.php
@@ -185,8 +185,11 @@ class InstallAjax {
 			}
     		$fileName = $cacic_config['path'].'language'.CACIC_DS.$cacic_config['cacic_language'].CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_STDDATA;
     		if(!is_readable($fileName)) {
-    	        $dadosOK = false;
-				$msg .= '<span class="Erro">['.InstallAjax::_('kciq_msg error', '',2)."! ] - ".InstallAjax::_('kciq_msg inst database sqldata not defined',array(CACIC_SQLFILE_STDDATA)).'</span><br>';
+	    		$fileName = $cacic_config['path'].'language'.CACIC_DS.CACIC_LANGUAGE.CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_STDDATA;
+	    		if(!is_readable($fileName)) {
+	    	        $dadosOK = false;
+					$msg .= '<span class="Erro">['.InstallAjax::_('kciq_msg error', '',2)."! ] - ".InstallAjax::_('kciq_msg inst database sqldata not defined',array(CACIC_SQLFILE_STDDATA)).'</span><br>';
+	    		}
 			}
     		if($cacic_config['dbdet']['demo'] == 'demo') {
     			$fileName = $cacic_config['path'].'instalador'.CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_DEMODATA;
@@ -547,9 +550,12 @@ class InstallAjax {
 					  
 		if($installType == 'createDB') {
 		   /*
-		    * Inclui dados básicos para CACIC
+		    * Inclui dados básicos para CACIC, do idioma selecionado ou, caso não exista, do idioma padrão
 		    */
 		   $fileName = $cacic_config['path'].'language'.CACIC_DS.$cacic_config['cacic_language'].CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_STDDATA;
+		   if(!is_readable($fileName))
+	    		$fileName = $cacic_config['path'].'language'.CACIC_DS.CACIC_LANGUAGE.CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_STDDATA;
+	    		
 		   if(is_readable($fileName)) {
 			 $cacic_sql_dadosbase = $fileName;
 			 echo "<br>".InstallAjax::_('kciq_msg inst insert basic data',array($cacic_config['db_name']));
--
libgit2 0.21.2