gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-02-12 03:21:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2021-05-13 15:51:55 +02:00
commit 012054c731
9 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
VERSION=$(shell php -r 'include("inc/inc.Version.php"); $$v=new SeedDMS_Version(); echo $$v->version();')
SRC=CHANGELOG inc conf utils index.php .htaccess languages op out controllers doc TODO LICENSE webdav install restapi pdfviewer
VIEWS ?= bootstrap
VIEWS ?= bootstrap bootstrap4
NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore

1
op/op.ChangePassword.php
View File

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

3
op/op.Login.php
View File

@ -61,9 +61,6 @@ if (!isset($login) || strlen($login)==0) {
$pwd = '';
if(isset($_POST['pwd'])) {
$pwd = (string) $_POST["pwd"];
if (get_magic_quotes_gpc()) {
$pwd = stripslashes($pwd);
}
}
$lang = '';

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

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

@ -61,17 +61,13 @@ document.form1.newpassword.focus();
$this->contentContainerStart();
$this->formField(
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) {
?>
<div class="control-group">
<label class="control-label"><?php printMLText("password_strength");?>:</label>
<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(
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>'
);
}
$this->formField(
getMLText("confirm_pwd"),

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

@ -93,12 +93,12 @@ $(document).ready( function() {
);
$this->formField(
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) {
$this->formField(
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(

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

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

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

@ -243,9 +243,7 @@ $(document).ready( function() {
$this->columnStart(8);
?>
<?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
<div class="well">
<div class="ajax" data-view="RoleMgr" data-action="form" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
</div>
<?php } else {
$this->errorMsg(getMLText('access_denied'));
}