Properly delete images when they are deleted in an admin setting.

lib.php

@@ -83,33 +83,34 @@ function theme_photo_update_settings_images($settingname) {
     // This is the component name the setting is stored in.
     $component = 'theme_photo';
 
+
     // This is the value of the admin setting which is the filename of the uploaded file.
     $filename = get_config($component, $settingname);
     // We extract the file extension because we want to preserve it.
     $extension = substr($filename, strrpos($filename, '.') + 1);
 
     // This is the path in the moodle internal file system.
     $fullpath = "/{$syscontext->id}/{$component}/{$settingname}/0{$filename}";
+
+    // This location matches the searched for location in theme_config::resolve_image_location.
+    $pathname = $CFG->dataroot . '/pix_plugins/theme/photo/' . $settingname . '.' . $extension;
+
+    // This pattern matches any previous files with maybe different file extensions.
+    $pathpattern = $CFG->dataroot . '/pix_plugins/theme/photo/' . $settingname . '.*';
+
+    // Make sure this dir exists.
+    @mkdir($CFG->dataroot . '/pix_plugins/theme/photo/', $CFG->directorypermissions, true);
+
+    // Delete any existing files for this setting.
+    foreach (glob($pathpattern) as $filename) {
+        @unlink($filename);
+    }
+
     // Get an instance of the moodle file storage.
     $fs = get_file_storage();
     // This is an efficient way to get a file if we know the exact path.
     if ($file = $fs->get_file_by_hash(sha1($fullpath))) {
         // We got the stored file - copy it to dataroot.
-        // This location matches the searched for location in theme_config::resolve_image_location.
-        $pathname = $CFG->dataroot . '/pix_plugins/theme/photo/' . $settingname . '.' . $extension;
-
-        // This pattern matches any previous files with maybe different file extensions.
-        $pathpattern = $CFG->dataroot . '/pix_plugins/theme/photo/' . $settingname . '.*';
-
-        // Make sure this dir exists.
-        @mkdir($CFG->dataroot . '/pix_plugins/theme/photo/', $CFG->directorypermissions, true);
-
-        // Delete any existing files for this setting.
-        foreach (glob($pathpattern) as $filename) {
-            @unlink($filename);
-        }
-
-        // Copy the current file to this location.
         $file->copy_content_to($pathname);
     }
 

version.php

@@ -26,7 +26,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 // This is the version of the plugin.
-$plugin->version = 2017010300;
+$plugin->version = 2017022000;
 
 // This is the version of Moodle this plugin requires.
 $plugin->requires = 2016112900.00;
@@ -44,5 +44,5 @@
 $plugin->maturity = MATURITY_STABLE;
 
 // This is the named version.
-$plugin->release = 1.2;
+$plugin->release = 1.3;