diff options
| -rw-r--r-- | core/css/styles.css | 9 | ||||
| -rw-r--r-- | lib/private/ocsclient.php | 29 | ||||
| -rw-r--r-- | lib/private/setup/oci.php | 14 | ||||
| -rw-r--r-- | settings/templates/personal.php | 3 |
4 files changed, 41 insertions, 14 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 7e41e904127..08ffaa72e10 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -736,9 +736,16 @@ code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono font-weight: normal; white-space: nowrap; border-bottom-left-radius: 3px; - border-top-left-radius: 3px; } + border-top-left-radius: 3px; + min-width: 1%; + max-width: 100%; +} #quotatext {padding:.6em 1em;} +#quota div.quota-warning { + background-color: #fc4; +} + .pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; } .pager li { display:inline-block; } diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php index e4cce6b2260..dc147dea0c9 100644 --- a/lib/private/ocsclient.php +++ b/lib/private/ocsclient.php @@ -29,6 +29,18 @@ class OC_OCSClient{ /** + * Returns whether the AppStore is enabled (i.e. because the AppStore is disabled for EE) + * @return bool + */ + protected static function isAppstoreEnabled() { + if(OC::$server->getConfig()->getSystemValue('appstoreenabled', true) === false OR OC_Util::getEditionString() !== '') { + return false; + } + + return true; + } + + /** * Get the url of the OCS AppStore server. * @return string of the AppStore server * @@ -36,16 +48,9 @@ class OC_OCSClient{ * to set it in the config file or it will fallback to the default */ private static function getAppStoreURL() { - if(OC_Util::getEditionString()===''){ - $default='https://api.owncloud.com/v1'; - }else{ - $default=''; - } - $url = OC_Config::getValue('appstoreurl', $default); - return($url); + return OC::$server->getConfig()->getSystemValue('appstoreurl', 'https://api.owncloud.com/v1'); } - /** * Get the content of an OCS url call. * @return string of the response @@ -64,7 +69,7 @@ class OC_OCSClient{ * This function returns a list of all the application categories on the OCS server */ public static function getCategories() { - if(OC_Config::getValue('appstoreenabled', true)==false) { + if(!self::isAppstoreEnabled()) { return null; } $url=OC_OCSClient::getAppStoreURL().'/content/categories'; @@ -100,7 +105,7 @@ class OC_OCSClient{ * @param string $filter */ public static function getApplications($categories, $page, $filter) { - if(OC_Config::getValue('appstoreenabled', true)==false) { + if(!self::isAppstoreEnabled()) { return(array()); } @@ -155,7 +160,7 @@ class OC_OCSClient{ * This function returns an applications from the OCS server */ public static function getApplication($id) { - if(OC_Config::getValue('appstoreenabled', true)==false) { + if(!self::isAppstoreEnabled()) { return null; } $url=OC_OCSClient::getAppStoreURL().'/content/data/'.urlencode($id); @@ -203,7 +208,7 @@ class OC_OCSClient{ * @param integer $item */ public static function getApplicationDownload($id, $item) { - if(OC_Config::getValue('appstoreenabled', true)==false) { + if(!self::isAppstoreEnabled()) { return null; } $url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item); diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php index 24863b9e38a..23b5232438a 100644 --- a/lib/private/setup/oci.php +++ b/lib/private/setup/oci.php @@ -14,9 +14,23 @@ class OCI extends AbstractDatabase { } else { $this->dbtablespace = 'USERS'; } + // allow empty hostname for oracle + $this->dbhost = $config['dbhost']; + \OC_Config::setValue('dbhost', $this->dbhost); \OC_Config::setValue('dbtablespace', $this->dbtablespace); } + public function validate($config) { + $errors = array(); + if(empty($config['dbuser'])) { + $errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname)); + } + if(empty($config['dbname'])) { + $errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname)); + } + return $errors; + } + public function setupDatabase($username) { $e_host = addslashes($this->dbhost); $e_dbname = addslashes($this->dbname); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 661c242ea6b..c1fb20dce05 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -34,7 +34,8 @@ <div id="quota" class="section"> - <div style="width:<?php p($_['usage_relative']);?>%;"> + <div style="width:<?php p($_['usage_relative']);?>%" + <?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>> <p id="quotatext"> <?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', array($_['usage'], $_['total_space'])));?> |