fixed the url parser so all urlhandlers have ^ tacked to the start

otherwise preg_match matches subtexts

Added APT code - and it seems to work

diff --git a/libglcas/urlparser.php b/libglcas/urlparser.php
index ab7e69c..d85692d 100644 (file)
--- a/libglcas/urlparser.php
+++ b/libglcas/urlparser.php
@@ -34,7 +34,7 @@ class GLCASUrlParser {
                                        error_log("catchall set to $val");
                                } else if($key != "/") {
                                        // now the rest
-                                       if(preg_match("/$key/", $url)) {
+                                       if(preg_match("/^$key/", $url)) {
                                                error_log("matched $url to $key and $val");
                                                return new $val($this->config);
                                        }

diff --git a/plugins/admin.php b/plugins/admin.php
index 609047f..2b1d1ef 100644 (file)
--- a/plugins/admin.php
+++ b/plugins/admin.php
@@ -30,6 +30,9 @@ class GLCASAdmin {
                                        GLCASpageBuilder($this,"doRepoNextForm");
                                        return;
                                        break;
+                               case "addrepoapt":
+                                       GLCASpageBuilder($this,"doAddRepoApt");
+                                       return;
                                case "addrepoyum":
                                        GLCASpageBuilder($this,"doAddRepoYum");
                                        return;
@@ -148,15 +151,27 @@ class GLCASAdmin {
                        } else {
                                //echo "Looks like an apt repo, but I cant find any known distro's<br>";
                        }
+                       //$existing_repos["distros"] = "Ubuntu, Debian";
+                       //$existing_repos["versions"] = "8.04LTS, 9.10, 10.04LTS, 10.10, 11.04, 11.10";
+                       //$existing_repos["arch"] = "x86_64, i386";
+                       
+                       
+                       $distros = $glt["distros"];
+                       $version = $glt["versions"];
+                       $archs = $glt["arch"];
                        
                        echo "<form method=\"post\" action=\"?action=addrepoapt\">";
                        echo "<input type=\"hidden\" name=\"repourl\" value=\"$repourl\">";
+                       echo "<input type=\"hidden\" name=\"distro\" value=\"$distros\">";
+                       echo "<input type=\"hidden\" name=\"version\" value=\"$version\">";
+                       echo "<input type=\"hidden\" name=\"arch\" value=\"$archs\">";
                        echo "<table>";
                        echo "<tr><td>Description</td><td><input type=\"text\" name=\"desc\" value=\"APT Repo$extratext\"></td>";
-                       echo "<tr><td>Provides</td><td><textarea name=\"provides\">$provides</text area></td></tr>";
+                       echo "<tr><td>Provides</td><td><textarea name=\"provides\" rows=\"".$glt["nrepos"]."\" cols=\"100\">$provides</textarea></td></tr>";
                        echo "<tr><td>Short URL</td><td><input type=\"text\" name=\"shorturl\"></td></tr>";
                        echo "<tr><td>URL Prefix (blank for none)</td><td><input type=\"text\" name=\"prefix\"></td></tr>";
-                       echo "<tr><td>Expire time for Meta Data</td><td><input type=\"text\" name=\"expiretime\"> days</td></tr>";
+                       echo "<tr><td>Expire time for Meta Data</td><td><input type=\"text\" name=\"expiretime\" value=\"3\"> days</td></tr>";
+                       echo "<tr><td><input type=\"submit\" name=\"Add\" value=\"Add\"></td></tr>";
                        echo "</table>";
                        echo "</form>";
                        return true;
@@ -179,12 +194,35 @@ class GLCASAdmin {
                        echo "<tr><td>Short URL</td><td><input type=\"text\" name=\"shorturl\"></td></tr>";
                        echo "<tr><td>URL Prefix (blank for none)</td><td><input type=\"text\" name=\"prefix\"></td></tr>";
                        echo "<tr><td>Do Initial Update (can take a while, but done in background)</td><td><input type=\"checkbox\" name=\"initial\" checked></td></tr>";
-                       echo "<tr><td>Expire time for Meta Data</td><td><input type=\"text\" name=\"expiretime\"> days</td></tr>";
+                       echo "<tr><td>Expire time for Meta Data</td><td><input type=\"text\" name=\"expiretime\" value=\"3\"> days</td></tr>";
                        echo "<tr><td><input type=\"submit\" name=\"Add\" value=\"Add\"></td></tr>";
                        echo "</table>";
                        echo "</form>";
                }
        }
+
+       function doAddRepoApt($url)
+       {
+               $repo = new GLCASRepo($this->config);
+               
+               $desc = $_REQUEST["desc"];
+               $OS = $_REQUEST["distro"];
+               $version = $_REQUEST["version"];
+               $arch = $_REQUEST["arch"];
+               $shorturl = $_REQUEST["shorturl"];
+               $prefix = $_REQUEST["prefix"];
+               $repurl = $_REQUEST["repourl"];
+               $expiretime = $REQUEST["expiretime"];
+               $init = false;
+               if(isset($_REQUEST["initial"])) $init = true;
+               
+               
+               
+               $repo->addRepo($desc, $OS, $version, $arch, "-", $shorturl, $prefix, $repurl, "APT", $init, $expiretime);
+               
+               global $WEB_ROOT_FS, $URL_HANDLERS, $BASE_URL;
+               header("Location: $BASE_URL/admin/");
+       }
        
        function doAddRepoYum($url)
        {

diff --git a/plugins/repo.php b/plugins/repo.php
index 27ae54c..55eaed3 100644 (file)
--- a/plugins/repo.php
+++ b/plugins/repo.php
@@ -746,7 +746,16 @@ class GLCASRepo {
                        $content .= "<table>";
                        $dh = opendir($dir);
                        while(($file = readdir($dh))!==false) {
-                               if($file != "." && $file != "..") $content .= "<tr><td><a href=\"$uri/$file\">$file</a></td></tr>";
+                               if($file != "." && $file != "..") {
+                                       if(is_dir("$dir/$file")) {
+                                               $fsize = "";
+                                               $icon = "/icons/folder.png";
+                                       } else {
+                                               $fsize = filesize("$dir/$file");
+                                               $icon = "/icons/text.png";
+                                       }
+                                       $content .= "<tr><td><img src=\"$icon\"></td><td><a href=\"$uri/$file\">$file</a></td><td>$fsize</td></tr>";
+                               }
                        }
                        $content .= "</table></body></html>";
                                
@@ -781,7 +790,11 @@ class GLCASRepo {
                        }
                }
                $existing_repos["nrepos"] = $repos;
+               
+               // TODO: these need to be "calculated"
                $existing_repos["distros"] = "Ubuntu, Debian";
+               $existing_repos["versions"] = "8.04LTS, 9.10, 10.04LTS, 10.10, 11.04, 11.10";
+               $existing_repos["arch"] = "x86_64, i386";
                
                
                return $existing_repos;