wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1942 from owncloud/fix-1925-wrong-quotes

Browse source 
Fix using wrong quotes for breaking long lines
This commit is contained in:
Thomas Müller 2013-02-26 12:37:23 -08:00
commit f1dc46b4e0
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/base.php
View file

@ -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();

4
lib/config.php
View file

@ -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;
}

8
lib/setup.php
View file

@ -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 />';

4
lib/user.php
View file

@ -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'));

12
lib/util.php
View file

@ -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" );