pentagram-cvs Mailing List for Pentagram

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2560
          http://sourceforge.net/p/pentagram/code/2560
Author:   mjimenez
Date:     2023-08-28 02:04:14 +0000 (Mon, 28 Aug 2023)
Log Message:
-----------
Update to support php 7

Modified Paths:
--------------
    web/trunk/base.inc
    web/trunk/class.FastTemplate.php3
    web/trunk/credits.php
    web/trunk/download.php
    web/trunk/forum.php
    web/trunk/index.php
    web/trunk/screenshots.php

Modified: web/trunk/base.inc
===================================================================

--- web/trunk/base.inc	2020-04-11 16:10:32 UTC (rev 2559)
+++ web/trunk/base.inc	2023-08-28 02:04:14 UTC (rev 2560)
@@ -1,6 +1,7 @@
 <?php
 	// Determine current file name
-	if(ereg("[^/]+$", $PHP_SELF, $regs))
+	$THIS_FILE = &$_SERVER['PHP_SELF'];
+	if(preg_match("/[^\/]+$/", $THIS_FILE, $regs))
 		$CURRENTFILE = $regs[0];
 
 
@@ -24,7 +25,7 @@
 	if( !isset($MOD_DATE) )
 		$MOD_DATE = date("Y-m-d",filemtime($CURRENTFILE));
 
-	if( $XHTML )
+	if( isset($XHTML) and $XHTML )
 		$MAIN_TEMPLATE .= "_xhtml";
 
 
@@ -36,19 +37,19 @@
 
 	$tpl->define(
 		array(
-			main			=> "$MAIN_TEMPLATE.tpl",
-			topic			=> "topic.tpl"
+			"main"			=> "$MAIN_TEMPLATE.tpl",
+			"topic"			=> "topic.tpl"
 		)
 	);
 	
 	$tpl->assign(
 		array(
-			URL			=>	$PHP_SELF,
-			MOD_DATE	=>	$MOD_DATE,
-			CURRENTFILE	=>	$CURRENTFILE,
+			"URL"			=>	$PHP_SELF,
+			"MOD_DATE"		=>	$MOD_DATE,
+			"CURRENTFILE"	=>	$CURRENTFILE,
 
-			TITLE		=>	$TITLE,
-			GUARDIAN	=>	$GUARDIAN
+			"TITLE"			=>	$TITLE,
+			"GUARDIAN"		=>	$GUARDIAN
 		)
 	);
 	
@@ -56,7 +57,7 @@
 	if (!$CUSTOM_PARSE )
 	{
 		add_topic($HEADLINE,$CONTENT);
-		$tpl->parse(MAIN, "main");
+		$tpl->parse("MAIN", "main");
 		$tpl->FastPrint();
 		exit;
 	}
@@ -67,10 +68,10 @@
 		
 		$tpl->assign(
 			array(
-				HEADLINE	=>	$headline
+				"HEADLINE"	=>	$headline
 			)
 		);
-		$tpl->parse(TOPICS,".topic");
+		$tpl->parse("TOPICS",".topic");
 	}
 
 	function add_topic( $headline, $content )
@@ -79,10 +80,10 @@
 		
 		$tpl->assign(
 			array(
-				HEADLINE	=>	$headline,
-				CONTENT		=>	$content
+				"HEADLINE"		=>	$headline,
+				"CONTENT"		=>	$content
 			)
 		);
-		$tpl->parse(TOPICS,".topic");
+		$tpl->parse("TOPICS",".topic");
 	}
 ?>

Modified: web/trunk/class.FastTemplate.php3
===================================================================
--- web/trunk/class.FastTemplate.php3	2020-04-11 16:10:32 UTC (rev 2559)
+++ web/trunk/class.FastTemplate.php3	2023-08-28 02:04:14 UTC (rev 2560)
@@ -51,7 +51,13 @@
 
 	}	// end (new) FastTemplate ()
 
+	function __construct ($pathToTemplates = "")
+	{
+		$this->FastTemplate($pathToTemplates);
 
+	}	// end (new) FastTemplate ()
+
+
 //	************************************************************
 //	All templates will be loaded from this "root" directory
 //	Can be changed in mid-process by re-calling with a new
@@ -104,7 +110,7 @@
 		$usec = (double)$time[0];
 		$sec = (double)$time[1];
 		return $sec + $usec;
-    }
+	}
 
 //  **************************************************************
 //	Strict template checking, if true sends warnings to STDOUT when
