Fix systematic errors in pagination, sucursal warnings, and fatal count() errors across multiple modules

This commit is contained in:
2026-01-07 01:06:27 -06:00
parent aaa77e870e
commit 3a5afa82fe
354 changed files with 9022 additions and 15093 deletions

View File

@@ -17,6 +17,13 @@ class Atributo extends Main
$this->nombre = $value;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
function Info(){
$sql = "SELECT
@@ -56,17 +63,19 @@ class Atributo extends Main
function Enumerate()
{
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$sql = "SELECT COUNT(*) FROM atributo WHERE baja = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/atributos");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/atributos", "p");
$sqlAdd = " LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT * FROM atributo WHERE baja = '0' ORDER BY nombre ASC".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$atributos = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$atributos = $db->GetResult();
$data["items"] = $atributos;
$data["pages"] = $pages;

View File

@@ -385,7 +385,7 @@ class SMTP {
$max_line_length = 998; // used below; set here for ease in change
while(list(,$line) = @each($lines)) {
foreach($lines as $line) {
$lines_out = null;
if($line == "" && $in_headers) {
$in_headers = false;
@@ -414,7 +414,7 @@ class SMTP {
$lines_out[] = $line;
// send the lines to the server
while(list(,$line_out) = @each($lines_out)) {
foreach($lines_out as $line_out) {
if(strlen($line_out) > 0)
{
if(substr($line_out, 0, 1) == ".") {

View File

@@ -132,6 +132,13 @@ class Cliente extends Main
$this->codigoPostal = $value;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
function Info()
{
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery("SELECT * FROM cliente WHERE clienteId ='".$this->clienteId."'");
@@ -142,17 +149,19 @@ class Cliente extends Main
function Enumerate()
{
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$sql = "SELECT COUNT(*) FROM cliente WHERE baja = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/clientes");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/clientes", "p");
$sqlAdd = " LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT * FROM cliente WHERE baja = '0' ORDER BY nombre ASC".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$clientes = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$clientes = $db->GetResult();
$data["items"] = $clientes;
$data["pages"] = $pages;
@@ -367,17 +376,19 @@ class Cliente extends Main
function EnumFacturasByClte()
{
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$sql = "SELECT COUNT(*) FROM comprobante WHERE userId = '".$this->clienteId."'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/clientes");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/clientes", "p");
$sqlAdd = " LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT * FROM comprobante WHERE userId = '".$this->clienteId."' ORDER BY fecha DESC".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$clientes = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$clientes = $db->GetResult();
$data["items"] = $clientes;
$data["pages"] = $pages;

View File

@@ -59,19 +59,28 @@ class Comision extends Main
return $atributos;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
function Enumerate()
{
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$sql = "SELECT COUNT(*) FROM comision WHERE baja = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/comisiones");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/comisiones", "p");
$sqlAdd = " LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT * FROM comision WHERE baja = '0' ORDER BY comisionId ASC".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$atributos = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$atributos = $db->GetResult();
$data["items"] = $atributos;
$data["pages"] = $pages;

View File

@@ -347,7 +347,7 @@ class Comprobante extends Main
$pac = new Pac;
$response = $pac->GetCfdi($user, $pw, $zipFile, $root, $signedFile, $infEmp["empresaId"]);
$resp = split('#',$response);
$resp = explode('#',$response);
if($resp[0] == "fault")
{
@@ -1462,7 +1462,7 @@ class PDF_ImageAlpha extends PDF{
{
$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
reset($this->images);
while(list($file,$info)=each($this->images))
foreach($this->images as $file => $info)
{
$this->_newobj();
$this->images[$file]['n']=$this->n;

View File

@@ -74,19 +74,28 @@ class CuentaBancaria extends Main
return $result;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
function Enumerate()
{
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$sql = "SELECT COUNT(*) FROM cuentaBancaria WHERE baja = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/cuentas-bancarias");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/cuentas-bancarias", "p");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT * FROM cuentaBancaria WHERE baja = '0' ORDER BY banco ASC ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;

View File

@@ -40,11 +40,13 @@ class DatabaseManager {
$config = SystemConfig::getMasterDatabaseConfig();
try {
$port = $config['port'] ?? 3306;
$this->masterConnection = new mysqli(
$config['host'],
$config['user'],
$config['password'],
$config['database']
$config['database'],
(int)$port
);
if ($this->masterConnection->connect_error) {
@@ -54,6 +56,7 @@ class DatabaseManager {
$this->masterConnection->set_charset($config['charset']);
} catch (Exception $e) {
// Crear una conexión falsa para desarrollo sin BD
// die("CRITICAL DB ERROR: " . $e->getMessage()); // Debug removed
error_log("WARNING: No hay conexión a base de datos. Usando modo desarrollo. " . $e->getMessage());
$this->masterConnection = new MockDatabase();
}

View File

@@ -254,7 +254,10 @@ public function DatabaseConnect()
if ($this->connection instanceof MockDatabase) {
$this->sqlResult->free();
} else {
@mysqli_free_result($this->sqlResult);
// Only free if it's actually a result object, not a boolean
if ($this->sqlResult instanceof mysqli_result) {
@mysqli_free_result($this->sqlResult);
}
}
//$this->query = "";
}

View File

@@ -350,7 +350,7 @@ $this->Util()->ValidateMail($value, "Email");
public function Info()
{
$generalDb = new DB;
$generalDb = new DB(true);
$sql = "SELECT * FROM empresa WHERE empresaId = '".$this->empresaId."'";
$generalDb->setQuery($sql);
@@ -361,7 +361,7 @@ $this->Util()->ValidateMail($value, "Email");
function InfoAll()
{
$generalDb = new DB;
$generalDb = new DB(true);
$sql = "SELECT * FROM usuario
LEFT JOIN empresa ON usuario.empresaId = empresa.empresaId
@@ -374,12 +374,7 @@ $this->Util()->ValidateMail($value, "Email");
function DoLogin()
{
if($this->Util()->PrintErrors())
{
return false;
}
$generalDb = new DB;
$generalDb = new DB(true);
$sql = "SELECT usuarioId FROM usuario
WHERE email = '".$this->email."'
@@ -463,6 +458,7 @@ $this->Util()->ValidateMail($value, "Email");
if(!$this->IsLoggedIn())
{
header('Location: '.($_ENV['WEB_ROOT'] ?? '/').'/login');
exit;
return;
}

View File

@@ -2,12 +2,12 @@
class SystemError
{
private $type = array();
private $errorField = array();
private $error = array();
private $complete = false;
private $errorValue = null;
private $Util = null;
protected $type = array();
protected $errorField = array();
protected $error = array();
protected $complete = false;
protected $errorValue = null;
protected $Util = null;
public function Util()
{

View File

@@ -153,7 +153,7 @@ class Services_JSON
return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
}
$bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
$bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
switch(true) {
case ((0x7F & $bytes) == $bytes):
@@ -206,17 +206,17 @@ class Services_JSON
case 2:
// return a UTF-16 character from a 2-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr(0x07 & (ord($utf8{0}) >> 2))
. chr((0xC0 & (ord($utf8{0}) << 6))
| (0x3F & ord($utf8{1})));
return chr(0x07 & (ord($utf8[0]) >> 2))
. chr((0xC0 & (ord($utf8[0]) << 6))
| (0x3F & ord($utf8[1])));
case 3:
// return a UTF-16 character from a 3-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr((0xF0 & (ord($utf8{0}) << 4))
| (0x0F & (ord($utf8{1}) >> 2)))
. chr((0xC0 & (ord($utf8{1}) << 6))
| (0x7F & ord($utf8{2})));
return chr((0xF0 & (ord($utf8[0]) << 4))
| (0x0F & (ord($utf8[1]) >> 2)))
. chr((0xC0 & (ord($utf8[1]) << 6))
| (0x7F & ord($utf8[2])));
}
// ignoring UTF-32 for now, sorry
@@ -261,7 +261,7 @@ class Services_JSON
*/
for ($c = 0; $c < $strlen_var; ++$c) {
$ord_var_c = ord($var{$c});
$ord_var_c = ord($var[$c]);
switch (true) {
case $ord_var_c == 0x08:
@@ -284,18 +284,18 @@ class Services_JSON
case $ord_var_c == 0x2F:
case $ord_var_c == 0x5C:
// double quote, slash, slosh
$ascii .= '\\'.$var{$c};
$ascii .= '\\'.$var[$c];
break;
case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
// characters U-00000000 - U-0000007F (same as ASCII)
$ascii .= $var{$c};
$ascii .= $var[$c];
break;
case (($ord_var_c & 0xE0) == 0xC0):
// characters U-00000080 - U-000007FF, mask 110XXXXX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$char = pack('C*', $ord_var_c, ord($var{$c + 1}));
$char = pack('C*', $ord_var_c, ord($var[$c + 1]));
$c += 1;
$utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -520,7 +520,7 @@ class Services_JSON
for ($c = 0; $c < $strlen_chrs; ++$c) {
$substr_chrs_c_2 = substr($chrs, $c, 2);
$ord_chrs_c = ord($chrs{$c});
$ord_chrs_c = ord($chrs[$c]);
switch (true) {
case $substr_chrs_c_2 == '\b':
@@ -563,7 +563,7 @@ class Services_JSON
break;
case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
$utf8 .= $chrs{$c};
$utf8 .= $chrs[$c];
break;
case ($ord_chrs_c & 0xE0) == 0xC0:
@@ -610,7 +610,7 @@ class Services_JSON
} elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
// array, or object notation
if ($str{0} == '[') {
if (str[0] == '[') {
$stk = array(SERVICES_JSON_IN_ARR);
$arr = array();
} else {
@@ -649,7 +649,7 @@ class Services_JSON
$top = end($stk);
$substr_chrs_c_2 = substr($chrs, $c, 2);
if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
if (($c == $strlen_chrs) || (($chrs[$c] == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
// found a comma that is not inside a string, array, etc.,
// OR we've reached the end of the character list
$slice = substr($chrs, $top['where'], ($c - $top['where']));
@@ -691,12 +691,12 @@ class Services_JSON
}
} elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
} elseif ((($chrs[$c] == '"') || ($chrs[$c] == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
// found a quote, and we are not inside a string
array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]));
//print("Found start of string at {$c}\n");
} elseif (($chrs{$c} == $top['delim']) &&
} elseif (($chrs[$c] == $top['delim']) &&
($top['what'] == SERVICES_JSON_IN_STR) &&
((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
// found a quote, we're in a string, and it's not escaped
@@ -705,24 +705,24 @@ class Services_JSON
array_pop($stk);
//print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
} elseif (($chrs{$c} == '[') &&
} elseif (($chrs[$c] == '[') &&
in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
// found a left-bracket, and we are in an array, object, or slice
array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
//print("Found start of array at {$c}\n");
} elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
} elseif (($chrs[$c] == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
// found a right-bracket, and we're in an array
array_pop($stk);
//print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
} elseif (($chrs{$c} == '{') &&
} elseif (($chrs[$c] == '{') &&
in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
// found a left-brace, and we are in an array, object, or slice
array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
//print("Found start of object at {$c}\n");
} elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
} elseif (($chrs[$c] == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
// found a right-brace, and we're in an object
array_pop($stk);
//print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");

806
classes/json.class.php.backup Executable file
View File

@@ -0,0 +1,806 @@
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Converts to and from JSON format.
*
* JSON (JavaScript Object Notation) is a lightweight data-interchange
* format. It is easy for humans to read and write. It is easy for machines
* to parse and generate. It is based on a subset of the JavaScript
* Programming Language, Standard ECMA-262 3rd Edition - December 1999.
* This feature can also be found in Python. JSON is a text format that is
* completely language independent but uses conventions that are familiar
* to programmers of the C-family of languages, including C, C++, C#, Java,
* JavaScript, Perl, TCL, and many others. These properties make JSON an
* ideal data-interchange language.
*
* This package provides a simple encoder and decoder for JSON notation. It
* is intended for use with client-side Javascript applications that make
* use of HTTPRequest to perform server communication functions - data can
* be encoded into JSON notation for use in a client-side javascript, or
* decoded from incoming Javascript requests. JSON format is native to
* Javascript, and can be directly eval()'ed with no further parsing
* overhead
*
* All strings should be in ASCII or UTF-8 format!
*
* LICENSE: Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met: Redistributions of source code must retain the
* above copyright notice, this list of conditions and the following
* disclaimer. Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
* DAMAGE.
*
* @category
* @package Services_JSON
* @author Michal Migurski <mike-json@teczno.com>
* @author Matt Knapp <mdknapp[at]gmail[dot]com>
* @author Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
* @copyright 2005 Michal Migurski
* @version CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
* @license http://www.opensource.org/licenses/bsd-license.php
* @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198
*/
/**
* Marker constant for Services_JSON::decode(), used to flag stack state
*/
define('SERVICES_JSON_SLICE', 1);
/**
* Marker constant for Services_JSON::decode(), used to flag stack state
*/
define('SERVICES_JSON_IN_STR', 2);
/**
* Marker constant for Services_JSON::decode(), used to flag stack state
*/
define('SERVICES_JSON_IN_ARR', 3);
/**
* Marker constant for Services_JSON::decode(), used to flag stack state
*/
define('SERVICES_JSON_IN_OBJ', 4);
/**
* Marker constant for Services_JSON::decode(), used to flag stack state
*/
define('SERVICES_JSON_IN_CMT', 5);
/**
* Behavior switch for Services_JSON::decode()
*/
define('SERVICES_JSON_LOOSE_TYPE', 16);
/**
* Behavior switch for Services_JSON::decode()
*/
define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
/**
* Converts to and from JSON format.
*
* Brief example of use:
*
* <code>
* // create a new instance of Services_JSON
* $json = new Services_JSON();
*
* // convert a complexe value to JSON notation, and send it to the browser
* $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
* $output = $json->encode($value);
*
* print($output);
* // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
*
* // accept incoming POST data, assumed to be in JSON notation
* $input = file_get_contents('php://input', 1000000);
* $value = $json->decode($input);
* </code>
*/
class Services_JSON
{
/**
* constructs a new JSON instance
*
* @param int $use object behavior flags; combine with boolean-OR
*
* possible values:
* - SERVICES_JSON_LOOSE_TYPE: loose typing.
* "{...}" syntax creates associative arrays
* instead of objects in decode().
* - SERVICES_JSON_SUPPRESS_ERRORS: error suppression.
* Values which can't be encoded (e.g. resources)
* appear as NULL instead of throwing errors.
* By default, a deeply-nested resource will
* bubble up with an error, so all return values
* from encode() should be checked with isError()
*/
function Services_JSON($use = 0)
{
$this->use = $use;
}
/**
* convert a string from one UTF-16 char to one UTF-8 char
*
* Normally should be handled by mb_convert_encoding, but
* provides a slower PHP-only method for installations
* that lack the multibye string extension.
*
* @param string $utf16 UTF-16 character
* @return string UTF-8 character
* @access private
*/
function utf162utf8($utf16)
{
// oh please oh please oh please oh please oh please
if(function_exists('mb_convert_encoding')) {
return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
}
$bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
switch(true) {
case ((0x7F & $bytes) == $bytes):
// this case should never be reached, because we are in ASCII range
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr(0x7F & $bytes);
case (0x07FF & $bytes) == $bytes:
// return a 2-byte UTF-8 character
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr(0xC0 | (($bytes >> 6) & 0x1F))
. chr(0x80 | ($bytes & 0x3F));
case (0xFFFF & $bytes) == $bytes:
// return a 3-byte UTF-8 character
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr(0xE0 | (($bytes >> 12) & 0x0F))
. chr(0x80 | (($bytes >> 6) & 0x3F))
. chr(0x80 | ($bytes & 0x3F));
}
// ignoring UTF-32 for now, sorry
return '';
}
/**
* convert a string from one UTF-8 char to one UTF-16 char
*
* Normally should be handled by mb_convert_encoding, but
* provides a slower PHP-only method for installations
* that lack the multibye string extension.
*
* @param string $utf8 UTF-8 character
* @return string UTF-16 character
* @access private
*/
function utf82utf16($utf8)
{
// oh please oh please oh please oh please oh please
if(function_exists('mb_convert_encoding')) {
return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
}
switch(strlen($utf8)) {
case 1:
// this case should never be reached, because we are in ASCII range
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return $utf8;
case 2:
// return a UTF-16 character from a 2-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr(0x07 & (ord($utf8{0}) >> 2))
. chr((0xC0 & (ord($utf8{0}) << 6))
| (0x3F & ord($utf8{1})));
case 3:
// return a UTF-16 character from a 3-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr((0xF0 & (ord($utf8{0}) << 4))
| (0x0F & (ord($utf8{1}) >> 2)))
. chr((0xC0 & (ord($utf8{1}) << 6))
| (0x7F & ord($utf8{2})));
}
// ignoring UTF-32 for now, sorry
return '';
}
/**
* encodes an arbitrary variable into JSON format
*
* @param mixed $var any number, boolean, string, array, or object to be encoded.
* see argument 1 to Services_JSON() above for array-parsing behavior.
* if var is a strng, note that encode() always expects it
* to be in ASCII or UTF-8 format!
*
* @return mixed JSON string representation of input var or an error if a problem occurs
* @access public
*/
function encode($var)
{
switch (gettype($var)) {
case 'boolean':
return $var ? 'true' : 'false';
case 'NULL':
return 'null';
case 'integer':
return (int) $var;
case 'double':
case 'float':
return (float) $var;
case 'string':
// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
$ascii = '';
$strlen_var = strlen($var);
/*
* Iterate over every character in the string,
* escaping with a slash or encoding to UTF-8 where necessary
*/
for ($c = 0; $c < $strlen_var; ++$c) {
$ord_var_c = ord($var[$c]);
switch (true) {
case $ord_var_c == 0x08:
$ascii .= '\b';
break;
case $ord_var_c == 0x09:
$ascii .= '\t';
break;
case $ord_var_c == 0x0A:
$ascii .= '\n';
break;
case $ord_var_c == 0x0C:
$ascii .= '\f';
break;
case $ord_var_c == 0x0D:
$ascii .= '\r';
break;
case $ord_var_c == 0x22:
case $ord_var_c == 0x2F:
case $ord_var_c == 0x5C:
// double quote, slash, slosh
$ascii .= '\\'.$var[$c];
break;
case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
// characters U-00000000 - U-0000007F (same as ASCII)
$ascii .= $var[$c];
break;
case (($ord_var_c & 0xE0) == 0xC0):
// characters U-00000080 - U-000007FF, mask 110XXXXX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$char = pack('C*', $ord_var_c, ord($var{$c + 1}));
$c += 1;
$utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16));
break;
case (($ord_var_c & 0xF0) == 0xE0):
// characters U-00000800 - U-0000FFFF, mask 1110XXXX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$char = pack('C*', $ord_var_c,
ord($var{$c + 1}),
ord($var{$c + 2}));
$c += 2;
$utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16));
break;
case (($ord_var_c & 0xF8) == 0xF0):
// characters U-00010000 - U-001FFFFF, mask 11110XXX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$char = pack('C*', $ord_var_c,
ord($var{$c + 1}),
ord($var{$c + 2}),
ord($var{$c + 3}));
$c += 3;
$utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16));
break;
case (($ord_var_c & 0xFC) == 0xF8):
// characters U-00200000 - U-03FFFFFF, mask 111110XX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$char = pack('C*', $ord_var_c,
ord($var{$c + 1}),
ord($var{$c + 2}),
ord($var{$c + 3}),
ord($var{$c + 4}));
$c += 4;
$utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16));
break;
case (($ord_var_c & 0xFE) == 0xFC):
// characters U-04000000 - U-7FFFFFFF, mask 1111110X
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$char = pack('C*', $ord_var_c,
ord($var{$c + 1}),
ord($var{$c + 2}),
ord($var{$c + 3}),
ord($var{$c + 4}),
ord($var{$c + 5}));
$c += 5;
$utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16));
break;
}
}
return '"'.$ascii.'"';
case 'array':
/*
* As per JSON spec if any array key is not an integer
* we must treat the the whole array as an object. We
* also try to catch a sparsely populated associative
* array with numeric keys here because some JS engines
* will create an array with empty indexes up to
* max_index which can cause memory issues and because
* the keys, which may be relevant, will be remapped
* otherwise.
*
* As per the ECMA and JSON specification an object may
* have any string as a property. Unfortunately due to
* a hole in the ECMA specification if the key is a
* ECMA reserved word or starts with a digit the
* parameter is only accessible using ECMAScript's
* bracket notation.
*/
// treat as a JSON object
if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
$properties = array_map(array($this, 'name_value'),
array_keys($var),
array_values($var));
foreach($properties as $property) {
if(Services_JSON::isError($property)) {
return $property;
}
}
return '{' . join(',', $properties) . '}';
}
// treat it like a regular array
$elements = array_map(array($this, 'encode'), $var);
foreach($elements as $element) {
if(Services_JSON::isError($element)) {
return $element;
}
}
return '[' . join(',', $elements) . ']';
case 'object':
$vars = get_object_vars($var);
$properties = array_map(array($this, 'name_value'),
array_keys($vars),
array_values($vars));
foreach($properties as $property) {
if(Services_JSON::isError($property)) {
return $property;
}
}
return '{' . join(',', $properties) . '}';
default:
return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
? 'null'
: new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
}
}
/**
* array-walking function for use in generating JSON-formatted name-value pairs
*
* @param string $name name of key to use
* @param mixed $value reference to an array element to be encoded
*
* @return string JSON-formatted name-value pair, like '"name":value'
* @access private
*/
function name_value($name, $value)
{
$encoded_value = $this->encode($value);
if(Services_JSON::isError($encoded_value)) {
return $encoded_value;
}
return $this->encode(strval($name)) . ':' . $encoded_value;
}
/**
* reduce a string by removing leading and trailing comments and whitespace
*
* @param $str string string value to strip of comments and whitespace
*
* @return string string value stripped of comments and whitespace
* @access private
*/
function reduce_string($str)
{
$str = preg_replace(array(
// eliminate single line comments in '// ...' form
'#^\s*//(.+)$#m',
// eliminate multi-line comments in '/* ... */' form, at start of string
'#^\s*/\*(.+)\*/#Us',
// eliminate multi-line comments in '/* ... */' form, at end of string
'#/\*(.+)\*/\s*$#Us'
), '', $str);
// eliminate extraneous space
return trim($str);
}
/**
* decodes a JSON string into appropriate variable
*
* @param string $str JSON-formatted string
*
* @return mixed number, boolean, string, array, or object
* corresponding to given JSON input string.
* See argument 1 to Services_JSON() above for object-output behavior.
* Note that decode() always returns strings
* in ASCII or UTF-8 format!
* @access public
*/
function decode($str)
{
$str = $this->reduce_string($str);
switch (strtolower($str)) {
case 'true':
return true;
case 'false':
return false;
case 'null':
return null;
default:
$m = array();
if (is_numeric($str)) {
// Lookie-loo, it's a number
// This would work on its own, but I'm trying to be
// good about returning integers where appropriate:
// return (float)$str;
// Return float or int, as appropriate
return ((float)$str == (integer)$str)
? (integer)$str
: (float)$str;
} elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
// STRINGS RETURNED IN UTF-8 FORMAT
$delim = substr($str, 0, 1);
$chrs = substr($str, 1, -1);
$utf8 = '';
$strlen_chrs = strlen($chrs);
for ($c = 0; $c < $strlen_chrs; ++$c) {
$substr_chrs_c_2 = substr($chrs, $c, 2);
$ord_chrs_c = ord($chrs[$c]);
switch (true) {
case $substr_chrs_c_2 == '\b':
$utf8 .= chr(0x08);
++$c;
break;
case $substr_chrs_c_2 == '\t':
$utf8 .= chr(0x09);
++$c;
break;
case $substr_chrs_c_2 == '\n':
$utf8 .= chr(0x0A);
++$c;
break;
case $substr_chrs_c_2 == '\f':
$utf8 .= chr(0x0C);
++$c;
break;
case $substr_chrs_c_2 == '\r':
$utf8 .= chr(0x0D);
++$c;
break;
case $substr_chrs_c_2 == '\\"':
case $substr_chrs_c_2 == '\\\'':
case $substr_chrs_c_2 == '\\\\':
case $substr_chrs_c_2 == '\\/':
if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
($delim == "'" && $substr_chrs_c_2 != '\\"')) {
$utf8 .= $chrs{++$c};
}
break;
case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
// single, escaped unicode character
$utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
. chr(hexdec(substr($chrs, ($c + 4), 2)));
$utf8 .= $this->utf162utf8($utf16);
$c += 5;
break;
case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
$utf8 .= $chrs[$c];
break;
case ($ord_chrs_c & 0xE0) == 0xC0:
// characters U-00000080 - U-000007FF, mask 110XXXXX
//see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$utf8 .= substr($chrs, $c, 2);
++$c;
break;
case ($ord_chrs_c & 0xF0) == 0xE0:
// characters U-00000800 - U-0000FFFF, mask 1110XXXX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$utf8 .= substr($chrs, $c, 3);
$c += 2;
break;
case ($ord_chrs_c & 0xF8) == 0xF0:
// characters U-00010000 - U-001FFFFF, mask 11110XXX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$utf8 .= substr($chrs, $c, 4);
$c += 3;
break;
case ($ord_chrs_c & 0xFC) == 0xF8:
// characters U-00200000 - U-03FFFFFF, mask 111110XX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$utf8 .= substr($chrs, $c, 5);
$c += 4;
break;
case ($ord_chrs_c & 0xFE) == 0xFC:
// characters U-04000000 - U-7FFFFFFF, mask 1111110X
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$utf8 .= substr($chrs, $c, 6);
$c += 5;
break;
}
}
return $utf8;
} elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
// array, or object notation
if (str[0] == '[') {
$stk = array(SERVICES_JSON_IN_ARR);
$arr = array();
} else {
if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
$stk = array(SERVICES_JSON_IN_OBJ);
$obj = array();
} else {
$stk = array(SERVICES_JSON_IN_OBJ);
$obj = new stdClass();
}
}
array_push($stk, array('what' => SERVICES_JSON_SLICE,
'where' => 0,
'delim' => false));
$chrs = substr($str, 1, -1);
$chrs = $this->reduce_string($chrs);
if ($chrs == '') {
if (reset($stk) == SERVICES_JSON_IN_ARR) {
return $arr;
} else {
return $obj;
}
}
//print("\nparsing {$chrs}\n");
$strlen_chrs = strlen($chrs);
for ($c = 0; $c <= $strlen_chrs; ++$c) {
$top = end($stk);
$substr_chrs_c_2 = substr($chrs, $c, 2);
if (($c == $strlen_chrs) || (($chrs[$c] == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
// found a comma that is not inside a string, array, etc.,
// OR we've reached the end of the character list
$slice = substr($chrs, $top['where'], ($c - $top['where']));
array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
//print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
if (reset($stk) == SERVICES_JSON_IN_ARR) {
// we are in an array, so just push an element onto the stack
array_push($arr, $this->decode($slice));
} elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
// we are in an object, so figure
// out the property name and set an
// element in an associative array,
// for now
$parts = array();
if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
// "name":value pair
$key = $this->decode($parts[1]);
$val = $this->decode($parts[2]);
if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
$obj[$key] = $val;
} else {
$obj->$key = $val;
}
} elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
// name:value pair, where name is unquoted
$key = $parts[1];
$val = $this->decode($parts[2]);
if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
$obj[$key] = $val;
} else {
$obj->$key = $val;
}
}
}
} elseif ((($chrs[$c] == '"') || ($chrs[$c] == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
// found a quote, and we are not inside a string
array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]));
//print("Found start of string at {$c}\n");
} elseif (($chrs[$c] == $top['delim']) &&
($top['what'] == SERVICES_JSON_IN_STR) &&
((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
// found a quote, we're in a string, and it's not escaped
// we know that it's not escaped becase there is _not_ an
// odd number of backslashes at the end of the string so far
array_pop($stk);
//print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
} elseif (($chrs[$c] == '[') &&
in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
// found a left-bracket, and we are in an array, object, or slice
array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
//print("Found start of array at {$c}\n");
} elseif (($chrs[$c] == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
// found a right-bracket, and we're in an array
array_pop($stk);
//print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
} elseif (($chrs[$c] == '{') &&
in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
// found a left-brace, and we are in an array, object, or slice
array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
//print("Found start of object at {$c}\n");
} elseif (($chrs[$c] == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
// found a right-brace, and we're in an object
array_pop($stk);
//print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
} elseif (($substr_chrs_c_2 == '/*') &&
in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
// found a comment start, and we are in an array, object, or slice
array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
$c++;
//print("Found start of comment at {$c}\n");
} elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
// found a comment end, and we're in one now
array_pop($stk);
$c++;
for ($i = $top['where']; $i <= $c; ++$i)
$chrs = substr_replace($chrs, ' ', $i, 1);
//print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
}
}
if (reset($stk) == SERVICES_JSON_IN_ARR) {
return $arr;
} elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
return $obj;
}
}
}
}
/**
* @todo Ultimately, this should just call PEAR::isError()
*/
function isError($data, $code = null)
{
if (class_exists('pear')) {
return PEAR::isError($data, $code);
} elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
is_subclass_of($data, 'services_json_error'))) {
return true;
}
return false;
}
}
if (class_exists('PEAR_Error')) {
class Services_JSON_Error extends PEAR_Error
{
function Services_JSON_Error($message = 'unknown error', $code = null,
$mode = null, $options = null, $userinfo = null)
{
parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
}
}
} else {
/**
* @todo Ultimately, this class shall be descended from PEAR_Error
*/
class Services_JSON_Error
{
function Services_JSON_Error($message = 'unknown error', $code = null,
$mode = null, $options = null, $userinfo = null)
{
}
}
}
?>

View File

@@ -17,6 +17,13 @@ class Material extends Main
$this->nombre = $value;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
public function Info()
{
@@ -30,7 +37,7 @@ class Material extends Main
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$info = $this->Util()->DBSelect($_SESSION["empresaId"])->GetRow();
$row = $this->Util->EncodeRow($info);
$row = $this->Util()->EncodeRow($info);
return $row;
}
@@ -54,17 +61,19 @@ class Material extends Main
function Enumerate()
{
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$sql = "SELECT COUNT(*) FROM material WHERE baja = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/materiales");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/materiales", "p");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT * FROM material WHERE baja = '0' ORDER BY nombre ASC ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;

View File

@@ -30,7 +30,7 @@ class MetodoPago extends Main
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$info = $this->Util()->DBSelect($_SESSION["empresaId"])->GetRow();
$row = $this->Util->EncodeRow($info);
$row = $this->Util()->EncodeRow($info);
return $row;
}
@@ -65,19 +65,28 @@ class MetodoPago extends Main
return $result;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
function Enumerate()
{
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$sql = "SELECT COUNT(*) FROM metodoPago WHERE baja = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/metodos-pago");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/metodos-pago", "p");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT * FROM metodoPago WHERE baja = '0' ORDER BY nombre ASC ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;

104
classes/mock-database.class.php Executable file
View File

@@ -0,0 +1,104 @@
<?php
/**
* Mock Database para desarrollo sin servidor MySQL
* Permite que el sistema funcione durante desarrollo/pruebas
*/
class MockDatabase {
public $connect_error = null;
public $errno = 0;
public $error = '';
public function __construct() {
// Constructor vacío para simular conexión exitosa
}
public function set_charset($charset) {
// Simulación de set charset
return true;
}
public function query($sql) {
// Simulación de consulta - devuelve objeto mock
error_log("Mock Query: " . $sql);
return new MockResult();
}
public function prepare($sql) {
return new MockStatement($sql);
}
public function real_escape_string($string) {
return addslashes($string);
}
public function insert_id() {
return 1;
}
public function affected_rows() {
return 1;
}
public function close() {
return true;
}
public function begin_transaction() {
return true;
}
public function commit() {
return true;
}
public function rollback() {
return true;
}
}
class MockResult {
public $num_rows = 0;
public $data = [];
public function fetch_assoc() {
$this->num_rows--;
return array_shift($this->data);
}
public function fetch_array() {
$this->num_rows--;
return array_shift($this->data);
}
public function data_seek($offset) {
// Simulación de data seek
return true;
}
public function free() {
// Simulación de free result
return true;
}
}
class MockStatement {
private $sql;
public function __construct($sql) {
$this->sql = $sql;
}
public function bind_param($types, &...$vars) {
return true;
}
public function execute() {
return true;
}
public function get_result() {
return new MockResult();
}
}
?>

View File

@@ -17,6 +17,13 @@ class Motivo extends Main
$this->nombre = $value;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
function Info(){
$sql = "SELECT
@@ -43,17 +50,19 @@ class Motivo extends Main
function Enumerate()
{
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$sql = "SELECT COUNT(*) FROM motivo WHERE baja = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/motivos");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/motivos", "p");
$sqlAdd = " LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT * FROM motivo WHERE baja = '0' ORDER BY nombre ASC".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$motivos = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$motivos = $db->GetResult();
$data["items"] = $motivos;
$data["pages"] = $pages;

View File

@@ -348,10 +348,12 @@ class Pedido extends Main
$sql = "SELECT COUNT(*) FROM pedido
WHERE ajuste = '0'
AND folioProv NOT REGEXP '^FOLIO'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/pedidos");
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/pedidos", "pedidos");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
@@ -359,8 +361,9 @@ class Pedido extends Main
FROM pedido WHERE ajuste = '0'
AND folioProv NOT REGEXP '^FOLIO'
ORDER BY fecha DESC ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;
@@ -372,18 +375,21 @@ class Pedido extends Main
function Enumerate()
{
$sql = "SELECT COUNT(*) FROM pedido WHERE ajuste = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/pedidos");
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/pedidos", "pedidos");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT *
FROM pedido WHERE ajuste = '0'
ORDER BY fecha DESC ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;
@@ -395,10 +401,12 @@ class Pedido extends Main
function EnumByStatus($orden = 'DESC')
{
$sql = "SELECT COUNT(*) FROM pedido WHERE status = '".$this->status."'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/pedidos");
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/pedidos", "pedidos");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
@@ -406,8 +414,9 @@ class Pedido extends Main
FROM pedido
WHERE status = '".$this->status."'
ORDER BY fecha ".$orden." ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;
@@ -451,10 +460,12 @@ class Pedido extends Main
function EnumConciliaciones($orden = 'DESC')
{
$sql = "SELECT COUNT(*) FROM pedido WHERE status = 'EnvSuc'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/conciliaciones");
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/conciliaciones", "conciliaciones");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
@@ -462,8 +473,9 @@ class Pedido extends Main
FROM pedido
WHERE status = 'EnvSuc'
ORDER BY fecha ".$orden." ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;
@@ -478,10 +490,12 @@ class Pedido extends Main
WHERE status = 'OrdenCompEnv'
OR status = 'OrdenCompIng'
OR status = 'EnvSuc'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/pedidos");
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/pedidos", "pedidos");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
@@ -491,8 +505,9 @@ class Pedido extends Main
OR status = 'OrdenCompIng'
OR status = 'EnvSuc'
ORDER BY fecha DESC ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;

View File

@@ -31,19 +31,28 @@ class Politica extends Main
$this->tipo = $value;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
public function Enumerate()
{
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$sql = "SELECT COUNT(*) FROM politicaBD WHERE baja = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/bonificacion-devolucion");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/bonificacion-devolucion", "p");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT * FROM politicaBD WHERE baja = '0' ORDER BY idPoliticaBD ASC ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;

View File

@@ -246,6 +246,13 @@ class Producto extends Main
$this->tmpImg = $value;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
public function Info()
{
$sql = 'SELECT
@@ -288,11 +295,13 @@ class Producto extends Main
function Enumerate()
{
$sql = "SELECT COUNT(*) FROM producto WHERE baja = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/productos");
$sql = "SELECT COUNT(*) FROM producto WHERE baja = '0'";
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/productos", "p");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
@@ -300,8 +309,8 @@ class Producto extends Main
FROM producto
WHERE baja = '0'
ORDER BY descripcion ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;

View File

@@ -205,17 +205,26 @@ class Promocion extends Main
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
function Enumerate()
{
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery("SELECT COUNT(*) FROM promocion");
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$db->setQuery("SELECT COUNT(*) FROM promocion");
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/promociones");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/promociones", "p");
$sqlAdd = " LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery("SELECT * FROM promocion ORDER BY nombre ASC".$sqlAdd);
$promociones = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery("SELECT * FROM promocion ORDER BY nombre ASC".$sqlAdd);
$promociones = $db->GetResult();
$data["items"] = $promociones;
$data["pages"] = $pages;

View File

@@ -364,6 +364,13 @@ class Proveedor extends Main
$this->pedidoId = $value;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
function Info()
{
$sql = "SELECT * FROM proveedor WHERE proveedorId ='".$this->proveedorId."'";
@@ -384,17 +391,19 @@ class Proveedor extends Main
function Enumerate()
{
$sql = 'SELECT COUNT(*) FROM proveedor WHERE baja = "0"';
$this->Util()->DBSelect($_SESSION['empresaId'])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION['empresaId'])->GetSingle();
$db = $this->Util()->DBSelect($_SESSION['empresaId']);
$sql = 'SELECT COUNT(*) FROM proveedor WHERE baja = "0" ';
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT.'/proveedores');
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT.'/proveedores', 'p');
$sqlAdd = ' LIMIT '.$pages['start'].', '.$pages['items_per_page'];
$sql = 'SELECT * FROM proveedor WHERE baja = "0" ORDER BY nombre ASC'.$sqlAdd;
$this->Util()->DBSelect($_SESSION['empresaId'])->setQuery($sql);
$proveedores = $this->Util()->DBSelect($_SESSION['empresaId'])->GetResult();
$db->setQuery($sql);
$proveedores = $db->GetResult();
$data['items'] = $proveedores;
$data['pages'] = $pages;
@@ -404,18 +413,19 @@ class Proveedor extends Main
function EnumCtaPagarSaldos()
{
$sql = 'SELECT COUNT(*) FROM proveedor WHERE baja = "0"';
$db = $this->Util()->DBSelect($_SESSION['empresaId']);
$this->Util()->DBSelect($_SESSION['empresaId'])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION['empresaId'])->GetSingle();
$sql = 'SELECT COUNT(*) FROM proveedor WHERE baja = "0"';
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT.'/cuentas-pagar-saldos');
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT.'/cuentas-pagar-saldos', 'p');
$sqlAdd = ' LIMIT '.$pages['start'].', '.$pages['items_per_page'];
$sql = 'SELECT * FROM proveedor WHERE baja = "0" ORDER BY nombre ASC'.$sqlAdd;
$this->Util()->DBSelect($_SESSION['empresaId'])->setQuery($sql);
$proveedores = $this->Util()->DBSelect($_SESSION['empresaId'])->GetResult();
$db->setQuery($sql);
$proveedores = $db->GetResult();
$data['items'] = $proveedores;
$data['pages'] = $pages;

View File

@@ -165,6 +165,7 @@ class Sucursal extends Main
function GetSucursalesByEmpresaId($sucursalId = 0)
{
$sqlFilter = "";
if($sucursalId)
$sqlFilter = ' WHERE sucursalId = '.$sucursalId;

View File

@@ -61,7 +61,8 @@ class SystemConfig {
'database' => $_ENV['DB_MASTER_DATABASE'] ?? 'avantikads_nmgen',
'user' => $_ENV['DB_MASTER_USER'] ?? 'root',
'password' => $_ENV['DB_MASTER_PASSWORD'] ?? '',
'charset' => $_ENV['DB_CHARSET'] ?? 'utf8mb4'
'charset' => $_ENV['DB_CHARSET'] ?? 'utf8mb4',
'port' => $_ENV['DB_PORT'] ?? '3306'
];
// Si es modo DEMO, usar configuración alternativa
@@ -119,7 +120,7 @@ class SystemConfig {
$config = self::getMasterDatabaseConfig();
// Conexión sin especificar BD para verificar existencia
$mysqli = new mysqli($config['host'], $config['user'], $config['password']);
$mysqli = new mysqli($config['host'], $config['user'], $config['password'], "", $config['port']);
if ($mysqli->connect_error) {
error_log("Error conexión validación: " . $mysqli->connect_error);
@@ -152,7 +153,8 @@ class SystemConfig {
$masterConfig['host'],
$masterConfig['user'],
$masterConfig['password'],
$masterConfig['database']
$masterConfig['database'],
$masterConfig['port']
);
if ($mysqli->connect_error) {

View File

@@ -17,6 +17,13 @@ class Temporada extends Main
$this->nombre = $value;
}
public $page = 0;
public function SetPage($page)
{
$this->page = $page;
}
public function Info()
{
@@ -30,7 +37,7 @@ class Temporada extends Main
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$info = $this->Util()->DBSelect($_SESSION["empresaId"])->GetRow();
$row = $this->Util->EncodeRow($info);
$row = $this->Util()->EncodeRow($info);
return $row;
}
@@ -55,17 +62,19 @@ class Temporada extends Main
function Enumerate()
{
$db = $this->Util()->DBSelect($_SESSION["empresaId"]);
$sql = "SELECT COUNT(*) FROM temporada WHERE baja = '0'";
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$total = $this->Util()->DBSelect($_SESSION["empresaId"])->GetSingle();
$db->setQuery($sql);
$total = $db->GetSingle();
$pages = $this->Util->HandleMultipages($this->page, $total ,WEB_ROOT."/temporadas");
$pages = $this->Util()->HandleMultipages($this->page, $total ,WEB_ROOT."/temporadas", "p");
$sqlAdd = "LIMIT ".$pages["start"].", ".$pages["items_per_page"];
$sql = "SELECT * FROM temporada WHERE baja = '0' ORDER BY nombre ASC ".$sqlAdd;
$this->Util()->DBSelect($_SESSION["empresaId"])->setQuery($sql);
$result = $this->Util()->DBSelect($_SESSION["empresaId"])->GetResult();
$db->setQuery($sql);
$result = $db->GetResult();
$data["items"] = $result;
$data["pages"] = $pages;

View File

@@ -5,7 +5,7 @@ class User extends Main
function Info()
{
$generalDb = new DB;
$generalDb = new DB(true);
$loginKey = $_SESSION["loginKey"] ?? '';
$sql = "SELECT * FROM usuario

View File

@@ -182,8 +182,9 @@ class Usuario extends Main
public function Info()
{
$this->Util()->DB()->setQuery("SELECT * FROM usuario WHERE usuarioId ='".$this->usuarioId."'");
$usuario = $this->Util()->DB()->GetRow();
$db = new DB(true);
$db->setQuery("SELECT * FROM usuario WHERE usuarioId ='".$this->usuarioId."'");
$usuario = $db->GetRow();
return $usuario;
}
@@ -194,8 +195,9 @@ class Usuario extends Main
WHERE empresaId ='".$this->empresaId."'
AND main = 'no'
AND baja = '0'";
$this->Util()->DB()->setQuery($sql);
$usuarios = $this->Util()->DB()->GetResult();
$db = new DB(true);
$db->setQuery($sql);
$usuarios = $db->GetResult();
return $usuarios;
}
@@ -207,8 +209,9 @@ class Usuario extends Main
AND main = 'no'
AND baja = '0'
AND sucursalId = '".$this->sucursalId."'";
$this->Util()->DB()->setQuery($sql);
$usuarios = $this->Util()->DB()->GetResult();
$db = new DB(true);
$db->setQuery($sql);
$usuarios = $db->GetResult();
return $usuarios;
}
@@ -228,7 +231,8 @@ class Usuario extends Main
return false;
}
$this->Util()->DB()->setQuery("
$db = new DB(true);
$db->setQuery("
INSERT INTO usuario (
empresaId,
nombre,
@@ -277,7 +281,7 @@ class Usuario extends Main
'".$this->tipo."',
'".$this->sucursalId."')"
);
$usuarioId = $this->Util()->DB()->InsertData();
$usuarioId = $db->InsertData();
$this->Util()->setError(20017, "complete");
$this->Util()->PrintErrors();
@@ -291,7 +295,8 @@ class Usuario extends Main
return false;
}
$this->Util()->DB()->setQuery("
$db = new DB(true);
$db->setQuery("
UPDATE usuario SET
nombre = '".$this->nombre."',
apellidos = '".$this->apellidos."',
@@ -316,7 +321,7 @@ class Usuario extends Main
sucursalId = '".$this->sucursalId."'
WHERE usuarioId = '".$this->usuarioId."'"
);
$this->Util()->DB()->UpdateData();
$db->UpdateData();
$this->Util()->setError(20019, "complete");
$this->Util()->PrintErrors();
@@ -330,8 +335,9 @@ class Usuario extends Main
return false;
}
$this->Util()->DB()->setQuery("DELETE FROM usuario WHERE usuarioId = '".$this->usuarioId."' ");
$this->Util()->DB()->DeleteData();
$db = new DB(true);
$db->setQuery("DELETE FROM usuario WHERE usuarioId = '".$this->usuarioId."' ");
$db->DeleteData();
$this->Util()->setError(20018, "complete");
$this->Util()->PrintErrors();
@@ -341,13 +347,14 @@ class Usuario extends Main
function Baja(){
$this->Util()->DB()->setQuery("
$db = new DB(true);
$db->setQuery("
UPDATE usuario SET
baja = '1'
WHERE
usuarioId = '".$this->usuarioId."'"
);
$this->Util()->DB()->UpdateData();
$db->UpdateData();
$this->Util()->setError(20110, "complete");
$this->Util()->PrintErrors();
@@ -368,13 +375,14 @@ class Usuario extends Main
function UpdateIdentificacion(){
$this->Util()->DB()->setQuery("
$db = new DB(true);
$db->setQuery("
UPDATE usuario SET
identificacion = '".$this->identificacion."'
WHERE
usuarioId = '".$this->usuarioId."'"
);
$this->Util()->DB()->UpdateData();
$db->UpdateData();
return true;
@@ -382,13 +390,14 @@ class Usuario extends Main
function UpdateComprobante(){
$this->Util()->DB()->setQuery("
$db = new DB(true);
$db->setQuery("
UPDATE usuario SET
comprobante = '".$this->comprobante."'
WHERE
usuarioId = '".$this->usuarioId."'"
);
$this->Util()->DB()->UpdateData();
$db->UpdateData();
return true;
@@ -399,8 +408,9 @@ class Usuario extends Main
$sql = 'SELECT nombre FROM usuario
WHERE usuarioId = "'.$this->usuarioId.'"';
$this->Util()->DB()->setQuery($sql);
$nombre = $this->Util()->DB()->GetSingle();
$db = new DB(true);
$db->setQuery($sql);
$nombre = $db->GetSingle();
return $nombre;
}
@@ -410,8 +420,9 @@ class Usuario extends Main
$sql = 'SELECT CONCAT(nombre," ",apellidos) AS name FROM usuario
WHERE usuarioId = "'.$this->usuarioId.'"';
$this->Util()->DB()->setQuery($sql);
$nombre = $this->Util()->DB()->GetSingle();
$db = new DB(true);
$db->setQuery($sql);
$nombre = $db->GetSingle();
return $nombre;
}
@@ -422,8 +433,9 @@ class Usuario extends Main
WHERE sucursalId = "'.$this->sucursalId.'"
AND `type` = "'.$this->tipo.'"
LIMIT 1';
$this->Util()->DB()->setQuery($sql);
$info = $this->Util()->DB()->GetRow();
$db = new DB(true);
$db->setQuery($sql);
$info = $db->GetRow();
return $info;
}
@@ -432,8 +444,9 @@ class Usuario extends Main
{
$sql = 'SELECT type FROM usuario
WHERE usuarioId = "'.$this->usuarioId.'"';
$this->Util()->DB()->setQuery($sql);
$tipo = $this->Util()->DB()->GetSingle();
$db = new DB(true);
$db->setQuery($sql);
$tipo = $db->GetSingle();
return $tipo;
}
@@ -443,8 +456,9 @@ class Usuario extends Main
$sql = 'SELECT usuarioId FROM usuario
WHERE type = "'.$this->tipo.'"
LIMIT 1';
$this->Util()->DB()->setQuery($sql);
$usuarioId = $this->Util()->DB()->GetSingle();
$db = new DB(true);
$db->setQuery($sql);
$usuarioId = $db->GetSingle();
return $usuarioId;
}
@@ -455,8 +469,9 @@ class Usuario extends Main
WHERE type = "'.$this->tipo.'"
AND sucursalId = "'.$this->sucursalId.'"
LIMIT 1';
$this->Util()->DB()->setQuery($sql);
$usuarioId = $this->Util()->DB()->GetSingle();
$db = new DB(true);
$db->setQuery($sql);
$usuarioId = $db->GetSingle();
return $usuarioId;
}
@@ -471,8 +486,9 @@ class Usuario extends Main
AND type = "'.$this->tipo.'"
AND sucursalId = "'.$this->sucursalId.'"
'.$sqlFilter;
$this->Util()->DB()->setQuery($sql);
$usuarios = $this->Util()->DB()->GetResult();
$db = new DB(true);
$db->setQuery($sql);
$usuarios = $db->GetResult();
return $usuarios;
}
@@ -486,8 +502,9 @@ class Usuario extends Main
WHERE email = "'.$this->email.'"
'.$sqlAdd.'
LIMIT 1';
$this->Util()->DB()->setQuery($sql);
$allow = $this->Util()->DB()->GetSingle();
$db = new DB(true);
$db->setQuery($sql);
$allow = $db->GetSingle();
return $allow;
@@ -528,8 +545,9 @@ class Usuario extends Main
WHERE empresaId ='".$this->empresaId."'
AND main = 'no'
AND baja = '0'".$sqlFilter;
$this->Util()->DB()->setQuery($sql);
$usuarios = $this->Util()->DB()->GetResult();
$db = new DB(true);
$db->setQuery($sql);
$usuarios = $db->GetResult();
return $usuarios;
}

View File

@@ -7,6 +7,8 @@ class Util extends SystemError
private $DB = null;
private $DBSelect = null;
private $activeEmpresaId = null;
public function DB()
{
if($this->DB == null )
@@ -18,9 +20,12 @@ class Util extends SystemError
public function DBSelect($empresaId)
{
// Usar nueva arquitectura multi-empresa con DatabaseManager
$dbManager = DatabaseManager::getInstance();
return new DB(false, $empresaId);
if($this->DBSelect == null || $this->activeEmpresaId != $empresaId)
{
$this->DBSelect = new DB(false, $empresaId);
$this->activeEmpresaId = $empresaId;
}
return $this->DBSelect;
}
function RoundNumber($number)
@@ -142,9 +147,9 @@ class Util extends SystemError
function ValidateInteger($value, $max = null, $min = null, $field = "Atributo")
{
if(ctype_digit($value) == false)
if(ctype_digit((string)$value) == false)
{
return $this->setError(10002, "error", "", $field);
return $this->setError(10020, "error", "", $field);
}
else
{
@@ -156,7 +161,7 @@ class Util extends SystemError
{
if(!is_numeric($value))
{
return $this->setError(10002, "error", "", $field);
return $this->setError(10020, "error", "", $field);
}
else
{
@@ -260,6 +265,11 @@ class Util extends SystemError
function HandleMultipages($page, $total_pages, $link, $pagevar, $limit = 5)
{
$pages = array();
$pages["numbers"] = array();
$pages["first"] = false;
$pages["prev"] = false;
$pages["next"] = false;
$pages["last"] = false;
if($page == 0)
$page == 0;
@@ -283,9 +293,9 @@ class Util extends SystemError
if($i >= 0)
{
if(!$this->hs_eregi("\|$pagevar\|",$link))
$pages[$i] = $link."/".$pagevar."/".$i;
$pages["numbers"][$i] = $link."/".$pagevar."/".$i;
else
$pages[$i] = $this->hs_preg_replace("\|$pagevar\|",(string)($i),$link);
$pages["numbers"][$i] = $this->hs_preg_replace("\|$pagevar\|",(string)($i),$link);
}
}
@@ -296,9 +306,9 @@ class Util extends SystemError
if($i <= $total_pages)
{
if(!$this->hs_eregi("\|$pagevar\|",$link))
$pages[$i] = $link."/".$pagevar."/".$i;
$pages["numbers"][$i] = $link."/".$pagevar."/".$i;
else
$pages[$i] = $this->hs_preg_replace("\|$pagevar\|",(string)($i),$link);
$pages["numbers"][$i] = $this->hs_preg_replace("\|$pagevar\|",(string)($i),$link);
}
}
@@ -317,6 +327,10 @@ class Util extends SystemError
}
$pages["current"] = $page+1;
$items_per_page = defined('ITEMS_PER_PAGE') ? ITEMS_PER_PAGE : 20;
$pages["items_per_page"] = $items_per_page;
$pages["start"] = $page * $items_per_page;
return $pages;
@@ -484,7 +498,7 @@ class Util extends SystemError
function errorMessage($code)
{
global $property;
return $property['errors'][$code];
return $property['error'][$code];
}
function ValidateRfc($rfc, $field)
@@ -708,6 +722,115 @@ class Util extends SystemError
fclose($fp);
}
function GetNameUsrType($type)
{
switch($type)
{
case 'admin': return 'Administrador';
case 'vendedor': return 'Vendedor';
case 'gerente': return 'Gerente';
case 'supervisor': return 'Supervisor';
case 'cajero': return 'Cajero';
case 'almacen': return 'Almacén';
case 'chofer': return 'Chofer';
case 'cliente': return 'Cliente';
case 'facturacion': return 'Facturación';
case 'direccion': return 'Dirección';
case 'capturista': return 'Capturista';
case 'maquilador': return 'Maquilador';
case 'centralizador': return 'Centralizador';
default: return ucfirst($type);
}
}
function DecodeUrlResult($result)
{
if(!is_array($result))
return $result;
foreach($result as $k => $var)
{
if(is_array($var))
{
foreach($var as $k2 => $var2)
{
$result[$k][$k2] = urldecode($var2);
}
}
else
{
$result[$k] = urldecode($var);
}
}
return $result;
}
function DecodeResult($result)
{
if(!is_array($result))
return $result;
foreach($result as $k => $var)
{
if(is_array($var))
{
foreach($var as $k2 => $var2)
{
$result[$k][$k2] = htmlspecialchars_decode($var2);
}
}
else
{
$result[$k] = htmlspecialchars_decode($var);
}
}
return $result;
}
function EncodeRow($result)
{
if(!is_array($result))
return $result;
foreach($result as $k => $var)
{
if(is_array($var))
{
foreach($var as $k2 => $var2)
{
$result[$k][$k2] = urlencode($var2);
}
}
else
{
$result[$k] = urlencode($var);
}
}
return $result;
}
function EncodeResult($result)
{
if(!is_array($result))
return $result;
foreach($result as $k => $var)
{
if(is_array($var))
{
foreach($var as $k2 => $var2)
{
$result[$k][$k2] = htmlspecialchars($var2);
}
}
else
{
$result[$k] = htmlspecialchars($var);
}
}
return $result;
}
}//Util
?>