admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* 260214-bug-upgrade-web:

Browse source 
config LOCALE add comment
  Bug : upgrade fails because account_repository has changed
This commit is contained in:
sparkyx 2026-02-14 16:22:40 +01:00
commit 494b9199fe
2 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
include/class/noalyss_user.class.php
View file

@ -401,7 +401,32 @@ class Noalyss_User
$sql_cond=" where use_id=$1";
$sql_array=array($this->id);
}
$sql="select use_id,
/**
* mono version
*/
if ( $this->repository->exist_table("repo_version")) {
$repo_version = $this->repository->get_value("select val from repo_version");
} else {
$repo_version = $this->repository->get_value("select val from version");
}
/**
* when upgrading , ACCOUNT_REPOSITORY is not yet upgraded
*/
if ( $repo_version < 21)
{
$sql="select use_id,
use_first_name,
use_name,
use_login,
use_active,
use_admin,
use_pass,
use_email
from ac_users ";
$row=array();
$row['use_auth_method']=$row['use_otp_secret']="";
} else {
$sql="select use_id,
use_first_name,
use_name,
use_login,
@ -412,6 +437,7 @@ class Noalyss_User
use_auth_method,
use_otp_secret
from ac_users ";
}
$Res=$this->repository->exec_sql($sql.$sql_cond, $sql_array);
if (($Max=Database::num_row($Res))==0)
return -1;

8
include/lib/config_file.php
View file

@ -165,7 +165,13 @@ function display_file_config($p_array, $from_setup = 1, $p_os = 1)
echo PHP_EOL;
print ('define ("NOALYSS_ADMIN_PASSWORD","' . $cpassword_admin . '");');
echo PHP_EOL;
echo "
/*
* LOCALE 0 means no language change , on some PHP installation
* you cannot change the language
*/
";
echo PHP_EOL;
print ('define ("LOCALE",' . $clocale . ');');
echo PHP_EOL;
echo "