Skip to content

Commit 4569cae

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1'
2 parents 0b2c411 + 1d46a3a commit 4569cae

23 files changed

+201
-69
lines changed

‎interface/lib/classes/tpl.inc.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -858,14 +858,12 @@ private function _getData ($tmplfile, $do_eval=false, $tmpl_from_string = false)
858858

859859

860860
if($this->_cache && $this->_checkCache($tmplfile, $tmpl_from_string)) { //* cache exists so lets use it
861-
$data = fread($fp = fopen($this->_cachefile, 'r'), filesize($this->_cachefile));
862-
fclose($fp);
861+
$data = file_get_contents($this->_cachefile);
863862
} else { //* no cache lets parse the file
864863
if($tmpl_from_string == true) {
865864
$data = $tmplfile;
866865
} else {
867-
$data = fread($fp = fopen($tmplfile, 'r'), filesize($tmplfile));
868-
fclose($fp);
866+
$data = file_get_contents($tmplfile);
869867
}
870868

871869
$regex = '/(<|<\/|{|{\/|<!--|<!--\/){1}\s*';

‎interface/lib/classes/validate_autoresponder.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function end_date($field_name, $field_value, $validator)
6060
$end_date_tstamp = mktime($end_date_array['hour'], $end_date_array['minute'], $end_date_array['second'], $end_date_array['month'], $end_date_array['day'], $end_date_array['year']);
6161

6262
// End date has to be > start date
63-
if($end_date_tstamp <= $start_date_tstamp) {
63+
if($end_date_tstamp <= $start_date_tstamp && ($start_date || $field_value)) {
6464
return $app->tform->lng($validator['errmsg']).'<br />';
6565
}
6666
}

‎interface/web/admin/templates/remote_user_edit.htm‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
1616
</div>
1717
<div class="form-group">
1818
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
19+
<div class="col-sm-9 checkbox">
1920
<div id="passBar"></div>
20-
<p class="formHint"><span id="passText">&nbsp;</span></p>
21+
<span id="passText">&nbsp;</span>
22+
</div>
2123
</div>
2224
<div class="form-group">
2325
<label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
2426
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
25-
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
26-
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
27+
<div class="form-group">
28+
<div class="col-sm-offset-3 col-sm-9">
29+
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
30+
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
31+
</div>
32+
</div>
2733
<div class="form-group">
2834
<label class="col-sm-3 control-label">{tmpl_var name='function_txt'}</label>
2935
<div class="col-sm-9">

‎interface/web/admin/templates/users_user_edit.htm‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
1414
</div>
1515
<div class="form-group">
1616
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
17+
<div class="col-sm-9 checkbox">
1718
<div id="passBar"></div>
18-
<p class="formHint"><span id="passText">&nbsp;</span></p>
19+
<span id="passText">&nbsp;</span>
20+
</div>
1921
</div>
2022
<div class="form-group">
2123
<label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
2224
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('passwort','repeat_password');" /></div></div>
23-
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
24-
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
25+
<div class="form-group">
26+
<div class="col-sm-offset-3 col-sm-9">
27+
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
28+
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
29+
</div>
30+
</div>
2531
<div class="form-group">
2632
<label class="col-sm-3 control-label">{tmpl_var name='modules_txt'}</label>
2733
<div class="col-sm-9">

‎interface/web/client/templates/client_edit_address.htm‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
4040
</div>
4141
<div class="form-group">
4242
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
43+
<div class="col-sm-9 checkbox">
4344
<div id="passBar"></div>
44-
<p class="formHint"><span id="passText">&nbsp;</span></p>
45+
<span id="passText">&nbsp;</span>
46+
</div>
4547
</div>
4648
<div class="form-group">
4749
<label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
4850
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
49-
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
50-
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
51+
<div class="form-group">
52+
<div class="col-sm-offset-3 col-sm-9">
53+
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
54+
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
55+
</div>
56+
</div>
5157
<div class="form-group">
5258
<label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
5359
<div class="col-sm-9"><select name="language" id="language" class="form-control flags">

‎interface/web/client/templates/reseller_edit_address.htm‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
4040
</div>
4141
<div class="form-group">
4242
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
43+
<div class="col-sm-9 checkbox">
4344
<div id="passBar"></div>
44-
<p class="formHint"><span id="passText">&nbsp;</span></p>
45+
<span id="passText">&nbsp;</span>
46+
</div>
4547
</div>
4648
<div class="form-group">
4749
<label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
4850
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
49-
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
50-
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
51+
<div class="form-group">
52+
<div class="col-sm-offset-3 col-sm-9">
53+
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
54+
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
55+
</div>
56+
</div>
5157
<div class="form-group">
5258
<label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
5359
<div class="col-sm-9"><select name="language" id="language" class="form-control flags">

‎interface/web/js/scrigo.js.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ function pass_result(points, message) {
133133
} else {
134134
width = points*20;
135135
}
136-
document.getElementById("passBar").innerHTML = '<div style="float:left; height: 10px; padding:0px; background-color: ' + pass_messages[points]['color'] + '; width: ' + width + 'px;" />';
136+
document.getElementById("passBar").innerHTML = '<div style="background-color: ' + pass_messages[points]['color'] + '; width: ' + width + 'px;" />';
137137
document.getElementById("passText").innerHTML = pass_messages[points]['text'];
138138
}
139139
function pass_contains(pass, check) {

‎interface/web/mail/templates/mail_mailinglist_edit.htm‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
6767
</div>
6868
<div class="form-group">
6969
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
70+
<div class="col-sm-9 checkbox">
7071
<div id="passBar"></div>
71-
<p class="formHint"><span id="passText">&nbsp;</span></p>
72+
<span id="passText">&nbsp;</span>
73+
</div>
7274
</div>
7375
<div class="form-group">
7476
<label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
7577
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
76-
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
77-
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
78+
<div class="form-group">
79+
<div class="col-sm-offset-3 col-sm-9">
80+
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
81+
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
82+
</div>
83+
</div>
7884

7985

8086
<input type="hidden" name="id" value="{tmpl_var name='id'}">

‎interface/web/mail/templates/mail_user_mailbox_edit.htm‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
3838
</div>
3939
<div class="form-group">
4040
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
41+
<div class="col-sm-9 checkbox">
4142
<div id="passBar"></div>
42-
<p class="formHint"><span id="passText">&nbsp;</span></p>
43+
<span id="passText">&nbsp;</span>
44+
</div>
4345
</div>
4446
<div class="form-group">
4547
<label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
4648
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
47-
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
48-
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
49+
<div class="form-group">
50+
<div class="col-sm-offset-3 col-sm-9">
51+
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
52+
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
53+
</div>
54+
</div>
4955
<div class="form-group">
5056
<label for="quota" class="col-sm-3 control-label">{tmpl_var name='quota_txt'}</label>
5157
<div class="col-sm-9"><div class="input-group"><input type="text" name="quota" id="quota" value="{tmpl_var name='quota'}" class="form-control" aria-describedby="quota-desc" /><span class="input-group-addon" id="quota-desc">MB</span></div></div>

‎interface/web/mail/templates/xmpp_user_edit.htm‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
2727
</div>
2828
<div class="form-group">
2929
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
30+
<div class="col-sm-9 checkbox">
3031
<div id="passBar"></div>
31-
<p class="formHint"><span id="passText">&nbsp;</span></p>
32+
<span id="passText">&nbsp;</span>
33+
</div>
3234
</div>
3335
<div class="form-group">
3436
<label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
3537
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
36-
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
37-
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
38+
<div class="form-group">
39+
<div class="col-sm-offset-3 col-sm-9">
40+
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
41+
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
42+
</div>
43+
</div>
3844
<div class="form-group">
3945
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
4046
<div class="col-sm-9">

0 commit comments

Comments
 (0)