Permalink
Browse files

Merge branch 'release/6.7.x' into develop

# Conflicts:
#	rsc/build/b2evo_base.bmin.css
#	rsc/build/bootstrap-b2evo_base.bmin.css
#	rsc/build/bootstrap-backoffice-b2evo_base.bmin.css
#	skins/bootstrap_blog_skin/style.css
#	skins/bootstrap_blog_skin/style.min.css
#	skins/bootstrap_forums_skin/style.css
#	skins/bootstrap_forums_skin/style.min.css
#	skins/bootstrap_gallery_legacy/style.css
#	skins/bootstrap_gallery_legacy/style.min.css
#	skins/bootstrap_gallery_skin/style.css
#	skins/bootstrap_gallery_skin/style.min.css
#	skins/bootstrap_main_skin/style.css
#	skins/bootstrap_main_skin/style.min.css
#	skins/bootstrap_manual_skin/style.css
#	skins/bootstrap_manual_skin/style.min.css
#	skins/pureforums/pureforums.bmin.css
#	skins_adm/bootstrap/rsc/css/style.min.css
  • Loading branch information...
2 parents b2e1403 + 0e51870 commit dea6e4ea857d51b3d43138c3684242822a416285 @yurabakhtin yurabakhtin committed Aug 15, 2016
Showing with 163 additions and 125 deletions.
  1. +9 −0 _tests/blogs/evocore/misc.funcs.simpletest.php
  2. +1 −1 conf/_application.php
  3. +22 −1 inc/_core/_misc.funcs.php
  4. +15 −13 inc/collections/model/_blog.class.php
  5. +1 −1 inc/collections/views/_coll_urls.form.php
  6. +28 −0 inc/settings/model/_abstractsettings.class.php
  7. +2 −7 inc/tools/model/_email.funcs.php
  8. +1 −1 inc/tools/views/_email_smtp.form.php
  9. +1 −1 rsc/build/b2evo_base.bmin.css
  10. +2 −6 rsc/build/b2evo_base.bundle.css
  11. +1 −1 rsc/build/bootstrap-b2evo_base.bmin.css
  12. +2 −1 rsc/build/bootstrap-b2evo_base.bundle.css
  13. +0 −4 rsc/css/basic.css
  14. +0 −1 rsc/css/basic_styles.css
  15. +2 −1 rsc/css/blog_base.css
  16. +2 −2 rsc/css/bootstrap-blog_base.css
  17. +1 −2 rsc/css/sitewide_style.css
  18. +1 −1 rsc/js/build/bootstrap-evo_backoffice.bmin.js
  19. +1 −1 rsc/js/build/bootstrap-evo_frontoffice.bmin.js
  20. +1 −1 rsc/js/build/colorbox.bmin.js
  21. +1 −1 rsc/js/build/evo_backoffice.bmin.js
  22. +1 −1 rsc/js/build/evo_frontoffice.bmin.js
  23. +1 −1 rsc/js/build/sha1_md5.bmin.js
  24. +1 −1 rsc/js/build/textcomplete.bmin.js
  25. +2 −1 rsc/less/_universal_item_list_widget.module.less
  26. +1 −2 skins/bootstrap_main_skin/style.css
  27. +1 −1 skins/bootstrap_main_skin/style.min.css
  28. +1 −1 skins/pureforums/pureforums.bmin.css
  29. +27 −29 skins/pureforums/pureforums.bundle.css
  30. +10 −10 skins/pureforums/pureforums_header.css
  31. +17 −19 skins/pureforums/pureforums_main.css
  32. +4 −8 skins/touch/style.css
  33. +0 −1 skins_adm/bootstrap/rsc/css/style.css
  34. +1 −1 skins_adm/bootstrap/rsc/css/style.min.css
  35. +2 −2 skins_site/_site_body_header.inc.php
