Compare commits

...

5 commits

124 changed files with 332 additions and 238 deletions

3
.gitignore vendored
View file

@ -3,4 +3,5 @@ upgrade.log
*~
vendor
/src/local.*
tests-report.xml
tests-report*.xml
.phplint-cache

View file

@ -1,9 +1,9 @@
stages:
- tests
tests:
tests:bullseye:
image:
name: brenard/ldapsaisie:dev
name: brenard/ldapsaisie:bullseye
entrypoint: [""]
stage: tests
@ -13,10 +13,60 @@ tests:
script:
- composer install
- service slapd start
- ./vendor/bin/phpstan analyse --no-interaction --configuration=.phpstan/config.neon --error-format=junit > tests-report.xml
- ./vendor/bin/phpstan analyse --no-interaction --configuration=.phpstan/config.neon --error-format=junit > tests-report-bullseye.xml
artifacts:
when: always
paths:
- tests-report.xml
- tests-report-bullseye.xml
reports:
junit: tests-report.xml
junit: tests-report-bullseye.xml
tests:buster:
image:
name: brenard/ldapsaisie:buster
entrypoint: [""]
stage: tests
rules:
- changes:
- src/*
script:
- composer install
- service slapd start
- ./vendor/bin/phpstan analyse --no-interaction --configuration=.phpstan/config.neon --error-format=junit > tests-report-buster.xml
artifacts:
when: always
paths:
- tests-report-buster.xml
reports:
junit: tests-report-buster.xml
tests:stretch:
image:
name: brenard/ldapsaisie:stretch
entrypoint: [""]
stage: tests
rules:
- changes:
- src/*
script:
- cd /tmp/
- composer require overtrue/phplint --dev
- cd -
- rm -f .phplint-cache
- /tmp/vendor/bin/phplint src
tests:jessie:
image:
name: brenard/ldapsaisie:jessie
entrypoint: [""]
stage: tests
rules:
- changes:
- src/*
script:
- cd /tmp/
- composer require overtrue/phplint --dev
- cd -
- rm -f .phplint-cache
- /tmp/vendor/bin/phplint src

View file

@ -1,6 +1,7 @@
<?php
require 'Net/LDAP2.php';
require 'Net/FTP.php';
require 'Console/Table.php';
require 'Zxcvbn/autoload.php';
require '/usr/share/php/phpseclib/autoload.php';

View file

@ -3,12 +3,12 @@ FROM debian:11
RUN apt-get update
RUN apt-get upgrade -y
# Install LdapSaisie APT repository
RUN apt-get install -y wget gnupg
RUN apt-get install -y --force-yes wget gnupg lsb-release
RUN wget -O - http://ldapsaisie.org/debian/ldapsaisie.gpg.key | apt-key add -
COPY apt.list /etc/apt/sources.list.d/ldapsaisie.list
RUN echo "deb http://ldapsaisie.org/debian $( lsb_release -c -s ) main" > /etc/apt/sources.list.d/ldapsaisie.list
RUN apt-get update
# Install dependencies
RUN DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get install -y git slapd apache2 php-ldap libapache2-mod-php php-cli smarty3 php-net-ldap2 php-net-ftp php-mail php-mail-mime php-console-table ldapvi locales sed bash-completion liquidprompt vim curl jq iproute2 net-tools composer php-cas php-zxcvbn php-phpseclib
RUN DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get install -y git slapd apache2 php-ldap libapache2-mod-php php-cli smarty3 php-net-ldap2 php-net-ftp php-mail php-mail-mime php-console-table ldapvi locales sed bash-completion liquidprompt vim curl jq iproute2 net-tools composer php-cas php-zxcvbn php-phpseclib php-zip
# Add fr_FR* locales
RUN sed -i 's/^# fr_FR/fr_FR/' /etc/locale.gen
RUN locale-gen

41
docker/Dockerfile-jessie Normal file
View file

@ -0,0 +1,41 @@
FROM debian:8
# Update/upgrade
RUN apt-get update
RUN apt-get upgrade -y
# Install LdapSaisie APT repository
RUN apt-get install -y --force-yes wget gnupg lsb-release
RUN wget -O - http://ldapsaisie.org/debian/ldapsaisie.gpg.key | apt-key add -
RUN echo "deb http://ldapsaisie.org/debian $( lsb_release -c -s ) main" > /etc/apt/sources.list.d/ldapsaisie.list
RUN apt-get update
# Install dependencies
RUN DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get install -y --force-yes git slapd apache2 php5-ldap libapache2-mod-php5 php5-cli smarty3 php-net-ldap2 php-net-ftp php-mail php-mail-mime php-console-table ldapvi locales sed bash-completion vim curl jq iproute2 net-tools php-cas php-zxcvbn
# Install composer
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
RUN php composer-setup.php && mv composer.phar /usr/local/bin/composer && chmod 755 /usr/local/bin/composer && rm -f composer-setup.php
# Add fr_FR* locales
RUN sed -i 's/^# fr_FR/fr_FR/' /etc/locale.gen
RUN locale-gen
# Clone sources
RUN git clone https://gitlab.easter-eggs.com/ee/ldapsaisie.git /var/www/ldapsaisie
# Fix www-data permission on temporary directory
RUN chown www-data: -R /var/www/ldapsaisie/src/tmp/
# Configure slapd and load lsexample directory
RUN killall slapd || echo slapd is not running
RUN /var/www/ldapsaisie/lsexample/restore_lsexample -v
# Configure and enable ldapsaisie VirtualHost (as default)
RUN a2dissite 000-default
COPY apache2.conf /etc/apache2/sites-available/ldapsaisie.conf
RUN a2ensite ldapsaisie
RUN a2enmod rewrite
RUN service apache2 restart
# Install ldapsaisie binary (with its bash-completion config)
RUN ln -s /var/www/ldapsaisie/src/bin/ldapsaisie.php /usr/local/sbin/ldapsaisie
RUN ln -s /var/www/ldapsaisie/debian/ldapsaisie.bash-completion /usr/share/bash-completion/completions/ldapsaisie
# Install vimrc.local file
COPY vimrc.local /etc/vim/vimrc.local
# Install entrypoint
COPY bashrc /root/.bashrc
COPY entrypoint.sh /usr/local/sbin/entrypoint.sh
RUN echo "ldapsaisie-dev" > /etc/hostname
ENTRYPOINT /usr/local/sbin/entrypoint.sh
EXPOSE 80 389

View file

@ -3,5 +3,8 @@ HISTSIZE=1000
HISTFILESIZE=2000
source /etc/bash_completion
# Only load liquidprompt in interactive shells, not from a script or from scp
echo $- | grep -q i 2>/dev/null && . /usr/share/liquidprompt/liquidprompt
if [ -x /usr/share/liquidprompt/liquidprompt ]
then
# Only load liquidprompt in interactive shells, not from a script or from scp
echo $- | grep -q i 2>/dev/null && . /usr/share/liquidprompt/liquidprompt
fi

View file

@ -701,7 +701,6 @@ pwdGraceAuthnLimit: 0
pwdLockout: FALSE
pwdLockoutDuration: 0
pwdMaxFailure: 0
pwdMaxRecordedFailure: 0
pwdFailureCountInterval: 0
pwdMustChange: FALSE
pwdAllowUserChange: FALSE
@ -724,7 +723,6 @@ pwdGraceAuthnLimit: 0
pwdLockout: FALSE
pwdLockoutDuration: 0
pwdMaxFailure: 0
pwdMaxRecordedFailure: 0
pwdFailureCountInterval: 0
pwdMustChange: FALSE
pwdAllowUserChange: FALSE

View file

@ -33,26 +33,26 @@ class LSattr_html extends LSlog_staticLoggerClass {
* The attribute name
* @var string
*/
var string $name;
var $name;
/**
* Attribute configuration (LSobjects.<type>.attrs.<attr_name>)
* @var array<string,mixed>
*/
var array $config;
var $config;
/**
* The reference of the parent LSattribute object
* @var LSattribute
*/
var LSattribute $attribute;
var $attribute;
/**
* The corresponding LSformElement object type
* Note: Must be set in implemented classes
* @var string
*/
var string $LSformElement_type = '';
var $LSformElement_type = '';
/**
* If true, this LSattr_html type is considered as able to only support
@ -61,7 +61,7 @@ class LSattr_html extends LSlog_staticLoggerClass {
* triggered.
* @var bool
*/
protected bool $singleValue = false;
protected $singleValue = false;
/**
* Constructeur

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_boolean extends LSattr_html {
var string $LSformElement_type = 'boolean';
var $LSformElement_type = 'boolean';
}

View file

@ -27,7 +27,7 @@
*/
class LSattr_html_date extends LSattr_html {
var string $LSformElement_type = 'date';
var $LSformElement_type = 'date';
/**
* Ajoute l'attribut au formualaire passer en paramètre

View file

@ -27,7 +27,7 @@
*/
class LSattr_html_image extends LSattr_html {
var string $LSformElement_type = 'image';
protected bool $singleValue = true;
var $LSformElement_type = 'image';
protected $singleValue = true;
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_jsonCompositeAttribute extends LSattr_html {
var string $LSformElement_type = 'jsonCompositeAttribute';
var $LSformElement_type = 'jsonCompositeAttribute';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_labeledValue extends LSattr_html {
var string $LSformElement_type = 'labeledValue';
var $LSformElement_type = 'labeledValue';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_mail extends LSattr_html {
var string $LSformElement_type = 'mail';
var $LSformElement_type = 'mail';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_mailQuota extends LSattr_html {
var string $LSformElement_type = 'mailQuota';
var $LSformElement_type = 'mailQuota';
}

View file

@ -29,7 +29,7 @@ LSsession :: loadLSaddon('maildir');
*/
class LSattr_html_maildir extends LSattr_html {
var string $LSformElement_type = 'maildir';
var $LSformElement_type = 'maildir';
/**
* Registered actions to do on object events

View file

@ -27,7 +27,7 @@
*/
class LSattr_html_password extends LSattr_html {
var string $LSformElement_type = 'password';
protected bool $singleValue = true;
var $LSformElement_type = 'password';
protected $singleValue = true;
}

View file

@ -29,6 +29,6 @@ LSsession :: loadLSclass('LSattr_html_textarea');
*/
class LSattr_html_postaladdress extends LSattr_html_textarea {
var string $LSformElement_type = 'postaladdress';
var $LSformElement_type = 'postaladdress';
}

View file

@ -29,6 +29,6 @@ LSsession :: loadLSclass('LSattr_html_textarea');
*/
class LSattr_html_pre extends LSattr_html_textarea {
var string $LSformElement_type = 'pre';
var $LSformElement_type = 'pre';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_quota extends LSattr_html {
var string $LSformElement_type = 'quota';
var $LSformElement_type = 'quota';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_rss extends LSattr_html {
var string $LSformElement_type = 'rss';
var $LSformElement_type = 'rss';
}

View file

@ -27,7 +27,7 @@ LSsession :: loadLSclass('LSattr_html_select_box');
*/
class LSattr_html_sambaAcctFlags extends LSattr_html_select_box {
var string $LSformElement_type = 'sambaAcctFlags';
var $LSformElement_type = 'sambaAcctFlags';
/**
* Retourne un tableau des valeurs possibles de la liste

View file

@ -33,6 +33,6 @@ LSsession :: loadLSclass('LSattr_html_select_list');
*/
class LSattr_html_select_box extends LSattr_html_select_list {
var string $LSformElement_type = 'select_box';
var $LSformElement_type = 'select_box';
}

View file

@ -42,7 +42,7 @@
*/
class LSattr_html_select_list extends LSattr_html{
var string $LSformElement_type = 'select';
var $LSformElement_type = 'select';
/**
* Ajoute l'attribut au formualaire passer en paramètre

View file

@ -27,14 +27,14 @@
*/
class LSattr_html_select_object extends LSattr_html{
var string $LSformElement_type = 'select_object';
var $LSformElement_type = 'select_object';
/**
* Array of unrecognized values
* @see LSattr_html_select_object::getFormValues()
* @var array<int,string>
*/
var array $unrecognizedValues = array();
var $unrecognizedValues = array();
/**
* Ajoute l'attribut au formualaire passer en paramètre

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_ssh_key extends LSattr_html {
var string $LSformElement_type = 'ssh_key';
var $LSformElement_type = 'ssh_key';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannActivite extends LSattr_html {
var string $LSformElement_type = 'supannActivite';
var $LSformElement_type = 'supannActivite';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannAdressePostalePrivee extends LSattr_html {
var string $LSformElement_type = 'supannAdressePostalePrivee';
var $LSformElement_type = 'supannAdressePostalePrivee';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannCodePopulation extends LSattr_html {
var string $LSformElement_type = 'supannCodePopulation';
var $LSformElement_type = 'supannCodePopulation';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannEmpCorps extends LSattr_html {
var string $LSformElement_type = 'supannEmpCorps';
var $LSformElement_type = 'supannEmpCorps';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannEmpProfil extends LSattr_html {
var string $LSformElement_type = 'supannEmpProfil';
var $LSformElement_type = 'supannEmpProfil';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannEtablissement extends LSattr_html {
var string $LSformElement_type = 'supannEtablissement';
var $LSformElement_type = 'supannEtablissement';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannEtuDiplome extends LSattr_html {
var string $LSformElement_type = 'supannEtuDiplome';
var $LSformElement_type = 'supannEtuDiplome';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannEtuElementPedagogique extends LSattr_html {
var string $LSformElement_type = 'supannEtuElementPedagogique';
var $LSformElement_type = 'supannEtuElementPedagogique';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannEtuEtape extends LSattr_html {
var string $LSformElement_type = 'supannEtuEtape';
var $LSformElement_type = 'supannEtuEtape';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannEtuInscription extends LSattr_html {
var string $LSformElement_type = 'supannEtuInscription';
var $LSformElement_type = 'supannEtuInscription';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannEtuRegimeInscription extends LSattr_html {
var string $LSformElement_type = 'supannEtuRegimeInscription';
var $LSformElement_type = 'supannEtuRegimeInscription';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannEtuSecteurDisciplinaire extends LSattr_html {
var string $LSformElement_type = 'supannEtuSecteurDisciplinaire';
var $LSformElement_type = 'supannEtuSecteurDisciplinaire';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannEtuTypeDiplome extends LSattr_html {
var string $LSformElement_type = 'supannEtuTypeDiplome';
var $LSformElement_type = 'supannEtuTypeDiplome';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannExtProfil extends LSattr_html {
var string $LSformElement_type = 'supannExtProfil';
var $LSformElement_type = 'supannExtProfil';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannLabeledValue extends LSattr_html {
var string $LSformElement_type = 'supannLabeledValue';
var $LSformElement_type = 'supannLabeledValue';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannMailPrive extends LSattr_html {
var string $LSformElement_type = 'supannMailPrive';
var $LSformElement_type = 'supannMailPrive';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannRessourceEtat extends LSattr_html {
var string $LSformElement_type = 'supannRessourceEtat';
var $LSformElement_type = 'supannRessourceEtat';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannRessourceEtatDate extends LSattr_html {
var string $LSformElement_type = 'supannRessourceEtatDate';
var $LSformElement_type = 'supannRessourceEtatDate';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannRoleEntite extends LSattr_html {
var string $LSformElement_type = 'supannRoleEntite';
var $LSformElement_type = 'supannRoleEntite';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannRoleGenerique extends LSattr_html {
var string $LSformElement_type = 'supannRoleGenerique';
var $LSformElement_type = 'supannRoleGenerique';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannTelephonePrive extends LSattr_html {
var string $LSformElement_type = 'supannTelephonePrive';
var $LSformElement_type = 'supannTelephonePrive';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_supannTypeEntite extends LSattr_html {
var string $LSformElement_type = 'supannTypeEntite';
var $LSformElement_type = 'supannTypeEntite';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_tel extends LSattr_html {
var string $LSformElement_type = 'tel';
var $LSformElement_type = 'tel';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_text extends LSattr_html {
var string $LSformElement_type = 'text';
var $LSformElement_type = 'text';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_textarea extends LSattr_html {
var string $LSformElement_type = 'textarea';
var $LSformElement_type = 'textarea';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_url extends LSattr_html {
var string $LSformElement_type = 'url';
var $LSformElement_type = 'url';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_valueWithUnit extends LSattr_html {
var string $LSformElement_type = 'valueWithUnit';
var $LSformElement_type = 'valueWithUnit';
}

View file

@ -29,6 +29,6 @@ LSsession :: loadLSclass('LSattr_html_textarea');
*/
class LSattr_html_wysiwyg extends LSattr_html_textarea {
var string $LSformElement_type = 'wysiwyg';
var $LSformElement_type = 'wysiwyg';
}

View file

@ -27,6 +27,6 @@
*/
class LSattr_html_xmpp extends LSattr_html {
var string $LSformElement_type = 'xmpp';
var $LSformElement_type = 'xmpp';
}

View file

@ -33,19 +33,19 @@ class LSattr_ldap extends LSlog_staticLoggerClass {
* LDAP attribute name
* @var string
*/
var string $name;
var $name;
/**
* Attribute configuration (LSobjects.<type>.attrs.<attr_name>)
* @var array<string,mixed>
*/
var array $config;
var $config;
/**
* The reference of the parent LSattribute object
* @var LSattribute
*/
var LSattribute $attribute;
var $attribute;
/**
* Constructeur

View file

@ -32,7 +32,7 @@ class LSattr_ldap_password extends LSattr_ldap {
* @see LSattr_ldap_password::getClearPassword()
* @var string
*/
private string $clearPassword = '';
private $clearPassword = '';
/**
* Return the display value of this attribute

View file

@ -37,39 +37,39 @@ class LSattribute extends LSlog_staticLoggerClass {
* Attribute name
* @var string
*/
var string $name;
var $name;
/**
* Attribute configuration (LSobjects.<type>.attrs.<attr_name>)
* @var array<string,mixed>
*/
var array $config;
var $config;
/**
* The reference of the parent LSldapObject object
* @var LSldapObject
*/
var LSldapObject $ldapObject;
var $ldapObject;
/**
* The implemented LSattr_ldap object
* @see LSattribute::__construct()
* @var LSattr_ldap
*/
var LSattr_ldap $ldap;
var $ldap;
/**
* The implemented LSattr_ldap object
* @see LSattribute::__construct()
* @var LSattr_html
*/
var LSattr_html $html;
var $html;
/**
* Attribute data
* @var array
*/
var array $data = array();
var $data = array();
/**
* Attribute updated data
@ -89,14 +89,14 @@ class LSattribute extends LSlog_staticLoggerClass {
* @see LSattribute::reloadData()
* @var bool
*/
var bool $is_validate=false;
var $is_validate=false;
/**
* Cache of the validated new attribute data
* @see LSattribute::getUpdateData()
* @var array<string>
*/
var array $_finalUpdateData=array();
var $_finalUpdateData=array();
/**
* Cache of the current connected user right on this attribute
@ -111,7 +111,7 @@ class LSattribute extends LSlog_staticLoggerClass {
* @see LSattribute::fireEvent()
* @var array<string,array>
*/
var array $_events=array();
var $_events=array();
/**
* Object registered hooks on event trigger object methods
@ -119,7 +119,7 @@ class LSattribute extends LSlog_staticLoggerClass {
* @see LSattribute::fireEvent()
* @var array<string,array>
*/
var array $_objectEvents=array();
var $_objectEvents=array();
/**
* Constructeur

View file

@ -34,7 +34,7 @@ class LScli extends LSlog_staticLoggerClass {
* @see LScli::add_command()
* @var array
*/
private static array $commands = array();
private static $commands = array();
/**
* Store current executed command

View file

@ -49,7 +49,7 @@ class LSform extends LSlog_staticLoggerClass {
* @see LSform::__construct()
* @var array
*/
var array $config;
var $config;
/**
* Validation ability telltale
@ -57,7 +57,7 @@ class LSform extends LSlog_staticLoggerClass {
* @see LSform::setElementError()
* @var boolean
*/
var bool $can_validate = true;
var $can_validate = true;
/**
* Form elements with attribute name as key and an implemented LSformElement as value
@ -65,20 +65,20 @@ class LSform extends LSlog_staticLoggerClass {
* @see LSattr_html::addToForm()
* @var array<string,LSformElement>
*/
var array $elements = array();
var $elements = array();
/**
* Registred elements's rules
* @var array<string,array>
*/
var array $_rules = array();
var $_rules = array();
/**
* Post data of the form
* @see LSform::getPostData()
* @var array<string,array>
*/
var array $_postData = array();
var $_postData = array();
/**
* Registered elements's errors
@ -87,7 +87,7 @@ class LSform extends LSlog_staticLoggerClass {
* @see LSform::getErrors()
* @var array<string,array>
*/
var array $_elementsErrors = array();
var $_elementsErrors = array();
/**
* Validation telltale
@ -130,14 +130,14 @@ class LSform extends LSlog_staticLoggerClass {
* @see LSform::addWarning()
* @var array<int,string>
*/
var array $warnings = array();
var $warnings = array();
/**
* Telltale of the API mode
* @see LSform::__construct()
* @var bool
*/
var bool $api_mode = false;
var $api_mode = false;
/**
* Submited telltale
@ -145,7 +145,7 @@ class LSform extends LSlog_staticLoggerClass {
* @see LSform::isSubmit()
* @var bool
*/
private bool $submited = false;
private $submited = false;
/**
* The submit button value

View file

@ -36,7 +36,7 @@ class LSformElement extends LSlog_staticLoggerClass {
* The attribute name
* @var string
*/
var string $name;
var $name;
/**
* The attribute label
@ -44,20 +44,20 @@ class LSformElement extends LSlog_staticLoggerClass {
* @see LSformElement::getLabel()
* @var string
*/
var string $label;
var $label;
/**
* Attribute configuration (LSobjects.<type>.attrs.<attr_name>)
* @see LSformElement::getParam()
* @var array<string,mixed>
*/
var array $params;
var $params;
/**
* Values of the element
* @var array<mixed>
*/
var array $values = array();
var $values = array();
/**
* Reference of the related LSform object
@ -71,7 +71,7 @@ class LSformElement extends LSlog_staticLoggerClass {
* @see LSformElement::isRequired()
* @var bool
*/
var bool $_required = false;
var $_required = false;
/**
* Freeze telltale (=read-only element)
@ -79,7 +79,7 @@ class LSformElement extends LSlog_staticLoggerClass {
* @see LSformElement::isFreeze()
* @var bool
*/
var bool $_freeze = false;
var $_freeze = false;
/**
* Reference to the related LSattr_html object
@ -92,21 +92,21 @@ class LSformElement extends LSlog_staticLoggerClass {
* Note: commonly overwrite in implementated classes
* @var string
*/
var string $fieldTemplate = 'LSformElement_field.tpl';
var $fieldTemplate = 'LSformElement_field.tpl';
/**
* The template filename (of the form complement element)
* Note: may be overwrite in implementated classes
* @var string
*/
var string $template = 'LSformElement.tpl';
var $template = 'LSformElement.tpl';
/**
* Template variables passed to Smarty computing the form element template
* Note: this variables are commonly added in implementated classes
* @var array<string,mixed>
*/
var array $fetchVariables = array();
var $fetchVariables = array();
/**
* Constructor

View file

@ -32,8 +32,8 @@
class LSformElement_boolean extends LSformElement {
var string $fieldTemplate = 'LSformElement_boolean_field.tpl';
var string $template = 'LSformElement_boolean.tpl';
var $fieldTemplate = 'LSformElement_boolean_field.tpl';
var $template = 'LSformElement_boolean.tpl';
/**
* Retourne les infos d'affichage de l'élément

View file

@ -32,9 +32,9 @@
class LSformElement_date extends LSformElement {
var string $fieldTemplate = 'LSformElement_date_field.tpl';
var $fieldTemplate = 'LSformElement_date_field.tpl';
var array $_php2js_format = array(
var $_php2js_format = array(
"a" => "a",
"A" => "A",
"b" => "b",
@ -60,9 +60,9 @@ class LSformElement_date extends LSformElement {
"%" => "%",
);
var array $_cache_php2js_format=array();
var $_cache_php2js_format=array();
var string $default_style="vista";
var $default_style="vista";
/**
* Définis la valeur de l'élément date

View file

@ -31,7 +31,7 @@
class LSformElement_image extends LSformElement {
var string $fieldTemplate = 'LSformElement_image_field.tpl';
var $fieldTemplate = 'LSformElement_image_field.tpl';
/**
* Retourne les infos d'affichage de l'élément

View file

@ -32,8 +32,8 @@ LSsession :: loadLSclass('LSformElement');
class LSformElement_jsonCompositeAttribute extends LSformElement {
var string $template = 'LSformElement_jsonCompositeAttribute.tpl';
var string $fieldTemplate = 'LSformElement_jsonCompositeAttribute_field.tpl';
var $template = 'LSformElement_jsonCompositeAttribute.tpl';
var $fieldTemplate = 'LSformElement_jsonCompositeAttribute_field.tpl';
public function __construct(&$form, $name, $label, $params, &$attr_html){
parent :: __construct($form, $name, $label, $params,$attr_html);

View file

@ -33,8 +33,8 @@ LSsession :: loadLSclass('LSformElement');
class LSformElement_labeledValue extends LSformElement {
var string $template = 'LSformElement_labeledValue.tpl';
var string $fieldTemplate = 'LSformElement_labeledValue_field.tpl';
var $template = 'LSformElement_labeledValue.tpl';
var $fieldTemplate = 'LSformElement_labeledValue_field.tpl';
/**
* Retourne les infos d'affichage de l'élément

View file

@ -33,20 +33,20 @@ LSsession :: loadLSclass('LSformElement_text');
class LSformElement_mail extends LSformElement_text {
var array $JSscripts = array(
var $JSscripts = array(
'LSformElement_mail.js'
);
var array $fetchVariables = array(
var $fetchVariables = array(
'additionalCssClass' => array('LSformElement_mail'),
'uriPrefix' => 'mailto:'
);
var string $fieldTemplate = 'LSformElement_uri_field.tpl';
var $fieldTemplate = 'LSformElement_uri_field.tpl';
// Flag to trigger warning about old Autocomplete config style
// (detect in constructor and show on getDisplay())
private bool $warnOldAutocompleteConfigStyle = false;
private $warnOldAutocompleteConfigStyle = false;
/**
* Constructor

View file

@ -32,9 +32,9 @@
class LSformElement_mailQuota extends LSformElement {
var string $fieldTemplate = 'LSformElement_mailQuota_field.tpl';
var $fieldTemplate = 'LSformElement_mailQuota_field.tpl';
var array $sizeFacts = array(
var $sizeFacts = array(
1 => 'o',
1000 => 'Ko',
1000000 => 'Mo',

View file

@ -52,12 +52,12 @@ LSsession :: loadLSclass('LSformElement_text');
class LSformElement_maildir extends LSformElement_text {
var array $JSscripts = array(
var $JSscripts = array(
'LSformElement_maildir_field.js',
'LSformElement_maildir.js'
);
var array $fetchVariables = array(
var $fetchVariables = array(
'additionalCssClass' => array('LSformElement_maildir'),
);

View file

@ -32,8 +32,8 @@ LSsession :: loadLSclass('LSformElement');
class LSformElement_password extends LSformElement {
var string $fieldTemplate = 'LSformElement_password_field.tpl';
var string $template = 'LSformElement_password.tpl';
var $fieldTemplate = 'LSformElement_password_field.tpl';
var $template = 'LSformElement_password.tpl';
/**
* Mail to send info

View file

@ -35,7 +35,7 @@ class LSformElement_postaladdress extends LSformElement_textarea {
* @see LSformElement_textarea::getDisplay()
* @var string
*/
var string $fieldTemplateExtraClass = 'LSformElement_postaladdress';
var $fieldTemplateExtraClass = 'LSformElement_postaladdress';
/**
* Retourne les infos d'affichage de l'élément

View file

@ -35,7 +35,7 @@ class LSformElement_pre extends LSformElement_textarea {
* @see LSformElement_textarea::getDisplay()
* @var string
*/
var string $fieldTemplateExtraClass = 'LSformElement_pre';
var $fieldTemplateExtraClass = 'LSformElement_pre';
/**
* Retourne les infos d'affichage de l'élément

View file

@ -32,9 +32,9 @@
class LSformElement_quota extends LSformElement {
var string $fieldTemplate = 'LSformElement_quota_field.tpl';
var $fieldTemplate = 'LSformElement_quota_field.tpl';
var array $sizeFacts = array(
var $sizeFacts = array(
1 => 'o',
1024 => 'Ko',
1048576 => 'Mo',

View file

@ -33,15 +33,15 @@ LSsession :: loadLSclass('LSformElement_text');
class LSformElement_rss extends LSformElement_text {
var array $JSscripts = array(
var $JSscripts = array(
'LSformElement_rss.js'
);
var array $fetchVariables = array(
var $fetchVariables = array(
'additionalCssClass' => array('LSformElement_rss'),
'uriPrefix' => ''
);
var string $fieldTemplate = 'LSformElement_uri_field.tpl';
var $fieldTemplate = 'LSformElement_uri_field.tpl';
public function getDisplay() {
LStemplate :: addHelpInfo(

View file

@ -32,8 +32,8 @@
class LSformElement_select extends LSformElement {
var string $template = 'LSformElement_select.tpl';
var string $fieldTemplate = 'LSformElement_select.tpl';
var $template = 'LSformElement_select.tpl';
var $fieldTemplate = 'LSformElement_select.tpl';
/**
* Return display data of this element

View file

@ -33,8 +33,8 @@ LSsession :: loadLSclass('LSformElement_select');
class LSformElement_select_box extends LSformElement_select {
var string $template = 'LSformElement_select_box.tpl';
var string $fieldTemplate = 'LSformElement_select_box.tpl';
var $template = 'LSformElement_select_box.tpl';
var $fieldTemplate = 'LSformElement_select_box.tpl';
/**
* Return display data of this element

View file

@ -43,8 +43,8 @@ LSsession :: loadLSclass('LSformElement');
class LSformElement_select_object extends LSformElement {
var string $fieldTemplate = 'LSformElement_select_object_field.tpl';
var string $template = 'LSformElement_select_object.tpl';
var $fieldTemplate = 'LSformElement_select_object_field.tpl';
var $template = 'LSformElement_select_object.tpl';
/**
* Reference to the related LSattr_html_select_object object

View file

@ -32,8 +32,8 @@
class LSformElement_ssh_key extends LSformElement {
var string $template = 'LSformElement_ssh_key.tpl';
var string $fieldTemplate = 'LSformElement_ssh_key_field.tpl';
var $template = 'LSformElement_ssh_key.tpl';
var $fieldTemplate = 'LSformElement_ssh_key_field.tpl';
/**

View file

@ -34,8 +34,8 @@ LSsession :: loadLSaddon('supann');
class LSformElement_supannCompositeAttribute extends LSformElement {
var string $template = 'LSformElement_supannCompositeAttribute.tpl';
var string $fieldTemplate = 'LSformElement_supannCompositeAttribute_field.tpl';
var $template = 'LSformElement_supannCompositeAttribute.tpl';
var $fieldTemplate = 'LSformElement_supannCompositeAttribute_field.tpl';
/*
* Composants des valeurs composites :

View file

@ -34,8 +34,8 @@ LSsession :: loadLSaddon('supann');
class LSformElement_supannLabeledValue extends LSformElement {
var string $template = 'LSformElement_supannLabeledValue.tpl';
var string $fieldTemplate = 'LSformElement_supannLabeledValue_field.tpl';
var $template = 'LSformElement_supannLabeledValue.tpl';
var $fieldTemplate = 'LSformElement_supannLabeledValue_field.tpl';
/**
* Nomenclature table of this form element's values

View file

@ -33,12 +33,12 @@ LSsession :: loadLSclass('LSformElement_text');
class LSformElement_tel extends LSformElement_text {
var array $fetchVariables = array(
var $fetchVariables = array(
'additionalCssClass' => array('LSformElement_tel'),
'uriPrefix' => 'tel:'
);
var string $fieldTemplate = 'LSformElement_uri_field.tpl';
var $fieldTemplate = 'LSformElement_uri_field.tpl';
public function getDisplay() {
$this -> fetchVariables['uriLinkTitle'] = $this -> attr_html -> attribute -> ldapObject ->getDisplayName();

View file

@ -39,7 +39,7 @@ class LSformElement_text extends LSformElement {
* @see LSformElement_text::getDisplay()
* @var array
*/
var array $JSscripts = array();
var $JSscripts = array();
/**
* Extra CSS file to load for handling this form element
@ -47,12 +47,12 @@ class LSformElement_text extends LSformElement {
* @see LSformElement_text::getDisplay()
* @var array
*/
var array $CSSfiles = array(
var $CSSfiles = array(
'LSformElement_text.css',
);
var string $fieldTemplate = 'LSformElement_text_field.tpl';
var array $fetchVariables = array(
var $fieldTemplate = 'LSformElement_text_field.tpl';
var $fetchVariables = array(
'additionalCssClass' => array(),
);

View file

@ -32,14 +32,14 @@
class LSformElement_textarea extends LSformElement {
var string $fieldTemplate = 'LSformElement_textarea_field.tpl';
var $fieldTemplate = 'LSformElement_textarea_field.tpl';
/**
* Extra CSS class for the pre HTML element
* @see LSformElement_textarea::getDisplay()
* @var string
*/
var string $fieldTemplateExtraClass = '';
var $fieldTemplateExtraClass = '';
/**
* Retourne les infos d'affichage de l'élément

View file

@ -33,16 +33,16 @@ LSsession :: loadLSclass('LSformElement_text');
class LSformElement_url extends LSformElement_text {
var array $JSscripts = array(
var $JSscripts = array(
'LSformElement_url.js'
);
var array $fetchVariables = array(
var $fetchVariables = array(
'additionalCssClass' => array('LSformElement_url'),
'uriPrefix' => ''
);
var string $fieldTemplate = 'LSformElement_uri_field.tpl';
var $fieldTemplate = 'LSformElement_uri_field.tpl';
public function getDisplay() {
LStemplate :: addHelpInfo(

View file

@ -32,7 +32,7 @@
class LSformElement_valueWithUnit extends LSformElement {
var string $fieldTemplate = 'LSformElement_valueWithUnit_field.tpl';
var $fieldTemplate = 'LSformElement_valueWithUnit_field.tpl';
/**
* Retourne les unites de l'attribut

View file

@ -31,7 +31,7 @@
class LSformElement_wysiwyg extends LSformElement {
var string $fieldTemplate = 'LSformElement_wysiwyg_field.tpl';
var $fieldTemplate = 'LSformElement_wysiwyg_field.tpl';
/**
* Retourne les infos d'affichage de l'élément

View file

@ -32,16 +32,16 @@ LSsession :: loadLSclass('LSformElement_text');
*/
class LSformElement_xmpp extends LSformElement_text {
var array $JSscripts = array(
var $JSscripts = array(
'LSformElement_xmpp.js'
);
var array $fetchVariables = array(
var $fetchVariables = array(
'additionalCssClass' => array('LSformElement_xmpp'),
'uriPrefix' => 'xmpp:'
);
var string $fieldTemplate = 'LSformElement_uri_field.tpl';
var $fieldTemplate = 'LSformElement_uri_field.tpl';
public function getDisplay() {
LStemplate :: addHelpInfo(

View file

@ -46,7 +46,7 @@ class LSformRule extends LSlog_staticLoggerClass {
* @see LSformRule::cli_test_form_rule_param_name_autocompleter()
* @var array<string,mixed>
*/
protected static array $cli_params_autocompleters = array();
protected static $cli_params_autocompleters = array();
/**
* Validate form element values with specified rule

View file

@ -28,7 +28,7 @@
class LSformRule_alphanumeric extends LSformRule {
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'withAccents' => array('LScli', 'autocomplete_bool'),
);

View file

@ -28,7 +28,7 @@
class LSformRule_callable extends LSformRule {
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'callable' => null,
);

View file

@ -34,7 +34,7 @@ class LSformRule_compare extends LSformRule {
const validate_one_by_one = False;
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'operator' => null,
);

View file

@ -28,7 +28,7 @@
class LSformRule_date extends LSformRule {
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'format' => null,
'special_values' => null,
);

View file

@ -28,7 +28,7 @@
class LSformRule_differentPassword extends LSformRule {
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'otherPasswordAttributes' => null,
);

View file

@ -28,7 +28,7 @@
class LSformRule_email extends LSformRule {
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'domain' => null,
'checkDomain' => array('LScli', 'autocomplete_bool'),
);

View file

@ -28,7 +28,7 @@
class LSformRule_filesize extends LSformRule {
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'minSize' => array('LScli', 'autocomplete_int'),
'maxSize' => array('LScli', 'autocomplete_int'),
);

View file

@ -28,7 +28,7 @@
class LSformRule_imagesize extends LSformRule {
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'minWidth' => array('LScli', 'autocomplete_int'),
'maxWitdh' => array('LScli', 'autocomplete_int'),
'minHeight' => array('LScli', 'autocomplete_int'),

View file

@ -28,7 +28,7 @@
class LSformRule_inarray extends LSformRule {
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'possible_values' => null,
'reverse' => array('LScli', 'autocomplete_bool'),
);

View file

@ -28,7 +28,7 @@
class LSformRule_integer extends LSformRule{
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'positive' => array('LScli', 'autocomplete_bool'),
'negative' => array('LScli', 'autocomplete_bool'),
'minHeight' => array('LScli', 'autocomplete_int'),

View file

@ -28,7 +28,7 @@
class LSformRule_ldapSearchURI extends LSformRule {
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'check_resolving_ldap_host' => array('LScli', 'autocomplete_bool'),
'host_required' => array('LScli', 'autocomplete_bool'),
'scope_required' => array('LScli', 'autocomplete_bool'),

View file

@ -28,7 +28,7 @@
class LSformRule_maxlength extends LSformRule {
// CLI parameters autocompleters
protected static array $cli_params_autocompleters = array(
protected static $cli_params_autocompleters = array(
'limit' => array('LScli', 'autocomplete_int'),
);

Some files were not shown because too many files have changed in this diff Show more