Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

Commit

Permalink
1.8.1 (#162)
Browse files Browse the repository at this point in the history 
* correction test variable CAS

* correction bug auto-validation. Fix #157

* upgrade v1.8.1
suppression du compte conges de la BDD

* correction sql

* correction variable

* debug procedure update

* correction erreur sql

If DISTINCT is specified, the expression in the ORDER BY clause have access only to the virtual table returned by the previous step

* Fermeture par groupe Fix #165

semble avoir été modifié dans 88d8907...

* Erreur nom variable. Fix #159

* retrait constante obsolete
  • Loading branch information
@wouldsmina @prytoegrian
wouldsmina authored and prytoegrian committed May 4, 2016
1 parent 908e9b9 commit e9c7ca6
Show file tree
Hide file tree
Showing 10 changed files with 542 additions and 24 deletions.
6 changes: 3 additions & 3 deletions fonctions_conges.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ function get_list_all_users_du_resp($resp_login)
}

$sql1=$sql1." ) " ;
$sql1 = $sql1." ORDER BY u_nom " ;
$sql1 = $sql1." ORDER BY u_login " ;
$ReqLog1 = \includes\SQL::query($sql1);

while ($resultat1 = $ReqLog1->fetch_array())
Expand Down Expand Up @@ -1060,7 +1060,7 @@ function get_list_all_users_du_resp($resp_login)
}

$sql_2=$sql_2." ) " ;
$sql_2 = $sql_2." ORDER BY u_nom " ;
$sql_2 = $sql_2." ORDER BY u_login " ;

$ReqLog_2 = \includes\SQL::query($sql_2);

Expand Down Expand Up @@ -1096,7 +1096,7 @@ function get_list_users_du_groupe($group_id)
$sql1='SELECT DISTINCT(gu_login) FROM conges_groupe_users WHERE gu_gid = '.intval($group_id).' ORDER BY gu_login ';
$ReqLog1 = \includes\SQL::query($sql1);
while ($resultat1 = $ReqLog1->fetch_array())
$list_users[] = '"'.\includes\SQL::quote($resultat1["gu_login"]).'"';
$list_users[] = "'".\includes\SQL::quote($resultat1["gu_login"])."'";

$list_users = implode(' , ', $list_users);
return $list_users;
Expand Down
8 changes: 4 additions & 4 deletions hr/Fonctions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1282,17 +1282,17 @@ public static function ajout_conges($tab_champ_saisie, $tab_commentaire_saisie)
foreach($tab_champ_saisie as $user_name => $tab_conges) // tab_champ_saisie[$current_login][$id_conges]=valeur du nb de jours ajouté saisi
{
foreach($tab_conges as $id_conges => $user_nb_jours_ajout) {
$valid=verif_saisie_decimal($user_nb_jours_ajout_float); //verif la bonne saisie du nombre décimal
$valid=verif_saisie_decimal($user_nb_jours_ajout); //verif la bonne saisie du nombre décimal
if($valid) {
if($user_nb_jours_ajout_float!=0) {
if($user_nb_jours_ajout!=0) {
/* Modification de la table conges_users */
$sql1 = 'UPDATE conges_solde_user SET su_solde = su_solde+'.$user_nb_jours_ajout_float.' WHERE su_login="'. \includes\SQL::quote($user_name).'" AND su_abs_id = "'. \includes\SQL::quote($id_conges).'";';
$sql1 = 'UPDATE conges_solde_user SET su_solde = su_solde+'.$user_nb_jours_ajout.' WHERE su_login="'. \includes\SQL::quote($user_name).'" AND su_abs_id = "'. \includes\SQL::quote($id_conges).'";';
/* On valide l'UPDATE dans la table ! */
$ReqLog1 = \includes\SQL::query($sql1) ;

// on insert l'ajout de conges dans la table periode
$commentaire = _('resp_ajout_conges_comment_periode_user') ;
\hr\Fonctions::insert_ajout_dans_periode($user_name, $user_nb_jours_ajout_float, $id_conges, $commentaire);
\hr\Fonctions::insert_ajout_dans_periode($user_name, $user_nb_jours_ajout, $id_conges, $commentaire);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion includes/fonction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ function authentification_passwd_conges_CAS()


// Vérification SSL
if(isset($config_CAS_CACERT))
if(!empty($config_CAS_CACERT))
phpCAS::setCasServerCACert ($config_CAS_CACERT);
else
phpCAS::setNoCasServerValidation();
Expand Down
23 changes: 11 additions & 12 deletions install/Fonctions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ public static function install($lang)
// affichage de la liste des versions ...
echo "<select name=\"version\">\n";
echo "<option value=\"0\">". _('install_installed_version') ."</option>\n";
echo "<option value=\"1.8\">v1.8</option>\n";
echo "<option value=\"1.7.0\">v1.7.0</option>\n";
echo "<option value=\"1.6.0\">v1.6.x</option>\n";
echo "<option value=\"1.5.1\">v1.5.x</option>\n";
Expand Down Expand Up @@ -322,30 +323,28 @@ public static function lance_maj($lang, $installed_version, $config_php_conges_v
$start_version=$installed_version ;

//on lance l'execution (include) des scripts d'upgrade l'un après l'autre jusqu a la version voulue ($config_php_conges_version) ..
if(($start_version=="1.5.0")||($start_version=="1.5.1"))
{
if(($start_version=="1.5.0")||($start_version=="1.5.1")) {
$file_upgrade='upgrade_from_v1.5.0.php';
$new_installed_version="1.6.0";
// execute le script php d'upgrade de la version1.5.0 (vers la suivante (1.6.0))
echo "<META HTTP-EQUIV=REFRESH CONTENT=\"0; URL=$file_upgrade?version=$new_installed_version&lang=$lang\">";
}
elseif($start_version=="1.6.0")
{
} elseif($start_version=="1.6.0") {
$file_upgrade='upgrade_from_v1.6.0.php';
$new_installed_version="1.7.0";
// execute le script php d'upgrade de la version1.6.0 (vers la suivante (1.7.0))
echo "<META HTTP-EQUIV=REFRESH CONTENT=\"0; URL=$file_upgrade?version=$new_installed_version&lang=$lang\">";
}
elseif($start_version=="1.7.0")
{
} elseif($start_version=="1.7.0") {
$file_upgrade='upgrade_from_v1.7.0.php';
$new_installed_version="1.8";
// execute le script php d'upgrade de la version1.7.0 (vers la suivante (1.8))
echo "<META HTTP-EQUIV=REFRESH CONTENT=\"0; URL=$file_upgrade?version=$new_installed_version&lang=$lang\">";
}
else
{
echo "<META HTTP-EQUIV=REFRESH CONTENT=\"0; URL=$PHP_SELF?etape=5&version=$new_installed_version&lang=$lang\">";
} elseif($start_version=="1.8") {
$file_upgrade='upgrade_from_v1.8.php';
$new_installed_version="1.8.1";
// execute le script php d'upgrade de la version1.8 (vers la suivante (1.8.1))
echo "<META HTTP-EQUIV=REFRESH CONTENT=\"0; URL=$file_upgrade?version=$new_installed_version&lang=$lang\">";
} else {
echo "<META HTTP-EQUIV=REFRESH CONTENT=\"0; URL=$PHP_SELF?etape=3&version=$start_version&lang=$lang\">";
}

}
Expand Down
Loading

0 comments on commit e9c7ca6

Please sign in to comment.