gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-15 05:21:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-05-12 10:57:17 +02:00
commit 21b590d547
6 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
op/op.ChangePassword.php
View File

@ -27,6 +27,7 @@ include("../inc/inc.Extension.php");
include("../inc/inc.ClassSession.php"); include("../inc/inc.ClassSession.php");
include("../inc/inc.DBInit.php"); include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php"); include("../inc/inc.ClassUI.php");
require_once("../inc/inc.ClassAccessOperation.php");
function _printMessage($heading, $message) { function _printMessage($heading, $message) {

2
out/out.ChangePassword.php
View File

@ -45,8 +45,6 @@ if (isset($_REQUEST["hash"]) && strlen($_REQUEST["hash"])>0) {
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'referuri'=>$referuri, 'hash'=>$hash, 'passwordstrength'=>$settings->_passwordStrength)); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'referuri'=>$referuri, 'hash'=>$hash, 'passwordstrength'=>$settings->_passwordStrength));
$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
if($view) { if($view) {
$view->setParam('accessobject', $accessop);
$view($_GET); $view($_GET);
} }

2
out/out.PasswordSend.php
View File

@ -23,6 +23,7 @@ if(!isset($settings))
require_once("inc/inc.LogInit.php"); require_once("inc/inc.LogInit.php");
require_once("inc/inc.Language.php"); require_once("inc/inc.Language.php");
require_once("inc/inc.Init.php"); require_once("inc/inc.Init.php");
require_once("inc/inc.DBInit.php");
require_once("inc/inc.Extension.php"); require_once("inc/inc.Extension.php");
require_once("inc/inc.DBInit.php"); require_once("inc/inc.DBInit.php");
require_once("inc/inc.ClassAccessOperation.php"); require_once("inc/inc.ClassAccessOperation.php");
@ -40,7 +41,6 @@ if (isset($_REQUEST["referuri"]) && strlen($_REQUEST["referuri"])>0) {
$referrer = ''; $referrer = '';
} }
if($view) { if($view) {
$view->setParam('accessobject', $accessop);
$view->setParam('referrer', $referrer); $view->setParam('referrer', $referrer);
$view($_GET); $view($_GET);
} }

14
views/bootstrap/class.ChangePassword.php
View File

@ -61,17 +61,13 @@ document.form1.newpassword.focus();
$this->contentContainerStart(); $this->contentContainerStart();
$this->formField( $this->formField(
getMLText("password"), getMLText("password"),
'<input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password">' '<input class="pwd form-control" type="password" rel="strengthbar" name="newpassword" id="password">'
); );
if($passwordstrength > 0) { if($passwordstrength > 0) {
?> $this->formField(
<div class="control-group"> getMLText("password_strength"),
<label class="control-label"><?php printMLText("password_strength");?>:</label> '<div id="strengthbar" class="progress" style="_width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>'
<div class="controls"> );
<div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>
</div>
</div>
<?php
} }
$this->formField( $this->formField(
getMLText("confirm_pwd"), getMLText("confirm_pwd"),

4
views/bootstrap/class.ForcePasswordChange.php
View File

@ -93,12 +93,12 @@ $(document).ready( function() {
); );
$this->formField( $this->formField(
getMLText("new_password"), getMLText("new_password"),
'<input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30">' '<input class="pwd form-control" type="password" rel="strengthbar" id="pwd" name="pwd">'
); );
if($passwordstrength) { if($passwordstrength) {
$this->formField( $this->formField(
getMLText("password_strength"), getMLText("password_strength"),
'<div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>' '<div id="strengthbar" class="progress" style="_width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>'
); );
} }
$this->formField( $this->formField(

2
views/bootstrap/class.Login.php
View File

@ -124,7 +124,7 @@ $(document).ready( function() {
<form class="form-horizontal" action="../op/op.Login.php" method="post" name="form1" id="form"> <form class="form-horizontal" action="../op/op.Login.php" method="post" name="form1" id="form">
<?php <?php
if ($refer) { if ($refer) {
echo "<input type='hidden' name='referuri' value='".sanitizeString($refer)."'/>"; echo "<input type='hidden' name='referuri' value='".htmlspecialchars($refer)."'/>";
} }
$this->formField( $this->formField(
getMLText("user_login"), getMLText("user_login"),