From 4a26d638673ab3745108dd4254f71777f76ea154 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 26 Feb 2013 20:48:01 +0100
Subject: [PATCH] Fix using wrong quotes for breaking long lines
Fixes #1925
---
lib/base.php | 12 ++++++------
lib/config.php | 4 ++--
lib/setup.php | 8 ++++----
lib/user.php | 4 ++--
lib/util.php | 12 ++++++------
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index f9bb1bb11b..9bdbf48d72 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -162,9 +162,9 @@ class OC {
OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/');
OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/');
} else {
- echo("3rdparty directory not found! Please put the ownCloud 3rdparty'
+ echo('3rdparty directory not found! Please put the ownCloud 3rdparty'
.' folder in the ownCloud folder or the folder above.'
- .' You can also configure the location in the config.php file.");
+ .' You can also configure the location in the config.php file.');
exit;
}
// search the apps folder
@@ -188,8 +188,8 @@ class OC {
}
if (empty(OC::$APPSROOTS)) {
- echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
- .' or the folder above. You can also configure the location in the config.php file.");
+ echo('apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
+ .' or the folder above. You can also configure the location in the config.php file.');
exit;
}
$paths = array();
@@ -214,8 +214,8 @@ class OC {
$tmpl = new OC_Template('', 'error', 'guest');
$tmpl->assign('errors', array(1 => array(
'error' => "Can't write into config directory 'config'",
- 'hint' => "You can usually fix this by giving the webserver user write access'
- .' to the config directory in owncloud"
+ 'hint' => 'You can usually fix this by giving the webserver user write access'
+ .' to the config directory in owncloud'
)));
$tmpl->printPage();
exit();
diff --git a/lib/config.php b/lib/config.php
index a5c11b466f..0bd497b8e5 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -166,8 +166,8 @@ class OC_Config{
$tmpl = new OC_Template( '', 'error', 'guest' );
$tmpl->assign('errors', array(1=>array(
'error'=>"Can't write into config directory 'config'",
- 'hint'=>"You can usually fix this by giving the webserver user write access'
- .' to the config directory in owncloud")));
+ 'hint'=>'You can usually fix this by giving the webserver user write access'
+ .' to the config directory in owncloud')));
$tmpl->printPage();
exit;
}
diff --git a/lib/setup.php b/lib/setup.php
index fd5f3cd5be..b7fe2f6a2c 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -261,8 +261,8 @@ class OC_Setup {
}
//fill the database if needed
- $query="select count(*) from information_schema.tables'
- .' where table_schema='$dbname' AND table_name = '{$dbtableprefix}users';";
+ $query='select count(*) from information_schema.tables'
+ ." where table_schema='$dbname' AND table_name = '{$dbtableprefix}users';";
$result = mysql_query($query, $connection);
if($result) {
$row=mysql_fetch_row($result);
@@ -454,8 +454,8 @@ class OC_Setup {
}
//check for roles creation rights in oracle
- $query="SELECT count(*) FROM user_role_privs, role_sys_privs'
- .' WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
+ $query='SELECT count(*) FROM user_role_privs, role_sys_privs'
+ ." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
$stmt = oci_parse($connection, $query);
if (!$stmt) {
$entry = $l->t('DB Error: "%s"', array(oci_last_error($connection))) . '<br />';
diff --git a/lib/user.php b/lib/user.php
index 16f6d2787c..f84aa8fad8 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -589,8 +589,8 @@ class OC_User {
* @param string $userid
*/
public static function enableUser($userid) {
- $sql = "DELETE FROM `*PREFIX*preferences`'
- .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
+ $sql = 'DELETE FROM `*PREFIX*preferences`'
+ ." WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
$stmt = OC_DB::prepare($sql);
if ( ! OC_DB::isError($stmt) ) {
$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
diff --git a/lib/util.php b/lib/util.php
index cfb13ad292..060db73da0 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -178,14 +178,14 @@ class OC_Util {
}
//common hint for all file permissons error messages
- $permissionsHint="Permissions can usually be fixed by giving the webserver write access'
- .' to the ownCloud directory";
+ $permissionsHint='Permissions can usually be fixed by giving the webserver write access'
+ .' to the ownCloud directory';
// Check if config folder is writable.
if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) {
$errors[]=array('error'=>"Can't write into config directory 'config'",
- 'hint'=>"You can usually fix this by giving the webserver user write access'
- .' to the config directory in owncloud");
+ 'hint'=>'You can usually fix this by giving the webserver user write access'
+ .' to the config directory in owncloud');
}
// Check if there is a writable install folder.
@@ -194,8 +194,8 @@ class OC_Util {
|| !is_writable(OC_App::getInstallPath())
|| !is_readable(OC_App::getInstallPath()) ) {
$errors[]=array('error'=>"Can't write into apps directory",
- 'hint'=>"You can usually fix this by giving the webserver user write access'
- .' to the apps directory in owncloud or disabling the appstore in the config file.");
+ 'hint'=>'You can usually fix this by giving the webserver user write access'
+ .' to the apps directory in owncloud or disabling the appstore in the config file.');
}
}
$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
--
GitLab