Advertisement Page Fix [Added Validation and File Deletion]

system/lib/message.xml

@@ -554,6 +554,9 @@
 	 <E_ERROR_UPLOAD_ADMIN_FAILED>
 		アップロード失敗。 もう一度お試しください。
 	 </E_ERROR_UPLOAD_ADMIN_FAILED>
+	 <E_ERROR_UPLOAD_ADMIN_INVALID>
+		無効なアップロードファイル
+	 </E_ERROR_UPLOAD_ADMIN_INVALID>
 	 <E_ERROR_NO_PAGE_ACCESS>
 		あなたは次のページにアクセスするための権限を持っていません。
 	 </E_ERROR_NO_PAGE_ACCESS>

system/lib/message_en.xml

@@ -556,6 +556,9 @@
         <E_ERROR_UPLOAD_ADMIN_FAILED>
             Failed to upload file. Please Try Again
         </E_ERROR_UPLOAD_ADMIN_FAILED>
+        <E_ERROR_UPLOAD_ADMIN_INVALID>
+            Uploaded file is invalid.
+        </E_ERROR_UPLOAD_ADMIN_INVALID>
         <E_ERROR_NAME_REQUIRED>
 				Name is a mandatory field.
 		</E_ERROR_NAME_REQUIRED>

system/logic/advertisements/logic.php

@@ -22,34 +22,34 @@ class LogicAdvertisements extends AdvertisementModelClass {
 	* @return		: TRUE:ロジック成功、FALSE:ロジック失敗
 	-------------------------------------------------------------------------*/
 	function logic() {
-
 		try {
-			// 初期データ処理
-			if($this -> init()){
-				$this -> lists();
+            $this -> init();
 			
-			}elseif($this -> getType() == TYPE_IMAGE_MANAGER_UPLOAD_COMPLETE){
-				if($this -> checkChiket()) {
-					$this -> popUpSessionMessage(INFO, 'I_COMPLATE_SAVE', array());
-				}
-				$this -> insertActivity();
-				$this -> loadImageAds();
+            switch($this -> getType()){
+                case TYPE_IMAGE_MANAGER_UPLOAD_COMPLETE:
+                    $this -> insertNewAd();
                     $this -> listsImages();
-			}elseif($this -> getType() == TYPE_IMAGE_MANAGER || $this -> getType()	== TYPE_SEARCH){
+                    break;
+                case TYPE_IMAGE_MANAGER:
+                case TYPE_SEARCH:
                     $this -> listsImages();
-			}elseif($this -> getType() == TYPE_IMAGE_MANAGER_DETAIL){
+                    break;
+                case TYPE_IMAGE_MANAGER_DETAIL:
                     $this -> selectAdDetails();
-			}elseif($this -> getType() == TYPE_UPDATE){
+                    break;
+                case TYPE_UPDATE:
                     $this -> insertActivity();
                     $this -> update();
-			}elseif($this -> getType() == TYPE_DELETE){
+                    break;
+                case TYPE_DELETE:
                     $this -> insertActivity();
                     $this -> deleteAd();
                     $this -> listsImages();
-			}else{
+                    break;
+                default:
                     $this -> lists();
+                    break;
             }
-			
 		} catch (Exception $e) {
 			throw $e;
 		}
@@ -61,15 +61,19 @@ class LogicAdvertisements extends AdvertisementModelClass {
 	* @return		: なし
 	-------------------------------------------------------------------------*/
 	function lists() {
-		//set variables
-		//$where = null;
-
 		$where = $this -> getWhere();
-		//$this -> getWhere();
 		$this -> setResult($this -> accessSelect('LIST_CLICKED_ADS', $where));
-
 	}
 	
+	function insertNewAd(){ 
+	    if($this -> loadImageAds()){
+	        $this -> insertActivity();
+	        $this -> accessModify('INSERT_ADS', $this -> getImageAdRegistData());
+	        $this -> popUpSessionMessage(INFO, 'I_COMPLATE_SAVE', array());
+	    }else{
+	        $this -> popUpSessionMessage(ERROR, 'E_ERROR_UPLOAD_ADMIN_INVALID', array());
+	    }
+	}
 
 	function listsImages() {
 		$this -> setImages($this -> accessSelect('LIST_IMAGES', $this -> getWhereAds()));
@@ -89,7 +93,15 @@ class LogicAdvertisements extends AdvertisementModelClass {
 	}
 
 	function deleteAd(){
-		$this -> accessModify('DELETE_AD_FILE', $this -> getDeleteData(), false);
+	    $deleteData = $this -> getDeleteData();
+	    $adDetails  = $this -> getRowData($this -> accessSelect('SELECT_AD_DETAILS', $deleteData));
+	    
+	    $toDelete = SYSTEM_DOCUMENT_ADS."/{$adDetails["file_name"]}";
+	    
+	    if(@file_exists($toDelete))
+	        unlink($toDelete);
+	    
+	    $this -> accessModify('DELETE_AD_FILE', $deleteData, false);
 	}
 
     function insertActivity(){