From f39454ed12018402f38a8f6bf99fc94d676a0a3a Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 14 Dec 2012 23:04:42 +0100 Subject: [PATCH] Fix "Line indented incorrectly" --- apps/files_versions/history.php | 4 +-- apps/user_ldap/lib/access.php | 2 +- apps/user_ldap/lib/connection.php | 8 ++--- apps/user_webdavauth/settings.php | 6 ++-- lib/db.php | 6 ++-- lib/migrate.php | 2 +- lib/ocsclient.php | 8 ++--- lib/request.php | 2 +- lib/templatelayout.php | 10 +++--- lib/updater.php | 18 +++++----- lib/util.php | 58 +++++++++++++++---------------- 11 files changed, 62 insertions(+), 62 deletions(-) diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php index deff735cedc..d4c278ebd85 100644 --- a/apps/files_versions/history.php +++ b/apps/files_versions/history.php @@ -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); diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 91f56ad882e..e1eea2f46c0 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -356,7 +356,7 @@ abstract class Access { ); } $res = $query->execute(array($dn))->fetchOne(); - if($res) { + if($res) { return $res; } return false; diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 687e2692270..b14cdafff89 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -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(); diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php index 497a3385caa..910073c7841 100755 --- a/apps/user_webdavauth/settings.php +++ b/apps/user_webdavauth/settings.php @@ -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 diff --git a/lib/db.php b/lib/db.php index 6524db7581a..7e60b41d230 100644 --- a/lib/db.php +++ b/lib/db.php @@ -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( '0000-00-00 00:00:00', 'CURRENT_TIMESTAMP', $content ); - } + if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't + $content = str_replace( '0000-00-00 00:00:00', 'CURRENT_TIMESTAMP', $content ); + } file_put_contents( $file2, $content ); diff --git a/lib/migrate.php b/lib/migrate.php index 2cc0a3067b8..f41441bedbb 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -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' ); diff --git a/lib/ocsclient.php b/lib/ocsclient.php index 12e5026a877..24081425f1e 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -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. diff --git a/lib/request.php b/lib/request.php index c975c84a711..782ed26a415 100755 --- a/lib/request.php +++ b/lib/request.php @@ -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 diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 1a0570a270d..87b5620932c 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -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 diff --git a/lib/updater.php b/lib/updater.php index 11081eded63..d44ac108380 100644 --- a/lib/updater.php +++ b/lib/updater.php @@ -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() { diff --git a/lib/util.php b/lib/util.php index 34c4d4f9b11..fc1c889c31d 100755 --- a/lib/util.php +++ b/lib/util.php @@ -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(); - - 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; - } + if (function_exists('curl_init')) { + + $curl = 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); + + } else { + + $ctx = stream_context_create( + array( + 'http' => array( + 'timeout' => 10 + ) + ) + ); + $data=@file_get_contents($url, 0, $ctx); + + } + + return $data; + } } -- 2.39.5