Typesetter / Simple-Blog

SimpleBlogCommon.php

Braces +3 added lines, -3 removed lines

@@ -486,7 +486,7 @@ 
 				message($langmessage['OOPS']);
 				return false;
 			}
-		}elseif( !unlink($post_file) ){
+		} elseif( !unlink($post_file) ){
 			message($langmessage['OOPS']);
 			return false;
 		}
@@ -536,7 +536,7 @@ 
 			$blog_comments = '<span class="simple_blog_comments">';
 			if( $cacheable ){
 				$blog_comments .= gpOutput::SelectText('Comments');
-			}else{
+			} else{
 				$blog_comments .= gpOutput::GetAddonText('Comments');
 			}
 			$blog_comments .= ': '.$count;
@@ -840,7 +840,7 @@ 
 			}
 			$key										= str_replace(array('"','>'),'',$key);
 			SimpleBlogCommon::$data[$data_string]		.= $key.'>'.$new_value.'"';
-		}else{
+		} else{
 			$offset										+= strlen($prev_key_str);
 			$length										= strpos(SimpleBlogCommon::$data[$data_string],'"',$offset) - $offset;
 			SimpleBlogCommon::$data[$data_string]		= substr_replace(SimpleBlogCommon::$data[$data_string],$new_value,$offset,$length);

Spacing +117 added lines, -117 removed lines

@@ -15,11 +15,11 @@ 
 
 	public static $index_file;
 	public static $data;
-	public static $root_url		= 'Special_Blog';
+	public static $root_url = 'Special_Blog';
 
-	public $new_install			= false;
+	public $new_install = false;
 	public $addonPathData;
-	public $post_id				= null;
+	public $post_id = null;
 
 	public static $data_dir;
 
@@ -45,12 +45,12 @@ 
 			return;
 		}
 
-		self::$data_dir			= $addonPathData;
-		self::$index_file		= self::$data_dir.'/index.php';
+		self::$data_dir = $addonPathData;
+		self::$index_file = self::$data_dir.'/index.php';
 
 
 		self::$root_url = 'Special_Blog';
