X-Git-Url: https://git.llucax.com/software/sercom-old.git/blobdiff_plain/2629d689134a52c5d3210e371758931b99692a84..5174fa9bd71e4f671d9788707e106296638a3c63:/src/T/general.php?ds=sidebyside

diff --git a/src/T/general.php b/src/T/general.php
index d2abd94..d56d841 100644
--- a/src/T/general.php
+++ b/src/T/general.php
@@ -1,5 +1,8 @@
 <?php // vim: set binary noeol et sw=4 sts=4:
 
+$VERSION = 0.2;
+$NAME = 'sercom';
+
 define('DB_DATAOBJECT_NO_OVERLOAD', 0);
 
 // Seteo umask para que el grupo pueda leer.
@@ -9,8 +12,8 @@ umask(00027);
 require_once 'T/logconstants.php';
 
 // obtengo configuración
-foreach (array('.', '/etc', '/etc/sercom') as $dir) {
-    $cf = "$dir/sercom.ini";
+foreach (array('.', '/etc', '/etc/'.$NAME) as $dir) {
+    $cf = "$dir/$NAME.ini";
     if (is_readable($cf)) {
         if (!($CONF = @parse_ini_file($cf, true))) {
             fputs(STDERR, "No se pudo abrir archivo de configuración '$cf' ($php_errormsg)!\n");
@@ -29,7 +32,7 @@ $DBO_options = &PEAR::getStaticProperty('DB_DataObject', 'options');
 
 // because PEAR::getstaticProperty was called with and & (get by reference)
 // this will actually set the variable inside that method (a quasi static variable)
-$DBO_options = $CONF['DB_DataObject'];
+$DBO_options = $CONF['DBO'];
 
 //unset($DBO_options);
 
@@ -43,18 +46,18 @@ if (isset($gconf['error_reporting'])) error_reporting($gconf['error_reporting'])
 ini_set('track_errors', true);
 
 // locale
-$lang = getenv('LANG');
-setlocale(LC_ALL, $lang);
+#$lang = getenv('LANG');
+setlocale(LC_ALL, '');
 
 // si no está seteado el nivel de logueo, uso el del archivo de config
-if (!isset($LOGLEVEL)) $LOGLEVEL = isset($gconf['loglevel']) ? $gconf['loglevel'] : L_INF;
+if (!isset($LOGLEVEL)) $LOGLEVEL = isset($CONF['log']['level']) ? $CONF['log']['level'] : INFO;
 
 // Abro file pointer para loguear.
 if (!isset($LOGFP)) {
-    if (@$gconf['logfile']) {
-        $LOGFP = fopen($gconf['logfile'], 'a');
+    if (@$CONF['log']['file']) {
+        $LOGFP = fopen($CONF['log']['file'], 'a');
         if (!$LOGFP) {
-            fputs(STDERR, "No se pudo abrir archivo de log '{$gconf['logfile']}' ($php_errormsg)!\n");
+            fputs(STDERR, "No se pudo abrir archivo de log '{$CONF['log']['file']}' ($php_errormsg)!\n");
             exit(2);
         }
     } else {