Switching from "new share" to "old share"

htconfig.php

@@ -92,5 +92,5 @@ $a->config['system']['lockpath'] = "";
 // If enabled, the MyBB fulltext engine is used
 // $a->config['system']['use_fulltext_engine'] = true;
 
-// Use the new "share" element
-// $a->config['system']['new_share'] = true;
+// Use the old style "share"
+// $a->config['system']['old_share'] = false;

include/api.php

@@ -984,7 +984,7 @@
 		);
 
 		if ($r[0]['body'] != "") {
-			if (intval(get_config('system','new_share'))) {
+			if (!intval(get_config('system','old_share'))) {
 				$post = "[share author='".str_replace("'", "'", $r[0]['reply_author']).
 						"' profile='".$r[0]['reply_url'].
 						"' avatar='".$r[0]['reply_photo'].

include/diaspora.php

@@ -1040,7 +1040,7 @@ function diaspora_reshare($importer,$xml,$msg) {
 	$datarray['owner-name'] = $contact['name'];
 	$datarray['owner-link'] = $contact['url'];
 	$datarray['owner-avatar'] = ((x($contact,'thumb')) ? $contact['thumb'] : $contact['photo']);
-	if (intval(get_config('system','new_share'))) {
+	if (!intval(get_config('system','wall-to-wall_share'))) {
 		$prefix = "[share author='".str_replace("'", "'",$person['name']).
 				"' profile='".$person['url'].
 				"' avatar='".((x($person,'thumb')) ? $person['thumb'] : $person['photo']).

include/items.php

@@ -811,7 +811,7 @@ function get_atom_elements($feed,$item) {
 		if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) {
 			logger('get_atom_elements: fixing sender of repeated message.');
 
-			if (intval(get_config('system','new_share'))) {
+			if (!intval(get_config('system','wall-to-wall_share'))) {
 				$prefix = "[share author='".str_replace("'", "'",$name).
 						"' profile='".$uri.
 						"' avatar='".$avatar.

mod/admin.php

@@ -282,7 +282,7 @@ function admin_page_site_post(&$a){
 	$ostatus_poll_interval	=	((x($_POST,'ostatus_poll_interval'))	? intval(trim($_POST['ostatus_poll_interval']))		:  0);
 	$diaspora_enabled	=	((x($_POST,'diaspora_enabled'))		? True   					: False);
 	$ssl_policy		=	((x($_POST,'ssl_policy'))		? intval($_POST['ssl_policy']) 			: 0);
-	$new_share		=	((x($_POST,'new_share'))		? True   					: False);
+	$old_share		=	((x($_POST,'old_share'))		? True   					: False);
 	$hide_help		=	((x($_POST,'hide_help'))		? True   					: False);
 	$use_fulltext_engine	=	((x($_POST,'use_fulltext_engine'))	? True   					: False);
 	$itemcache		=	((x($_POST,'itemcache'))		? notags(trim($_POST['itemcache']))		: '');
@@ -398,7 +398,7 @@ function admin_page_site_post(&$a){
 	set_config('system','diaspora_enabled', $diaspora_enabled);
 	set_config('config','private_addons', $private_addons);
 	
-	set_config('system','new_share', $new_share);
+	set_config('system','old_share', $old_share);
 	set_config('system','hide_help', $hide_help);
 	set_config('system','use_fulltext_engine', $use_fulltext_engine);
 	set_config('system','itemcache', $itemcache);
@@ -508,7 +508,7 @@ function admin_page_site(&$a) {
 		'$theme' 		=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
 		'$theme_mobile' 	=> array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
 		'$ssl_policy'		=> array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
-		'$new_share'		=> array('new_share', t("'Share' element"), get_config('system','new_share'), t("Activates the bbcode element 'share' for repeating items.")),
+		'$old_share'		=> array('old_share', t("Old style 'Share'"), get_config('system','old_share'), t("Deactivates the bbcode element 'share' for repeating items.")),
 		'$hide_help'		=> array('hide_help', t("Hide help entry from navigation menu"), get_config('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
 		'$singleuser' 		=> array('singleuser', t("Single user instance"), get_config('system','singleuser'), t("Make this instance multi-user or single-user for the named user"), $user_names),
 		'$maximagesize'		=> array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),

mod/share.php

@@ -18,7 +18,7 @@ function share_init(&$a) {
 	if(! count($r) || ($r[0]['private'] == 1))
 		killme();
 
-	if (intval(get_config('system','new_share'))) {
+	if (!intval(get_config('system','old_share'))) {
 		if (strpos($r[0]['body'], "[/share]") !== false) {
 			$pos = strpos($r[0]['body'], "[share");
 			$o = substr($r[0]['body'], $pos);

view/templates/admin_site.tpl

@@ -55,7 +55,7 @@
 	{{include file="field_select.tpl" field=$theme}}
 	{{include file="field_select.tpl" field=$theme_mobile}}
 	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$old_share}}
 	{{include file="field_checkbox.tpl" field=$hide_help}}
 	{{include file="field_select.tpl" field=$singleuser}}
 

view/theme/decaf-mobile/templates/admin_site.tpl

@@ -16,7 +16,7 @@
 	{{include file="field_select.tpl" field=$theme}}
 	{{include file="field_select.tpl" field=$theme_mobile}}
 	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$old_share}}
 	{{include file="field_checkbox.tpl" field=$hide_help}} 
 	{{include file="field_select.tpl" field=$singleuser}} 
 	

view/theme/frost-mobile/templates/admin_site.tpl

@@ -16,7 +16,7 @@
 	{{include file="field_select.tpl" field=$theme}}
 	{{include file="field_select.tpl" field=$theme_mobile}}
 	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$old_share}}
 	{{include file="field_checkbox.tpl" field=$hide_help}} 
 	{{include file="field_select.tpl" field=$singleuser}} 
 	

view/theme/frost/templates/admin_site.tpl

@@ -16,7 +16,7 @@
 	{{include file="field_select.tpl" field=$theme}}
 	{{include file="field_select.tpl" field=$theme_mobile}}
 	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$old_share}}
 	{{include file="field_checkbox.tpl" field=$hide_help}} 
 	{{include file="field_select.tpl" field=$singleuser}}