Browse code

Parse Error, hatte ich gar nicht bemerkt...

git-svn-id: https://svn.schokokeks.org/repos/tools/webinterface/trunk@560 87cf0b9e-d624-0410-a070-f6ee81989793

bernd authored on28/07/2007 17:20:15
Showing5 changed files
... ...
@@ -9,8 +9,6 @@ require_once('inc/security.php');
9 9
 
10 10
 require_role(ROLE_CUSTOMER);
11 11
 
12
-DEBUG("GET: ".htmlentities(print_r($_GET, true))." / POST: ".htmlentities(print_r($_POST, true)));
13
-
14 12
 $jabberaccounts = get_jabber_accounts();
15 13
 
16 14
 output("<h3>Jabber-Accounts</h3>
... ...
@@ -8,8 +8,6 @@ require_role(ROLE_CUSTOMER);
8 8
 
9 9
 $title = "Neues Jabber-Konto erstellen";
10 10
 
11
-DEBUG("GET: ".htmlentities(print_r($_GET, true))." / POST: ".htmlentities(print_r($_POST, true)));
12
-
13 11
 $account = get_jabberaccount_details($_GET['account']);
14 12
 $account_string = $account['local'].'@'.$account['domain'];
15 13
 
... ...
@@ -4,6 +4,7 @@ require_once("inc/debug.php");
4 4
 require_once("inc/db_connect.php");
5 5
 require_once("inc/security.php");
6 6
 
7
+require_once('class/domain.php');
7 8
 
8 9
 function get_jabber_accounts() {
9 10
   require_role(ROLE_CUSTOMER);
... ...
@@ -29,7 +30,13 @@ function get_jabberaccount_details($id)
29 30
   if (mysql_num_rows($result) != 1)
30 31
     system_failure("Invalid account");
31 32
   $data = mysql_fetch_assoc($result);
32
-  $data['domain'] = get_domain_name($data['domain']);
33
+  if ($data['domain'] == NULL)
34
+    $data['domain'] = 'schokokeks.org';
35
+  else
36
+  {
37
+    $dom = new Domain((int) $data['domain']);
38
+    $data['domain'] = $dom->fqdn;
39
+  }
33 40
   return $data;
34 41
 }
35 42
 
... ...
@@ -9,8 +9,6 @@ require_role(ROLE_CUSTOMER);
9 9
 
10 10
 $title = "Neues Jabber-Konto erstellen";
11 11
 
12
-DEBUG("GET: ".htmlentities(print_r($_GET, true))." / POST: ".htmlentities(print_r($_POST, true)));
13
-
14 12
 $jabberdomains = get_jabberable_domains();
15 13
 
16 14
 $options = '';
... ...
@@ -2,7 +2,6 @@
2 2
 
3 3
 require_once('session/start.php');
4 4
 
5
-require_once('domains.php');
6 5
 require_once('jabberaccounts.php');
7 6
 
8 7
 require_once('inc/security.php');
... ...
@@ -12,7 +11,6 @@ require_role(ROLE_CUSTOMER);
12 11
 
13 12
 require_once("inc/debug.php");
14 13
 global $debugmode;
15
-DEBUG("GET: ".htmlentities(print_r($_GET, true))." / POST: ".htmlentities(print_r($_POST, true)));
16 14
 
17 15
 if ($_GET['action'] == 'new')
18 16
 {
... ...
@@ -33,6 +31,7 @@ if ($_GET['action'] == 'new')
33 31
 elseif ($_GET['action'] == 'chpass')
34 32
 {
35 33
   check_form_token('jabber_chpass');
34
+  get_jabberaccount_details($_POST['accountid']);
36 35
   if ($_POST['newpass'] == '' ||
37 36
       $_POST['newpass2'] == '' ||
38 37
       $_POST['newpass'] != $_POST['newpass2'] ||