mod_python version of webui now operational at http://server/cobbler/web with pluggable authn/authz and using same tokens through entire communication chain. Should probably implement a session logout though.

11 files changed, 30 insertions, 29 deletions

diff --git a/webui_templates/distro_edit.tmpl b/webui_templates/distro_edit.tmpl
index 5e45800..167f8cb 100644
--- a/webui_templates/distro_edit.tmpl
+++ b/webui_templates/distro_edit.tmpl
@@ -15,12 +15,13 @@ function disablename(value)
 </script>
 #end if 
 
-<form method="post" action="$base_url/distro_save">
+<form method="POST" action="$base_url">
 <fieldset id="cform">
 
      
     #if $distro
         <legend>Editing Distro</legend>
+        <input type="hidden" name="mode" value="distro_save">
         <input type="hidden" name="new_or_edit" value="edit"/>
         <input type="hidden" name="oldname" value="$distro.name"/>
     #else
diff --git a/webui_templates/distro_list.tmpl b/webui_templates/distro_list.tmpl
index db9897f..4fabd48 100644
--- a/webui_templates/distro_list.tmpl
+++ b/webui_templates/distro_list.tmpl
@@ -30,7 +30,7 @@
 
         <tr class="$tr_class">
             <td>
-                <a href="$base_url/distro_edit?name=$distro.name">$distro.name</a>
+                <a href="$base_url?mode=distro_edit&name=$distro.name">$distro.name</a>
             </td>
             <td>$distro.breed</td>
             <td>$distro.arch</td>
diff --git a/webui_templates/ksfile_edit.tmpl b/webui_templates/ksfile_edit.tmpl
index 8b0eeec..5e0c5ae 100644
--- a/webui_templates/ksfile_edit.tmpl
+++ b/webui_templates/ksfile_edit.tmpl
@@ -2,7 +2,7 @@
 #attr $title = "Cobbler: Edit Kickstart File $ksfile"
 
 #block body
-<form method="post" action="$base_url/ksfile_save">
+<form method="post" action="$base_url?mode=ksfile_save">
     <input type="hidden" name="name" value="$name"/>
     <fieldset id="cform">
         <legend>Edit Kickstart File</legend>
diff --git a/webui_templates/ksfile_list.tmpl b/webui_templates/ksfile_list.tmpl
index 292fcf9..dcfaa0a 100644
--- a/webui_templates/ksfile_list.tmpl
+++ b/webui_templates/ksfile_list.tmpl
@@ -22,9 +22,9 @@
         <tr class="$tr_class">
             <td>$ksfile</td>
             #if $ksfile.startswith("/var/lib/cobbler/kickstarts")
-                <td><a href="$base_url/ksfile_edit?name=$ksfile">edit</a></td>
+                <td><a href="$base_url?mode=ksfile_edit&name=$ksfile">edit</a></td>
             #else if $ksfile.startswith("/etc/cobbler")
-                <td><a href="$base_url/ksfile_edit?name=$ksfile">edit</a></td>
+                <td><a href="$base_url?mode=ksfile_edit&name=$ksfile">edit</a></td>
             #else if $ksfile.startswith("http://")
                 <td><a href="$ksfile">view</A></td>
             #else
diff --git a/webui_templates/master.tmpl b/webui_templates/master.tmpl
index abd09af..96fbe75 100644
--- a/webui_templates/master.tmpl
+++ b/webui_templates/master.tmpl
@@ -29,23 +29,23 @@
 <div id="sidebar">
     <ul id="nav">
         <li><a href="/cobbler/webui/wui.html" class="menu">Docs</a></li>
-        <li><a href="$base_url/settings_view" class="menu">Settings</a></li>
+        <li><a href="$base_url?mode=settings_view" class="menu">Settings</a></li>
         <li><hr/></li>
         <li>LIST</li>
-        <li><a href="$base_url/distro_list" class="menu">Distros</a></li>
-        <li><a href="$base_url/profile_list" class="menu">Profiles</a></li>
-        <li><a href="$base_url/system_list" class="menu">Systems</a></li>
-        <li><a href="$base_url/ksfile_list" class="menu">Kickstarts</a></li>
-        <li><a href="$base_url/repo_list" class="menu">Repos</a></li>
+        <li><a href="$base_url?mode=distro_list" class="menu">Distros</a></li>
+        <li><a href="$base_url?mode=profile_list" class="menu">Profiles</a></li>
+        <li><a href="$base_url?mode=system_list" class="menu">Systems</a></li>
+        <li><a href="$base_url?mode=ksfile_list" class="menu">Kickstarts</a></li>
+        <li><a href="$base_url?mode=repo_list" class="menu">Repos</a></li>
         <li><hr/></li>
         <li>ADD</li>
-        <li><a href="$base_url/distro_edit" class="menu">Distro</a></li>
-        <li><a href="$base_url/profile_edit" class="menu">Profile</a></li>
-        <li><a href="$base_url/subprofile_edit" class="menu">Subprofile</a></li>
-        <li><a href="$base_url/system_edit" class="menu">System</a></li>
-        <li><a href="$base_url/repo_edit" class="menu">Repo</a></li>
+        <li><a href="$base_url?mode=distro_edit" class="menu">Distro</a></li>
+        <li><a href="$base_url?mode=profile_edit" class="menu">Profile</a></li>
+        <li><a href="$base_url?mode=subprofile_edit" class="menu">Subprofile</a></li>
+        <li><a href="$base_url?mode=system_edit" class="menu">System</a></li>
+        <li><a href="$base_url?mode=repo_edit" class="menu">Repo</a></li>
         <li><hr/><br/></li>
