From 5bdc5d672e3119977866d9205121f32e978abc8e Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Tue, 2 Aug 2016 16:07:24 +0200
Subject: [PATCH] Disable radius functionality

---
 neuf_userinfo/forms.py         |  6 ++++--
 templates/private/profile.html | 11 ++++++++---
 userinfosite/settings.py       |  2 +-
 userinfosite/urls.py           |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/neuf_userinfo/forms.py b/neuf_userinfo/forms.py
index 1353b5b..aa2f01d 100644
--- a/neuf_userinfo/forms.py
+++ b/neuf_userinfo/forms.py
@@ -16,7 +16,6 @@ from inside.models import InsideUser
 from inside.utils import set_inside_password
 
 from neuf_kerberos.utils import set_kerberos_password, has_kerberos_principal
-from neuf_radius.utils import set_radius_password
 from neuf_ldap.utils import set_ldap_password, ldap_username_exists, ldap_user_group_exists
 from neuf_userinfo.utils import decrypt_rijndael
 from neuf_userinfo.validators import UsernameValidator, validate_password
@@ -41,7 +40,10 @@ class NeufSetPasswordForm(SetPasswordForm):
         set_inside_password(username, password)
 
         # Active services
-        set_radius_password(username, password)  # creates user if non-existant
+        if 'neuf_radius' in settings.INSTALLED_APPS:
+            from neuf_radius.utils import set_radius_password
+            set_radius_password(username, password)  # creates user if non-existant
+
         if ldap_username_exists(username):
             set_ldap_password(username, password)
 
diff --git a/templates/private/profile.html b/templates/private/profile.html
index f97e620..51e9edf 100644
--- a/templates/private/profile.html
+++ b/templates/private/profile.html
@@ -19,7 +19,7 @@
         <div class="well">
             <ul>
                 <li><span id="sso">Felles innlogging (DNS-konto)</span></li>
-                <li><span id="wireless_status">Trådløst nettverk</span></li>
+                <li><span id="wireless_status">Trådløst nettverk (neuf-wifi)</span></li>
                 <li><span id="client_status">Foreningsmaskiner</span></li>
             </ul>
         </div>
@@ -70,7 +70,7 @@
             }
             $("#client_status").append(image).prop('title', title).attr('data-content', data_content).popover();
         });
-        $.getJSON("/userstatus/wireless/?format=json&username="+username, function(data) {
+        /*$.getJSON("/userstatus/wireless/?format=json&username="+username, function(data) {
             if(data.active) {
                 image = img_check;
                 title = 'Du har tilgang til trådløst nettverk';
@@ -86,7 +86,12 @@
                 data_content = 'Du har ikke en trådløskonto i Radius.';
             }
             $("#wireless_status").append(image).prop('title', title).attr('data-content', data_content).popover();
-        });
+        });*/
+
+        /* Radius is not in use, show info about SSID with PSK */
+        title = 'Du har tilgang til trådløst nettverk';
+        data_content = 'Spør andre aktive eller i Glassbaren om passord til neuf-wifi';
+        $("#wireless_status").append(img_check).prop('title', title).attr('data-content', data_content).popover();
 
         $.getJSON("/ldap/users/"+username+"/")
         .done(function(data) {
diff --git a/userinfosite/settings.py b/userinfosite/settings.py
index a31153b..01653fb 100644
--- a/userinfosite/settings.py
+++ b/userinfosite/settings.py
@@ -35,7 +35,7 @@ INSTALLED_APPS += (
     'rest_framework',
     'neuf_userinfo',
     'neuf_ldap',
-    'neuf_radius',
+    # 'neuf_radius',  # Not in use
     'neuf_kerberos',
     'inside',
 )
diff --git a/userinfosite/urls.py b/userinfosite/urls.py
index cc194a0..49f0869 100644
--- a/userinfosite/urls.py
+++ b/userinfosite/urls.py
@@ -11,7 +11,7 @@ urlpatterns = patterns(
     url(r'', include('neuf_userinfo.urls')),
     url(r'', include('neuf_ldap.urls')),
     url(r'^userstatus/client/$', 'neuf_kerberos.views.client_status'),
-    url(r'^userstatus/wireless/$', 'neuf_radius.views.wireless_status'),
+    # url(r'^userstatus/wireless/$', 'neuf_radius.views.wireless_status'),  # radius is not in use
 
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
     url(r'^admin/', include(admin.site.urls)),