4,10c4,10
< 	switch ($path) {
<     	case 'admin/help#blog_addons':
< 		$message = ' Blog AddOns help';
< 		break;
< 		}
< 	return $message;
< 	}
---
>   switch ($path) {
>     case 'admin/help#blog_addons':
> 	$message = ' Blog AddOns help';
> 	break;
> }
> return $message;
> }
15,17c15,18
< function blog_addons_perm() {
< 	return array( 'administer blog_addons' );
< 	}                               
---
> function blog_addons_perm()
> {
>   return array( 'administer blog_addons' );
> }                               
22d22
< 
24,25c24,26
< 	global $user;
< 	$items = array();
---
>   global $user;
>  $items = array();
> 
94c95
< 		'access arguments' => array('access content'),
---
> 	'access arguments' => array('access content'),
101,102c102,104
< function blog_addons_bloggers() {
< 	$pager_attrib = array('sort' => variable_get('blog_addons_sort', 'nposts'), 'order' => variable_get('blog_addons_order', 'DESC'));    
---
> function blog_addons_bloggers()
> {
>   $pager_attrib = array('sort' => variable_get('blog_addons_sort', 'nposts'), 'order' => variable_get('blog_addons_order', 'DESC'));    
104,105c106,109
< 	if (isset($_GET['order']))
< 		$pager_attrib['order'] = ($_GET['order'] == 'desc') ? 'desc' : 'asc'; 
---
>   if (isset($_GET['order']))
>   {
>     $pager_attrib['order'] = ($_GET['order'] == 'desc') ? 'desc' : 'asc'; 
>   }
107,131c111,137
< 	if (isset($_GET['sort'])) {
< 		switch($_GET['sort']) {
< 			case 'name':
< 				$pager_attrib['sort'] = ($_GET['sort'] == 'name') ? 'name' : 'name';
< 				break;
< 			case 'nposts':
<         		$pager_attrib['sort'] = ($_GET['sort'] == 'nposts') ? 'nposts' : 'nposts';
<       			break;
<       		default:
<         		$pager_attrib['sort'] =  'name'; 
<       		break;
<    			}
<  		}
<  		
< 	switch ($pager_attrib['sort']) {
< 		case 'name':
< 			$sortby = " ORDER BY u.name " . $pager_attrib['order'] . " ";
< 			break;
< 		case 'nposts':
< 			$sortby = " ORDER BY nposts " . $pager_attrib['order'] . " ";
< 			break; 
< 		default:                                 
< 			$sortby = " ORDER By u.name ASC ";
< 			break;
< 		}
---
>   if (isset($_GET['sort']))
>   {
>     switch($_GET['sort'])
>     {
>       case 'name':
>         $pager_attrib['sort'] = ($_GET['sort'] == 'name') ? 'name' : 'name';
>       break;
>       case 'nposts':
>         $pager_attrib['sort'] = ($_GET['sort'] == 'nposts') ? 'nposts' : 'nposts';
>       break;
>       default:
>         $pager_attrib['sort'] =  'name'; 
>       break;
>    }
>  }       
>  switch ($pager_attrib['sort']) 
>  {
>     case 'name':
>       $sortby = " ORDER BY u.name " . $pager_attrib['order'] . " ";
>     break;
>     case 'nposts':
>       $sortby = " ORDER BY nposts " . $pager_attrib['order'] . " ";
>     break; 
>     default:                                 
>      $sortby = " ORDER By u.name ASC ";
>     break;
>   }
133,134c139,140
< 	$query = "SELECT COUNT(DISTINCT(u.name)) FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.type = 'blog'";
< 	$counts = db_rewrite_sql($query);
---
>   $query = "SELECT COUNT(DISTINCT(u.name)) FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.type = 'blog'";
>   $counts = db_rewrite_sql($query);
136,137c142,143
< 	$query = "SELECT u.name, COUNT(n.uid) AS nposts FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.status=1 AND n.type = 'blog' GROUP BY u.uid " . $sortby;
< 	$result = pager_query(db_rewrite_sql($query), variable_get('blog_addons_nbloggers', 20),0,$counts);
---
>   $query = "SELECT u.name, COUNT(n.uid) AS nposts FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.status=1 AND n.type = 'blog' GROUP BY u.uid " . $sortby;
>   $result = pager_query(db_rewrite_sql($query), variable_get('blog_addons_nbloggers', 20),0,$counts);
139,140c145,147
< 	blog_addons_show_bloggers($result,$pager_attrib );
< 	}
---
>   blog_addons_show_bloggers($result,$pager_attrib );
> 
> }
150,151c157
< /*
<   $content .= '<div class="blog_addons-sort">Sort by:';
---
>   $content .= '<div class="blog_addons-sort">Sort by:'; 
154c160
<   $content .= "]</div><br> ";
---
>   $content .= "]</div><br> ";               
159,170d164
< */
< 
< //<div class=\"blog_addons-sort\">
<   $content .= "<br />
<   <table border=\"0\" width=\"40%\">
<    <tr><td><i>" .  l(t("Name"), $_GET['q'], array('attributes' => $sort_attr, 'query' => "&sort=name&order=$order")) .
<   "</i></td><td><i>" . l(t("Number of posts"), $_GET['q'], array('attributes' => $sort_attr, 'query' => "&sort=nposts&order=$order")) .
<   "</i></td></tr>";
<   while ($blogger = db_fetch_object($result))
<   {
<     $content .= "<tr><td>" . l($blogger->name,'blog/'.$blogger->name) . "</td><td>" . $blogger->nposts . "</td></tr>";
<   }
172d165
<   $content .= "</table><br /><br />";
177,178c170,204
< function blog_addons_recentposts() {
< 	$pager_attrib = array("sort" => variable_get('blog_addons_sort', 'date'), 'order' => variable_get('blog_addons_order', 'DESC'));    
---
> function blog_addons_recentposts()
> {
>  $pager_attrib = array("sort" => variable_get('blog_addons_sort', 'date'), 'order' => variable_get('blog_addons_order', 'DESC'));    
> 
>   if (isset($_GET['order']))
>   {
>     $pager_attrib['order'] = ($_GET['order'] == 'desc') ? 'desc' : 'asc';  
>   }
> 
>   if (isset($_GET['sort']))
>   {
>     switch($_GET['sort'])
>     {
>       case 'date':
>         $pager_attrib['sort'] = ($_GET['sort'] == 'date') ? 'date' : 'date';
>       break;
>       default:
>         $pager_attrib['sort'] =  'date'; 
>       break;
>     }
>   }       
> 
>   switch ($pager_attrib['sort']) 
>   {
>       case 'date':
>         $sortby = " ORDER BY n.created " . $pager_attrib['order'] . " ";
>       break; 
>       default:                                 
>         $sortby = " ORDER By n.created ASC ";
>       break;
>   } 
> 
>   $query = "SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 " . $sortby;
>   $result = pager_query(db_rewrite_sql($query), variable_get('blog_addons_nposts', 10),0);
>   blog_addons_show_recentposts($result,$pager_attrib );
180,181c206
< 	if (isset($_GET['order']))
< 		$pager_attrib['order'] = ($_GET['order'] == 'desc') ? 'desc' : 'asc';  
---
> }
183,210c208,211
< 	if (isset($_GET['sort'])) {
<     	switch($_GET['sort']) {
< 			case 'date':
<         		$pager_attrib['sort'] = ($_GET['sort'] == 'date') ? 'date' : 'date';
<       			break;
<       		default:
<         		$pager_attrib['sort'] =  'date'; 
<       			break;
<     		}
<   		}
< 
<   	switch ($pager_attrib['sort']) {
< 		case 'date':
< 			$sortby = " ORDER BY n.created " . $pager_attrib['order'] . " ";
< 			break; 
< 		default:                                 
< 			$sortby = " ORDER By n.created ASC ";
< 			break;
< 		}
< 
< 		$query = "SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 " . $sortby;
< 		$result = pager_query(db_rewrite_sql($query), variable_get('blog_addons_nposts', 10),0);
< 		blog_addons_show_recentposts($result,$pager_attrib );
< }
< 
< function blog_addons_show_recentposts($result, $attrib = array("sort" => 'date', 'order' => 'ASC')) {
< 	drupal_add_css(drupal_get_path('module', 'blog_addons').'/blog_addons.css');
< 	global $pager_total_items;
---
> function blog_addons_show_recentposts($result, $attrib = array("sort" => 'date', 'order' => 'ASC'))
> {
>   drupal_add_css(drupal_get_path('module', 'blog_addons').'/blog_addons.css');
>   global $pager_total_items;
212,322c213,339
< 	$order = ($attrib['order'] == "desc" || $attrib['order'] == "DESC")?"asc":"desc";                           
< 	$sort_attr = array("title"=>t("Click a second time to reverse the sort order"));                            
< 	$content .= '<div class="blog_addons-sort">Sort by:'; 
< 	$content .= "[".l(t("Date"), $_GET['q'], array('attributes' => $sort_attr, 'query' => "&sort=date&order=$order"));
< 	$content .= "]</div> <br> ";               
< 
< 	//  drupal_set_title(t('Blog posts'));
< 
< 	while ($blogentry = db_fetch_object($result)) {
< 		$content .= node_view(node_load($blogentry->nid),1);
<   		}
< 
<   	$content .= theme('pager',0,variable_get('blog_addons_nposts', 10));
<   	print theme('page',$content);
< 	}
< 
< 
< function blog_addons_block($op='list', $delta=0 ) {
< 	global $user;
< 	if ($op == 'list') {
< 		$block[0]['title'] = t('BLOGS');
< 		$block[0]['info'] = t('Blog navigation menu');
< 		$block[0]['content'] = t('');
< 		$block[0]['pages'] = 'blog*';
< 		$block[0]['visibility'] = '1';
< 		return $block;
< 		}
<   	else if ($op == 'view') {
< 		if (arg(0) == 'blog') {
<       		if (is_numeric(arg(1)))
<         		$account = user_load(array('uid' =>  arg(1)));
<       		else	 
<         		$account = user_load(array('name' =>  arg(1)));
<     		}
<     	else if (arg(0) == 'node') {
< 			if (is_numeric(arg(1))) {
< 				$node = node_load(arg(1));
< 					if ($node->type == 'blog')
< 						$account = user_load(array('uid' =>  $node->uid));
< 				}
< 			}
< 
< 		if (!isset($account->uid))
< 			$account = $user;
< 
< 		if ( (((arg(0) == 'blogs')||(arg(0) == 'blog')) && !arg(1)) || (((arg(0) == 'blogs')||(arg(0) == 'blog')) && (arg(1)=='posts')) ) {
< 		$bcontent .= "<ul>";
< 		$bcontent .= "<li>" . l(t("My blog"),'blog/'. $user->name) . "</li>";
< 		$bcontent .= "<li>" . l('Post new blog entry','node/add/blog') . "</li>";
< 		$bcontent .= "<li>Top bloggers </li>";
< 		$query = "SELECT u.name, COUNT(n.uid) AS nposts FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.status=1 AND n.type = 'blog' GROUP BY u.uid  ORDER BY nposts DESC LIMIT " . variable_get('blog_addons_ntopbloggers', 5);
< 		$result = db_query(db_rewrite_sql($query));
< 		$bcontent .= "<ul>";
< 
< 		while ($blogger = db_fetch_object($result)) {
< 			$bcontent .= "<li> " . l($blogger->name,'blog/'.$blogger->name) . "  (" . $blogger->nposts . ") </li>";
< 			}
< 		$more_attr = array("title"=>t("Click for more bloggers"));
< 		$bcontent .= "<li>" . l(t("more ..."), 'blogs/blogs', array('attributes' => $more_attr, 'query' => "&sort=nposts&order=desc")) . "</li>";
< 		$bcontent .= "</ul>";
< 		$bcontent .= "<li>" . l(t("Recent posts"), 'blogs/posts', array('query' => "&sort=date&order=desc")) . "</li>";
< 
< 		$bcontent .= "</ul>";
< 
< 		$block['title'] = t('Blogs');
< 		$block['content'] = $bcontent;
< 		return $block;
< 		}
< 	else {
< 		$query = "SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 AND n.uid = " . $account->uid . " ORDER By n.created DESC ";
< 		$result = db_query(db_rewrite_sql($query));
< 		$bcontent .= "<ul>";
< 		$bcontent .= "<li>" . l($account->name . '\'s home page', 'blog/' . $account->name) . "</li>";
< 		if ($user->uid == $account->uid)
< 			$bcontent .= "<li>" . l('Post new blog entry','node/add/blog') . "</li>";
< 		$bcontent .= "<li> Posts </li>";
< 		$bcontent .= "<ul>";
< 
< 		while ($postdate = db_fetch_object($result)) {
< 			$year = date('Y', $postdate->created);
< 			$month = date('F', $postdate->created);  
< 			$month_numeric = date('m', $postdate->created);  
< 			$day = date('j', $postdate->created);  
< 
< 			if ($year != $lastyear) {
< 				if (isset($lastyear)) 
< 					$bcontent .= "</ul>";
< 				$bcontent .= "<li>" . l($year,'blog/' . $account->name . '/' . $year) . "</li><ul>";
< 				}
< 			if ($month != $lastmonth) {
< 				$limit = " AND YEAR(FROM_UNIXTIME(n.created)) = " . $year;
< 				$limit .= " AND MONTH(FROM_UNIXTIME(n.created)) = " . $month_numeric;
< 				$query = "SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 AND n.uid = " . $account->uid . $limit . " ORDER By n.created DESC ";
< 				$postpermonth =  mysql_num_rows(db_query($query));
< 
< 				$bcontent .= "<li>" . l($month,'blog/' . $account->name . '/' . $year . '/' . $month_numeric)  . " (" . $postpermonth . ") </li>";
< 				$lastmonth = $month;
< 				}
< 
< 			$lastyear = $year;
< 			}
< 
< 		$bcontent .= "</ul>";
< 		$bcontent .= "</ul>";
< 		if ($user->uid != $account->uid) {	
< 			$bcontent .= "<li>" . l(t("My blog"),'blog/'. $user->name) . "</li>";
< 			$bcontent .= "<li>" . l('Post new blog entry','node/add/blog') . "</li>";
< 			}
< 		$bcontent .= "<li>" . l('All blogs', 'blogs') . "</li>";
< 		$bcontent .= "</ul>";
< 		}
---
>   $order = ($attrib['order'] == "desc" || $attrib['order'] == "DESC")?"asc":"desc";                           
>   $sort_attr = array("title"=>t("Click a second time to reverse the sort order"));                            
>   $content .= '<div class="blog_addons-sort">Sort by:'; 
>   $content .= "[".l(t("Date"), $_GET['q'], array('attributes' => $sort_attr, 'query' => "&sort=date&order=$order"));
>   $content .= "]</div> <br> ";               
> 
> //  drupal_set_title(t('Blog posts'));
> 
>   while ($blogentry = db_fetch_object($result))
>   {
>     $content .= node_view(node_load($blogentry->nid),1);
>   }
> 
>   $content .= theme('pager',0,variable_get('blog_addons_nposts', 10));
>   print theme('page',$content);
> }
> 
> 
> function blog_addons_block($op='list', $delta=0 )
> {
>   global $user;
>   if ($op == 'list')
>   {
>    $block[0]['title'] = t('BLOGS');
>    $block[0]['info'] = t('Blog navigation menu');
>    $block[0]['content'] = t('');
>    $block[0]['pages'] = 'blog*';
>    $block[0]['visibility'] = '1';
>    return $block;
>   }
>   else if ($op == 'view')
>   {
>     if (arg(0) == 'blog') 
>     {
>       if (is_numeric(arg(1)))
>         $account = user_load(array('uid' =>  arg(1)));
>       else	 
>         $account = user_load(array('name' =>  arg(1)));
>     }
>     else if (arg(0) == 'node')
>     {
>       if (is_numeric(arg(1)))
>       {
>         $node = node_load(arg(1));
>         if ($node->type == 'blog')
>           $account = user_load(array('uid' =>  $node->uid));
>       }
>     }
> 
>     if (!isset($account->uid))
>       $account = $user;
> 
>     if ( (((arg(0) == 'blogs')||(arg(0) == 'blog')) && !arg(1)) || (((arg(0) == 'blogs')||(arg(0) == 'blog')) && (arg(1)=='posts')) )
>     {
>       $bcontent .= "<ul>";
>       $bcontent .= "<li>" . l(t("My blog"),'blog/'. $user->name) . "</li>";
>       $bcontent .= "<li>" . l('Post new blog entry','node/add/blog') . "</li>";
>       $bcontent .= "<li>Top bloggers </li>";
>       $query = "SELECT u.name, COUNT(n.uid) AS nposts FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.status=1 AND n.type = 'blog' GROUP BY u.uid  ORDER BY nposts DESC LIMIT " . variable_get('blog_addons_ntopbloggers', 5);
>       $result = db_query(db_rewrite_sql($query));
>       $bcontent .= "<ul>";
> 
>       while ($blogger = db_fetch_object($result))
>      {
>        $bcontent .= "<li> " . l($blogger->name,'blog/'.$blogger->name) . "  (" . $blogger->nposts . ") </li>";
>      }
>      $more_attr = array("title"=>t("Click for more bloggers"));
>      $bcontent .= "<li>" . l(t("more ..."), 'blogs/blogs', array('attributes' => $more_attr, 'query' => "&sort=nposts&order=desc")) . "</li>";
>      $bcontent .= "</ul>";
>      $bcontent .= "<li>" . l(t("Recent posts"), 'blogs/posts', array('query' => "&sort=date&order=desc")) . "</li>";
> 
>      $bcontent .= "</ul>";
> 
>      $block['title'] = t('Blogs');
>      $block['content'] = $bcontent;
>      return $block;
>   }
>   else
>   {
>     $query = "SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 AND n.uid = " . $account->uid . " ORDER By n.created DESC ";
>     $result = db_query(db_rewrite_sql($query));
>     $bcontent .= "<ul>";
>     $bcontent .= "<li>" . l($account->name . '\'s home page', 'blog/' . $account->name) . "</li>";
>     if ($user->uid == $account->uid)
>       {	
>       $bcontent .= "<li>" . l('Post new blog entry','node/add/blog') . "</li>";
>       }
>     $bcontent .= "<li> Posts </li>";
>     $bcontent .= "<ul>";
> 
>     while ($postdate = db_fetch_object($result))
>     {
>       $year = date('Y', $postdate->created);
>       $month = date('F', $postdate->created);  
>       $month_numeric = date('m', $postdate->created);  
>       $day = date('j', $postdate->created);  
> 
>       if ($year != $lastyear)
>       {
>         if (isset($lastyear)) 
> 	  $bcontent .= "</ul>";
>        $bcontent .= "<li>" . l($year,'blog/' . $account->name . '/' . $year)  . "</li><ul>";
>       }
>       if ($month != $lastmonth)
>       {
>         $limit = " AND YEAR(FROM_UNIXTIME(n.created)) = " . $year;
>         $limit .= " AND MONTH(FROM_UNIXTIME(n.created)) = " . $month_numeric;
>         $query = "SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 AND n.uid = " . $account->uid . $limit . " ORDER By n.created DESC ";
>         $postpermonth =  mysql_num_rows(db_query($query));
> 
>         $bcontent .= "<li>" . l($month,'blog/' . $account->name . '/' . $year . '/' . $month_numeric)  . " (" . $postpermonth . ") </li>";
> 	$lastmonth = $month;
>       }
> 
>       $lastyear = $year;
>     }
> 
>     $bcontent .= "</ul>";
>     $bcontent .= "</ul>";
>     if ($user->uid != $account->uid)
>       {	
>       $bcontent .= "<li>" . l(t("My blog"),'blog/'. $user->name) . "</li>";
>       $bcontent .= "<li>" . l('Post new blog entry','node/add/blog') . "</li>";
>       }
>     $bcontent .= "<li>" . l('All blogs', 'blogs') . "</li>";
>     $bcontent .= "</ul>";
>     }
324,373c341,397
< 	$block['title'] = t($account->name . '\'s blog');
< 	$block['content'] = $bcontent;
< 	return $block;
< 
< 	}
< 	}
< 
< 
< function blog_addons_page($year = NULL, $month = NULL, $day = NULL, $user) {
< 	//global $pager_total_items;
< 	$pager_attrib = array("sort" => variable_get('blog_addons_sort', 'date'), 'order' => variable_get('blog_addons_order', 'DESC'));    
< 
< 	$pager_attrib = array("sort" => variable_get('blog_addons_sort', 'date'), 'order' => variable_get('blog_addons_order', 'DESC'));    
< 
< 	if (isset($_GET['order'])) {
<  		$pager_attrib['order'] = ($_GET['order'] == 'desc') ? 'desc' : 'asc'; 
< 		}
< 
<  	if (isset($_GET['sort'])) {
<     		switch($_GET['sort']) {
<     			case 'date':
<       				$pager_attrib['sort'] = ($_GET['sort'] == 'date') ? 'date' : 'date';
<       				break;
<     			case 'title':
<       				$pager_attrib['sort'] = ($_GET['sort'] == 'title') ? 'title' : 'title';
<       				break;
<     			default:
<       				$pager_attrib['sort'] =  'date'; 
<     				break;
<    			}
<  		}
< 
<   	switch ($pager_attrib['sort']) {
<         	case 'date':
<           		$sortby = " ORDER BY n.created " . $pager_attrib['order'] . " ";
<         		break; 
<         	case 'title':
<           		$sortby = " ORDER BY n.title " . $pager_attrib['order'] . " ";
<         		break; 
<         	default:                                 
<         		$sortby = " ORDER By n.created ASC ";
<         		break;
<   		} //end switch     
< 
< 
< 	if ($year) {
< 		$title = $user . "'s blog entries posted on " ;
<    		if($day) {
<        		$title .= $day . '/';
<        		} 
---
>   $block['title'] = t($account->name . '\'s blog');
>   $block['content'] = $bcontent;
>   return $block;
>   }
> 
> 
> }
> 
> 
> function blog_addons_page($year = NULL, $month = NULL, $day = NULL, $user)
> {
> //global $pager_total_items;
> $pager_attrib = array("sort" => variable_get('blog_addons_sort', 'date'), 'order' => variable_get('blog_addons_order', 'DESC'));    
> 
> $pager_attrib = array("sort" => variable_get('blog_addons_sort', 'date'), 'order' => variable_get('blog_addons_order', 'DESC'));    
> 
> if (isset($_GET['order']))
> {
>  $pager_attrib['order'] = ($_GET['order'] == 'desc') ? 'desc' : 'asc'; 
> }
> 
>  if (isset($_GET['sort']))
>   {
>     switch($_GET['sort'])
>   {
>     case 'date':
>       $pager_attrib['sort'] = ($_GET['sort'] == 'date') ? 'date' : 'date';
>       break;
>     case 'title':
>       $pager_attrib['sort'] = ($_GET['sort'] == 'title') ? 'title' : 'title';
>       break;
>     default:
>       $pager_attrib['sort'] =  'date'; 
>     break;
>    }
>  }       
> 
>   switch ($pager_attrib['sort']) {
>         case 'date':
>           $sortby = " ORDER BY n.created " . $pager_attrib['order'] . " ";
>         break; 
>         case 'title':
>           $sortby = " ORDER BY n.title " . $pager_attrib['order'] . " ";
>         break; 
>         default:                                 
>         $sortby = " ORDER By n.created ASC ";
>         break;
>   } //end switch     
> 
> 
> if ($year)
>   {
>   $title = $user . "'s blog entries posted on " ;
>    if($day)
>       {
>        $title .= $day . '/';
>        } 
375,404c399,426
<   	if($month) {
<      	$title .=  $month . '/';
<     	} 
<   	$title .= $year;
< 	}
< 
< 	//drupal_set_title($title);
< 
<    	if (is_numeric($user))
<      	$tempuser = user_load(array('uid' =>  $user));
<    	else	 
<      	$tempuser = user_load(array('name' => $user));
< 
< 	if ($tempuser->uid != '') {
< 		if ($year) 
<  		$limit = " AND YEAR(FROM_UNIXTIME(n.created)) = " . $year;
< 		if (is_numeric($month)) 
<  			$limit .= " AND MONTH(FROM_UNIXTIME(n.created)) = " . $month;
< 		if (is_numeric($day)) 
<  			$limit .= " AND DAY(FROM_UNIXTIME(n.created)) = " . $day;
< 
< 		$query = "SELECT n.nid, n.created, YEAR(FROM_UNIXTIME(n.created)) AS year, MONTH(FROM_UNIXTIME(n.created)) AS month, DAY(FROM_UNIXTIME(n.created)) AS day FROM {node} n WHERE n.type = 'blog' AND n.status = 1  AND n.uid = " . $tempuser->uid . " " . $limit .  $sortby;
< 
<  		$result = pager_query($query,variable_get('blog_addons_nposts_userhomepage', 20));
< 		blog_addons_page_results($result,$pager_attrib);
< 		}
< 	else {
< 		print theme('page',"No such blogger.");
< 		}
< 	}    
---
>   if($month)
>     {
>      $title .=  $month . '/';
>     } 
>   $title .= $year;
> 
> }
> //drupal_set_title($title);
> 
>    if (is_numeric($user))
>      $tempuser = user_load(array('uid' =>  $user));
>    else	 
>      $tempuser = user_load(array('name' => $user));
> 
> if ($year) 
>  $limit = " AND YEAR(FROM_UNIXTIME(n.created)) = " . $year;
> if (is_numeric($month)) 
>  $limit .= " AND MONTH(FROM_UNIXTIME(n.created)) = " . $month;
> if (is_numeric($day)) 
>  $limit .= " AND DAY(FROM_UNIXTIME(n.created)) = " . $day;
> 
> $query = "SELECT n.nid, n.created, YEAR(FROM_UNIXTIME(n.created)) AS year, MONTH(FROM_UNIXTIME(n.created)) AS month, DAY(FROM_UNIXTIME(n.created)) AS day FROM {node} n WHERE n.type = 'blog' AND n.status = 1  AND n.uid = " . $tempuser->uid . " " . $limit .  $sortby;
> 
>  $result = pager_query($query,variable_get('blog_addons_nposts_userhomepage', 20));
> 
> blog_addons_page_results($result,$pager_attrib);
> 
> }    
406,435c428,457
< function blog_addons_page_results($result, $attrib = array("sort" => 'title', 'order' => 'ASC')) {
< 	$order = ($attrib['order'] == "desc" || $attrib['order'] == "DESC")?"asc":"desc";                           
<    	$sort_attr = array("title"=>t("Click a second time to reverse the sort order"));                            
<    	$output .= '<div class="blog_addons-sort">Sort by:'; 
<    	$output .= "[".l(t("Title"), $_GET['q'], array('attributes' => $sort_attr, 'query' => "&sort=title&order=$order"));
<    	$output .= "][".l(t("Date"), $_GET['q'], array('attributes' => $sort_attr, 'query' => "&sort=date&order=$order"));
<    	$output .= "]</div><br> ";               
< 
< 	$output .= "<ul>";
< 	while ($postdate = db_fetch_object($result)) {
< 		$month = date('F', $postdate->created);
< 		$node  = node_load($postdate->nid);
< 		$output .= "<li>" . l($node->title,'node/' . $node->nid) . ' - ' .   $month . ' ' . $postdate->day . '., ' . $postdate->year .  "</li>";
< 		}
< 	$output .= "</ul>";
< 	$output .= theme('pager',0,variable_get('blog_addons_nposts_userhomepage', 20));
< 	print theme('page',$output);
< 	}
< 
< 
< function blog_addons_user_page_title($user) {
< 	if (is_numeric($user))
<     	$tempuser = user_load(array('uid' =>  $user));
<    	else	 
<     	$tempuser = user_load(array('name' => $user));
< 
< 	if ($tempuser->name != '') 
< 		$title = $tempuser->name . "'s blog";
< 	else
< 		$title = "No such blogger";
---
> function blog_addons_page_results($result, $attrib = array("sort" => 'title', 'order' => 'ASC'))
> {
>    $order = ($attrib['order'] == "desc" || $attrib['order'] == "DESC")?"asc":"desc";                           
>    $sort_attr = array("title"=>t("Click a second time to reverse the sort order"));                            
>    $output .= '<div class="blog_addons-sort">Sort by:'; 
>    $output .= "[".l(t("Title"), $_GET['q'], array('attributes' => $sort_attr, 'query' => "&sort=title&order=$order"));
>    $output .= "][".l(t("Date"), $_GET['q'], array('attributes' => $sort_attr, 'query' => "&sort=date&order=$order"));
>    $output .= "]</div><br> ";               
> 
> $output .= "<ul>";
> while ($postdate = db_fetch_object($result))
> {
> $month = date('F', $postdate->created);
> $node  = node_load($postdate->nid);
> $output .= "<li>" . l($node->title,'node/' . $node->nid) . ' - ' .   $month . ' ' . $postdate->day . '., ' . $postdate->year .  "</li>";
> }
> $output .= "</ul>";
> $output .= theme('pager',0,variable_get('blog_addons_nposts_userhomepage', 20));
> print theme('page',$output);
> }
> 
> 
> function blog_addons_user_page_title($user)
> {
>    if (is_numeric($user))
>      $tempuser = user_load(array('uid' =>  $user));
>    else	 
>      $tempuser = user_load(array('name' => $user));
> 
> $title = $tempuser->name . "'s blog";
437c459
< 	return $title;
---
> return $title;
445c467,469
< function blog_addons_settings() { 
---
> function blog_addons_settings() 
> { 
> 
482a507
> 
484a510
>