Changeset 2663:8dd9be9b33c1 for plugins/themeEditor/class.themeEditor.php

Timestamp:

02/14/14 22:05:36 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add reset button in theme editor (available only on template file and if there is a model, from parent or from template set), addresses #1703

File:

• plugins/themeEditor/class.themeEditor.php (modified) (3 diffs)

plugins/themeEditor/class.themeEditor.php

@@ -158 +158 @@
      }
 
+     public function deletableFile($type,$f)
+     {
+          if ($type != 'tpl') {
+               // Only tpl files may be deleted
+               return false;
+          }
+
+          $files = $this->getFilesFromType($type);
+          if (isset($files[$f])) {
+               $dest = $this->getDestinationFile($type,$f);
+               if ($dest) {
+                    if (file_exists($dest) && is_writable($dest)) {
+                         // Is there a model (parent theme or template set) ?
+                         if (isset($this->tpl_model[$f])) {
+                              return true;
+                         }
+                    }
+               }
+          }
+          return false;
+     }
+
+     public function deleteFile($type,$f)
+     {
+          if ($type != 'tpl') {
+               // Only tpl files may be deleted
+               return;
+          }
+
+          $files = $this->getFilesFromType($type);
+          if (!isset($files[$f])) {
+               throw new Exception(__('File does not exist.'));
+          }
+
+          try
+          {
+               $dest = $this->getDestinationFile($type,$f);
+               if ($dest) {
+                    // File exists and may be deleted
+                    unlink($dest);
+
+                    // Updating template files list
+                    $this->findTemplates();
+               }
+          }
+          catch (Exception $e)
+          {
+               throw new Exception(sprintf(__('Unable to delete file %s. Please check your theme files and folders permissions.'),$f));
+          }
+     }
+
      protected function getDestinationFile($type,$f)
      {
@@ -235 +286 @@
           $this->tpl = array_merge(
                $this->getFilesInDir($this->tplset_theme),
-               $this->getFilesInDir($this->parent_theme.'/tpl'),
-               $this->getFilesInDir($this->user_theme.'/tpl')
+               $this->getFilesInDir($this->parent_theme.'/tpl')
                );
+          $this->tpl_model = $this->tpl;
+
+          $this->tpl = array_merge($this->tpl,$this->getFilesInDir($this->user_theme.'/tpl'));
 
           # Then we look in 'default-templates' plugins directory
@@ -243 +296 @@
           foreach ($plugins as $p) {
                $this->tpl = array_merge($this->getFilesInDir($p['root'].'/default-templates'),$this->tpl);
+               $this->tpl_model = array_merge($this->getFilesInDir($p['root'].'/default-templates'),$this->tpl_model);
           }