Add perPage settings into config

diff --git a/ChangeLog b/ChangeLog
index 8886a1c92c3c914fdb70b137bd47b37b52b4a4d4..2d10757d3a6dbbe3cd86d5daea234b7c20c11910 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-20  Justin J. Novack  <jnovack@gmail.com>
+
+       * Add perPage settings into config
+

 2013-08-20  Christian Weiske  <cweiske@cweiske.de>
 
        * Fix bug #41: AGPL link broken
 2013-08-20  Christian Weiske  <cweiske@cweiske.de>
 
        * Fix bug #41: AGPL link broken

diff --git a/data/config.default.php b/data/config.default.php
index 009b572353a70e7170918659d4696236307049c3..7e6ebb94582e9e6caf9558c8860879bb04ba8202 100644 (file)
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -12,7 +12,8 @@ $GLOBALS['phorkie']['cfg'] = array(
     'setupcheck'    => true,
     'elasticsearch' => null,
     'geshi'         => 'MediaWiki/geshi/geshi/geshi.php',
     'setupcheck'    => true,
     'elasticsearch' => null,
     'geshi'         => 'MediaWiki/geshi/geshi/geshi.php',

-    'index'         => 'new'//"new" or "list"
+    'index'         => 'new',//"new" or "list"
+    'perPage'       => 10,

 );
 $GLOBALS['phorkie']['auth'] = array(
     // 0 = public, no authentication, 1 = protect adds/edits/deletes,
 );
 $GLOBALS['phorkie']['auth'] = array(
     // 0 = public, no authentication, 1 = protect adds/edits/deletes,

diff --git a/data/config.php.dist b/data/config.php.dist
index 77d20059abc1016a192ffebe110ebf4f13b570d0..81ffdbe3be2e278f7e222711c2ccbf0d16cbe8d2 100644 (file)
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -6,6 +6,7 @@
 //$GLOBALS['phorkie']['cfg']['git']['private'] = 'ssh://git@bogo:paste/';
 //$GLOBALS['phorkie']['cfg']['elasticsearch'] = 'http://localhost:9200/phorkie/';
 //$GLOBALS['phorkie']['cfg']['setupcheck'] = false;
 //$GLOBALS['phorkie']['cfg']['git']['private'] = 'ssh://git@bogo:paste/';
 //$GLOBALS['phorkie']['cfg']['elasticsearch'] = 'http://localhost:9200/phorkie/';
 //$GLOBALS['phorkie']['cfg']['setupcheck'] = false;

+//$GLOBALS['phorkie']['cfg']['perPage'] = 10;

 
 //$GLOBALS['phorkie']['auth']['securityLevel'] = 0;
 //$GLOBALS['phorkie']['auth']['listedUsersOnly'] = false;
 
 //$GLOBALS['phorkie']['auth']['securityLevel'] = 0;
 //$GLOBALS['phorkie']['auth']['listedUsersOnly'] = false;

diff --git a/www/list.php b/www/list.php
index 1ff8a87d68f462a7eca8f28a67bae0d9c6f05622..88ad31dc66a20f7e3cef0fd00d558ecee0019fd8 100644 (file)
--- a/www/list.php
+++ b/www/list.php
@@ -15,7 +15,7 @@ if (isset($_GET['page'])) {
     $page = (int)$_GET['page'] - 1;
 }
 
     $page = (int)$_GET['page'] - 1;
 }
 

-$perPage = 10;
+$perPage = $GLOBALS['phorkie']['cfg']['perPage'];

 list($repos, $repoCount) = $rs->getList($page, $perPage);
 
 $pager = new Html_Pager(
 list($repos, $repoCount) = $rs->getList($page, $perPage);
 
 $pager = new Html_Pager(

diff --git a/www/search.php b/www/search.php
index 2f2de2e6465e6eaa8514f1f222759c40d58ed818..82b40a7bad75ea36b332bad5e3d215dccc697196 100644 (file)
--- a/www/search.php
+++ b/www/search.php
@@ -20,7 +20,7 @@ if (isset($_GET['page'])) {
     //PEAR Pager begins at 1
     $page = (int)$_GET['page'] - 1;
 }
     //PEAR Pager begins at 1
     $page = (int)$_GET['page'] - 1;
 }

-$perPage = 10;
+$perPage = $GLOBALS['phorkie']['cfg']['perPage'];

 
 $db     = new Database();
 $search = $db->getSearch();
 
 $db     = new Database();
 $search = $db->getSearch();