Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
4a26d638
Commit
4a26d638
authored
12 years ago
by
Bart Visscher
Browse files
Options
Downloads
Patches
Plain Diff
Fix using wrong quotes for breaking long lines
Fixes #1925
parent
7eec3156
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
lib/base.php
+6
-6
6 additions, 6 deletions
lib/base.php
lib/config.php
+2
-2
2 additions, 2 deletions
lib/config.php
lib/setup.php
+4
-4
4 additions, 4 deletions
lib/setup.php
lib/user.php
+2
-2
2 additions, 2 deletions
lib/user.php
lib/util.php
+6
-6
6 additions, 6 deletions
lib/util.php
with
20 additions
and
20 deletions
lib/base.php
+
6
−
6
View file @
4a26d638
...
@@ -162,9 +162,9 @@ class OC {
...
@@ -162,9 +162,9 @@ class OC {
OC
::
$THIRDPARTYWEBROOT
=
rtrim
(
dirname
(
OC
::
$WEBROOT
),
'/'
);
OC
::
$THIRDPARTYWEBROOT
=
rtrim
(
dirname
(
OC
::
$WEBROOT
),
'/'
);
OC
::
$THIRDPARTYROOT
=
rtrim
(
dirname
(
OC
::
$SERVERROOT
),
'/'
);
OC
::
$THIRDPARTYROOT
=
rtrim
(
dirname
(
OC
::
$SERVERROOT
),
'/'
);
}
else
{
}
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.'
.
' 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
;
exit
;
}
}
// search the apps folder
// search the apps folder
...
@@ -188,8 +188,8 @@ class OC {
...
@@ -188,8 +188,8 @@ class OC {
}
}
if
(
empty
(
OC
::
$APPSROOTS
))
{
if
(
empty
(
OC
::
$APPSROOTS
))
{
echo
(
"
apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
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.
"
);
.
' or the folder above. You can also configure the location in the config.php file.
'
);
exit
;
exit
;
}
}
$paths
=
array
();
$paths
=
array
();
...
@@ -214,8 +214,8 @@ class OC {
...
@@ -214,8 +214,8 @@ class OC {
$tmpl
=
new
OC_Template
(
''
,
'error'
,
'guest'
);
$tmpl
=
new
OC_Template
(
''
,
'error'
,
'guest'
);
$tmpl
->
assign
(
'errors'
,
array
(
1
=>
array
(
$tmpl
->
assign
(
'errors'
,
array
(
1
=>
array
(
'error'
=>
"Can't write into config directory 'config'"
,
'error'
=>
"Can't write into config directory 'config'"
,
'hint'
=>
"
You can usually fix this by giving the webserver user write access'
'hint'
=>
'
You can usually fix this by giving the webserver user write access'
.' to the config directory in owncloud
"
.
' to the config directory in owncloud
'
)));
)));
$tmpl
->
printPage
();
$tmpl
->
printPage
();
exit
();
exit
();
...
...
This diff is collapsed.
Click to expand it.
lib/config.php
+
2
−
2
View file @
4a26d638
...
@@ -166,8 +166,8 @@ class OC_Config{
...
@@ -166,8 +166,8 @@ class OC_Config{
$tmpl
=
new
OC_Template
(
''
,
'error'
,
'guest'
);
$tmpl
=
new
OC_Template
(
''
,
'error'
,
'guest'
);
$tmpl
->
assign
(
'errors'
,
array
(
1
=>
array
(
$tmpl
->
assign
(
'errors'
,
array
(
1
=>
array
(
'error'
=>
"Can't write into config directory 'config'"
,
'error'
=>
"Can't write into config directory 'config'"
,
'hint'
=>
"
You can usually fix this by giving the webserver user write access'
'hint'
=>
'
You can usually fix this by giving the webserver user write access'
.' to the config directory in owncloud
"
)));
.
' to the config directory in owncloud
'
)));
$tmpl
->
printPage
();
$tmpl
->
printPage
();
exit
;
exit
;
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/setup.php
+
4
−
4
View file @
4a26d638
...
@@ -261,8 +261,8 @@ class OC_Setup {
...
@@ -261,8 +261,8 @@ class OC_Setup {
}
}
//fill the database if needed
//fill the database if needed
$query
=
"
select count(*) from information_schema.tables'
$query
=
'
select count(*) from information_schema.tables'
.
'
where table_schema='
$dbname
' AND table_name = '
{
$dbtableprefix
}
users';"
;
.
"
where table_schema='
$dbname
' AND table_name = '
{
$dbtableprefix
}
users';"
;
$result
=
mysql_query
(
$query
,
$connection
);
$result
=
mysql_query
(
$query
,
$connection
);
if
(
$result
)
{
if
(
$result
)
{
$row
=
mysql_fetch_row
(
$result
);
$row
=
mysql_fetch_row
(
$result
);
...
@@ -454,8 +454,8 @@ class OC_Setup {
...
@@ -454,8 +454,8 @@ class OC_Setup {
}
}
//check for roles creation rights in oracle
//check for roles creation rights in oracle
$query
=
"
SELECT count(*) FROM user_role_privs, role_sys_privs'
$query
=
'
SELECT count(*) FROM user_role_privs, role_sys_privs'
.
'
WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'"
;
.
"
WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'"
;
$stmt
=
oci_parse
(
$connection
,
$query
);
$stmt
=
oci_parse
(
$connection
,
$query
);
if
(
!
$stmt
)
{
if
(
!
$stmt
)
{
$entry
=
$l
->
t
(
'DB Error: "%s"'
,
array
(
oci_last_error
(
$connection
)))
.
'<br />'
;
$entry
=
$l
->
t
(
'DB Error: "%s"'
,
array
(
oci_last_error
(
$connection
)))
.
'<br />'
;
...
...
This diff is collapsed.
Click to expand it.
lib/user.php
+
2
−
2
View file @
4a26d638
...
@@ -589,8 +589,8 @@ class OC_User {
...
@@ -589,8 +589,8 @@ class OC_User {
* @param string $userid
* @param string $userid
*/
*/
public
static
function
enableUser
(
$userid
)
{
public
static
function
enableUser
(
$userid
)
{
$sql
=
"
DELETE FROM `*PREFIX*preferences`'
$sql
=
'
DELETE FROM `*PREFIX*preferences`'
.
'
WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?"
;
.
"
WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?"
;
$stmt
=
OC_DB
::
prepare
(
$sql
);
$stmt
=
OC_DB
::
prepare
(
$sql
);
if
(
!
OC_DB
::
isError
(
$stmt
)
)
{
if
(
!
OC_DB
::
isError
(
$stmt
)
)
{
$result
=
$stmt
->
execute
(
array
(
$userid
,
'core'
,
'enabled'
,
'false'
));
$result
=
$stmt
->
execute
(
array
(
$userid
,
'core'
,
'enabled'
,
'false'
));
...
...
This diff is collapsed.
Click to expand it.
lib/util.php
+
6
−
6
View file @
4a26d638
...
@@ -178,14 +178,14 @@ class OC_Util {
...
@@ -178,14 +178,14 @@ class OC_Util {
}
}
//common hint for all file permissons error messages
//common hint for all file permissons error messages
$permissionsHint
=
"
Permissions can usually be fixed by giving the webserver write access'
$permissionsHint
=
'
Permissions can usually be fixed by giving the webserver write access'
.' to the ownCloud directory
"
;
.
' to the ownCloud directory
'
;
// Check if config folder is writable.
// Check if config folder is writable.
if
(
!
is_writable
(
OC
::
$SERVERROOT
.
"/config/"
)
or
!
is_readable
(
OC
::
$SERVERROOT
.
"/config/"
))
{
if
(
!
is_writable
(
OC
::
$SERVERROOT
.
"/config/"
)
or
!
is_readable
(
OC
::
$SERVERROOT
.
"/config/"
))
{
$errors
[]
=
array
(
'error'
=>
"Can't write into config directory 'config'"
,
$errors
[]
=
array
(
'error'
=>
"Can't write into config directory 'config'"
,
'hint'
=>
"
You can usually fix this by giving the webserver user write access'
'hint'
=>
'
You can usually fix this by giving the webserver user write access'
.' to the config directory in owncloud
"
);
.
' to the config directory in owncloud
'
);
}
}
// Check if there is a writable install folder.
// Check if there is a writable install folder.
...
@@ -194,8 +194,8 @@ class OC_Util {
...
@@ -194,8 +194,8 @@ class OC_Util {
||
!
is_writable
(
OC_App
::
getInstallPath
())
||
!
is_writable
(
OC_App
::
getInstallPath
())
||
!
is_readable
(
OC_App
::
getInstallPath
())
)
{
||
!
is_readable
(
OC_App
::
getInstallPath
())
)
{
$errors
[]
=
array
(
'error'
=>
"Can't write into apps directory"
,
$errors
[]
=
array
(
'error'
=>
"Can't write into apps directory"
,
'hint'
=>
"
You can usually fix this by giving the webserver user write access'
'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.
"
);
.
' to the apps directory in owncloud or disabling the appstore in the config file.
'
);
}
}
}
}
$CONFIG_DATADIRECTORY
=
OC_Config
::
getValue
(
"datadirectory"
,
OC
::
$SERVERROOT
.
"/data"
);
$CONFIG_DATADIRECTORY
=
OC_Config
::
getValue
(
"datadirectory"
,
OC
::
$SERVERROOT
.
"/data"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment