Dev: some cleaning

LimeSurvey · Oct 16, 2017 · ccd1d86 · ccd1d86
1 parent a401211
commit ccd1d86
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/application/models/TemplateConfig.php b/application/models/TemplateConfig.php
@@ -821,8 +821,7 @@ public static function importManifest($sTemplateName, $aDatas)
         $oNewTemplate->author_url    = ''; // privacy
         $oNewTemplate->api_version   = $aDatas['api_version'];
         $oNewTemplate->view_folder   = $aDatas['view_folder'];
-        $oNewTemplate->files_folder  = $aDatas['files_folder'];
-        //$oNewTemplate->description  TODO: a more complex modal whith email, author, url, licence, desc, etc
+        $oNewTemplate->files_folder  = $aDatas['files_folder'];        
         $oNewTemplate->owner_id      = Yii::app()->user->id;
         $oNewTemplate->extends       = $aDatas['extends'];
 

diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -227,15 +227,15 @@ public static function getInstance($sTemplateName=null, $iSurveyGroupId=null, $i
         $oTemplateConfigurationModel = new TemplateConfiguration();
 
         if ($sTemplateName!=null){
-            $oTemplateConfigurationModel = @TemplateConfiguration::getInstanceFromTemplateName($sTemplateName);
+            $oTemplateConfigurationModel = TemplateConfiguration::getInstanceFromTemplateName($sTemplateName);
         }
 
         if($iSurveyGroupId!=null && $iSurveyId==null) {
-            $oTemplateConfigurationModel = @TemplateConfiguration::getInstanceFromSurveyGroup($iSurveyGroupId, $sTemplateName);
+            $oTemplateConfigurationModel = TemplateConfiguration::getInstanceFromSurveyGroup($iSurveyGroupId, $sTemplateName);
         }
 
         if($iSurveyId!=null) {
-            $oTemplateConfigurationModel = @TemplateConfiguration::getInstanceFromSurveyId($iSurveyId, $sTemplateName);
+            $oTemplateConfigurationModel = TemplateConfiguration::getInstanceFromSurveyId($iSurveyId, $sTemplateName);
         }
 
         return $oTemplateConfigurationModel;

diff --git a/application/models/TemplateManifest.php b/application/models/TemplateManifest.php
@@ -23,7 +23,6 @@
 class TemplateManifest extends TemplateConfiguration
 {
     public $templateEditor;
-
     public $sPreviewImgTag;
 
     /**
@@ -64,7 +63,6 @@ public function getValidScreenFiles($sType = "view", $sScreen=null)
         $filesFromXML = (is_null($sScreen)) ? (array) $this->templateEditor->screens->xpath('//file') : $this->templateEditor->screens->xpath('//'.$sScreen.'/file');
 
         foreach( $filesFromXML as $file){
-
             if ( $file->attributes()->type == $sType ){
                 $aScreenFiles[] = (string) $file;
             }