[Openupload-svn-update] SF.net SVN: openupload:[85] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 85
          http://openupload.svn.sourceforge.net/openupload/?rev=85&view=rev
Author:   tsdogs
Date:     2008-10-27 11:36:38 +0000 (Mon, 27 Oct 2008)

Log Message:
-----------
Remove template path in templates (for images and css)

Modified Paths:
--------------
    trunk/lib/general.inc.php
    trunk/lib/main.inc.php
    trunk/lib/smarty/plugins/block.tr.php
    trunk/templates/default/index.tpl
    trunk/templates/default/modules/admin/admin.tpl
    trunk/templates/default/modules/admin/banned.tpl
    trunk/templates/default/modules/admin/files.tpl
    trunk/templates/default/modules/admin/groups.tpl
    trunk/templates/default/modules/admin/plugins.tpl
    trunk/templates/default/modules/admin/pluginsacl.tpl
    trunk/templates/default/modules/admin/rights.tpl
    trunk/templates/default/modules/admin/users.tpl
    trunk/templates/default/modules/files/downloadConfirm.tpl
    trunk/templates/default/modules/files/uploadForm.tpl

Added Paths:
-----------
    trunk/lib/smarty/plugins/function.tpl.php

Modified: trunk/lib/general.inc.php
===================================================================

--- trunk/lib/general.inc.php	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/lib/general.inc.php	2008-10-27 11:36:38 UTC (rev 85)
@@ -82,6 +82,17 @@
   return $txt;
 }
 
+function template_file($file) {
+  global $CONFIG;
+
+
+  if ($file == '') return '';
+  if (file_exists($CONFIG['WEB_ROOT'].'/templates/'.$CONFIG['site']['template'].'/'.$file))
+    return $CONFIG['WWW_ROOT'].'/templates/'.$CONFIG['site']['template'].'/'.$file;
+  else
+    return $CONFIG['WWW_ROOT'].'/templates/default/'.$file;
+}
+
 /**
 Validate an email address.
 Provide email address (raw input)

Modified: trunk/lib/main.inc.php
===================================================================
--- trunk/lib/main.inc.php	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/lib/main.inc.php	2008-10-27 11:36:38 UTC (rev 85)
@@ -26,7 +26,7 @@
     $this->tpl->config_dir   = SMARTY_DIR.'/config';
     $this->tpl->cache_dir    = $this->config['INSTALL_ROOT'].'/cache';
     $this->tpl->caching      = $this->config['site']['caching'];
-    
+
     $this->page['template']= $this->config['WWW_ROOT'].'/templates/'.$this->config['site']['template'];
 
     /* include the class first */

Modified: trunk/lib/smarty/plugins/block.tr.php
===================================================================
--- trunk/lib/smarty/plugins/block.tr.php	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/lib/smarty/plugins/block.tr.php	2008-10-27 11:36:38 UTC (rev 85)
@@ -1,6 +1,24 @@
 <?php
