pretty urls fixes, openid fix

voitto · May 1, 2009 · 14d03a4 · 14d03a4
1 parent 0631420
commit 14d03a4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/app/omb/plugins/omb.php b/app/omb/plugins/omb.php
@@ -387,7 +387,10 @@ function omb_request_munger( &$request, &$route ) {
   foreach($omb_routes as $func) {
     if (array_key_exists($func,$params)) {
         // if found, lie to the mapper about the URI
-        $request->set('uri',$request->base."?".$func);
+        if (pretty_urls())
+          $request->set('uri',$request->base."".$func);
+        else
+          $request->set('uri',$request->base."?".$func);
         $request->set('params', array($func));
     }
   }

diff --git a/app/omb/plugins/security.php b/app/omb/plugins/security.php
@@ -354,7 +354,7 @@ function _email( &$vars ) {
     $return_to = $_SESSION['requested_url'];
   else
     $return_to = $request->base;
-  $protected_url = $request->base;
+  $protected_url = base_url(true);
   $Identity =& $db->model('Identity');
   if (isset($request->params['ident'])) {
     $ident = $Identity->find_by('token',$request->params['ident']);
@@ -396,7 +396,7 @@ function _register( &$vars ) {
     $return_to = $_SESSION['requested_url'];
   else
     $return_to = $request->base;
-  $protected_url = $request->base;
+  $protected_url = base_url(true);
   if (isset($request->params['ident'])) {
     $ident = $Identity->find_by('token',$request->params['ident']);
     if ($ident) {
@@ -433,7 +433,7 @@ function _login( &$vars ) {
     $return_to = $_SESSION['requested_url'];
   else
     $return_to = $request->base;
-  $protected_url = $request->base;
+  $protected_url = base_url(true);
   if (isset($_SESSION['openid_url']))
     $openid_url = $_SESSION['openid_url'];
   else

diff --git a/db/library/dbscript/_functions.php b/db/library/dbscript/_functions.php
@@ -2623,6 +2623,11 @@ function array_sort($array, $key, $max=false)
   '+14'    =>  'Line Island'
 );
 
-
+function pretty_urls() {
+  global $pretty_url_base;
+  if (isset($pretty_url_base) && !empty($pretty_url_base))
+    return true;
+  return false;
+}
 
 
diff --git a/db/library/dbscript/mapper.php b/db/library/dbscript/mapper.php
@@ -330,7 +330,10 @@ function breadcrumbs() {
     $links[] = '<a href="'. $this->base .'">Home</a>';
 
     if ( isset( $this->resource ) && ( $this->resource != 'introspection' ))
-      $links[] = '<a href="'. $this->base .'?'.$this->resource.'">'.ucwords($this->resource).'</a>';
+      if (pretty_urls())
+        $links[] = '<a href="'. $this->base .''.$this->resource.'">'.ucwords($this->resource).'</a>';
+      else
+        $links[] = '<a href="'. $this->base .'?'.$this->resource.'">'.ucwords($this->resource).'</a>';
 
     if ( ($this->id != 0) && isset( $this->resource ) && ( $this->resource != 'introspection' ))
        $links[] = '<a href="'.$this->entry_url($this->id).'">Entry '.ucwords($this->id).'</a>';