--- nfo/php/libs/org.netfrag.glib/utils/links.php	2003/04/08 17:56:09	1.2
+++ nfo/php/libs/org.netfrag.glib/utils/links.php	2003/04/08 22:38:43	1.3
@@ -1,9 +1,12 @@
 <?
 /*
 ## -------------------------------------------------------------------------
-##  $Id: links.php,v 1.2 2003/04/08 17:56:09 joko Exp $
+##  $Id: links.php,v 1.3 2003/04/08 22:38:43 joko Exp $
 ## -------------------------------------------------------------------------
 ##  $Log: links.php,v $
+##  Revision 1.3  2003/04/08 22:38:43  joko
+##  NEW: 'class url' as code container for some shortcut functions
+##
 ##  Revision 1.2  2003/04/08 17:56:09  joko
 ##  bugfixes
 ##
@@ -79,7 +82,7 @@
     // FIXME: do this more generic! use array_merge for this purpose?
     $opts = array_merge($_GET, $_POST);
     if (!$args[ap]) { $args[ap] = $opts[ap]; }
-    $query_string = httpQuery($args);
+    $query_string = url::query($args);
     return html_a($query_string, $caption);
   }
   
@@ -116,41 +119,56 @@
   function page($page_name, $args = array()) {
     $args[ap] = $page_name;
     //unset($args[ap]);
-    return httpQuery($args);
+    return url::query($args);
   }
 
   function topic($topic_name, $args = array()) {
     $args[t] = $topic_name;
     //unset($args[ap]);
-    return httpQuery($args);
+    return url::query($args);
   }
   
   function action($action_name, $args = array()) {
     $args[ga] = $action_name;
-    return httpQuery($args);
+    return url::query($args);
   }
 
 }
 
 
-function httpQuery($args = array()) {
-  $query_list = array();
-  foreach ($args as $key => $val) {
-    array_push($query_list, "$key=$val");
-  }
-  $query_string = join('&', $query_list);
-  if ($query_string) { $query_string = '?' . $query_string; }
-  return $query_string;
-}
-
+class url {
 
-function yesno($bool) {
-  return $bool ? 'yes' : 'no';
-}
+  function query($args = array()) {
+    $query_list = array();
+    foreach ($args as $key => $val) {
+      array_push($query_list, "$key=$val");
+    }
+    $query_string = join('&', $query_list);
+    if ($query_string) { $query_string = '?' . $query_string; }
+    return $query_string;
+  }
+
+  // shortcut to 'link::store'
+  function short($base = '', $link_vars = array()) {
+    
+    // if $base isn't defined, use the current url as base
+    if (!$base) { $base = $_SERVER['PHP_SELF']; }
+
+    if (constants::get('URL_ENCODE_GUID')) { 
+      // store and encode the argument payload
+      $link_guid = link::store($link_vars);
+      
+      // build complete url
+      $url = $base . "?lbid=" . $link_guid;
+    } else {
+      $url = $base . url::query($link_vars);
+    }
+    
+    
+    // there you have it..
+    return $url;
+  }
 
-function qLink_old($args = array()) {
-  return httpQuery($args);
 }
 
-
 ?>
\ No newline at end of file