diff --git a/core/trunk/core/class/class_security.php b/core/trunk/core/class/class_security.php
index 3e8ad870babf977e3da3a8ce725cf16da7e8487a..f7a5cb7f6f1ad69cd3794866bd181e1ac5fc29d4 100644
--- a/core/trunk/core/class/class_security.php
+++ b/core/trunk/core/class/class_security.php
@@ -183,7 +183,7 @@ class security extends Database
time() . '%' . $array['FirstName'] . '%' . $array['UserId']
. '%' . $array['UserId'] . '%' . date('dmYHmi') . '%'
);
- $user->__set('cookie_key', functions::protect_string_db($key));
+ $user->__set('cookie_key', $key);
if ($_SESSION['config']['databasetype'] == 'ORACLE') {
$user->__set('cookie_date', 'SYSDATE');
} else {
@@ -341,7 +341,7 @@ class security extends Database
/*setcookie("maarch", "UserId=".$_SESSION['user']['UserId']."&key=".$line->cookie_key,time()-3600000, 0, 0, $_SERVER["HTTPS"], 1);*/
$key = md5(time()."%".$_SESSION['user']['FirstName']."%".$_SESSION['user']['UserId']."%".$_SESSION['user']['UserId']."%".date("dmYHmi")."%");
- $user->__set('cookie_key', functions::protect_string_db($key));
+ $user->__set('cookie_key', $key);
if ($_SESSION['config']['databasetype'] == "ORACLE")
$user->__set('cookie_date', 'SYSDATE');
else
diff --git a/core/trunk/core/class/docserver_locations_controler.php b/core/trunk/core/class/docserver_locations_controler.php
index 7405f8b962d23ecb57a6db98b1c7e43d142f389b..9799fcf566cf51c6cbae595d68be49c25d90b2a6 100644
--- a/core/trunk/core/class/docserver_locations_controler.php
+++ b/core/trunk/core/class/docserver_locations_controler.php
@@ -167,25 +167,21 @@ class docserver_locations_controler extends ObjectControler
&& !empty($docserverLocations->docserver_location_id)) {
// Update, so values exist
$docserverLocations->docserver_location_id =
- $f->protect_string_db(
- $f->wash(
- $docserverLocations->docserver_location_id,
- 'nick', _DOCSERVER_LOCATION_ID . ' ',
- 'yes', 0, 32
- )
+ $f->wash(
+ $docserverLocations->docserver_location_id,
+ 'nick', _DOCSERVER_LOCATION_ID . ' ',
+ 'yes', 0, 32
);
} else {
$error .= _DOCSERVER_LOCATION_ID . ' ' . _IS_EMPTY . '#';
}
$docserverLocations->ipv4 =
- $f->protect_string_db(
- $f->wash(
- $docserverLocations->ipv4,
- 'no', _IPV4 . ' ',
- 'yes',
- 0,
- 255
- )
+ $f->wash(
+ $docserverLocations->ipv4,
+ 'no', _IPV4 . ' ',
+ 'yes',
+ 0,
+ 255
);
if (!$this->ipv4Control($docserverLocations->ipv4)) {
$error .= _IP_V4_FORMAT_NOT_VALID . '#';
@@ -195,54 +191,46 @@ class docserver_locations_controler extends ObjectControler
$error .= _IP_V4_ADRESS_NOT_VALID . '#';
}*/
$docserverLocations->ipv6 =
- $f->protect_string_db(
- $f->wash(
- $docserverLocations->ipv6,
- 'no',
- _IPV6 . ' ',
- 'no',
- 0,
- 255
- )
+ $f->wash(
+ $docserverLocations->ipv6,
+ 'no',
+ _IPV6 . ' ',
+ 'no',
+ 0,
+ 255
);
if (!$this->ipv6Control($docserverLocations->ipv6)) {
$error .= _IP_V6_NOT_VALID . '#';
}
$docserverLocations->net_domain =
- $f->protect_string_db(
- $f->wash(
- $docserverLocations->net_domain,
- 'no',
- _NET_DOMAIN . ' ',
- 'no',
- 0,
- 32
- )
+ $f->wash(
+ $docserverLocations->net_domain,
+ 'no',
+ _NET_DOMAIN . ' ',
+ 'no',
+ 0,
+ 32
);
$docserverLocations->mask =
- $f->protect_string_db(
- $f->wash(
- $docserverLocations->mask,
- 'no',
- _MASK . ' ',
- 'no',
- 0,
- 255
- )
+ $f->wash(
+ $docserverLocations->mask,
+ 'no',
+ _MASK . ' ',
+ 'no',
+ 0,
+ 255
);
if (!$this->maskControl($docserverLocations->mask)) {
$error .= _MASK_NOT_VALID . '#';
}
$docserverLocations->net_link =
- $f->protect_string_db(
- $f->wash(
- $docserverLocations->net_link,
- 'no',
- _NET_LINK . ' ',
- 'no',
- 0,
- 255
- )
+ $f->wash(
+ $docserverLocations->net_link,
+ 'no',
+ _NET_LINK . ' ',
+ 'no',
+ 0,
+ 255
);
if ($mode == 'add'
&& $this->docserverLocationExists(
diff --git a/core/trunk/core/class/docserver_types_controler.php b/core/trunk/core/class/docserver_types_controler.php
index 4d93e9d8ca76721b8eb6d6da080a4868a792ab44..9ef32c3f099d17ec95052aba80632a5dba9bd06f 100644
--- a/core/trunk/core/class/docserver_types_controler.php
+++ b/core/trunk/core/class/docserver_types_controler.php
@@ -126,50 +126,50 @@ class docserver_types_controler extends ObjectControler implements ObjectControl
$error = "";
if (isset($docserver_types->docserver_type_id) && !empty($docserver_types->docserver_type_id)) {
// Update, so values exist
- $docserver_types->docserver_type_id=$f->protect_string_db($f->wash($docserver_types->docserver_type_id, "nick", _DOCSERVER_TYPE_ID." ", "yes", 0, 32));
+ $docserver_types->docserver_type_id=$f->wash($docserver_types->docserver_type_id, "nick", _DOCSERVER_TYPE_ID." ", "yes", 0, 32);
} else {
$error .= _DOCSERVER_TYPE_ID . " " . _IS_EMPTY . "#";
}
- $docserver_types->docserver_type_label=$f->protect_string_db($f->wash($docserver_types->docserver_type_label, "no", _DOCSERVER_TYPE_LABEL." ", 'yes', 0, 255));
- $docserver_types->is_container=$f->protect_string_db($f->wash($docserver_types->is_container, "no", _IS_CONTAINER." ", 'yes', 0, '5'));
+ $docserver_types->docserver_type_label=$f->wash($docserver_types->docserver_type_label, "no", _DOCSERVER_TYPE_LABEL." ", 'yes', 0, 255);
+ $docserver_types->is_container=$f->wash($docserver_types->is_container, "no", _IS_CONTAINER." ", 'yes', 0, '5');
if ($docserver_types->is_container == "false" || $docserver_types->is_container == "N") {
$docserver_types->is_container=false;
$docserver_types->container_max_number = 0;
} else {
$docserver_types->is_container=true;
- $docserver_types->container_max_number=$f->protect_string_db($f->wash($docserver_types->container_max_number, "no", _CONTAINER_MAX_NUMBER." ", 'yes', 0, 6));
+ $docserver_types->container_max_number=$f->wash($docserver_types->container_max_number, "no", _CONTAINER_MAX_NUMBER." ", 'yes', 0, 6);
}
- $docserver_types->is_compressed=$f->protect_string_db($f->wash($docserver_types->is_compressed, "no", _IS_COMPRESSED." ", 'yes', 0, '5'));
+ $docserver_types->is_compressed=$f->wash($docserver_types->is_compressed, "no", _IS_COMPRESSED." ", 'yes', 0, '5');
if ($docserver_types->is_compressed == "false" || $docserver_types->is_compressed == "N") {
$docserver_types->is_compressed=false;
$docserver_types->compression_mode = "NONE";
} else {
$docserver_types->is_compressed=true;
- $docserver_types->compression_mode=$f->protect_string_db($f->wash($docserver_types->compression_mode, "no", _COMPRESSION_MODE." ", 'yes', 0, 32));
+ $docserver_types->compression_mode=$f->wash($docserver_types->compression_mode, "no", _COMPRESSION_MODE." ", 'yes', 0, 32);
}
- $docserver_types->is_meta=$f->protect_string_db($f->wash($docserver_types->is_meta, "no", _IS_META." ", 'yes', 0, '5'));
+ $docserver_types->is_meta=$f->wash($docserver_types->is_meta, "no", _IS_META." ", 'yes', 0, '5');
if ($docserver_types->is_meta == "false" || $docserver_types->is_meta == "N") {
$docserver_types->is_meta=false;
$docserver_types->meta_template = "NONE";
} else {
$docserver_types->is_meta=true;
- $docserver_types->meta_template=$f->protect_string_db($f->wash($docserver_types->meta_template, "no", _META_TEMPLATE." ", 'yes', 0, 32));
+ $docserver_types->meta_template=$f->wash($docserver_types->meta_template, "no", _META_TEMPLATE." ", 'yes', 0, 32);
}
- $docserver_types->is_logged=$f->protect_string_db($f->wash($docserver_types->is_logged, "no", _IS_LOGGED." ", 'yes', 0, '5'));
+ $docserver_types->is_logged=$f->wash($docserver_types->is_logged, "no", _IS_LOGGED." ", 'yes', 0, '5');
if ($docserver_types->is_logged == "false" || $docserver_types->is_logged == "N") {
$docserver_types->is_logged=false;
$docserver_types->log_template = "NONE";
} else {
$docserver_types->is_logged=true;
- $docserver_types->log_template=$f->protect_string_db($f->wash($docserver_types->log_template, "no", _LOG_TEMPLATE." ", 'yes', 0, 32));
+ $docserver_types->log_template=$f->wash($docserver_types->log_template, "no", _LOG_TEMPLATE." ", 'yes', 0, 32);
}
- $docserver_types->is_signed=$f->protect_string_db($f->wash($docserver_types->is_signed, "no", _IS_SIGNED." ", 'yes', 0, '5'));
+ $docserver_types->is_signed=$f->wash($docserver_types->is_signed, "no", _IS_SIGNED." ", 'yes', 0, '5');
if ($docserver_types->is_signed == "false" || $docserver_types->is_signed == "N") {
$docserver_types->is_signed=false;
$docserver_types->fingerprint_mode = "NONE";
} else {
$docserver_types->is_signed=true;
- $docserver_types->fingerprint_mode=$f->protect_string_db($f->wash($docserver_types->fingerprint_mode, "no", _FINGERPRINT_MODE." ", 'yes', 0, 32));
+ $docserver_types->fingerprint_mode=$f->wash($docserver_types->fingerprint_mode, "no", _FINGERPRINT_MODE." ", 'yes', 0, 32);
}
if ($mode == "add" && $this->docserverTypeExists($docserver_types->docserver_type_id)) {
$error .= $docserver_types->docserver_type_id." "._ALREADY_EXISTS."#";
diff --git a/core/trunk/core/class/docservers_controler.php b/core/trunk/core/class/docservers_controler.php
index 275f1ea95e1b00e39918a2a632871b7609535bb3..e895ef13352676ba8da1d342c3571cd43b8e17fa 100644
--- a/core/trunk/core/class/docservers_controler.php
+++ b/core/trunk/core/class/docservers_controler.php
@@ -164,19 +164,18 @@ class docservers_controler
if (isset($docserver->docserver_id)
&& $docserver->docserver_id <> ''
) {
- $docserver->docserver_id = $f->protect_string_db(
+ $docserver->docserver_id =
$f->wash(
$docserver->docserver_id,
'nick',
_DOCSERVER_ID . ' ',
'yes', 0, 32
- )
- );
+ );
} else {
$error .= _DOCSERVER_ID . ' ' . _IS_EMPTY . '#';
}
}
- $docserver->docserver_type_id = $f->protect_string_db(
+ $docserver->docserver_type_id =
$f->wash(
$docserver->docserver_type_id,
'no',
@@ -184,9 +183,8 @@ class docservers_controler
'yes',
0,
32
- )
- );
- $docserver->device_label = $f->protect_string_db(
+ );
+ $docserver->device_label =
$f->wash(
$docserver->device_label,
'no',
@@ -194,12 +192,11 @@ class docservers_controler
'yes',
0,
255
- )
- );
+ );
if ($docserver->is_readonly == '') {
$docserver->is_readonly = 'false';
}
- $docserver->is_readonly = $f->protect_string_db(
+ $docserver->is_readonly =
$f->wash(
$docserver->is_readonly,
'no',
@@ -207,8 +204,7 @@ class docservers_controler
'yes',
0,
5
- )
- );
+ );
if ($docserver->is_readonly == 'false') {
$docserver->is_readonly = false;
} else {
@@ -217,7 +213,7 @@ class docservers_controler
if (isset($docserver->size_limit_number)
&& !empty($docserver->size_limit_number)
) {
- $docserver->size_limit_number = $f->protect_string_db(
+ $docserver->size_limit_number =
$f->wash(
$docserver->size_limit_number,
'no',
@@ -225,8 +221,7 @@ class docservers_controler
'yes',
0,
255
- )
- );
+ );
if ($docserver->size_limit_number == 0) {
$error .= _SIZE_LIMIT . ' ' . _IS_EMPTY . '#';
}
@@ -239,7 +234,7 @@ class docservers_controler
} else {
$error .= _SIZE_LIMIT . ' ' . _IS_EMPTY . '#';
}
- $docserver->path_template = $f->protect_string_db(
+ $docserver->path_template =
$f->wash(
$docserver->path_template,
'no',
@@ -247,8 +242,7 @@ class docservers_controler
'yes',
0,
255
- )
- );
+ );
if (!is_dir($docserver->path_template)) {
$error .= _PATH_OF_DOCSERVER_UNAPPROACHABLE . '#';
} else {
@@ -259,7 +253,7 @@ class docservers_controler
$error .= _THE_DOCSERVER_DOES_NOT_HAVE_THE_ADEQUATE_RIGHTS;
}
}
- $docserver->coll_id = $f->protect_string_db(
+ $docserver->coll_id =
$f->wash(
$docserver->coll_id,
'no',
@@ -267,9 +261,8 @@ class docservers_controler
'yes',
0,
32
- )
- );
- $docserver->priority_number = $f->protect_string_db(
+ );
+ $docserver->priority_number =
$f->wash(
$docserver->priority_number,
'num',
@@ -277,9 +270,8 @@ class docservers_controler
'yes',
0,
6
- )
- );
- $docserver->docserver_location_id = $f->protect_string_db(
+ );
+ $docserver->docserver_location_id =
$f->wash(
$docserver->docserver_location_id,
'no',
@@ -287,9 +279,8 @@ class docservers_controler
'yes',
0,
32
- )
- );
- $docserver->adr_priority_number = $f->protect_string_db(
+ );
+ $docserver->adr_priority_number =
$f->wash(
$docserver->adr_priority_number,
'num',
@@ -297,8 +288,7 @@ class docservers_controler
'yes',
0,
6
- )
- );
+ );
if ($mode == 'add'
&& $this->docserversExists($docserver->docserver_id)
) {
diff --git a/core/trunk/core/class/usergroups_controler.php b/core/trunk/core/class/usergroups_controler.php
index 168f99b6eb1f7e2b80f4a050bf56116a129dc4c9..99b0e807e9ce77b36907e7aa735e7ae09b764f30 100644
--- a/core/trunk/core/class/usergroups_controler.php
+++ b/core/trunk/core/class/usergroups_controler.php
@@ -318,19 +318,11 @@ class usergroups_controler extends ObjectControler implements ObjectControlerIF
if ($security[$i] <> "") {
$values = array(
'group_id' => $group->group_id,
- 'coll_id' => $func->protect_string_db(
- $security[$i]['COLL_ID']
- ),
- 'where_clause' => $func->protect_string_db(
- $security[$i]['WHERE_CLAUSE']
- ),
- 'maarch_comment' => $func->protect_string_db(
- $security[$i]['COMMENT']
- ),
- 'where_target' => $func->protect_string_db(
- $security[$i]['WHERE_TARGET']
- )
- );
+ 'coll_id' => $security[$i]['COLL_ID'],
+ 'where_clause' => $security[$i]['WHERE_CLAUSE'],
+ 'maarch_comment' => $security[$i]['COMMENT'],
+ 'where_target' => $security[$i]['WHERE_TARGET']
+ );
$bitmask = '0';
if (isset($security[$i]['RIGHTS_BITMASK'])