Apply AT's patch to switch the WebUI to using Apache digest auth / htaccess / etc

1 files changed, 58 insertions, 73 deletions

diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py
index 17d93b0..ee20ed7 100644
--- a/cobbler/webui/master.py
+++ b/cobbler/webui/master.py
@@ -33,10 +33,10 @@ VFN=valueForName
 currentTime=time.time
 __CHEETAH_version__ = '2.0rc8'
 __CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8)
-__CHEETAH_genTime__ = 1192826261.8448961
-__CHEETAH_genTimestamp__ = 'Fri Oct 19 16:37:41 2007'
+__CHEETAH_genTime__ = 1193430296.732923
+__CHEETAH_genTimestamp__ = 'Fri Oct 26 13:24:56 2007'
 __CHEETAH_src__ = 'webui_templates/master.tmpl'
-__CHEETAH_srcLastModified__ = 'Fri Oct 12 11:53:14 2007'
+__CHEETAH_srcLastModified__ = 'Fri Oct 26 11:41:47 2007'
 __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'
 
 if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple:
@@ -69,7 +69,7 @@ class master(Template):
 
 
 
-        ## CHEETAH: generated from #block body at line 60, col 1.
+        ## CHEETAH: generated from #block body at line 53, col 1.
         trans = KWS.get("trans")
         if (not trans and not self._CHEETAH__isBuffering and not callable(self.transaction)):
             trans = self.transaction # is None unless self.awake() was called
@@ -148,75 +148,60 @@ class master(Template):
 
 <div id="sidebar">
     <ul id="nav">
-''')
-        if not VFFSL(SL,"logged_in",True): # generated from line 31, col 9
-            write('''            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 32, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 32, col 26.
-            write('''/login" class="menu">Log In</a></li>
-''')
-        else: # generated from line 33, col 9
-            write('''            <li><a href="/cobbler/webui/wui.html" class="menu">Docs</a></li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 35, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 35, col 26.
-            write('''/settings_view" class="menu">Settings</a></li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 36, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 36, col 26.
-            write('''/logout_submit" class="menu">Log Out</a></li>
-            <li><hr/></li>
-            <li>LIST</li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 39, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 39, col 26.
-            write('''/distro_list" class="menu">Distros</a></li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 40, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 40, col 26.
-            write('''/profile_list" class="menu">Profiles</a></li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 41, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 41, col 26.
-            write('''/system_list" class="menu">Systems</a></li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 42, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 42, col 26.
-            write('''/ksfile_list" class="menu">Kickstarts</a></li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 43, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 43, col 26.
-            write('''/repo_list" class="menu">Repos</a></li>
-            <li><hr/></li>
-            <li>ADD</li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 46, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 46, col 26.
-            write('''/distro_edit" class="menu">Distro</a></li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 47, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 47, col 26.
-            write('''/profile_edit" class="menu">Profile</a></li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 48, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 48, col 26.
-            write('''/subprofile_edit" class="menu">Subprofile</a></li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 49, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 49, col 26.
-            write('''/system_edit" class="menu">System</a></li>
-            <li><a href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 50, col 26
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 50, col 26.
-            write('''/repo_edit" class="menu">Repo</a></li>
-            <li><hr/><br/></li>
-            <li><a class="button sync" href="''')
-            _v = VFFSL(SL,"base_url",True) # '$base_url' on line 52, col 46
-            if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 52, col 46.
-            write('''/sync">Sync</a></li>
-''')
-        write('''
-
+        <li><a href="/cobbler/webui/wui.html" class="menu">Docs</a></li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 32, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 32, col 22.
+        write('''/settings_view" class="menu">Settings</a></li>
+        <li><hr/></li>
+        <li>LIST</li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 35, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 35, col 22.
+        write('''/distro_list" class="menu">Distros</a></li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 36, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 36, col 22.
+        write('''/profile_list" class="menu">Profiles</a></li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 37, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 37, col 22.
+        write('''/system_list" class="menu">Systems</a></li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 38, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 38, col 22.
+        write('''/ksfile_list" class="menu">Kickstarts</a></li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 39, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 39, col 22.
+        write('''/repo_list" class="menu">Repos</a></li>
+        <li><hr/></li>
+        <li>ADD</li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 42, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 42, col 22.
+        write('''/distro_edit" class="menu">Distro</a></li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 43, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 43, col 22.
+        write('''/profile_edit" class="menu">Profile</a></li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 44, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 44, col 22.
+        write('''/subprofile_edit" class="menu">Subprofile</a></li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 45, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 45, col 22.
+        write('''/system_edit" class="menu">System</a></li>
+        <li><a href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 46, col 22
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 46, col 22.
+        write('''/repo_edit" class="menu">Repo</a></li>
+        <li><hr/><br/></li>
+        <li><a class="button sync" href="''')
+        _v = VFFSL(SL,"base_url",True) # '$base_url' on line 48, col 42
+        if _v is not None: write(_filter(_v, rawExpr='$base_url')) # from line 48, col 42.
+        write('''/sync">Sync</a></li>
     </ul>
 </div>