diff --git a/cis/private/tools/feedback.php b/cis/private/tools/feedback.php
index 73372fc95..814c56afa 100644
--- a/cis/private/tools/feedback.php
+++ b/cis/private/tools/feedback.php
@@ -26,19 +26,19 @@
* Formular zum Senden eins Feedbacks an die CIS-Administratoren
*/
require_once('../../../config/cis.config.inc.php');
- require_once('../../../include/basis_db.class.php');
- if (!$db = new basis_db())
- die($p->t("global/fehlerBeimOeffnenDerDatenbankverbindung"));
-
+ require_once('../../../include/basis_db.class.php');
require_once('../../../include/functions.inc.php');
require_once('../../../include/mail.class.php');
require_once('../../../include/phrasen.class.php');
- $sprache = getSprache();
- $p=new phrasen($sprache);
+$sprache = getSprache();
+$p=new phrasen($sprache);
- if (!$user=get_uid())
- die($p->t("global/nichtAngemeldet").'! Zurück');
+if (!$db = new basis_db())
+ die($p->t("global/fehlerBeimOeffnenDerDatenbankverbindung"));
+
+if (!$user=get_uid())
+ die($p->t("global/nichtAngemeldet").'! Zurück');
?>
diff --git a/cis/private/tools/notebook_registration.php b/cis/private/tools/notebook_registration.php
index 2435cbb4d..5d5bd08cd 100644
--- a/cis/private/tools/notebook_registration.php
+++ b/cis/private/tools/notebook_registration.php
@@ -1,58 +1,54 @@
t("global/fehlerBeimOeffnenDerDatenbankverbindung"));
+if (!$user=get_uid())
+ die($p->t("global/nichtAngemeldet").'! '.$p->t("global/zurueck").'');
- require_once('../../../include/basis_db.class.php');
- if (!$db = new basis_db())
- die($p->t("global/fehlerBeimOeffnenDerDatenbankverbindung"));
-
- require_once('../../../include/functions.inc.php');
- require_once('../../../include/File/SearchReplace.php');
- require_once('../../../include/File/Match.php');
- require_once('../../../include/phrasen.class.php');
+$mac_result = trim((isset($_REQUEST['mac_result']) ? $_REQUEST['mac_result']:''));
+$txtUID = trim((isset($_REQUEST['txtUID']) ? $_REQUEST['txtUID']:''));
+$txtPassword = trim((isset($_REQUEST['txtPassword']) ? $_REQUEST['txtPassword']:''));
- if (!$user=get_uid())
- die($p->t("global/nichtAngemeldet").'! '.$p->t("global/zurueck").'');
-
- $sprache = getSprache();
- $p=new phrasen($sprache);
-
-
- $mac_result = trim((isset($_REQUEST['mac_result']) ? $_REQUEST['mac_result']:''));
- $txtUID = trim((isset($_REQUEST['txtUID']) ? $_REQUEST['txtUID']:''));
- $txtPassword = trim((isset($_REQUEST['txtPassword']) ? $_REQUEST['txtPassword']:''));
-
- if(check_lektor($user))
- $is_lector=true;
- else
- $is_lector=false;
+if(check_lektor($user))
+ $is_lector=true;
+else
+ $is_lector=false;
- function ip_increment($ip = "")
+function ip_increment($ip = "")
+{
+ $ip = split("\.", $ip);
+
+ if($ip[3] > 0 && $ip[3] < 254)
{
- $ip = split("\.", $ip);
-
- if($ip[3] > 0 && $ip[3] < 254)
- {
- ++$ip[3];
- }
- else
- {
- ++$ip[2];
- $ip[3] = 1;
- }
-
- return join(".", $ip);
+ ++$ip[3];
}
+ else
+ {
+ ++$ip[2];
+ $ip[3] = 1;
+ }
+ return join(".", $ip);
+}
?>
diff --git a/cis/private/tools/psearch.php b/cis/private/tools/psearch.php
index 840c13857..ec463338c 100644
--- a/cis/private/tools/psearch.php
+++ b/cis/private/tools/psearch.php
@@ -31,11 +31,12 @@ require_once('../../../include/benutzerfunktion.class.php');
require_once('../../../include/globals.inc.php');
require_once('../../../include/phrasen.class.php');
+$sprache = getSprache();
+ $p=new phrasen($sprache);
+
if (!$db = new basis_db())
die($p->t("global/fehlerBeimOeffnenDerDatenbankverbindung"));
- $sprache = getSprache();
- $p=new phrasen($sprache);
$uid=get_uid();
$cmbLektorMitarbeiter=(isset($_REQUEST['cmbLektorMitarbeiter'])?$_REQUEST['cmbLektorMitarbeiter']:'all');
@@ -830,7 +831,7 @@ if(isset($do_search) || $do_excel)