mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-07 23:26:41 +02:00
Code Issues Releases Wiki Activity

HTML5 Validation fixes.

Browse Source
This commit is contained in:
Cameron
2016-01-30 18:39:01 -08:00
parent ee28ffb622
commit a31602108b
5 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_core/templates/usersettings_template.php
View File

@@ -214,7 +214,7 @@ $USERSETTINGS_WRAPPER['edit']['CUSTOMTITLE'] = "<div class='form-group'>
"; ";
$USERSETTINGS_WRAPPER['edit']['USERCLASSES'] = "<div class='form-group'> $USERSETTINGS_WRAPPER['edit']['USERCLASSES'] = "<div class='form-group'>
<label for='userclasses' class='col-sm-3 control-label'>".LAN_USER_76.":".req($pref['signup_option_class'])."</label> <label class='col-sm-3 control-label'>".LAN_USER_76.":".req($pref['signup_option_class'])."</label>
<div class='col-sm-9'>{---}</div> <div class='col-sm-9'>{---}</div>
</div> </div>
"; ";
@@ -256,14 +256,14 @@ $USERSETTINGS_TEMPLATE['edit'] = "
<div class='form-group'> <div class='form-group'>
<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_60.req(!$pref['disable_emailcheck'])."</label> <label for='email' class='col-sm-3 control-label'>".LAN_USER_60.req(!$pref['disable_emailcheck'])."</label>
<div class='col-sm-9'> <div class='col-sm-9'>
{EMAIL} {EMAIL}
</div> </div>
</div> </div>
<div class='form-group'> <div class='form-group'>
<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_63.req($pref['signup_option_realname'])."</label> <label for='realname' class='col-sm-3 control-label'>".LAN_USER_63.req($pref['signup_option_realname'])."</label>
<div class='col-sm-9'> <div class='col-sm-9'>
{REALNAME} {REALNAME}
</div> </div>
@@ -277,14 +277,14 @@ $USERSETTINGS_TEMPLATE['edit'] = "
<div class='form-group'> <div class='form-group'>
<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_83."</label> <label for='hideemail' class='col-sm-3 control-label'>".LAN_USER_83."</label>
<div class='col-sm-9'> <div class='col-sm-9'>
{HIDEEMAIL=radio} {HIDEEMAIL=radio}
</div> </div>
</div> </div>
<div class='form-group'> <div class='form-group'>
<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_07.req($pref['signup_option_image'])."</label> <label class='col-sm-3 control-label'>".LAN_USER_07.req($pref['signup_option_image'])."</label>
<div class='col-sm-9'> <div class='col-sm-9'>
{AVATAR_REMOTE} {AVATAR_REMOTE}
</div> </div>

22
e107_handlers/core_functions.php
View File

@@ -307,7 +307,7 @@ if (!function_exists('asortbyindex'))
if (!function_exists('r_emote')) if (!function_exists('r_emote'))
{ {
/** /**
* @DEPRECATED * Still in use.
*/ */
function r_emote() function r_emote()
{ {
@@ -331,10 +331,24 @@ if (!function_exists('r_emote'))
$value = ($value2 ? $value2 : $value); $value = ($value2 ? $value2 : $value);
$value = ($value == '&|') ? ':((' : $value; $value = ($value == '&|') ? ':((' : $value;
$value = " ".$value." "; $value = " ".$value." ";
//TODO CSS class
$str .= "\n<a href=\"javascript:addtext('$value',true)\"><img src='$key' alt='' /></a> "; // $str .= "\n<a class='addEmote' data-emote=\"".$value."\" href=\"javascript:addtext('$value',true)\"><img src='$key' alt='' /></a> ";
$str .= "\n<a class='addEmote' data-emote=\"".$value."\" href=\"#\"><img src='$key' alt='' /></a> ";
} }
$JS = "
$('.addEmote').click(function(){
val = $(this).attr('data-emote')
addtext(val,true);
return false;
});
";
e107::js('footer-inline',$JS);
return "<div class='spacer'>".$str."</div>"; return "<div class='spacer'>".$str."</div>";
} }
} }

5
e107_handlers/e_parse_class.php
View File

@@ -3198,7 +3198,10 @@ class e_parser
$title = (ADMIN) ? $image : $tp->toAttribute($userData['user_name']); $title = (ADMIN) ? $image : $tp->toAttribute($userData['user_name']);
$shape = (vartrue($options['shape'])) ? "img-".$options['shape'] : "img-rounded"; $shape = (vartrue($options['shape'])) ? "img-".$options['shape'] : "img-rounded";
$text = "<img class='".$shape." img-responsive user-avatar e-tip' title=\"".$title."\" src='".$img."' alt='' width='".$width."' height='".$height."' />";
$heightInsert = empty($height) ? '' : "height='".$height."'";
$text = "<img class='".$shape." img-responsive user-avatar e-tip' title=\"".$title."\" src='".$img."' alt='' width='".$width."' ".$heightInsert." />";
// return $img; // return $img;
return $text; return $text;

4
e107_handlers/form_handler.php
View File

@@ -663,8 +663,8 @@ class e_form
if($localonly == true) if($localonly == true)
{ {
$text = "<input class='tbox' style='width:80%' id='{$idinput}' type='hidden' name='image' size='40' value='{$curVal}' maxlength='100' />"; $text = "<input class='tbox' style='width:80%' id='{$idinput}' type='hidden' name='image' value='{$curVal}' />";
$text .= "<img src='".$img."' id='{$previnput}' class='img-rounded e-expandit e-tip avatar' style='cursor:pointer; width:".$pref['im_width']."px; height:".$pref['im_height']."px' title='Click on the avatar to change it'/>"; // TODO LAN $text .= "<img src='".$img."' id='{$previnput}' class='img-rounded e-expandit e-tip avatar' style='cursor:pointer; width:".$pref['im_width']."px; height:".$pref['im_height']."px' title='Click on the avatar to change it' alt='Click on the avatar to change it' />"; // TODO LAN
} }
else else
{ {

2
usersettings.php
View File

@@ -763,7 +763,7 @@ if (vartrue($_POST))
//require_once (e_HANDLER."form_handler.php"); //require_once (e_HANDLER."form_handler.php");
//$rs = new form; //$rs = new form;
$text = '<form method="post" action="'.$usersettings_form_action.'" id="dataform" class="form-horizontal" role="form" enctype="multipart/form-data" autocomplete="off">'; $text = '<form method="post" action="'.vartrue($usersettings_form_action,e_REQUEST_URI).'" id="dataform" class="form-horizontal" enctype="multipart/form-data" autocomplete="off">';
//$text = (is_numeric($_uid) ? $rs->form_open("post", e_SELF."?".e_QUERY, "dataform", "", " class='form-horizontal' role='form' enctype='multipart/form-data'") : $rs->form_open("post", e_SELF, "dataform", "", " class='form-horizontal' role='form' enctype='multipart/form-data'")); //$text = (is_numeric($_uid) ? $rs->form_open("post", e_SELF."?".e_QUERY, "dataform", "", " class='form-horizontal' role='form' enctype='multipart/form-data'") : $rs->form_open("post", e_SELF, "dataform", "", " class='form-horizontal' role='form' enctype='multipart/form-data'"));