diff options
author | Bart Visscher <bartv@thisnet.nl> | 2012-08-29 20:34:44 +0200 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2012-08-29 20:34:44 +0200 |
commit | db18218a1bba86e364fd4fec08c2e1a0eb4e7b16 (patch) | |
tree | cfa630c22ea74e3d6bd6258b78776a1d8b5c84bd /lib | |
parent | 9e32e0730644a4340b2f88b0d8750fd1f8e8903a (diff) | |
download | nextcloud-server-db18218a1bba86e364fd4fec08c2e1a0eb4e7b16.tar.gz nextcloud-server-db18218a1bba86e364fd4fec08c2e1a0eb4e7b16.zip |
Space before tab fixes
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/app.php | 4 | ||||
-rw-r--r-- | lib/base.php | 2 | ||||
-rw-r--r-- | lib/db.php | 30 | ||||
-rw-r--r-- | lib/ocsclient.php | 2 | ||||
-rw-r--r-- | lib/public/json.php | 2 | ||||
-rw-r--r-- | lib/public/util.php | 2 | ||||
-rw-r--r-- | lib/setup.php | 6 | ||||
-rw-r--r-- | lib/template.php | 4 | ||||
-rwxr-xr-x | lib/util.php | 2 | ||||
-rw-r--r-- | lib/vcategories.php | 2 |
10 files changed, 28 insertions, 28 deletions
diff --git a/lib/app.php b/lib/app.php index 74315903467..f6708ecb3df 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 0c3ab8527a9..1798bf09b95 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 ecaf9e37ee5..de72dee2554 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 9d510046697..f05a9af31c2 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 2a74535f417..c37b42c3f74 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 8d7303bf7a4..6ad578441e2 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 e60a461debf..271fe55fd70 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 609c8da9763..fe8a3c79943 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 f543f742ac1..24f80b93896 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 60cc034f780..05dfe18db6f 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) { |