Menu
▾
▴
[Thevr-commit] SF.net SVN: thevr: [31] modx/pms/trunk/TheVR_0.1.1c.xml
|
From: <and...@us...> - 2007-09-01 17:21:24
|
Revision: 31
http://thevr.svn.sourceforge.net/thevr/?rev=31&view=rev
Author: andrewbelcher
Date: 2007-09-01 10:21:25 -0700 (Sat, 01 Sep 2007)
Log Message:
-----------
Fixed a couple white space/line break problems.
Also changed the langauge/en/acp/forums.php change to a 'before-add' rather than 'after-add' as it made more sense.
Modified Paths:
--------------
modx/pms/trunk/TheVR_0.1.1c.xml
Modified: modx/pms/trunk/TheVR_0.1.1c.xml
===================================================================
--- modx/pms/trunk/TheVR_0.1.1c.xml 2007-09-01 17:14:55 UTC (rev 30)
+++ modx/pms/trunk/TheVR_0.1.1c.xml 2007-09-01 17:21:25 UTC (rev 31)
@@ -247,44 +247,35 @@
</open>
<open src="/adm/style/acp_forums.html">
<edit>
- <find>
- <![CDATA[ <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
- </dl>]]>
- </find>
- <action type="after-add">
- <![CDATA[ <dl>
+ <find><![CDATA[ <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
+ </dl>]]></find>
+ <action type="after-add"><![CDATA[ <dl>
<dt><label for="forum_site_id">{L_SITE_ID}:</label><br /><span>{L_SITE_ID_EXPLAIN}</span></dt>
<dd><select id="forum_site_id" name="forum_site_id"><option value="0">{L_SITE_GLOBAL}</option>{S_SITE_OPTIONS}</select></dd>
- </dl>]]>
- </action>
+ </dl>]]></action>
</edit>
</open>
<open src="/includes/auth.php">
<edit>
- <find>
- {
- $this->cache[$f][$opt] |= $this->acl[$f][$this->acl_options['local'][$opt]];
- }
- </find>
- <action type="after-add">
-
+ <find><![CDATA[ if (isset($this->acl[$f]) && isset($this->acl[$f][$this->acl_options['local'][$opt]]))
+ {
+ $this->cache[$f][$opt] |= $this->acl[$f][$this->acl_options['local'][$opt]];
+ }]]></find>
+ <action type="after-add">
if (check_forum($f) == false)
{
$this->cache[$f][$opt] = false;
- }
- </action>
+ }</action>
</edit>
</open>
<open src="/includes/constants.php">
<edit>
- <find>
-// Additional tables</find>
+ <find>// Additional tables</find>
<action type="after-add">
//TheVR
define('SITES_TABLE', $table_prefix . 'sites');
define('SITE_URL_TABLE', $table_prefix . 'site_urls');
-define('SITE_CONFIG_TABLE', $table_prefix . 'site_config');
- </action>
+define('SITE_CONFIG_TABLE', $table_prefix . 'site_config');</action>
</edit>
</open>
<open src="/includes/functions_user.php">
@@ -292,39 +283,37 @@
<find> // Now make it the users default group...
group_set_user_default($user_row['group_id'], array($user_id), false);
</find>
- <action type="after-add">
- /***** START
-ADDED by reekingofrandomness for thevr.co.uk
-This Automatically adds a member to there sites group
-*****/
+ <action type="after-add"> /***** START
+ ADDED by reekingofrandomness for thevr.co.uk
+ This Automatically adds a member to there sites group
+ *****/
- // Place into appropriate group...
- $sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array(
- 'user_id' => (int) $user_id,
- 'group_id' => (int) $config['site_group_id'],
- 'user_pending' => 0)
- );
- $db->sql_query($sql);
+ // Place into appropriate group...
+ $sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+ 'user_id' => (int) $user_id,
+ 'group_id' => (int) $config['site_group_id'],
+ 'user_pending' => 0)
+ );
+ $db->sql_query($sql);
-/***** END *****/
- </action>
+ /***** END *****/</action>
</edit>
</open>
<open src="/includes/acp/acp_forums.php">
<edit>
<find> 'forum_password_confirm'=> request_var('forum_password_confirm', '', true),</find>
- <action type="after-add"> 'forum_site_id' => request_var('forum_site_id', 0),</action>
+ <action type="after-add"> 'site_id' => request_var('forum_site_id', 0),</action>
</edit>
<edit>
<find> 'forum_password_confirm'=> '',</find>
- <action type="after-add"> 'forum_site_id' => 0,</action>
+ <action type="after-add"> 'site_id' => 0,</action>
</edit>
<edit>
<find> 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $forum_id, false, true, false))
);
}
$db->sql_freeresult($result);
- </find>
+</find>
<action type="after-add">
$site_list = '';
@@ -339,7 +328,7 @@
$site_list .= '>' . $row['name'] . '</option>';]]>
}
$db->sql_freeresult($result);
- </action>
+</action>
</edit>
<edit>
<find> 'S_STYLES_OPTIONS' => $styles_list,</find>
@@ -367,14 +356,15 @@
'ACP_MANAGE_SITES' => 'Manage Sites',
'ACP_SITE_SETTINGS' => 'Edit Site Configuration',
'ACP_SITE_SETTINGS_EXPLAIN' => '',
-/** End added **/</action>
+/** End added **/
+</action>
</edit>
</open>
<open src="/language/en/acp/forums.php">
<edit>
- <find> 'REDIRECT_ACL' => 'Now you are able to %sset permissions%s for this forum.',</find>
- <action type="after-add">
- 'SITE_ID' => 'Site',
+ <find> 'SYNC_IN_PROGRESS' => 'Synchronizing forum',
+ 'SYNC_IN_PROGRESS_EXPLAIN' => 'Currently resyncing topic range %1$d/%2$d.',</find>
+ <action type="before-add">'SITE_ID' => 'Site',
'SITE_ID_EXPLAIN' => 'Select which site this is part of.',
'SITE_GLOBAL' => 'Global Forum',</action>
</edit>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
