[pLog-svn] r1242 - in plugins/trunk/templateeditor: class/action class/view locale

mark at devel.plogworld.net mark at devel.plogworld.net
Mon Feb 28 16:09:25 GMT 2005


Author: mark
Date: 2005-02-28 16:09:24 +0000 (Mon, 28 Feb 2005)
New Revision: 1242

Modified:
   plugins/trunk/templateeditor/class/action/pluginsiteedittemplatefileaction.class.php
   plugins/trunk/templateeditor/class/action/pluginsitetemplatesetslistaction.class.php
   plugins/trunk/templateeditor/class/action/pluginsitetemplateslistaction.class.php
   plugins/trunk/templateeditor/class/action/pluginsiteupdatetemplatefileaction.class.php
   plugins/trunk/templateeditor/class/view/pluginsitetemplatesetslistview.class.php
   plugins/trunk/templateeditor/class/view/pluginsitetemplateslistview.class.php
   plugins/trunk/templateeditor/locale/locale_en_UK.php
   plugins/trunk/templateeditor/locale/locale_zh_TW.php
Log:
Add file error handing to template editor. So, SiteTemplateEditor should be complete.

ToDo:
1. Port the function to BlogTemplateEditor
2. SmartyEditor
3. Plugin Settings for Enable/Disable "BlogTemplateEditor" and "MaxBackupFiles"

