Update manifest version to 7.1.4 [▶️]

.gitea/workflows/release_build.yml

@@ -6,7 +6,7 @@ on:
       - main
   workflow_dispatch:
   schedule:
-    - cron: '28 5 * * *'
+    - cron: "28 5 * * *"
   # workflow_run support in Gitea can be tricky, keeping it but might need adjustment
   workflow_run:
     workflows: ["Sync Repo"]
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: catthehacker/ubuntu:act-latest
-    
+
     permissions:
       contents: write
       packages: write
@@ -139,7 +139,7 @@ jobs:
           LATEST_RELEASE_TAG=$(curl -sL -H "Accept: application/json" \
             -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             "${{ gitea.api_url }}/repos/${{ gitea.repository }}/releases/latest" | jq -r .tag_name)
-          
+
           if [ -z "$LATEST_RELEASE_TAG" ] || [ "$LATEST_RELEASE_TAG" = "null" ]; then
             LATEST_RELEASE_TAG="v1.0.0"
           fi
@@ -245,7 +245,7 @@ jobs:
           AUTHOR="Ivan Carlos"
           VERSION_FILE="manifest.json"
           UPSTREAM_SHA="${{ steps.check_upstream.outputs.upstream_sha }}"
-          
+
           if [ -f "$VERSION_FILE" ]; then
              jq --arg v "$VERSION" \
                 --arg a "$AUTHOR" \
@@ -265,6 +265,11 @@ jobs:
           git commit -m "Update manifest version to ${{ steps.version.outputs.VERSION }} [▶️]" || echo "Nothing to commit"
           git push origin main
 
+      - name: 🛠 Install zip
+        if: steps.check_commits.outputs.commit_count != '0'
+        run: |
+          apt-get update && apt-get install -y zip
+
       - name: 📦 Create ZIP package (excluding certain files)
         if: steps.check_commits.outputs.commit_count != '0'
         run: |
@@ -279,11 +284,11 @@ jobs:
         run: |
           TAG_NAME="v${{ steps.version.outputs.VERSION }}"
           RELEASE_NAME="${{ steps.version.outputs.REPO_NAME }} v${{ steps.version.outputs.VERSION }}"
-          
+
           # Construct Markdown body safely using env var
           # We use printf to avoid interpreting backslashes in the file list
           BODY=$(printf "### Changelog\nFiles changed in this release:\n%s" "$CHANGELOG_LIST")
-          
+
           # Create JSON payload using jq
           jq -n \
             --arg tag_name "$TAG_NAME" \
@@ -299,13 +304,13 @@ jobs:
             -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             -H "Content-Type: application/json" \
             -d @release_payload.json > api_response.json
-          
+
           echo "DEBUG: API Response:"
           cat api_response.json || true
-          
+
           RELEASE_ID=$(jq -r .id api_response.json)
           echo "RELEASE_ID=$RELEASE_ID" >> "$GITHUB_OUTPUT"
-          
+
           if [ "$RELEASE_ID" == "null" ] || [ -z "$RELEASE_ID" ]; then
             echo "Failed to create release. Response content:"
             cat api_response.json
@@ -318,19 +323,18 @@ jobs:
           RELEASE_ID="${{ steps.create_release.outputs.RELEASE_ID }}"
           ZIP_NAME="${{ steps.version.outputs.ZIP_NAME }}"
           FILE_PATH="./$ZIP_NAME"
-          
-          curl -s -X POST "${{ gitea.api_url }}/repos/${{ gitea.repository }}/releases/$RELEASE_ID/assets" \
+
+          curl --fail -s -X POST "${{ gitea.api_url }}/repos/${{ gitea.repository }}/releases/$RELEASE_ID/assets?name=$ZIP_NAME" \
             -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             -H "Content-Type: application/zip" \
-            --data-binary @"$FILE_PATH" \
-            -o /dev/null
+            --data-binary @"$FILE_PATH"
 
       # ----- Docker steps -----
       - name: Clone Upstream Code (if needed)
         if: steps.check_commits.outputs.commit_count != '0' && (steps.check_upstream.outputs.upstream_needs_update == 'true' || steps.check_upstream.outputs.repo_url != '')
         run: |
