[pLog-svn] r608 - in plog/trunk: . class/misc templates/wizard

[ork at devel.plogworld.net]

Author: ork
Date: 2004-12-29 17:16:20 +0000 (Wed, 29 Dec 2004)
New Revision: 608

Modified:
   plog/trunk/class/misc/version.class.php
   plog/trunk/templates/wizard/intro.template
   plog/trunk/version.php
Log:
version now correct in intro.templ and fixed a typo 


Modified: plog/trunk/class/misc/version.class.php
===================================================================
--- plog/trunk/class/misc/version.class.php	2004-12-29 17:12:39 UTC (rev 607)
+++ plog/trunk/class/misc/version.class.php	2004-12-29 17:16:20 UTC (rev 608)
@@ -5,35 +5,34 @@
      */
 
 
-	include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
-	include_once( PLOG_CLASS_PATH."class/file/file.class.php" );
+    include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+    include_once( PLOG_CLASS_PATH."class/file/file.class.php" );
 
     define( "PLOG_PROJECT_PAGE", "http://www.plogworld.net" );
-	
-    if (!defined("DEFAULT_VERSION_FILE")) {
-		define( "DEFAULT_VERSION_FILE", PLOG_CLASS_PATH . "version.php" );
-	}	
+    
+    if ( !defined("DEFAULT_VERSION_FILE") )
+      define( "DEFAULT_VERSION_FILE", PLOG_CLASS_PATH . "version.php" );
 
     /**
      * Returns the version of pLog we're running.
      */
     class Version extends Object 
-	{
+    {
 
-    	/**
+        /**
          * Returns the current version of pLog, determined by the value of the $version
          * variable in the version.php file.
          * If the file is not available, the result is unknown.
          * @static
          * @return The version identifier.
          */
-    	function getVersion()
+        function getVersion()
         {
-			$versionFile = PLOG_CLASS_PATH."version.php";
-			if( File::isReadable( $versionFile ))
-				include_once( $versionFile );
-			else
-				$version = "UNKNOWN";
+            $versionFile = PLOG_CLASS_PATH."version.php";
+            if( File::isReadable( $versionFile ))
+                include_once( $versionFile );
+            else
+                $version = "UNKNOWN";
 
             return $version;
         }
@@ -42,11 +41,11 @@
          * Returns the official page of the project.
          *
          * @return The official project page.
-		 * @static
+         * @static
          */
         function getProjectPage()
         {
-        	return PLOG_PROJECT_PAGE;
+            return PLOG_PROJECT_PAGE;
         }
     }
 ?>

Modified: plog/trunk/templates/wizard/intro.template
===================================================================
--- plog/trunk/templates/wizard/intro.template	2004-12-29 17:12:39 UTC (rev 607)
+++ plog/trunk/templates/wizard/intro.template	2004-12-29 17:16:20 UTC (rev 608)
@@ -10,7 +10,7 @@
    {else}
      <div class="wizardInfo">
       <img src="imgs/icon_info-16.png" alt="Info" class="wizardInfoIcon" />
-      <p class="wizardInfoText">Welcome to the configuration wizard of pLog. This wizard will guide you through the process of installing pLog 1.0.
+      <p class="wizardInfoText">Welcome to the configuration wizard of pLog. This wizard will guide you through the process of installing pLog {$version}
       <br/><br/>
       The first thing that it is needed to know
       is the information regarding your database configuration. The user that will be used
@@ -67,4 +67,4 @@
     <input type="submit" name="Next" value="Next &raquo;"/>
    </div> 
  </form>
-{include file="wizard/footer.template"}
\ No newline at end of file
+{include file="wizard/footer.template"}

Modified: plog/trunk/version.php
===================================================================
--- plog/trunk/version.php	2004-12-29 17:12:39 UTC (rev 607)
+++ plog/trunk/version.php	2004-12-29 17:16:20 UTC (rev 608)
@@ -1,3 +1,3 @@
 <?php
-$version = "PLOG_SVN $Id";
+$version = 'PLOG_SVN (build $Rev$)';
 ?>


Property changes on: plog/trunk/version.php
___________________________________________________________________
Name: svn:keyword
   + Rev