Merge lp:~leeturner/quam-plures/xmlrpc_off into lp:quam-plures

[Lee Turner]

http://forums.quamplures.net/viewtopic.php?f=11&t=1167

Allows you to enable or disable each of the xml-rpc API individually.

[EdB (edb)]

Move the new section down below "Notifications", PLEASE!

That page was alphabetized after figuring out there really doesn't seem to be a 'best order' is the reason. Can't see why we would go away from that ... unless a 'best order' really does show up one day.

[lp:~leeturner/quam-plures/xmlrpc_off]

7643. By Lee Turner <email address hidden> on 2012-07-23

moved the remote publishing settings to the correct place in the settings screen

[Lee Turner (leeturner)]

Never realised it was alphabetical until you mentioned it. Obvious now I look :-)

Now moved to the correct place.

[EdB (edb)]

:)

review: Approve

=== modified file 'qp_inc/settings/settings.ctrl.php'
--- qp_inc/settings/settings.ctrl.php	2011-01-09 17:19:59 +0000
+++ qp_inc/settings/settings.ctrl.php	2012-07-23 07:49:20 +0000
@@ -86,6 +86,10 @@
 			*/
 
 			$Settings->delete_array( array(
+					'general_xmlrpc_b2',
+					'general_xmlrpc_blogger',
+					'general_xmlrpc_metaweblog',
+					'general_xmlrpc_mt',
 					'outbound_notifications_mode',
 					'eblog_enabled',
 					'eblog_method',
@@ -134,6 +138,19 @@
 		}
 		else
 		{
+			// Remote publishing
+ 			param( 'general_xmlrpc_b2', 'boolean', 0 );
+			$Settings->set( 'general_xmlrpc_b2',  $general_xmlrpc_b2 );
+
+ 			param( 'general_xmlrpc_blogger', 'boolean', 0 );
+			$Settings->set( 'general_xmlrpc_blogger',  $general_xmlrpc_blogger );
+
+ 			param( 'general_xmlrpc_metaweblog', 'boolean', 0 );
+			$Settings->set( 'general_xmlrpc_metaweblog',  $general_xmlrpc_metaweblog );
+
+ 			param( 'general_xmlrpc_mt', 'boolean', 0 );
+			$Settings->set( 'general_xmlrpc_mt',  $general_xmlrpc_mt );
+
 			// After each new post...
  			param( 'outbound_notifications_mode', 'string', true );
 			$Settings->set( 'outbound_notifications_mode',  get_param('outbound_notifications_mode') );
 
=== modified file 'qp_inc/settings/views/_general.form.php'
--- qp_inc/settings/views/_general.form.php	2011-03-31 22:48:44 +0000
+++ qp_inc/settings/views/_general.form.php	2012-07-23 07:49:20 +0000
@@ -199,6 +199,15 @@
 
 // --------------------------------------------
 
+$Form->begin_fieldset( get_manual_link('remote_publishing').T_('Remote publishing') );
+	$Form->checkbox_input( 'general_xmlrpc_b2', $Settings->get('general_xmlrpc_b2'), T_('Enable B2'), array( 'note' => T_('Enable the B2 XML-RPC publishing protocol.') ) );
+	$Form->checkbox_input( 'general_xmlrpc_blogger', $Settings->get('general_xmlrpc_blogger'), T_('Enable Blogger'), array( 'note' => T_('Enable the Blogger XML-RPC publishing protocol.') ) );
+	$Form->checkbox_input( 'general_xmlrpc_metaweblog', $Settings->get('general_xmlrpc_metaweblog'), T_('Enable MetaWeblog'), array( 'note' => T_('Enable the MetaWeblog XML-RPC publishing protocol.') ) );
+	$Form->checkbox_input( 'general_xmlrpc_mt', $Settings->get('general_xmlrpc_mt'), T_('Enable Movable Type'), array( 'note' => T_('Enable the Movable Type XML-RPC publishing protocol.') ) );
+$Form->end_fieldset();
+
+// --------------------------------------------
+
 $Form->begin_fieldset( get_manual_link( 'security-options' ).T_('Security options') );
 	$Form->text_input( 'user_minpwdlen', (int)$Settings->get( 'user_minpwdlen' ), 2, T_('Minimum password length'), T_('characters.'), array( 'maxlength'=>2, 'required'=>true ) );
 	$Form->checkbox_input( 'js_passwd_hashing', (bool)$Settings->get( 'js_passwd_hashing' ), T_('Login password hashing'), array( 'note'=>T_('Check to enable the login form to hash the password with Javascript before transmitting it. This provides extra security on non-SSL connections.')) );
 
=== modified file 'qp_inc/xmlrpc/apis/_b2.api.php'
--- qp_inc/xmlrpc/apis/_b2.api.php	2010-12-31 12:12:03 +0000
+++ qp_inc/xmlrpc/apis/_b2.api.php	2012-07-23 07:49:20 +0000
@@ -13,6 +13,12 @@
  */
 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
 
+if( ! $Settings->get('general_xmlrpc_b2') )
+{	// We cannot use XML-RPC: send an error response ( "17 Internal server error" ).
+	$errMessage = 'The B2 XML-RPC service is disabled on this system.';
+	$errResponse = new xmlrpcresp( 0, 17, $errMessage );
+	die( $errResponse->serialize() );
+}
 
 $b2newpost_doc='Adds a post, blogger-api like, +title +category +postdate';
 $b2newpost_sig = array(array($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcBoolean, $xmlrpcString, $xmlrpcString, $xmlrpcString));
 
=== modified file 'qp_inc/xmlrpc/apis/_blogger.api.php'
--- qp_inc/xmlrpc/apis/_blogger.api.php	2010-12-31 12:12:03 +0000
+++ qp_inc/xmlrpc/apis/_blogger.api.php	2012-07-23 07:49:20 +0000
@@ -15,6 +15,12 @@
  */
 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
 
+if( ! $Settings->get('general_xmlrpc_blogger') )
+{	// We cannot use XML-RPC: send an error response ( "17 Internal server error" ).
+	$errMessage = 'The Blogger XML-RPC service is disabled on this system.';
+	$errResponse = new xmlrpcresp( 0, 17, $errMessage );
+	die( $errResponse->serialize() );
+}
 
 $bloggernewpost_doc = 'Adds a post, blogger-api like';
 $bloggernewpost_sig = array(array($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcBoolean));
 
=== modified file 'qp_inc/xmlrpc/apis/_metaweblog.api.php'
--- qp_inc/xmlrpc/apis/_metaweblog.api.php	2010-12-31 12:12:03 +0000
+++ qp_inc/xmlrpc/apis/_metaweblog.api.php	2012-07-23 07:49:20 +0000
@@ -16,6 +16,12 @@
  */
 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
 
+if( ! $Settings->get('general_xmlrpc_metaweblog') )
+{	// We cannot use XML-RPC: send an error response ( "17 Internal server error" ).
+	$errMessage = 'The Metaweblog XML-RPC service is disabled on this system.';
+	$errResponse = new xmlrpcresp( 0, 17, $errMessage );
+	die( $errResponse->serialize() );
+}
 
 /**
  * Decode the dateCreated
 
=== modified file 'qp_inc/xmlrpc/apis/_mt.api.php'
--- qp_inc/xmlrpc/apis/_mt.api.php	2010-12-31 12:12:03 +0000
+++ qp_inc/xmlrpc/apis/_mt.api.php	2012-07-23 07:49:20 +0000
@@ -17,7 +17,12 @@
  */
 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
 
-
+if( ! $Settings->get('general_xmlrpc_mt') )
+{	// We cannot use XML-RPC: send an error response ( "17 Internal server error" ).
+	$errMessage = 'The Movable Type XML-RPC service is disabled on this system.';
+	$errResponse = new xmlrpcresp( 0, 17, $errMessage );
+	die( $errResponse->serialize() );
+}
 
 $mt_setPostCategories_sig = array(array($xmlrpcBoolean, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcArray));
 $mt_setPostCategories_doc = 'Sets the categories for a post.';
 
=== modified file 'qp_srvc/rsd.php'
--- qp_srvc/rsd.php	2010-12-31 12:12:03 +0000
+++ qp_srvc/rsd.php	2012-07-23 07:49:20 +0000
@@ -37,20 +37,28 @@
 	  <engineLink><?php echo $app_homepage; ?></engineLink>
 	  <homePageLink><?php echo $app_baseurl; ?></homePageLink>
 	  <apis>
-	    <api name="MetaWeblog" preferred="true" apiLink="<?php echo $srvc_url; ?>xmlrpc.php"<?php
+	  	<?php if( $Settings->get('general_xmlrpc_metaweblog') )
+	  	{?>
+		<api name="MetaWeblog" preferred="true" apiLink="<?php echo $srvc_url; ?>xmlrpc.php"<?php
 	    	if( !empty($blog) ) { echo ' blogID="'.$blog.'"'; }
 	    	?>>
 				<settings>
 					<docs>http://manual.b2evolution.net/MetaWeblog_API</docs>
 				</settings>
 			</api>
-	    <api name="MovableType" preferred="false" apiLink="<?php echo $srvc_url; ?>xmlrpc.php"<?php
+		<?}?>
+	  	<?php if( $Settings->get('general_xmlrpc_mt') )
+	  	{?>
+		<api name="MovableType" preferred="false" apiLink="<?php echo $srvc_url; ?>xmlrpc.php"<?php
 	    	if( !empty($blog) ) { echo ' blogID="'.$blog.'"'; }
 	    	?>>
 				<settings>
 					<docs>http://manual.b2evolution.net/MovableType_API</docs>
 				</settings>
 			</api>
+		<?}?>
+	  	<?php if( $Settings->get('general_xmlrpc_blogger') )
+	  	{?>
 	    <api name="Blogger" preferred="false" apiLink="<?php echo $srvc_url; ?>xmlrpc.php"<?php
 	    	if( !empty($blog) ) { echo ' blogID="'.$blog.'"'; }
 	    	?>>
@@ -58,6 +66,9 @@
 					<docs>http://manual.b2evolution.net/Blogger_API</docs>
 				</settings>
 			</api>
+		<?}?>
+	  	<?php if( $Settings->get('general_xmlrpc_b2') )
+	  	{?>
 	    <api name="b2" preferred="false" apiLink="<?php echo $srvc_url; ?>xmlrpc.php"<?php
 	    	if( !empty($blog) ) { echo ' blogID="'.$blog.'"'; }
 	    	?>>
@@ -65,6 +76,7 @@
 					<docs>http://manual.b2evolution.net/B2_API</docs>
 				</settings>
 			</api>
+		<?}?>
 	  </apis>
 	</service>
 </rsd>
 
=== modified file 'qp_srvc/xmlrpc.php'
--- qp_srvc/xmlrpc.php	2010-12-31 12:12:03 +0000
+++ qp_srvc/xmlrpc.php	2012-07-23 07:49:20 +0000
@@ -41,7 +41,6 @@
 	die( $errResponse->serialize() );
 }
 
-
 // We can't display standard error messages. We must return XMLRPC responses.
 $DB->halt_on_error = false;
 $DB->show_errors = false;