Ver Fonte

Ticket #4558 - Build-in API support: Alert before file uploading.

AntonLV há 2 anos atrás
pai
commit
ef2f3b5e6d

+ 9 - 7
modules/boonex/opencv/classes/BxOpencvAlerts.php

@@ -23,15 +23,17 @@ class BxOpencvAlerts extends BxDolAlertsResponse
             $sStorages = getParam('bx_opencv_option_storages');
             $aStorages = explode(',', $sStorages);
             if (in_array($o->aExtras['storage_object'], $aStorages)) {
-
-                $oProfile = BxDolProfile::getInstance($o->iSender);
-                if ($oProfile) {
+                $bObfuscateFaces = false;
+                if(($oProfile = BxDolProfile::getInstance($o->iSender)) !== false) {
                     $aInfo = bx_srv($oProfile->getModule(), 'get_content_info_by_profile_id', [$o->iSender]);
-                    if (isset($aInfo['obfuscate_faces']) && $aInfo['obfuscate_faces']) {
-                        $oModule = BxDolModule::getInstance('bx_opencv');
-                        $oModule->serviceProcessImage($o->aExtras['file_path'], isset($o->aExtras['ext']) ? $o->aExtras['ext'] : 'jpg');
-                    }
+                    $bObfuscateFaces = isset($aInfo['obfuscate_faces']) && $aInfo['obfuscate_faces'];
                 }
+
+                if(($mixedObfuscateFaces = bx_get('obfuscate_faces')) !== false)
+                    $bObfuscateFaces = (int)$mixedObfuscateFaces == 1;
+
+                if ($bObfuscateFaces)
+                    bx_srv('bx_opencv', 'process_image', [$o->aExtras['file_path'], isset($o->aExtras['ext']) ? $o->aExtras['ext'] : 'jpg']);
             }
         }
     }    

+ 0 - 8
storage_uploader.php

@@ -72,14 +72,6 @@ switch ($sAction) {
 
         bx_import('BxDolLanguages');
 
-        bx_alert('system', 'upload_file_before', 0, false, [
-            'uploader_object' => $sUploaderObject,
-            'storage_object' => $sStorageObject,
-            'uniq_id' => $sUniqId,
-            'is_multiple' => $isMultiple,
-            'is_private' => $isPrivate,
-        ]);
-
         $oUploader->handleUploads(bx_get_logged_profile_id(), isset($_FILES['f']) ? $_FILES['f'] : null, $isMultiple, $iContentId, $isPrivate);
         break;
 

+ 0 - 8
template/scripts/BxBaseUploaderServices.php

@@ -76,14 +76,6 @@ class BxBaseUploaderServices extends BxDol
                 break;
 
             case 'upload':
-                bx_alert('system', 'upload_file_before', 0, false, [
-                    'uploader_object' => $sUploaderObject,
-                    'storage_object' => $sStorageObject,
-                    'uniq_id' => $sUniqId,
-                    'is_multiple' => $isMultiple,
-                    'is_private' => $isPrivate,
-                ]);
-
                 return $oUploader->handleUploads(bx_get_logged_profile_id(), isset($_FILES['f']) ? $_FILES['f'] : null, $isMultiple, $iContentId, $isPrivate);
                 break;