[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[15204] trunk

[<bri...@us...>]

Revision: 15204
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15204&view=rev
Author:   brian_moore
Date:     2008-10-17 22:22:27 +0000 (Fri, 17 Oct 2008)

Log Message:
-----------
[ENH] More sefurl updates, remove deprecated url_show replace with base_path which makes sefurls actually work for image galleries

Modified Paths:
--------------
    trunk/lib/smarty_tiki/modifier.sefurl.php
    trunk/templates/tiki-admin_menu_options.tpl
    trunk/templates/tiki-blog_post.tpl
    trunk/templates/tiki-browse_gallery.tpl
    trunk/templates/tiki-edit_image.tpl
    trunk/templates/tiki-galleries.tpl
    trunk/tiki-browse_gallery.php

Modified: trunk/lib/smarty_tiki/modifier.sefurl.php
===================================================================
--- trunk/lib/smarty_tiki/modifier.sefurl.php	2008-10-17 22:07:41 UTC (rev 15203)
+++ trunk/lib/smarty_tiki/modifier.sefurl.php	2008-10-17 22:22:27 UTC (rev 15204)
@@ -9,9 +9,10 @@
 	exit;
 }
 
-function smarty_modifier_sefurl($source, $type='wiki') {
+function smarty_modifier_sefurl($source, $type='wiki', $with_next = '' ) {
 	global $prefs, $wikilib;
 	include_once('lib/wiki/wikilib.php');
+
 	switch($type){
 	case 'wiki page':
 	case 'wiki':
@@ -19,9 +20,9 @@
 	// rewrite other things so htaccess can unrewrite
 	case 'blog':
 	        if ($prefs['feature_sefurl'] == 'y') {
-	            return "blog" . $source;
+			return "blog" . $source;
 	        } else {
-	            return 'tiki-view_blog.php?blogId='.$source;
+			return 'tiki-view_blog.php?blogId='.$source;
 		}
 	case 'blogpost':
 	        if ($prefs['feature_sefurl'] == 'y') {
@@ -31,9 +32,9 @@
 		}
 	case 'gallery':
 	        if ($prefs['feature_sefurl'] == 'y') {
-	            return "gallery" . $source;
+	            return "gallery" . $source . ($with_next ? '?' : '') ;
 	        } else {
-	            return 'tiki-browse_gallery.php?galleryId='.$source;
+	            return 'tiki-browse_gallery.php?galleryId='. $source . ($with_next ? '&' : '');
 		}
 	}
 

Modified: trunk/templates/tiki-admin_menu_options.tpl
===================================================================
--- trunk/templates/tiki-admin_menu_options.tpl	2008-10-17 22:07:41 UTC (rev 15203)
+++ trunk/templates/tiki-admin_menu_options.tpl	2008-10-17 22:22:27 UTC (rev 15204)
@@ -79,7 +79,7 @@
 <tr><td>{tr}Home{/tr}: </td><td><select name="wikilinks" onchange="setMenuCon(options[selectedIndex].value);return true;">
 <option value=",,,">{tr}Choose{/tr} ...</option>
 <option value="{$prefs.tikiIndex},{tr}Home Page{/tr}">{tr}Home Page{/tr}</option>
-{if $prefs.home_blog}<option value="tiki-view_blog.php?blogId={$prefs.home_blog},{tr}Home Blog{/tr},feature_blogs,tiki_p_view_blogs">{tr}Home Blog{/tr}</option>{/if}
+{if $prefs.home_blog}<option value="{$prefs.home_blog|sefurl:blog},{tr}Home Blog{/tr},feature_blogs,tiki_p_view_blogs">{tr}Home Blog{/tr}</option>{/if}
 {if $prefs.home_gallery}<option value="tiki-browse_gallery.php?galleryId={$prefs.home_gallery},{tr}Home Image Gal{/tr},feature_galleries,tiki_p_view_image_gallery">{tr}Home Image Gallery{/tr}</option>{/if}
 {if $prefs.home_file_gallery}<option value="tiki-list_file_gallery?galleryId={$prefs.home_file_gallery},{tr}Home File Gal{/tr},feature_file_galleries,tiki_p_view_file_gallery">{tr}Home File Gallery{/tr}</option>{/if}]
 </select></td></tr>

Modified: trunk/templates/tiki-blog_post.tpl
===================================================================
--- trunk/templates/tiki-blog_post.tpl	2008-10-17 22:07:41 UTC (rev 15203)
+++ trunk/templates/tiki-blog_post.tpl	2008-10-17 22:22:27 UTC (rev 15204)
@@ -11,7 +11,7 @@
 {/if}
 {/if}
 {if $blogId > 0 }
-<span class="button2"><a href="tiki-view_blog.php?blogId={$blogId}">{tr}View Blog{/tr}</a></span>
+<span class="button2"><a href="{$blogId|sefurl:blog}">{tr}View Blog{/tr}</a></span>
 {/if}
 <span class="button2"><a href="tiki-list_blogs.php">{tr}List Blogs{/tr}</a></span>
 </div>

Modified: trunk/templates/tiki-browse_gallery.tpl
===================================================================
--- trunk/templates/tiki-browse_gallery.tpl	2008-10-17 22:07:41 UTC (rev 15203)
+++ trunk/templates/tiki-browse_gallery.tpl	2008-10-17 22:22:27 UTC (rev 15204)
@@ -65,11 +65,11 @@
 {/if}
 
 	<span class="sorttitle">{tr}Sort Images by{/tr}</span>
-    [ <span class="sortoption"><a class="gallink" href="tiki-browse_gallery.php?galleryId={$galleryId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}Name{/tr}</a></span>
-    | <span class="sortoption"><a class="gallink" href="tiki-browse_gallery.php?galleryId={$galleryId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'created_desc'}created_asc{else}created_desc{/if}">{tr}Date{/tr}</a></span>
-    | <span class="sortoption"><a class="gallink" href="tiki-browse_gallery.php?galleryId={$galleryId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'hits_desc'}hits_asc{else}hits_desc{/if}">{tr}Hits{/tr}</a></span>
-    | <span class="sortoption"><a class="gallink" href="tiki-browse_gallery.php?galleryId={$galleryId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'user_desc'}user_asc{else}user_desc{/if}">{tr}User{/tr}</a></span>
-    | <span class="sortoption"><a class="gallink" href="tiki-browse_gallery.php?galleryId={$galleryId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'filesize_desc'}filesize_asc{else}filesize_desc{/if}">{tr}Size{/tr}</a></span> ]
+    [ <span class="sortoption"><a class="gallink" href="{$galleryId|sefurl:gallery:with_next}offset={$offset}&amp;sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}Name{/tr}</a></span>
+    | <span class="sortoption"><a class="gallink" href="{$galleryId|sefurl:gallery:with_next}offset={$offset}&amp;sort_mode={if $sort_mode eq 'created_desc'}created_asc{else}created_desc{/if}">{tr}Date{/tr}</a></span>
+    | <span class="sortoption"><a class="gallink" href="{$galleryId|sefurl:gallery:with_next}offset={$offset}&amp;sort_mode={if $sort_mode eq 'hits_desc'}hits_asc{else}hits_desc{/if}">{tr}Hits{/tr}</a></span>
+    | <span class="sortoption"><a class="gallink" href="{$galleryId|sefurl:gallery:with_next}offset={$offset}&amp;sort_mode={if $sort_mode eq 'user_desc'}user_asc{else}user_desc{/if}">{tr}User{/tr}</a></span>
+    | <span class="sortoption"><a class="gallink" href="{$galleryId|sefurl:gallery:with_next}offset={$offset}&amp;sort_mode={if $sort_mode eq 'filesize_desc'}filesize_asc{else}filesize_desc{/if}">{tr}Size{/tr}</a></span> ]
 
 
   <div class="thumbnails">
@@ -130,9 +130,9 @@
             		<a class="gallink" href="tiki-browse_image.php?galleryId={$galleryId}&amp;sort_mode={$sort_mode}&amp;imageId={$item.imageId}&amp;scalesize=0" title="{tr}Original Size{/tr}"><img src='img/icons2/nav_dot.gif' border='0' width='8' height='11' alt='{tr}Original Size{/tr}' title='{tr}Original Size{/tr}' /></a>
 	    		{/if}
             	{if $imagerotate}
-            		<a class="gallink" href="tiki-browse_gallery.php?galleryId={$galleryId}&amp;rotateright={$item.imageId}" title="{tr}rotate right{/tr}"><img src='img/icons2/admin_rotate.gif' border='0' width='11' height='11' alt='{tr}rotate{/tr}' title='{tr}rotate{/tr}' /></a>
+            		<a class="gallink" href={$galleryId}|sefurl:gallery:with_next}rotateright={$item.imageId}" title="{tr}rotate right{/tr}"><img src='img/icons2/admin_rotate.gif' border='0' width='11' height='11' alt='{tr}rotate{/tr}' title='{tr}rotate{/tr}' /></a>
             	{/if}