-		if( is_callable( array('common','SpecialHref') ) ){
+		if( is_callable(array('common', 'SpecialHref')) ){
 			self::$root_url = common::SpecialHref('Special_Blog');
 		}
 
@@ -60,12 +60,12 @@ 
 
 
 		//regenerate if there are pending posts that need to be published
-		if( !is_null(SimpleBlogCommon::$data['next_regen']) && SimpleBlogCommon::$data['next_regen'] < time()  ){
+		if( !is_null(SimpleBlogCommon::$data['next_regen']) && SimpleBlogCommon::$data['next_regen'] < time() ){
 			if( @gpFiles::WriteLock() ){
 				self::GenStaticContent();
 				SimpleBlogCommon::NextGenTime();
 				SimpleBlogCommon::SaveIndex();
-				gpFiles::Unlock('write',gp_random);
+				gpFiles::Unlock('write', gp_random);
 			}
 		}
 
@@ -88,13 +88,13 @@ 
 	 */
 	public static function NextGenTime(){
 
-		$post_times			= SimpleBlogCommon::AStrToArray('post_times');
+		$post_times = SimpleBlogCommon::AStrToArray('post_times');
 		arsort($post_times);
 
 
 		asort($post_times);
 		$next_regen = null;
-		foreach($post_times as $time){
+		foreach( $post_times as $time ){
 			if( $time > time() ){
 				$next_regen = $time;
 				break;
@@ -111,14 +111,14 @@ 
 	 *
 	 */
 	public static function AddCSS(){
-		global $addonFolderName,$page;
+		global $addonFolderName, $page;
 
-		static $added			= false;
+		static $added = false;
 
 		if( !$added ){
-			$page->jQueryCode	.= '$(".blog_gadget_link").click(function(){ $(this).next(".nodisplay").toggle(); });';
-			$page->css_user[]	= '/data/_addoncode/'.$addonFolderName.'/static/style.css';
-			$added				= true;
+			$page->jQueryCode .= '$(".blog_gadget_link").click(function(){ $(this).next(".nodisplay").toggle(); });';
+			$page->css_user[] = '/data/_addoncode/'.$addonFolderName.'/static/style.css';
+			$added = true;
 		}
 	}
 
@@ -140,7 +140,7 @@ 
 			unset($blogData['twitter_password']);
 		}
 
-		SimpleBlogCommon::$data = $blogData + SimpleBlogCommon::Defaults();
+		SimpleBlogCommon::$data = $blogData+SimpleBlogCommon::Defaults();
 		self::GenIndexStr();
 
 		//update to simple blog 2.0 data
@@ -160,7 +160,7 @@ 
 
 		if( !empty(SimpleBlogCommon::$data['str_index']) ){
 			if( SimpleBlogCommon::$data['str_index'][0] == ',' ){
-				SimpleBlogCommon::$data['str_index'] = str_replace( array(',',':'), array('"','>'), SimpleBlogCommon::$data['str_index']);
+				SimpleBlogCommon::$data['str_index'] = str_replace(array(',', ':'), array('"', '>'), SimpleBlogCommon::$data['str_index']);
 			}
 			return;
 		}
@@ -178,10 +178,10 @@ 
 	 */
 	public static function DataUpdate20(){
 
-		$comment_counts	= array();
+		$comment_counts = array();
 		$comments_closed = array();
 		if( isset(SimpleBlogCommon::$data['post_info']) && is_array(SimpleBlogCommon::$data['post_info']) ){
-			foreach(SimpleBlogCommon::$data['post_info'] as $post_id => $info){
+			foreach( SimpleBlogCommon::$data['post_info'] as $post_id => $info ){
 				if( isset($info['comments']) ){
 					$comment_counts[$post_id] = $info['comments'];
 				}
@@ -201,8 +201,8 @@ 
 		$categories = $categories_hidden = $category_posts = $post_categories = array();
 		if( !isset(SimpleBlogCommon::$data['categories']) ){
 			$old_categories = self::load_blog_categories();
-			foreach($old_categories as $key => $cat){
-				$cat['ct'] = htmlspecialchars($cat['ct'],ENT_COMPAT,'UTF-8',false);
+			foreach( $old_categories as $key => $cat ){
+				$cat['ct'] = htmlspecialchars($cat['ct'], ENT_COMPAT, 'UTF-8', false);
 				$categories[$key] = $cat['ct'];
 				if( isset($cat['visible']) && !$cat['visible'] ){
 					$categories_hidden[$key] = 1;
@@ -210,7 +210,7 @@ 
 
 				if( isset($cat['posts']) && is_array($cat['posts']) ){
 					$category_posts[$key] = array();
-					foreach($cat['posts'] as $post => $title){
+					foreach( $cat['posts'] as $post => $title ){
 						$category_posts[$key][] = $post;
 						$post_categories[$post][] = $key;
 					}
@@ -227,12 +227,12 @@ 
 		$i = 0;
 		do{
 
-			$posts = self::GetPostFile($i,$post_file);
+			$posts = self::GetPostFile($i, $post_file);
 			if( !$posts ){
 				break;
 			}
 
-			foreach($posts as $post_id => $post){
+			foreach( $posts as $post_id => $post ){
 
 				if( isset($post['isDraft']) && $post['isDraft'] ){
 					$drafts[$post_id] = 1;
@@ -246,9 +246,9 @@ 
 				}
 			}
 
-			gpFiles::SaveArray($post_file,'posts',$posts);
+			gpFiles::SaveArray($post_file, 'posts', $posts);
 
-			$i +=20 ;
+			$i += 20;
 		}while( $posts );
 
 
@@ -259,7 +259,7 @@ 
 
 		SimpleBlogCommon::$data['categories'] = SimpleBlogCommon::AStrFromArray($categories);
 		SimpleBlogCommon::$data['categories_hidden'] = SimpleBlogCommon::AStrFromArray($categories_hidden);
-		foreach($category_posts as $key => $posts){
+		foreach( $category_posts as $key => $posts ){
 			SimpleBlogCommon::$data['category_posts_'.$key] = SimpleBlogCommon::AStrFromArray($posts);
 		}
 
@@ -283,24 +283,24 @@ 
 	 */
 	public static function WhichPosts($start, $len, $include_drafts = false){
 
-		$posts		= array();
-		$end		= $start+$len;
-		for($i = $start; $i < $end; $i++){
+		$posts = array();
+		$end = $start+$len;
+		for( $i = $start; $i < $end; $i++ ){
 
 			//get post id
-			$post_id = SimpleBlogCommon::AStrGet('str_index',$i);
+			$post_id = SimpleBlogCommon::AStrGet('str_index', $i);
 			if( !$post_id ){
 				continue;
 			}
 
 			if( !$include_drafts ){
 				//exclude drafts
-				if( SimpleBlogCommon::AStrGet('drafts',$post_id) ){
+				if( SimpleBlogCommon::AStrGet('drafts', $post_id) ){
 					continue;
 				}
 
 				//exclude future posts
-				$time = SimpleBlogCommon::AStrGet('post_times',$post_id);
+				$time = SimpleBlogCommon::AStrGet('post_times', $post_id);
 				if( $time > time() ){
 					continue;
 				}
@@ -321,9 +321,9 @@ 
 	public static function Defaults(){
 		global $config;
 
-		$zero_strip = stristr(PHP_OS,'win') ? '' : '-';
+		$zero_strip = stristr(PHP_OS, 'win') ? '' : '-';
 
-		return array(	'post_index'			=> 0,
+		return array('post_index'			=> 0,
 						'per_page'				=> 10,
 						'post_abbrev'			=> '',
 						'gadget_entries'		=> 3,
@@ -356,10 +356,10 @@ 
 	 */
 	public static function SaveIndex(){
 
-		SimpleBlogCommon::$data['str_index'] = '"'.trim(SimpleBlogCommon::$data['str_index'],'"').'"';
-		SimpleBlogCommon::$data['post_count'] = substr_count(SimpleBlogCommon::$data['str_index'],'>');
+		SimpleBlogCommon::$data['str_index'] = '"'.trim(SimpleBlogCommon::$data['str_index'], '"').'"';
+		SimpleBlogCommon::$data['post_count'] = substr_count(SimpleBlogCommon::$data['str_index'], '>');
 
-		return gpFiles::SaveArray(self::$index_file,'blogData',SimpleBlogCommon::$data);
+		return gpFiles::SaveArray(self::$index_file, 'blogData', SimpleBlogCommon::$data);
 	}
 
 
@@ -370,14 +370,14 @@ 
 	 * @deprecated 3.0
 	 *
 	 */
-	public static function GetPostFile($post_index,&$post_file){
+	public static function GetPostFile($post_index, &$post_file){
 
 		if( !is_numeric($post_index) ){
 			return false;
 		}
 
-		$file_index		= floor($post_index/20);
-		$post_file		= self::$data_dir.'/posts_'.$file_index.'.php';
+		$file_index = floor($post_index / 20);
+		$post_file = self::$data_dir.'/posts_'.$file_index.'.php';
 
 		if( !file_exists($post_file) ){
 			return false;
@@ -398,13 +398,13 @@ 
 	 */
 	public static function GetPostContent($post_index){
 
-		$file		= self::PostFilePath($post_index);
+		$file = self::PostFilePath($post_index);
 		if( file_exists($file) ){
 			require($file);
 			return $post;
 		}
 
-		$posts = self::GetPostFile($post_index,$post_file);
+		$posts = self::GetPostFile($post_index, $post_file);
 		if( $posts === false ){
 			return false;
 		}
@@ -434,15 +434,15 @@ 
 	public static function Delete(){
 		global $langmessage;
 
-		$post_id		= $_POST['del_id'];
-		$posts			= false;
+		$post_id = $_POST['del_id'];
+		$posts = false;
 
 
 		//post in single file or collection
-		$post_file		= self::PostFilePath($post_id);
+		$post_file = self::PostFilePath($post_id);
 		if( !file_exists($post_file) ){
 
-			$posts		= self::GetPostFile($post_id,$post_file);
+			$posts = self::GetPostFile($post_id, $post_file);
 			if( $posts === false ){
 				message($langmessage['OOPS']);
 				return false;
@@ -463,15 +463,15 @@ 
 		//reset the index string
 		$new_index = SimpleBlogCommon::$data['str_index'];
 		$new_index = preg_replace('#"\d+>'.$post_id.'"#', '"', $new_index);
-		preg_match_all('#(?:"\d+>)([^">]*)#',$new_index,$matches);
+		preg_match_all('#(?:"\d+>)([^">]*)#', $new_index, $matches);
 		SimpleBlogCommon::$data['str_index'] = SimpleBlogCommon::AStrFromArray($matches[1]);
 
 
 		//remove post from other index strings
-		SimpleBlogCommon::AStrRm('drafts',$post_id);
-		SimpleBlogCommon::AStrRm('comments_closed',$post_id);
-		SimpleBlogCommon::AStrRm('titles',$post_id);
-		SimpleBlogCommon::AStrRm('post_times',$post_id);
+		SimpleBlogCommon::AStrRm('drafts', $post_id);
+		SimpleBlogCommon::AStrRm('comments_closed', $post_id);
+		SimpleBlogCommon::AStrRm('titles', $post_id);
+		SimpleBlogCommon::AStrRm('post_times', $post_id);
 
 
 
@@ -482,7 +482,7 @@ 
 
 		//save data file or remove the file
 		if( $posts ){
-			if( !gpFiles::SaveArray($post_file,'posts',$posts) ){
+			if( !gpFiles::SaveArray($post_file, 'posts', $posts) ){
 				message($langmessage['OOPS']);
 				return false;
 			}
@@ -513,7 +513,7 @@ 
 	 *
 	 * @param string $header
 	 */
-	public static function BlogHead($header,$post_index,$post,$cacheable=false){
+	public static function BlogHead($header, $post_index, $post, $cacheable = false){
 
 
 		//subtitle
@@ -526,13 +526,13 @@ 
 
 		//blog date
 		$blog_date = '<span class="simple_blog_date">';
-		$blog_date .= strftime(SimpleBlogCommon::$data['strftime_format'],$post['time']);
+		$blog_date .= strftime(SimpleBlogCommon::$data['strftime_format'], $post['time']);
 		$blog_date .= '</span>';
 
 
 		//blog comments
 		$blog_comments = '{empty_blog_piece}';
-		$count = SimpleBlogCommon::AStrGet('comment_counts',$post_index);
+		$count = SimpleBlogCommon::AStrGet('comment_counts', $post_index);
 		if( $count > 0 ){
 			$blog_comments = '<span class="simple_blog_comments">';
 			if( $cacheable ){
@@ -551,16 +551,16 @@ 
 		$search = array('{header}', '{blog_info}', '{blog_date}', '{blog_comments}');
 		$replace = array($header, $blog_info, $blog_date, $blog_comments);
 
-		$result = str_replace($search,$replace,$format);
+		$result = str_replace($search, $replace, $format);
 
 
 		$reg = '#\{empty_blog_piece\}(\s*)\{separator\}#';
-		$result = preg_replace($reg,'\1',$result);
+		$result = preg_replace($reg, '\1', $result);
 
 		$reg = '#\{separator\}(\s*){empty_blog_piece\}#';
-		$result = preg_replace($reg,'\1',$result);
+		$result = preg_replace($reg, '\1', $result);
 
-		echo str_replace('{separator}',SimpleBlogCommon::$data['subtitle_separator'],$result);
+		echo str_replace('{separator}', SimpleBlogCommon::$data['subtitle_separator'], $result);
 	}
 
 
@@ -580,7 +580,7 @@ 
 		global $addonPathData;
 		$categories_file = $addonPathData.'/categories.php';
 
-		$categories = array( 'a' => array( 'ct'=>'Unsorted posts', 'visible'=>false,'posts'=>array() ) );
+		$categories = array('a' => array('ct'=>'Unsorted posts', 'visible'=>false, 'posts'=>array()));
 		if( file_exists($categories_file) ){
 			include($categories_file);
 		}
@@ -592,11 +592,11 @@ 
 	 * Remove a blog entry from a category
 	 *
 	 */
-	public static function DeletePostFromCategories( $post_id ){
+	public static function DeletePostFromCategories($post_id){
 
-		$categories = SimpleBlogCommon::AStrToArray( 'categories' );
-		foreach($categories as $catindex => $catname){
-			SimpleBlogCommon::AStrRmValue( 'category_posts_'.$catindex, $post_id );
+		$categories = SimpleBlogCommon::AStrToArray('categories');
+		foreach( $categories as $catindex => $catname ){
+			SimpleBlogCommon::AStrRmValue('category_posts_'.$catindex, $post_id);
 		}
 	}
 
@@ -655,7 +655,7 @@ 
 	 * Save the comment data for a blog post
 	 *
 	 */
-	public static function SaveCommentData($post_index,$data){
+	public static function SaveCommentData($post_index, $data){
 		global $langmessage;
 
 
@@ -667,7 +667,7 @@ 
 
 		$commentDataFile = $dir.'/'.$post_index.'.txt';
 		$dataTxt = serialize($data);
-		if( !gpFiles::Save($commentDataFile,$dataTxt) ){
+		if( !gpFiles::Save($commentDataFile, $dataTxt) ){
 			return false;
 		}
 
@@ -678,7 +678,7 @@ 
 			unlink($commentDataFile);
 		}
 
-		SimpleBlogCommon::AStrSet('comment_counts',$post_index,count($data));
+		SimpleBlogCommon::AStrSet('comment_counts', $post_index, count($data));
 
 		SimpleBlogCommon::SaveIndex();
 
@@ -698,16 +698,16 @@ 
 		}
 	}
 
-	public static function PostLink($post,$label,$query='',$attr=''){
-		return '<a href="'.SimpleBlogCommon::PostUrl($post,$query,true).'" '.$attr.'>'.common::Ampersands($label).'</a>';
+	public static function PostLink($post, $label, $query = '', $attr = ''){
+		return '<a href="'.SimpleBlogCommon::PostUrl($post, $query, true).'" '.$attr.'>'.common::Ampersands($label).'</a>';
 	}
 
-	public static function PostUrl( $post = false, $query='' ){
-		SimpleBlogCommon::UrlQuery( $post, $url, $query );
-		return common::GetUrl( $url, $query );
+	public static function PostUrl($post = false, $query = ''){
+		SimpleBlogCommon::UrlQuery($post, $url, $query);
+		return common::GetUrl($url, $query);
 	}
 
-	public static function UrlQuery( $post_id = false, &$url, &$query ){
+	public static function UrlQuery($post_id = false, &$url, &$query){
 
 		$url = SimpleBlogCommon::$root_url;
 
@@ -715,8 +715,8 @@ 
 			switch( SimpleBlogCommon::$data['urls'] ){
 
 				case 'Full':
-					$title = SimpleBlogCommon::AStrGet('titles',$post_id);
-					$title = str_replace(array('?',' '),array('','_'),$title);
+					$title = SimpleBlogCommon::AStrGet('titles', $post_id);
+					$title = str_replace(array('?', ' '), array('', '_'), $title);
 					$url .= '/'.$post_id.'_'.$title;
 				break;
 
@@ -725,13 +725,13 @@ 
 				break;
 
 				case 'Title':
-					$title = SimpleBlogCommon::AStrGet('titles',$post_id);
-					$title = str_replace(array('?',' '),array('','_'),$title);
+					$title = SimpleBlogCommon::AStrGet('titles', $post_id);
+					$title = str_replace(array('?', ' '), array('', '_'), $title);
 					$url .= '/'.$title;
 				break;
 
 				default:
-				$query = trim($query.'&id='.$post_id,'&');
+				$query = trim($query.'&id='.$post_id, '&');
 				break;
 			}
 		}
@@ -740,14 +740,14 @@ 
 	/**
 	 * @param string $label
 	 */
-	public static function CategoryLink( $catindex, $cattitle, $label, $query = '', $attr = '' ){
+	public static function CategoryLink($catindex, $cattitle, $label, $query = '', $attr = ''){
 
 		$url = 'Special_Blog_Categories';
 		switch( SimpleBlogCommon::$data['urls'] ){
 
 			case 'Title':
 			case 'Full':
-				$cattitle = str_replace(array('?',' '),array('','_'),$cattitle);
+				$cattitle = str_replace(array('?', ' '), array('', '_'), $cattitle);
 				$url .= '/'.$cattitle;
 			break;
 
@@ -756,11 +756,11 @@ 
 			break;
 
 			default:
-				$query = trim('cat='.$catindex.'&'.$query,'&');
+				$query = trim('cat='.$catindex.'&'.$query, '&');
 			break;
 		}
 
-		return '<a href="'.common::GetUrl( $url, $query ).'" '.$attr.'>'.common::Ampersands($label).'</a>';
+		return '<a href="'.common::GetUrl($url, $query).'" '.$attr.'>'.common::Ampersands($label).'</a>';
 	}
 
 
@@ -780,9 +780,9 @@ 
 	 */
 	public static function AStrFromArray($array){
 		$str = '';
-		foreach($array as $key => $value){
-			$key = str_replace(array('"','>'),'',$key);
-			$value = str_replace(array('"','>'),'',$value);
+		foreach( $array as $key => $value ){
+			$key = str_replace(array('"', '>'), '', $key);
+			$value = str_replace(array('"', '>'), '', $value);
 			$str .= '"'.$key.'>'.$value;
 		}
 		return $str.'"';
@@ -796,7 +796,7 @@ 
 	 * @param mixed $new_value
 	 * @deprecated 3.0.1
 	 */
-	public static function AStrValue( $data_string, $key, $new_value = false ){
+	public static function AStrValue($data_string, $key, $new_value = false){
 
 		if( $new_value === false ){
 			return self::AStrGet($data_string, $key);
@@ -811,18 +811,18 @@ 
 	 * @param string $data_string
 	 * @param int|string $key
 	 */
-	public static function AStrGet( $data_string, $key){
+	public static function AStrGet($data_string, $key){
 
-		$string =& SimpleBlogCommon::$data[$data_string];
+		$string = & SimpleBlogCommon::$data[$data_string];
 
 		//get position of current value
-		$prev_key_str	= '"'.$key.'>';
-		$offset			= strpos($string,$prev_key_str);
+		$prev_key_str = '"'.$key.'>';
+		$offset = strpos($string, $prev_key_str);
 
 		if( $offset !== false ){
-			$offset		+= strlen($prev_key_str);
-			$length		= strpos($string,'"',$offset) - $offset;
-			return substr($string,$offset,$length);
+			$offset += strlen($prev_key_str);
+			$length = strpos($string, '"', $offset)-$offset;
+			return substr($string, $offset, $length);
 		}
 
 		return false;
@@ -835,25 +835,25 @@ 
 	 * @param int|string $key
 	 * @param string $new_value
 	 */
-	public static function AStrSet( $data_string, $key, $new_value){
+	public static function AStrSet($data_string, $key, $new_value){
 
-		$string =& SimpleBlogCommon::$data[$data_string];
+		$string = & SimpleBlogCommon::$data[$data_string];
 
 		//get position of current value
-		$prev_key_str	= '"'.$key.'>';
-		$offset			= strpos($string,$prev_key_str);
+		$prev_key_str = '"'.$key.'>';
+		$offset = strpos($string, $prev_key_str);
 
 		//setting values
 		if( $offset === false ){
 			if( empty($string) ){
-				$string	= '"';
+				$string = '"';
 			}
-			$key		= str_replace(array('"','>'),'',$key);
+			$key = str_replace(array('"', '>'), '', $key);
 			$string		.= $key.'>'.$new_value.'"';
 		}else{
 			$offset		+= strlen($prev_key_str);
-			$length		= strpos($string,'"',$offset) - $offset;
-			$string		= substr_replace($string,$new_value,$offset,$length);
+			$length		= strpos($string, '"', $offset)-$offset;
+			$string		= substr_replace($string, $new_value, $offset, $length);
 		}
 
 		return true;
@@ -866,7 +866,7 @@ 
 	 *
 	 * @param string $data_string
 	 */
-	public static function AStrKey( $data_string, $value, $url_search = false ){
+	public static function AStrKey($data_string, $value, $url_search = false){
 		static $integers = '0123456789';
 
 		if( !isset(SimpleBlogCommon::$data[$data_string]) ){
@@ -876,21 +876,21 @@ 
 		$string			= SimpleBlogCommon::$data[$data_string];
 
 		if( $url_search ){
-			$string		= str_replace(array('?',' '),array('','_'),$string);
+			$string		= str_replace(array('?', ' '), array('', '_'), $string);
 		}
 
-		$len			= strlen($string);
-		$post_pos		= strpos($string,'>'.$value.'"');
+		$len = strlen($string);
+		$post_pos = strpos($string, '>'.$value.'"');
 
 		if( $post_pos === false ){
 			return false;
 		}
 
-		$offset			= $post_pos-$len;
-		$post_key_pos	= strrpos( $string, '"', $offset );
-		$post_key_len	= strspn( $string, $integers, $post_key_pos+1 );
+		$offset = $post_pos-$len;
+		$post_key_pos	= strrpos($string, '"', $offset);
+		$post_key_len	= strspn($string, $integers, $post_key_pos+1);
 
-		return substr( $string, $post_key_pos+1, $post_key_len );
+		return substr($string, $post_key_pos+1, $post_key_len);
 	}
 
 
@@ -899,9 +899,9 @@ 
 	 *
 	 * @param string $data_string
 	 */
-	public static function AStrRm( $data_string, $key ){
+	public static function AStrRm($data_string, $key){
 
-		$string =& SimpleBlogCommon::$data[$data_string];
+		$string = & SimpleBlogCommon::$data[$data_string];
 		$string = preg_replace('#"'.$key.'>[^">]*\"#', '"', $string);
 	}
 
@@ -909,9 +909,9 @@ 
 	/**
 	 * @param string $data_string
 	 */
-	public static function AStrRmValue( $data_string, $value ){
+	public static function AStrRmValue($data_string, $value){
 
-		$string =& SimpleBlogCommon::$data[$data_string];
+		$string = & SimpleBlogCommon::$data[$data_string];
 		$string = preg_replace('#"[^">]*>'.$value.'\"#', '"', $string);
 
 	}
@@ -922,9 +922,9 @@ 
 	 *
 	 * @param string $data_string
 	 */
-	public static function AStrToArray( $data_string ){
+	public static function AStrToArray($data_string){
 
-		$string =& SimpleBlogCommon::$data[$data_string];
+		$string = & SimpleBlogCommon::$data[$data_string];
 
 		$count = preg_match_all('#(?:([^">]*)>)([^">]*)#', $string, $matches);
 		if( !$count ){
@@ -934,7 +934,7 @@ 
 		$keys = $matches[1];
 		$values = $matches[2];
 
-		return array_combine($matches[1],$matches[2]);
+		return array_combine($matches[1], $matches[2]);
 	}
 
 

SimpleBlogCategories.php

Braces +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
 		if( $this->catindex && isset($this->categories[$this->catindex]) && !SimpleBlogCommon::AStrGet('categories_hidden',$this->catindex) ){
 			$this->ShowCategory();
-		}else{
+		} else{
 			$this->ShowCategories();
 		}
 	}
@@ -113,7 +113,7 @@ 
 
 				$show_posts[] = $post_id;
 			}
-		}else{
+		} else{
 			$show_posts = $cat_posts;
 		}
 		$this->total_posts = count($show_posts);

Spacing +22 added lines, -22 removed lines

@@ -14,12 +14,12 @@ 
 		global $page;
 
 		SimpleBlogCommon::Init();
-		$this->categories = SimpleBlogCommon::AStrToArray( 'categories' );
+		$this->categories = SimpleBlogCommon::AStrToArray('categories');
 
 
 		$this->catindex = $this->CatIndex($page->requested);
 
-		if( $this->catindex && isset($this->categories[$this->catindex]) && !SimpleBlogCommon::AStrGet('categories_hidden',$this->catindex) ){
+		if( $this->catindex && isset($this->categories[$this->catindex]) && !SimpleBlogCommon::AStrGet('categories_hidden', $this->catindex) ){
 			$this->ShowCategory();
 		}else{
 			$this->ShowCategories();
@@ -32,23 +32,23 @@ 
 	 */
 	function CatIndex($requested){
 
-		if( isset($_REQUEST['cat'])	){
+		if( isset($_REQUEST['cat']) ){
 			return $_REQUEST['cat'];
 		}
 
-		if( strpos($requested,'/') === false ){
+		if( strpos($requested, '/') === false ){
 			return false;
 		}
 
-		$parts	= explode('/',$requested);
+		$parts = explode('/', $requested);
 
 		if( ctype_digit($parts[1]) ){
 			return $parts[1];
 		}
 
 
-		$parts[1] = str_replace('_',' ',$parts[1]);
-		return array_search($parts[1],$this->categories);
+		$parts[1] = str_replace('_', ' ', $parts[1]);
+		return array_search($parts[1], $this->categories);
 	}
 
 
@@ -66,7 +66,7 @@ 
 		$start = $page * $per_page;
 
 		$include_drafts = common::LoggedIn();
-		$show_posts = $this->WhichCatPosts( $start, $per_page, $include_drafts);
+		$show_posts = $this->WhichCatPosts($start, $per_page, $include_drafts);
 
 		$this->ShowPosts($show_posts);
 
@@ -75,15 +75,15 @@ 
 		echo '<p class="blog_nav_links">';
 
 		if( $page > 0 ){
-			$html = SimpleBlogCommon::CategoryLink( $this->catindex, $catname, '%s', 'page='.($page-1), 'class="blog_newer"' );
-			echo gpOutput::GetAddonText('Newer Entries',$html);
+			$html = SimpleBlogCommon::CategoryLink($this->catindex, $catname, '%s', 'page='.($page-1), 'class="blog_newer"');
+			echo gpOutput::GetAddonText('Newer Entries', $html);
 			echo '&nbsp;';
 		}
 
 
-		if( ( ($page+1) * $per_page) < $this->total_posts ){
-			$html = SimpleBlogCommon::CategoryLink( $this->catindex, $catname, '%s', 'page='.($page+1), 'class="blog_older"' );
-			echo gpOutput::GetAddonText('Older Entries',$html);
+		if( (($page+1) * $per_page) < $this->total_posts ){
+			$html = SimpleBlogCommon::CategoryLink($this->catindex, $catname, '%s', 'page='.($page+1), 'class="blog_older"');
+			echo gpOutput::GetAddonText('Older Entries', $html);
 		}
 
 
@@ -101,12 +101,12 @@ 
 		//remove drafts
 		$show_posts = array();
 		if( !$include_drafts ){
-			foreach($cat_posts as $post_id){
-				if( SimpleBlogCommon::AStrGet('drafts',$post_id) ){
+			foreach( $cat_posts as $post_id ){
+				if( SimpleBlogCommon::AStrGet('drafts', $post_id) ){
 					continue;
 				}
 
-				$time = SimpleBlogCommon::AStrGet('post_times',$post_id);
+				$time = SimpleBlogCommon::AStrGet('post_times', $post_id);
 				if( $time > time() ){
 					continue;
 				}
@@ -118,7 +118,7 @@ 
 		}
 		$this->total_posts = count($show_posts);
 
-		return array_slice($show_posts,$start,$len);
+		return array_slice($show_posts, $start, $len);
 	}
 
 
@@ -130,22 +130,22 @@ 
 
 
 		echo '<ul>';
-		foreach($this->categories as $catindex => $catname){
+		foreach( $this->categories as $catindex => $catname ){
 
 			//skip hidden categories
-			if( SimpleBlogCommon::AStrGet('categories_hidden',$catindex) ){
+			if( SimpleBlogCommon::AStrGet('categories_hidden', $catindex) ){
 				continue;
 			}
 
-			$cat_posts_str =& SimpleBlogCommon::$data['category_posts_'.$catindex];
-			$count = substr_count($cat_posts_str ,'>');
+			$cat_posts_str = & SimpleBlogCommon::$data['category_posts_'.$catindex];
+			$count = substr_count($cat_posts_str, '>');
 
 			if( !$count ){
 				continue;
 			}
 
 			echo '<li>';
-			echo SimpleBlogCommon::CategoryLink( $catindex, $catname, $catname.' ('.$count.')' );
+			echo SimpleBlogCommon::CategoryLink($catindex, $catname, $catname.' ('.$count.')');
 			echo '</li>';
 		}
 		echo '</ul>';

Admin/Comments.php

Braces +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 		echo '<br/>';
 		if( (SimpleBlogCommon::$data['commenter_website'] == 'nofollow') && !empty($comment['website']) ){
 			echo '<a href="'.$comment['website'].'" rel="nofollow">'.$comment['website'].'</a>';
-		}elseif( (SimpleBlogCommon::$data['commenter_website'] == 'link') && !empty($comment['website']) ){
+		} elseif( (SimpleBlogCommon::$data['commenter_website'] == 'link') && !empty($comment['website']) ){
 			echo '<a href="'.$comment['website'].'">'.$comment['website'].'</a>';
 		}
 

Spacing +17 added lines, -17 removed lines

@@ -17,7 +17,7 @@ 
 		parent::__construct();
 
 
-		$this->dir			= SimpleBlogCommon::$data_dir.'/comments';
+		$this->dir = SimpleBlogCommon::$data_dir.'/comments';
 
 		$this->GetCache();
 
@@ -47,9 +47,9 @@ 
 		echo 'Options';
 		echo '</th></tr>';
 
-		uasort($this->cache, array('SimpleBlogComments','Sort') );
+		uasort($this->cache, array('SimpleBlogComments', 'Sort'));
 
-		foreach($this->cache as $comment){
+		foreach( $this->cache as $comment ){
 			$this->OutputComment($comment);
 		}
 		echo '</table>';
@@ -67,7 +67,7 @@ 
 
 		echo '</td><td>';
 		//echo strftime(SimpleBlogCommon::$data['strftime_format'],$comment['time']);
-		echo strftime( "%Y-%m-%d %H:%M:%S", $comment['time'] );
+		echo strftime("%Y-%m-%d %H:%M:%S", $comment['time']);
 		echo '<br/>';
 		if( (SimpleBlogCommon::$data['commenter_website'] == 'nofollow') && !empty($comment['website']) ){
 			echo '<a href="'.$comment['website'].'" rel="nofollow">'.$comment['website'].'</a>';
@@ -76,25 +76,25 @@ 
 		}
 
 		echo '</td><td>';
-		echo SimpleBlogCommon::PostLink($comment['post_id'],'View&nbsp;Post');
+		echo SimpleBlogCommon::PostLink($comment['post_id'], 'View&nbsp;Post');
 		echo ' &nbsp; ';
-		echo common::Link('Admin_BlogComments',$langmessage['delete'],'cmd=delete_comment&id='.$comment['post_id'].'&comment_time='.$comment['time'],array('name'=>'postlink','class'=>'gpconfirm','title'=>$langmessage['delete_confirm']));
+		echo common::Link('Admin_BlogComments', $langmessage['delete'], 'cmd=delete_comment&id='.$comment['post_id'].'&comment_time='.$comment['time'], array('name'=>'postlink', 'class'=>'gpconfirm', 'title'=>$langmessage['delete_confirm']));
 		echo '</td></tr>';
 	}
 
 	function DeleteComment(){
 
-		$post_id		= $_REQUEST['id'];
-		$comment_time	= $_REQUEST['comment_time'];
-		$data			= SimpleBlogCommon::GetCommentData($post_id);
+		$post_id = $_REQUEST['id'];
+		$comment_time = $_REQUEST['comment_time'];
+		$data = SimpleBlogCommon::GetCommentData($post_id);
 
-		foreach($data as $key => $comment){
+		foreach( $data as $key => $comment ){
 			if( $comment['time'] == $comment_time ){
 				unset($data[$key]);
 			}
 		}
 
-		SimpleBlogCommon::SaveCommentData($post_id,$data);
+		SimpleBlogCommon::SaveCommentData($post_id, $data);
 		$this->GetCache();
 	}
 
@@ -125,13 +125,13 @@ 
 		$new_entries = false;
 
 		$files = scandir($this->dir);
-		foreach($files as $file){
+		foreach( $files as $file ){
 
 			if( $file == '.' || $file == '..' ){
 				continue;
 			}
 
-			list($post_id,$ext) = explode('.',$file,2);
+			list($post_id, $ext) = explode('.', $file, 2);
 
 			if( !is_numeric($post_id) ){
 				continue;
@@ -146,7 +146,7 @@ 
 
 			$data = SimpleBlogCommon::FileData($full_path);
 
-			foreach($data as $comment){
+			foreach( $data as $comment ){
 				if( $comment['time'] < $this->cache_mod ){
 					continue;
 				}
@@ -158,13 +158,13 @@ 
 		}
 
 		if( $new_entries ){
-			uasort($this->cache, array('SimpleBlogComments','Sort') );
+			uasort($this->cache, array('SimpleBlogComments', 'Sort'));
 			$dataTxt = serialize($this->cache);
-			gpFiles::Save($this->cache_file,$dataTxt);
+			gpFiles::Save($this->cache_file, $dataTxt);
 		}
 	}
 
-	function Sort($a,$b){
+	function Sort($a, $b){
 		if( $a['time'] == $b['time'] ){
 			return 0;
 		}

Admin/Configuration.php

Braces +9 added lines, -9 removed lines

@@ -54,7 +54,7 @@ 
 
 		if( is_numeric($_POST['post_abbrev']) ){
 			SimpleBlogCommon::$data['post_abbrev'] = (int)$_POST['post_abbrev'];
-		}elseif( empty($_POST['post_abbrev']) ){
+		} elseif( empty($_POST['post_abbrev']) ){
 			SimpleBlogCommon::$data['post_abbrev'] = '';
 		}
 
@@ -127,7 +127,7 @@ 
 		echo '<tr><td>Urls</td><td>';
 		if( version_compare($gpversion,'4.0','>=') ){
 			self::Radio('urls',$options['urls'],$array['urls']);
-		}else{
+		} else{
 			echo 'Available in gpEasy 4.0+';
 		}
 		echo '</td><td>';
@@ -182,7 +182,7 @@ 
 		echo '</td><td>';
 		if( $array['abbrev_image'] ){
 			echo '<input type="checkbox" name="abbrev_image" value="allow" checked="checked" />';
-		}else{
+		} else{
 			echo '<input type="checkbox" name="abbrev_image" value="allow" />';
 		}
 		echo '</td><td></td></tr>';
@@ -194,7 +194,7 @@ 
 		echo '</td><td>';
 		if( $array['abbrev_cat'] ){
 			echo '<input type="checkbox" name="abbrev_cat" value="allow" checked="checked" />';
-		}else{
+		} else{
 			echo '<input type="checkbox" name="abbrev_cat" value="allow" />';
 		}
 		echo '</td><td></td></tr>';
@@ -262,7 +262,7 @@ 
 		echo '</td><td>';
 		if( $array['allow_comments'] ){
 			echo '<input type="checkbox" name="allow_comments" value="allow" checked="checked" />';
-		}else{
+		} else{
 			echo '<input type="checkbox" name="allow_comments" value="allow" />';
 		}
 		echo '</td><td></td></tr>';
@@ -285,11 +285,11 @@ 
 				echo '<option value="">Hide</option>';
 				echo '<option value="nofollow" selected="selected">Nofollow Link</option>';
 				echo '<option value="link">Follow Link</option>';
-			}elseif( $array['commenter_website'] == 'link' ){
+			} elseif( $array['commenter_website'] == 'link' ){
 				echo '<option value="">Hide</option>';
 				echo '<option value="nofollow" selected="selected">Nofollow Link</option>';
 				echo '<option value="link" selected="selected">Follow Link</option>';
-			}else{
+			} else{
 				echo '<option value="">Hide</option>';
 				echo '<option value="nofollow">Nofollow Link</option>';
 				echo '<option value="link">Follow Link</option>';
@@ -305,13 +305,13 @@ 
 
 		if( !gp_recaptcha::isActive() ){
 			$disabled = ' disabled="disabled" ';
-		}else{
+		} else{
 			$disabled = '';
 		}
 
 		if( $array['comment_captcha'] ){
 			echo '<input type="checkbox" name="comment_captcha" value="allow" checked="checked" '.$disabled.'/>';
-		}else{
+		} else{
 			echo '<input type="checkbox" name="comment_captcha" value="allow" '.$disabled.'/>';
 		}
 		echo '</td><td>';

Spacing +22 added lines, -22 removed lines

@@ -14,7 +14,7 @@ 
 
 
 		$cmd = common::GetCommand();
-		switch($cmd){
+		switch( $cmd ){
 			//regen
 			case 'regen':
 				SimpleBlogCommon::GenStaticContent();
@@ -50,7 +50,7 @@ 
 			SimpleBlogCommon::$data['urls'] = $_POST['urls'];
 		}
 
-		SimpleBlogCommon::$data['per_page']				= (int)$_POST['per_page'];
+		SimpleBlogCommon::$data['per_page'] = (int)$_POST['per_page'];
 
 		if( is_numeric($_POST['post_abbrev']) ){
 			SimpleBlogCommon::$data['post_abbrev'] = (int)$_POST['post_abbrev'];
@@ -59,8 +59,8 @@ 
 		}
 
 
-		SimpleBlogCommon::$data['gadget_entries']		= (int)$_POST['gadget_entries'];
-		SimpleBlogCommon::$data['gadget_abbrev']		= (int)$_POST['gadget_abbrev'];
+		SimpleBlogCommon::$data['gadget_entries'] = (int)$_POST['gadget_entries'];
+		SimpleBlogCommon::$data['gadget_abbrev'] = (int)$_POST['gadget_abbrev'];
 
 		$format = htmlspecialchars($_POST['strftime_format']);
 		if( @strftime($format) ){
@@ -69,19 +69,19 @@ 
 
 
 		SimpleBlogCommon::$data['feed_entries']			= (int)$_POST['feed_entries'];
-		SimpleBlogCommon::$data['feed_abbrev']			= (int)$_POST['feed_abbrev'];
+		SimpleBlogCommon::$data['feed_abbrev'] = (int)$_POST['feed_abbrev'];
 
 		SimpleBlogCommon::$data['abbrev_image']			= isset($_POST['abbrev_image']);
-		SimpleBlogCommon::$data['abbrev_cat']			= isset($_POST['abbrev_cat']);
+		SimpleBlogCommon::$data['abbrev_cat'] = isset($_POST['abbrev_cat']);
 
 
 		//comments
-		SimpleBlogCommon::$data['allow_comments']		= isset($_POST['allow_comments']);
-		SimpleBlogCommon::$data['commenter_website']	= (string)$_POST['commenter_website'];
-		SimpleBlogCommon::$data['comment_captcha']		= isset($_POST['comment_captcha']);
+		SimpleBlogCommon::$data['allow_comments'] = isset($_POST['allow_comments']);
+		SimpleBlogCommon::$data['commenter_website'] = (string)$_POST['commenter_website'];
+		SimpleBlogCommon::$data['comment_captcha'] = isset($_POST['comment_captcha']);
 
-		SimpleBlogCommon::$data['subtitle_separator']	= (string)$_POST['subtitle_separator'];
-		SimpleBlogCommon::$data['email_comments']		= $_POST['email_comments'];
+		SimpleBlogCommon::$data['subtitle_separator'] = (string)$_POST['subtitle_separator'];
+		SimpleBlogCommon::$data['email_comments'] = $_POST['email_comments'];
 
 		if( !SimpleBlogCommon::SaveIndex() ){
 			message($langmessage['OOPS']);
@@ -103,7 +103,7 @@ 
 
 
 		$defaults = SimpleBlogCommon::Defaults();
-		$array =& SimpleBlogCommon::$data;
+		$array = & SimpleBlogCommon::$data;
 
 		$label = gpOutput::SelectText('Blog');
 
@@ -125,8 +125,8 @@ 
 
 		//Pretty Urls
 		echo '<tr><td>Urls</td><td>';
-		if( version_compare($gpversion,'4.0','>=') ){
-			self::Radio('urls',$options['urls'],$array['urls']);
+		if( version_compare($gpversion, '4.0', '>=') ){
+			self::Radio('urls', $options['urls'], $array['urls']);
 		}else{
 			echo 'Available in gpEasy 4.0+';
 		}
@@ -329,9 +329,9 @@ 
 
 
 		echo '<p style="text-align:center">';
-			echo common::Link('Admin_Theme_Content',$langmessage['editable_text'],'cmd=addontext&addon='.urlencode($addonFolderName),' title="'.urlencode($langmessage['editable_text']).'" name="gpabox" ');
+			echo common::Link('Admin_Theme_Content', $langmessage['editable_text'], 'cmd=addontext&addon='.urlencode($addonFolderName), ' title="'.urlencode($langmessage['editable_text']).'" name="gpabox" ');
 			echo ' &nbsp; &nbsp; ';
-			echo common::Link('Admin_BlogConfig','Regenerate Gadget','cmd=regen',' name="creq"');
+			echo common::Link('Admin_BlogConfig', 'Regenerate Gadget', 'cmd=regen', ' name="creq"');
 		echo '</p>';
 
 		echo '</form>';
@@ -352,11 +352,11 @@ 
 
 	}
 
-	function Select($name,$options,$current){
+	function Select($name, $options, $current){
 		echo '<select name="'.$name.'" class="gpselect">';
-		foreach($options as $value => $label){
+		foreach( $options as $value => $label ){
 			$selected = '';
-			if( $current == $value){
+			if( $current == $value ){
 				$selected = ' selected="selected"';
 			}
 			echo '<option value="'.$value.'"'.$selected.'">'.$label.'</option>';
@@ -367,12 +367,12 @@ 
 	/**
 	 * @param string $name
 	 */
-	function Radio($name,$options,$current){
+	function Radio($name, $options, $current){
 
-		foreach($options as $value => $label){
+		foreach( $options as $value => $label ){
 			echo '<div><label>';
 			$checked = '';
-			if( $current == $value){
+			if( $current == $value ){
 				$checked = ' checked';
 			}
 			echo '<input type="radio" name="'.$name.'" value="'.$value.'" '.$checked.' /> ';

Admin/SimpleBlogPage.php

Braces +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 
 		if( $closed ){
 			SimpleBlogCommon::AStrSet('comments_closed',$post_id,1);
-		}else{
+		} else{
 			SimpleBlogCommon::AStrRm('comments_closed',$post_id);
 		}
 
@@ -61,7 +61,7 @@ 
 		if( SimpleBlogCommon::SaveIndex() ){
 			$this->comments_closed = $closed;
 			message($langmessage['SAVED']);
-		}else{
+		} else{
 			message($langmessage['OOPS']);
 		}
 	}
@@ -87,7 +87,7 @@ 
 		if( SimpleBlogCommon::SaveCommentData($this->post_id,$data) ){
 			message($langmessage['SAVED']);
 			return true;
-		}else{
+		} else{
 			message($langmessage['OOPS']);
 			return false;
 		}

Spacing +12 added lines, -12 removed lines

@@ -11,7 +11,7 @@ 
 
 		$cmd = common::GetCommand();
 
-		switch($cmd){
+		switch( $cmd ){
 
 			// inline editing
 			case 'inlineedit':
@@ -49,13 +49,13 @@ 
 	 *
 	 * @param boolean $closed
 	 */
-	function ToggleComments($closed, $post_id ){
+	function ToggleComments($closed, $post_id){
 		global $langmessage;
 
 		if( $closed ){
-			SimpleBlogCommon::AStrSet('comments_closed',$post_id,1);
+			SimpleBlogCommon::AStrSet('comments_closed', $post_id, 1);
 		}else{
-			SimpleBlogCommon::AStrRm('comments_closed',$post_id);
+			SimpleBlogCommon::AStrRm('comments_closed', $post_id);
 		}
 
 
@@ -75,8 +75,8 @@ 
 	function DeleteComment(){
 		global $langmessage;
 
-		$data		= SimpleBlogCommon::GetCommentData($this->post_id);
-		$comment	= $_POST['comment_index'];
+		$data = SimpleBlogCommon::GetCommentData($this->post_id);
+		$comment = $_POST['comment_index'];
 
 		if( !isset($data[$comment]) ){
 			message($langmessage['OOPS']);
@@ -85,7 +85,7 @@ 
 
 		unset($data[$comment]);
 
-		if( SimpleBlogCommon::SaveCommentData($this->post_id,$data) ){
+		if( SimpleBlogCommon::SaveCommentData($this->post_id, $data) ){
 			message($langmessage['SAVED']);
 			return true;
 		}else{
@@ -151,19 +151,19 @@ 
 		global $gpAdmin;
 
 		gpFiles::cleanText($post['content']);
-		$post['username']		= $gpAdmin['username'];
-		$post_file				= SimpleBlogCommon::PostFilePath($post_index);
+		$post['username'] = $gpAdmin['username'];
+		$post_file = SimpleBlogCommon::PostFilePath($post_index);
 
-		if( !gpFiles::SaveArray($post_file,'post',$post) ){
+		if( !gpFiles::SaveArray($post_file, 'post', $post) ){
 			message($langmessage['OOPS'].' (Post not saved)');
 			return false;
 		}
 
 		//remove from old data file
-		$posts					= SimpleBlogCommon::GetPostFile($post_index,$post_file);
+		$posts = SimpleBlogCommon::GetPostFile($post_index, $post_file);
 		if( isset($posts[$post_index]) ){
 			unset($posts[$post_index]);
-			gpFiles::SaveArray($post_file,'posts',$posts);
+			gpFiles::SaveArray($post_file, 'posts', $posts);
 		}
 
 		return true;

Admin/Admin.php

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		foreach($options as $slug => $label){
 			if( $slug == $current ){
 				$links[] = $label;
-			}else{
+			} else{
 				$links[] = common::Link($slug,$label);
 			}
 		}

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 		SimpleBlogCommon::Init();
 
 		$page->css_admin[]	= '/include/css/addons.css'; //for hmargin css pre gpEasy 3.6
-		$page->head_js[]	= '/data/_addoncode/'.$addonFolderName.'/static/admin.js';
+		$page->head_js[] = '/data/_addoncode/'.$addonFolderName.'/static/admin.js';
 		$page->css_admin[]	= '/data/_addoncode/'.$addonFolderName.'/static/admin.css'; //gpPlugin::css('admin.css'); //gpeasy 4.0+
 
 
@@ -35,21 +35,21 @@ 
 			);
 
 		$links = array();
-		foreach($options as $slug => $label){
+		foreach( $options as $slug => $label ){
 			if( $slug == $current ){
 				$links[] = $label;
 			}else{
-				$links[] = common::Link($slug,$label);
+				$links[] = common::Link($slug, $label);
 			}
 		}
 
-		echo common::Link('Admin_Blog','New Blog Post','cmd=new_form',' class="gpsubmit" style="float:right"');
+		echo common::Link('Admin_Blog', 'New Blog Post', 'cmd=new_form', ' class="gpsubmit" style="float:right"');
 
 		echo '<h2 class="hmargin">';
 		$label = gpOutput::SelectText('Blog');
-		echo common::Link('Special_Blog',$label);
+		echo common::Link('Special_Blog', $label);
 		echo ' &#187; ';
-		echo implode('<span>|</span>',$links);
+		echo implode('<span>|</span>', $links);
 		echo '</h2>';
 	}
 

SimpleBlogPage.php

Braces +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
 			$header		.= '<span style="opacity:0.3;">';
 			$header		.= gpOutput::SelectText('Draft');
 			$header		.= '</span> ';
-		}elseif( $this->post['time'] > time() ){
+		} elseif( $this->post['time'] > time() ){
 			$header .= '<span style="opacity:0.3;">';
 			$header .= gpOutput::SelectText('Pending');
 			$header .= '</span> ';
@@ -205,7 +205,7 @@ 
 			if( !isset($_POST['anti_spam_submitted']) ){
 				return false;
 
-			}elseif( !gp_recaptcha::Check() ){
+			} elseif( !gp_recaptcha::Check() ){
 				return false;
 
 			}
@@ -324,9 +324,9 @@ 
 		echo '<p class="name">';
 		if( (SimpleBlogCommon::$data['commenter_website'] == 'nofollow') && !empty($comment['website']) ){
 			echo '<b><a href="'.$comment['website'].'" rel="nofollow">'.$comment['name'].'</a></b>';
-		}elseif( (SimpleBlogCommon::$data['commenter_website'] == 'link') && !empty($comment['website']) ){
+		} elseif( (SimpleBlogCommon::$data['commenter_website'] == 'link') && !empty($comment['website']) ){
 			echo '<b><a href="'.$comment['website'].'">'.$comment['name'].'</a></b>';
-		}else{
+		} else{
 			echo '<b>'.$comment['name'].'</b>';
 		}
 		echo ' &nbsp; ';

Spacing +49 added lines, -49 removed lines

@@ -7,13 +7,13 @@ 
 
 	public $post_id;
 	public $post;
-	public $comment_saved		= false;
+	public $comment_saved = false;
 	public $comments_closed;
 
 	public function __construct($post_id){
-		$this->post_id			= $post_id;
-		$this->post				= SimpleBlogCommon::GetPostContent($this->post_id);
-		$this->comments_closed	= SimpleBlogCommon::AStrGet('comments_closed',$this->post_id);
+		$this->post_id = $post_id;
+		$this->post = SimpleBlogCommon::GetPostContent($this->post_id);
+		$this->comments_closed = SimpleBlogCommon::AStrGet('comments_closed', $this->post_id);
 	}
 
 
@@ -28,7 +28,7 @@ 
 			return;
 		}
 
-		if( !common::LoggedIn() && SimpleBlogCommon::AStrGet('drafts',$this->post_id) ){
+		if( !common::LoggedIn() && SimpleBlogCommon::AStrGet('drafts', $this->post_id) ){
 			$this->Error_404();
 			return;
 		}
@@ -41,7 +41,7 @@ 
 	public function _ShowPost(){
 		global $page;
 
-		$page->label = SimpleBlogCommon::Underscores( $this->post['title'] );
+		$page->label = SimpleBlogCommon::Underscores($this->post['title']);
 
 		$class = $id = '';
 		if( common::LoggedIn() ){
@@ -51,8 +51,8 @@ 
 		echo '<div class="blog_post single_blog_item '.$class.'" '.$id.'>';
 
 		//heading
-		$header			= '<h2 id="blog_post_'.$this->post_id.'">';
-		if( SimpleBlogCommon::AStrGet('drafts',$this->post_id) ){
+		$header = '<h2 id="blog_post_'.$this->post_id.'">';
+		if( SimpleBlogCommon::AStrGet('drafts', $this->post_id) ){
 			$header		.= '<span style="opacity:0.3;">';
 			$header		.= gpOutput::SelectText('Draft');
 			$header		.= '</span> ';
@@ -62,9 +62,9 @@ 
 			$header .= '</span> ';
 		}
 
-		$header			.= SimpleBlogCommon::PostLink($this->post_id,$page->label);
+		$header			.= SimpleBlogCommon::PostLink($this->post_id, $page->label);
 		$header			.= '</h2>';
-		SimpleBlogCommon::BlogHead($header,$this->post_id,$this->post);
+		SimpleBlogCommon::BlogHead($header, $this->post_id, $this->post);
 
 
 		//content
@@ -95,17 +95,17 @@ 
 
 		if( empty($cmd) ){
 			//redirect to correct url if needed
-			SimpleBlogCommon::UrlQuery( $this->post_id, $expected_url, $query );
-			$expected_url = str_replace('&amp;','&',$expected_url); //because of htmlspecialchars($cattitle)
+			SimpleBlogCommon::UrlQuery($this->post_id, $expected_url, $query);
+			$expected_url = str_replace('&amp;', '&', $expected_url); //because of htmlspecialchars($cattitle)
 			if( $page->requested != $expected_url ){
-				$expected_url = common::GetUrl( $expected_url, $query, false );
+				$expected_url = common::GetUrl($expected_url, $query, false);
 				common::Redirect($expected_url);
 			}
 			return;
 		}
 
 
-		switch($cmd){
+		switch( $cmd ){
 			case 'Add Comment':
 				$this->AddComment();
 			break;
@@ -126,12 +126,12 @@ 
 		}
 
 		$temp = array();
-		foreach($this->post['categories'] as $catindex){
-			$title = SimpleBlogCommon::AStrGet( 'categories', $catindex );
+		foreach( $this->post['categories'] as $catindex ){
+			$title = SimpleBlogCommon::AStrGet('categories', $catindex);
 			if( !$title ){
 				continue;
 			}
-			if( SimpleBlogCommon::AStrGet('categories_hidden',$catindex) ){
+			if( SimpleBlogCommon::AStrGet('categories_hidden', $catindex) ){
 				continue;
 			}
 			$temp[] = SimpleBlogCommon::CategoryLink($catindex, $title, $title);
@@ -142,7 +142,7 @@ 
 			echo '<b>';
 			echo gpOutput::GetAddonText('Categories');
 			echo ':</b> ';
-			echo implode(', ',$temp);
+			echo implode(', ', $temp);
 			echo '</div>';
 		}
 	}
@@ -216,10 +216,10 @@ 
 			return false;
 		}
 
-		$data		= SimpleBlogCommon::GetCommentData($this->post_id);
-		$data[]		= $comment;
+		$data = SimpleBlogCommon::GetCommentData($this->post_id);
+		$data[] = $comment;
 
-		if( !SimpleBlogCommon::SaveCommentData($this->post_id,$data) ){
+		if( !SimpleBlogCommon::SaveCommentData($this->post_id, $data) ){
 			message($langmessage['OOPS']);
 			return false;
 		}
@@ -240,25 +240,25 @@ 
 
 		if( empty($_POST['name']) ){
 			$field = gpOutput::SelectText('Name');
-			message($langmessage['OOPS_REQUIRED'],$field);
+			message($langmessage['OOPS_REQUIRED'], $field);
 			return false;
 		}
 
 		if( empty($_POST['comment']) ){
 			$field = gpOutput::SelectText('Comment');
-			message($langmessage['OOPS_REQUIRED'],$field);
+			message($langmessage['OOPS_REQUIRED'], $field);
 			return false;
 		}
 
 
-		$comment				= array();
+		$comment = array();
 		$comment['name']		= htmlspecialchars($_POST['name']);
-		$comment['comment']		= nl2br(strip_tags($_POST['comment']));
+		$comment['comment'] = nl2br(strip_tags($_POST['comment']));
 		$comment['time']		= time();
 
 		if( !empty($_POST['website']) && ($_POST['website'] !== 'http://') ){
 			$website = $_POST['website'];
-			if( mb_strpos($website,'://') === false ){
+			if( mb_strpos($website, '://') === false ){
 				$website = false;
 			}
 			if( $website ){
@@ -284,7 +284,7 @@ 
 		includeFile('tool/email_mailer.php');
 
 
-		$body		= '';
+		$body = '';
 		if( !empty($comment['name']) ){
 			$body .= '<p>From: '.$comment['name'].'</p>';
 		}
@@ -302,14 +302,14 @@ 
 	 * Output the html for a blog post's comments
 	 *
 	 */
-	public function GetCommentHtml( $data ){
+	public function GetCommentHtml($data){
 
 		if( !is_array($data) ){
 			return;
 		}
 
-		foreach($data as $key => $comment){
-			$this->OutputComment($key,$comment);
+		foreach( $data as $key => $comment ){
+			$this->OutputComment($key, $comment);
 		}
 	}
 
@@ -317,7 +317,7 @@ 
 	 * Output single comment
 	 *
 	 */
-	private function OutputComment($key,$comment){
+	private function OutputComment($key, $comment){
 		global $langmessage;
 
 		echo '<div class="comment_area">';
@@ -331,14 +331,14 @@ 
 		}
 		echo ' &nbsp; ';
 		echo '<span>';
-		echo strftime(SimpleBlogCommon::$data['strftime_format'],$comment['time']);
+		echo strftime(SimpleBlogCommon::$data['strftime_format'], $comment['time']);
 		echo '</span>';
 
 
 		if( common::LoggedIn() ){
 			echo ' &nbsp; ';
-			$attr = 'class="delete gpconfirm" title="'.$langmessage['delete_confirm'].'" name="postlink" data-nonce= "'.common::new_nonce('post',true).'"';
-			echo SimpleBlogCommon::PostLink($this->post_id,$langmessage['delete'],'cmd=delete_comment&comment_index='.$key,$attr);
+			$attr = 'class="delete gpconfirm" title="'.$langmessage['delete_confirm'].'" name="postlink" data-nonce= "'.common::new_nonce('post', true).'"';
+			echo SimpleBlogCommon::PostLink($this->post_id, $langmessage['delete'], 'cmd=delete_comment&comment_index='.$key, $attr);
 		}
 
 
@@ -368,7 +368,7 @@ 
 		}
 
 
-		$_POST += array('name'=>'','website'=>'http://','comment'=>'');
+		$_POST += array('name'=>'', 'website'=>'http://', 'comment'=>'');
 
 		echo '<h3>';
 		echo gpOutput::GetAddonText('Leave Comment');
@@ -423,7 +423,7 @@ 
 		echo '<li>';
 		echo '<input type="hidden" name="cmd" value="Add Comment" />';
 		$html = '<input type="submit" name="" class="submit" value="%s" />';
-		echo gpOutput::GetAddonText('Add Comment',$html);
+		echo gpOutput::GetAddonText('Add Comment', $html);
 		echo '</li>';
 
 		echo '</ul>';
@@ -449,14 +449,14 @@ 
 	 */
 	public function PostLinks(){
 
-		$post_key = SimpleBlogCommon::AStrKey('str_index',$this->post_id);
+		$post_key = SimpleBlogCommon::AStrKey('str_index', $this->post_id);
 
 		echo '<p class="blog_nav_links">';
 
 
 		//blog home
-		$html = common::Link('Special_Blog','%s','','class="blog_home"');
-		echo gpOutput::GetAddonText('Blog Home',$html);
+		$html = common::Link('Special_Blog', '%s', '', 'class="blog_home"');
+		echo gpOutput::GetAddonText('Blog Home', $html);
 		echo '&nbsp;';
 
 
@@ -465,17 +465,17 @@ 
 		if( $post_key > 0 ){
 
 			$i = 0;
-			do {
+			do{
 				$i++;
-				$next_index = SimpleBlogCommon::AStrGet('str_index',$post_key-$i);
+				$next_index = SimpleBlogCommon::AStrGet('str_index', $post_key-$i);
 				if( !common::loggedIn() ){
-					$isDraft = SimpleBlogCommon::AStrGet('drafts',$next_index);
+					$isDraft = SimpleBlogCommon::AStrGet('drafts', $next_index);
 				}
 			}while( $isDraft );
 
 			if( !$isDraft ){
-				$html = SimpleBlogCommon::PostLink($next_index,'%s','','class="blog_newer"');
-				echo gpOutput::GetAddonText('Newer Entry',$html);
+				$html = SimpleBlogCommon::PostLink($next_index, '%s', '', 'class="blog_newer"');
+				echo gpOutput::GetAddonText('Newer Entry', $html);
 				echo '&nbsp;';
 			}
 		}
@@ -486,19 +486,19 @@ 
 		$isDraft = false;
 		do{
 			$i++;
-			$prev_index = SimpleBlogCommon::AStrGet('str_index',$post_key+$i);
+			$prev_index = SimpleBlogCommon::AStrGet('str_index', $post_key+$i);
 
 			if( $prev_index === false ){
 				break;
 			}
 
 			if( !common::loggedIn() ){
-				$isDraft = SimpleBlogCommon::AStrGet('drafts',$prev_index);
+				$isDraft = SimpleBlogCommon::AStrGet('drafts', $prev_index);
 			}
 
 			if( !$isDraft ){
-				$html = SimpleBlogCommon::PostLink($prev_index,'%s','','class="blog_older"');
-				echo gpOutput::GetAddonText('Older Entry',$html);
+				$html = SimpleBlogCommon::PostLink($prev_index, '%s', '', 'class="blog_older"');
+				echo gpOutput::GetAddonText('Older Entry', $html);
 			}
 
 		}while( $isDraft );
@@ -506,7 +506,7 @@ 
 
 		if( common::LoggedIn() ){
 			echo '&nbsp;';
-			echo common::Link('Admin_Blog','New Post','cmd=new_form','class="blog_post_new"');
+			echo common::Link('Admin_Blog', 'New Post', 'cmd=new_form', 'class="blog_post_new"');
 		}
 
 		echo '</p>';

SimpleBlog.php

Braces +4 added lines, -4 removed lines

@@ -138,7 +138,7 @@ 
 		if( common::LoggedIn() ){
 			gpPlugin_incl('Admin/SimpleBlogPage.php');
 			$blog_page = new AdminSimpleBlogPage($this->post_id);
-		}else{
+		} else{
 			gpPlugin_incl('SimpleBlogPage.php');
 			$blog_page = new SimpleBlogPage($this->post_id);
 		}
@@ -239,7 +239,7 @@ 
 			$header .= '<span style="opacity:0.3;">';
 			$header .= gpOutput::SelectText('Draft');
 			$header .= '</span> ';
-		}elseif( $post['time'] > time() ){
+		} elseif( $post['time'] > time() ){
 			$header .= '<span style="opacity:0.3;">';
 			$header .= gpOutput::SelectText('Pending');
 			$header .= '</span> ';
@@ -323,7 +323,7 @@ 
 		//make it an absolute path
 		if( isset($_SERVER['HTTP_HOST']) ){
 			$server = $_SERVER['HTTP_HOST'];
-		}else{
+		} else{
 			$server = $_SERVER['SERVER_NAME'];
 		}
 
@@ -362,7 +362,7 @@ 
 			if( $comments_closed ){
 				$label = gpOutput::SelectText('Open Comments');
 				echo SimpleBlogCommon::PostLink($post_index,$label,'cmd=opencomments','name="cnreq" style="display:none"');
-			}else{
+			} else{
 				$label = gpOutput::SelectText('Close Comments');
 				echo SimpleBlogCommon::PostLink($post_index,$label,'cmd=closecomments','name="cnreq" style="display:none"');
 			}

Spacing +72 added lines, -72 removed lines

@@ -19,22 +19,22 @@ 
 
 		//get the post id
 		if( $page->pagetype == 'special_display' ){
-			$this->post_id	= $this->PostID($page->requested);
+			$this->post_id = $this->PostID($page->requested);
 		}
 
 
 		if( common::LoggedIn() ){
 
-			$page->admin_links[]		= array('Special_Blog','Blog Home');
-			$page->admin_links[]		= array('Admin_Blog','New Blog Post','cmd=new_form');
-			$page->admin_links[]		= array('Admin_Blog','Configuration');
-			$page->admin_links[]		= array('Admin_Theme_Content',$langmessage['editable_text'],'cmd=addontext&addon='.urlencode($addonFolderName),' name="gpabox" ');
-			$label						= 'Number of Posts: '. SimpleBlogCommon::$data['post_count'];
-			$page->admin_links[$label]	= '';
-			$cmd						= common::GetCommand();
+			$page->admin_links[]		= array('Special_Blog', 'Blog Home');
+			$page->admin_links[]		= array('Admin_Blog', 'New Blog Post', 'cmd=new_form');
+			$page->admin_links[]		= array('Admin_Blog', 'Configuration');
+			$page->admin_links[]		= array('Admin_Theme_Content', $langmessage['editable_text'], 'cmd=addontext&addon='.urlencode($addonFolderName), ' name="gpabox" ');
+			$label = 'Number of Posts: '.SimpleBlogCommon::$data['post_count'];
+			$page->admin_links[$label] = '';
+			$cmd = common::GetCommand();
 
 
-			switch($cmd){
+			switch( $cmd ){
 
 
 				//delete
@@ -57,7 +57,7 @@ 
 
 		if( common::LoggedIn() && !file_exists(self::$index_file) ){
 			echo '<p>Congratulations on successfully installing Simple Blog for gpEasy.</p> ';
-			echo '<p>You\'ll probably want to get started by '.common::Link('Admin_Blog','creating a blog post','cmd=new_form').'.</p>';
+			echo '<p>You\'ll probably want to get started by '.common::Link('Admin_Blog', 'creating a blog post', 'cmd=new_form').'.</p>';
 		}
 
 	}
@@ -74,20 +74,20 @@ 
 			return $_REQUEST['id'];
 		}
 
-		if( strpos($requested,'/') === false ){
+		if( strpos($requested, '/') === false ){
 			return;
 		}
 
-		$parts	= explode('/',$requested);
+		$parts	= explode('/', $requested);
 
 		if( SimpleBlogCommon::$data['urls'] != 'Title' ){
-			$ints	= strspn($parts[1],'0123456789');
+			$ints	= strspn($parts[1], '0123456789');
 			if( $ints ){
-				return substr($parts[1],0,$ints);
+				return substr($parts[1], 0, $ints);
 			}
 		}
 
-		$id = SimpleBlogCommon::AStrKey('titles',$parts[1], true);
+		$id = SimpleBlogCommon::AStrKey('titles', $parts[1], true);
 		if( $id !== false ){
 			return $id;
 		}
@@ -104,17 +104,17 @@ 
 		global $config;
 
 		$titles				= SimpleBlogCommon::AStrToArray('titles');
-		$post_times			= SimpleBlogCommon::AStrToArray('post_times');
+		$post_times = SimpleBlogCommon::AStrToArray('post_times');
 		$similar			= array();
-		$lower				= str_replace(' ','_',strtolower($title));
+		$lower = str_replace(' ', '_', strtolower($title));
 
-		foreach($titles as $post_id => $title){
+		foreach( $titles as $post_id => $title ){
 
 			if( $post_times[$post_id] > time() ){
 				continue;
 			}
 
-			similar_text($lower,strtolower($title),$percent);
+			similar_text($lower, strtolower($title), $percent);
 			$similar[$percent] = $post_id; //if similarity is the same for two posts, the newer post will take precedence
 		}
 
@@ -156,23 +156,23 @@ 
 
 		$per_page		= SimpleBlogCommon::$data['per_page'];
 		$page_num		= 0;
-		$expected_q		= '';
+		$expected_q = '';
 		if( isset($_GET['page']) && is_numeric($_GET['page']) ){
-			$page_num		= (int)$_GET['page'];
-			$expected_q		= 'page='.$page_num;
+			$page_num = (int)$_GET['page'];
+			$expected_q = 'page='.$page_num;
 		}
 
 
 		//redirect if the request isn't correct
 		if( $page->requested != SimpleBlogCommon::$root_url ){
-			$expected_url = common::GetUrl( SimpleBlogCommon::$root_url, $expected_q, false );
+			$expected_url = common::GetUrl(SimpleBlogCommon::$root_url, $expected_q, false);
 			common::Redirect($expected_url);
 		}
 
 
-		$start				= $page_num * $per_page;
-		$include_drafts		= common::LoggedIn();
-		$show_posts			= SimpleBlogCommon::WhichPosts($start,$per_page,$include_drafts);
+		$start = $page_num * $per_page;
+		$include_drafts = common::LoggedIn();
+		$show_posts = SimpleBlogCommon::WhichPosts($start, $per_page, $include_drafts);
 
 		$this->ShowPosts($show_posts);
 
@@ -181,19 +181,19 @@ 
 
 		if( $page_num > 0 ){
 
-			$html = common::Link('Special_Blog','%s');
-			echo gpOutput::GetAddonText('Blog Home',$html);
+			$html = common::Link('Special_Blog', '%s');
+			echo gpOutput::GetAddonText('Blog Home', $html);
 			echo '&nbsp;';
 
-			$html = common::Link('Special_Blog','%s','page='.($page_num-1),'class="blog_newer"');
-			echo gpOutput::GetAddonText('Newer Entries',$html);
+			$html = common::Link('Special_Blog', '%s', 'page='.($page_num-1), 'class="blog_newer"');
+			echo gpOutput::GetAddonText('Newer Entries', $html);
 			echo '&nbsp;';
 
 		}
 
-		if( ( ($page_num+1) * $per_page) < SimpleBlogCommon::$data['post_count'] ){
-			$html = common::Link('Special_Blog','%s','page='.($page_num+1),'class="blog_older"');
-			echo gpOutput::GetAddonText('Older Entries',$html);
+		if( (($page_num+1) * $per_page) < SimpleBlogCommon::$data['post_count'] ){
+			$html = common::Link('Special_Blog', '%s', 'page='.($page_num+1), 'class="blog_older"');
+			echo gpOutput::GetAddonText('Older Entries', $html);
 		}
 
 		echo '</p>';
@@ -208,8 +208,8 @@ 
 	public function ShowPosts($post_list){
 
 		$posts = array();
-		foreach($post_list as $post_index){
-			$this->ShowPostContent( $post_index );
+		foreach( $post_list as $post_index ){
+			$this->ShowPostContent($post_index);
 		}
 
 	}
@@ -218,14 +218,14 @@ 
 	 * Display the html for a single blog post
 	 *
 	 */
-	public function ShowPostContent( $post_index ){
+	public function ShowPostContent($post_index){
 
-		if( !common::LoggedIn() && SimpleBlogCommon::AStrGet('drafts',$post_index) ){
+		if( !common::LoggedIn() && SimpleBlogCommon::AStrGet('drafts', $post_index) ){
 			return false;
 		}
 
-		$post	= SimpleBlogCommon::GetPostContent($post_index);
-		$class	= $id = '';
+		$post = SimpleBlogCommon::GetPostContent($post_index);
+		$class = $id = '';
 
 		if( common::LoggedIn() ){
 			SimpleBlog::EditLinks($post_index, $class, $id);
@@ -235,7 +235,7 @@ 
 		echo '<div class="blog_post post_list_item'.$class.'" '.$id.'>';
 
 		$header = '<h2 id="blog_post_'.$post_index.'">';
-		if( SimpleBlogCommon::AStrGet('drafts',$post_index) ){
+		if( SimpleBlogCommon::AStrGet('drafts', $post_index) ){
 			$header .= '<span style="opacity:0.3;">';
 			$header .= gpOutput::SelectText('Draft');
 			$header .= '</span> ';
@@ -245,11 +245,11 @@ 
 			$header .= '</span> ';
 		}
 
-		$label = SimpleBlogCommon::Underscores( $post['title'] );
-		$header .= SimpleBlogCommon::PostLink($post_index,$label);
+		$label = SimpleBlogCommon::Underscores($post['title']);
+		$header .= SimpleBlogCommon::PostLink($post_index, $label);
 		$header .= '</h2>';
 
-		SimpleBlogCommon::BlogHead($header,$post_index,$post);
+		SimpleBlogCommon::BlogHead($header, $post_index, $post);
 
 		echo '<div class="twysiwygr">';
 
@@ -257,7 +257,7 @@ 
 			$this->GetImageFromPost($post['content']);
 		}
 
-		echo $this->AbbrevContent( $post['content'], $post_index, SimpleBlogCommon::$data['post_abbrev']);
+		echo $this->AbbrevContent($post['content'], $post_index, SimpleBlogCommon::$data['post_abbrev']);
 		echo '</div>';
 
 		echo '</div>';
@@ -266,12 +266,12 @@ 
 
 		if( SimpleBlogCommon::$data['abbrev_cat'] && isset($post['categories']) && count($post['categories']) ){
 			$temp = array();
-			foreach($post['categories'] as $catindex){
-				$title = SimpleBlogCommon::AStrGet( 'categories', $catindex );
+			foreach( $post['categories'] as $catindex ){
+				$title = SimpleBlogCommon::AStrGet('categories', $catindex);
 				if( !$title ){
 					continue;
 				}
-				if( SimpleBlogCommon::AStrGet('categories_hidden',$catindex) ){
+				if( SimpleBlogCommon::AStrGet('categories_hidden', $catindex) ){
 					continue;
 				}
 				$temp[] = SimpleBlogCommon::CategoryLink($catindex, $title, $title);
@@ -280,7 +280,7 @@ 
 			if( count($temp) ){
 				echo '<div class="category_container">';
 				echo gpOutput::GetAddonText('Categories').' ';
-				echo implode(', ',$temp);
+				echo implode(', ', $temp);
 				echo '</div>';
 			}
 		}
@@ -297,28 +297,28 @@ 
 	 */
 	public function GetImageFromPost($item){
 
-		$img_pos = strpos($item,'<img');
+		$img_pos = strpos($item, '<img');
 		if( $img_pos === false ){
 			return;
 		}
-		$src_pos = strpos($item,'src=',$img_pos);
+		$src_pos = strpos($item, 'src=', $img_pos);
 		if( $src_pos === false ){
 			return;
 		}
-		$src = substr($item,$src_pos+4);
+		$src = substr($item, $src_pos+4);
 		$quote = $src[0];
 		if( $quote != '"' && $quote != "'" ){
 			return;
 		}
-		$src_pos = strpos($src,$quote,1);
-		$src = substr($src,1,$src_pos-1);
+		$src_pos = strpos($src, $quote, 1);
+		$src = substr($src, 1, $src_pos-1);
 
 		// check for resized image, get original source if img is resized
-		if( strpos($src,'image.php') !== false && strpos($src,'img=') !== false ){
-			$src = $dirPrefix . '/data/_uploaded/' . urldecode(substr($src,strpos($src,'img=')+4));
+		if( strpos($src, 'image.php') !== false && strpos($src, 'img=') !== false ){
+			$src = $dirPrefix.'/data/_uploaded/'.urldecode(substr($src, strpos($src, 'img=')+4));
 		}
 
-		$thumb_path		= common::ThumbnailPath($src);
+		$thumb_path = common::ThumbnailPath($src);
 
 		//make it an absolute path
 		if( isset($_SERVER['HTTP_HOST']) ){
@@ -342,36 +342,36 @@ 
 	public static function EditLinks($post_index, &$class, &$id){
 		global $langmessage;
 
-		$query		= 'du'; //dummy parameter
+		$query = 'du'; //dummy parameter
 
-		SimpleBlogCommon::UrlQuery( $post_index, $url, $query );
+		SimpleBlogCommon::UrlQuery($post_index, $url, $query);
 
-		$edit_link	= gpOutput::EditAreaLink($edit_index,$url,$langmessage['edit'].' (TWYSIWYG)',$query,'name="inline_edit_generic" rel="text_inline_edit"');
-		$class 		= ' editable_area';
-		$id			= 'id="ExtraEditArea'.$edit_index.'"';
+		$edit_link = gpOutput::EditAreaLink($edit_index, $url, $langmessage['edit'].' (TWYSIWYG)', $query, 'name="inline_edit_generic" rel="text_inline_edit"');
+		$class = ' editable_area';
+		$id = 'id="ExtraEditArea'.$edit_index.'"';
 
 
 		echo '<span style="display:none;" id="ExtraEditLnks'.$edit_index.'">';
 		echo $edit_link;
 
-		echo common::Link('Admin_Blog/'.$post_index,$langmessage['edit'].' (All)','cmd=edit_post',' style="display:none"');
+		echo common::Link('Admin_Blog/'.$post_index, $langmessage['edit'].' (All)', 'cmd=edit_post', ' style="display:none"');
 
-		echo common::Link('Special_Blog',$langmessage['delete'],'cmd=deleteentry&del_id='.$post_index,array('class'=>'delete gpconfirm','data-cmd'=>'cnreq','title'=>$langmessage['delete_confirm']));
+		echo common::Link('Special_Blog', $langmessage['delete'], 'cmd=deleteentry&del_id='.$post_index, array('class'=>'delete gpconfirm', 'data-cmd'=>'cnreq', 'title'=>$langmessage['delete_confirm']));
 
 		if( SimpleBlogCommon::$data['allow_comments'] ){
 
-			$comments_closed = SimpleBlogCommon::AStrGet('comments_closed',$post_index);
+			$comments_closed = SimpleBlogCommon::AStrGet('comments_closed', $post_index);
 			if( $comments_closed ){
 				$label = gpOutput::SelectText('Open Comments');
-				echo SimpleBlogCommon::PostLink($post_index,$label,'cmd=opencomments','name="cnreq" style="display:none"');
+				echo SimpleBlogCommon::PostLink($post_index, $label, 'cmd=opencomments', 'name="cnreq" style="display:none"');
 			}else{
 				$label = gpOutput::SelectText('Close Comments');
-				echo SimpleBlogCommon::PostLink($post_index,$label,'cmd=closecomments','name="cnreq" style="display:none"');
+				echo SimpleBlogCommon::PostLink($post_index, $label, 'cmd=closecomments', 'name="cnreq" style="display:none"');
 			}
 		}
 
-		echo common::Link('Admin_Blog','New Blog Post','cmd=new_form',' style="display:none"');
-		echo common::Link('Admin_Blog',$langmessage['administration'],'',' style="display:none"');
+		echo common::Link('Admin_Blog', 'New Blog Post', 'cmd=new_form', ' style="display:none"');
+		echo common::Link('Admin_Blog', $langmessage['administration'], '', ' style="display:none"');
 		echo '</span>';
 	}
 
@@ -379,7 +379,7 @@ 
 	 * Abbreviate $content if a $limit greater than zero is given
 	 *
 	 */
-	public function AbbrevContent( $content, $post_index, $limit = 0 ){
+	public function AbbrevContent($content, $post_index, $limit = 0){
 
 		if( !is_numeric($limit) || $limit == 0 ){
 			return $content;
@@ -391,14 +391,14 @@ 
 			return $content;
 		}
 
-		$pos = mb_strpos($content,' ',$limit-5);
+		$pos = mb_strpos($content, ' ', $limit-5);
 
 		if( ($pos > 0) && ($limit+20 > $pos) ){
 			$limit = $pos;
 		}
-		$content = mb_substr($content,0,$limit).' ... ';
+		$content = mb_substr($content, 0, $limit).' ... ';
 		$label = gpOutput::SelectText('Read More');
-		return $content . SimpleBlogCommon::PostLink($post_index,$label);
+		return $content.SimpleBlogCommon::PostLink($post_index, $label);
 	}
 
 

Admin/StaticGenerator.php

Doc Comments +1 added lines

@@ -301,6 +301,7 @@
 	/**
 	 * Change relative link to absolute link
 	 *
+	 * @param string $server
 	 */
 	public static function FixLink(&$content,$server,$match){
 

Braces +5 added lines, -3 removed lines

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

Spacing +58 added lines, -58 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,14 +171,14 @@ 
 	static function GenCategoryGadget(){
 		global $addonPathData;
 
-		$categories = SimpleBlogCommon::AStrToArray( 'categories' );
+		$categories = SimpleBlogCommon::AStrToArray('categories');
 
 		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;
 			}
 
@@ -191,10 +191,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>';
@@ -205,7 +205,7 @@ 
 
 
 		$gadgetFile = $addonPathData.'/gadget_categories.php';
-		gpFiles::Save( $gadgetFile, $content );
+		gpFiles::Save($gadgetFile, $content);
 	}
 
 
@@ -217,13 +217,13 @@ 
 		global $addonPathData;
 
 		//get list of posts and times
-		$list = SimpleBlogCommon::AStrToArray( 'post_times' );
+		$list = SimpleBlogCommon::AStrToArray('post_times');
 		if( !count($list) ) return;
 
 		//get year counts
 		$archive = array();
-		foreach($list as $post_id => $time){
-			$ym = date('Y-m',$time); //year&month
+		foreach( $list as $post_id => $time ){
+			$ym = date('Y-m', $time); //year&month
 			$archive[$ym][] = $post_id;
 		}
 
@@ -233,8 +233,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>';
@@ -251,13 +251,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>';
@@ -270,16 +270,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;
 	}
 
@@ -291,11 +291,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);
 		}
 
 	}
@@ -305,24 +305,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);
 	}