[pLog-CVS] plog summary.php,1.4.4.3,1.4.4.4 register.php,1.4,1.4.4.1

[Oscar R. <phu...@us...>]

Update of /cvsroot/plog/plog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29615

Modified Files:
      Tag: PLOG_0_3_2_DEVEL
	summary.php register.php 
Log Message:



Index: register.php
===================================================================
RCS file: /cvsroot/plog/plog/register.php,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** register.php	19 Mar 2004 05:17:00 -0000	1.4
--- register.php	6 Jul 2004 15:31:31 -0000	1.4.4.1
***************
*** 26,30 ****
      include_once( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
      include_once( PLOG_CLASS_PATH."class/action/action.class.php" );
-     include_once( PLOG_CLASS_PATH."class/template/template.class.php" );
      include_once( PLOG_CLASS_PATH."class/view/view.class.php" );
      include_once( PLOG_CLASS_PATH."class/database/adodb/adodb.inc.php" );
--- 26,29 ----
***************
*** 34,41 ****
      include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
      include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
-     include_once( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
      include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
-     include_once( PLOG_CLASS_PATH."class/dao/article.class.php" );
      include_once( PLOG_CLASS_PATH."class/misc/version.class.php" );
  
      // maps used to map requests with actions
--- 33,39 ----
      include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
      include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
      include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
      include_once( PLOG_CLASS_PATH."class/misc/version.class.php" );
+     include_once( PLOG_CLASS_PATH."class/locale/locales.class.php" );
  
      // maps used to map requests with actions
***************
*** 222,236 ****
              $blogInfo = $blogs->getBlogInfo( $newblogId );
              $rg = new RequestGenerator( $blogInfo );
!             $blogUrl = $rg->blogLink($blogInfo);
  
              // if the blog was created, we can add some basic information
              // add a category
              $articleCategories = new ArticleCategories();
!             $articleCategory = new ArticleCategory( "General", "", $newblogId, true );
              $catId = $articleCategories->addArticleCategory( $articleCategory );
  
              // add an article based on that category
!             $articleTopic = "Congratulations, it worked!";
!             $articleText  = "If you can read this, it means that your signup and registration was successful and that you can start blogging.";
              $article = new Article( $articleTopic, $articleText, $catId, $this->_userId, $newblogId, 'published', 0 );
              $article->setDateObject( new Timestamp());  // set it to the current date
--- 220,238 ----
              $blogInfo = $blogs->getBlogInfo( $newblogId );
              $rg = new RequestGenerator( $blogInfo );
!             $blogUrl = $rg->blogLink();
!             
!             // get the default locale configured for the site
!             $config =& Config::getConfig();
!             $locale =& Locales::getLocale( $config->getValue( "default_locale" ));
  
              // if the blog was created, we can add some basic information
              // add a category
              $articleCategories = new ArticleCategories();
!             $articleCategory = new ArticleCategory( $locale->tr("register_default_category" ), "", $newblogId, true );
              $catId = $articleCategories->addArticleCategory( $articleCategory );
  
              // add an article based on that category
!             $articleTopic = $locale->tr( "register_default_article_topic" );
!             $articleText  = $locale->tr("register_default_article_text" );
              $article = new Article( $articleTopic, $articleText, $catId, $this->_userId, $newblogId, 'published', 0 );
              $article->setDateObject( new Timestamp());  // set it to the current date
***************
*** 265,271 ****
  
              $config =& Config::getConfig();
!             $locale = new Locale( $config->getValue( "default_locale" ));
              $this->_params->setValue( "version", new Version());
!             $this->_params->setValue( "locale", $locale );
              $template->assign( $this->_params->getAsArray());
              print $template->fetch();
--- 267,273 ----
  
              $config =& Config::getConfig();
!             $this->_locale =& Locales::getLocale( $config->getValue("default_locale" ));
              $this->_params->setValue( "version", new Version());
!             $this->_params->setValue( "locale", $this->_locale );
              $template->assign( $this->_params->getAsArray());
              print $template->fetch();

Index: summary.php
===================================================================
RCS file: /cvsroot/plog/plog/summary.php,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -C2 -d -r1.4.4.3 -r1.4.4.4
*** summary.php	19 Jun 2004 14:51:32 -0000	1.4.4.3
--- summary.php	6 Jul 2004 15:31:31 -0000	1.4.4.4
***************
*** 19,23 ****
       include_once( PLOG_CLASS_PATH."class/dao/summarystats.class.php" );     
       include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
!      include_once( PLOG_CLASS_PATH."class/locale/locale.class.php" );
       include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
       include_once( PLOG_CLASS_PATH."class/net/httpvars.class.php" );
--- 19,23 ----
       include_once( PLOG_CLASS_PATH."class/dao/summarystats.class.php" );     
       include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
!      include_once( PLOG_CLASS_PATH."class/locale/locales.class.php" );
       include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
       include_once( PLOG_CLASS_PATH."class/net/httpvars.class.php" );
***************
*** 42,46 ****
  
              $config =& Config::getConfig();
!             $this->_locale   = new Locale( $config->getValue("default_locale" ));
              $this->_numPosts = $config->getValue( "summary_page_show_max" );
          }
--- 42,46 ----
  
              $config =& Config::getConfig();
!             $this->_locale   = Locales::getLocale( $config->getValue("default_locale" ));
              $this->_numPosts = $config->getValue( "summary_page_show_max" );
          }
***************
*** 99,103 ****
  
              $config =& Config::getConfig();
!             $this->_locale   = new Locale( $config->getValue("default_locale" ));
              $this->_numPosts = $config->getValue( "summary_page_show_max" );
          }
--- 99,103 ----
  
              $config =& Config::getConfig();
!             $this->_locale   = Locales::getLocale( $config->getValue("default_locale" ));
              $this->_numPosts = $config->getValue( "summary_page_show_max" );
          }
***************
*** 138,142 ****
  
              $config =& Config::getConfig();
!             $this->_locale   = new Locale( $config->getValue("default_locale" ));
          }
  
--- 138,142 ----
  
              $config =& Config::getConfig();
!             $this->_locale   = Locales::getLocale( $config->getValue("default_locale" ));
          }