Dev Show proper error message on template rename if a template under …

…that name already exists
LimeSurvey · Oct 23, 2013 · fbaf7e2 · fbaf7e2
1 parent d008906
commit fbaf7e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -559,7 +559,7 @@
 * Default is 'stable'
 * @var string
 */
-$config['updatenotification'] = 'stable';
+$config['updatenotification'] = 'both';
 
 
 // === Advanced Setup

diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php
@@ -411,8 +411,10 @@ public function templaterename()
             $olddirname = Yii::app()->getConfig('usertemplaterootdir') . "/" . returnGlobal('copydir');
             if (isStandardTemplate(returnGlobal('newname')))
                 $this->getController()->error(sprintf($clang->gT("Template could not be renamed to `%s`.", "js"), $newname) . " " . $clang->gT("This name is reserved for standard template.", "js"));
+            elseif (file_exists($newdirname))
+                $this->getController()->error(sprintf($clang->gT("Template could not be renamed to `%s`.", "js"), $newname) . " " . $clang->gT("A template with that name already exists.", "js"));
             elseif (rename($olddirname, $newdirname) == false)
-                $this->getController()->error(sprintf($clang->gT("Directory could not be renamed to `%s`.", "js"), $newname) . " " . $clang->gT("Maybe you don't have permission.", "js"));
+                $this->getController()->error(sprintf($clang->gT("Template could not be renamed to `%s`.", "js"), $newname) . " " . $clang->gT("Maybe you don't have permission.", "js"));
             else
             {
                 Survey::model()->updateAll(array( 'template' => $newname ), "template = '{$oldname}'" );