Typesetter / Simple-Blog

SimpleBlogCommon.php

Spacing +117 added lines, -117 removed lines

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