loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix issue #168

This commit is contained in:
Thomas Zilio 2018-03-23 14:42:56 +01:00
parent 4e25b26524
commit acf1db245e
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/utenti/user.php
View File

@ -2,8 +2,9 @@
include_once __DIR__.'/../../core.php';
// Decido la lunghezza minima della password, e la lunghezza minima del nome utente
$min_length = 8;
// Lunghezza minima della password
$min_length_password = 8;
// Lunghezza minima del nome utente (username)
$min_length_username = 4;
$self_edit = Modules::getPermission('Utenti e permessi') != 'rw' || (filter('id_utente') == null && filter('idgruppo') == null);
@ -35,7 +36,7 @@ if (!empty($id_utente)) {
echo '
<form action="" method="post" id="link_form">
<input type="hidden" name="op" value="'.$op.'">
<input type="hidden" name="min_length" value="'.$min_length.'">
<input type="hidden" name="min_length" value="'.$min_length_password.'">
<input type="hidden" name="min_length_username" value="'.$min_length_username.'">';
if (!empty($id_utente)) {
@ -91,7 +92,7 @@ echo '
</form>
<script type="text/javascript">
var min_length = '.$min_length.';
var min_length = '.$min_length_password.';
var min_length_username = '.$min_length_username.';
function do_submit(){
if( $("#password1").val() == "" || $("#password2").val() == "" )
@ -100,7 +101,7 @@ echo '
alert("'.tr('Le password non coincidono').'.");
else if( $("#password1").val().length < min_length )
alert("'.tr('La password deve essere lunga minimo _MIN_ caratteri!', [
'_MIN_' => $min_length,
'_MIN_' => $min_length_password,
]).'");
else if( $("#username").val().length < min_length_username )
alert("'.tr("L'username deve essere lungo minimo _MIN_ caratteri!", [

6
src/Prints.php
View File

@ -77,7 +77,11 @@ class Prints
$result = [];
foreach ((array) self::$modules[$module_id] as $value) {
$result[] = self::get($value);
$print = self::get($value);
if (!empty($print['is_record'])) {
$result[] = $print;
}
}
return $result;

5
update/2_4.sql
View File

@ -5,6 +5,7 @@
CREATE TABLE IF NOT EXISTS `zz_prints` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`id_module` int(11) NOT NULL,
`is_record` BOOLEAN NOT NULL DEFAULT 1,
`name` varchar(255) NOT NULL,
`title` varchar(255) NOT NULL,
`directory` varchar(50) NOT NULL,
@ -24,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `zz_prints` (
-- Inserimento delle stampe di base
INSERT INTO `zz_prints` (`id_module`, `name`, `directory`, `options`, `previous`, `enabled`, `default`) VALUES
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Fatture di vendita'), 'Fattura di vendita', 'fatture', '', 'iddocumento', 1, 1),
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Interventi'), 'Riepilogo intervento', 'riepilogo_interventi', '', '', 1, 1),
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Interventi'), 'Riepilogo interventi', 'riepilogo_interventi', '', '', 1, 1),
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli'), 'Inventario magazzino', 'magazzino_inventario', '', '', 1, 1),
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Piano dei conti'), 'Mastrino', 'partitario_mastrino', '', 'idconto', 1, 1),
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Scadenzario'), 'Scadenzario', 'scadenzario', '', '', 1, 1),
@ -32,6 +33,8 @@ INSERT INTO `zz_prints` (`id_module`, `name`, `directory`, `options`, `previous`
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Stampe contabili'), 'Fatturato', 'fatturato', '', '', 1, 1),
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Stampe contabili'), 'Spesometro', 'spesometro', '', '', 1, 1);
UPDATE `zz_prints` SET `is_record` = 0 WHERE `name` = 'Riepilogo interventi';
-- Inserimento delle stampe con prezzo disabilitato
INSERT INTO `zz_prints` (`id_module`, `name`, `directory`, `options`, `previous`, `enabled`, `default`) VALUES
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Contratti'), 'Contratto (senza costi)', 'contratti', '{"pricing":false}', 'idcontratto', 1, 1),