From 75fc3a8cebbf727b708ae164e0f4208cb3072b95 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 7 Sep 2014 19:16:48 -0700
Subject: for webpages, hide the mimetype selector unless in advanced mode. For
 pages that endless scroll and show blocky-block things, set the default
 items-per-page to 60. Why? It fits column-widths of 2,3,4,5,6,10,12,15, and
 20 without leaving remaindered items dangling at the end. No other setting
 less than 100 has this much versatility.

---
 mod/directory.php |  2 +-
 mod/dirsearch.php |  4 ++--
 mod/photos.php    |  4 ++--
 mod/webpages.php  | 13 +++++++++----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/mod/directory.php b/mod/directory.php
index d6dc8627c..3d7632ec0 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -5,7 +5,7 @@ require_once('include/widgets.php');
 
 
 function directory_init(&$a) {
-	$a->set_pager_itemspage(80);
+	$a->set_pager_itemspage(60);
 
 }
 
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index e292553ad..d8f611e6a 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -4,7 +4,7 @@ require_once('include/dir_fns.php');
 
 
 function dirsearch_init(&$a) {
-	$a->set_pager_itemspage(80);
+	$a->set_pager_itemspage(60);
 
 }
 
@@ -122,7 +122,7 @@ function dirsearch_content(&$a) {
 	}
 
 
-    $perpage      = (($_REQUEST['n'])              ? $_REQUEST['n']                    : 80);
+    $perpage      = (($_REQUEST['n'])              ? $_REQUEST['n']                    : 60);
     $page         = (($_REQUEST['p'])              ? intval($_REQUEST['p'] - 1)        : 0);
     $startrec     = (($page+1) * $perpage) - $perpage;
 	$limit        = (($_REQUEST['limit'])          ? intval($_REQUEST['limit'])        : 0);
diff --git a/mod/photos.php b/mod/photos.php
index 5618ae4e6..70870a33a 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -635,7 +635,7 @@ function photos_content(&$a) {
 		);
 		if(count($r)) {
 			$a->set_pager_total(count($r));
-			$a->set_pager_itemspage(40);
+			$a->set_pager_itemspage(60);
 		}
 
 		if($_GET['order'] === 'posted')
@@ -1156,7 +1156,7 @@ function photos_content(&$a) {
 	);
 	if(count($r)) {
 		$a->set_pager_total(count($r));
-		$a->set_pager_itemspage(20);
+		$a->set_pager_itemspage(60);
 	}
 
 	$r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo`
diff --git a/mod/webpages.php b/mod/webpages.php
index bfa2ebd7d..1b906a97f 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -46,11 +46,16 @@ function webpages_content(&$a) {
 //		}
 
 
-	$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_config('system','page_mimetype'));
-	if(! $mimetype)
-		$mimetype = 'choose';
+	if(feature_enabled($owner,'expert_mode')) {
+		$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
+		if(! $mimetype)
+			$mimetype = 'choose';	
+	}
+	else {
+		$mimetype = 'text/bbcode';
+	}
 
-	$layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_config('system','page_layout'));
+	$layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout'));
 	if(! $layout)
 		$layout = 'choose';
 
-- 
cgit v1.2.3