Modified: plugins/trunk/templateeditor/class/action/pluginsiteedittemplatefileaction.class.php
===================================================================
--- plugins/trunk/templateeditor/class/action/pluginsiteedittemplatefileaction.class.php	2005-02-28 14:59:55 UTC (rev 1241)
+++ plugins/trunk/templateeditor/class/action/pluginsiteedittemplatefileaction.class.php	2005-02-28 16:09:24 UTC (rev 1242)
@@ -1,7 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/action/admin/siteadminaction.class.php" );
-	include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/templateeditor/class/view/pluginsiteedittemplatefileview.class.php" );
 
 	/**

Modified: plugins/trunk/templateeditor/class/action/pluginsitetemplatesetslistaction.class.php
===================================================================
--- plugins/trunk/templateeditor/class/action/pluginsitetemplatesetslistaction.class.php	2005-02-28 14:59:55 UTC (rev 1241)
+++ plugins/trunk/templateeditor/class/action/pluginsitetemplatesetslistaction.class.php	2005-02-28 16:09:24 UTC (rev 1242)
@@ -1,7 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/action/admin/siteadminaction.class.php" );
-	include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/templateeditor/class/view/pluginsitetemplatesetslistview.class.php" );
 
 	/**

Modified: plugins/trunk/templateeditor/class/action/pluginsitetemplateslistaction.class.php
===================================================================
--- plugins/trunk/templateeditor/class/action/pluginsitetemplateslistaction.class.php	2005-02-28 14:59:55 UTC (rev 1241)
+++ plugins/trunk/templateeditor/class/action/pluginsitetemplateslistaction.class.php	2005-02-28 16:09:24 UTC (rev 1242)
@@ -1,7 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/action/admin/siteadminaction.class.php" );
-	include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/templateeditor/class/view/pluginsitetemplateslistview.class.php" );
 
 	/**

Modified: plugins/trunk/templateeditor/class/action/pluginsiteupdatetemplatefileaction.class.php
===================================================================
--- plugins/trunk/templateeditor/class/action/pluginsiteupdatetemplatefileaction.class.php	2005-02-28 14:59:55 UTC (rev 1241)
+++ plugins/trunk/templateeditor/class/action/pluginsiteupdatetemplatefileaction.class.php	2005-02-28 16:09:24 UTC (rev 1242)
@@ -1,7 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/action/admin/siteadminaction.class.php" );
-	include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/templateeditor/class/view/pluginsiteedittemplatefileview.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/templateeditor/class/view/pluginsitetemplateslistview.class.php" );
 	include_once( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );		
@@ -32,7 +31,7 @@
 
         	$view = new PluginSiteEditTemplateFileView( $this->_blogInfo, $this->_templateId, $this->_fileId, $this->_backupId );
         	$view->setErrorMessage( $this->_locale->tr("error_updating_template_file"));
-        	$this->setValidationErrorView( $view );			
+        	$this->setValidationErrorView( $view );
 		}
 		
 		function perform()
@@ -51,9 +50,20 @@
             
             $fileName = $templateFolder . $this->_fileId;
             $backupFileName = $backupFolder . $this->_fileId . "_" . time();
-            File::copy($fileName,$backupFileName);
+            if( !File::copy($fileName,$backupFileName) ) {
+            	$this->_view = new PluginSiteEditTemplateFileView( $this->_blogInfo, $this->_templateId, $this->_fileId, $this->_backupId );
+            	$this->_view->setErrorMessage( $this->_locale->tr("error_backup_template_file"));
+                $this->setCommonData();
+                return false;            	
+            }
             
         	$file = new MyFile($fileName);
+        	if( !$file->isWritable() ) {
+            	$this->_view = new PluginSiteEditTemplateFileView( $this->_blogInfo, $this->_templateId, $this->_fileId, $this->_backupId );
+            	$this->_view->setErrorMessage( $this->_locale->tr("error_updating_template_file"));
+                $this->setCommonData();
+                return false;              
+            }
             $fileContent = $file->writeFileContent( stripslashes($this->_fileContent) );
 
 			// if everything went ok...

Modified: plugins/trunk/templateeditor/class/view/pluginsitetemplatesetslistview.class.php
===================================================================
--- plugins/trunk/templateeditor/class/view/pluginsitetemplatesetslistview.class.php	2005-02-28 14:59:55 UTC (rev 1241)
+++ plugins/trunk/templateeditor/class/view/pluginsitetemplatesetslistview.class.php	2005-02-28 16:09:24 UTC (rev 1242)
@@ -19,6 +19,7 @@
 			// get a list with all the global template sets
         	$ts = new TemplateSets();
             $globalTemplates = $ts->getGlobalTemplateSets();
+            
             $this->setValue( "templates", $globalTemplates );
             $this->setValue( "defaultTemplate", $ts->getDefaultTemplateSet());
 		

Modified: plugins/trunk/templateeditor/class/view/pluginsitetemplateslistview.class.php
===================================================================
--- plugins/trunk/templateeditor/class/view/pluginsitetemplateslistview.class.php	2005-02-28 14:59:55 UTC (rev 1241)
+++ plugins/trunk/templateeditor/class/view/pluginsitetemplateslistview.class.php	2005-02-28 16:09:24 UTC (rev 1242)
@@ -37,14 +37,12 @@
 
             foreach ($cssFiles as $cssFile) {
                 $file['name'] = basename($cssFile);
-                // $file['fullPath'] = $cssFile;
                 $file['size'] = filesize($cssFile);
                 array_push ($templateFiles, $file);
             }
             
             foreach ($tplFiles as $tplFile) {
                 $file['name'] = basename($tplFile);
-                $file['fullPath'] = $tplFile;
                 $file['size'] = filesize($tplFile);
                 array_push ($templateFiles, $file);
             }

Modified: plugins/trunk/templateeditor/locale/locale_en_UK.php
===================================================================
--- plugins/trunk/templateeditor/locale/locale_en_UK.php	2005-02-28 14:59:55 UTC (rev 1241)
+++ plugins/trunk/templateeditor/locale/locale_en_UK.php	2005-02-28 16:09:24 UTC (rev 1242)
@@ -10,8 +10,10 @@
 
 $messages["error_no_files_selected"] = "No files were selected to delete.";
 $messages["error_removing_template_file"] = "There was an error deleting template file %s.";
-$messages["error_updating_template_file"] = "There was an error updating template file %s.";
+$messages["error_updating_template_file"] = "There was an error updating template file.";
+$messages["error_backup_template_file"] = "There was an error backing up template file.";
 
+
 $messages["template_file_removed_ok"] = "Template file %s deleted successfully.";
 $messages["template_files_removed_ok"] = "%s templates files deleted successfully";
 $messages["templateeditor_file_saved_ok"] = "Template file saved successfully.";

Modified: plugins/trunk/templateeditor/locale/locale_zh_TW.php
===================================================================
--- plugins/trunk/templateeditor/locale/locale_zh_TW.php	2005-02-28 14:59:55 UTC (rev 1241)
+++ plugins/trunk/templateeditor/locale/locale_zh_TW.php	2005-02-28 16:09:24 UTC (rev 1242)
@@ -5,12 +5,13 @@
 $messages["templateeditor_backupfile"] = "請選擇您要回復的備份日期,模版編輯器會自動將備份檔載入編輯器中。pLog 系統預設為儲存 5 個備份檔。";
 $messages["templateeditor_choose_backupfile"] = "請選擇要回復的備份檔";
 $messages["templateeditor_currentfile"] = "載入最新模版檔";
-$messages["templateeditor_filecontent"] = "修改模版檔案內容,完成修改後請記得按下更新。否則您將看不到任何修改效果。";
+$messages["templateeditor_filecontent"] = "修改模版檔案內容。";
 $messages["templateeditor_recover_from"] = "回覆自";
 
 $messages["error_no_files_selected"] = "您沒有選擇任何模版檔案。";
 $messages["error_removing_template_file"] = "在刪除模版檔案 %s 時發生錯誤。";
-$messages["error_updating_template_file"] = "在更新模版檔案 %s 時發生錯誤。";
+$messages["error_updating_template_file"] = "在更新模版檔案時發生錯誤。";
+$messages["error_backup_template_file"] = "在備份模版檔案時發生錯誤。";
 
 $messages["template_file_removed_ok"] = "模版檔案「%s」已順利刪除。";
 $messages["template_files_removed_ok"] = "已順利刪除「%s」個模版檔案。";




More information about the pLog-svn mailing list