-        <li><a class="button sync" href="$base_url/sync">Sync</a></li>
+        <li><a class="button sync" href="$base_url?mode=sync">Sync</a></li>
     </ul>
 </div>
 
diff --git a/webui_templates/paginate.tmpl b/webui_templates/paginate.tmpl
index 9d986f3..9b20e56 100644
--- a/webui_templates/paginate.tmpl
+++ b/webui_templates/paginate.tmpl
@@ -3,7 +3,7 @@
 
     #if $page != 0
        #set $previous_page = $page - 1
-       <A HREF="${base_url}/${what}_list?page=${previous_page}&limit=${results_per_page}">&lt;</A>&nbsp;
+       <A HREF="${base_url}?mode=${what}_list&page=${previous_page}&limit=${results_per_page}">&lt;</A>&nbsp;
     #else
        &lt; 
     #end if
@@ -15,13 +15,13 @@
        #else
            #set doselect = " selected " 
        #end if
-       <option value="${base_url}/${what}_list?page=${this_page}&limit=${results_per_page}" ${doselect} >Page ${this_page}</option>
+       <option value="${base_url}?mode=${what}_list&page=${this_page}&limit=${results_per_page}" ${doselect} >Page ${this_page}</option>
     #end for
     </select>
 
     #if $page != $pages
        #set $next_page = $page + 1
-       <A HREF="${base_url}/${what}_list?page=${next_page}&limit=${results_per_page}">&gt;</A>
+       <A HREF="${base_url}?mode=${what}_list&page=${next_page}&limit=${results_per_page}">&gt;</A>
     #else
        &gt;
     #end if
diff --git a/webui_templates/profile_edit.tmpl b/webui_templates/profile_edit.tmpl
index 6be47d0..f9eca09 100644
--- a/webui_templates/profile_edit.tmpl
+++ b/webui_templates/profile_edit.tmpl
@@ -13,7 +13,7 @@ function disablename(value)
 </script>
 #end if
 
-<form method="post" action="$base_url/profile_save">
+<form method="post" action="$base_url?mode=profile_save">
 <fieldset id="cform">
 
 <!--
diff --git a/webui_templates/profile_list.tmpl b/webui_templates/profile_list.tmpl
index 047714a..f213775 100644
--- a/webui_templates/profile_list.tmpl
+++ b/webui_templates/profile_list.tmpl
@@ -29,13 +29,13 @@
 
         <tr class="$tr_class">
             <td>
-                <a href="$base_url/profile_edit?name=$profile.name">$profile.name</a>
+                <a href="$base_url?mode=profile_edit&name=$profile.name">$profile.name</a>
             </td>
             <td>
                 #if $profile.distro != "<<inherit>>"
-                    <a href="$base_url/distro_edit?name=$profile.distro">$profile.distro</a>
+                    <a href="$base_url?mode=distro_edit&name=$profile.distro">$profile.distro</a>
                 #else
-                    <a href="$base_url/profile_edit?name=$profile.parent">$profile.parent</A>
+                    <a href="$base_url?mode=profile_edit&name=$profile.parent">$profile.parent</A>
                 #end if
             </td>
             <td>$profile.kickstart</td>
diff --git a/webui_templates/repo_edit.tmpl b/webui_templates/repo_edit.tmpl
index 6fb5c72..17ca4ec 100644
--- a/webui_templates/repo_edit.tmpl
+++ b/webui_templates/repo_edit.tmpl
@@ -14,7 +14,7 @@ function disablename(value)
 #end if
 
 
-<form method="post" action="$base_url/repo_save">
+<form method="post" action="$base_url?mode=repo_save">
 <fieldset id="cform">
 
     #if $repo
diff --git a/webui_templates/system_edit.tmpl b/webui_templates/system_edit.tmpl
index cc1c0c3..fa37244 100644
--- a/webui_templates/system_edit.tmpl
+++ b/webui_templates/system_edit.tmpl
@@ -32,7 +32,7 @@ function disablename(value)
 function get_random_mac()
 {
     xmlHttp = new XMLHttpRequest();
-    xmlHttp.open("GET", "$base_url/random_mac", true);
+    xmlHttp.open("GET", "$base_url?mode=random_mac", true);
     xmlHttp.onreadystatechange = function () {
         if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
             var mac_field = document.getElementById("macaddress")
@@ -87,7 +87,7 @@ function page_onload() {
 }
 </script>
 
-<form method="post" action="$base_url/system_save">
+<form method="post" action="$base_url?mode=system_save">
 <fieldset id="cform">
    
     #if $system
diff --git a/webui_templates/system_list.tmpl b/webui_templates/system_list.tmpl
index 2e5833a..5c70ffc 100644
--- a/webui_templates/system_list.tmpl
+++ b/webui_templates/system_list.tmpl
@@ -31,10 +31,10 @@
 
         <tr class="$tr_class">
             <td>
-                <a href="$base_url/system_edit?name=${system.name}">${system.name}</a>
+                <a href="$base_url?mode=system_edit&name=${system.name}">${system.name}</a>
             </td>
             <td>
-                <a href="$base_url/profile_edit?name=${system.profile}">${system.profile}</a>
+                <a href="$base_url?mode=profile_edit&name=${system.profile}">${system.profile}</a>
             </td>
             ## <td> ${system.mac_address} </td>
             ## <td> ${system.ip_address} </td>