mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Backward Compatibility Fixes.

Browse Source
This commit is contained in:
Cameron
2016-12-01 19:12:25 -08:00
parent 5dd2ad8b99
commit c3df2134e2
4 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
e107_core/shortcodes/batch/signup_shortcodes.php
View File

@@ -255,8 +255,17 @@ class signup_shortcodes extends e_shortcode
$options['required'] = true;
$options['pattern'] = '(?=^.{'.$len.',}$)((?=.*\d)|(?=.*\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$';
$options['autocomplete'] = 'off';
$options['class'] = vartrue($parm['class'],'');
$options['placeholder'] = vartrue($parm['placeholder'],'');
if(!empty($parm['class']))
{
$options['class'] = $parm['class'];
}
if(!empty($parm['placeholder']))
{
$options['placeholder'] = $parm['placeholder'];
}
// $options['pattern'] = '\w{'.$len.',}'; // word of minimum length
@@ -277,9 +286,18 @@ class signup_shortcodes extends e_shortcode
{
return false;
}
$options = array('size'=>30,'class'=>'e-password tbox','required'=>1);
$options['class'] = vartrue($parm['class'],'');
$options['placeholder'] = vartrue($parm['placeholder'],'');
$options = array('size'=>30,'class'=>'e-password tbox','required'=>1); //defaults
if(!empty($parm['class']))
{
$options['class'] = $parm['class'];
}
if(!empty($parm['placeholder']))
{
$options['placeholder'] = $parm['placeholder'];
}
return e107::getForm()->password('password2', '', 20, $options);
}
@@ -301,7 +319,7 @@ class signup_shortcodes extends e_shortcode
function sc_signup_email($parm=null)
{
$options = array('size'=>30,'required'=>1,'class'=>'tbox form-control input-text e-email');
$options = array('size'=>30,'required'=>1,'class'=>'tbox form-control e-email');
$options['title'] = LAN_SIGNUP_108; // Must be a valid email address.
$options['class'] = vartrue($parm['class'],'');
$options['placeholder'] = vartrue($parm['placeholder'],'');
@@ -378,8 +396,8 @@ class signup_shortcodes extends e_shortcode
$uc = e107::getUserClass();
$frm = e107::getForm();
if(deftrue('BOOTSTRAP'))
{
// if(deftrue('BOOTSTRAP'))
// {
$text = "<div class='checkboxes'>";
$label = $tp->toHTML($uc->getName($classnum),false, 'defs');
@@ -389,11 +407,13 @@ class signup_shortcodes extends e_shortcode
$text .= "</div>";
return $text;
}
// }
// code below is too unpredictable for reliable BC.
global $USERCLASS_SUBSCRIBE_ROW;
e107::getDebug()->log($USERCLASS_SUBSCRIBE_ROW);
$tmp = explode(',',$current_value);

4
e107_core/templates/signup_template.php
View File

@@ -53,7 +53,7 @@ if(!defined($USERCLASS_SUBSCRIBE_START))
<td class='forumheader3' style='width:70%;margin-left:0px'>
<table style='".USER_WIDTH."'>";
}
/*
if(!defined($USERCLASS_SUBSCRIBE_ROW))
{
$USERCLASS_SUBSCRIBE_ROW = "
@@ -68,7 +68,7 @@ if(!defined($USERCLASS_SUBSCRIBE_ROW))
<span class='smalltext'>{USERCLASS_DESCRIPTION}</span>
</td>
</tr>";
}
}*/
if(!defined($USERCLASS_SUBSCRIBE_END))
{

6
e107_handlers/form_handler.php
View File

@@ -1010,7 +1010,7 @@ class e_form
foreach($avFiles as $fi)
{
$img_path = $tp->thumbUrl(e_AVATAR_DEFAULT.$fi['fname']);
$text .= "\n<a class='e-expandit' title='Choose this avatar' href='#{$optioni}'><img src='".$img_path."' alt='' onclick=\"insertext('".$fi['fname']."', '".$idinput."');document.getElementById('".$previnput."').src = this.src;\" /></a> ";
$text .= "\n<a class='e-expandit' title='Choose this avatar' href='#{$optioni}'><img src='".$img_path."' alt='' onclick=\"insertext('".$fi['fname']."', '".$idinput."');document.getElementById('".$previnput."').src = this.src;return false\" /></a> ";
$count++;
@@ -1871,11 +1871,13 @@ class e_form
//width should be explicit set by current admin theme
// $size = 'input-large';
$height = '';
$cols = 70;
switch($size)
{
case 'tiny':
$rows = '3';
$cols = 50;
// $height = "style='height:250px'"; // inline required for wysiwyg
break;
@@ -1926,7 +1928,7 @@ class e_form
$ret .= e107::getBB()->renderButtons($template,$help_tagid);
$ret .= $this->textarea($name, $value, $rows, 70, $options, $counter); // higher thank 70 will break some layouts.
$ret .= $this->textarea($name, $value, $rows, $cols, $options, $counter); // higher thank 70 will break some layouts.
$ret .= "</div>\n";

4
e107_web/css/backcompat.css
View File

@@ -24,3 +24,7 @@ mark { text-decoration: underline; color:#FF0000; font-weight:bold; }
div.form-group { padding-top: 5px }
div.news-empty { text-align:center; font-weight: bold }
div.checkboxes label.checkbox { display: block }
textarea.bbarea { margin:0; }