Jelajahi Sumber

Maj deleted user

stany.ferer 1 tahun lalu
induk
melakukan
82f79191c3

+ 1 - 1
core/class/document.class.php

@@ -502,7 +502,7 @@ class document
                     . "CONCAT(" . DB_T_USER . ".prenom, ' ', " . DB_T_USER . ".nom) AS name "
                     . "FROM " . DB_T_USER_TAGS . " "
                     . "INNER JOIN " . DB_T_USER . " ON " . DB_T_USER . ".id = " . DB_T_USER_TAGS . ".id_user "
-                    . "WHERE " . DB_T_USER_TAGS . ".id_tags = 1 OR " . DB_T_USER_TAGS . ".id_tags = 2 "
+                    . "WHERE (" . DB_T_USER_TAGS . ".id_tags = 1 OR " . DB_T_USER_TAGS . ".id_tags = 2) AND " . DB_T_USER . ".deleted = 0 "
                     . "GROUP BY " . DB_T_USER . ".id");
         return db::resultset();
     }

+ 0 - 1
core/class/json.class.php

@@ -192,7 +192,6 @@ class json extends db
 
     private static function create_document()
     {
-        
         db::query("SELECT 
         " . DB_T_DOCUMENTS . ".id, 
         " . DB_T_DOCUMENTS . ".titre, 

+ 1 - 1
core/submit/cms.user-delete.php

@@ -15,5 +15,5 @@ if(core::ifGet("id")) {
     alert::recSuccess("Suppression du compte de ". user::getNameById(core::getGet("id")));
 }
 
-header("Location: /parametres.html");
+header("Location: /parametre-users.html");
 exit();

+ 1 - 1
core/submit/cms.user-restore.php

@@ -15,5 +15,5 @@ if(core::ifGet("id")) {
     alert::recSuccess("Restauration du compte de ". user::getNameById(core::getGet("id")));
 }
 
-header("Location: /parametres.html");
+header("Location: /user-" . core::getGet("id") . ".html");
 exit();

+ 4 - 2
core/views/pages/cms.user.php

@@ -118,7 +118,7 @@ if(core::ifGet("add") AND access::ifAccesss("add-user")) {
     <br />
 
     <?php 
-        if(access::ifAccesss("add-user") AND core::ifGet("id")) { ?>
+        if(access::ifAccesss("add-user") AND core::ifGet("id") AND (isset($user["deleted"]) AND $user["deleted"] == 0)) { ?>
             <div class="form-group">
                 <label>Rôles aditionnels</label>
                 <?= html::printInput('type="text" name="tags" id="tags"', @$user["tags"]) ?>
@@ -235,8 +235,10 @@ if(core::ifGet("add") AND access::ifAccesss("add-user")) {
         <?= html::printInput('type="hidden" name="actif"', $user["actif"]); ?>
     <?php endif; ?>
 
+    <?php if((isset($user["deleted"]) AND $user["deleted"] == 0) OR core::ifGet("add")) : ?>
     <input class="btn btn-primary btn-lg" style="width: 100%; margin-bottom:20px;" type="button" value="<?php echo $submit ?>"  onclick="validateAndSubmit()">
-    
+    <?php endif; ?>
+
 </form>
 
 <script>