-            	<a class="gallink" href="tiki-browse_gallery.php?galleryId={$galleryId}&amp;remove={$item.imageId}" title="{tr}Delete{/tr}">{icon _id='cross' alt='{tr}Delete{/tr}'}</a>
+            	<a class="gallink" href="{$galleryId|sefurl:gallery:with_next}remove={$item.imageId}" title="{tr}Delete{/tr}">{icon _id='cross' alt='{tr}Delete{/tr}'}</a>
             	<a class="gallink" href="tiki-edit_image.php?galleryId={$galleryId}&amp;edit={$item.imageId}" title="{tr}Edit{/tr}">{icon _id='page_edit'}</a>
           {/if}
           <a class="gallink" href="tiki-browse_image.php?galleryId={$galleryId}&amp;sort_mode={$sort_mode}&amp;imageId={$item.imageId}&amp;scalesize={$defaultscale}" {if $prefs.gal_image_mouseover neq 'n'}{popup fullhtml="1" text=$over_info.$key|escape:"javascript"|escape:"html"}{/if}>{icon _id='magnifier' alt='{tr}Details{/tr}'}</a>
@@ -195,7 +195,7 @@
       <td class="even">
       <small>
   {tr}You can view this gallery's configured image (first, random, etc.) in your browser using{/tr}:<br /><br />
