gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-05 07:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-03-22 15:11:42 +01:00
commit 0577fec1ba
45 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SeedDMS_Core/Core/inc.ClassAccess.php
View File

@ -27,7 +27,7 @@ class SeedDMS_Core_UserAccess { /* {{{ */
var $_user;
var $_mode;
function SeedDMS_Core_UserAccess($user, $mode) {
function __construct($user, $mode) {
$this->_user = $user;
$this->_mode = $mode;
}
@ -60,7 +60,7 @@ class SeedDMS_Core_GroupAccess { /* {{{ */
var $_group;
var $_mode;
function SeedDMS_Core_GroupAccess($group, $mode) {
function __construct($group, $mode) {
$this->_group = $group;
$this->_mode = $mode;
}

4
SeedDMS_Core/Core/inc.ClassAttribute.php
View File

@ -79,7 +79,7 @@ class SeedDMS_Core_Attribute { /* {{{ */
* @param SeedDMS_Core_AttributeDefinition $attrdef reference to the attribute definition
* @param string $value value of the attribute
*/
function SeedDMS_Core_Attribute($id, $obj, $attrdef, $value) { /* {{{ */
function __construct($id, $obj, $attrdef, $value) { /* {{{ */
$this->_id = $id;
$this->_obj = $obj;
$this->_attrdef = $attrdef;
@ -395,7 +395,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
* @param string $valueset separated list of allowed values, the first char
* is taken as the separator
*/
function SeedDMS_Core_AttributeDefinition($id, $name, $objtype, $type, $multiple, $minvalues, $maxvalues, $valueset, $regex) { /* {{{ */
function __construct($id, $name, $objtype, $type, $multiple, $minvalues, $maxvalues, $valueset, $regex) { /* {{{ */
$this->_id = $id;
$this->_name = $name;
$this->_type = $type;

10
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -150,7 +150,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
*/
protected $_sequence;
function SeedDMS_Core_Document($id, $name, $comment, $date, $expires, $ownerID, $folderID, $inheritAccess, $defaultAccess, $locked, $keywords, $sequence) { /* {{{ */
function __construct($id, $name, $comment, $date, $expires, $ownerID, $folderID, $inheritAccess, $defaultAccess, $locked, $keywords, $sequence) { /* {{{ */
parent::__construct($id);
$this->_name = $name;
$this->_comment = $comment;
@ -2261,7 +2261,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
else $this->setStatus(S_RELEASED,$msg,$user);
} /* }}} */
function SeedDMS_Core_DocumentContent($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='') { /* {{{ */
function __construct($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='') { /* {{{ */
parent::__construct($id);
$this->_document = $document;
$this->_version = (int) $version;
@ -4214,7 +4214,7 @@ class SeedDMS_Core_DocumentLink { /* {{{ */
*/
protected $_public;
function SeedDMS_Core_DocumentLink($id, $document, $target, $userID, $public) {
function __construct($id, $document, $target, $userID, $public) {
$this->_id = $id;
$this->_document = $document;
$this->_target = $target;
@ -4313,7 +4313,7 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
*/
protected $_name;
function SeedDMS_Core_DocumentFile($id, $document, $userID, $comment, $date, $dir, $fileType, $mimeType, $orgFileName,$name) {
function __construct($id, $document, $userID, $comment, $date, $dir, $fileType, $mimeType, $orgFileName,$name) {
$this->_id = $id;
$this->_document = $document;
$this->_userID = $userID;
@ -4381,7 +4381,7 @@ class SeedDMS_Core_AddContentResultSet { /* {{{ */
*/
protected $_dms;
function SeedDMS_Core_AddContentResultSet($content) { /* {{{ */
function __construct($content) { /* {{{ */
$this->_content = $content;
$this->_indReviewers = null;
$this->_grpReviewers = null;

2
SeedDMS_Core/Core/inc.ClassDocumentCategory.php
View File

@ -39,7 +39,7 @@ class SeedDMS_Core_DocumentCategory {
*/
protected $_dms;
function SeedDMS_Core_DocumentCategory($id, $name) { /* {{{ */
function __construct($id, $name) { /* {{{ */
$this->_id = $id;
$this->_name = $name;
$this->_dms = null;

2
SeedDMS_Core/Core/inc.ClassFolder.php
View File

@ -73,7 +73,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
*/
protected $_sequence;
function SeedDMS_Core_Folder($id, $name, $parentID, $comment, $date, $ownerID, $inheritAccess, $defaultAccess, $sequence) { /* {{{ */
function __construct($id, $name, $parentID, $comment, $date, $ownerID, $inheritAccess, $defaultAccess, $sequence) { /* {{{ */
parent::__construct($id);
$this->_id = $id;
$this->_name = $name;

2
SeedDMS_Core/Core/inc.ClassGroup.php
View File

@ -43,7 +43,7 @@ class SeedDMS_Core_Group {
*/
protected $_dms;
function SeedDMS_Core_Group($id, $name, $comment) { /* {{{ */
function __construct($id, $name, $comment) { /* {{{ */
$this->_id = $id;
$this->_name = $name;
$this->_comment = $comment;

2
SeedDMS_Core/Core/inc.ClassKeywords.php
View File

@ -47,7 +47,7 @@ class SeedDMS_Core_KeywordCategory {
*/
protected $_dms;
function SeedDMS_Core_KeywordCategory($id, $ownerID, $name) {
function __construct($id, $ownerID, $name) {
$this->_id = $id;
$this->_name = $name;
$this->_ownerID = $ownerID;

2
SeedDMS_Core/Core/inc.ClassNotification.php
View File

@ -67,7 +67,7 @@ class SeedDMS_Core_Notification { /* {{{ */
* @param integer $groupid id of group. The id is -1 if the notification is
* for a user.
*/
function SeedDMS_Core_Notification($target, $targettype, $userid, $groupid) { /* {{{ */
function __construct($target, $targettype, $userid, $groupid) { /* {{{ */
$this->_target = $target;
$this->_targettype = $targettype;
$this->_userid = $userid;

2
SeedDMS_Core/Core/inc.ClassObject.php
View File

@ -38,7 +38,7 @@ class SeedDMS_Core_Object { /* {{{ */
*/
public $_dms;
function SeedDMS_Core_Object($id) { /* {{{ */
function __construct($id) { /* {{{ */
$this->_id = $id;
$this->_dms = null;
} /* }}} */

2
SeedDMS_Core/Core/inc.ClassUser.php
View File

@ -134,7 +134,7 @@ class SeedDMS_Core_User { /* {{{ */
const role_admin = '1';
const role_guest = '2';
function SeedDMS_Core_User($id, $login, $pwd, $fullName, $email, $language, $theme, $comment, $role, $isHidden=0, $isDisabled=0, $pwdExpiration='0000-00-00 00:00:00', $loginFailures=0, $quota=0, $homeFolder=null) {
function __construct($id, $login, $pwd, $fullName, $email, $language, $theme, $comment, $role, $isHidden=0, $isDisabled=0, $pwdExpiration='0000-00-00 00:00:00', $loginFailures=0, $quota=0, $homeFolder=null) {
$this->_id = $id;
$this->_login = $login;
$this->_pwd = $pwd;

14
SeedDMS_Core/Core/inc.ClassWorkflow.php
View File

@ -56,7 +56,7 @@ class SeedDMS_Core_Workflow { /* {{{ */
*/
var $_dms;
function SeedDMS_Core_Workflow($id, $name, $initstate) { /* {{{ */
function __construct($id, $name, $initstate) { /* {{{ */
$this->_id = $id;
$this->_name = $name;
$this->_initstate = $initstate;
@ -390,7 +390,7 @@ class SeedDMS_Core_Workflow_State { /* {{{ */
*/
var $_dms;
function SeedDMS_Core_Workflow_State($id, $name, $maxtime, $precondfunc, $documentstatus) {
function __construct($id, $name, $maxtime, $precondfunc, $documentstatus) {
$this->_id = $id;
$this->_name = $name;
$this->_maxtime = $maxtime;
@ -543,7 +543,7 @@ class SeedDMS_Core_Workflow_Action { /* {{{ */
*/
var $_dms;
function SeedDMS_Core_Workflow_Action($id, $name) {
function __construct($id, $name) {
$this->_id = $id;
$this->_name = $name;
$this->_dms = null;
@ -685,7 +685,7 @@ class SeedDMS_Core_Workflow_Transition { /* {{{ */
*/
var $_dms;
function SeedDMS_Core_Workflow_Transition($id, $workflow, $state, $action, $nextstate, $maxtime) {
function __construct($id, $workflow, $state, $action, $nextstate, $maxtime) {
$this->_id = $id;
$this->_workflow = $workflow;
$this->_state = $state;
@ -890,7 +890,7 @@ class SeedDMS_Core_Workflow_Transition_User { /* {{{ */
*/
var $_dms;
function SeedDMS_Core_Workflow_Transition_User($id, $transition, $user) {
function __construct($id, $transition, $user) {
$this->_id = $id;
$this->_transition = $transition;
$this->_user = $user;
@ -964,7 +964,7 @@ class SeedDMS_Core_Workflow_Transition_Group { /* {{{ */
*/
var $_dms;
function SeedDMS_Core_Workflow_Transition_Group($id, $transition, $group, $numOfUsers) { /* {{{ */
function __construct($id, $transition, $group, $numOfUsers) { /* {{{ */
$this->_id = $id;
$this->_transition = $transition;
$this->_group = $group;
@ -1077,7 +1077,7 @@ class SeedDMS_Core_Workflow_Log { /* {{{ */
*/
var $_dms;
function SeedDMS_Core_Workflow_Log($id, $document, $version, $workflow, $user, $transition, $date, $comment) {
function __construct($id, $document, $version, $workflow, $user, $transition, $date, $comment) {
$this->_id = $id;
$this->_document = $document;
$this->_version = $version;

2
SeedDMS_Core/Core/inc.DBAccess.php
View File

@ -67,7 +67,7 @@ class SeedDMS_Core_DatabaseAccess {
* @param string $passw password of user
* @param string $database name of database
*/
function SeedDMS_Core_DatabaseAccess($driver, $hostname, $user, $passw, $database = false) {
function __construct($driver, $hostname, $user, $passw, $database = false) {
$this->_driver = $driver;
$this->_hostname = $hostname;
$this->_database = $database;

2
SeedDMS_Core/Core/inc.DBAccessPDO.php
View File

@ -128,7 +128,7 @@ class SeedDMS_Core_DatabaseAccess {
* @param string $passw password of user
* @param string $database name of database
*/
function SeedDMS_Core_DatabaseAccess($driver, $hostname, $user, $passw, $database = false) { /* {{{ */
function __construct($driver, $hostname, $user, $passw, $database = false) { /* {{{ */
$this->_driver = $driver;
$tmp = explode(":", $hostname);
$this->_hostname = $tmp[0];

2
SeedDMS_SQLiteFTS/package.xml
View File

@ -23,7 +23,7 @@
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
make it work with sqlite3 < 3.8.0
make it work with sqlite3 &lt; 3.8.0
</notes>
<contents>
<dir baseinstalldir="SeedDMS" name="/">

2
inc/inc.ClassSettings.php
View File

@ -240,7 +240,7 @@ class Settings { /* {{{ */
*
* @param string $configFilePath path to config file
*/
function Settings($configFilePath='') { /* {{{ */
function __construct($configFilePath='') { /* {{{ */
if($configFilePath=='') {
$configFilePath = $this->searchConfigFilePath();

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

@ -69,7 +69,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
$('#new-file').click(function(event) {
$("#upload-file").clone().appendTo("#upload-files").removeAttr("id").children('div').children('input').val('');

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

@ -63,7 +63,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -65,7 +65,7 @@ function checkForm()
$(document).ready( function() {
$('body').on('submit', '#fileupload', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

3
views/bootstrap/class.AddSubFolder.php
View File

@ -32,6 +32,7 @@ require_once("class.Bootstrap.php");
class SeedDMS_View_AddSubFolder extends SeedDMS_Bootstrap_Style {
function js() { /* {{{ */
$strictformcheck = $this->params['strictformcheck'];
header('Content-Type: application/javascript');
?>
function checkForm()
@ -62,7 +63,7 @@ function checkForm()
$(document).ready( function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -77,11 +77,11 @@ function checkGrpForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkIndForm()) return;
event.preventDefault();
ev.preventDefault();
});
$('body').on('submit', '#form2', function(ev){
if(checkGrpForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -39,7 +39,7 @@ class SeedDMS_View_AttributeMgr extends SeedDMS_Bootstrap_Style {
$(document).ready( function() {
$('body').on('submit', '#form', function(ev){
// if(checkForm()) return;
// event.preventDefault();
// ev.preventDefault();
});
$( "#selector" ).change(function() {
$('div.ajax').trigger('update', {attrdefid: $(this).val()});

6
views/bootstrap/class.DefaultKeywords.php
View File

@ -100,15 +100,15 @@ function checkKeywordForm()
$(document).ready( function() {
$('body').on('submit', '#form', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
$('body').on('submit', '.formk', function(ev){
if(checkKeywordForm()) return;
event.preventDefault();
ev.preventDefault();
});
$('body').on('submit', '.formn', function(ev){
if(checkFormName()) return;
event.preventDefault();
ev.preventDefault();
});
$( "#selector" ).change(function() {
$('div.ajax').trigger('update', {categoryid: $(this).val()});

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

@ -68,7 +68,7 @@ function checkForm()
$(document).ready( function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -58,7 +58,7 @@ function checkForm()
$(document).ready( function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -62,7 +62,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -67,7 +67,7 @@ function checkForm()
$(document).ready( function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -63,7 +63,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -62,7 +62,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -59,7 +59,7 @@ function checkForm()
$(document).ready( function() {
$('body').on('submit', '#form', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -65,7 +65,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -57,7 +57,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -61,7 +61,7 @@ function checkForm()
$(document).ready( function() {
$('body').on('submit', '#form', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -85,13 +85,13 @@ $(document).ready( function() {
$('body').on('submit', '#form_1', function(ev){
if(checkForm1())
return;
event.preventDefault();
ev.preventDefault();
});
$('body').on('submit', '#form_2', function(ev){
if(checkForm2())
return;
event.preventDefault();
ev.preventDefault();
});
$( "#selector" ).change(function() {

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

@ -56,7 +56,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -56,7 +56,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
document.form1.email.focus();

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

@ -55,7 +55,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -77,11 +77,11 @@ function checkGrpForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkIndForm()) return;
event.preventDefault();
ev.preventDefault();
});
$('body').on('submit', '#form2', function(ev){
if(checkGrpForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -62,7 +62,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -56,7 +56,7 @@ function checkForm()
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -72,7 +72,7 @@ function checkForm()
$(document).ready( function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
});
<?php

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

@ -54,7 +54,7 @@ showKeywords(sel);
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
$( "#selector" ).change(function() {
showKeywords(this);

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

@ -71,7 +71,7 @@ function checkForm()
$(document).ready( function() {
$('body').on('submit', '#form', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
$( "#selector" ).change(function() {
$('div.ajax').trigger('update', {userid: $(this).val()});

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

@ -58,7 +58,7 @@ function checkForm(num)
$(document).ready( function() {
$('body').on('submit', '#form', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
$( "#selector" ).change(function() {
$('div.ajax').trigger('update', {workflowactionid: $(this).val()});

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

@ -60,7 +60,7 @@ function checkForm(num)
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
$( "#selector" ).change(function() {
$('div.ajax').trigger('update', {workflowid: $(this).val()});

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

@ -59,7 +59,7 @@ function checkForm(num)
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
if(checkForm()) return;
event.preventDefault();
ev.preventDefault();
});
$( "#selector" ).change(function() {
$('div.ajax').trigger('update', {workflowstateid: $(this).val()});