open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Style cleanup core dir

Browse Source
remotes/origin/stable5
Bart Visscher 12 years ago
parent db8dbb9847
commit 1a747b3e48
9 changed files with 143 additions and 43 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 62
      core/ajax/share.php
  2. 30
      core/js/config.php
  3. 4
      core/templates/exception.php
  4. 53
      core/templates/installation.php
  5. 3
      core/templates/layout.base.php
  6. 6
      core/templates/layout.guest.php
  7. 22
      core/templates/layout.user.php
  8. 3
      core/templates/login.php
  9. 3
      core/templates/update.php

62
core/ajax/share.php
Unescape View File

@ -34,7 +34,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$shareWith = null;
}
$token = OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], $shareType, $shareWith, $_POST['permissions']);
$token = OCP\Share::shareItem(
$_POST['itemType'],
$_POST['itemSource'],
$shareType,
$shareWith,
$_POST['permissions']
);
if (is_string($token)) {
OC_JSON::success(array('data' => array('token' => $token)));
@ -59,7 +65,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
break;
case 'setPermissions':
if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
$return = OCP\Share::setPermissions(
$_POST['itemType'],
$_POST['itemSource'],
$_POST['shareType'],
$_POST['shareWith'],
$_POST['permissions']
);
($return) ? OC_JSON::success() : OC_JSON::error();
}
break;
@ -86,9 +98,11 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
if ($type === 'dir')
$subject = (string)$l->t('User %s shared a folder with you', $displayName);
$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($displayName, $file, $link));
$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s',
array($displayName, $file, $link));
if ($type === 'dir')
$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($displayName, $file, $link));
$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s',
array($displayName, $file, $link));
$default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
@ -112,14 +126,29 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
}
break;
case 'getItem':
if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkReshare']) && isset($_GET['checkShares'])) {
if (isset($_GET['itemType'])
&& isset($_GET['itemSource'])
&& isset($_GET['checkReshare'])
&& isset($_GET['checkShares'])) {
if ($_GET['checkReshare'] == 'true') {
$reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
$reshare = OCP\Share::getItemSharedWithBySource(
$_GET['itemType'],
$_GET['itemSource'],
OCP\Share::FORMAT_NONE,
null,
true
);
} else {
$reshare = false;
}
if ($_GET['checkShares'] == 'true') {
$shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
$shares = OCP\Share::getItemShared(
$_GET['itemType'],
$_GET['itemSource'],
OCP\Share::FORMAT_NONE,
null,
true
);
} else {
$shares = false;
}
@ -165,8 +194,15 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
}
$offset += $limit;
foreach ($users as $uid => $displayName) {
if ((!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $uid != OC_User::getUser()) {
$shareWith[] = array('label' => $displayName, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $uid));
if ((!isset($_GET['itemShares'])
|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])
|| !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]))
&& $uid != OC_User::getUser()) {
$shareWith[] = array(
'label' => $displayName,
'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER,
'shareWith' => $uid)
);
$count++;
}
}
@ -179,7 +215,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
$shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group));
$shareWith[] = array(
'label' => $group.' (group)',
'value' => array(
'shareType' => OCP\Share::SHARE_TYPE_GROUP,
'shareWith' => $group
)
);
$count++;
}
} else {

30
core/js/config.php
Unescape View File

@ -29,8 +29,33 @@ $array = array(
"oc_current_user" => "\"".OC_User::getUser(). "\"",
"oc_requesttoken" => "\"".OC_Util::callRegister(). "\"",
"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
"dayNames" => json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))),
"monthNames" => json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))),
"dayNames" => json_encode(
array(
(string)$l->t('Sunday'),
(string)$l->t('Monday'),
(string)$l->t('Tuesday'),
(string)$l->t('Wednesday'),
(string)$l->t('Thursday'),
(string)$l->t('Friday'),
(string)$l->t('Saturday')
)
),
"monthNames" => json_encode(
array(
(string)$l->t('January'),
(string)$l->t('February'),
(string)$l->t('March'),
(string)$l->t('April'),
(string)$l->t('May'),
(string)$l->t('June'),
(string)$l->t('July'),
(string)$l->t('August'),
(string)$l->t('September'),
(string)$l->t('October'),
(string)$l->t('November'),
(string)$l->t('December')
)
),
"firstDay" => json_encode($l->l('firstday', 'firstday')) ,
);
@ -38,4 +63,3 @@ $array = array(
foreach ($array as $setting => $value) {
echo("var ". $setting ."=".$value.";\n");
}
?>

4
core/templates/exception.php
Unescape View File

@ -5,7 +5,9 @@
<p class="exception">
<?php
if($_['showsysinfo'] == true) {
echo 'If you would like to support ownCloud\'s developers and report this error in our <a href="https://github.com/owncloud/core">bug tracker</a>, please copy the following informations into the description. <br><br><textarea readonly>';
echo 'If you would like to support ownCloud\'s developers and'
.' report this error in our <a href="https://github.com/owncloud/core">bug tracker</a>,'
.' please copy the following informations into the description. <br><br><textarea readonly>';
echo 'Message: ' . $_['message'] . "\n";
echo 'Error Code: ' . $_['code'] . "\n";
echo 'File: ' . $_['file'] . "\n";

53
core/templates/installation.php
Unescape View File

@ -21,26 +21,33 @@
<?php if(!$_['secureRNG']): ?>
<fieldset class="warning">
<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
<p><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?><br/>
<?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></p>
<p><?php echo $l->t('No secure random number generator is available,'
.' please enable the PHP OpenSSL extension.');?><br/>
<?php echo $l->t('Without a secure random number generator an attacker may be able to'
.' predict password reset tokens and take over your account.');?></p>
</fieldset>
<?php endif; ?>
<?php if(!$_['htaccessWorking']): ?>
<fieldset class="warning">
<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
<p><?php echo $l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.');?><br>
<?php echo $l->t('For information how to properly configure your server, please see the <a href="http://doc.owncloud.org/server/5.0/admin_manual/installation.html" target="_blank">documentation</a>.');?></p>
<p><?php echo $l->t('Your data directory and files are probably accessible from the internet'
.' because the .htaccess file does not work.');?><br>
<?php echo $l->t('For information how to properly configure your server,'
.' please see the <a href="http://doc.owncloud.org/server/5.0/admin_manual/installation.html"'
.' target="_blank">documentation</a>.');?></p>
</fieldset>
<?php endif; ?>
<fieldset id="adminaccount">
<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
<p class="infield grouptop">
<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
<input type="text" name="adminlogin" id="adminlogin"
value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
</p>
<p class="infield groupbottom">
<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" />
<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
value="<?php print OC_Helper::init_var('adminpass'); ?>" />
<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
<img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
<input type="checkbox" id="show" name="show" />
@ -52,12 +59,14 @@
<legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> <img class="svg" src="<?php echo image_path('', 'actions/triangle-s.svg'); ?>" /></a></legend>
<div id="datadirContent">
<label for="directory"><?php echo $l->t( 'Data folder' ); ?></label>
<input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" />
<input type="text" name="directory" id="directory"
value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" />
</div>
</fieldset>
<fieldset id='databaseField'>
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
<legend><?php echo $l->t( 'Configure the database' ); ?></legend>
<div id="selectDbType">
<?php if($_['hasSQLite']): ?>
@ -66,7 +75,8 @@
<p>SQLite <?php echo $l->t( 'will be used' ); ?>.</p>
<input type="hidden" id="dbtype" name="dbtype" value="sqlite" />
<?php else: ?>
<input type="radio" name="dbtype" value="sqlite" id="sqlite" <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/>
<input type="radio" name="dbtype" value="sqlite" id="sqlite"
<?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/>
<label class="sqlite" for="sqlite">SQLite</label>
<?php endif; ?>
<?php endif; ?>
@ -77,7 +87,8 @@
<p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p>
<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
<?php else: ?>
<input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
<input type="radio" name="dbtype" value="mysql" id="mysql"
<?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
<label class="mysql" for="mysql">MySQL</label>
<?php endif; ?>
<?php endif; ?>
@ -88,7 +99,8 @@
<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
<?php else: ?>
<label class="pgsql" for="pgsql">PostgreSQL</label>
<input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
<input type="radio" name="dbtype" value='pgsql' id="pgsql"
<?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
<?php endif; ?>
<?php endif; ?>
@ -98,7 +110,8 @@
<input type="hidden" id="dbtype" name="dbtype" value="oci" />
<?php else: ?>
<label class="oci" for="oci">Oracle</label>
<input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
<input type="radio" name="dbtype" value='oci' id="oci"
<?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
<?php endif; ?>
<?php endif; ?>
</div>
@ -107,15 +120,19 @@
<div id="use_other_db">
<p class="infield grouptop">
<label for="dbuser" class="infield"><?php echo $l->t( 'Database user' ); ?></label>
<input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" />
<input type="text" name="dbuser" id="dbuser"
value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" />
</p>
<p class="infield groupmiddle">
<label for="dbpass" class="infield"><?php echo $l->t( 'Database password' ); ?></label>
<input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" />
<input type="password" name="dbpass" id="dbpass"
value="<?php print OC_Helper::init_var('dbpass'); ?>" />
</p>
<p class="infield groupmiddle">
<label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label>
<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
<input type="text" name="dbname" id="dbname"
value="<?php print OC_Helper::init_var('dbname'); ?>"
autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
</p>
</div>
<?php endif; ?>
@ -123,13 +140,15 @@
<div id="use_oracle_db">
<p class="infield groupmiddle">
<label for="dbtablespace" class="infield"><?php echo $l->t( 'Database tablespace' ); ?></label>
<input type="text" name="dbtablespace" id="dbtablespace" value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" />
<input type="text" name="dbtablespace" id="dbtablespace"
value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" />
</p>
</div>
<?php endif; ?>
<p class="infield groupbottom">
<label for="dbhost" class="infield" id="dbhostlabel"><?php echo $l->t( 'Database host' ); ?></label>
<input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" />
<input type="text" name="dbhost" id="dbhost"
value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" />
</p>
</fieldset>

3
core/templates/layout.base.php
Unescape View File

@ -3,7 +3,8 @@
<head>
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" />
<link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach ($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>

6
core/templates/layout.guest.php
Unescape View File

@ -4,7 +4,8 @@
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="apple-itunes-app" content="app-id=543672169">
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" />
<link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
@ -30,6 +31,7 @@
</div></header>
<?php echo $_['content']; ?>
</div>
<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t( 'web services under your control' ); ?></p></footer>
<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash;
<?php echo $l->t( 'web services under your control' ); ?></p></footer>
</body>
</html>

22
core/templates/layout.user.php
Unescape View File

@ -1,10 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
<title><?php echo !empty($_['application'])?$_['application'].' | ':''
?>ownCloud <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="apple-itunes-app" content="app-id=543672169">
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" />
<link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
@ -27,7 +29,8 @@
<div id="notification"></div>
</div>
<header><div id="header">
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg"
src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
<ul id="settings" class="svg">
<span id="expand">
@ -37,7 +40,8 @@
<div id="expanddiv">
<?php foreach($_['settingsnavigation'] as $entry):?>
<li>
<a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
<a href="<?php echo $entry['href']; ?>" title=""
<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
<img class="svg" alt="" src="<?php echo $entry['icon']; ?>">
<?php echo $entry['name'] ?>
</a>
@ -45,14 +49,17 @@
<?php endforeach; ?>
<li>
<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true">
<img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /> <?php echo $l->t('Log out');?>
<img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>"
/> <?php echo $l->t('Log out');?>
</a>
</li>
</div>
</ul>
<form class="searchbox" action="#" method="post">
<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech />
<input id="searchbox" class="svg" type="search" name="query"
value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>"
autocomplete="off" x-webkit-speech />
</form>
</div></header>
@ -60,7 +67,8 @@
<ul id="apps" class="svg">
<?php foreach($_['navigation'] as $entry): ?>
<li data-id="<?php echo $entry['id']; ?>">
<a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
<a href="<?php echo $entry['href']; ?>" title=""
<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
<img class="icon svg" src="<?php echo $entry['icon']; ?>"/>
<?php echo $entry['name']; ?>
</a>

3
core/templates/login.php
Unescape View File

@ -8,7 +8,8 @@
<?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
<li class="errors">
<?php echo $l->t('Automatic logon rejected!'); ?><br>
<small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
<small><?php echo $l->t('If you did not change your password recently,'
.' your account may be compromised!'); ?></small>
<br>
<small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
</li>

3
core/templates/update.php
Unescape View File

@ -1,5 +1,6 @@
<ul>
<li class='update'>
<?php echo $l->t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?><br /><br />
<?php echo $l->t('Updating ownCloud to version %s, this may take a while.',
array($_['version'])); ?><br /><br />
</li>
</ul>

Write Preview
Loading…
Cancel
Save