[pLog-CVS] plog/class/action adminaddlinkaction.class.php,1.3,1.4 adminnewlinkaction.class.php,1.1.1.1,1.2

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

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

Modified Files:
	adminaddlinkaction.class.php adminnewlinkaction.class.php 
Log Message:
Includes fixes ...

Index: adminaddlinkaction.class.php
===================================================================
RCS file: /cvsroot/plog/plog/class/action/adminaddlinkaction.class.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** adminaddlinkaction.class.php	3 Nov 2003 16:28:24 -0000	1.3
--- adminaddlinkaction.class.php	3 Jan 2004 17:24:28 -0000	1.4
***************
*** 1,7 ****
  <?php
  
! 	include_once( "class/action/adminaction.class.php" );
      include_once( "class/dao/mylinks.class.php" );
      include_once( "class/dao/mylink.class.php" );
  
      /**
--- 1,9 ----
  <?php
  
!     include_once( "class/action/adminaction.class.php" );
      include_once( "class/dao/mylinks.class.php" );
      include_once( "class/dao/mylink.class.php" );
+     include_once( "class/view/adminerrorview.class.php" );
+     include_once( "class/view/adminmessageview.class.php" );
  
      /**
***************
*** 10,19 ****
      class AdminAddLinkAction extends AdminAction {
  
!     	var $_linkName;
          var $_linkUrl;
          var $_linkDescription;
          var $_linkCategoryId;
  
!     	/**
           * Constructor. If nothing else, it also has to call the constructor of the parent
           * class, BlogAction with the same parameters
--- 12,21 ----
      class AdminAddLinkAction extends AdminAction {
  
!         var $_linkName;
          var $_linkUrl;
          var $_linkDescription;
          var $_linkCategoryId;
  
!         /**
           * Constructor. If nothing else, it also has to call the constructor of the parent
           * class, BlogAction with the same parameters
***************
*** 21,25 ****
          function AdminAddLinkAction( $actionInfo, $request )
          {
!         	$this->AdminAction( $actionInfo, $request );
          }
  
--- 23,27 ----
          function AdminAddLinkAction( $actionInfo, $request )
          {
!             $this->AdminAction( $actionInfo, $request );
          }
  
***************
*** 29,33 ****
          function validate()
          {
!         	$this->_linkName = $this->_request->getValue( "linkName" );
              $this->_linkUrl  = $this->_request->getValue( "linkUrl" );
              $this->_linkCategoryId = $this->_request->getValue( "linkCategoryId" );
--- 31,35 ----
          function validate()
          {
!             $this->_linkName = $this->_request->getValue( "linkName" );
              $this->_linkUrl  = $this->_request->getValue( "linkUrl" );
              $this->_linkCategoryId = $this->_request->getValue( "linkCategoryId" );
***************
*** 51,64 ****
          function perform()
          {
!         	// check if the link given by the user has http:// or https:// in front.
              // if not there, we will then add it...
              if( !preg_match("/^https?:\/\/.*$/i", $this->_linkUrl))
!             	$this->_linkUrl = "http://".$this->_linkUrl;
  
!         	// adds the new link to the database
              $myLinks = new MyLinks();
              $myLink  = new MyLink( $this->_linkName, $this->_linkDescription, $this->_linkUrl, $this->_blogInfo->getId(), $this->_linkCategoryId );
              if( !$myLinks->addMyLink( $myLink, $this->_blogInfo->getId())) {
!             	$this->_view = new AdminErrorView( $this->_blogInfo );
                  $this->_view->setMessage( $this->_locale->tr("error_adding_link"));
                  $this->setCommonData();
--- 53,66 ----
          function perform()
          {
!             // check if the link given by the user has http:// or https:// in front.
              // if not there, we will then add it...
              if( !preg_match("/^https?:\/\/.*$/i", $this->_linkUrl))
!                 $this->_linkUrl = "http://".$this->_linkUrl;
  
!             // adds the new link to the database
              $myLinks = new MyLinks();
              $myLink  = new MyLink( $this->_linkName, $this->_linkDescription, $this->_linkUrl, $this->_blogInfo->getId(), $this->_linkCategoryId );
              if( !$myLinks->addMyLink( $myLink, $this->_blogInfo->getId())) {
!                 $this->_view = new AdminErrorView( $this->_blogInfo );
                  $this->_view->setMessage( $this->_locale->tr("error_adding_link"));
                  $this->setCommonData();

Index: adminnewlinkaction.class.php
===================================================================
RCS file: /cvsroot/plog/plog/class/action/adminnewlinkaction.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** adminnewlinkaction.class.php	24 Oct 2003 13:52:58 -0000	1.1.1.1
--- adminnewlinkaction.class.php	3 Jan 2004 17:24:28 -0000	1.2
***************
*** 1,6 ****
  <?php
  
! 	include_once( "class/action/adminaction.class.php" );
      include_once( "class/view/adminnewlinkview.class.php" );
      include_once( "class/dao/mylinkscategories.class.php" );
      include_once( "class/dao/mylinkscategory.class.php" );
--- 1,7 ----
  <?php
  
!     include_once( "class/action/adminaction.class.php" );
      include_once( "class/view/adminnewlinkview.class.php" );
+     include_once( "class/view/adminerrorview.class.php" );
      include_once( "class/dao/mylinkscategories.class.php" );
      include_once( "class/dao/mylinkscategory.class.php" );
***************
*** 11,15 ****
      class AdminNewLinkAction extends AdminAction {
  
!     	/**
           * Constructor. If nothing else, it also has to call the constructor of the parent
           * class, BlogAction with the same parameters
--- 12,16 ----
      class AdminNewLinkAction extends AdminAction {
  
!         /**
           * Constructor. If nothing else, it also has to call the constructor of the parent
           * class, BlogAction with the same parameters
***************
*** 17,21 ****
          function AdminNewLinAction( $actionInfo, $request )
          {
!         	$this->AdminAction( $actionInfo, $request );
          }
  
--- 18,22 ----
          function AdminNewLinAction( $actionInfo, $request )
          {
!             $this->AdminAction( $actionInfo, $request );
          }
  
***************
*** 25,34 ****
          function perform()
          {
!         	// fetch all the link categories
              $mylinksCategories = new MyLinksCategories();
              $blogMyLinksCategories = $mylinksCategories->getMyLinksCategories( $this->_blogInfo->getId());
              // if there is none, we should not be allowed to add any link!
              if( empty($blogMyLinksCategories)) {
!             	$this->_view = new AdminErrorView( $this->_blogInfo );
                  $this->_view->setMessage( $this->_locale->tr("error_must_have_one_link_category" ));
                  $this->setCommonData();
--- 26,35 ----
          function perform()
          {
!             // fetch all the link categories
              $mylinksCategories = new MyLinksCategories();
              $blogMyLinksCategories = $mylinksCategories->getMyLinksCategories( $this->_blogInfo->getId());
              // if there is none, we should not be allowed to add any link!
              if( empty($blogMyLinksCategories)) {
!                 $this->_view = new AdminErrorView( $this->_blogInfo );
                  $this->_view->setMessage( $this->_locale->tr("error_must_have_one_link_category" ));
                  $this->setCommonData();
***************
*** 38,42 ****
  
              // else, put that in the template and continue
!         	$this->_view = new AdminNewLinkView( $this->_blogInfo );
              $this->_view->setValue( "linkcategories", $blogMyLinksCategories );
              $this->setCommonData();
--- 39,43 ----
  
              // else, put that in the template and continue
!             $this->_view = new AdminNewLinkView( $this->_blogInfo );
              $this->_view->setValue( "linkcategories", $blogMyLinksCategories );
              $this->setCommonData();