Skip to content

Commit

Permalink
unacms#4793 Ability to set db_host in phing build script
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Trofimov committed Sep 5, 2024
1 parent 062769e commit 88b0ff9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
6 changes: 5 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
</if>


<if>
<not><isset property="db_host" /></not>
<then><property name="db_host" value="localhost" override="yes" /></then>
</if>
<if>
<not><isset property="db_name" /></not>
<then><property name="db_name" value="test" override="yes" /></then>
Expand Down Expand Up @@ -122,7 +126,7 @@
<not><isset property="install_base_dir" /></not>
<then><property name="install_base_dir" value="${project.basedir}" /></then>
</if>
<exec command="${php} cmd.php -m ${modules} --db_name=${db_name} --db_user=${db_user} --db_password=${db_password} --server_http_host=${http_host} --server_php_self=${php_self} --server_doc_root=${doc_root}" dir="${install_base_dir}/install" checkreturn="true" />
<exec command="${php} cmd.php -m ${modules} --db_host=${db_host} --db_name=${db_name} --db_user=${db_user} --db_password=${db_password} --server_http_host=${http_host} --server_php_self=${php_self} --server_doc_root=${doc_root}" dir="${install_base_dir}/install" checkreturn="true" />
</target>

<!-- ============================================ -->
Expand Down
6 changes: 6 additions & 0 deletions modules/boonex/okta_connect/classes/BxOktaConCustom.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ function onConvertRemoteFields($aProfileInfo, &$aProfileFields)

$v = 0;
foreach ($a as $i) {
if ($i == 'K Grader')
$i = 20;
elseif ($i == 'TK Grader')
$i = 21;
elseif ($i == 'AL Grader')
$i = 22;
$v += pow(2, (int)$i - 1);
}

Expand Down

0 comments on commit 88b0ff9

Please sign in to comment.