-  <a class="gallink" href="{$url_show}?galleryId={$galleryId}">{$url_show}?galleryId={$galleryId}</a><br />
+  <a class="gallink" href="{$base_url}show_image.php?galleryId={$galleryId}">{$base_url}show_image.php?galleryId={$galleryId}</a><br />
   </small>
   </td>
 </tr>
@@ -204,11 +204,11 @@
   <small>
   {tr}You can include the gallery's image in an HTML page using one of these lines{/tr}:<br /><br />
   {if $resultscale == $defaultscale}
-  &lt;img src="{$url_show}?galleryId={$galleryId}" /&gt;<br />
+  &lt;img src="{$base_url}show_image.php?galleryId={$galleryId}" /&gt;<br />
   {elseif !$resultscale}
-  &lt;img src="{$url_show}?galleryId={$galleryId}" /&gt;<br />
+  &lt;img src="{$base_url}show_image.php?galleryId={$galleryId}" /&gt;<br />
   {else}
-  &lt;img src="{$url_show}?galleryId={$galleryId}" /&gt;<br />
+  &lt;img src="{$base_url}show_image.php?galleryId={$galleryId}" /&gt;<br />
   {/if}
   </small>
   </td>
@@ -222,7 +222,7 @@
   {elseif !$resultscale}
   {literal}{{/literal}img src=show_image.php?galleryId={$galleryId} {literal}}{/literal}<br />
   {else}
-  {literal}{{/literal}img src={$url_show}?galleryId={$galleryId} {literal}}{/literal}<br />
+  {literal}{{/literal}img src={$base_url}show_image.php?galleryId={$galleryId} {literal}}{/literal}<br />
   {/if}
   </small>
   </td>

Modified: trunk/templates/tiki-edit_image.tpl
===================================================================
--- trunk/templates/tiki-edit_image.tpl	2008-10-17 22:07:41 UTC (rev 15203)
+++ trunk/templates/tiki-edit_image.tpl	2008-10-17 22:22:27 UTC (rev 15204)
@@ -1,6 +1,6 @@
 {title}{tr}Edit Image{/tr}{/title}
 
-<span class="button2"><a href="tiki-browse_gallery.php?galleryId={$galleryId}">{tr}Return to Gallery{/tr}</a></span>
+<span class="button2"><a href="{$galleryId|sefurl:gallery}">{tr}Return to Gallery{/tr}</a></span>
 <span class="button2"><a href="tiki-browse_image.php?imageId={$imageId}">{tr}Browse Images{/tr}</a></span>
 <br /><br />
 <div align="center">

Modified: trunk/templates/tiki-galleries.tpl
===================================================================
--- trunk/templates/tiki-galleries.tpl	2008-10-17 22:07:41 UTC (rev 15203)
+++ trunk/templates/tiki-galleries.tpl	2008-10-17 22:22:27 UTC (rev 15204)
@@ -169,11 +169,11 @@
 {if $galleries[changes].visible eq 'y' or $tiki_p_admin_galleries eq 'y'}
 <tr>
 {if $prefs.gal_list_name eq 'y'}
-  <td class="{cycle advance=false}"><a class="galname" href="tiki-browse_gallery.php?galleryId={$galleries[changes].galleryId}">{$galleries[changes].name}</a></td>
+  <td class="{cycle advance=false}"><a class="galname" href="{$galleries[changes].galleryId|sefurl:gallery}">{$galleries[changes].name}</a></td>
 {/if}
 {if $prefs.gal_list_parent eq 'y'}
   <td class="{cycle advance=false}">
-  {if $galleries[changes].parentgallery ne -1 }<a class="galname" href="tiki-browse_gallery.php?galleryId={$galleries[changes].parentgallery}">{$galleries[changes].parentgalleryName}</a>{/if}
+  {if $galleries[changes].parentgallery ne -1 }<a class="galname" href="{$galleries[changes].parentgallery|sefurl:gallery}">{$galleries[changes].parentgalleryName}</a>{/if}
   {if $galleries[changes].parentgal eq 'y'}<i>{tr}Parent{/tr}</i>{/if}
   </td>
 {/if}

Modified: trunk/tiki-browse_gallery.php
===================================================================
--- trunk/tiki-browse_gallery.php	2008-10-17 22:07:41 UTC (rev 15203)
+++ trunk/tiki-browse_gallery.php	2008-10-17 22:22:27 UTC (rev 15204)
@@ -408,9 +408,6 @@
 }
 
 // Display the template
-$foo = parse_url($_SERVER["REQUEST_URI"]);
-$foo2 = str_replace("tiki-browse_gallery", "show_image", $foo["path"]);
-$smarty->assign('url_show', $tikilib->httpPrefix(). $foo2);
 
 $smarty->assign('mid', 'tiki-browse_gallery.tpl');
 $smarty->display("tiki.tpl");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.