yetangitu/lam
1
0
Fork 0
mirror of https://github.com/LDAPAccountManager/lam.git synced 2025-10-06 03:49:56 +02:00
Code Issues Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
Roland Gruber 2025-01-14 07:40:54 +01:00
parent 1a489d6688
commit c0d027e7ad
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lam/lib/schema.inc
View file

@ -4,7 +4,7 @@ namespace LAM\SCHEMA;
/* /*
Copyright (C) 2004 David Smith Copyright (C) 2004 David Smith
modified to fit for LDAP Account Manager 2005 - 2024 Roland Gruber modified to fit for LDAP Account Manager 2005 - 2025 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -612,7 +612,7 @@ class AttributeType extends SchemaItem {
$i++; $i++;
do { do {
$i++; $i++;
if (strlen($this->name) == 0) { if (empty($this->name)) {
$this->name = $strings[$i]; $this->name = $strings[$i];
} }
else { else {
@ -632,7 +632,7 @@ class AttributeType extends SchemaItem {
case 'DESC': case 'DESC':
do { do {
$i++; $i++;
if (strlen($this->description) == 0) { if (empty($this->description)) {
$this->description .= $strings[$i]; $this->description .= $strings[$i];
} }
else { else {
@ -702,10 +702,14 @@ class AttributeType extends SchemaItem {
$this->description = preg_replace("/^\'/", "", $this->description); $this->description = preg_replace("/^\'/", "", $this->description);
$this->description = preg_replace("/\'$/", "", $this->description); $this->description = preg_replace("/\'$/", "", $this->description);
} }
$this->syntax = preg_replace("/^\'/", "", $this->syntax); if (!empty($this->syntax)) {
$this->syntax = preg_replace("/\'$/", "", $this->syntax); $this->syntax = preg_replace("/^\'/", "", $this->syntax);
$this->syntax_oid = preg_replace("/^\'/", "", $this->syntax_oid); $this->syntax = preg_replace("/\'$/", "", $this->syntax);
$this->syntax_oid = preg_replace("/\'$/", "", $this->syntax_oid); }
if (!empty($this->syntax_oid)) {
$this->syntax_oid = preg_replace("/^\'/", "", $this->syntax_oid);
$this->syntax_oid = preg_replace("/\'$/", "", $this->syntax_oid);
}
if ($this->sup_attribute !== null) { if ($this->sup_attribute !== null) {
$this->sup_attribute = preg_replace("/^\'/", "", $this->sup_attribute); $this->sup_attribute = preg_replace("/^\'/", "", $this->sup_attribute);
$this->sup_attribute = preg_replace("/\'$/", "", $this->sup_attribute); $this->sup_attribute = preg_replace("/\'$/", "", $this->sup_attribute);
@ -1016,7 +1020,7 @@ class Syntax extends SchemaItem {
case 'DESC': case 'DESC':
do { do {
$i++; $i++;
if (strlen($this->description) == 0) { if (empty($this->description)) {
$this->description .= $strings[$i]; $this->description .= $strings[$i];
} }
else { else {
@ -1076,7 +1080,7 @@ class MatchingRule extends SchemaItem {
if ($strings[$i + 1] !== "(") { if ($strings[$i + 1] !== "(") {
do { do {
$i++; $i++;
if (strlen($this->name) == 0) { if (empty($this->name)) {
$this->name = $strings[$i]; $this->name = $strings[$i];
} }
else { else {
@ -1129,8 +1133,10 @@ class MatchingRule extends SchemaItem {
} }
} }
} }
$this->description = preg_replace("/^\'/", "", $this->description); if (!empty($this->description)) {
$this->description = preg_replace("/\'$/", "", $this->description); $this->description = preg_replace("/^\'/", "", $this->description);
$this->description = preg_replace("/\'$/", "", $this->description);
}
} }
/** /**