+/**
+ * Smarty plugin
+ * @package OpenUpload
+ * @subpackage plugins
+ */
 
 
+/**
+ * Smarty {tr} block plugin
+ *
+ * Type:     block<br>
+ * Name:     tr<br>
+ * Purpose:  Translate contained text with a user defined function "translate"
+ * @author Alessandro Briosi 
+ * @param array
+ * @param Smarty
+ * @return string
+ * @uses translate()
+ */
+
 function smarty_block_tr($params, $content = null, &$smarty, &$repeat) {
 
   if(!$repeat){

Added: trunk/lib/smarty/plugins/function.tpl.php
===================================================================
--- trunk/lib/smarty/plugins/function.tpl.php	                        (rev 0)
+++ trunk/lib/smarty/plugins/function.tpl.php	2008-10-27 11:36:38 UTC (rev 85)
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ * @package OpenUpload
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty {tpl} function plugin
+ *
+ * Type:     function<br>
+ * Name:     tpl<br>
+ * Input:<br>
+ *           - file       (required) - string containing template sub file
+ * Purpose:  Returns a file from the template folder, if it does not exsist
+ *           it returns a file from the default template
+ * @author Alessandro Briosi
+ * @param array
+ * @param Smarty
+ * @return string
+ * @uses template_file
+ */
+
+function smarty_function_tpl($params, &$smarty)
+{
+  return template_file($params["file"]);
+
+}
+?>
\ No newline at end of file

Modified: trunk/templates/default/index.tpl
===================================================================
--- trunk/templates/default/index.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/index.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -1,12 +1,12 @@
 <html>
 <head>
 <title>{$site.title} - {tr}{$page.title}{/tr}</title>
-<link rel="stylesheet" type="text/css" href='{$page.template}/main.css'>
+<link rel="stylesheet" type="text/css" href="{tpl file=/main.css}">
 </head>
 <body>
 <!-- header -->
 <div id="header">
-<div id="logo"><img src="{$page.template}/img/openupload.jpg" border="0"></div>
+<div id="logo"><img src="{tpl file=/img/openupload.jpg}" border="0"></div>
 <div id="langs">
 <ul>
 {foreach from=$langs item=l name=c}

Modified: trunk/templates/default/modules/admin/admin.tpl
===================================================================
--- trunk/templates/default/modules/admin/admin.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/admin.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -1,18 +1,18 @@
 {tr}Here you can administer{/tr}:<hr>
 <table border="0" width="400" height="300">
 <tr>
-  <td align="center"><a href="{$script}?action=adminsettings"><img src="{$page.template}/img/admin/settings.png" border="0" ><br>{tr}Settings{/tr}</a></td>
-  <td align="center"><a href="{$script}?action=adminplugins"><img src="{$page.template}/img/admin/plugins.png" border="0" align="center"><br>{tr}Plugins{/tr}</a></td>
-  <td align="center"><a href="{$script}?action=adminfiles"><img src="{$page.template}/img/admin/files.png" border="0" ><br>{tr}Files{/tr}</a></td>
+  <td align="center"><a href="{$script}?action=adminsettings"><img src="{tpl file=/img/admin/settings.png}" border="0" ><br>{tr}Settings{/tr}</a></td>
+  <td align="center"><a href="{$script}?action=adminplugins"><img src="{tpl file=/img/admin/plugins.png}" border="0" align="center"><br>{tr}Plugins{/tr}</a></td>
+  <td align="center"><a href="{$script}?action=adminfiles"><img src="{tpl file=/img/admin/files.png}" border="0" ><br>{tr}Files{/tr}</a></td>
 </tr>
 <tr>
-  <td align="center"><a href="{$script}?action=adminusers"><img src="{$page.template}/img/admin/users.png" border="0" ><br>{tr}Users{/tr}</a></td>
-  <td align="center"><a href="{$script}?action=admingroups"><img src="{$page.template}/img/admin/groups.png" border="0" ><br>{tr}Groups{/tr}</a></td>
-  <td align="center"><a href="{$script}?action=adminrights"><img src="{$page.template}/img/admin/rights.png" border="0" ><br>{tr}Rights{/tr}</a></td>
+  <td align="center"><a href="{$script}?action=adminusers"><img src="{tpl file=/img/admin/users.png}" border="0" ><br>{tr}Users{/tr}</a></td>
+  <td align="center"><a href="{$script}?action=admingroups"><img src="{tpl file=/img/admin/groups.png}" border="0" ><br>{tr}Groups{/tr}</a></td>
+  <td align="center"><a href="{$script}?action=adminrights"><img src="{tpl file=/img/admin/rights.png}" border="0" ><br>{tr}Rights{/tr}</a></td>
 </tr>
 <tr>
   <td align="center">&nbsp;</td>
-  <td align="center"><a href="{$script}?action=adminbanned"><img src="{$page.template}/img/admin/banned.png" border="0" ><br>{tr}Banned IPs{/tr}</a></td>
+  <td align="center"><a href="{$script}?action=adminbanned"><img src="{tpl file=/img/admin/banned.png}" border="0" ><br>{tr}Banned IPs{/tr}</a></td>
   <td align="center">&nbsp;</td>
 </tr>
 {$plugins}

Modified: trunk/templates/default/modules/admin/banned.tpl
===================================================================
--- trunk/templates/default/modules/admin/banned.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/banned.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -1,7 +1,7 @@
 {include file="default/modules/admin/adminmenu.tpl"}
 <div id="toolbar">
-<a href="{$script}?action={$action}&step=2"><img src="{$page.template}/img/admin/tadd.png"></a>
-<img src="{$page.template}/img/admin/tdelete.png">
+<a href="{$script}?action={$action}&step=2"><img src="{tpl file=/img/admin/tadd.png}"></a>
+<img src="{tpl file=/img/admin/tdelete.png}">
 </div>
 <br>
 {if $pages>2}
@@ -31,7 +31,7 @@
   <td id="{$rid}">{$b.access}</td>
   <td id="{$rid}">{$b.priority}</td>
   <td id="{$rid}">
-   <a title="delete" href="{$script}?action={$action}&step=4&id={$b.id}"><img src="{$page.template}/img/admin/delete.png"></a>
+   <a title="delete" href="{$script}?action={$action}&step=4&id={$b.id}"><img src="{tpl file=/img/admin/delete.png}"></a>
   </td>
 </tr>
 {/foreach}

Modified: trunk/templates/default/modules/admin/files.tpl
===================================================================
--- trunk/templates/default/modules/admin/files.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/files.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -29,10 +29,10 @@
   <td id="{$rid}">{$f.name}</td>
   <td id="{$rid}">{$users[$f.user_id].login}</td>
   <td id="{$rid}" style="text-align: left"><a title="ban IP {$f.ip}" href="{$script}?action=adminbanned&step=2&ip={$f.ip}&newaction={$action}">
-                              <img align="right" src="{$page.template}/img/admin/ban.png" ></a>{$f.ip} </td>
+                              <img align="right" src="{tpl file=/img/admin/ban.png}" ></a>{$f.ip} </td>
   <td id="{$rid}">{$f.upload_date}</td>
   <td id="{$rid}">
-   <a title="delete" href="{$script}?action={$action}&step=4&id={$f.id}"><img src="{$page.template}/img/admin/delete.png"></a></td>
+   <a title="delete" href="{$script}?action={$action}&step=4&id={$f.id}"><img src="{tpl file=/img/admin/delete.png}"></a></td>
 </tr>
 {/foreach}
 </table>
\ No newline at end of file

Modified: trunk/templates/default/modules/admin/groups.tpl
===================================================================
--- trunk/templates/default/modules/admin/groups.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/groups.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -1,7 +1,7 @@
 {include file="default/modules/admin/adminmenu.tpl"}
 <div id="toolbar">
-<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{$page.template}/img/admin/tadd_group.png"></a>
-<img src="{$page.template}/img/admin/tdelete_group.png">
+<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{tpl file=/img/admin/tadd_group.png}"></a>
+<img src="{tpl file=/img/admin/tdelete_group.png}">
 </div>
 <br>
 <table border="0" id="dbtable">
@@ -18,9 +18,9 @@
   <td id="{$rid}" style="text-align:left"><a href="{$script}?action=admingroups&step=3&id={$g.name}">{$g.name}</a></td>
   <td id="{$rid}">{$g.description}</td>
   <td id="{$rid}">
-    <a href="{$script}?action={$action}&step=3&id={$g.name}"><img src="{$page.template}/img/admin/edit_group.png"></a>
+    <a href="{$script}?action={$action}&step=3&id={$g.name}"><img src="{tpl file=/img/admin/edit_group.png}"></a>
    &nbsp; 
-   <a href="{$script}?action={$action}&step=4&id={$g.name}"><img src="{$page.template}/img/admin/delete_group.png"></a></td>
+   <a href="{$script}?action={$action}&step=4&id={$g.name}"><img src="{tpl file=/img/admin/delete_group.png}"></a></td>
 </tr>
 {/foreach}
 </table>
\ No newline at end of file

Modified: trunk/templates/default/modules/admin/plugins.tpl
===================================================================
--- trunk/templates/default/modules/admin/plugins.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/plugins.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -2,8 +2,8 @@
 <br>
 <table border="0" width="400" height="200">
 <tr>
-  <td align="center"><a href="{$script}?action=adminpluginsacl"><img src="{$page.template}/img/admin/plugins.png" border="0" ><br>{tr}Plugins ACL{/tr}</a></td>
-  <td align="center"><a href="{$script}?action=adminpluginsoptions"><img src="{$page.template}/img/admin/plugins.png" border="0" align="center"><br>{tr}Plugins Options{/tr}</a></td>
+  <td align="center"><a href="{$script}?action=adminpluginsacl"><img src="{tpl file=/img/admin/plugins.png}" border="0" ><br>{tr}Plugins ACL{/tr}</a></td>
+  <td align="center"><a href="{$script}?action=adminpluginsoptions"><img src="{tpl file=/img/admin/plugins.png}" border="0" align="center"><br>{tr}Plugins Options{/tr}</a></td>
 </tr>
 {$plugins}
 </table>
\ No newline at end of file

Modified: trunk/templates/default/modules/admin/pluginsacl.tpl
===================================================================
--- trunk/templates/default/modules/admin/pluginsacl.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/pluginsacl.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -1,7 +1,7 @@
 {include file="default/modules/admin/adminmenu.tpl"}
 <div id="toolbar">
-<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{$page.template}/img/admin/plugins.png"></a>
-<img src="{$page.template}/img/admin/tdelete.png">
+<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{tpl file=/img/admin/plugins.png}"></a>
+<img src="{tpl file=/img/admin/tdelete.png}">
 </div>
 <br>
 <table border="0" id="dbtable">
@@ -22,9 +22,9 @@
   <td id="{$rid}">{$p.group_name}</td>
   <td id="{$rid}">{$p.access}</td>
   <td id="{$rid}">
-    <a href="{$script}?action={$action}&step=3&id={$p.id}"><img src="{$page.template}/img/admin/edit_plugin.png"></a>
+    <a href="{$script}?action={$action}&step=3&id={$p.id}"><img src="{tpl file=/img/admin/edit_plugin.png}"></a>
    &nbsp; 
-   <a href="{$script}?action={$action}&step=4&id={$p.id}"><img src="{$page.template}/img/admin/delete.png"></a></td>
+   <a href="{$script}?action={$action}&step=4&id={$p.id}"><img src="{tpl file=/img/admin/delete.png}"></a></td>
 </tr>
 {/foreach}
 </table>
\ No newline at end of file

Modified: trunk/templates/default/modules/admin/rights.tpl
===================================================================
--- trunk/templates/default/modules/admin/rights.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/rights.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -1,7 +1,7 @@
 {include file="default/modules/admin/adminmenu.tpl"}
 <div id="toolbar">
-<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{$page.template}/img/admin/tadd_right.png"></a>
-<img src="{$page.template}/img/admin/tdelete.png">
+<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{tpl file=/img/admin/tadd_right.png}"></a>
+<img src="{tpl file=/img/admin/tdelete.png}">
 </div>
 <br>
 <table border="0" id="dbtable">
@@ -24,9 +24,9 @@
   <td id="{$rid}">{$r.action}</td>
   <td id="{$rid}">{$r.access}</td>
   <td id="{$rid}">
-    <a href="{$script}?action={$action}&step=3&id={$r.id}"><img src="{$page.template}/img/admin/edit_right.png"></a>
+    <a href="{$script}?action={$action}&step=3&id={$r.id}"><img src="{tpl file=/img/admin/edit_right.png}"></a>
    &nbsp; 
-   <a href="{$script}?action={$action}&step=4&id={$r.id}"><img src="{$page.template}/img/admin/delete.png"></a></td>
+   <a href="{$script}?action={$action}&step=4&id={$r.id}"><img src="{tpl file=/img/admin/delete.png}"></a></td>
 </tr>
 {/foreach}
 </table>
\ No newline at end of file

Modified: trunk/templates/default/modules/admin/users.tpl
===================================================================
--- trunk/templates/default/modules/admin/users.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/users.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -1,7 +1,7 @@
 {include file="default/modules/admin/adminmenu.tpl"}
 <div id="toolbar">
-<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{$page.template}/img/admin/tadd_user.png"></a>
-<img src="{$page.template}/img/admin/tdelete_user.png">
+<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{tpl file=/img/admin/tadd_user.png}"></a>
+<img src="{tpl file=/img/admin/tdelete_user.png}">
 </div>
 <br>
 <table border="0" id="dbtable">
@@ -23,13 +23,13 @@
   <td id="{$rid}">{$u.group_name}</td>
   <td id="{$rid}">{$u.email}</td>
   <td id="{$rid}"><a href="{$script}?action={$action}&step=5&id={$u.login}&active={$u.active}">
-                   <img src="{$page.template}/img/admin/active{$u.active}.png">
+                   <img src="{tpl file='/img/admin/active%s.png'|sprintf:$u.active}">
                 </a>
    </td>
   <td id="{$rid}">
-    <a href="{$script}?action={$action}&step=3&id={$u.login}"><img src="{$page.template}/img/admin/edit_user.png"></a>
+    <a href="{$script}?action={$action}&step=3&id={$u.login}"><img src="{tpl file=/img/admin/edit_user.png}"></a>
    &nbsp; 
-   <a href="{$script}?action={$action}&step=4&id={$u.login}"><img src="{$page.template}/img/admin/delete_user.png"></a></td>
+   <a href="{$script}?action={$action}&step=4&id={$u.login}"><img src="{tpl file=/img/admin/delete_user.png}"></a></td>
 </tr>
 {/foreach}
 </table>
\ No newline at end of file

Modified: trunk/templates/default/modules/files/downloadConfirm.tpl
===================================================================
--- trunk/templates/default/modules/files/downloadConfirm.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/files/downloadConfirm.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -8,7 +8,7 @@
 </table>
 <div id="downloadbutton"><br><center>
   <a href="{$script}?action=g">
-  <img src="{$page.template}/img/download.png" border="0"><br>
+  <img src="{tpl file=/img/download.png}" border="0"><br>
   {tr}Download file{/tr}</a></center>
 </div>
 

Modified: trunk/templates/default/modules/files/uploadForm.tpl
===================================================================
--- trunk/templates/default/modules/files/uploadForm.tpl	2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/files/uploadForm.tpl	2008-10-27 11:36:38 UTC (rev 85)
@@ -21,7 +21,7 @@
 {$plugins}
 <div id="uploadbutton" style="visibility:hidden"><br>
   <a href="{$script}" onclick="document.uploadform.submit();return false;">
-  <img src="{$page.template}/img/upload.png" border="0"><br>
+  <img src="{tpl file=/img/upload.png}" border="0"><br>
   {tr}Upload{/tr}</a>
 </div>
 </form>


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


