From 931a4fafe316b23bacf92ac1ff35f9b8467415dd Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 29 Apr 2016 21:38:36 +0200
Subject: get rid of the unused ispublic variable

---
 Zotlabs/Module/Cal.php      |  2 +-
 Zotlabs/Module/Editpost.php |  1 -
 Zotlabs/Module/Photos.php   |  2 +-
 include/conversation.php    |  1 -
 view/js/acl.js              |  5 +----
 view/js/mod_photos.js       |  4 ----
 view/js/mod_settings.js     |  3 ---
 view/tpl/jot-header.tpl     | 11 -----------
 view/tpl/jot.tpl            |  2 +-
 9 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php
index 89967bca1..958ce5aa6 100644
--- a/Zotlabs/Module/Cal.php
+++ b/Zotlabs/Module/Cal.php
@@ -38,7 +38,7 @@ class Cal extends \Zotlabs\Web\Controller {
 	
 			head_set_icon(\App::$data['channel']['xchan_photo_s']);
 	
-			\App::$page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "'; var profile_uid = " . ((\App::$data['channel']) ? \App::$data['channel']['channel_id'] : 0) . "; </script>" ;
+			\App::$page['htmlhead'] .= "<script> var profile_uid = " . ((\App::$data['channel']) ? \App::$data['channel']['channel_id'] : 0) . "; </script>" ;
 	
 		}
 	
diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php
index fd9912fe9..1c2c2a30b 100644
--- a/Zotlabs/Module/Editpost.php
+++ b/Zotlabs/Module/Editpost.php
@@ -83,7 +83,6 @@ class Editpost extends \Zotlabs\Web\Controller {
 		}
 
 		$x = array(
-			'ispublic' => '&nbsp;',
 			'nickname' => $channel['channel_address'],
 			'editor_autocomplete'=> true,
 			'bbco_autocomplete'=> 'bbcode',
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 15a1f4d9c..2b7f5525f 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -42,7 +42,7 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 			head_set_icon(\App::$data['channel']['xchan_photo_s']);
 	
-			\App::$page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "'; var profile_uid = " . ((\App::$data['channel']) ? \App::$data['channel']['channel_id'] : 0) . "; </script>" ;
+			\App::$page['htmlhead'] .= "<script> var profile_uid = " . ((\App::$data['channel']) ? \App::$data['channel']['channel_id'] : 0) . "; </script>" ;
 	
 		}
 	
diff --git a/include/conversation.php b/include/conversation.php
index 14fee19b2..b1b47df39 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1175,7 +1175,6 @@ function status_editor($a, $x, $popup = false) {
 		'$pretext' => ((x($x,'pretext')) ? $x['pretext'] : ''),
 		'$geotag' => $geotag,
 		'$nickname' => $x['nickname'],
-		'$ispublic' => ((x($x,'ispublic')) ? $x['ispublic'] : t('Visible to <strong>everybody</strong>')),
 		'$linkurl' => t('Please enter a link URL:'),
 		'$term' => t('Tag term:'),
 		'$whereareu' => t('Where are you right now?'),
diff --git a/view/js/acl.js b/view/js/acl.js
index 65f1009ed..7940a9bdc 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -196,16 +196,13 @@ ACL.prototype.update_view = function() {
 			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
 			$('#jot-public').show();
 			$('.profile-jot-net input').attr('disabled', false);
-			if(typeof editor !== 'undefined' && editor !== false) {
-				$('#profile-jot-desc').html(ispublic);
-			}
 	} else {
 		that.showall.removeClass("btn-warning").addClass("btn-default");
 		/* jot acl */
 		$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
 		$('#jot-public').hide();
 		$('.profile-jot-net input').attr('disabled', 'disabled');
-		$('#profile-jot-desc').html('&nbsp;');
+
 	}
 	$("#acl-list-content .acl-list-item").each(function() {
 		$(this).removeClass("groupshow grouphide");
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index 34e2e3f25..8af75b4eb 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -1,10 +1,6 @@
 /**
  * JavaScript used by mod/photos
  */
-
-// is this variable used anywhere?
-var ispublic = aStr.everybody;
-
 $(document).ready(function() {
 
 	$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 3fd57995a..9a7550ac1 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -2,9 +2,6 @@
  * JavaScript used by mod/settings
  */
 
-// is this used anywhere?
-var ispublic = aStr.everybody;
-
 $(document).ready(function() {
 	$('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings
 
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 085710f55..bdcca71ac 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -1,7 +1,6 @@
 <script language="javascript" type="text/javascript">
 
 var editor = false;
-var textlen = 0;
 var plaintext = '{{$editselect}}';
 var pretext = '{{$pretext}}';
 
@@ -75,14 +74,6 @@ function initEditor(cb){
 					else {
 						if(cPopup !== null) { cPopup.close(); cPopup = null; }
 					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html('&nbsp;');
-					}
 				});
 
 				ed.onInit.add(function(ed) {
@@ -109,8 +100,6 @@ function enableOnUser(){
 </script>
 <script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
 <script>
-	var ispublic = '{{$ispublic}}';
-
 	$(document).ready(function() {
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 34952596a..106181ab5 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -128,7 +128,7 @@
 						{{if $weblink}}
 						<li><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i>&nbsp;{{$weblink}}</a></li>
 						{{/if}}
-i						{{if $setloc}}
+						{{if $setloc}}
 						<li><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i>&nbsp;{{$setloc}}</a></li>
 						{{/if}}
 						{{if $clearloc}}
-- 
cgit v1.2.3