[pLog-svn] r7079 - plugins/branches/lifetype-1.2/templateeditor/class/action

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Fri Oct 22 14:05:21 EDT 2010


Author: jondaley
Date: 2010-10-22 14:05:21 -0400 (Fri, 22 Oct 2010)
New Revision: 7079

Modified:
   plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatefileaction.class.php
   plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php
   plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatefileaction.class.php
   plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatesetaction.class.php
Log:
typos, and invalid objects

Modified: plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatefileaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatefileaction.class.php	2010-10-22 17:07:57 UTC (rev 7078)
+++ plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatefileaction.class.php	2010-10-22 18:05:21 UTC (rev 7079)
@@ -29,11 +29,11 @@
             $this->_subFolderId = $this->_request->getValue( "subFolderId" );
             $this->_fileId = $this->_request->getValue( "fileId" );
             $this->_newFileId = $this->_request->getValue( "newFileId" );
-            if( !$this->isValidTamplateFileName( $this->_newFileId ) ) {
+            if( !$this->isValidTemplateFileName( $this->_newFileId ) ) {
                 if ( empty($this->_subFolderId) ) {
-                    $view = new PluginBlogTemplatesListView( $this->_blogInfo, $this->_templateId );
+                    $this->_view = new PluginBlogTemplatesListView( $this->_blogInfo, $this->_templateId );
                 } else {
-                    $view = new PluginBlogTemplateSubFolderListView( $this->_blogInfo, $this->_templateId, $this->_subFolderId );
+                    $this->_view = new PluginBlogTemplateSubFolderListView( $this->_blogInfo, $this->_templateId, $this->_subFolderId );
                 } 
                 $this->_view->setErrorMessage( $this->_locale->tr("templateeditor_error_templatefile_name"));
                 $this->setCommonData();
@@ -42,9 +42,9 @@
             }
             if( !$this->isValidExtension( $this->_newFileId ) ) {
                 if ( empty($this->_subFolderId) ) {
-                    $view = new PluginBlogTemplatesListView( $this->_blogInfo, $this->_templateId );
+                    $this->_view = new PluginBlogTemplatesListView( $this->_blogInfo, $this->_templateId );
                 } else {
-                    $view = new PluginBlogTemplateSubFolderListView( $this->_blogInfo, $this->_templateId, $this->_subFolderId );
+                    $this->_view = new PluginBlogTemplateSubFolderListView( $this->_blogInfo, $this->_templateId, $this->_subFolderId );
                 }
                 $this->_view->setErrorMessage( $this->_locale->tr("templateeditor_error_templatefile_extension"));
                 $this->setCommonData();
@@ -109,7 +109,7 @@
             return true;
         }
 
-        function isValidTamplateFileName( $name )
+        function isValidTemplateFileName( $name )
         {
 		    $pattern = '/^[a-zA-Z0-9\._-]*$/';
             if (preg_match($pattern, $name) ) {

Modified: plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php	2010-10-22 17:07:57 UTC (rev 7078)
+++ plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php	2010-10-22 18:05:21 UTC (rev 7079)
@@ -26,7 +26,7 @@
 		{
             $this->_templateId = $this->_request->getValue( "templateId" );
             $this->_newTemplateId = $this->_request->getValue( "newTemplateId" );
-            if( !$this->isValidTamplateSetName( $this->_newTemplateId ) || !$this->isValidTamplateSetName( $this->_templateId )) {
+            if( !$this->isValidTemplateSetName( $this->_newTemplateId ) || !$this->isValidTemplateSetName( $this->_templateId )) {
                 $this->_view = new PluginBlogTemplateSetsListView( $this->_blogInfo );
                 $this->_view->setErrorMessage( $this->_locale->tr("templateeditor_error_templateset_name"));
                 $this->setCommonData();
@@ -122,7 +122,7 @@
             return true;
         }
 
-        function isValidTamplateSetName( $name )
+        function isValidTemplateSetName( $name )
         {
 		    $pattern = '/^[a-zA-Z0-9_-]*$/';
             if (preg_match($pattern, $name) ) {

Modified: plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatefileaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatefileaction.class.php	2010-10-22 17:07:57 UTC (rev 7078)
+++ plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatefileaction.class.php	2010-10-22 18:05:21 UTC (rev 7079)
@@ -29,11 +29,11 @@
             $this->_subFolderId = $this->_request->getValue( "subFolderId" );
             $this->_fileId = $this->_request->getValue( "fileId" );
             $this->_newFileId = $this->_request->getValue( "newFileId" );
-            if( !$this->isValidTamplateFileName( $this->_newFileId ) ) {
+            if( !$this->isValidTemplateFileName( $this->_newFileId ) ) {
                 if ( empty($this->_subFolderId) ) {
-                    $view = new PluginSiteTemplatesListView( $this->_blogInfo, $this->_templateId );
+                    $this->_view = new PluginSiteTemplatesListView( $this->_blogInfo, $this->_templateId );
                 } else {
-                    $view = new PluginSiteTemplateSubFolderListView( $this->_blogInfo, $this->_templateId, $this->_subFolderId );
+                    $this->_view = new PluginSiteTemplateSubFolderListView( $this->_blogInfo, $this->_templateId, $this->_subFolderId );
                 } 
                 $this->_view->setErrorMessage( $this->_locale->tr("templateeditor_error_templatefile_name"));
                 $this->setCommonData();
@@ -109,7 +109,7 @@
             return true;
         }
 
-        function isValidTamplateFileName( $name )
+        function isValidTemplateFileName( $name )
         {
 		    $pattern = '/^[a-zA-Z0-9\._-]*$/';
             if (preg_match($pattern, $name) ) {

Modified: plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatesetaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatesetaction.class.php	2010-10-22 17:07:57 UTC (rev 7078)
+++ plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatesetaction.class.php	2010-10-22 18:05:21 UTC (rev 7079)
@@ -25,7 +25,7 @@
 		{
             $this->_templateId = $this->_request->getValue( "templateId" );
             $this->_newTemplateId = $this->_request->getValue( "newTemplateId" );
-            if( !$this->isValidTamplateSetName( $this->_newTemplateId ) || !$this->isValidTamplateSetName( $this->_templateId )) {
+            if( !$this->isValidTemplateSetName( $this->_newTemplateId ) || !$this->isValidTemplateSetName( $this->_templateId )) {
                 $this->_view = new PluginSiteTemplateSetsListView( $this->_blogInfo );
                 $this->_view->setErrorMessage( $this->_locale->tr("templateeditor_error_templateset_name"));
                 $this->setCommonData();
@@ -79,7 +79,7 @@
             return true;
         }
 
-        function isValidTamplateSetName( $name )
+        function isValidTemplateSetName( $name )
         {
 		    $pattern = '/^[a-zA-Z0-9_-]*$/';
             if (preg_match($pattern, $name) ) {



More information about the pLog-svn mailing list