Merge branch 'master' into dev

Zotlabs/Lib/XConfig.php

@@ -122,7 +122,7 @@ class XConfig {
 			);
 		}
 
-		App::$config[$xchan][$family][$key] = $value;
+		\App::$config[$xchan][$family][$key] = $value;
 
 		if($ret)
 			return $value;

boot.php

@@ -45,8 +45,8 @@ require_once('include/account.php');
 
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '1.9' );
+define ( 'STD_VERSION',             '1.8' );
-define ( 'ZOT_REVISION',            1.1     );
+define ( 'ZOT_REVISION',            '1.1' );
 
 define ( 'DB_UPDATE_VERSION',       1178  );
 

include/datetime.php

@@ -224,7 +224,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
 
 	$pickers = '';
 	if(!$pickdate) $pickers .= ',datepicker: false';
-	if(!$picktime) $pickers .= ',timepicker: false';
+	if(!$picktime) $pickers .= ',timepicker: false, closeOnDateSelect:true';
 
 	$extra_js = '';
 	if($minfrom != '') 

view/cs/htconfig.tpl

@@ -1,82 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '{{$dbhost}}';
-$db_port = '{{$dbport}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
-
-define( 'UNO', {{$uno}} );
-
-/*
- * Notice: Many of the following settings will be available in the admin panel 
- * after a successful site install. Once they are set in the admin panel, they
- * are stored in the DB - and the DB setting will over-ride any corresponding
- * setting in this file
- *
- * The command-line tool util/config is able to query and set the DB items 
- * directly if for some reason the admin panel is not available and a system
- * setting requires modification. 
- *
- */ 
-
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-App::$config['system']['timezone'] = '{{$timezone}}';
-
-// What is your site name?
-
-App::$config['system']['baseurl'] = '{{$siteurl}}';
-App::$config['system']['sitename'] = "Hubzilla";
-App::$config['system']['location_hash'] = '{{$site_id}}';
-
-// These lines set additional security headers to be sent with all responses
-// You may wish to set transport_security_header to 0 if your server already sends
-// this header. content_security_policy may need to be disabled if you wish to
-// run the piwik analytics plugin or include other offsite resources on a page
-
-App::$config['system']['transport_security_header'] = 1;
-App::$config['system']['content_security_policy'] = 1;
-
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting 
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-App::$config['system']['register_policy'] = REGISTER_OPEN;
-App::$config['system']['register_text'] = '';
-App::$config['system']['admin_email'] = '{{$adminmail}}';
-
-// Maximum size of an imported message, 0 is unlimited
-
-App::$config['system']['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-App::$config['system']['maximagesize'] = 8000000;
-
-// Location of PHP command line processor
-
-App::$config['system']['php_path'] = '{{$phpath}}';
-
-// Configure how we communicate with directory servers.
-// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
-// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
-// DIRECTORY_MODE_PRIMARY    = main directory server
-// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
-
-App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
-
-// default system theme
-
-App::$config['system']['theme'] = 'redbasic';
-

view/cs/lostpass_eml.tpl

@@ -1,32 +0,0 @@
-
-Dear {{$username}},
-	A request was recently received at {{$sitename}} to reset your account 
-password. In order to confirm this request, please select the verification link
-below or paste it into your web browser address bar. 
-
-If you did NOT request this change, please DO NOT follow the link
-provided and ignore and/or delete this email. 
-
-Your password will not be changed unless we can verify that you
-issued this request. 
-
-Follow this link to verify your identity:
-
-{{$reset_link}}
-
-You will then receive a follow-up message containing the new password.
-
-You may change that password from your account settings page after logging in.
-
-The login details are as follows:
-
-Site Location:	{{$siteurl}}
-Login Name:	{{$email}}
-
-
-
-
-Sincerely,
-	{{$sitename}} Administrator
-
- 

view/cs/passchanged_eml.tpl

@@ -1,20 +0,0 @@
-
-Dear {{$username}},
-	Your password has been changed as requested. Please retain this 
-information for your records (or change your password immediately to 
-something that you will remember).
-
-
-Your login details are as follows:
-
-Site Location:	{{$siteurl}}
-Login Name:	{{$email}}
-Password:	{{$new_password}}
-
-You may change that password from your account settings page after logging in.
-
-
-Sincerely,
-	{{$sitename}} Administrator
-
- 

view/cs/register_open_eml.tpl

@@ -1,19 +0,0 @@
-
-An account has been created at {{$sitename}} for this email address. 
-The login details are as follows:
-
-Site Location:	{{$siteurl}}
-Login:	{{$email}}
-Password: (the password which was provided during registration)
-
-If this account was created without your knowledge and is not desired, you may 
-visit this site and reset the password. This will allow you to remove the 
-account from the links on the Settings page, and we 
-apologise for any inconvenience. 
-
-Thank you and welcome to {{$sitename}}.
-
-Sincerely,
-	{{$sitename}} Administrator
-
- 

view/cs/register_verify_eml.tpl

@@ -1,25 +0,0 @@
-
-A new user registration request was received at {{$sitename}} which requires 
-your approval. 
-
-
-The login details are as follows:
-
-Site Location:	{{$siteurl}}
-Login Name:	{{$email}}
-IP Address: {{$details}}
-
-To approve this request please visit the following link:
-
-
-{{$siteurl}}/regmod/allow/{{$hash}} 
-
-
-To deny the request and remove the account, please visit:
-
-
-{{$siteurl}}/regmod/deny/{{$hash}}
-
-
-Thank you.
-

view/cs/update_fail_eml.tpl

@@ -1,13 +0,0 @@
-Hey, 
-I'm the web server at {{$sitename}};
-   
-The Hubzilla developers released update {{$update}} recently, 
-but when I tried to install it, something went terribly wrong.  
-This needs to be fixed soon and it requires human intervention. 
-Please contact a Red developer if you can not figure out how to 
-fix it on your own. My database might be invalid. 
-
-The error message is '{{$error}}'.   
-
-Apologies for the inconvenience, 
-	your web server at {{$siteurl}}

view/eo/htconfig.tpl

@@ -1,82 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '{{$dbhost}}';
-$db_port = '{{$dbport}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
-
-define( 'UNO', {{$uno}} );
-
-/*
- * Notice: Many of the following settings will be available in the admin panel 
- * after a successful site install. Once they are set in the admin panel, they
- * are stored in the DB - and the DB setting will over-ride any corresponding
- * setting in this file
- *
- * The command-line tool util/config is able to query and set the DB items 
- * directly if for some reason the admin panel is not available and a system
- * setting requires modification. 
- *
- */ 
-
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-App::$config['system']['timezone'] = '{{$timezone}}';
-
-// What is your site name?
-
-App::$config['system']['baseurl'] = '{{$siteurl}}';
-App::$config['system']['sitename'] = "Hubzilla";
-App::$config['system']['location_hash'] = '{{$site_id}}';
-
-
-// These lines set additional security headers to be sent with all responses
-// You may wish to set transport_security_header to 0 if your server already sends
-// this header. content_security_policy may need to be disabled if you wish to
-// run the piwik analytics plugin or include other offsite resources on a page
-
-App::$config['system']['transport_security_header'] = 1;
-App::$config['system']['content_security_policy'] = 1;
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting 
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-App::$config['system']['register_policy'] = REGISTER_OPEN;
-App::$config['system']['register_text'] = '';
-App::$config['system']['admin_email'] = '{{$adminmail}}';
-
-// Maximum size of an imported message, 0 is unlimited
-
-App::$config['system']['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-App::$config['system']['maximagesize'] = 8000000;
-
-// Location of PHP command line processor
-
-App::$config['system']['php_path'] = '{{$phpath}}';
-
-// Configure how we communicate with directory servers.
-// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
-// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
-// DIRECTORY_MODE_PRIMARY    = main directory server
-// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
-
-App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
-
-// default system theme
-
-App::$config['system']['theme'] = 'redbasic';
-

view/eo/lostpass_eml.tpl

@@ -1,32 +0,0 @@
-
-Dear {{$username}},
-	A request was recently received at {{$sitename}} to reset your account 
-password. In order to confirm this request, please select the verification link
-below or paste it into your web browser address bar. 
-
-If you did NOT request this change, please DO NOT follow the link
-provided and ignore and/or delete this email. 
-
-Your password will not be changed unless we can verify that you
-issued this request. 
-
-Follow this link to verify your identity:
-
-{{$reset_link}}
-
-You will then receive a follow-up message containing the new password.
-
-You may change that password from your account settings page after logging in.
-
-The login details are as follows:
-
-Site Location:	{{$siteurl}}
-Login Name:	{{$email}}
-
-
-
-
-Sincerely,
-	{{$sitename}} Administrator
-
- 

view/eo/passchanged_eml.tpl

@@ -1,20 +0,0 @@
-
-Dear {{$username}},
-	Your password has been changed as requested. Please retain this 
-information for your records (or change your password immediately to 
-something that you will remember).
-
-
-Your login details are as follows:
-
-Site Location:	{{$siteurl}}
-Login Name:	{{$email}}
-Password:	{{$new_password}}
-
-You may change that password from your account settings page after logging in.
-
-
-Sincerely,
-	{{$sitename}} Administrator
-
- 

view/eo/register_open_eml.tpl

@@ -1,19 +0,0 @@
-
-An account has been created at {{$sitename}} for this email address. 
-The login details are as follows:
-
-Site Location:	{{$siteurl}}
-Login:	{{$email}}
-Password: (the password which was provided during registration)
-
-If this account was created without your knowledge and is not desired, you may 
-visit this site and reset the password. This will allow you to remove the 
-account from the links on the Settings page, and we 
-apologise for any inconvenience. 
-
-Thank you and welcome to {{$sitename}}.
-
-Sincerely,
-	{{$sitename}} Administrator
-
- 

view/eo/register_verify_eml.tpl

@@ -1,25 +0,0 @@
-
-A new user registration request was received at {{$sitename}} which requires 
-your approval. 
-
-
-The login details are as follows:
-
-Site Location:	{{$siteurl}}
-Login Name:	{{$email}}
-IP Address: {{$details}}
-
-To approve this request please visit the following link:
-
-
-{{$siteurl}}/regmod/allow/{{$hash}} 
-
-
-To deny the request and remove the account, please visit:
-
-
-{{$siteurl}}/regmod/deny/{{$hash}}
-
-
-Thank you.
-

view/eo/update_fail_eml.tpl

@@ -1,13 +0,0 @@
-Hey, 
-I'm the web server at {{$sitename}};
-   
-The Hubzilla developers released update {{$update}} recently, 
-but when I tried to install it, something went terribly wrong.  
-This needs to be fixed soon and it requires human intervention. 
-Please contact a Red developer if you can not figure out how to 
-fix it on your own. My database might be invalid. 
-
-The error message is '{{$error}}'.   
-
-Apologies for the inconvenience, 
-	your web server at {{$siteurl}}