webinterface.git

@@ -69,6 +69,16 @@ function config($key, $localonly = false)

     return NULL;

 }

+function have_role($role) {

+    $have = $_SESSION['role'] & $role;

+    if ($have) {

+        DEBUG("Current user has role ".$role);

+    } else {

+        DEBUG("Current user does not have role ".$role);

+    }

+    return $have;

+}

+

 function get_server_by_id($id) {

   $id = (int) $id;

   $result = db_query("SELECT hostname FROM system.servers WHERE id=?", array($id));

@@ -112,18 +112,25 @@ function show_messages()

 function require_role($roles)

 {

-  if (! is_array($roles))

+  if (! is_array($roles)) {

     $roles = array($roles);

+  }

   $allow = false;

-  foreach ($roles as $role)

-    if ($role & $_SESSION['role'])

+  foreach ($roles as $role) {

+    if ($role & $_SESSION['role']) {

       $allow = true;

-  if (! $allow)

-    if ($_SESSION['role'] == ROLE_ANONYMOUS)

+    }

+  }

+  if (! $allow) {

+    if ($_SESSION['role'] == ROLE_ANONYMOUS) {

       login_screen();

-    else

+    } else {

+      $backtrace = debug_backtrace();

+      DEBUG($backtrace[0]['file'].':'.$backtrace[0]['line'].': Current user does not have any of the required roles: '.implode(",",$roles));

       login_screen("Diese Seite können Sie mit Ihren aktuellen Zugriffsrechten nicht benutzen, bitte melden Sie sich mit den benötigten Zugriffsrechten an!");

     }

+  }

+}

 function login_screen($why = NULL)

@@ -23,6 +23,9 @@ require_once('domainapi.php');

 require_once('domains.php');

 require_role(ROLE_CUSTOMER);

+if (! config('http.net-apikey')) {

+    system_failure("Dieses System ist nicht eingerichtet zum Hinzufügen von Domains");

+}

 title("Domain hinzufügen");

 $section='domains_domains';

@@ -19,9 +19,8 @@ require_once('inc/icons.php');

 require_once('class/domain.php');

 require_once('domains.php');

-require_once('domainapi.php');

-require_role(ROLE_CUSTOMER);

+require_role(array(ROLE_CUSTOMER, ROLE_SYSTEMUSER));

 $dom = NULL;

 if (isset($_REQUEST['id'])) {

@@ -35,7 +34,11 @@ if (isset($_REQUEST['id'])) {

 if (!$dom) {

     system_failure("Keine Domain gewählt!");

 }

+if (have_role(ROLE_CUSTOMER)) {

     $dom->ensure_customerdomain();

+} else {

+    $dom->ensure_userdomain();

+}

 title("Domain {$dom->fqdn}");

 $section = 'domains_domains';

@@ -43,7 +46,7 @@ $section = 'domains_domains';

 // Block zuständiger Useraccount

 $useraccounts = list_useraccounts();

-if ($_SESSION['role'] & ROLE_CUSTOMER && count($useraccounts) > 1) {

+if (have_role(ROLE_CUSTOMER) && count($useraccounts) > 1) {

     // Mehrere User vorhanden

     $options = array();

     foreach ($useraccounts as $u) {

@@ -60,9 +63,10 @@ if ($_SESSION['role'] & ROLE_CUSTOMER && count($useraccounts) > 1) {

 // Block Domain-Inhaber 

-if ($dom->provider == 'terions' && ($dom->cancel_date === NULL || $dom->cancel_date > date('Y-m-d'))) {

+if (have_role(ROLE_CUSTOMER) && config('http.net-apikey') && $dom->provider == 'terions' && ($dom->cancel_date === NULL || $dom->cancel_date > date('Y-m-d'))) {

     use_module('contacts');

     require_once('contacts.php');

+    require_once('domainapi.php');

     output('<h4>Inhaberwechsel der Domain</h4>');

     output('<p>Legen Sie hier einen neuen Inhaber für diese Domain fest.</p>');

@@ -131,6 +135,7 @@ if ($dom->provider == 'terions' && ($dom->cancel_date === NULL || $dom->cancel_d

 // Block Externe Domain umziehen

+if (have_role(ROLE_CUSTOMER) && config('http.net-apikey')) {

     if ($dom->status == 'prereg') {

         output('<h4>Domain-Registrierung abschließen</h4>

                 <p>'.internal_link('domainreg', 'Domain registrieren', "domain={$dom->fqdn}").'</p>');

@@ -141,7 +146,7 @@ if ($dom->status == 'prereg') {

         output('<h4>Domain zu '.config('company_name').' umziehen</h4>

                 <p>'.internal_link('domainreg', 'Domain-Transfer starten', "domain={$dom->fqdn}").'</p>');

     }

-

+}

 // Block Domain löschen/kündigen

@@ -149,7 +154,8 @@ $domain_in_use = mailman_subdomains($dom->id) || mail_in_use($dom->id) || web_in

 if (!$domain_in_use && ($dom->status == 'prereg' || $dom->status == 'pretransfer' || $dom->status == 'transferfailed' || $dom->status == 'external')) {

     output('<h4>Domain wieder entfernen</h4>');

     output('<p class="delete">'.internal_link('save', 'Die Domain '.$dom->fqdn.' entfernen', 'action=delete&domain='.$dom->id).'</p>');

-} elseif ($dom->provider == 'terions') {

+} elseif (have_role(ROLE_CUSTOMER) && config('http.net-apikey') && $dom->provider == 'terions') {

+    require_once('domainapi.php');

     output('<h4>Domain kündigen</h4>');

     $info = api_download_domain($dom->id);

     if ($info['authInfo']) {

@@ -24,6 +24,9 @@ require_role(ROLE_CUSTOMER);

 use_module('contacts');

 require_once('contacts.php');

+if (! config('http.net-apikey')) {

+    system_failure("Dieses System ist nicht eingerichtet zum Hinzufügen von Domains");

+}

 $dom = NULL;

 if (isset($_REQUEST['domain'])) {

@@ -23,7 +23,7 @@ require_once('domains.php');

 require_role(array(ROLE_SYSTEMUSER, ROLE_CUSTOMER));

-if ($_SESSION['role'] & ROLE_CUSTOMER)

+if (have_role(ROLE_CUSTOMER))

   $user_domains = get_domain_list($_SESSION['customerinfo']['customerno']);

 else

   $user_domains = get_domain_list($_SESSION['userinfo']['customerno'], $_SESSION['userinfo']['uid']);

@@ -107,12 +107,17 @@ foreach ($user_domains as $domain)

     $punycode = '';

   }

   $domainname = "{$domain->fqdn}{$punycode}";

+  if (have_role(ROLE_CUSTOMER)) {

       $domainname = internal_link('detail', $domainname, 'id='.$domain->id);

+  }

   output("  <div class=\"domain-item {$status} {$locked}\"><p class=\"domainname\">{$domainname}</p><p class=\"regdate\">{$regdate}</p><p class=\"domain-usage\">Verwendung: {$features}{$mailserver_lock}</p></div>\n");

 }

 output('</div>');

 output("<br />");

+

+if (have_role(ROLE_CUSTOMER) && config('http.net-apikey')) {

     addnew('adddomain', 'Neue Domain bestellen / hinzufügen');

+}

 ?>