[pLog-CVS] plog/class/action adminaddtemplateaction.class.php,1.1.1.1,1.2

[<fra...@us...>]

Update of /cvsroot/plog/plog/class/action
In directory sc8-pr-cvs1:/tmp/cvs-serv30925/class/action

Modified Files:
	adminaddtemplateaction.class.php 
Log Message:
Fixed some includes ...

Index: adminaddtemplateaction.class.php
===================================================================
RCS file: /cvsroot/plog/plog/class/action/adminaddtemplateaction.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** adminaddtemplateaction.class.php	24 Oct 2003 13:52:51 -0000	1.1.1.1
--- adminaddtemplateaction.class.php	3 Jan 2004 16:12:13 -0000	1.2
***************
*** 1,9 ****
  <?php
  
! 	include_once( "class/action/siteadminaction.class.php" );
      include_once( "class/view/admintemplatedview.class.php" );
      include_once( "class/view/adminerrorview.class.php" );
      include_once( "class/file/unpacker.class.php" );
      include_once( "class/data/templatevalidator.class.php" );
  
      /**
--- 1,12 ----
  <?php
  
!     include_once( "class/action/siteadminaction.class.php" );
      include_once( "class/view/admintemplatedview.class.php" );
      include_once( "class/view/adminerrorview.class.php" );
+     include_once( "class/view/adminmessageview.class.php" );
      include_once( "class/file/unpacker.class.php" );
      include_once( "class/data/templatevalidator.class.php" );
+     include_once( "class/data/stringvalidator.class.php" );
+     include_once( "class/template/templatesandbox.class.php" );
  
      /**
***************
*** 12,31 ****
      class AdminAddTemplateAction extends SiteAdminAction {
  
!     	var $_templateCode;
  
!     	function AdminAddTemplateAction( $actionInfo, $request )
          {
!         	$this->SiteAdminAction( $actionInfo, $request );
          }
  
          function validate()
          {
!         	$this->_subOp = $this->_request->getValue( "subOp" );
  
!         	if( $this->_subOp == "uploadTemplate" ) {
!             	// check that we have a file!!
                  $files = HttpVars::getFiles();
                  if( count($files) == 0 ) {
!                 	$this->_view = new AdminErrorView( $this->_blogInfo );
                      $this->_view->setValue( $this->_locale->tr("error_must_upload_file"));
                      $this->setCommonData();
--- 15,34 ----
      class AdminAddTemplateAction extends SiteAdminAction {
  
!         var $_templateCode;
  
!         function AdminAddTemplateAction( $actionInfo, $request )
          {
!             $this->SiteAdminAction( $actionInfo, $request );
          }
  
          function validate()
          {
!             $this->_subOp = $this->_request->getValue( "subOp" );
  
!             if( $this->_subOp == "uploadTemplate" ) {
!                 // check that we have a file!!
                  $files = HttpVars::getFiles();
                  if( count($files) == 0 ) {
!                     $this->_view = new AdminErrorView( $this->_blogInfo );
                      $this->_view->setValue( $this->_locale->tr("error_must_upload_file"));
                      $this->setCommonData();
***************
*** 35,42 ****
              }
              elseif( $this->_subOp == "addTemplateCode" ) {
!             	$this->_templateCode = $this->_request->getValue( "templateCode" );
                  $val = new StringValidator( $this->_templateCode );
                  if( !$val->validate()) {
!                 	$this->_view = new AdminErrorView( $this->_blogInfo );
                      $this->_view->setMessage( $this->_locale->tr("error_no_template_name"));
                      $this->setCommonData();
--- 38,45 ----
              }
              elseif( $this->_subOp == "addTemplateCode" ) {
!                 $this->_templateCode = $this->_request->getValue( "templateCode" );
                  $val = new StringValidator( $this->_templateCode );
                  if( !$val->validate()) {
!                     $this->_view = new AdminErrorView( $this->_blogInfo );
                      $this->_view->setMessage( $this->_locale->tr("error_no_template_name"));
                      $this->setCommonData();
***************
*** 52,72 ****
          {
              switch( $result ) {
!             	case ERROR_TEMPLATE_NOT_INSIDE_FOLDER:
!                 	$errorMessage = $this->_locale->tr("error_template_not_inside_folder");
                      break;
                  case ERROR_MISSING_BASE_FILES:
!                 	$errorMessage =  $this->_locale->tr("error_missing_base_files");
                      break;
                  case TEMPLATE_SANDBOX_ERROR_UNPACKING:
!                 	$errorMessage =  $this->_locale->tr("error_unpacking");
                      break;
                  case TEMPLATE_SANDBOX_ERROR_FORBIDDEN_EXTENSIONS:
!                 	$errorMessage =  $this->_locale->tr("error_forbidden_extensions");
                      break;
                  case TEMPLATE_SANDBOX_ERROR_CREATING_WORKING_FOLDER:
!                 	$errorMessage = $this->_locale->tr("error_creating_working_folder");
                      break;
                  default:
!                 	$errorMessage = $this->_locale->pr("error_checking_template", $result);
                      break;
              }
--- 55,75 ----
          {
              switch( $result ) {
!                 case ERROR_TEMPLATE_NOT_INSIDE_FOLDER:
!                     $errorMessage = $this->_locale->tr("error_template_not_inside_folder");
                      break;
                  case ERROR_MISSING_BASE_FILES:
!                     $errorMessage =  $this->_locale->tr("error_missing_base_files");
                      break;
                  case TEMPLATE_SANDBOX_ERROR_UNPACKING:
!                     $errorMessage =  $this->_locale->tr("error_unpacking");
                      break;
                  case TEMPLATE_SANDBOX_ERROR_FORBIDDEN_EXTENSIONS:
!                     $errorMessage =  $this->_locale->tr("error_forbidden_extensions");
                      break;
                  case TEMPLATE_SANDBOX_ERROR_CREATING_WORKING_FOLDER:
!                     $errorMessage = $this->_locale->tr("error_creating_working_folder");
                      break;
                  default:
!                     $errorMessage = $this->_locale->pr("error_checking_template", $result);
                      break;
              }
***************
*** 77,81 ****
          function _performUploadTemplate()
          {
!         	// handle the uploaded file
              $files    = HttpVars::getFiles();
              $uploads  = new FileUploads( $files );
--- 80,84 ----
          function _performUploadTemplate()
          {
!             // handle the uploaded file
              $files    = HttpVars::getFiles();
              $uploads  = new FileUploads( $files );
***************
*** 95,99 ****
  
              if( $valid < 0 ) {
!             	$this->_view = new AdminErrorView( $this->_blogInfo );
                  $this->_view->setMessage( $this->_checkTemplateSandboxResult( $valid ));
                  $this->setCommonData();
--- 98,102 ----
  
              if( $valid < 0 ) {
!                 $this->_view = new AdminErrorView( $this->_blogInfo );
                  $this->_view->setMessage( $this->_checkTemplateSandboxResult( $valid ));
                  $this->setCommonData();
***************
*** 113,117 ****
              $templateFolder = $config->getValue( "template_folder" );
              if( !$unpacker->unpack( $tmpFolder."/".$upload->getFileName(), $templateFolder )) {
!             	$this->_view = new AdminErrorView( $this->_blogInfo );
                  $this->_view->setMessage( $this->_locale->tr("error_installing_template"));
                  $this->setCommonData();
--- 116,120 ----
              $templateFolder = $config->getValue( "template_folder" );
              if( !$unpacker->unpack( $tmpFolder."/".$upload->getFileName(), $templateFolder )) {
!                 $this->_view = new AdminErrorView( $this->_blogInfo );
                  $this->_view->setMessage( $this->_locale->tr("error_installing_template"));
                  $this->setCommonData();
***************
*** 148,152 ****
              $valid = $templateSandbox->checkTemplateFolder( $templateName, $ts->getBaseTemplateFolder());
              if( $valid < 0 ) {
!             	$this->_view = new AdminErrorView( $this->_blogInfo );
                  $this->_view->setMessage( $this->_checkTemplateSandboxResult( $valid ));
                  $this->setCommonData();
--- 151,155 ----
              $valid = $templateSandbox->checkTemplateFolder( $templateName, $ts->getBaseTemplateFolder());
              if( $valid < 0 ) {
!                 $this->_view = new AdminErrorView( $this->_blogInfo );
                  $this->_view->setMessage( $this->_checkTemplateSandboxResult( $valid ));
                  $this->setCommonData();
***************
*** 168,176 ****
          {
              if( $this->_subOp == "uploadTemplate" )
!             	$result = $this->_performUploadTemplate();
              elseif( $this->_subOp == "addTemplateCode" )
!             	$result = $this->_performAddTemplateCode();
              else {
!             	throw( new Exception( "You shouldn't be seeing this!!! :)" ));
                  die();
              }
--- 171,179 ----
          {
              if( $this->_subOp == "uploadTemplate" )
!                 $result = $this->_performUploadTemplate();
              elseif( $this->_subOp == "addTemplateCode" )
!                 $result = $this->_performAddTemplateCode();
              else {
!                 throw( new Exception( "You shouldn't be seeing this!!! :)" ));
                  die();
              }