@@ -57,6 +57,15 @@ function test_make_clickable()
// XSS sample:
'text http://test_url.test"onmouseover="alert(1)"onerror=1 "text' => 'text <a href="http://test_url.test">http://test_url.test</a>"onmouseover="alert(1)"onerror=1 "text',
+
+ // Test stop symbols:
+ 'Please check: http://example.com/index.php?issue=123&page=4; message #5' => 'Please check: <a href="http://example.com/index.php?issue=123&page=4">http://example.com/index.php?issue=123&page=4</a>; message #5',
+ 'Info here: http://info.info!' => 'Info here: <a href="http://info.info">http://info.info</a>!',
+ 'Did you read this instruction https://doc.com/ip/settings.html? page 3' => 'Did you read this instruction <a href="https://doc.com/ip/settings.html">https://doc.com/ip/settings.html</a>? page 3',
+ 'Link http://test.net<p>Detailed info below:</p>' => 'Link <a href="http://test.net">http://test.net</a><p>Detailed info below:</p>',
+ 'Go to http://doc.com/page/56>' => 'Go to <a href="http://doc.com/page/56">http://doc.com/page/56</a>>',
+ 'Text http://example.com{sample}' => 'Text <a href="http://example.com">http://example.com</a>{sample}',
+ 'Plugins{doc http://plugins.com/doc/page/4}' => 'Plugins{doc <a href="http://plugins.com/doc/page/4">http://plugins.com/doc/page/4</a>}',
) as $lText => $lExpected )
{
$this->assertEqual( make_clickable($lText), $lExpected );
@@ -21,7 +21,7 @@
* Release date (ISO)
* @global string
*/
-$app_date = '2016-08-11';
+$app_date = '2016-08-12';
/**
* Long version string for checking differences
@@ -4012,7 +4012,12 @@ function mail_autoinsert_user_data( $text, $User = NULL )
*/
function mail_template( $template_name, $format = 'auto', $params = array(), $User = NULL )
{
- global $current_charset;
+ global $current_charset, $is_mail_template;
+
+ // Flag to currently mail template mode:
+ // @see is_mail_template()
+ // (For example, useful to force media URLs to absolute)
+ $is_mail_template = true;
if( !empty( $params['locale'] ) )
{ // Switch to locale for current email template
@@ -4114,6 +4119,9 @@ function mail_template( $template_name, $format = 'auto', $params = array(), $Us
locale_restore_previous();
}
+ // Disable mail template mode:
+ $is_mail_template = false;
+
if( isset( $template_contents ) )
{ // Return array for multipart content
$template_contents['full'] = $template_message;
@@ -5413,6 +5421,19 @@ function is_front_page()
/**
+ * Check it currently we are building email template
+ *
+ * @return boolean
+ */
+function is_mail_template()
+{
+ global $is_mail_template;
+
+ return isset( $is_mail_template ) && $is_mail_template === true;
+}
+
+
+/**
* Does the given url require logged in user
*
* @param string url
@@ -1815,28 +1815,30 @@ function get_htsrv_url( $force_https = false )
* Get the URL of the media folder, on the current blog's domain (which is NOT always the same as the $baseurl domain!).
*
* @param string NULL to use current media_assets_url_type setting. Use 'basic', 'relative' or 'absolute' to force.
+ * @param boolean TRUE - to don't force relative URL to absolute on back-office, mail template and feed skin
* @return string URL to /media/ folder
*/
- function get_local_media_url( $url_type = NULL )
+ function get_local_media_url( $url_type = NULL, $force_normal_using = false )
{
$url_type = is_null( $url_type ) ? $this->get_setting( 'media_assets_url_type' ) : $url_type;
if( $url_type == 'relative' )
{ // Relative URL:
global $media_subdir, $Skin;
- if( is_admin_page() )
- { // Force to absolute base URL on back-office side:
- global $media_url;
- return $media_url;
- }
- elseif( isset( $Skin ) && $Skin->get( 'type' ) == 'feed' )
- { // Force to absolute collection URL on feed skins:
- return $this->get_baseurl_root().$this->get_basepath().$media_subdir;
- }
- else
- { // Use relative URL for other skins:
- return $this->get_basepath().$media_subdir;
+ if( ! $force_normal_using )
+ { // Don't force URL value to normal using on front-office:
+ if( is_admin_page() || is_mail_template() )
+ { // Force to absolute base URL on back-office side and email template:
+ global $media_url;
+ return $media_url;
+ }
+ elseif( isset( $Skin ) && $Skin->get( 'type' ) == 'feed' )
+ { // Force to absolute collection URL on feed skins:
+ return $this->get_baseurl_root().$this->get_basepath().$media_subdir;
+ }
}
+ // Use relative URL for other skins:
+ return $this->get_basepath().$media_subdir;
}
elseif( $url_type == 'absolute' )
{ // Absolute URL
@@ -327,7 +327,7 @@ function update_urlpreview( baseurl, url_path )
'url' => $media_url,
'absolute_url' => 'media_assets_absolute_url',
'folder' => '/media/',
- 'local_url' => $edited_Blog->get_local_media_url( 'relative' )
+ 'local_url' => $edited_Blog->get_local_media_url( 'relative', true )
);
}
@@ -379,6 +379,34 @@ function getx( $col_key1, $col_key2 = NULL, $col_key3 = NULL )
/**
+ * Get a ready-to-display member param by its name
+ *
+ * Same as disp but don't echo
+ *
+ * @param string Name of parameter
+ * @param string Output format, see {@link format_to_output()}
+ */
+ function dget( $parname, $format = 'htmlbody' )
+ {
+ // Note: we call get again because of derived objects specific handlers !
+ return format_to_output( $this->get($parname), $format );
+ }
+
+
+ /**
+ * Display a member param by its name
+ *
+ * @param string Name of parameter
+ * @param string Output format, see {@link format_to_output()}
+ */
+ function disp( $parname, $format = 'htmlbody' )
+ {
+ // Note: we call get again because of derived objects specific handlers !
+ echo format_to_output( $this->get($parname), $format );
+ }
+
+
+ /**
* Get the default for the last key of {@link $col_key_names}
*
* @param string The last column key
@@ -610,11 +610,6 @@ function check_smtp_mailer()
return T_( 'SMTP gateway is not enabled.' );
}
- if( version_compare( phpversion(), '5.2', '<' ) )
- { // Swift Mailer works only with PHP 5.2 and higher
- return T_( 'PHP version must be 5.2 or higher to enable SMTP gateway.' );
- }
-
$smtp_server_host = $Settings->get( 'smtp_server_host' );
$smtp_server_port = $Settings->get( 'smtp_server_port' );
if( empty( $smtp_server_host ) || empty( $smtp_server_port ) )
@@ -1053,7 +1048,7 @@ function smtp_email_sending_test()
// Exit here.
}
- $smtp_message = sprintf( T_( 'Attempting to send a text message to "%s" via external SMTP server...' ), $current_User->get( 'email' ) ).' ';
+ $smtp_message = sprintf( T_( 'Attempting to send a text email to "%s" via external SMTP server...' ), $current_User->get( 'email' ) ).' ';
// Force temporary to use ONLY SMTP sending:
$email_service = $Settings->get( 'email_service' );
@@ -1098,7 +1093,7 @@ function php_email_sending_test()
{
global $Settings, $current_User, $php_mail_sending_log;
- $mail_message = sprintf( T_( 'Attempting to send a text message to "%s" via PHP...' ), $current_User->get( 'email' ) ).' ';
+ $mail_message = sprintf( T_( 'Attempting to send a text email to "%s" via PHP...' ), $current_User->get( 'email' ) ).' ';
// Force temporary to use ONLY PHP mail sending:
$email_service = $Settings->get( 'email_service' );
@@ -80,7 +80,7 @@
array( 'from', '<code>-f $return-address$</code>', ),
array( 'custom', T_('Custom').':', '',
'<input type="text" class="form_text_input form-control" name="sendmail_params_custom"
- size="150" value="'.format_to_output( $Settings->get( 'sendmail_params_custom' ), 'formvalue' ).'" />
+ size="150" value="'.$Settings->dget( 'sendmail_params_custom', 'formvalue' ).'" />
<span class="notes">'.sprintf( T_('Allowed placeholders: %s'), '<code>$from-address$</code>, <code>$return-address$</code>' ).'</span>' ),
), T_('Sendmail additional params'), true );
Oops, something went wrong.
@@ -446,7 +446,6 @@ samp {
pre,
code {
-webkit-hyphens: none;
- -moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
}
@@ -1116,7 +1115,6 @@ div#evo_toolbar .actions_right {
width: 25ex;
border: 1px solid #aeaeae;
box-shadow: 2px 2px 4px -1px rgba(0, 0, 0, 0.25);
- -webkit-transition: opacity 0.2s ease-in-out;
transition: opacity 0.2s ease-in-out;
}
.evobar-menu ul li {
@@ -1180,7 +1178,6 @@ div#evo_toolbar .actions_right {
display: inline-block;
position: relative;
background-color: #d2d2d2;
- -webkit-transition: background-color 0.15s ease-out;
transition: background-color 0.15s ease-out;
padding: 6px 1ex;
text-decoration: none;
@@ -1195,7 +1192,6 @@ div#evo_toolbar .actions_right {
}
.evobar-menu a:hover {
background-color: #bfbfbf;
- -webkit-transition: none;
transition: none;
text-decoration: none;
}
@@ -1969,7 +1965,6 @@ table.widget_grid .note {
}
.widget_flow_blocks,
table.widget_grid {
- display: -webkit-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
@@ -2189,7 +2184,8 @@ div.widget_core_coll_page_list.evo_1pic__special ul li,
div.widget_core_coll_related_post_list.evo_1pic__special ul li {
list-style: none;
height: auto;
- display: block;
+ display: inline-block;
+ width: 100%;
clear: both;
margin: 5px 0;
padding: 0;
Oops, something went wrong.
@@ -1703,7 +1703,8 @@ div.widget_core_coll_page_list.evo_1pic__special ul li,
div.widget_core_coll_related_post_list.evo_1pic__special ul li {
list-style: none;
height: auto;
- display: block;
+ display: inline-block;
+ width: 100%;
clear: both;
margin: 5px 0;
padding: 0;
View
@@ -146,7 +146,6 @@ div#evo_toolbar .actions_right {
width: 25ex;
border: 1px solid #aeaeae;
box-shadow: 2px 2px 4px -1px rgba(0, 0, 0, 0.25);
- -webkit-transition: opacity 0.2s ease-in-out;
transition: opacity 0.2s ease-in-out;
}
.evobar-menu ul li {
@@ -210,7 +209,6 @@ div#evo_toolbar .actions_right {
display: inline-block;
position: relative;
background-color: #d2d2d2;
- -webkit-transition: background-color 0.15s ease-out;
transition: background-color 0.15s ease-out;
padding: 6px 1ex;
text-decoration: none;
@@ -225,7 +223,6 @@ div#evo_toolbar .actions_right {
}
.evobar-menu a:hover {
background-color: #bfbfbf;
- -webkit-transition: none;
transition: none;
text-decoration: none;
}
@@ -999,7 +996,6 @@ table.widget_grid .note {
}
.widget_flow_blocks,
table.widget_grid {
- display: -webkit-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
@@ -445,7 +445,6 @@ samp {
pre,
code {
-webkit-hyphens: none;
- -moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
}
@@ -90,7 +90,8 @@ div.widget_core_coll_page_list.evo_1pic__special ul li,
div.widget_core_coll_related_post_list.evo_1pic__special ul li {
list-style: none;
height: auto;
- display: block;
+ display: inline-block;
+ width: 100%;
clear: both;
margin: 5px 0;
padding: 0;
@@ -90,7 +90,8 @@ div.widget_core_coll_page_list.evo_1pic__special ul li,
div.widget_core_coll_related_post_list.evo_1pic__special ul li {
list-style: none;
height: auto;
- display: block;
+ display: inline-block;
+ width: 100%;
clear: both;
margin: 5px 0;
padding: 0;
@@ -1510,7 +1511,6 @@ input.btn-lg {
margin: 0 1em 1em 0;
}
.evo_item_workflow_form .evo_item_workflow_form__fields {
- display: -webkit-box;
display: -ms-flexbox;
display: flex;
display: -webkit-flex;
@@ -76,8 +76,7 @@ input#nav-trigger {
}
.nav-trigger + .sitewide_header_menu_wrapper {
- -webkit-transition: max-height 0.5s ease-in-out;
- transition: max-height 0.5s ease-in-out;
+ transition: max-height 0.5s ease-in-out;
}
.sitewide_header,
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit dea6e4e

Please sign in to comment.