[pLog-svn] r2499 - in plog/trunk: class/action/admin class/dao templates/admin

[oscar at devel.plogworld.net]

Author: oscar
Date: 2005-09-20 18:55:55 +0000 (Tue, 20 Sep 2005)
New Revision: 2499

Modified:
   plog/trunk/class/action/admin/adminaction.class.php
   plog/trunk/class/action/admin/adminloginaction.class.php
   plog/trunk/class/dao/bloginfo.class.php
   plog/trunk/templates/admin/globalsettings_general.template
   plog/trunk/templates/admin/globalsettings_summary.template
Log:
enabled two features that were 'hidden' in 1.0.2 (use 'captcha' for registration and allow users to skip the dashboard)


Modified: plog/trunk/class/action/admin/adminaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaction.class.php	2005-09-20 18:40:44 UTC (rev 2498)
+++ plog/trunk/class/action/admin/adminaction.class.php	2005-09-20 18:55:55 UTC (rev 2499)
@@ -89,14 +89,10 @@
          */
         function _getBlogInfo()
         {
-            require_once( PLOG_CLASS_PATH . "class/cache/bloginfomanager.class.php" );
-
             $session = HttpVars::getSession();
             $sessionInfo = $session["SessionInfo"];
-            $blogInfoManager = BlogInfoManager::getBlogInfoManager();
 
-            $blogId = $sessionInfo->getValue( "blogId" );
-            $this->_blogInfo = $blogInfoManager->getBlogInfo( $blogId );
+            $this->_blogInfo = $sessionInfo->getValue( "blogInfo" );
         }
 
         /**

Modified: plog/trunk/class/action/admin/adminloginaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminloginaction.class.php	2005-09-20 18:40:44 UTC (rev 2498)
+++ plog/trunk/class/action/admin/adminloginaction.class.php	2005-09-20 18:55:55 UTC (rev 2499)
@@ -109,7 +109,7 @@
 			// check if we are skipping the dashboard
 			if( $this->_config->getValue( "skip_dashboard" )) {
 				// get the first blog that came
-				$this->_blogInfo = end( $userBlogs );			
+				$this->_blogInfo = end( $userBlogs );
 				// set it in the session
             	$session = HttpVars::getSession();
             	$session["SessionInfo"]->setValue( "blogInfo", $this->_blogInfo );

Modified: plog/trunk/class/dao/bloginfo.class.php
===================================================================
--- plog/trunk/class/dao/bloginfo.class.php	2005-09-20 18:40:44 UTC (rev 2498)
+++ plog/trunk/class/dao/bloginfo.class.php	2005-09-20 18:55:55 UTC (rev 2499)
@@ -616,9 +616,18 @@
 	        	$this->_mangledBlog = Textfilter::urlize( $this->getBlog());
 	        	
 	    	return( $this->_mangledBlog );  
-		}		
+		}
 		
 		/**
+		 * @see getMangledBlogName
+		 * Alias for the method above
+		 */
+		function getMangledBlog()
+		{
+			return( $this->getMangledBlogName());
+		}
+		
+		/**
 		 * @return whether this blog should be shown in the summary page
 		 */
 		function getShowInSummary()

Modified: plog/trunk/templates/admin/globalsettings_general.template
===================================================================
--- plog/trunk/templates/admin/globalsettings_general.template	2005-09-20 18:40:44 UTC (rev 2498)
+++ plog/trunk/templates/admin/globalsettings_general.template	2005-09-20 18:55:55 UTC (rev 2499)
@@ -244,4 +244,11 @@
     <div class="formHelp">{$locale->tr("help_session_save_path")}</div>	
     <input style="width:100%" type="text" name="config[session_save_path]" value="{$session_save_path}"/>
    </div>   
+   <!-- skip_dashboard -->
+   <div class="field">
+    <label for="config[skip_dashboard]">skip_dashboard</label>
+    <div class="formHelp">{$locale->tr("help_skip_dashboard")}</div>
+    <input class="radio" type="radio" name="config[skip_dashboard]" value="1" {if $skip_dashboard == 1 } checked="checked" {/if} />{$locale->tr("yes")}
+    <input class="radio" type="radio" name="config[skip_dashboard]" value="0" {if $skip_dashboard == 0 } checked="checked" {/if} />{$locale->tr("no")}
+   </div>   
 </div>   
\ No newline at end of file

Modified: plog/trunk/templates/admin/globalsettings_summary.template
===================================================================
--- plog/trunk/templates/admin/globalsettings_summary.template	2005-09-20 18:40:44 UTC (rev 2498)
+++ plog/trunk/templates/admin/globalsettings_summary.template	2005-09-20 18:55:55 UTC (rev 2499)
@@ -52,4 +52,11 @@
 	<div class="formHelp">{$locale->tr("help_num_blogs_per_user")}</div> 
     <input style="width:100%" type="text" id="config[num_blogs_per_user]" name="config[num_blogs_per_user]" value="{$num_blogs_per_user}"/>	
   </div>  
+  <!-- use_captcha_auth -->
+  <div class="field">
+    <label for="config[use_captcha_auth]">use_captcha_auth</label>  
+    <div class="formHelp">{$locale->tr("help_use_captcha_auth")}</div>
+    <input class="radio" type="radio" id="config[use_captcha_auth]" name="config[use_captcha_auth]" value="1" {if $use_captcha_auth == 1 } checked="checked" {/if} />{$locale->tr("yes")}
+    <input class="radio" type="radio" id="config[use_captcha_auth]" name="config[use_captcha_auth]" value="0" {if $use_captcha_auth == 0 } checked="checked" {/if} />{$locale->tr("no")}  
+  </div>
  </div> 
\ No newline at end of file