tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2010-05-14 Miguel de Dios <miguel.dedios@artica.es> 

* include/gettext.php: Sorry I forget part of changes in "fixed the bug of
	pseudo-gettext with diferent arquitectures. Now check the arquitecture
	before." 
	Fixes: #2991545
	
	* godmode/agentes/configurar_agente.php: fixed lost the require file.
	Fixes: #3000337



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2726 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-05-14 09:01:38 +00:00
parent 9fd8a5a297
commit c06b11a83d
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2010-05-14 Miguel de Dios <miguel.dedios@artica.es>
* include/gettext.php: Sorry I forget part of changes in "fixed the bug of
pseudo-gettext with diferent arquitectures. Now check the arquitecture
before."
Fixes: #2991545
* godmode/agentes/configurar_agente.php: fixed lost the require file.
Fixes: #3000337
2010-05-13 Raúl Mateos <raulofpandora@gmail.com>
* operation/agentes/group_view.php: Clean code. Close tags. Now, if

1
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -36,6 +36,7 @@ if (! give_acl ($config["id_user"], $group, "AW")) {
require_once ('include/functions_modules.php');
require_once ('include/functions_alerts.php');
require_once ('include/functions_reporting.php');
// Get passed variables
$tab = get_parameter ('tab', 'main');

27
pandora_console/include/gettext.php
View File

@ -126,13 +126,26 @@ class gettext_reader {
$this->STREAM = $Reader;
$magic = $this->readint();
if ($magic == ($MAGIC1 & 0xFFFFFFFF)) {
$this->BYTEORDER = 0;
} elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) {
$this->BYTEORDER = 1;
} else {
$this->error = 1; // not MO file
return false;
if ($enabled64Bits) {
if ($magic == ($MAGIC1 & 0xFFFFFFFF)) {
$this->BYTEORDER = 0;
} elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) {
$this->BYTEORDER = 1;
} else {
$this->error = 1; // not MO file
return false;
}
}
else {
if ($magic == $MAGIC1) {
$this->BYTEORDER = 0;
} elseif ($magic == $MAGIC2) {
$this->BYTEORDER = 1;
} else {
$this->error = 1; // not MO file
return false;
}
}
// FIXME: Do we care about revision? We should.