-           rm -rf upstream_src
-           git clone --depth 1 --branch ${{ steps.check_upstream.outputs.repo_branch }} ${{ steps.check_upstream.outputs.repo_url }} upstream_src
+          rm -rf upstream_src
+          git clone --depth 1 --branch ${{ steps.check_upstream.outputs.repo_branch }} ${{ steps.check_upstream.outputs.repo_url }} upstream_src
 
       - name: 🔍 Check if Dockerfile exists
         if: steps.check_commits.outputs.commit_count != '0' || steps.check_upstream.outputs.upstream_needs_update == 'true'

README.md

@@ -1,19 +1,6 @@
 # Bundled CMDB
 Small CMDB project that uses ESET data sent to database for asset management, uses Keycloak as SSO provider for user authentication, S3 for file submission and access related to each asset
 
-<!-- buttons -->
-[![Stars](https://img.shields.io/github/stars/ivancarlosti/bundledcmdb?label=⭐%20Stars&color=gold&style=flat)](https://github.com/ivancarlosti/bundledcmdb/stargazers)
-[![Watchers](https://img.shields.io/github/watchers/ivancarlosti/bundledcmdb?label=Watchers&style=flat&color=red)](https://github.com/sponsors/ivancarlosti)
-[![Forks](https://img.shields.io/github/forks/ivancarlosti/bundledcmdb?label=Forks&style=flat&color=ff69b4)](https://github.com/sponsors/ivancarlosti)
-[![GitHub commit activity](https://img.shields.io/github/commit-activity/m/ivancarlosti/bundledcmdb?label=Activity)](https://github.com/ivancarlosti/bundledcmdb/pulse)
-[![GitHub Issues](https://img.shields.io/github/issues/ivancarlosti/bundledcmdb?label=Issues&color=orange)](https://github.com/ivancarlosti/bundledcmdb/issues)
-[![License](https://img.shields.io/github/license/ivancarlosti/bundledcmdb?label=License)](LICENSE)  
-[![GitHub last commit](https://img.shields.io/github/last-commit/ivancarlosti/bundledcmdb?label=Last%20Commit)](https://github.com/ivancarlosti/bundledcmdb/commits)
-[![Security](https://img.shields.io/badge/Security-View%20Here-purple)](https://github.com/ivancarlosti/bundledcmdb/security)
-[![Code of Conduct](https://img.shields.io/badge/Code%20of%20Conduct-2.1-4baaaa)](https://github.com/ivancarlosti/bundledcmdb?tab=coc-ov-file)
-[![GitHub Sponsors](https://img.shields.io/github/sponsors/ivancarlosti?label=GitHub%20Sponsors&color=ffc0cb)][sponsor]
-<!-- endbuttons -->
-
 ## Requirement:
 
 * [Docker Compose](https://docs.docker.com/engine/install/)

manifest.json

@@ -1,4 +1,4 @@
 {
-  "version": "7.1.0",
+  "version": "7.1.4",
   "author": "Ivan Carlos"
 }

public/manage_permissions.php

@@ -37,7 +37,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         $email = $_POST['email'] ?? '';
         $newRole = $_POST['role_to_set'] ?? '';
         
-        if ($email && in_array($newRole, ['admin', 'superadmin'])) {
+        if ($email && in_array($newRole, ['admin', 'superadmin', 'manager'])) {
             // Update user role
             $stmt = $pdo->prepare("UPDATE users SET role = :role WHERE email = :email");
             $success = $stmt->execute([':role' => $newRole, ':email' => $email]);
@@ -73,7 +73,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 }
 
 // Fetch Admins and SuperAdmins
-$stmt = $pdo->query("SELECT * FROM users WHERE role IN ('admin', 'superadmin') ORDER BY role DESC, email ASC");
+$stmt = $pdo->query("SELECT * FROM users WHERE LOWER(TRIM(role)) IN ('admin', 'superadmin', 'manager') ORDER BY role DESC, email ASC");
 $admins = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
 // Fetch All Users for Dropdown
@@ -134,6 +134,7 @@ $allUsers = $stmt->fetchAll(PDO::FETCH_COLUMN);
         }
         .role-superadmin { background: #6f42c1; color: white; }
         .role-admin { background: #28a745; color: white; }
+        .role-manager { background: #17a2b8; color: white; }
         
         .btn-remove {
             background: #dc3545;
@@ -186,6 +187,7 @@ $allUsers = $stmt->fetchAll(PDO::FETCH_COLUMN);
                 
                 <label for="role">Role:</label>
                 <select name="role_to_set" id="role" required>
+                    <option value="manager">Manager</option>
                     <option value="admin">Admin</option>
                     <option value="superadmin">SuperAdmin</option>
                 </select>