gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 17:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2016-04-22 12:39:41 +02:00
commit b4e2224c3e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
op/op.AddDocument.php
View File

@ -61,12 +61,12 @@ if($settings->_quota > 0) {
}
}
$comment = $_POST["comment"];
$version_comment = $_POST["version_comment"];
$comment = trim($_POST["comment"]);
$version_comment = trim($_POST["version_comment"]);
if($version_comment == "" && isset($_POST["use_comment"]))
$version_comment = $comment;
$keywords = $_POST["keywords"];
$keywords = trim($_POST["keywords"]);
$categories = isset($_POST["categories"]) ? $_POST["categories"] : null;
$cats = array();
if($categories) {
@ -354,7 +354,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
}
if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!=""))
$name = $_POST["name"];
$name = trim($_POST["name"]);
else $name = basename($userfilename);
/* Check if name already exists in the folder */

6
op/op.EditDocument.php
View File

@ -52,9 +52,9 @@ if($document->isLocked()) {
}
}
$name = isset($_POST['name']) ? $_POST["name"] : "";
$comment = isset($_POST['comment']) ? $_POST["comment"] : "";
$keywords = isset($_POST["keywords"]) ? $_POST["keywords"] : "";
$name = isset($_POST['name']) ? trim($_POST["name"]) : "";
$comment = isset($_POST['comment']) ? trim($_POST["comment"]) : "";
$keywords = isset($_POST["keywords"]) ? trim($_POST["keywords"]) : "";
if(isset($_POST['categoryidform1'])) {
$categories = explode(',', preg_replace('/[^0-9,]+/', '', $_POST["categoryidform1"]));
} elseif(isset($_POST["categories"])) {