Merge branch 'develop' into 18.04

apps/maarch_entreprise/admin/update_control/update_control.php

@@ -56,7 +56,6 @@ $allCurrentTags = [];
 $allNextTags = [];
 $cptCurrentTags = 0;
 $isAnyAvailableTag = false;
-$isAnyAvailableVersion = false;
 
 foreach ($tags as $value) {
     if (!preg_match("/^\d{2}\.\d{2}\.\d+$/", $value['name'])) {
@@ -68,7 +67,6 @@ foreach ($tags as $value) {
         $year = substr($value['name'], 0, 2);
         $month = substr($value['name'], 3, 2);
         if (($year == $currentVersionBranchYear && $month > $currentVersionBranchMonth) || $year > $currentVersionBranchYear) {
-            $isAnyAvailableVersion = true;
             $allNextTags[] = $value['name'];
         }
     } else {
@@ -139,7 +137,7 @@ foreach ($tags as $value) {
             }
         }
 
-        if ($isAnyAvailableVersion) {
+        if (!empty($allNextTags)) {
             echo '<br><br><br><b>'._NEW_MAJOR_VERSION_AVAILABLE.'</b> : <br>';
             for ($j = 0; $j < count($allNextTags); ++$j) {
                 echo $allNextTags[$j].'<br />';

install/view/update_download_view.php

@@ -23,59 +23,52 @@ if ($_SESSION['user']['UserId'] <> 'superadmin') {
 
 //retrives tags
 $client = new \Gitlab\Client('https://labs.maarch.org/api/v4/');
-//$client->authenticate('aSecretToken', \Gitlab\Client::AUTH_URL_TOKEN);
-
-// $project = $client->api('projects')->show('12');
 
 $tags = $client->api('tags')->all('12');
 
 //retrieve current version
-$db             = new Database();
-$query          = "SELECT param_value_int, param_value_string FROM parameters WHERE id = 'database_version'";
-$stmt           = $db->query($query, []);
+$db = new Database();
+$query = "SELECT param_value_string FROM parameters WHERE id = 'database_version'";
+$stmt = $db->query($query, []);
 $currentVersion = $stmt->fetchObject();
 
-$versionBranch         = substr($currentVersion->param_value_int, 0, 2) . '.' . substr($currentVersion->param_value_int, 2);
-$currentVersionNumeric = preg_replace("/[^0-9,]/", "", $currentVersion->param_value_int);
-if (!empty($currentVersion->param_value_string)) {
-    $currentVersionTagNumeric = preg_replace("/[^0-9,]/", "", $currentVersion->param_value_string);
-}
+$currentVersionBranch = substr($currentVersion->param_value_string, 0, 5);
+$currentVersionBranchYear = substr($currentVersion->param_value_string, 0, 2);
+$currentVersionBranchMonth = substr($currentVersion->param_value_string, 3, 2);
+$currentVersionTag = substr($currentVersion->param_value_string, 6);
 
-$allCurrentTags        = [];
-$allNextTags           = [];
-$cptCurrentTags        = 0;
-$isAnyAvailableTag     = false;
+$allCurrentTags = [];
+$allNextTags = [];
+$cptCurrentTags = 0;
+$isAnyAvailableTag = false;
 $isAnyAvailableVersion = false;
 
-foreach ($tags as $key => $value) {
-    //echo $tags[$key]['name'] . ' ' . preg_replace("/[^0-9,]/", "", $tags[$key]['name']) . '<br />';
-    if (!preg_match("/^\d{2}\.\d{2}\.\d+$/", $tags[$key]['name'])) {
+foreach ($tags as $value) {
+    if (!preg_match("/^\d{2}\.\d{2}\.\d+$/", $value['name'])) {
         continue;
     }
-    $tagNumeric = preg_replace("/[^0-9,]/", "", $tags[$key]['name']);
-    $pos        = strpos($tagNumeric, $currentVersionNumeric);
+    $tag = substr($value['name'], 6);
+    $pos = strpos($value['name'], $currentVersionBranch);
     if ($pos === false) {
-        //echo 'tag not in currentVersion:';
-        $isAnyAvailableVersion = true;
-        $allNextTags[] = $tags[$key]['name'];
+        $year = substr($value['name'], 0, 2);
+        $month = substr($value['name'], 3, 2);
+        if (($year == $currentVersionBranchYear && $month > $currentVersionBranchMonth) || $year > $currentVersionBranchYear) {
+            $isAnyAvailableVersion = true;
+            $allNextTags[] = $value['name'];
+        }
     } else {
-        //echo 'tag in currentVersion:';
         $allCurrentTags[$cptCurrentTags] = [];
-        $allCurrentTags[$cptCurrentTags]['name'] = $tags[$key]['name'];
-        $allCurrentTags[$cptCurrentTags]['numeric'] = $tagNumeric;
-        if ($tagNumeric > $currentVersionTagNumeric) {
+        $allCurrentTags[$cptCurrentTags]['name'] = $value['name'];
+        if ($tag > $currentVersionTag) {
             $allCurrentTags[$cptCurrentTags]['enabled'] = true;
             $isAnyAvailableTag = true;
         } else {
             $allCurrentTags[$cptCurrentTags]['enabled'] = false;
         }
-        $cptCurrentTags++;
+        ++$cptCurrentTags;
     }
 }
 
-// require_once('install/class/Class_Install.php');
-// $Class_Install = new Install;
-
 ?>
 <script>
     function launchProcess(myVar) {
@@ -121,7 +114,7 @@ foreach ($tags as $key => $value) {
                             <td><?php echo _YOUR_VERSION;?></td>
                             <td>:</td>
                             <td>
-                                <?php echo '<b>' . $currentVersion->param_value_string . '</b> (' . _BRANCH_VERSION . ' : <b>' . $versionBranch . '</b>)';?>
+                                <?php echo '<b>' . $currentVersion->param_value_string . '</b>';?>
                             </td>
                         </tr>
                         <tr>