New feature: Purge survey files possibly left from erroneous delete

application/controllers/admin/globalsettings.php

@@ -160,7 +160,8 @@ protected function getSurveyFolderStorage($uploaddir, $decimals)
                     'sizeInBytes' => $size,
                     'size'        => humanFilesize($size, $decimals),
                     'name'        => empty($surveyinfo['name']) ? '(' . gT('deleted') . ')' : $surveyinfo['name'],
-                    'showPurgeButton' => Permission::model()->hasGlobalPermission('superadmin','delete')
+                    'deleted'     => empty($surveyinfo['name']),
+                    'showPurgeButton' => Permission::model()->hasGlobalPermission('superadmin', 'delete')
                                          && empty($surveyinfo['name']),
                     'sid'         => $surveyId
                 );

application/controllers/admin/surveyadmin.php

@@ -767,6 +767,41 @@ public function delete($iSurveyID)
         $this->_renderWrappedTemplate('survey', $aViewUrls, $aData);
     }
 
+    /**
+     * Remove files not deleted properly.
+     * Purge is only available for surveys that were already deleted but for some reason
+     * left files behind.
+     * @param int $purge_sid
+     * @return void
+     */
+    public function purge($purge_sid)
+    {
+        $purge_sid = (int) $purge_sid;
+        if (Permission::model()->hasGlobalPermission('superadmin', 'delete')) {
+            $survey = Survey::model()->findByPk($purge_sid);
+            if (empty($survey)) {
+                $result = rmdirr(Yii::app()->getConfig('uploaddir') . '/surveys/' . $purge_sid);
+                if ($result) {
+                    Yii::app()->user->setFlash('success', gT('Survey files deleted.'));
+                } else {
+                    Yii::app()->user->setFlash('error', gT('Error: Could not delete survey files.'));
+                }
+            } else {
+                // Should not be possible.
+                Yii::app()->user->setFlash(
+                    'error',
+                    gT('Error: Cannot purge files for a survey that is not deleted. Please delete the survey normally in the survey view.')
+                );
+            }
+        } else {
+            Yii::app()->user->setFlash('error', gT('Access denied'));
+        }
+
+        $this->getController()->redirect(
+            $this->getController()->createUrl('admin/globalsettings')
+        );
+    }
+
     /**
     * Takes the edit call from the detailed survey view, which either deletes the survey information
     */

application/views/admin/global_settings/_storage_ajax.php

@@ -39,15 +39,20 @@
         <tr>
             <td style='width: 70%;'>
                 <?php echo $survey['name']; ?>
-                (<a href="<?php echo $this->createUrl('admin/survey', array('sa' => 'view', 'surveyid' => $survey['sid'])); ?>"><?php echo $survey['sid']; ?></a>)
+                <?php if ($survey['deleted']): ?>
+                    (<?php echo $survey['sid']; ?>)
+                <?php else: ?>
+                    (<a href="<?php echo $this->createUrl('admin/survey', array('sa' => 'view', 'surveyid' => $survey['sid'])); ?>"><?php echo $survey['sid']; ?></a>)
+                <?php endif; ?>
             </td>
             <td>
                 <?php echo $survey['size']; ?>
                 <?php if ($survey['showPurgeButton']): ?>
                     <span
                         class='fa fa-trash pull-right btn btn-danger btn-xs'
                         data-toggle='tooltip'
-                        title='<?php eT('Purge survey'); ?>'
+                        onclick='window.location = "<?php echo $this->createUrl('admin/survey', array('sa' => 'purge', 'purge_sid' => $survey['sid'])); ?>"'
+                        title='<?php eT('Delete survey files'); ?>'
                     >
                     </span>
                 <?php endif; ?>