Typesetter / Simple-Blog

SimpleBlog.php

Spacing +73 added lines, -73 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,19 +245,19 @@ 
 			$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">';
 
-		if( !empty(SimpleBlogCommon::$data['post_abbrev']) && SimpleBlogCommon::$data['abbrev_image']  ){
+		if( !empty(SimpleBlogCommon::$data['post_abbrev']) && SimpleBlogCommon::$data['abbrev_image'] ){
 			$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);
 	}
 
 

SimpleBlogCategories.php

Spacing +23 added lines, -23 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,27 +32,27 @@ 
 	 */
 	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]);
-		if( array_key_exists($parts[1],$this->categories) ){
+		$parts[1] = str_replace('_', ' ', $parts[1]);
+		if( array_key_exists($parts[1], $this->categories) ){
 			return $parts[1];
 		}
 
-		return array_search($parts[1],$this->categories);
+		return array_search($parts[1], $this->categories);
 	}
 
 
@@ -70,7 +70,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);
 
@@ -79,15 +79,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);
 		}
 
 
@@ -105,12 +105,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;
 				}
@@ -122,7 +122,7 @@ 
 		}
 		$this->total_posts = count($show_posts);
 
-		return array_slice($show_posts,$start,$len);
+		return array_slice($show_posts, $start, $len);
 	}
 
 
@@ -134,22 +134,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>';