mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix "Line indented incorrectly"

This commit is contained in:
Bart Visscher 2012-12-14 23:04:42 +01:00
parent 8256650da8
commit f39454ed12
11 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_versions/history.php
View File

@ -33,7 +33,7 @@ if ( isset( $_GET['path'] ) ) {
$versions = new OCA_Versions\Storage();
// roll back to old version if button clicked
if( isset( $_GET['revert'] ) ) {
if( isset( $_GET['revert'] ) ) {
if( $versions->rollback( $path, $_GET['revert'] ) ) {
@ -52,7 +52,7 @@ if ( isset( $_GET['path'] ) ) {
}
// show the history only if there is something to show
if( OCA_Versions\Storage::isversioned( $path ) ) {
if( OCA_Versions\Storage::isversioned( $path ) ) {
$count = 999; //show the newest revisions
$versions = OCA_Versions\Storage::getVersions( $path, $count);

2
apps/user_ldap/lib/access.php
View File

@ -356,7 +356,7 @@ abstract class Access {
);
}
$res = $query->execute(array($dn))->fetchOne();
if($res) {
if($res) {
return $res;
}
return false;

8
apps/user_ldap/lib/connection.php
View File

@ -338,11 +338,11 @@ class Connection {
}
$this->ldapConnectionRes = ldap_connect($this->config['ldapHost'], $this->config['ldapPort']);
if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
if($this->config['ldapTLS']) {
ldap_start_tls($this->ldapConnectionRes);
}
if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
if($this->config['ldapTLS']) {
ldap_start_tls($this->ldapConnectionRes);
}
}
}
return $this->bind();

6
apps/user_webdavauth/settings.php
View File

@ -23,9 +23,9 @@
if($_POST) {
if(isset($_POST['webdav_url'])) {
OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
}
if(isset($_POST['webdav_url'])) {
OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
}
}
// fill template

6
lib/db.php
View File

@ -445,9 +445,9 @@ class OC_DB {
* http://www.sqlite.org/lang_createtable.html
* http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
*/
if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't
$content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
}
if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't
$content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
}
file_put_contents( $file2, $content );

2
lib/migrate.php
View File

@ -78,7 +78,7 @@ class OC_Migrate{
* @param otional $path string path to zip output folder
* @return false on error, path to zip on success
*/
public static function export( $uid=null, $type='user', $path=null ) {
public static function export( $uid=null, $type='user', $path=null ) {
$datadir = OC_Config::getValue( 'datadirectory' );
// Validate export type
$types = array( 'user', 'instance', 'system', 'userfiles' );

8
lib/ocsclient.php
View File

@ -44,10 +44,10 @@ class OC_OCSClient{
* @returns string of the KB server
* This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default
*/
private static function getKBURL() {
$url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
return($url);
}
private static function getKBURL() {
$url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
return($url);
}
/**
* @brief Get the content of an OCS url call.

2
lib/request.php
View File

@ -74,7 +74,7 @@ class OC_Request {
switch($encoding) {
case 'ISO-8859-1' :
$path_info = utf8_encode($path_info);
$path_info = utf8_encode($path_info);
}
// end copy

10
lib/templatelayout.php
View File

@ -97,13 +97,13 @@ class OC_TemplateLayout extends OC_Template {
* @param $web base for path
* @param $file the filename
*/
static public function appendIfExist(&$files, $root, $webroot, $file) {
if (is_file($root.'/'.$file)) {
static public function appendIfExist(&$files, $root, $webroot, $file) {
if (is_file($root.'/'.$file)) {
$files[] = array($root, $webroot, $file);
return true;
}
return false;
}
}
return false;
}
static public function findStylesheetFiles($styles) {
// Read the selected theme from the config file

18
lib/updater.php
View File

@ -52,18 +52,18 @@ class OC_Updater{
)
);
$xml=@file_get_contents($url, 0, $ctx);
if($xml==false) {
return array();
}
$data=@simplexml_load_string($xml);
if($xml==false) {
return array();
}
$data=@simplexml_load_string($xml);
$tmp=array();
$tmp['version'] = $data->version;
$tmp['versionstring'] = $data->versionstring;
$tmp['url'] = $data->url;
$tmp['web'] = $data->web;
$tmp['version'] = $data->version;
$tmp['versionstring'] = $data->versionstring;
$tmp['url'] = $data->url;
$tmp['web'] = $data->web;
return $tmp;
return $tmp;
}
public static function ShowUpdatingHint() {

54
lib/util.php
View File

@ -586,7 +586,7 @@ class OC_Util {
/**
* Check if the ownCloud server can connect to the internet
*/
public static function isinternetconnectionworking() {
public static function isinternetconnectionworking() {
// try to connect to owncloud.org to see if http connections to the internet are possible.
$connected = @fsockopen("www.owncloud.org", 80);
@ -685,34 +685,34 @@ class OC_Util {
* If not, file_get_element is used.
*/
public static function getUrlContent($url){
public static function getUrlContent($url){
if (function_exists('curl_init')) {
$curl = curl_init();
if (function_exists('curl_init')) {
curl_setopt($curl, CURLOPT_HEADER, 0);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
$data = curl_exec($curl);
curl_close($curl);
$curl = curl_init();
} else {
$ctx = stream_context_create(
array(
'http' => array(
'timeout' => 10
)
)
);
$data=@file_get_contents($url, 0, $ctx);
}
return $data;
}
curl_setopt($curl, CURLOPT_HEADER, 0);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
$data = curl_exec($curl);
curl_close($curl);
} else {
$ctx = stream_context_create(
array(
'http' => array(
'timeout' => 10
)
)
);
$data=@file_get_contents($url, 0, $ctx);
}
return $data;
}
}