[geeklog-cvs] geeklog: For consistency: Template variables for text strings fr...

[geeklog-cvs at lists.geeklog.net]

changeset 7523:118c024f7b26
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/118c024f7b26
user: Dirk Haun <dirk at haun-online.de>
date: Sat Dec 12 20:46:36 2009 +0100
description:
For consistency: Template variables for text strings from the language files should always start with lang_

diffstat:

 public_html/docs/english/theme.html                                 |   3 +
 public_html/layout/professional/admin/common/edit_permissions.thtml |   8 +-
 system/lib-security.php                                             |  44 ++++++-----
 3 files changed, 31 insertions(+), 24 deletions(-)

diffs (115 lines):

diff -r 450d18b0273d -r 118c024f7b26 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sat Dec 12 20:25:50 2009 +0100
+++ b/public_html/docs/english/theme.html	Sat Dec 12 20:46:36 2009 +0100
@@ -198,6 +198,9 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.2</a></h2>
 
 <ul>
+<li>For consistency: The template variables for the headline texts in
+    <tt>admin/common/edit_permissions.thtml</tt> are now also available with a
+    <code>lang_</code> prefix (<code>{lang_owner}</code>, etc).</li>
 <li>New variable <code>{hide_meta}</code> in the Story editor templates,
     <tt>admin/topic/storyeditor.thtml</tt> and
     <tt>admin/topic/storyeditor_advanced.thtml</tt>, to hide the text entry
diff -r 450d18b0273d -r 118c024f7b26 public_html/layout/professional/admin/common/edit_permissions.thtml
--- a/public_html/layout/professional/admin/common/edit_permissions.thtml	Sat Dec 12 20:25:50 2009 +0100
+++ b/public_html/layout/professional/admin/common/edit_permissions.thtml	Sat Dec 12 20:46:36 2009 +0100
@@ -1,9 +1,9 @@
 <table cellpadding="0" cellspacing="0" class="admin-list-smalltable">
     <tr>
-        <th colspan="2" class="edit-perm-up admin-list-headerfield">{owner}</th>
-        <th colspan="2" class="edit-perm-up admin-list-headerfield">{group}</th>
-        <th class="edit-perm-up admin-list-headerfield">{members}</th>
-        <th class="edit-perm-up admin-list-headerfield">{anonymous}</th>
+        <th colspan="2" class="edit-perm-up admin-list-headerfield">{lang_owner}</th>
+        <th colspan="2" class="edit-perm-up admin-list-headerfield">{lang_group}</th>
+        <th class="edit-perm-up admin-list-headerfield">{lang_members}</th>
+        <th class="edit-perm-up admin-list-headerfield">{lang_anonymous}</th>
     </tr>
     <tr class="pluginRow1">
         <td class="edit-perm-down admin-list-field"><b>R</b><br{xhtml}><input type="checkbox" name="perm_owner[]" value="2"{owner_r_checked}{xhtml}></td>
diff -r 450d18b0273d -r 118c024f7b26 system/lib-security.php
--- a/system/lib-security.php	Sat Dec 12 20:25:50 2009 +0100
+++ b/system/lib-security.php	Sat Dec 12 20:46:36 2009 +0100
@@ -411,8 +411,8 @@
 /**
 * Shows security control for an object
 *
-* This will return the HTML needed to create the security control see on the admin
-* screen for GL objects (i.e. stories, etc)
+* This will return the HTML needed to create the security control seen on the
+* admin screen for GL objects (i.e. stories, etc)
 *
 * @param        int     $perm_owner     Permissions the owner has 1 = edit 2 = read 3 = read/edit
 * @param        int     $perm_group     Permission the group has
@@ -421,48 +421,52 @@
 * @return       string  needed HTML (table) in HTML $perm_owner = array of permissions [edit,read], etc edit = 1 if permission, read = 2 if permission
 *
 */
-function SEC_getPermissionsHTML($perm_owner,$perm_group,$perm_members,$perm_anon)
+function SEC_getPermissionsHTML($perm_owner, $perm_group, $perm_members, $perm_anon)
 {
-    global $LANG_ACCESS, $_CONF;
+    global $_CONF, $LANG_ACCESS;
 
     $retval = '';
 
     $perm_templates = new Template($_CONF['path_layout'] . 'admin/common');
-    $perm_templates->set_file(array('editor'=>'edit_permissions.thtml'));
+    $perm_templates->set_file(array('editor' => 'edit_permissions.thtml'));
 
-    $perm_templates->set_var ( 'xhtml', XHTML );
-    $perm_templates->set_var ('site_url', $_CONF['site_url']);
-    $perm_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
-    $perm_templates->set_var ('layout_url', $_CONF['layout_url']);
-    $perm_templates->set_var ('owner', $LANG_ACCESS['owner']);
-    $perm_templates->set_var ('group', $LANG_ACCESS['group']);
-    $perm_templates->set_var ('members', $LANG_ACCESS['members']);
-    $perm_templates->set_var ('anonymous', $LANG_ACCESS['anonymous']);
+    $perm_templates->set_var('xhtml', XHTML);
+    $perm_templates->set_var('site_url', $_CONF['site_url']);
+    $perm_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
+    $perm_templates->set_var('layout_url', $_CONF['layout_url']);
+    $perm_templates->set_var('lang_owner', $LANG_ACCESS['owner']);
+    $perm_templates->set_var('owner', $LANG_ACCESS['owner']);
+    $perm_templates->set_var('lang_group', $LANG_ACCESS['group']);
+    $perm_templates->set_var('group', $LANG_ACCESS['group']);
+    $perm_templates->set_var('lang_members', $LANG_ACCESS['members']);
+    $perm_templates->set_var('members', $LANG_ACCESS['members']);
+    $perm_templates->set_var('lang_anonymous', $LANG_ACCESS['anonymous']);
+    $perm_templates->set_var('anonymous', $LANG_ACCESS['anonymous']);
 
     // Owner Permissions
     if ($perm_owner >= 2) {
-        $perm_templates->set_var ('owner_r_checked',' checked="checked"');
+        $perm_templates->set_var('owner_r_checked',' checked="checked"');
     }
     if ($perm_owner == 3) {
-        $perm_templates->set_var ('owner_e_checked',' checked="checked"');
+        $perm_templates->set_var('owner_e_checked',' checked="checked"');
     }
     // Group Permissions
     if ($perm_group >= 2) {
-        $perm_templates->set_var ('group_r_checked',' checked="checked"');
+        $perm_templates->set_var('group_r_checked',' checked="checked"');
     }
     if ($perm_group == 3) {
-        $perm_templates->set_var ('group_e_checked',' checked="checked"');
+        $perm_templates->set_var('group_e_checked',' checked="checked"');
     }
     // Member Permissions
     if ($perm_members == 2) {
-        $perm_templates->set_var ('members_checked',' checked="checked"');
+        $perm_templates->set_var('members_checked',' checked="checked"');
     }
     // Anonymous Permissions
     if ($perm_anon == 2) {
-        $perm_templates->set_var ('anon_checked',' checked="checked"');
+        $perm_templates->set_var('anon_checked',' checked="checked"');
     }
 
-    $perm_templates->parse('output','editor');
+    $perm_templates->parse('output', 'editor');
     $retval .= $perm_templates->finish($perm_templates->get_var('output'));
 
     return $retval;