revert previous commit

.gitea/workflows/deploy.yaml

@@ -1,23 +0,0 @@
-name: Intranet Deployment
-
-on: 
-  push:
-    branches: 
-      - master
-
-jobs:
-  Deploy:
-    name: Deploy Project files
-    runs-on: intranet
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-        with:
-          SSH-KEY: ${{secrets.read_key}}
-          SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHsv90d6ofdNgJx0W6zPTVpouqDeF/qv/L0guzFBg6YON4jiubCovUZ0h7M8ipg/kXACHLfNBWAmNvsaGrPpHNU=
-          SSH-STRICT: 'false'
-      - name: Copy files to project dir
-        run: xcopy /E /I /Y /V . ${{ vars.PROD_DEPLOY_DIR }}
-      - name: Update Composer Packages
-        working-directory: ${{ vars.PROD_DEPLOY_DIR }}
-        run: composer update --no-interaction --working-dir=${{ vars.PROD_DEPLOY_DIR }}

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "gitea.owner": "audrey",
-    "gitea.repo": "intranet",
-    "gitea.instanceURL": "https://gitea.jv.com"
-}

README.md

@@ -1,5 +1,3 @@
-![Deployed](https://gitea.jv.com/audrey/intranet/actions/workflows/deploy.yaml/badge.svg)
-
 [Install](#install)  
 [Configuring IIS](#iis-configuration)  
 [Updating](#updating)  

composer.lock

@@ -4,84 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6c9cd0fccf203daf66cab2a05cf2e389",
+    "content-hash": "5625360c4bf0ca4c404a3a47e7b43354",
     "packages": [
-        {
-            "name": "doctrine/annotations",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
-                "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/lexer": "^2 || ^3",
-                "ext-tokenizer": "*",
-                "php": "^7.2 || ^8.0",
-                "psr/cache": "^1 || ^2 || ^3"
-            },
-            "require-dev": {
-                "doctrine/cache": "^2.0",
-                "doctrine/coding-standard": "^10",
-                "phpstan/phpstan": "^1.8.0",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "symfony/cache": "^5.4 || ^6",
-                "vimeo/psalm": "^4.10"
-            },
-            "suggest": {
-                "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "https://www.doctrine-project.org/projects/annotations.html",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/2.0.1"
-            },
-            "time": "2023-02-02T22:02:53+00:00"
-        },
         {
             "name": "doctrine/cache",
             "version": "2.2.0",
@@ -2084,84 +2008,6 @@
             },
             "time": "2021-07-14T16:46:02+00:00"
         },
-        {
-            "name": "sensio/framework-extra-bundle",
-            "version": "v6.2.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
-                "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/2f886f4b31f23c76496901acaedfedb6936ba61f",
-                "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/annotations": "^1.0|^2.0",
-                "php": ">=7.2.5",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/framework-bundle": "^4.4|^5.0|^6.0",
-                "symfony/http-kernel": "^4.4|^5.0|^6.0"
-            },
-            "conflict": {
-                "doctrine/doctrine-cache-bundle": "<1.3.1",
-                "doctrine/persistence": "<1.3"
-            },
-            "require-dev": {
-                "doctrine/dbal": "^2.10|^3.0",
-                "doctrine/doctrine-bundle": "^1.11|^2.0",
-                "doctrine/orm": "^2.5",
-                "symfony/browser-kit": "^4.4|^5.0|^6.0",
-                "symfony/doctrine-bridge": "^4.4|^5.0|^6.0",
-                "symfony/dom-crawler": "^4.4|^5.0|^6.0",
-                "symfony/expression-language": "^4.4|^5.0|^6.0",
-                "symfony/finder": "^4.4|^5.0|^6.0",
-                "symfony/monolog-bridge": "^4.0|^5.0|^6.0",
-                "symfony/monolog-bundle": "^3.2",
-                "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0",
-                "symfony/security-bundle": "^4.4|^5.0|^6.0",
-                "symfony/twig-bundle": "^4.4|^5.0|^6.0",
-                "symfony/yaml": "^4.4|^5.0|^6.0",
-                "twig/twig": "^1.34|^2.4|^3.0"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Sensio\\Bundle\\FrameworkExtraBundle\\": "src/"
-                },
-                "exclude-from-classmap": [
-                    "/tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "This bundle provides a way to configure your controllers with annotations",
-            "keywords": [
-                "annotations",
-                "controllers"
-            ],
-            "support": {
-                "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.10"
-            },
-            "abandoned": "Symfony",
-            "time": "2023-02-24T14:57:12+00:00"
-        },
         {
             "name": "symfony/asset",
             "version": "v6.3.0",
@@ -5641,16 +5487,16 @@
         },
         {
             "name": "symfony/runtime",
-            "version": "v6.3.12",
+            "version": "v6.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/runtime.git",
-                "reference": "a8d2b8f6033a33c224b43065a10bab5e4f0be486"
+                "reference": "8e83b5d8e0ace903e1a91dedfe08a84ed2a54b0d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/runtime/zipball/a8d2b8f6033a33c224b43065a10bab5e4f0be486",
+                "url": "https://api.github.com/repos/symfony/runtime/zipball/8e83b5d8e0ace903e1a91dedfe08a84ed2a54b0d",
-                "reference": "a8d2b8f6033a33c224b43065a10bab5e4f0be486",
+                "reference": "8e83b5d8e0ace903e1a91dedfe08a84ed2a54b0d",
                 "shasum": ""
             },
             "require": {
@@ -5700,7 +5546,7 @@
                 "runtime"
             ],
             "support": {
-                "source": "https://github.com/symfony/runtime/tree/v6.3.12"
+                "source": "https://github.com/symfony/runtime/tree/v6.3.1"
             },
             "funding": [
                 {
@@ -5716,7 +5562,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:35:58+00:00"
+            "time": "2023-06-21T12:08:28+00:00"
         },
         {
             "name": "symfony/security-bundle",
@@ -9634,5 +9480,5 @@
         "ext-iconv": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

config/bundles.php

@@ -11,5 +11,4 @@ return [
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
-    Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
 ];

config/packages/sensio_framework_extra.yaml

@@ -1,3 +0,0 @@
-sensio_framework_extra:
-    router:
-        annotations: false

src/Controller/CSPController.php

@@ -34,14 +34,12 @@ class CSPController extends AbstractController
             $searchQuery = $ticketsRepo->getByKeyword($searchKeywords);
             $paginator = new \Doctrine\ORM\Tools\Pagination\Paginator($searchQuery);
             $ticketsPerPage = count($paginator);
-            //If no tickets were found, return a special page.
-            //NOTE: we set page information to 1 of 1. Paginator has no tickets, which we're letting the twig template deal with.
-            return $this->render('cspViewer.html.twig',['tickets' => $paginator, 'portal' => $portal, 'pageNum' => 1, 'pageCount' => 1, 'form' => $form]);
         }
         else
         {
             $paginator = new \Doctrine\ORM\Tools\Pagination\Paginator($query);
         }
+
         //Pagination
         $totalItems = count($paginator);
         $pageCount = ceil($totalItems / $ticketsPerPage);

src/Controller/ComplaintController.php

@@ -2,6 +2,7 @@
 namespace App\Controller;
 
 use App\Form\AnonymousComplaintType;
+use Error;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -9,6 +10,7 @@ use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\HttpFoundation\Request;
 use jv\intranet\Types\NavbarItem;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\TransportInterface;
 use Symfony\Component\Mailer\MailerInterface;
@@ -45,10 +47,10 @@ class ComplaintController extends AbstractController
         $email->getHeaders()->addTextHeader('X-Auto-Response-Suppress', 'OOF, DR, RN, NRN, AutoReply'); //Tell autoresponders to not reply
         try
         {
-            $log->debug($mailer->send($email)->toString());
+            $mailer->send($email);
             return true;
         }
-        catch (TransportExceptionInterface $e)
+        catch ( TransportExceptionInterface $e)
         {
             return false;
         }

src/Repository/TicketRepository.php

@@ -49,7 +49,6 @@ class TicketRepository extends EntityRepository
         {
             $qb->andwhere('t.description LIKE :keyword'.$i)
             ->orwhere('t.summary LIKE :keyword'.$i)
-            ->orwhere('t.id LIKE :keyword'.$i)
             ->setParameter('keyword'.$i, '%'.$keyword.'%');
         }
         return $qb

symfony.lock

@@ -1,13 +1,4 @@
 {
-    "doctrine/annotations": {
-        "version": "2.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "1.10",
-            "ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05"
-        }
-    },
     "doctrine/doctrine-bundle": {
         "version": "2.10",
         "recipe": {
@@ -49,18 +40,6 @@
             "tests/bootstrap.php"
         ]
     },
-    "sensio/framework-extra-bundle": {
-        "version": "6.2",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "5.2",
-            "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b"
-        },
-        "files": [
-            "config/packages/sensio_framework_extra.yaml"
-        ]
-    },
     "symfony/console": {
         "version": "6.3",
         "recipe": {

templates/Training/Safety/safetyHome.html.twig

@@ -37,24 +37,11 @@
                     </div>
                 </div>
         {% endfor %}
-	</div>
-		{# Forklift Training #}
-	<div class="card-group">
-		<div class="card text-center service-card">
-                    <div class="card-body">
-                        <div class="card-header">
-                            <h5 class="card-title">Forklift Training</h5>
-                        </div>
-                        <div class="card-text">
-                            <ul class="list-group list-group-flush">
-                                <a class="list-group-item list-group-item-action list-item" href="https://sunbeltrentals.csod.com/login/render.aspx?id=defaultclp">Account Creation</a>
-								<a class="list-group-item list-group-item-action list-item" href="https://www.sunbeltrentals.com/training/safety/">Training</a>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-			</div>
 		</div>
+		
+	</div>
+
+
 </body>
 
 </html>

templates/complaint.html.twig

@@ -6,12 +6,12 @@
 <body>
 	{{ include('_navbar.html.twig')}}
 <div class="container">
-<h2>Anonymous Comment Page
+<h2>Anonymous Complaint Page
 <h4 class="text-bold">Instructions</h4>
 
     <p>Type your complaint or problem into the message box below and click "Submit".
     <br>Messages will be sent directly to {{ complaintReceiverName }}'s email account.
-    <br>Messages will be completely anonymous so comments cannot be traced to a specific person. 
+    <br>Messages will be completely anonymous so complaints cannot be traced to a specific person. 
     <br> Feel free to submit any problem or concern.
     <br><strong>Note: If you add personally identifying information (such as your name) then this won't be anonymous. Avoid this, unless you want your identity to be known</strong>
     </p>
@@ -25,7 +25,6 @@
         {% else %}
             <h5 class="alert alert-danger"> Form/email failed to submit with errors. Contact IT </h5>
         {% endif %}
-        {% else %}
     {% endif %}
     </div>
     </body>