@@ -141,7 +147,7 @@
 	}
 
 //	************************************************************
-//	Grabs a template from the root dir and 
+//	Grabs a template from the root dir and
 //	reads it into a (potentially REALLY) big string
 
 	function get_template ($template)
@@ -171,7 +177,7 @@
 	function show_unknowns ($Line)
 	{
 		$unknown = array();
-		if (ereg("({[A-Z0-9_]+})",$Line,$unknown))
+		if (preg_match("/({[A-Z0-9_]+})/",$Line,$unknown))
 		{
 			$UnkVar = $unknown[1];
 			if(!(empty($UnkVar)))
@@ -187,7 +193,7 @@
 
 	function parse_template ($template, $tpl_array)
 	{
-		while ( list ($key,$val) = each ($tpl_array) )
+		foreach ($tpl_array as $key => $val)
 		{
 			if (!(empty($key)))
 			{
@@ -198,7 +204,7 @@
 
 				//	php4 doesn't like '{$' combinations.
 				$key = '{'."$key".'}';
-				$template = ereg_replace("$key","$val","$template");
+				$template = preg_replace("/$key/","$val","$template");
 				//$template = str_replace("$key","$val","$template");
 			}
 		}
@@ -207,15 +213,15 @@
 		{
 			// Silently remove anything not already found
 
-			$template = ereg_replace("{([A-Z0-9_]+)}","",$template);
+			$template = preg_replace("/{([A-Z0-9_]+)}/","",$template);
 		}
 		else
 		{
 			// Warn about unresolved template variables
-			if (ereg("({[A-Z0-9_]+})",$template))
+			if (preg_match("/({[A-Z0-9_]+})/",$template))
 			{
-				$unknown = split("\n",$template);
-				while (list ($Element,$Line) = each($unknown) )
+				$unknown = explode("\n",$template);
+				foreach ($unknown as $Element => $Line)
 				{
 					$UnkVar = $Line;
 					if(!(empty($UnkVar)))
@@ -242,7 +248,7 @@
 		{
 			unset($this->$ReturnVar);	// Clear any previous data
 
-			while ( list ( $key , $val ) = each ( $FileTags ) )
+			foreach ($FileTags as $key => $val)
 			{
 				if ( (!isset($this->$val)) || (empty($this->$val)) )
 				{
@@ -296,7 +302,7 @@
 					}
 			}
 
-			if($append)
+			if(!empty($this->$ReturnVar) and $append)
 			{
 				$this->$ReturnVar .= $this->parse_template($this->$val,$this->PARSEVARS);
 			}
@@ -372,7 +378,7 @@
 		// The file must already be in memory.
 
 		$ParentTag = $this->DYNAMIC["$Macro"];
-		if( (!$this->$ParentTag) or (empty($this->$ParentTag)) )
+		if( empty($this->$ParentTag) or (!$this->$ParentTag) )
 		{
 			$fileName = $this->FILELIST[$ParentTag];
 			$this->$ParentTag = $this->get_template($fileName);
@@ -381,13 +387,13 @@
 		if($this->$ParentTag)
 		{
 			$template = $this->$ParentTag;
-			$DataArray = split("\n",$template);
+			$DataArray = explode("\n",$template);
 			$newMacro = "";
 			$newParent = "";
 			$outside = true;
 			$start = false;
 			$end = false;
-			while ( list ($lineNum,$lineData) = each ($DataArray) )
+			foreach ($DataArray as $lineNum => $lineData)
 			{
 				$lineTest = trim($lineData);
 				if("<!-- BEGIN DYNAMIC BLOCK: $Macro -->" == "$lineTest" )
@@ -453,12 +459,12 @@
 		if($this->$ParentTag)
 		{
 			$template = $this->$ParentTag;
-			$DataArray = split("\n",$template);
+			$DataArray = explode("\n",$template);
 			$newParent = "";
 			$outside = true;
 			$start = false;
 			$end = false;
-			while ( list ($lineNum,$lineData) = each ($DataArray) )
+			foreach ($DataArray as $lineNum => $lineData)
 			{
 				$lineTest = trim($lineData);
 				if("<!-- BEGIN DYNAMIC BLOCK: $Macro -->" == "$lineTest" )
@@ -499,7 +505,7 @@
 
 	function define ($fileList)
 	{
-		while ( list ($FileTag,$FileName) = each ($fileList) )
+		foreach ($fileList as $FileTag => $FileName)
 		{
 			$this->FILELIST["$FileTag"] = $FileName;
 		}
@@ -521,7 +527,7 @@
 
 		if(!empty($ReturnVar))
 		{
-			if( (gettype($ReturnVar)) != "array")
+			if(!is_array($ReturnVar))
 			{
 				unset($this->$ReturnVar);
 				return;
@@ -528,7 +534,7 @@
 			}
 			else
 			{
-				while ( list ($key,$val) = each ($ReturnVar) )
+				foreach ($ReturnVar as $key => $val)
 				{
 					unset($this->$val);
 				}
@@ -538,7 +544,7 @@
 
 		// Empty - clear all of them
 
-		while ( list ( $key,$val) = each ($this->HANDLE) )
+		foreach ($this->HANDLE as $key => $val)
 		{
 			$KEY = $key;
 			unset($this->$KEY);
@@ -574,7 +580,7 @@
 		{
 			// Clear ALL fileHandles
 
-			while ( list ($key, $val) = each ($this->LOADED) )
+			foreach ($this->LOADED as $key => $val)
 			{
 				unset($this->$key);
 			}
@@ -584,7 +590,7 @@
 		}
 		else
 		{
-			if( (gettype($fileHandle)) != "array")
+			if(!is_array($fileHandle))
 			{
 				if( (isset($this->$fileHandle)) || (!empty($this->$fileHandle)) )
 				{
@@ -595,10 +601,10 @@
 			}
 			else
 			{
-				while ( list ($Key, $Val) = each ($fileHandle) )
+				foreach ($fileHandle as $key => $val)
 				{
-					unset($this->LOADED[$Key]);
-					unset($this->$Key);
+					unset($this->LOADED[$key]);
+					unset($this->$key);
 				}
 				return true;
 			}
@@ -618,7 +624,7 @@
 			return;
 		}
 
-		if( (gettype($Files)) != "array")
+		if(!is_array($FileTag))
 		{
 			unset($this->FILELIST[$FileTag]);
 			return;
@@ -625,7 +631,7 @@
 		}
 		else
 		{
-			while ( list ( $Tag, $Val) = each ($FileTag) )
+			foreach ($FileTag as $Tag => $Val)
 			{
 				unset($this->FILELIST[$Tag]);
 			}
@@ -647,7 +653,7 @@
 	{
 		if(!(empty($this->PARSEVARS)))
 		{
-			while(list($Ref,$Val) = each ($this->PARSEVARS) )
+			foreach ($this->PARSEVARS as $Ref => $Val)
 			{
 				unset($this->PARSEVARS["$Ref"]);
 			}
@@ -667,7 +673,7 @@
 			}
 			else
 			{
-				while (list ($Ref,$val) = each ($href) )
+				foreach ($href as $Ref => $val)
 				{
 					unset($this->PARSEVARS[$Ref]);
 				}
@@ -689,7 +695,7 @@
 	{
 		if(gettype($tpl_array) == "array")
 		{
-			while ( list ($key,$val) = each ($tpl_array) )
+			foreach ($tpl_array as $key => $val)
 			{
 				if (!(empty($key)))
 				{
@@ -724,7 +730,7 @@
 		else
 		{
 			return false;
-        }
+		}
 	}
 
 //	************************************************************
@@ -732,7 +738,7 @@
 	function error ($errorMsg, $die = 0)
 	{
 		$this->ERROR = $errorMsg;
-		echo "ERROR: $this->ERROR <BR> \n";
+		echo "ERROR: $this->ERROR <br/> \n";
 		if ($die == 1)
 		{
 			exit;
@@ -751,4 +757,4 @@
 
 } // End class.FastTemplate.php3
 
-?>
+?>
\ No newline at end of file

Modified: web/trunk/credits.php
===================================================================
--- web/trunk/credits.php	2020-04-11 16:10:32 UTC (rev 2559)
+++ web/trunk/credits.php	2023-08-28 02:04:14 UTC (rev 2560)
@@ -11,7 +11,7 @@
 
 	add_topic("Pentagram Team", join("", file ("content/team.dat")));
 	add_topic("Special Thanks to", join("", file ("content/credits.dat")));
-	$tpl->parse(MAIN, "main");
+	$tpl->parse("MAIN", "main");
 	$tpl->FastPrint();
 	exit;
 ?>

Modified: web/trunk/download.php
===================================================================
--- web/trunk/download.php	2020-04-11 16:10:32 UTC (rev 2559)
+++ web/trunk/download.php	2023-08-28 02:04:14 UTC (rev 2560)
@@ -8,12 +8,12 @@
 
 	$tpl->define(
 		array(
-			download		=> "download.tpl",
-			empty_tpl		=> "empty.tpl",
-			section			=> "download_section.tpl",
-			d_entry			=> "download_entry.tpl",
-			s_entry			=> "snapshot_entry.tpl",
-			d_link			=> "download_link.tpl"
+			"download"		=> "download.tpl",
+			"empty_tpl"		=> "empty.tpl",
+			"section"		=> "download_section.tpl",
+			"d_entry"		=> "download_entry.tpl",
+			"s_entry"		=> "snapshot_entry.tpl",
+			"d_link"		=> "download_link.tpl"
 		)
 	);
 
@@ -21,9 +21,9 @@
 	// very easy to change and maintain
 	include("content/download.dat");
 	
-	$tpl->parse(CONTENT, "download");
+	$tpl->parse("CONTENT", "download");
 	add_topic_headline($HEADLINE);
-	$tpl->parse(MAIN, "main");
+	$tpl->parse("MAIN", "main");
 	$tpl->FastPrint();
 	exit;
 
@@ -35,7 +35,7 @@
 		// Set the name of the current section
 		$tpl->assign(
 			array(
-				SECTION_TITLE	=>	$section
+				"SECTION_TITLE"	=>	$section
 			)
 		);
 	}
@@ -45,10 +45,10 @@
 		global $tpl;
 		
 		// Write out the section
-		$tpl->parse(DOWNLOAD_SECTIONS,".section");
+		$tpl->parse("DOWNLOAD_SECTIONS",".section");
 
 		// Close the section entries list, in preparation for the new section
-		$tpl->parse(SECTION_ENTRIES,"empty_tpl");
+		$tpl->parse("SECTION_ENTRIES","empty_tpl");
 	}
 
 	function add_extern_entry( $file, $desc, $size )
@@ -57,12 +57,12 @@
 		
 		$tpl->assign(
 			array(
-				FILENAME	=>	$file,
-				DESCRIPTION	=>	$desc,
-				SIZE		=>	$size
+				"FILENAME"		=>	$file,
+				"DESCRIPTION"	=>	$desc,
+				"SIZE"			=>	$size
 			)
 		);
-		$tpl->parse(SECTION_ENTRIES,".d_entry");
+		$tpl->parse("SECTION_ENTRIES",".d_entry");
 	}
 
 	function add_extern_link( $url, $desc )
@@ -71,11 +71,11 @@
 		
 		$tpl->assign(
 			array(
-				URL			=>	$url,
-				DESCRIPTION	=>	$desc
+				"URL"			=>	$url,
+				"DESCRIPTION"	=>	$desc
 			)
 		);
-		$tpl->parse(SECTION_ENTRIES,".d_link");
+		$tpl->parse("SECTION_ENTRIES",".d_link");
 	}
 
 	function add_local_entry( $file, $desc )
@@ -85,14 +85,14 @@
 		if (file_exists("snapshots/$file")) {
 			$tpl->assign(
 				array(
-					FILENAME	=>	$file,
-					DESCRIPTION	=>	$desc,
-					FILE_TIME	=>	date("H:i",filemtime("snapshots/$file")),
-					FILE_DATE	=>	date("Y-m-d",filemtime("snapshots/$file")),
-					SIZE		=>	ceil(filesize("snapshots/$file")/1024)
+					"FILENAME"		=>	$file,
+					"DESCRIPTION"	=>	$desc,
+					"FILE_TIME"		=>	date("H:i",filemtime("snapshots/$file")),
+					"FILE_DATE"		=>	date("Y-m-d",filemtime("snapshots/$file")),
+					"SIZE"			=>	ceil(filesize("snapshots/$file")/1024)
 				)
 			);
-			$tpl->parse(SECTION_ENTRIES,".s_entry");
+			$tpl->parse("SECTION_ENTRIES",".s_entry");
 		}
 	}
 ?>

Modified: web/trunk/forum.php
===================================================================
--- web/trunk/forum.php	2020-04-11 16:10:32 UTC (rev 2559)
+++ web/trunk/forum.php	2023-08-28 02:04:14 UTC (rev 2560)
@@ -9,7 +9,7 @@
 
 
 	add_topic("Pentagram Forum", join("", file ("content/forum.dat")));
-	$tpl->parse(MAIN, "main");
+	$tpl->parse("MAIN", "main");
 	$tpl->FastPrint();
 	exit;
 ?>

Modified: web/trunk/index.php
===================================================================
--- web/trunk/index.php	2020-04-11 16:10:32 UTC (rev 2559)
+++ web/trunk/index.php	2023-08-28 02:04:14 UTC (rev 2560)
@@ -12,7 +12,7 @@
 	add_topic("What is it?", join("", file ("content/intro.dat")));
 	add_topic("What's the status?", join("", file("content/status.dat")));
 	add_topic("News", join("", file ("content/news.dat")));
-	$tpl->parse(MAIN, "main");
+	$tpl->parse("MAIN", "main");
 	$tpl->FastPrint();
 	exit;
 ?>

Modified: web/trunk/screenshots.php
===================================================================
--- web/trunk/screenshots.php	2020-04-11 16:10:32 UTC (rev 2559)
+++ web/trunk/screenshots.php	2023-08-28 02:04:14 UTC (rev 2560)
@@ -9,8 +9,8 @@
 
 	$tpl->define(
 		array(
-			screenshots		=> "screenshots.tpl",
-			entry			=> "screenshot.tpl"
+			"screenshots"	=> "screenshots.tpl",
+			"entry"			=> "screenshot.tpl"
 		)
 	);
 
@@ -18,9 +18,9 @@
 	// dirty trick to seperate data and content a bit ;)
 	include("content/screenshots.dat");
 	
-	$tpl->parse(CONTENT, "screenshots");
+	$tpl->parse("CONTENT", "screenshots");
 	add_topic_headline($HEADLINE);
-	$tpl->parse(MAIN, "main");
+	$tpl->parse("MAIN", "main");
 	$tpl->FastPrint();
 	exit;
 
@@ -31,12 +31,12 @@
 		
 		$tpl->assign(
 			array(
-				FILENAME	=>	$file,
-				WIDTH		=>	$width,
-				HEIGHT		=>	$height,
-				DESCRIPTION	=>	$desc
+				"FILENAME"		=>	$file,
+				"WIDTH"			=>	$width,
+				"HEIGHT"		=>	$height,
+				"DESCRIPTION"	=>	$desc
 			)
 		);
-		$tpl->parse(ENTRIES,".entry");
+		$tpl->parse("ENTRIES",".entry");
 	}
 ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2002	Jan	Feb	Mar	Apr	May (15)	Jun (32)	Jul	Aug (44)	Sep (20)	Oct (106)	Nov (62)	Dec (124)
2003	Jan (18)	Feb (26)	Mar (109)	Apr (59)	May (357)	Jun (338)	Jul (160)	Aug (54)	Sep (16)	Oct (8)	Nov (11)	Dec (51)
2004	Jan (97)	Feb (20)	Mar (26)	Apr (94)	May (186)	Jun (110)	Jul (105)	Aug (120)	Sep (90)	Oct (98)	Nov (99)	Dec (61)
2005	Jan (142)	Feb (96)	Mar (138)	Apr (120)	May (90)	Jun (43)	Jul (176)	Aug (37)	Sep (6)	Oct (50)	Nov (11)	Dec (21)
2006	Jan (5)	Feb (76)	Mar (46)	Apr (26)	May (9)	Jun (2)	Jul (13)	Aug (6)	Sep (5)	Oct (4)	Nov (2)	Dec (11)
2007	Jan (26)	Feb (4)	Mar (14)	Apr (5)	May (26)	Jun (3)	Jul (4)	Aug (12)	Sep (2)	Oct	Nov (2)	Dec (13)
2008	Jan	Feb	Mar	Apr (1)	May (1)	Jun	Jul (19)	Aug (6)	Sep (8)	Oct	Nov (3)	Dec
2009	Jan (1)	Feb	Mar	Apr (1)	May	Jun	Jul	Aug (11)	Sep (23)	Oct (2)	Nov (2)	Dec (1)
2010	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (26)	Nov (5)	Dec
2011	Jan	Feb (1)	Mar	Apr	May (1)	Jun	Jul (2)	Aug (1)	Sep	Oct (5)	Nov (11)	Dec (3)
2012	Jan (1)	Feb (1)	Mar (2)	Apr (1)	May	Jun (1)	Jul (1)	Aug (1)	Sep	Oct	Nov	Dec
2013	Jan (23)	Feb (3)	Mar	Apr (2)	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May (1)	Jun	Jul	Aug (2)	Sep	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2020	Jan	Feb	Mar	Apr (3)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2023	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec

pentagram-cvs Mailing List for Pentagram

pentagram-cvs — Pentagram CVS logs