Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

6 files changed, 37 insertions, 12 deletions

diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 18a20885b..fde9fe823 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -501,7 +501,7 @@ class Setup extends \Zotlabs\Web\Controller {
 		$this->check_add($ck_funcs, t('libCurl PHP module'), true, true);
 		$this->check_add($ck_funcs, t('GD graphics PHP module'), true, true);
 		$this->check_add($ck_funcs, t('OpenSSL PHP module'), true, true);
-		$this->check_add($ck_funcs, t('mysqli or postgres PHP module'), true, true);
+		$this->check_add($ck_funcs, t('PDO database PHP module'), true, true);
 		$this->check_add($ck_funcs, t('mb_string PHP module'), true, true);
 		$this->check_add($ck_funcs, t('xml PHP module'), true, true);
 
@@ -531,9 +531,9 @@ class Setup extends \Zotlabs\Web\Controller {
 			$ck_funcs[2]['status'] = false;
 			$ck_funcs[2]['help'] = t('Error: openssl PHP module required but not installed.');
 		}
-		if(! function_exists('mysqli_connect') && !function_exists('pg_connect')) {
+		if(! class_exists('PDO')) {
 			$ck_funcs[3]['status'] = false;
-			$ck_funcs[3]['help'] = t('Error: mysqli or postgres PHP module required but neither are installed.');
+			$ck_funcs[3]['help'] = t('Error: PDO database PHP module required but not installed.');
 		}
 		if(! function_exists('mb_strlen')) {
 			$ck_funcs[4]['status'] = false;
diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php
index 526bf765c..cb244abad 100755
--- a/include/dba/dba_pdo.php
+++ b/include/dba/dba_pdo.php
@@ -60,7 +60,7 @@ class dba_pdo extends dba_driver {
 	
 			$this->error = $e->getMessage();
 			if($this->error) {
-				db_logger('dba_mysqli: ERROR: ' . printable($sql) . "\n" . $this->error, LOGGER_NORMAL, LOG_ERR);
+				db_logger('dba_pdo: ERROR: ' . printable($sql) . "\n" . $this->error, LOGGER_NORMAL, LOG_ERR);
 				if(file_exists('dbfail.out')) {
 					file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . "\n" . $this->error . "\n", FILE_APPEND);
 				}
@@ -69,13 +69,13 @@ class dba_pdo extends dba_driver {
 
 		if(!($select)) {
 			if($this->debug) {
-				db_logger('dba_mysqli: DEBUG: ' . printable($sql) . ' returns ' . (($result) ? 'true' : 'false'), LOGGER_NORMAL,(($result) ? LOG_INFO : LOG_ERR));
+				db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returns ' . (($result) ? 'true' : 'false'), LOGGER_NORMAL,(($result) ? LOG_INFO : LOG_ERR));
 			}
 			return $result;
 		}
 
 		if($this->debug) {
-			db_logger('dba_mysqli: DEBUG: ' . printable($sql) . ' returned ' . count($result) . ' results.', LOGGER_NORMAL, LOG_INFO); 
+			db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($result) . ' results.', LOGGER_NORMAL, LOG_INFO); 
 		}
 
 		$r = array();
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 94ec511d8..a216e630d 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -156,12 +156,21 @@ but may be an issue with nginx or other web server platforms.
 
 
 3. Create an empty database and note the access details (hostname, username, 
-password, database name). The MySQL client libraries will fallback to socket 
+password, database name). The PDO database libraries will fallback to socket 
 communication if the hostname is 'localhost' and some people have reported
 issues with the socket implementation. Use it if your requirements mandate. 
 Otherwise if the database is served on the local server, use '127.0.0.1' for
-the hostname. See https://dev.mysql.com/doc/refman/5.0/en/connecting.html
-for more information. 
+the hostname. 
+
+Internally we now use the PDO library for database connections. If you 
+encounter a database configuration which cannot be expressed on the setup form
+(for instance using MySQL with an unusual socket location); you can supply
+the PDO connection string as the database hostname. For instance
+	
+	mysql:unix_socket=/my/special/socket_path
+
+You should still fill in all other applicable form values as needed.  
+
 
 4. If you know in advance that it will be impossible for the web server to 
 write or create files in your web directory, create an empty file called 
@@ -223,7 +232,7 @@ You should also be sure that App::$config['system']['php_path'] is set correctly
 in your .htconfig.php file, it should look like (changing it to the correct 
 PHP location):
 
-App::$config['system']['php_path'] = '/usr/local/php55/bin/php';
+App::$config['system']['php_path'] = '/usr/local/php56/bin/php';
   
  
 #####################################################################
@@ -297,6 +306,21 @@ name of your operating system distribution or Apache package.
 
   
 #####################################################################
+- If you see an error during database setup that DNS lookup failed
+#####################################################################
+
+This is a known issue on some versions of FreeBSD, because 
+dns_get_record() fails for some lookups. Create a file in your top webserver 
+folder called '.htpreconfig.php' and inside it put the following:
+
+<?php
+App::$config['system']['do_not_check_dns'] = 1;
+
+This should allow installation to proceed. Once the database has been
+installed, add the same config statement (but not the '<?php' line) to the 
+.htconfig.php file which was created during installation. 
+
+#####################################################################
 - If you are unable to write the file .htconfig.php during installation 
 due to permissions issues:
 #####################################################################
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 7ecd41627..9272ed3f6 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -36,7 +36,7 @@
 	display: inherit;
 }
 
-#profile-jot-text:focus {
+#profile-jot-text.jot-expanded {
 	resize: vertical;
 }
 
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 571b5a5b1..aa47a6e19 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -269,7 +269,7 @@ function string2bb(element) {
 	$.fn.bbco_autocomplete = function(type) {
 
 		if(type=='bbcode') {
-			var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer'];
+			var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'embed'];
 			var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr',  ];
 
 			var elements = open_close_elements.concat(open_elements);
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index ac657e63f..edabee2da 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -26,6 +26,7 @@ function initEditor(cb){
 				  'transition' : 'elastic' 
 			});
 			$(".jothidden").show();
+			$("#profile-jot-text").addClass('jot-expanded');
 			if (typeof cb!="undefined") cb();
 			if(pretext.length)
 				addeditortext(pretext);