From db18218a1bba86e364fd4fec08c2e1a0eb4e7b16 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 29 Aug 2012 20:34:44 +0200
Subject: [PATCH] Space before tab fixes
---
apps/files/templates/part.breadcrumb.php | 2 +-
apps/files_external/templates/settings.php | 2 +-
apps/files_versions/appinfo/update.php | 15 +++++------
apps/files_versions/history.php | 2 +-
apps/user_ldap/tests/group_ldap.php | 2 +-
lib/app.php | 4 +--
lib/base.php | 2 +-
lib/db.php | 30 +++++++++++-----------
lib/ocsclient.php | 2 +-
lib/public/json.php | 2 +-
lib/public/util.php | 2 +-
lib/setup.php | 6 ++---
lib/template.php | 4 +--
lib/util.php | 2 +-
lib/vcategories.php | 2 +-
15 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 22d9bb4490..875fc747bb 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,6 +1,6 @@
<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
$crumb = $_["breadcrumb"][$i]; ?>
<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
- <a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
+ <a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
</div>
<?php endfor;?>
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 7da9613572..c44b09b180 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -82,7 +82,7 @@
<br />
<?php if (!$_['isAdminPage']): ?>
- <table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
+ <table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
<thead>
<tr>
<th><?php echo $l->t('SSL root certificates'); ?></th>
diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
index e289b927b3..52a4850758 100644
--- a/apps/files_versions/appinfo/update.php
+++ b/apps/files_versions/appinfo/update.php
@@ -5,12 +5,11 @@ $installedVersion=OCP\Config::getAppValue('files_versions', 'installed_version')
if (version_compare($installedVersion, '1.0.2', '<')) {
$users = \OCP\User::getUsers();
$datadir = \OCP\Config::getSystemValue('datadirectory').'/';
- foreach ($users as $user) {
- $oldPath = $datadir.$user.'/versions';
- $newPath = $datadir.$user.'/files_versions';
- if(is_dir($oldPath)) {
- rename($oldPath, $newPath);
- }
- }
-
+ foreach ($users as $user) {
+ $oldPath = $datadir.$user.'/versions';
+ $newPath = $datadir.$user.'/files_versions';
+ if(is_dir($oldPath)) {
+ rename($oldPath, $newPath);
+ }
+ }
}
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index ea36d6d9f8..0ebb34f45e 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -35,7 +35,7 @@ if ( isset( $_GET['path'] ) ) {
// roll back to old version if button clicked
if( isset( $_GET['revert'] ) ) {
- if( $versions->rollback( $path, $_GET['revert'] ) ) {
+ if( $versions->rollback( $path, $_GET['revert'] ) ) {
$tmpl->assign( 'outcome_stat', 'success' );
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index 106459580f..ac66a608b7 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -29,7 +29,7 @@ class Test_Group_Ldap extends UnitTestCase {
OC_Group::useBackend(new OCA\user_ldap\GROUP_LDAP());
$group_ldap = new OCA\user_ldap\GROUP_LDAP();
- $this->assertIsA(OC_Group::getGroups(),gettype(array()));
+ $this->assertIsA(OC_Group::getGroups(),gettype(array()));
$this->assertIsA($group_ldap->getGroups(),gettype(array()));
$this->assertFalse(OC_Group::inGroup('john','dosers'),gettype(false));
diff --git a/lib/app.php b/lib/app.php
index 7431590346..f6708ecb3d 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -286,7 +286,7 @@ class OC_App{
if(OC_Config::getValue('knowledgebaseenabled', true)==true){
$settings = array(
array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" ))
- );
+ );
}
// if the user is logged-in
@@ -313,7 +313,7 @@ class OC_App{
$settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
}
- }
+ }
$navigation = self::proceedNavigation($settings);
return $navigation;
diff --git a/lib/base.php b/lib/base.php
index 0c3ab8527a..1798bf09b9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -533,7 +533,7 @@ class OC{
protected static function tryBasicAuthLogin() {
if (!isset($_SERVER["PHP_AUTH_USER"])
|| !isset($_SERVER["PHP_AUTH_PW"])){
- return false;
+ return false;
}
OC_App::loadApps(array('authentication'));
if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"])) {
diff --git a/lib/db.php b/lib/db.php
index ecaf9e37ee..de72dee255 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -592,21 +592,21 @@ class OC_DB {
* @param $file string path to the MDB2 xml db export file
*/
public static function replaceDB( $file ){
- $apps = OC_App::getAllApps();
- self::beginTransaction();
- // Delete the old tables
- self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
-
- foreach($apps as $app){
- $path = OC_App::getAppPath($app).'/appinfo/database.xml';
- if(file_exists($path)){
- self::removeDBStructure( $path );
- }
- }
-
- // Create new tables
- self::createDBFromStructure( $file );
- self::commit();
+ $apps = OC_App::getAllApps();
+ self::beginTransaction();
+ // Delete the old tables
+ self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
+
+ foreach($apps as $app){
+ $path = OC_App::getAppPath($app).'/appinfo/database.xml';
+ if(file_exists($path)){
+ self::removeDBStructure( $path );
+ }
+ }
+
+ // Create new tables
+ self::createDBFromStructure( $file );
+ self::commit();
}
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 9d51004669..f05a9af31c 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -187,7 +187,7 @@ class OC_OCSClient{
if(isset($tmp->downloadlink)) {
$app['downloadlink']=$tmp->downloadlink;
}else{
- $app['downloadlink']='';
+ $app['downloadlink']='';
}
return $app;
}
diff --git a/lib/public/json.php b/lib/public/json.php
index 2a74535f41..c37b42c3f7 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -92,7 +92,7 @@ class JSON {
* Send json success msg
*
* Return a json success message with optional extra data.
- * @see OCP\JSON::error() for the format to use.
+ * @see OCP\JSON::error() for the format to use.
*
* @param array $data The data to use
* @return string json formatted string.
diff --git a/lib/public/util.php b/lib/public/util.php
index 8d7303bf7a..6ad578441e 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -260,7 +260,7 @@ class Util {
/**
- * Register an get/post call. This is important to prevent CSRF attacks
+ * Register an get/post call. This is important to prevent CSRF attacks
* TODO: write example
*/
public static function callRegister(){
diff --git a/lib/setup.php b/lib/setup.php
index e60a461deb..271fe55fd7 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -84,8 +84,8 @@ class OC_Setup {
//write the config file
OC_Config::setValue('datadirectory', $datadir);
- OC_Config::setValue('dbtype', $dbtype);
- OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+ OC_Config::setValue('dbtype', $dbtype);
+ OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
if($dbtype == 'mysql') {
$dbuser = $options['dbuser'];
$dbpass = $options['dbpass'];
@@ -552,7 +552,7 @@ class OC_Setup {
$content.= "</IfModule>\n";
$content.= "<IfModule mod_rewrite.c>\n";
$content.= "RewriteEngine on\n";
- $content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]\n";
+ $content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]\n";
$content.= "RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]\n";
$content.= "RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]\n";
$content.= "RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]\n";
diff --git a/lib/template.php b/lib/template.php
index 609c8da976..fe8a3c7994 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -171,8 +171,8 @@ class OC_Template{
* mobile -> interface for smartphones
* tablet -> interface for tablets
* standalone -> the default interface but without header, footer and
- * sidebar, just the application. Useful to use just a specific
- * app on the desktop in a standalone window.
+ * sidebar, just the application. Useful to use just a specific
+ * app on the desktop in a standalone window.
*/
public static function detectFormfactor(){
// please add more useragent strings for other devices
diff --git a/lib/util.php b/lib/util.php
index f543f742ac..24f80b9389 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -219,7 +219,7 @@ class OC_Util {
$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
//check for correct file permissions
if(!stristr(PHP_OS, 'WIN')){
- $permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users.";
+ $permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users.";
$prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY)),-3);
if(substr($prems,-1)!='0'){
OC_Helper::chmodr($CONFIG_DATADIRECTORY,0770);
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 60cc034f78..05dfe18db6 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -129,7 +129,7 @@ class OC_VCategories {
* $objects[] = $row['carddata'];
* }
* }
- * $categories->rescan($objects);
+ * $categories->rescan($objects);
*/
public function rescan($objects, $sync=true, $reset=true) {
if($reset === true) {
--
GitLab