Typesetter / Simple-Blog

Search.php

Spacing +9 added lines, -9 removed lines

@@ -3,27 +3,27 @@
 
 gpPlugin_incl('SimpleBlogCommon.php');
 
-class BlogSearch extends SimpleBlogCommon{
+class BlogSearch extends SimpleBlogCommon {
 
-	function __construct($args){
+	function __construct($args) {
 
 		SimpleBlogCommon::Init();
 
 		$search_obj		= $args[0];
 		$blog_label		= common::GetLabelIndex('special_blog');
-		$post_ids		= SimpleBlogCommon::AStrToArray('str_index');
+		$post_ids = SimpleBlogCommon::AStrToArray('str_index');
 
-		foreach($post_ids as $id){
-			$post		= SimpleBlogCommon::GetPostContent($id);
+		foreach ($post_ids as $id) {
+			$post = SimpleBlogCommon::GetPostContent($id);
 
-			if( !$post ){
+			if (!$post) {
 				continue;
 			}
 
-			$title		= $blog_label.': '.str_replace('_',' ',$post['title']);
-			$content	= str_replace('_',' ',$post['title']).' '.$post['content'];
+			$title = $blog_label.': '.str_replace('_', ' ', $post['title']);
+			$content = str_replace('_', ' ', $post['title']).' '.$post['content'];
 
-			SimpleBlogCommon::UrlQuery( $id, $url, $query );
+			SimpleBlogCommon::UrlQuery($id, $url, $query);
 			$search_obj->FindString($content, $title, $url, $query);
 		}
 

SimpleBlogCommon.php

Spacing +200 added lines, -200 removed lines

@@ -11,15 +11,15 @@ 
  *
  *
  */
-class SimpleBlogCommon{
+class SimpleBlogCommon {
 
 	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;
 
@@ -29,7 +29,7 @@ 
 	 * When SimpleBlogCommon is created as an object, it will regenerate the static files
 	 *
 	 */
-	public function __construct(){
+	public function __construct() {
 		self::Init();
 		self::GenStaticContent();
 	}
@@ -38,19 +38,19 @@ 
 	 * Set variables for blog display
 	 *
 	 */
-	public static function Init(){
+	public static function Init() {
 		global $addonPathData;
 
-		if( isset(self::$data) ){
+		if (isset(self::$data)) {
 			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( @gpFiles::WriteLock() ){
+		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);
 			}
 		}
 
@@ -76,7 +76,7 @@ 
 	 * Regenerate feed and gadgets
 	 *
 	 */
-	public static function GenStaticContent(){
+	public static function GenStaticContent() {
 		gpPlugin_incl('Admin/StaticGenerator.php');
 		StaticGenerator::Generate();
 	}
@@ -86,16 +86,16 @@ 
 	 * Get next static gen time
 	 *
 	 */
-	public static function NextGenTime(){
+	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){
-			if( $time > time() ){
+		foreach ($post_times as $time) {
+			if ($time > time()) {
 				$next_regen = $time;
 				break;
 			}
@@ -110,15 +110,15 @@ 
 	 * Add css and some js to the page
 	 *
 	 */
-	public static function AddCSS(){
-		global $addonFolderName,$page;
+	public static function AddCSS() {
+		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;
+		if (!$added) {
+			$page->jQueryCode .= '$(".blog_gadget_link").click(function(){ $(this).next(".nodisplay").toggle(); });';
+			$page->css_user[] = '/data/_addoncode/'.$addonFolderName.'/static/style.css';
+			$added = true;
 		}
 	}
 
@@ -127,24 +127,24 @@ 
 	 * Get the user configuration and information about the current blog
 	 *
 	 */
-	public function GetBlogData(){
+	public function GetBlogData() {
 
 		$blogData = array();
-		if( file_exists(self::$index_file) ){
+		if (file_exists(self::$index_file)) {
 			require(self::$index_file);
 		}
 
 		//old twitter auth no longer works
-		if( isset($blogData['twitter_username']) || isset($blogData['twitter_password']) ){
+		if (isset($blogData['twitter_username']) || isset($blogData['twitter_password'])) {
 			unset($blogData['twitter_username']);
 			unset($blogData['twitter_password']);
 		}
 
-		SimpleBlogCommon::$data = $blogData + SimpleBlogCommon::Defaults();
+		SimpleBlogCommon::$data = $blogData+SimpleBlogCommon::Defaults();
 		self::GenIndexStr();
 
 		//update to simple blog 2.0 data
-		if( isset(SimpleBlogCommon::$data['post_info']) ){
+		if (isset(SimpleBlogCommon::$data['post_info'])) {
 			self::DataUpdate20();
 		}
 	}
@@ -156,15 +156,15 @@ 
 	 *
 	 * As of 2.0, Uses " and > instead , and :
 	 */
-	public static function GenIndexStr(){
+	public static function GenIndexStr() {
 
-		if( !empty(SimpleBlogCommon::$data['str_index']) ){
-			if( SimpleBlogCommon::$data['str_index'][0] == ',' ){
-				SimpleBlogCommon::$data['str_index'] = str_replace( array(',',':'), array('"','>'), SimpleBlogCommon::$data['str_index']);
+		if (!empty(SimpleBlogCommon::$data['str_index'])) {
+			if (SimpleBlogCommon::$data['str_index'][0] == ',') {
+				SimpleBlogCommon::$data['str_index'] = str_replace(array(',', ':'), array('"', '>'), SimpleBlogCommon::$data['str_index']);
 			}
 			return;
 		}
-		if( !isset(SimpleBlogCommon::$data['post_list']) ){
+		if (!isset(SimpleBlogCommon::$data['post_list'])) {
 			return;
 		}
 
@@ -176,17 +176,17 @@ 
 	 * Serialize comment counts
 	 *
 	 */
-	public static function DataUpdate20(){
+	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){
-				if( isset($info['comments']) ){
+		if (isset(SimpleBlogCommon::$data['post_info']) && is_array(SimpleBlogCommon::$data['post_info'])) {
+			foreach (SimpleBlogCommon::$data['post_info'] as $post_id => $info) {
+				if (isset($info['comments'])) {
 					$comment_counts[$post_id] = $info['comments'];
 				}
 
-				if( isset($info['closecomments']) ){
+				if (isset($info['closecomments'])) {
 					$comments_closed[$post_id] = 1;
 				}
 			}
@@ -199,18 +199,18 @@ 
 
 		//use AStr data for categories
 		$categories = $categories_hidden = $category_posts = $post_categories = array();
-		if( !isset(SimpleBlogCommon::$data['categories']) ){
+		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'] ){
+				if (isset($cat['visible']) && !$cat['visible']) {
 					$categories_hidden[$key] = 1;
 				}
 
-				if( isset($cat['posts']) && is_array($cat['posts']) ){
+				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;
 					}
@@ -225,31 +225,31 @@ 
 		$post_times = array();
 
 		$i = 0;
-		do{
+		do {
 
-			$posts = self::GetPostFile($i,$post_file);
-			if( !$posts ){
+			$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'] ){
+				if (isset($post['isDraft']) && $post['isDraft']) {
 					$drafts[$post_id] = 1;
 				}
 				$titles[$post_id] = $post['title'];
 				$post_times[$post_id] = $post['time'];
 
 				$posts[$post_id]['categories'] = array();
-				if( isset($post_categories[$post_id]) ){
+				if (isset($post_categories[$post_id])) {
 					$posts[$post_id]['categories'] = $post_categories[$post_id];
 				}
 			}
 
-			gpFiles::SaveArray($post_file,'posts',$posts);
+			gpFiles::SaveArray($post_file, 'posts', $posts);
 
-			$i +=20 ;
-		}while( $posts );
+			$i += 20;
+		}while ($posts);
 
 
 		//convert arrays to astr
@@ -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);
 		}
 
@@ -281,27 +281,27 @@ 
 	 * Get a list of post indeces
 	 *
 	 */
-	public static function WhichPosts($start, $len, $include_drafts = false){
+	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);
-			if( !$post_id ){
+			$post_id = SimpleBlogCommon::AStrGet('str_index', $i);
+			if (!$post_id) {
 				continue;
 			}
 
-			if( !$include_drafts ){
+			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);
-				if( $time > time() ){
+				$time = SimpleBlogCommon::AStrGet('post_times', $post_id);
+				if ($time > time()) {
 					continue;
 				}
 			}
@@ -318,12 +318,12 @@ 
 	 * Return the configuration defaults
 	 * @static
 	 */
-	public static function Defaults(){
+	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,
@@ -354,12 +354,12 @@ 
 	 * Save the blog configuration and details about the blog
 	 *
 	 */
-	public static function SaveIndex(){
+	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,21 +370,21 @@ 
 	 * @deprecated 3.0
 	 *
 	 */
-	public static function GetPostFile($post_index,&$post_file){
+	public static function GetPostFile($post_index, &$post_file) {
 
-		if( !is_numeric($post_index) ){
+		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) ){
+		if (!file_exists($post_file)) {
 			return false;
 		}
 
 		require($post_file);
-		if( !is_array($posts) ){
+		if (!is_array($posts)) {
 			return false;
 		}
 
@@ -396,20 +396,20 @@ 
 	 * Get the content from a single post
 	 *
 	 */
-	public static function GetPostContent($post_index){
+	public static function GetPostContent($post_index) {
 
-		$file		= self::PostFilePath($post_index);
-		if( file_exists($file) ){
+		$file = self::PostFilePath($post_index);
+		if (file_exists($file)) {
 			require($file);
 			return $post;
 		}
 
-		$posts = self::GetPostFile($post_index,$post_file);
-		if( $posts === false ){
+		$posts = self::GetPostFile($post_index, $post_file);
+		if ($posts === false) {
 			return false;
 		}
 
-		if( !isset($posts[$post_index]) ){
+		if (!isset($posts[$post_index])) {
 			return false;
 		}
 		return $posts[$post_index];
@@ -421,7 +421,7 @@ 
 	 * @since 3.0
 	 *
 	 */
-	public static function PostFilePath($post_index){
+	public static function PostFilePath($post_index) {
 		return self::$data_dir.'/posts/'.$post_index.'.php'; //3.0+
 	}
 
@@ -431,24 +431,24 @@ 
 	 * @return bool
 	 *
 	 */
-	public static function Delete(){
+	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);
-		if( !file_exists($post_file) ){
+		$post_file = self::PostFilePath($post_id);
+		if (!file_exists($post_file)) {
 
-			$posts		= self::GetPostFile($post_id,$post_file);
-			if( $posts === false ){
+			$posts = self::GetPostFile($post_id, $post_file);
+			if ($posts === false) {
 				message($langmessage['OOPS']);
 				return false;
 			}
 
-			if( !isset($posts[$post_id]) ){
+			if (!isset($posts[$post_id])) {
 				message($langmessage['OOPS']);
 				return false;
 			}
@@ -463,30 +463,30 @@ 
 		//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);
 
 
 
-		if( !SimpleBlogCommon::SaveIndex() ){
+		if (!SimpleBlogCommon::SaveIndex()) {
 			message($langmessage['OOPS']);
 			return false;
 		}
 
 		//save data file or remove the file
-		if( $posts ){
-			if( !gpFiles::SaveArray($post_file,'posts',$posts) ){
+		if ($posts) {
+			if (!gpFiles::SaveArray($post_file, 'posts', $posts)) {
 				message($langmessage['OOPS']);
 				return false;
 			}
-		}elseif( !unlink($post_file) ){
+		}elseif (!unlink($post_file)) {
 			message($langmessage['OOPS']);
 			return false;
 		}
@@ -494,7 +494,7 @@ 
 
 		//delete the comments
 		$commentDataFile = self::$data_dir.'/comments/'.$post_id.'.txt';
-		if( file_exists($commentDataFile) ){
+		if (file_exists($commentDataFile)) {
 			unlink($commentDataFile);
 			SimpleBlogCommon::ClearCommentCache();
 		}
@@ -512,12 +512,12 @@ 
 	 * However, this would make it more difficult for theme developers to design for the blog plugin
 	 *
 	 */
-	public static function BlogHead($header,$post_index,$post,$cacheable=false){
+	public static function BlogHead($header, $post_index, $post, $cacheable = false) {
 
 
 		//subtitle
 		$blog_info = '{empty_blog_piece}';
-		if( !empty($post['subtitle']) ){
+		if (!empty($post['subtitle'])) {
 			$blog_info = '<span class="simple_blog_subtitle">';
 			$blog_info .= $post['subtitle'];
 			$blog_info .= '</span>';
@@ -525,18 +525,18 @@ 
 
 		//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);
-		if( $count > 0 ){
+		$count = SimpleBlogCommon::AStrGet('comment_counts', $post_index);
+		if ($count > 0) {
 			$blog_comments = '<span class="simple_blog_comments">';
-			if( $cacheable ){
+			if ($cacheable) {
 				$blog_comments .= gpOutput::SelectText('Comments');
-			}else{
+			}else {
 				$blog_comments .= gpOutput::GetAddonText('Comments');
 			}
 			$blog_comments .= ': '.$count;
@@ -550,16 +550,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);
 	}
 
 
@@ -575,12 +575,12 @@ 
 	 * @deprecated 2.0
 	 *
 	 */
-	public static function load_blog_categories(){
+	public static function load_blog_categories() {
 		global $addonPathData;
 		$categories_file = $addonPathData.'/categories.php';
 
-		$categories = array( 'a' => array( 'ct'=>'Unsorted posts', 'visible'=>false,'posts'=>array() ) );
-		if( file_exists($categories_file) ){
+		$categories = array('a' => array('ct'=>'Unsorted posts', 'visible'=>false, 'posts'=>array()));
+		if (file_exists($categories_file)) {
 			include($categories_file);
 		}
 		return $categories;
@@ -591,29 +591,29 @@ 
 	 * 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);
 		}
 	}
 
 
-	public static function Underscores($str){
-		if( function_exists('mb_ereg_replace') ){
+	public static function Underscores($str) {
+		if (function_exists('mb_ereg_replace')) {
 			return mb_ereg_replace('_', ' ', $str);
 		}
 		return str_replace('_', ' ', $str);
 	}
 
-	public static function FileData($file){
+	public static function FileData($file) {
 
-		if( !file_exists($file) ){
+		if (!file_exists($file)) {
 			return false;
 		}
 		$dataTxt = file_get_contents($file);
-		if( empty($dataTxt) ){
+		if (empty($dataTxt)) {
 			return false;
 		}
 
@@ -625,19 +625,19 @@ 
 	 * Get the comment data for a single post
 	 *
 	 */
-	public static function GetCommentData($post_id){
+	public static function GetCommentData($post_id) {
 
 		// pre 1.7.4
 		$file = self::$data_dir.'/comments_data_'.$post_id.'.txt';
 		$data = SimpleBlogCommon::FileData($file);
-		if( is_array($data) ){
+		if (is_array($data)) {
 			return $data;
 		}
 
 		// 1.7.4+
 		$file = self::$data_dir.'/comments/'.$post_id.'.txt';
 		$data = SimpleBlogCommon::FileData($file);
-		if( is_array($data) ){
+		if (is_array($data)) {
 			return $data;
 		}
 
@@ -651,30 +651,30 @@ 
 	 * Save the comment data for a blog post
 	 *
 	 */
-	public static function SaveCommentData($post_index,$data){
+	public static function SaveCommentData($post_index, $data) {
 		global $langmessage;
 
 
 		// check directory
 		$dir = self::$data_dir.'/comments';
-		if( !gpFiles::CheckDir($dir) ){
+		if (!gpFiles::CheckDir($dir)) {
 			return false;
 		}
 
 		$commentDataFile = $dir.'/'.$post_index.'.txt';
 		$dataTxt = serialize($data);
-		if( !gpFiles::Save($commentDataFile,$dataTxt) ){
+		if (!gpFiles::Save($commentDataFile, $dataTxt)) {
 			return false;
 		}
 
 
 		// clean pre 1.7.4 files
 		$commentDataFile = self::$data_dir.'/comments_data_'.$post_index.'.txt';
-		if( file_exists($commentDataFile) ){
+		if (file_exists($commentDataFile)) {
 			unlink($commentDataFile);
 		}
 
-		SimpleBlogCommon::AStrSet('comment_counts',$post_index,count($data));
+		SimpleBlogCommon::AStrSet('comment_counts', $post_index, count($data));
 
 		SimpleBlogCommon::SaveIndex();
 
@@ -687,32 +687,32 @@ 
 	 * Delete the comments cache
 	 *
 	 */
-	public static function ClearCommentCache(){
+	public static function ClearCommentCache() {
 		$cache_file = self::$data_dir.'/comments/cache.txt';
-		if( file_exists($cache_file) ){
+		if (file_exists($cache_file)) {
 			unlink($cache_file);
 		}
 	}
 
-	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;
 
-		if( $post_id > 0 ){
-			switch( SimpleBlogCommon::$data['urls'] ){
+		if ($post_id > 0) {
+			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;
 
@@ -721,26 +721,26 @@ 
 				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;
 			}
 		}
 	}
 
-	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'] ){
+		switch (SimpleBlogCommon::$data['urls']) {
 
 			case 'Title':
 			case 'Full':
-				$cattitle = str_replace(array('?',' '),array('','_'),$cattitle);
+				$cattitle = str_replace(array('?', ' '), array('', '_'), $cattitle);
 				$url .= '/'.$cattitle;
 			break;
 
@@ -749,11 +749,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>';
 	}
 
 
@@ -771,11 +771,11 @@ 
 	 * Serialize a simple array into a string
 	 *
 	 */
-	public static function AStrFromArray($array){
+	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.'"';
@@ -789,9 +789,9 @@ 
 	 * @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 ){
+		if ($new_value === false) {
 			return self::AStrGet($data_string, $key);
 		}
 
@@ -804,16 +804,16 @@ 
 	 * @param string $data_string
 	 * @param int|string $key
 	 */
-	public static function AStrGet( $data_string, $key){
+	public static function AStrGet($data_string, $key) {
 
 		//get position of current value
-		$prev_key_str	= '"'.$key.'>';
-		$offset			= strpos(SimpleBlogCommon::$data[$data_string],$prev_key_str);
+		$prev_key_str = '"'.$key.'>';
+		$offset = strpos(SimpleBlogCommon::$data[$data_string], $prev_key_str);
 
-		if( $offset !== false ){
-			$offset		+= strlen($prev_key_str);
-			$length		= strpos(SimpleBlogCommon::$data[$data_string],'"',$offset) - $offset;
-			return substr(SimpleBlogCommon::$data[$data_string],$offset,$length);
+		if ($offset !== false) {
+			$offset += strlen($prev_key_str);
+			$length = strpos(SimpleBlogCommon::$data[$data_string], '"', $offset)-$offset;
+			return substr(SimpleBlogCommon::$data[$data_string], $offset, $length);
 		}
 
 		return false;
@@ -826,24 +826,24 @@ 
 	 * @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) {
 
 
 		//get position of current value
-		$prev_key_str	= '"'.$key.'>';
-		$offset			= strpos(SimpleBlogCommon::$data[$data_string],$prev_key_str);
+		$prev_key_str = '"'.$key.'>';
+		$offset = strpos(SimpleBlogCommon::$data[$data_string], $prev_key_str);
 
 		//setting values
-		if( $offset === false ){
-			if( empty(SimpleBlogCommon::$data[$data_string]) ){
-				SimpleBlogCommon::$data[$data_string]	= '"';
+		if ($offset === false) {
+			if (empty(SimpleBlogCommon::$data[$data_string])) {
+				SimpleBlogCommon::$data[$data_string] = '"';
 			}
-			$key										= str_replace(array('"','>'),'',$key);
-			SimpleBlogCommon::$data[$data_string]		.= $key.'>'.$new_value.'"';
-		}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);
+			$key = str_replace(array('"', '>'), '', $key);
+			SimpleBlogCommon::$data[$data_string] .= $key.'>'.$new_value.'"';
+		}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);
 		}
 
 		return true;
@@ -855,31 +855,31 @@ 
 	 * Should be changed to allow for non-numeric keys
 	 *
 	 */
-	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]) ){
+		if (!isset(SimpleBlogCommon::$data[$data_string])) {
 			return false;
 		}
 
 		$string			= SimpleBlogCommon::$data[$data_string];
 
-		if( $url_search ){
-			$string		= str_replace(array('?',' '),array('','_'),$string);
+		if ($url_search) {
+			$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 ){
+		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);
 	}
 
 
@@ -887,16 +887,16 @@ 
 	 * Remove a key-value
 	 *
 	 */
-	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);
 	}
 
 
-	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);
 
 	}
@@ -906,19 +906,19 @@ 
 	 * Convert an AStr to an array
 	 *
 	 */
-	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 ){
+		if (!$count) {
 			return array();
 		}
 
 		$keys = $matches[1];
 		$values = $matches[2];
 
-		return array_combine($matches[1],$matches[2]);
+		return array_combine($matches[1], $matches[2]);
 	}
 
 

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);

ArchivesGadget.php

Spacing +5 added lines, -5 removed lines

@@ -3,26 +3,26 @@
 
 gpPlugin_incl('SimpleBlogCommon.php');
 
-class SimpleBlogArchives{
+class SimpleBlogArchives {
 
-	function __construct(){
+	function __construct() {
 		global $addonPathData;
 
 		SimpleBlogCommon::AddCSS();
 
 		$content = '';
 		$gadget_file = $addonPathData.'/gadget_archive.php';
-		if( file_exists($gadget_file) ){
+		if (file_exists($gadget_file)) {
 			$content = file_get_contents($gadget_file);
 		}
 
 		//fix edit links
-		if( strpos($content,'simple_blog_gadget_label') ){
+		if (strpos($content, 'simple_blog_gadget_label')) {
 			new SimpleBlogCommon();
 			$content = file_get_contents($gadget_file);
 		}
 
-		if( empty($content) ){
+		if (empty($content)) {
 			return;
 		}
 

SimpleBlogCategories.php

Spacing +36 added lines, -36 removed lines

@@ -4,24 +4,24 @@ 
 //gpPlugin_incl('SimpleBlogCommon.php');
 gpPlugin_incl('SimpleBlog.php');
 
-class BlogCategories extends SimpleBlog{
+class BlogCategories extends SimpleBlog {
 
 	var $categories = array();
 	var $catindex = false;
 	var $total_posts = 0;
 
-	function __construct(){
+	function __construct() {
 		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{
+		}else {
 			$this->ShowCategories();
 		}
 	}
@@ -30,29 +30,29 @@ 
 	 * Get the category index from the request
 	 *
 	 */
-	function CatIndex($requested){
+	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]) ){
+		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);
 	}
 
 
-	function ShowCategory(){
+	function ShowCategory() {
 
 		$this->showing_category = $this->catindex;
 		$catname = $this->categories[$this->catindex];
@@ -60,13 +60,13 @@ 
 		//paginate
 		$per_page = SimpleBlogCommon::$data['per_page'];
 		$page = 0;
-		if( isset($_GET['page']) && is_numeric($_GET['page']) ){
+		if (isset($_GET['page']) && is_numeric($_GET['page'])) {
 			$page = (int)$_GET['page'];
 		}
 		$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);
 
@@ -74,16 +74,16 @@ 
 		//pagination links
 		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);
+		if ($page > 0) {
+			$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);
 		}
 
 
@@ -93,36 +93,36 @@ 
 
 
 
-	function WhichCatPosts($start, $len, $include_drafts = false){
+	function WhichCatPosts($start, $len, $include_drafts = false) {
 
 		$cat_posts = SimpleBlogCommon::AStrToArray('category_posts_'.$this->catindex);
 
 
 		//remove drafts
 		$show_posts = array();
-		if( !$include_drafts ){
-			foreach($cat_posts as $post_id){
-				if( SimpleBlogCommon::AStrGet('drafts',$post_id) ){
+		if (!$include_drafts) {
+			foreach ($cat_posts as $post_id) {
+				if (SimpleBlogCommon::AStrGet('drafts', $post_id)) {
 					continue;
 				}
 
-				$time = SimpleBlogCommon::AStrGet('post_times',$post_id);
-				if( $time > time() ){
+				$time = SimpleBlogCommon::AStrGet('post_times', $post_id);
+				if ($time > time()) {
 					continue;
 				}
 
 				$show_posts[] = $post_id;
 			}
-		}else{
+		}else {
 			$show_posts = $cat_posts;
 		}
 		$this->total_posts = count($show_posts);
 
-		return array_slice($show_posts,$start,$len);
+		return array_slice($show_posts, $start, $len);
 	}
 
 
-	function ShowCategories(){
+	function ShowCategories() {
 
 		echo '<h2>';
 		echo gpOutput::GetAddonText('Categories');
@@ -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 ){
+			if (!$count) {
 				continue;
 			}
 
 			echo '<li>';
-			echo SimpleBlogCommon::CategoryLink( $catindex, $catname, $catname.' ('.$count.')' );
+			echo SimpleBlogCommon::CategoryLink($catindex, $catname, $catname.' ('.$count.')');
 			echo '</li>';
 		}
 		echo '</ul>';

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);

SimpleBlogFeed.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 
 global $addonPathData;
 $feed_file = $addonPathData.'/feed.atom';
-if( !file_exists($feed_file) ){
+if (!file_exists($feed_file)) {
 	die('Feed does not exist');
 }
 

Text.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@
 
 
 /* this function can be used to update the addon once changes to the text values have been made */
-function OnTextChange(){
+function OnTextChange() {
 	gpPlugin_incl('SimpleBlogCommon.php');
-	new SimpleBlogCommon();//regenerate the gadget and feed
+	new SimpleBlogCommon(); //regenerate the gadget and feed
 }

Admin/Posts.php

Spacing +127 added lines, -127 removed lines

@@ -5,17 +5,17 @@ 
 gpPlugin_incl('Admin/Admin.php');
 
 
-class AdminSimpleBlogPosts extends SimipleBlogAdmin{
+class AdminSimpleBlogPosts extends SimipleBlogAdmin {
 
-	public function __construct(){
+	public function __construct() {
 		global $langmessage, $page;
 		parent::__construct();
 
 
 		//post request
-		if( strpos($page->requested,'/') ){
-			$parts	= explode('/',$page->requested);
-			if( $this->AdminPost($parts[1])  ){
+		if (strpos($page->requested, '/')) {
+			$parts = explode('/', $page->requested);
+			if ($this->AdminPost($parts[1])) {
 				return;
 			}
 		}
@@ -23,7 +23,7 @@ 
 
 		//general admin
 		$cmd = common::GetCommand();
-		switch( $cmd ){
+		switch ($cmd) {
 
 			//creating
 			case 'save_new';
@@ -56,44 +56,44 @@ 
 	 * Show all blog posts
 	 *
 	 */
-	public function ShowPosts(){
+	public function ShowPosts() {
 		global $langmessage;
 
 		$this->Heading('Admin_Blog');
 
-		$post_ids			= SimpleBlogCommon::AStrToArray('str_index');
+		$post_ids = SimpleBlogCommon::AStrToArray('str_index');
 		$post_titles		= SimpleBlogCommon::AStrToArray('titles');
 		$post_times			= SimpleBlogCommon::AStrToArray('post_times');
-		$post_comments		= SimpleBlogCommon::AStrToArray('comment_counts');
+		$post_comments = SimpleBlogCommon::AStrToArray('comment_counts');
 		$post_drafts		= SimpleBlogCommon::AStrToArray('drafts');
 		$total_posts		= count($post_ids);
-		$per_page			= 20;
-		$total_pages		= ceil($total_posts/$per_page);
-		$offset				= 0;
+		$per_page = 20;
+		$total_pages		= ceil($total_posts / $per_page);
+		$offset = 0;
 
 
 		//offset
-		if( isset($_REQUEST['offset']) && ctype_digit($_REQUEST['offset']) && $_REQUEST['offset'] > 0 ){
-			$offset		= $_REQUEST['offset'];
+		if (isset($_REQUEST['offset']) && ctype_digit($_REQUEST['offset']) && $_REQUEST['offset'] > 0) {
+			$offset = $_REQUEST['offset'];
 		}
-		$post_ids			= array_slice($post_ids, $offset, $per_page);
+		$post_ids = array_slice($post_ids, $offset, $per_page);
 
 
 		//pagination links
 		echo '<div  style="float:right;margin:20px 0;">';
 		echo '<span class="page_count">';
-		echo ($offset+1).' to '.min($total_posts,$offset+$per_page).' of '.$total_posts;
+		echo ($offset+1).' to '.min($total_posts, $offset+$per_page).' of '.$total_posts;
 		echo '</span>';
 		echo '<ul class="pagination">';
 
-		if( $total_posts > $per_page ){
-			for($i = 0; $i < $total_pages; $i++){
-				$_offset = $i*$per_page;
+		if ($total_posts > $per_page) {
+			for ($i = 0; $i < $total_pages; $i++) {
+				$_offset = $i * $per_page;
 				$class = '';
-				if( $_offset == $offset ){
+				if ($_offset == $offset) {
 					$class = ' class="active"';
 				}
-				echo '<li '.$class.'>'.common::Link('Admin_Blog',$i+1,'offset='.($_offset)).'</li>';
+				echo '<li '.$class.'>'.common::Link('Admin_Blog', $i+1, 'offset='.($_offset)).'</li>';
 			}
 		}
 		echo '</ul>';
@@ -107,63 +107,63 @@ 
 		echo '<th>Options</th>';
 		echo '</tr></thead>';
 		echo '<tbody>';
-		foreach($post_ids as $i => $post_id){
+		foreach ($post_ids as $i => $post_id) {
 
 			//draft/pending
 			echo '<tr><td width="1%">';
-			if( isset($post_drafts[$post_id]) ){
+			if (isset($post_drafts[$post_id])) {
 				echo 'Draft';
-			}elseif( $post_times[$post_id] > time() ){
+			}elseif ($post_times[$post_id] > time()) {
 				echo 'Pending';
 			}
 
 			//title
 			echo '</td><td>';
 			$title = $post_titles[$post_id];
-			echo SimpleBlogCommon::PostLink($post_id,$title);
+			echo SimpleBlogCommon::PostLink($post_id, $title);
 
 			//post time
 			echo '</td><td>';
-			if( isset($post_times[$post_id]) ){
-				echo strftime(SimpleBlogCommon::$data['strftime_format'],$post_times[$post_id]);
+			if (isset($post_times[$post_id])) {
+				echo strftime(SimpleBlogCommon::$data['strftime_format'], $post_times[$post_id]);
 			}
 
 			//comments
 			echo '</td><td>';
 			echo '<span style="display:inline-block;min-width:30px">';
-			if( isset($post_comments[$post_id]) ){
+			if (isset($post_comments[$post_id])) {
 				echo number_format($post_comments[$post_id]);
-			}else{
+			}else {
 				echo '0';
 			}
 			echo '</span>';
 
 
-			if( SimpleBlogCommon::$data['allow_comments'] ){
-				$comments_closed	= SimpleBlogCommon::AStrGet('comments_closed',$post_id);
-				$open				= gpOutput::SelectText('Open');
-				$close				= gpOutput::SelectText('Close');
+			if (SimpleBlogCommon::$data['allow_comments']) {
+				$comments_closed = SimpleBlogCommon::AStrGet('comments_closed', $post_id);
+				$open = gpOutput::SelectText('Open');
+				$close = gpOutput::SelectText('Close');
 
-				if( $comments_closed ){
-					echo common::Link('Admin_Blog',$open,'cmd=opencomments&id='.$post_id,'name="cnreq"');
+				if ($comments_closed) {
+					echo common::Link('Admin_Blog', $open, 'cmd=opencomments&id='.$post_id, 'name="cnreq"');
 					echo ' &nbsp; ';
 					echo gpOutput::SelectText('Closed');
-				}else{
+				}else {
 					echo $open;
 					echo ' &nbsp; ';
-					echo common::Link('Admin_Blog',$close,'cmd=closecomments&id='.$post_id,'name="cnreq"');
+					echo common::Link('Admin_Blog', $close, 'cmd=closecomments&id='.$post_id, 'name="cnreq"');
 				}
-			}else{
-				echo common::Link('Admin_BlogConfig','Disabled');
+			}else {
+				echo common::Link('Admin_BlogConfig', 'Disabled');
 			}
 
 
 			echo '</td><td>';
-			echo SimpleBlogCommon::PostLink($post_id,'View Post');
+			echo SimpleBlogCommon::PostLink($post_id, 'View Post');
 			echo ' &nbsp; ';
-			echo common::Link('Admin_Blog/'.$post_id,$langmessage['edit'],'cmd=edit_post');
+			echo common::Link('Admin_Blog/'.$post_id, $langmessage['edit'], 'cmd=edit_post');
 			echo ' &nbsp; ';
-			echo common::Link('Admin_Blog',$langmessage['delete'],'cmd=deleteentry&del_id='.$post_id,array('class'=>'delete gpconfirm','data-cmd'=>'cnreq','title'=>$langmessage['delete_confirm']));
+			echo common::Link('Admin_Blog', $langmessage['delete'], 'cmd=deleteentry&del_id='.$post_id, array('class'=>'delete gpconfirm', 'data-cmd'=>'cnreq', 'title'=>$langmessage['delete_confirm']));
 
 			echo '</td></tr>';
 		}
@@ -176,18 +176,18 @@ 
 	 * Admin a blog post
 	 *
 	 */
-	public function AdminPost($id){
+	public function AdminPost($id) {
 		global $langmessage;
 
-		if( !ctype_digit($id) ){
+		if (!ctype_digit($id)) {
 			message($langmessage['OOPS'].' (Invalid Request)');
 			return false;
 		}
 
 
-		$this->post_id			= $id;
-		$this->post				= SimpleBlogCommon::GetPostContent($id);
-		if( !$this->post ){
+		$this->post_id = $id;
+		$this->post = SimpleBlogCommon::GetPostContent($id);
+		if (!$this->post) {
 			message($langmessage['OOPS'].' (No Post)');
 			return false;
 		}
@@ -197,10 +197,10 @@ 
 		return true;
 	}
 
-	private function _AdminPost(){
+	private function _AdminPost() {
 
 		$cmd = common::GetCommand();
-		switch( $cmd ){
+		switch ($cmd) {
 
 			//editing
 			case 'save_edit':
@@ -217,16 +217,16 @@ 
 	 * Display the form for editing an existing post
 	 *
 	 */
-	private function EditPost(){
+	private function EditPost() {
 		global $langmessage, $page;
 
 
 
-		$page->ajaxReplace	= array();
-		$post				= $this->post;
-		$_POST				+= $post;
+		$page->ajaxReplace = array();
+		$post = $this->post;
+		$_POST += $post;
 
-		$this->PostForm('Edit Post',$_POST,'save_edit',$this->post_id);
+		$this->PostForm('Edit Post', $_POST, 'save_edit', $this->post_id);
 	}
 
 
@@ -234,8 +234,8 @@ 
 	 * Display the form for creating a new post
 	 *
 	 */
-	private function NewForm(){
-		$this->PostForm('New Blog Post',$_POST);
+	private function NewForm() {
+		$this->PostForm('New Blog Post', $_POST);
 	}
 
 
@@ -247,19 +247,19 @@ 
 	 * @param string $cmd
 	 * @param int|string $post_id
 	 */
-	private function PostForm($label,&$array,$cmd='save_new',$post_id=null){
+	private function PostForm($label, &$array, $cmd = 'save_new', $post_id = null) {
 		global $langmessage;
 
 		includeFile('tool/editing.php');
 
-		$array 				+= array('title'=>'', 'content'=>'', 'subtitle'=>'', 'isDraft'=>false, 'categories'=>array(), 'time'=>time() );
-		if( $post_id ){
-			$array				+= array('isDraft'=>SimpleBlogCommon::AStrGet('drafts',$post_id));
+		$array 				+= array('title'=>'', 'content'=>'', 'subtitle'=>'', 'isDraft'=>false, 'categories'=>array(), 'time'=>time());
+		if ($post_id) {
+			$array				+= array('isDraft'=>SimpleBlogCommon::AStrGet('drafts', $post_id));
 		}
-		$array['title']		= SimpleBlogCommon::Underscores( $array['title'] );
+		$array['title'] = SimpleBlogCommon::Underscores($array['title']);
 
 		$action = common::GetUrl('Admin_Blog');
-		if( $post_id ){
+		if ($post_id) {
 			$action = common::GetUrl('Admin_Blog/'.$post_id);
 		}
 
@@ -270,10 +270,10 @@ 
 		echo '<div style="float:right">';
 		echo '<input type="hidden" name="cmd" value="'.$cmd.'" />';
 		echo '<input class="gpsubmit" type="submit" name="" value="'.$langmessage['save'].'" /> ';
-		echo common::Link('Admin_Blog',$langmessage['cancel'],'',' class="gpcancel"');
+		echo common::Link('Admin_Blog', $langmessage['cancel'], '', ' class="gpcancel"');
 
-		if( $post_id ){
-			echo SimpleBlogCommon::PostLink($post_id,'View Post','','target="_blank"');
+		if ($post_id) {
+			echo SimpleBlogCommon::PostLink($post_id, 'View Post', '', 'target="_blank"');
 		}
 
 
@@ -309,7 +309,7 @@ 
 		echo '<div class="sb_edit_group">';
 		echo '<label>';
 		echo '<input type="checkbox" name="isDraft" value="on" data-cmd="DraftCheckbox" ';
-		if( $array['isDraft'] ) echo 'checked="true"';
+		if ($array['isDraft']) echo 'checked="true"';
 		echo '" /> Draft</label>';
 		echo '</div>';
 
@@ -321,7 +321,7 @@ 
 		//categories
 		echo '<div class="sb_edit_box">';
 		echo '<div class="sb_edit_group">';
-		self::ShowCategoryList($post_id,$array);
+		self::ShowCategoryList($post_id, $array);
 		echo '</div>';
 		echo '</div>';
 
@@ -330,7 +330,7 @@ 
 
 		//content
 		echo '<div class="sb_post_container_left">';
-		gp_edit::UseCK($array['content'],'content');
+		gp_edit::UseCK($array['content'], 'content');
 		echo '</div>';
 
 		echo '</div>';
@@ -350,10 +350,10 @@ 
 	 * Display fields for setting publish date
 	 *
 	 */
-	public function FieldPublish($array){
+	public function FieldPublish($array) {
 
 		$style = '';
-		if( $array['isDraft'] ){
+		if ($array['isDraft']) {
 			$style = ' style="display:none"';
 		}
 
@@ -362,13 +362,13 @@ 
 
 
 		//month
-		$pub_month	= date('n',$array['time']);
-		$months		= array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
+		$pub_month = date('n', $array['time']);
+		$months = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
 
 		echo '<select name="pub_month" style="width:4.3em">';
-		for($i = 1; $i <= 12; $i++){
+		for ($i = 1; $i <= 12; $i++) {
 			$selected = '';
-			if( $i == $pub_month ){
+			if ($i == $pub_month) {
 				$selected = 'selected';
 			}
 			echo '<option value="'.$i.'" '.$selected.'>'.$months[$i-1].' ('.$i.')</option>';
@@ -376,15 +376,15 @@ 
 		echo '</select>';
 
 		//day
-		echo '<input name="pub_day" value="'.date('d',$array['time']).'" style="width:2em"/>';
+		echo '<input name="pub_day" value="'.date('d', $array['time']).'" style="width:2em"/>';
 		echo ', ';
-		echo '<input name="pub_year" value="'.date('Y',$array['time']).'" style="width:4em"/>';
+		echo '<input name="pub_year" value="'.date('Y', $array['time']).'" style="width:4em"/>';
 
 		//time
 		echo '@';
-		echo '<input name="pub_hour" value="'.date('H',$array['time']).'" style="width:2em"/>';
+		echo '<input name="pub_hour" value="'.date('H', $array['time']).'" style="width:2em"/>';
 		echo ':';
-		echo '<input name="pub_min" value="'.date('i',$array['time']).'" style="width:2em"/>';
+		echo '<input name="pub_min" value="'.date('i', $array['time']).'" style="width:2em"/>';
 
 
 		echo '</div>';
@@ -397,7 +397,7 @@ 
 	 * @return bool
 	 *
 	 */
-	function SaveNew(){
+	function SaveNew() {
 		global $langmessage, $gpAdmin;
 
 		//use current data file or create new one
@@ -406,18 +406,18 @@ 
 
 		//add new_id to list of indeces
 		$str_index = SimpleBlogCommon::AStrToArray('str_index');
-		array_unshift($str_index,$new_id);
-		SimpleBlogCommon::$data['str_index']	= SimpleBlogCommon::AStrFromArray($str_index);
+		array_unshift($str_index, $new_id);
+		SimpleBlogCommon::$data['str_index'] = SimpleBlogCommon::AStrFromArray($str_index);
 
 
 		//save to data file
 		$post = array();
-		if( !self::SavePost($new_id, $post) ){
+		if (!self::SavePost($new_id, $post)) {
 			return false;
 		}
 
 		//redirect to new post
-		$url = common::GetUrl('Admin_Blog','',false);
+		$url = common::GetUrl('Admin_Blog', '', false);
 		common::Redirect($url);
 	}
 
@@ -429,18 +429,18 @@ 
 	 * @return bool
 	 *
 	 */
-	private function SaveEdit(){
+	private function SaveEdit() {
 		global $langmessage;
 
 
 		//save to data file
-		if( !self::SavePost($this->post_id, $this->post) ){
+		if (!self::SavePost($this->post_id, $this->post)) {
 			message($langmessage['OOPS'].' (Post not saved)');
 			return false;
 		}
 
 
-		$this->post			= SimpleBlogCommon::GetPostContent($this->post_id);
+		$this->post = SimpleBlogCommon::GetPostContent($this->post_id);
 
 		return true;
 	}
@@ -450,14 +450,14 @@ 
 	 * Save the post
 	 *
 	 */
-	public static function SavePost($post_id, $post){
+	public static function SavePost($post_id, $post) {
 		global $langmessage;
 
-		$_POST			+= array('title'=>'', 'content'=>'', 'subtitle'=>'', 'isDraft'=>'','category'=>array());
+		$_POST += array('title'=>'', 'content'=>'', 'subtitle'=>'', 'isDraft'=>'', 'category'=>array());
 		$title			= htmlspecialchars($_POST['title']);
 		$title			= trim($title);
 
-		if( empty($title) ){
+		if (empty($title)) {
 			message($langmessage['TITLE_REQUIRED']);
 			return false;
 		}
@@ -467,12 +467,12 @@ 
 
 		//different time
 		//organize posts based on publish time
-		SimpleBlogCommon::AStrSet('post_times',$post_id,$_POST['time']);
-		$post_times			= SimpleBlogCommon::AStrToArray('post_times');
+		SimpleBlogCommon::AStrSet('post_times', $post_id, $_POST['time']);
+		$post_times = SimpleBlogCommon::AStrToArray('post_times');
 		arsort($post_times);
 
-		$str_index			= array_keys($post_times);
-		SimpleBlogCommon::$data['str_index']	= SimpleBlogCommon::AStrFromArray($str_index);
+		$str_index = array_keys($post_times);
+		SimpleBlogCommon::$data['str_index'] = SimpleBlogCommon::AStrFromArray($str_index);
 
 
 		//get next static gen time
@@ -480,33 +480,33 @@ 
 
 
 		//create post array
-		$post['title']			= $title;
-		$post['content']		= $_POST['content'];
-		$post['subtitle']		= htmlspecialchars($_POST['subtitle']);
-		$post['categories']		= $_POST['category'];
-		$post['time']			= $_POST['time'];
+		$post['title'] = $title;
+		$post['content'] = $_POST['content'];
+		$post['subtitle'] = htmlspecialchars($_POST['subtitle']);
+		$post['categories'] = $_POST['category'];
+		$post['time'] = $_POST['time'];
 		unset($post['isDraft']);
 
 
 		//save to data file
-		if( !parent::SavePost($post_id, $post) ){
+		if (!parent::SavePost($post_id, $post)) {
 			return false;
 		}
 
 
 		//draft
-		if( $_POST['isDraft'] === 'on' ){
-			SimpleBlogCommon::AStrSet('drafts',$post_id,1);
-		}else{
-			SimpleBlogCommon::AStrRm('drafts',$post_id);
+		if ($_POST['isDraft'] === 'on') {
+			SimpleBlogCommon::AStrSet('drafts', $post_id, 1);
+		}else {
+			SimpleBlogCommon::AStrRm('drafts', $post_id);
 		}
 
 
 
-		SimpleBlogCommon::AStrSet('titles',$post_id,$title);
-		self::UpdatePostCategories($post_id);	//find and update the edited post in categories and archives
+		SimpleBlogCommon::AStrSet('titles', $post_id, $title);
+		self::UpdatePostCategories($post_id); //find and update the edited post in categories and archives
 
-		if( !SimpleBlogCommon::SaveIndex() ){
+		if (!SimpleBlogCommon::SaveIndex()) {
 			message($langmessage['OOPS'].' (Index not saved)');
 			return false;
 		}
@@ -524,14 +524,14 @@ 
 	 * Get posted time
 	 *
 	 */
-	public static function GetPostedTime(){
-		$_POST['pub_year']		= ($_POST['pub_year'] <= 0 )	? date('Y') : $_POST['pub_year'];
-		$_POST['pub_month']		= ($_POST['pub_month'] <= 0 )	? date('n') : $_POST['pub_month'];
-		$_POST['pub_day']		= ($_POST['pub_day'] > 31 )		? 31 : $_POST['pub_day'];
-		$_POST['pub_day']		= ($_POST['pub_day'] <= 0 )		? date('j') : $_POST['pub_day'];
-		$_POST['pub_hour']		= ($_POST['pub_hour'] > 23 )	? $_POST['pub_hour'] -24 : $_POST['pub_hour'];
-		$_POST['pub_min']		= ($_POST['pub_min'] > 59 ) ? $_POST['pub_min'] -60 : $_POST['pub_min'];
-		$_POST['time']			= gmmktime( $_POST['pub_hour'], $_POST['pub_min'], 0, $_POST['pub_month'], $_POST['pub_day'], $_POST['pub_year'] );
+	public static function GetPostedTime() {
+		$_POST['pub_year'] = ($_POST['pub_year'] <= 0) ? date('Y') : $_POST['pub_year'];
+		$_POST['pub_month'] = ($_POST['pub_month'] <= 0) ? date('n') : $_POST['pub_month'];
+		$_POST['pub_day']		= ($_POST['pub_day'] > 31) ? 31 : $_POST['pub_day'];
+		$_POST['pub_day']		= ($_POST['pub_day'] <= 0) ? date('j') : $_POST['pub_day'];
+		$_POST['pub_hour'] = ($_POST['pub_hour'] > 23) ? $_POST['pub_hour']-24 : $_POST['pub_hour'];
+		$_POST['pub_min']		= ($_POST['pub_min'] > 59) ? $_POST['pub_min']-60 : $_POST['pub_min'];
+		$_POST['time'] = gmmktime($_POST['pub_hour'], $_POST['pub_min'], 0, $_POST['pub_month'], $_POST['pub_day'], $_POST['pub_year']);
 	}
 
 
@@ -539,25 +539,25 @@ 
 	 * Show a list of all categories
 	 *
 	 */
-	public static function ShowCategoryList( $post_id, $post ){
+	public static function ShowCategoryList($post_id, $post) {
 
 		$_POST += array('category'=>array());
 
 		echo '<label>Category</label>';
 		echo '<select name="category[]" multiple="multiple"  class="gpinput">';
 
-		$categories = SimpleBlogCommon::AStrToArray( 'categories' );
-		foreach( $categories as $catindex => $catname ){
+		$categories = SimpleBlogCommon::AStrToArray('categories');
+		foreach ($categories as $catindex => $catname) {
 
 			$selected = '';
 			$label = $catname;
-			if( $post_id && in_array($catindex, $post['categories']) ){
+			if ($post_id && in_array($catindex, $post['categories'])) {
 				$selected = 'selected="selected"';
-			}elseif( in_array($catindex, $_POST['category']) ){
+			}elseif (in_array($catindex, $_POST['category'])) {
 				$selected = 'selected="selected"';
 			}
 
-			if( SimpleBlogCommon::AStrGet('categories_hidden', $catindex) ){
+			if (SimpleBlogCommon::AStrGet('categories_hidden', $catindex)) {
 				$label .= ' (Hidden)';
 			}
 
@@ -573,26 +573,26 @@ 
 	 * Update a category when a blog entry is edited
 	 *
 	 */
-	private static function UpdatePostCategories( $post_id ){
+	private static function UpdatePostCategories($post_id) {
 
 		$_POST += array('category'=>array());
 
 		//get order of all posts
-		$post_times = SimpleBlogCommon::AStrToArray( 'post_times' );
+		$post_times = SimpleBlogCommon::AStrToArray('post_times');
 		arsort($post_times);
 		$post_times = array_keys($post_times);
 
 
 		//loop through each category
-		$categories = SimpleBlogCommon::AStrToArray( 'categories' );
+		$categories = SimpleBlogCommon::AStrToArray('categories');
 
-		foreach( $categories as $catindex => $catname ){
+		foreach ($categories as $catindex => $catname) {
 
-			SimpleBlogCommon::AStrRmValue('category_posts_'.$catindex, $post_id );
-			if( in_array($catindex, $_POST['category']) ){
+			SimpleBlogCommon::AStrRmValue('category_posts_'.$catindex, $post_id);
+			if (in_array($catindex, $_POST['category'])) {
 
 				//add and order correctly
-				$category_posts = SimpleBlogCommon::AStrToArray( 'category_posts_'.$catindex );
+				$category_posts = SimpleBlogCommon::AStrToArray('category_posts_'.$catindex);
 				$category_posts[] = $post_id;
 				$category_posts = array_intersect($post_times, $category_posts);
 				SimpleBlogCommon::$data['category_posts_'.$catindex] = SimpleBlogCommon::AStrFromArray($category_posts);

Braces +9 added lines, -7 removed lines

@@ -113,7 +113,7 @@ 
 			echo '<tr><td width="1%">';
 			if( isset($post_drafts[$post_id]) ){
 				echo 'Draft';
-			}elseif( $post_times[$post_id] > time() ){
+			} elseif( $post_times[$post_id] > time() ){
 				echo 'Pending';
 			}
 
@@ -133,7 +133,7 @@ 
 			echo '<span style="display:inline-block;min-width:30px">';
 			if( isset($post_comments[$post_id]) ){
 				echo number_format($post_comments[$post_id]);
-			}else{
+			} else{
 				echo '0';
 			}
 			echo '</span>';
@@ -148,12 +148,12 @@ 
 					echo common::Link('Admin_Blog',$open,'cmd=opencomments&id='.$post_id,'name="cnreq"');
 					echo ' &nbsp; ';
 					echo gpOutput::SelectText('Closed');
-				}else{
+				} else{
 					echo $open;
 					echo ' &nbsp; ';
 					echo common::Link('Admin_Blog',$close,'cmd=closecomments&id='.$post_id,'name="cnreq"');
 				}
-			}else{
+			} else{
 				echo common::Link('Admin_BlogConfig','Disabled');
 			}
 
@@ -309,7 +309,9 @@ 
 		echo '<div class="sb_edit_group">';
 		echo '<label>';
 		echo '<input type="checkbox" name="isDraft" value="on" data-cmd="DraftCheckbox" ';
-		if( $array['isDraft'] ) echo 'checked="true"';
+		if( $array['isDraft'] ) {
+			echo 'checked="true"';
+		}
 		echo '" /> Draft</label>';
 		echo '</div>';
 
@@ -497,7 +499,7 @@ 
 		//draft
 		if( $_POST['isDraft'] === 'on' ){
 			SimpleBlogCommon::AStrSet('drafts',$post_id,1);
-		}else{
+		} else{
 			SimpleBlogCommon::AStrRm('drafts',$post_id);
 		}
 
@@ -553,7 +555,7 @@ 
 			$label = $catname;
 			if( $post_id && in_array($catindex, $post['categories']) ){
 				$selected = 'selected="selected"';
-			}elseif( in_array($catindex, $_POST['category']) ){
+			} elseif( in_array($catindex, $_POST['category']) ){
 				$selected = 'selected="selected"';
 			}
 

Admin/Comments.php

Spacing +36 added lines, -36 removed lines

@@ -5,24 +5,24 @@ 
 gpPlugin_incl('Admin/Admin.php');
 
 
-class SimpleBlogComments extends SimipleBlogAdmin{
+class SimpleBlogComments extends SimipleBlogAdmin {
 
 	var $dir;
 	var $cache = array();
 	var $cache_mod = 0;
 
-	function __construct(){
+	function __construct() {
 		global $page, $addonFolderName;
 
 		parent::__construct();
 
 
-		$this->dir			= SimpleBlogCommon::$data_dir.'/comments';
+		$this->dir = SimpleBlogCommon::$data_dir.'/comments';
 
 		$this->GetCache();
 
 		$cmd = common::GetCommand();
-		switch( $cmd ){
+		switch ($cmd) {
 			case 'delete_comment':
 				$this->DeleteComment();
 			break;
@@ -31,7 +31,7 @@ 
 		$this->ShowRecent();
 	}
 
-	function ShowRecent(){
+	function ShowRecent() {
 		global $langmessage;
 
 
@@ -47,15 +47,15 @@ 
 		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>';
 	}
 
-	function OutputComment($comment){
+	function OutputComment($comment) {
 		global $langmessage;
 		echo '<tr><td class="user_submitted">';
 		echo '<b>'.$comment['name'].'</b>';
@@ -67,34 +67,34 @@ 
 
 		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']) ){
+		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>';
 		}
 
 		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(){
+	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){
-			if( $comment['time'] == $comment_time ){
+		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();
 	}
 
@@ -103,12 +103,12 @@ 
 	 * The cache file will store the 100 most recent comments
 	 *
 	 */
-	function GetCache(){
+	function GetCache() {
 		$this->cache = array();
 		$this->cache_mod = 0;
 		$this->cache_file = SimpleBlogCommon::$data_dir.'/comments/cache.txt';
 
-		if( file_exists($this->cache_file) ){
+		if (file_exists($this->cache_file)) {
 			$this->cache_mod = filemtime($this->cache_file)-100;
 			$this->cache = SimpleBlogCommon::FileData($this->cache_file);
 		}
@@ -117,37 +117,37 @@ 
 	}
 
 
-	function GetRecent(){
-		if( !file_exists($this->dir) ){
+	function GetRecent() {
+		if (!file_exists($this->dir)) {
 			return false;
 		}
 
 		$new_entries = false;
 
 		$files = scandir($this->dir);
-		foreach($files as $file){
+		foreach ($files as $file) {
 
-			if( $file == '.' || $file == '..' ){
+			if ($file == '.' || $file == '..') {
 				continue;
 			}
 
-			list($post_id,$ext) = explode('.',$file,2);
+			list($post_id, $ext) = explode('.', $file, 2);
 
-			if( !is_numeric($post_id) ){
+			if (!is_numeric($post_id)) {
 				continue;
 			}
 
 			//should already be part of the cache
 			$full_path = $this->dir.'/'.$file;
 			$mod_time = filemtime($full_path);
-			if( $mod_time < $this->cache_mod ){
+			if ($mod_time < $this->cache_mod) {
 				continue;
 			}
 
 			$data = SimpleBlogCommon::FileData($full_path);
 
-			foreach($data as $comment){
-				if( $comment['time'] < $this->cache_mod ){
+			foreach ($data as $comment) {
+				if ($comment['time'] < $this->cache_mod) {
 					continue;
 				}
 				$unique = $post_id.'.'.$comment['time'];
@@ -157,15 +157,15 @@ 
 			}
 		}
 
-		if( $new_entries ){
-			uasort($this->cache, array('SimpleBlogComments','Sort') );
+		if ($new_entries) {
+			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){
-		if( $a['time'] == $b['time'] ){
+	function Sort($a, $b) {
+		if ($a['time'] == $b['time']) {
 			return 0;
 		}
 		return ($a['time'] < $b['time']) ? 1 : -1;

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>';
 		}
 

Admin/Configuration.php

Spacing +47 added lines, -47 removed lines

@@ -5,16 +5,16 @@ 
 gpPlugin_incl('Admin/Admin.php');
 
 
-class AdminSimpleBlogConfig extends SimipleBlogAdmin{
+class AdminSimpleBlogConfig extends SimipleBlogAdmin {
 
-	function __construct(){
+	function __construct() {
 		global $langmessage;
 
 		parent::__construct();
 
 
 		$cmd = common::GetCommand();
-		switch($cmd){
+		switch ($cmd) {
 			//regen
 			case 'regen':
 				SimpleBlogCommon::GenStaticContent();
@@ -24,7 +24,7 @@ 
 
 			//config
 			case 'save_config':
-				if( $this->SaveConfig() ){
+				if ($this->SaveConfig()) {
 					SimpleBlogCommon::GenStaticContent();
 				}
 			break;
@@ -41,49 +41,49 @@ 
 	 * @return bool
 	 *
 	 */
-	function SaveConfig(){
+	function SaveConfig() {
 		global $langmessage;
 
 
 		$options = self::Options();
-		if( isset($_POST['urls']) && isset($options['urls'][$_POST['urls']]) ){
+		if (isset($_POST['urls']) && isset($options['urls'][$_POST['urls']])) {
 			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']) ){
+		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'] = '';
 		}
 
 
-		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) ){
+		if (@strftime($format)) {
 			SimpleBlogCommon::$data['strftime_format'] = $format;
 		}
 
 
 		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() ){
+		if (!SimpleBlogCommon::SaveIndex()) {
 			message($langmessage['OOPS']);
 			return false;
 		}
@@ -98,12 +98,12 @@ 
 	 * Show the configuration form
 	 *
 	 */
-	function Config(){
+	function Config() {
 		global $langmessage, $addonFolderName, $gpversion;
 
 
 		$defaults = SimpleBlogCommon::Defaults();
-		$array =& SimpleBlogCommon::$data;
+		$array = & SimpleBlogCommon::$data;
 
 		$label = gpOutput::SelectText('Blog');
 
@@ -125,9 +125,9 @@ 
 
 		//Pretty Urls
 		echo '<tr><td>Urls</td><td>';
-		if( version_compare($gpversion,'4.0','>=') ){
-			self::Radio('urls',$options['urls'],$array['urls']);
-		}else{
+		if (version_compare($gpversion, '4.0', '>=')) {
+			self::Radio('urls', $options['urls'], $array['urls']);
+		}else {
 			echo 'Available in gpEasy 4.0+';
 		}
 		echo '</td><td>';
@@ -180,9 +180,9 @@ 
 		echo '<tr><td>';
 		echo 'Image in Abbrevation';
 		echo '</td><td>';
-		if( $array['abbrev_image'] ){
+		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>';
@@ -192,9 +192,9 @@ 
 		echo '<tr><td>';
 		echo 'Categories in Abbrevation';
 		echo '</td><td>';
-		if( $array['abbrev_cat'] ){
+		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>';
@@ -260,9 +260,9 @@ 
 		echo '<tr><td>';
 		echo 'Allow Comments';
 		echo '</td><td>';
-		if( $array['allow_comments'] ){
+		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>';
@@ -281,15 +281,15 @@ 
 		echo 'Commenter Website';
 		echo '</td><td>';
 		echo '<select name="commenter_website" class="gpselect">';
-			if( $array['commenter_website'] == 'nofollow' ){
+			if ($array['commenter_website'] == 'nofollow') {
 				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>';
@@ -303,15 +303,15 @@ 
 		echo 'reCaptcha';
 		echo '</td><td>';
 
-		if( !gp_recaptcha::isActive() ){
+		if (!gp_recaptcha::isActive()) {
 			$disabled = ' disabled="disabled" ';
-		}else{
+		}else {
 			$disabled = '';
 		}
 
-		if( $array['comment_captcha'] ){
+		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>';
@@ -329,15 +329,15 @@ 
 
 
 		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>';
 	}
 
-	static function Options(){
+	static function Options() {
 
 		return array(
 
@@ -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>';
@@ -364,12 +364,12 @@ 
 		echo '</select>';
 	}
 
-	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.' /> ';

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>';