diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/js.js | 6 | ||||
| -rw-r--r-- | core/js/setup.js | 7 | ||||
| -rw-r--r-- | core/templates/installation.php | 25 |
3 files changed, 32 insertions, 6 deletions
diff --git a/core/js/js.js b/core/js/js.js index 499e6b7525c..86e802cd348 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -475,7 +475,7 @@ $(document).ready(function(){ } } // hide log in button etc. when form fields not filled - // commented out due to some browsers having issues with it + // commented out due to some browsers having issues with it // checkShowCredentials(); // $('input#user, input#password').keyup(checkShowCredentials); @@ -535,7 +535,7 @@ if (!Array.prototype.map){ } } - return res; + return res; }; } @@ -543,7 +543,7 @@ if (!Array.prototype.map){ * Filter Jquery selector by attribute value **/ $.fn.filterAttr = function(attr_name, attr_value) { - return this.filter(function() { return $(this).attr(attr_name) === attr_value; }); + return this.filter(function() { return $(this).attr(attr_name) === attr_value; }); }; function humanFileSize(size) { diff --git a/core/js/setup.js b/core/js/setup.js index 6e056cc90d1..23c705a0686 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -4,6 +4,7 @@ $(document).ready(function() { sqlite:!!$('#hasSQLite').val(), mysql:!!$('#hasMySQL').val(), postgresql:!!$('#hasPostgreSQL').val(), + oracle:!!$('#hasOracle').val(), } $('#selectDbType').buttonset(); @@ -34,6 +35,12 @@ $(document).ready(function() { $('#dbhost').show(250); $('#dbhostlabel').show(250); }); + + $('#oci').click(function() { + $('#use_other_db').slideDown(250); + $('#dbhost').show(250); + $('#dbhostlabel').show(250); + }); $('input[checked]').trigger('click'); diff --git a/core/templates/installation.php b/core/templates/installation.php index 4558f97bc08..1a05c3fb762 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -1,6 +1,7 @@ <input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'></input> <input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'></input> <input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'></input> +<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'></input> <form action="index.php" method="post"> <input type="hidden" name="install" value="true" /> @@ -40,7 +41,7 @@ </fieldset> <fieldset id='databaseField'> - <?php if($_['hasMySQL'] or $_['hasPostgreSQL']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> + <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> <legend><?php echo $l->t( 'Configure the database' ); ?></legend> <div id="selectDbType"> <?php if($_['hasSQLite']): ?> @@ -56,7 +57,7 @@ <?php if($_['hasMySQL']): ?> <input type='hidden' id='hasMySQL' value='true'/> - <?php if(!$_['hasSQLite'] and !$_['hasPostgreSQL']): ?> + <?php if(!$_['hasSQLite'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?> <p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p> <input type="hidden" id="dbtype" name="dbtype" value="mysql" /> <?php else: ?> @@ -66,7 +67,7 @@ <?php endif; ?> <?php if($_['hasPostgreSQL']): ?> - <?php if(!$_['hasSQLite'] and !$_['hasMySQL']): ?> + <?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasOracle']): ?> <p>PostgreSQL <?php echo $l->t( 'will be used' ); ?>.</p> <input type="hidden" id="dbtype" name="dbtype" value="pgsql" /> <?php else: ?> @@ -74,6 +75,16 @@ <input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype','pgsql', 'sqlite'); ?>/> <?php endif; ?> <?php endif; ?> + + <?php if($_['hasOracle']): ?> + <?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL']): ?> + <p>Oracle <?php echo $l->t( 'will be used' ); ?>.</p> + <input type="hidden" id="dbtype" name="dbtype" value="oci" /> + <?php else: ?> + <label class="oci" for="oci">Oracle</label> + <input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype','oci', 'sqlite'); ?>/> + <?php endif; ?> + <?php endif; ?> </div> <?php if($hasOtherDB): ?> @@ -92,6 +103,14 @@ </p> </div> <?php endif; ?> + <?php if($_['hasOracle']): ?> + <div id="use_oracle_db"> + <p class="infield"> + <label for="dbtablespace" class="infield"><?php echo $l->t( 'Database tablespace' ); ?></label> + <input type="text" name="dbtablespace" id="dbtablespace" value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" /> + </p> + </div> + <?php endif; ?> <p class="infield"> <label for="dbhost" class="infield"><?php echo $l->t( 'Database host' ); ?></label> <input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" /> |