appification of the pdl editor and move advanced_theming to theme settings where it belongs

2 files changed, 16 insertions, 15 deletions

diff --git a/Zotlabs/Module/Pdledit.php b/Zotlabs/Module/Pdledit.php
index 9b86b599b..d0bde7715 100644
--- a/Zotlabs/Module/Pdledit.php
+++ b/Zotlabs/Module/Pdledit.php
@@ -1,15 +1,20 @@
 <?php
 namespace Zotlabs\Module;
 
+use App;
+use Zotlabs\Web\Controller;
+use Zotlabs\Lib\Apps;
 
-class Pdledit extends \Zotlabs\Web\Controller {
+class Pdledit extends Controller {
 
 	function post() {
 		if(! local_channel())
 			return;
-		if(! $_REQUEST['module'])
+
+		if(! Apps::system_app_installed(local_channel(), 'PDL Editor'))
 			return;
-		if(! feature_enabled(local_channel(),'advanced_theming'))
+
+		if(! $_REQUEST['module'])
 			return;
 
 		if(! trim($_REQUEST['content'])) {
@@ -30,9 +35,13 @@ class Pdledit extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		if(! feature_enabled(local_channel(),'advanced_theming')) {
-			notice( t('Feature disabled.') . EOL);
-			return;
+		if(! Apps::system_app_installed(local_channel(), 'PDL Editor')) {
+			//Do not display any associated widgets at this point
+			App::$pdl = '';
+
+			$o = '<b>PDL Editor App (Not Installed):</b><br>';
+			$o .= t('Provides the ability to edit system page layouts');
+			return $o;
 		}
 
 		if(argc() > 2 && argv(2) === 'reset') {
diff --git a/Zotlabs/Module/Settings/Display.php b/Zotlabs/Module/Settings/Display.php
index d35c54a90..0c63a3056 100644
--- a/Zotlabs/Module/Settings/Display.php
+++ b/Zotlabs/Module/Settings/Display.php
@@ -31,7 +31,6 @@ class Display {
 		$network_list_mode = ((x($_POST,'network_list_mode')) ? intval($_POST['network_list_mode']) : 0);
 		$manual_update     = ((array_key_exists('manual_update',$_POST)) ? intval($_POST['manual_update']) : 0);
 		$start_menu        = ((x($_POST,'start_menu')) ? intval($_POST['start_menu']) : 0);
-		$advanced_theming  = ((x($_POST,'advanced_theming')) ? intval($_POST['advanced_theming']) : 0);
 
 		$channel_divmore_height = ((x($_POST,'channel_divmore_height')) ? intval($_POST['channel_divmore_height']) : 400);
 		if($channel_divmore_height < 50)
@@ -63,7 +62,6 @@ class Display {
 		set_pconfig(local_channel(),'system','manual_conversation_update', $manual_update);
 		set_pconfig(local_channel(),'system','channel_menu', $channel_menu);
 		set_pconfig(local_channel(),'system','start_menu', $start_menu);
-		set_pconfig(local_channel(),'system','advanced_theming', $advanced_theming);
 
 		$newschema = '';
 		if($theme){
@@ -181,8 +179,6 @@ class Display {
 		$title_tosource = get_pconfig(local_channel(),'system','title_tosource');
 		$title_tosource = (($title_tosource===false)? '0': $title_tosource); // default if not set: 0
 
-		$advanced_theming = get_pconfig(local_channel(),'system','advanced_theming', 0);
-
 		$theme_config = "";
 		if(($themeconfigfile = $this->get_theme_config_file($theme)) != null){
 			require_once($themeconfigfile);
@@ -218,16 +214,12 @@ class Display {
 			'$channel_menu' => [ 'channel_menu', t('Provide channel menu in navigation bar'), get_pconfig(local_channel(),'system','channel_menu',get_config('system','channel_menu',0)), t('Default: channel menu located in app menu'),$yes_no ],
 			'$manual_update'	=> array('manual_update', t('Manual conversation updates'), channel_manual_conv_update(local_channel()), t('Default is on, turning this off may increase screen jumping'), $yes_no),
 			'$title_tosource'	=> array('title_tosource', t("Link post titles to source"), $title_tosource, '', $yes_no),
-			'$layout_editor' => t('System Page Layout Editor - (advanced)'),
 			'$theme_config' => $theme_config,
-			'$expert' => $advanced_theming,
 			'$channel_list_mode' => array('channel_list_mode', t('Use blog/list mode on channel page'), get_pconfig(local_channel(),'system','channel_list_mode'), t('(comments displayed separately)'), $yes_no),
 			'$network_list_mode' => array('network_list_mode', t('Use blog/list mode on grid page'), get_pconfig(local_channel(),'system','network_list_mode'), t('(comments displayed separately)'), $yes_no),
 			'$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','channel_divmore_height')) ? get_pconfig(local_channel(),'system','channel_divmore_height') : 400), t('click to expand content exceeding this height')),
 			'$network_divmore_height' => array('network_divmore_height', t('Grid page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','network_divmore_height')) ? get_pconfig(local_channel(),'system','network_divmore_height') : 400) , t('click to expand content exceeding this height')),
-			'$start_menu' => ['start_menu', t('New Member Links'), $start_menu, t('Display new member quick links menu'), $yes_no],
-			'$advanced_theming' => ['advanced_theming', t('Advanced Theme and Layout Settings'), $advanced_theming, t('Allows fine tuning of themes and page layouts'), $yes_no]
-
+			'$start_menu' => ['start_menu', t('New Member Links'), $start_menu, t('Display new member quick links menu'), $yes_no]
 		));
 
 		call_hooks('display_settings',$o);