merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -9,6 +9,6 @@
<field name="db_userid" required="true" length="1:250" rule="alpha_number" />
<field name="db_password" required="true" length="1:250"/>
<field name="db_database" required="true" length="1:250" />
<field name="db_table_prefix" length="2:20" rule="alpha" />
<field name="db_table_prefix" length="2:20" rule="alpha_number" />
</fields>
</ruleset>

View file

@ -6,7 +6,6 @@
<field name="email_address" required="true" length="1:200" rule="email" />
<field name="password" required="true" length="1:20" />
<field name="password2" required="true" length="1:20" equalto="password" />
<field name="user_id" required="true" length="2:20" rule="userid" />
<field name="nick_name" required="true" length="2:20" />
</fields>
</ruleset>

View file

@ -3,9 +3,9 @@
<customrules>
</customrules>
<fields>
<field name="ftp_host" required="true" />
<field name="ftp_host" required="true" default="127.0.0.1" />
<field name="ftp_user" required="true" />
<field name="ftp_port" filter="number" />
<field name="ftp_port" required="true" filter="number" default="21" />
<field name="ftp_root_path" required="true" />
<field name="sftp" required="true" />
</fields>

View file

@ -9,6 +9,6 @@
<field name="db_userid" required="true" length="1:250" rule="alpha_number" />
<field name="db_password" required="true" length="1:250"/>
<field name="db_database" required="true" length="1:250" />
<field name="db_table_prefix" length="2:20" rule="alpha" />
<field name="db_table_prefix" length="2:20" rule="alpha_number" />
</fields>
</ruleset>

View file

@ -10,6 +10,6 @@
<field name="db_userid" required="true" length="1:250" rule="mysqlUserId" />
<field name="db_password" required="true" length="1:250"/>
<field name="db_database" required="true" length="1:250" />
<field name="db_table_prefix" length="2:20" rule="alpha" />
<field name="db_table_prefix" length="2:20" rule="alpha_number" />
</fields>
</ruleset>