Merge pull request #986 from greezybacon/issue/959

Fix a couple issues on page management

Reviewed-By: Peter Rotich <peter@osticket.com>

include/i18n/en_US/help/tips/manage.pages.yaml

@@ -21,7 +21,7 @@ site_pages:
         configure them in the company settings and help topics.
     links:
       - title: Company Settings
-        href: /scp/settings?t=pages
+        href: /scp/settings.php?t=pages
 
 type:
     title: Type

include/staff/pages.inc.php

@@ -5,8 +5,8 @@ $qstr='';
 $sql='SELECT page.id, page.isactive, page.name, page.created, page.updated, '
      .'page.type, count(topic.topic_id) as topics '
      .' FROM '.PAGE_TABLE.' page '
-     .' LEFT JOIN '.TOPIC_TABLE.' topic ON(topic.page_id=page.id) '
-     .' WHERE type in ("other","landing","thank-you","offline") ';
+     .' LEFT JOIN '.TOPIC_TABLE.' topic ON(topic.page_id=page.id) ';
+$where = ' WHERE type in ("other","landing","thank-you","offline") ';
 $sortOptions=array(
         'name'=>'page.name', 'status'=>'page.isactive',
         'created'=>'page.created', 'updated'=>'page.updated',
@@ -33,13 +33,13 @@ $x=$sort.'_sort';
 $$x=' class="'.strtolower($order).'" ';
 $order_by="$order_column $order ";
 
-$total=db_count('SELECT count(*) FROM '.PAGE_TABLE.' page ');
+$total=db_count('SELECT count(*) FROM '.PAGE_TABLE.' page '.$where);
 $page=($_GET['p'] && is_numeric($_GET['p']))?$_GET['p']:1;
 $pageNav=new Pagenate($total, $page, PAGE_LIMIT);
 $pageNav->setURL('pages.php',$qstr.'&sort='.urlencode($_REQUEST['sort']).'&order='.urlencode($_REQUEST['order']));
 //Ok..lets roll...create the actual query
 $qstr.='&order='.($order=='DESC'?'ASC':'DESC');
-$query="$sql GROUP BY page.id ORDER BY $order_by LIMIT ".$pageNav->getStart().",".$pageNav->getLimit();
+$query="$sql $where GROUP BY page.id ORDER BY $order_by LIMIT ".$pageNav->getStart().",".$pageNav->getLimit();
 $res=db_query($query);
 if($res && ($num=db_num_rows($res)))
     $showing=$pageNav->showing();