Typesetter / Simple-Blog

Admin/StaticGenerator.php

Spacing +59 added lines, -59 removed lines

@@ -25,7 +25,7 @@ 
 		ob_start();
 
 		$atomFormat = 'Y-m-d\TH:i:s\Z';
-		$show_posts = SimpleBlogCommon::WhichPosts(0,SimpleBlogCommon::$data['feed_entries']);
+		$show_posts = SimpleBlogCommon::WhichPosts(0, SimpleBlogCommon::$data['feed_entries']);
 
 
 		if( isset($_SERVER['HTTP_HOST']) ){
@@ -39,14 +39,14 @@ 
 		echo '<?xml version="1.0" encoding="utf-8"?>'."\n";
 		echo '<feed xmlns="http://www.w3.org/2005/Atom">'."\n";
 		echo '<title>'.$config['title'].'</title>'."\n";
-		echo '<link href="'.$serverWithDir.'/data/_addondata/'.str_replace(' ', '%20',$addonFolderName).'/feed.atom" rel="self" />'."\n";
+		echo '<link href="'.$serverWithDir.'/data/_addondata/'.str_replace(' ', '%20', $addonFolderName).'/feed.atom" rel="self" />'."\n";
 		echo '<link href="'.$server.common::GetUrl('Special_Blog').'" />'."\n";
 		echo '<id>urn:uuid:'.self::uuid($serverWithDir).'</id>'."\n";
 		echo '<updated>'.date($atomFormat, time()).'</updated>'."\n";
 		echo '<author><name>'.$config['title'].'</name></author>'."\n";
 
 
-		foreach($show_posts as $post_index){
+		foreach( $show_posts as $post_index ){
 
 			$post = SimpleBlogCommon::GetPostContent($post_index);
 
@@ -55,31 +55,31 @@ 
 			}
 
 			echo '<entry>'."\n";
-			echo '<title>'.SimpleBlogCommon::Underscores( $post['title'] ).'</title>'."\n";
+			echo '<title>'.SimpleBlogCommon::Underscores($post['title']).'</title>'."\n";
 			echo '<link href="'.$server.SimpleBlogCommon::PostUrl($post_index).'"></link>'."\n";
 			echo '<id>urn:uuid:'.self::uuid($post_index).'</id>'."\n";
 			echo '<updated>'.date($atomFormat, $post['time']).'</updated>'."\n";
 
-			$content =& $post['content'];
-			if( (SimpleBlogCommon::$data['feed_abbrev']> 0) && (mb_strlen($content) > SimpleBlogCommon::$data['feed_abbrev']) ){
-				$content = mb_substr($content,0,SimpleBlogCommon::$data['feed_abbrev']).' ... ';
+			$content = & $post['content'];
+			if( (SimpleBlogCommon::$data['feed_abbrev'] > 0) && (mb_strlen($content) > SimpleBlogCommon::$data['feed_abbrev']) ){
+				$content = mb_substr($content, 0, SimpleBlogCommon::$data['feed_abbrev']).' ... ';
 				$label = gpOutput::SelectText('Read More');
-				$content .= '<a href="'.$server.SimpleBlogCommon::PostUrl($post_index,$label).'">'.$label.'</a>';
+				$content .= '<a href="'.$server.SimpleBlogCommon::PostUrl($post_index, $label).'">'.$label.'</a>';
 			}
 
 			//old images
 			$replacement = $server.'/';
-			$content = str_replace('src="/', 'src="'.$replacement,$content);
+			$content = str_replace('src="/', 'src="'.$replacement, $content);
 
 			//new images
-			$content = str_replace('src="../', 'src="'.$serverWithDir,$content);
+			$content = str_replace('src="../', 'src="'.$serverWithDir, $content);
 
 			//images without /index.php/
-			$content = str_replace('src="./', 'src="'.$serverWithDir,$content);
+			$content = str_replace('src="./', 'src="'.$serverWithDir, $content);
 
 
 			//href
-			self::FixLinks($content,$server,0);
+			self::FixLinks($content, $server, 0);
 
 			echo '<summary type="html"><![CDATA['.$content.']]></summary>'."\n";
 			echo '</entry>'."\n";
@@ -89,7 +89,7 @@ 
 
 		$feed = ob_get_clean();
 		$feedFile = SimpleBlogCommon::$data_dir.'/feed.atom';
-		gpFiles::Save($feedFile,$feed);
+		gpFiles::Save($feedFile, $feed);
 	}
 
 
@@ -103,31 +103,31 @@ 
 		global $langmessage;
 
 		$posts = array();
-		$show_posts = SimpleBlogCommon::WhichPosts(0,SimpleBlogCommon::$data['gadget_entries']);
+		$show_posts = SimpleBlogCommon::WhichPosts(0, SimpleBlogCommon::$data['gadget_entries']);
 
 
 		ob_start();
 		$label = gpOutput::SelectText('Blog');
 		if( !empty($label) ){
 			echo '<h3>';
-			echo common::Link('Special_Blog',$label);
+			echo common::Link('Special_Blog', $label);
 			echo '</h3>';
 		}
 
-		foreach($show_posts as $post_index){
+		foreach( $show_posts as $post_index ){
 
-			$post		= SimpleBlogCommon::GetPostContent($post_index);
+			$post = SimpleBlogCommon::GetPostContent($post_index);
 
 			if( !$post ){
 				continue;
 			}
 
-			$header		= '<b class="simple_blog_title">';
-			$label		= SimpleBlogCommon::Underscores( $post['title'] );
-			$header		.= SimpleBlogCommon::PostLink($post_index,$label);
+			$header = '<b class="simple_blog_title">';
+			$label = SimpleBlogCommon::Underscores($post['title']);
+			$header		.= SimpleBlogCommon::PostLink($post_index, $label);
 			$header		.= '</b>';
 
-			SimpleBlogCommon::BlogHead($header,$post_index,$post,true);
+			SimpleBlogCommon::BlogHead($header, $post_index, $post, true);
 
 
 			$content = strip_tags($post['content']);
@@ -136,14 +136,14 @@ 
 
 				$cut = SimpleBlogCommon::$data['gadget_abbrev'];
 
-				$pos = mb_strpos($content,' ',$cut-5);
+				$pos = mb_strpos($content, ' ', $cut-5);
 				if( ($pos > 0) && ($cut+20 > $pos) ){
 					$cut = $pos;
 				}
-				$content = mb_substr($content,0,$cut).' ... ';
+				$content = mb_substr($content, 0, $cut).' ... ';
 
 				$label = gpOutput::SelectText('Read More');
-				$content .= SimpleBlogCommon::PostLink($post_index,$label);
+				$content .= SimpleBlogCommon::PostLink($post_index, $label);
 			}
 
 			echo '<p class="simple_blog_abbrev">';
@@ -155,12 +155,12 @@ 
 		if( SimpleBlogCommon::$data['post_count'] > 3 ){
 
 			$label = gpOutput::SelectText('More Blog Entries');
-			echo common::Link('Special_Blog',$label);
+			echo common::Link('Special_Blog', $label);
 		}
 
 		$gadget = ob_get_clean();
 		$gadgetFile = SimpleBlogCommon::$data_dir.'/gadget.php';
-		gpFiles::Save($gadgetFile,$gadget);
+		gpFiles::Save($gadgetFile, $gadget);
 	}
 
 
@@ -171,20 +171,20 @@ 
 	static function GenCategoryGadget(){
 		global $addonPathData;
 
-		$categories = SimpleBlogCommon::AStrToArray( 'categories' );
+		$categories = SimpleBlogCommon::AStrToArray('categories');
 		$post_drafts = SimpleBlogCommon::AStrToArray('drafts');
 
 		ob_start();
 		echo '<ul>';
-		foreach($categories as $catindex => $catname){
+		foreach( $categories as $catindex => $catname ){
 
 			//skip hidden categories
-			if( SimpleBlogCommon::AStrGet('categories_hidden',$catindex) ){
+			if( SimpleBlogCommon::AStrGet('categories_hidden', $catindex) ){
 				continue;
 			}
 
 			$posts = SimpleBlogCommon::AStrToArray('category_posts_'.$catindex);
-			foreach($posts as $key => $post_id){
+			foreach( $posts as $key => $post_id ){
 				if( isset($post_drafts[$post_id]) ){
 				  unset($posts[$key]);
 				}
@@ -198,10 +198,10 @@ 
 			echo '<li>';
 			echo '<a class="blog_gadget_link">'.$catname.' ('.$sum.')</a>';
 			echo '<ul class="nodisplay">';
-			foreach($posts as $post_id){
-				$post_title = SimpleBlogCommon::AStrGet('titles',$post_id);
+			foreach( $posts as $post_id ){
+				$post_title = SimpleBlogCommon::AStrGet('titles', $post_id);
 				echo '<li>';
-				echo SimpleBlogCommon::PostLink( $post_id, $post_title );
+				echo SimpleBlogCommon::PostLink($post_id, $post_title);
 				echo '</li>';
 			}
 			echo '</ul></li>';
@@ -212,7 +212,7 @@ 
 
 
 		$gadgetFile = $addonPathData.'/gadget_categories.php';
-		gpFiles::Save( $gadgetFile, $content );
+		gpFiles::Save($gadgetFile, $content);
 	}
 
 
@@ -224,15 +224,15 @@ 
 		global $addonPathData;
 
 		//get list of posts and times
-		$list = SimpleBlogCommon::AStrToArray( 'post_times' );
+		$list = SimpleBlogCommon::AStrToArray('post_times');
 		$post_drafts = SimpleBlogCommon::AStrToArray('drafts');
 		if( !count($list) ) return;
 
 		//get year counts
 		$archive = array();
-		foreach($list as $post_id => $time){
+		foreach( $list as $post_id => $time ){
 		  if( !isset($post_drafts[$post_id]) ){
-			$ym = date('Y-m',$time); //year&month
+			$ym = date('Y-m', $time); //year&month
 			$archive[$ym][] = $post_id;
 		  }
 		}
@@ -243,8 +243,8 @@ 
 		$prev_year = false;
 		echo '<ul>';
 		foreach( $archive as $ym => $posts ){
-			$y = substr($ym,0,4);
-			$m = substr($ym,-2);
+			$y = substr($ym, 0, 4);
+			$m = substr($ym, -2);
 			if( $y != $prev_year ){
 				if( $prev_year !== false ){
 					echo '</li>';
@@ -261,13 +261,13 @@ 
 			echo '<ul>';
 			echo '<li><a class="blog_gadget_link">';
 			$time = strtotime($ym.'-01');
-			echo strftime('%B',$time);
+			echo strftime('%B', $time);
 			echo ' ('.$sum.')</a>';
 			echo '<ul class="simple_blog_category_posts nodisplay">';
-			foreach($posts as $post_id ){
-				$post_title = SimpleBlogCommon::AStrGet('titles',$post_id);
+			foreach( $posts as $post_id ){
+				$post_title = SimpleBlogCommon::AStrGet('titles', $post_id);
 				echo '<li>';
-				echo SimpleBlogCommon::PostLink($post_id, $post_title );
+				echo SimpleBlogCommon::PostLink($post_id, $post_title);
 				echo '</li>';
 			}
 			echo '</ul>';
@@ -280,16 +280,16 @@ 
 		$content = ob_get_clean();
 
 		$gadgetFile = $addonPathData.'/gadget_archive.php';
-		gpFiles::Save( $gadgetFile, $content );
+		gpFiles::Save($gadgetFile, $content);
 	}
 
 	static function uuid($str){
 		$chars = md5($str);
-		return mb_substr($chars,0,8)
-				.'-'. mb_substr($chars,8,4)
-				.'-'. mb_substr($chars,12,4)
-				.'-'. mb_substr($chars,16,4)
-				.'-'. mb_substr($chars,20,12);
+		return mb_substr($chars, 0, 8)
+				.'-'.mb_substr($chars, 8, 4)
+				.'-'.mb_substr($chars, 12, 4)
+				.'-'.mb_substr($chars, 16, 4)
+				.'-'.mb_substr($chars, 20, 12);
 		return $uuid;
 	}
 
@@ -301,11 +301,11 @@ 
 	 * @param string $server
 	 * @param integer $offset
 	 */
-	public static function FixLinks(&$content,$server,$offset){
+	public static function FixLinks(&$content, $server, $offset){
 
-		preg_match_all('#href="([^<>"]+)"#i',$content,$matches,PREG_SET_ORDER);
-		foreach($matches as $match){
-			self::FixLink($content,$server,$match);
+		preg_match_all('#href="([^<>"]+)"#i', $content, $matches, PREG_SET_ORDER);
+		foreach( $matches as $match ){
+			self::FixLink($content, $server, $match);
 		}
 
 	}
@@ -315,24 +315,24 @@ 
 	 * Change relative link to absolute link
 	 *
 	 */
-	public static function FixLink(&$content,$server,$match){
+	public static function FixLink(&$content, $server, $match){
 
-		if( strpos($match[1],'mailto:') !== false ){
+		if( strpos($match[1], 'mailto:') !== false ){
 			return;
 		}
-		if( strpos($match[1],'://') !== false ){
+		if( strpos($match[1], '://') !== false ){
 			return;
 		}
 
-		if( mb_strpos($match[1],'/') === 0 ){
+		if( mb_strpos($match[1], '/') === 0 ){
 			$replacement = $server.$match[1];
 		}else{
 			$replacement = $server.common::GetUrl($match[1]);
 		}
 
-		$replacement = str_replace($match[1],$replacement,$match[0]);
+		$replacement = str_replace($match[1], $replacement, $match[0]);
 
-		$content = str_replace($match[0],$replacement,$content);
+		$content = str_replace($match[0], $replacement, $content);
 	}
 
 

Braces +5 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 
 		if( isset($_SERVER['HTTP_HOST']) ){
 			$server = 'http://'.$_SERVER['HTTP_HOST'];
-		}else{
+		} else{
 			$server = 'http://'.$_SERVER['SERVER_NAME'];
 		}
 		$serverWithDir = $server.$dirPrefix;
@@ -226,7 +226,9 @@ 
 		//get list of posts and times
 		$list = SimpleBlogCommon::AStrToArray( 'post_times' );
 		$post_drafts = SimpleBlogCommon::AStrToArray('drafts');
-		if( !count($list) ) return;
+		if( !count($list) ){
+			return;
+		}
 
 		//get year counts
 		$archive = array();
@@ -326,7 +328,7 @@ 
 
 		if( mb_strpos($match[1],'/') === 0 ){
 			$replacement = $server.$match[1];
-		}else{
+		} else{
 			$replacement = $server.common::GetUrl($match[1]);
 		}