[BF] - Customer Notes spam

inex · Jul 15, 2019 · 976f9bf · 976f9bf
1 parent 9e17870
commit 976f9bf
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 20 deletions.
diff --git a/app/Http/Controllers/Api/V4/Customer/Note/CustomerNotesController.php b/app/Http/Controllers/Api/V4/Customer/Note/CustomerNotesController.php
@@ -28,22 +28,21 @@
 use IXP\Exceptions\GeneralException;
 
 use IXP\Http\Controllers\Controller;
+
 use Illuminate\Http\{
     JsonResponse,
     Request
 };
 
-
 use Entities\{
-    Customer as CustomerEntity, CustomerNote as CustomerNoteEntity, CustomerNote
+    Customer as CustomerEntity,
+    CustomerNote as CustomerNoteEntity
 };
 
-
-
 use IXP\Events\Customer\Note\{
     Added       as CustomerNoteAddedEvent,
     Deleted     as CustomerNoteDeletedEvent,
-    Edited     as CustomerNoteUpdatedEvent
+    Edited      as CustomerNoteUpdatedEvent
 };
 
 /**
@@ -65,7 +64,8 @@ class CustomerNotesController extends Controller
      *
      * @throws
      */
-    public function add( Request $request ): JsonResponse{
+    public function add( Request $request ): JsonResponse
+    {
 
         /** @var CustomerEntity $c */
         if( !( $c = D2EM::getRepository( CustomerEntity::class )->find( $request->input( 'custid' ) ) ) ) {
@@ -118,7 +118,8 @@ public function add( Request $request ): JsonResponse{
      *
      * @throws
      */
-    public function get( int $id = null ) {
+    public function get( int $id = null )
+    {
         if( !( $n = D2EM::getRepository( CustomerNoteEntity::class )->find( $id ) ) ) {
             abort( 404, 'Note not found.' );
         }
@@ -147,7 +148,8 @@ public function get( int $id = null ) {
      *
      * @throws
      */
-    public function delete( int $id = null ) : JsonResponse {
+    public function delete( int $id = null ) : JsonResponse
+    {
         if( !( $n = D2EM::getRepository( CustomerNoteEntity::class )->find( $id ) ) ) {
             abort( 404, 'Note not found.' );
         }
@@ -167,9 +169,10 @@ public function delete( int $id = null ) : JsonResponse {
      *
      * @param int|null $id
      * @return JsonResponse
-     * @throws \Doctrine\ORM\OptimisticLockException
+     * @throws
      */
-    public function ping( int $id = null ): JsonResponse {
+    public function ping( int $id = null ): JsonResponse
+    {
 
         if( Auth::getUser()->isSuperUser() ) {
             if( !( $c = D2EM::getRepository( CustomerEntity::class )->find( $id ) ) ) {
@@ -189,30 +192,39 @@ public function ping( int $id = null ): JsonResponse {
 
     /**
      * @param int $id  Customer ID
+     *
      * @return JsonResponse
+     *
      * @throws
      */
-    public function notifyToggleCustomer( int $id ): JsonResponse {
+    public function notifyToggleCustomer( int $id ): JsonResponse
+    {
         return  $this->notifyToggle( $id, null );
     }
 
     /**
      * @param int $id Note ID
+     *
      * @return JsonResponse
+     *
      * @throws
      */
-    public function notifyToggleNote( int $id ): JsonResponse {
+    public function notifyToggleNote( int $id ): JsonResponse
+    {
         return  $this->notifyToggle( null, $id );
     }
 
     /**
+     *
      * @param int|null $custid
      * @param int|null $noteId
+     *
      * @return JsonResponse
-     * @throws \Doctrine\ORM\OptimisticLockException
-     * @throws GeneralException
+     *
+     * @throws
      */
-    private function notifyToggle( int $custid = null, int $noteId = null ): JsonResponse {
+    private function notifyToggle( int $custid = null, int $noteId = null ): JsonResponse
+    {
         if( $custid ) {
             $id   = $custid;
             $name = sprintf( "customer-notes.%d.notify", $id );

diff --git a/app/Http/Controllers/Customer/CustomerNotesController.php b/app/Http/Controllers/Customer/CustomerNotesController.php
@@ -45,13 +45,15 @@
  * @copyright  Copyright (C) 2009 - 2019 Internet Neutral Exchange Association Company Limited By Guarantee
  * @license    http://www.gnu.org/licenses/gpl-2.0.html GNU GPL V2.0
  */
-class CustomerNotesController extends Controller {
+class CustomerNotesController extends Controller
+{
 
     /**
      * @return RedirectResponse
-     * @throws \Doctrine\ORM\OptimisticLockException
+     * @throws
      */
-    public function readAll() : RedirectResponse{
+    public function readAll() : RedirectResponse
+    {
         $lastReads = Auth::getUser()->getAssocPreference( 'customer-notes' )[0];
         foreach( $lastReads as $id => $data ) {
             if( is_numeric( $id ) )
@@ -69,7 +71,8 @@ public function readAll() : RedirectResponse{
      *
      * @return View
      */
-    public function unreadNotes() : View {
+    public function unreadNotes() : View
+    {
         $lastRead = Auth::getUser()->getAssocPreference( 'customer-notes' )[0];
 
         $latestNotes = [];

diff --git a/app/Listeners/Customer/Note/EmailOnChange.php b/app/Listeners/Customer/Note/EmailOnChange.php
@@ -107,7 +107,7 @@ public function handle( $e )
             $to = [ config( 'ixp_fe.customer.notes.only_send_to' ) ];
         } else {
             // get admin users
-            $users = D2EM::getRepository( UserEntity::class )->findBy( [ 'privs' => UserEntity::AUTH_SUPERUSER ] );
+            $users = D2EM::getRepository( UserEntity::class )->findBy( [ 'privs' => UserEntity::AUTH_SUPERUSER, 'disabled' => false ] );
             $to = [];
 
             foreach( $users as $user ) {