@@ -1,10 +1,10 @@ |
||
1 | 1 | <ul class="error-wide"> |
2 | - <?php foreach($_["errors"] as $error):?> |
|
2 | + <?php foreach ($_["errors"] as $error):?> |
|
3 | 3 | <li class='error'> |
4 | 4 | <?php p($error['error']) ?><br> |
5 | - <?php if(isset($error['hint']) && $error['hint']): ?> |
|
5 | + <?php if (isset($error['hint']) && $error['hint']): ?> |
|
6 | 6 | <p class='hint'><?php print_unescaped($error['hint']) ?></p> |
7 | - <?php endif;?> |
|
7 | + <?php endif; ?> |
|
8 | 8 | </li> |
9 | 9 | <?php endforeach ?> |
10 | 10 | </ul> |
@@ -18,8 +18,11 @@ discard block |
||
18 | 18 | <?php if(is_array($err)):?> |
19 | 19 | <?php print_unescaped($err['error']); ?> |
20 | 20 | <span class='hint'><?php print_unescaped($err['hint']); ?></span> |
21 | - <?php else: ?> |
|
22 | - <?php print_unescaped($err); ?> |
|
21 | + <?php else { |
|
22 | + : ?> |
|
23 | + <?php print_unescaped($err); |
|
24 | +} |
|
25 | +?> |
|
23 | 26 | <?php endif; ?> |
24 | 27 | </p> |
25 | 28 | <?php endforeach; ?> |
@@ -75,8 +78,12 @@ discard block |
||
75 | 78 | |
76 | 79 | <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
77 | 80 | <fieldset id='databaseBackend'> |
78 | - <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) |
|
79 | - $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> |
|
81 | + <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) { |
|
82 | + $hasOtherDB = true; |
|
83 | +} else { |
|
84 | + $hasOtherDB =false; |
|
85 | + } |
|
86 | + //other than SQLite ?> |
|
80 | 87 | <legend><?php p($l->t( 'Configure the database' )); ?></legend> |
81 | 88 | <div id="selectDbType"> |
82 | 89 | <?php foreach($_['databases'] as $type => $label): ?> |
@@ -88,11 +95,14 @@ discard block |
||
88 | 95 | <?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a> |
89 | 96 | </p> |
90 | 97 | <input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>"> |
91 | - <?php else: ?> |
|
98 | + <?php else { |
|
99 | + : ?> |
|
92 | 100 | <input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>" |
93 | 101 | <?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/> |
94 | 102 | <label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label> |
95 | - <?php endif; ?> |
|
103 | + <?php endif; |
|
104 | +} |
|
105 | +?> |
|
96 | 106 | <?php endforeach; ?> |
97 | 107 | </div> |
98 | 108 | </fieldset> |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | script('core', [ |
3 | - 'jquery-showpassword', |
|
4 | - 'installation' |
|
3 | + 'jquery-showpassword', |
|
4 | + 'installation' |
|
5 | 5 | ]); |
6 | 6 | ?> |
7 | 7 | <input type='hidden' id='hasMySQL' value='<?php p($_['hasMySQL']) ?>'> |
@@ -30,9 +30,9 @@ discard block |
||
30 | 30 | <legend><strong><?php p($l->t('Security warning'));?></strong></legend> |
31 | 31 | <p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br> |
32 | 32 | <?php print_unescaped($l->t( |
33 | - 'For information how to properly configure your server, please see the <a href="%s" target="_blank">documentation</a>.', |
|
34 | - link_to_docs('admin-install') |
|
35 | - )); ?></p> |
|
33 | + 'For information how to properly configure your server, please see the <a href="%s" target="_blank">documentation</a>.', |
|
34 | + link_to_docs('admin-install') |
|
35 | + )); ?></p> |
|
36 | 36 | </fieldset> |
37 | 37 | <?php endif; ?> |
38 | 38 | <fieldset id="adminaccount"> |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
77 | 77 | <fieldset id='databaseBackend'> |
78 | 78 | <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) |
79 | - $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> |
|
79 | + $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> |
|
80 | 80 | <legend><?php p($l->t( 'Configure the database' )); ?></legend> |
81 | 81 | <div id="selectDbType"> |
82 | 82 | <?php foreach($_['databases'] as $type => $label): ?> |
@@ -10,12 +10,12 @@ discard block |
||
10 | 10 | <input type='hidden' id='hasOracle' value='<?php p($_['hasOracle']) ?>'> |
11 | 11 | <form action="index.php" method="post"> |
12 | 12 | <input type="hidden" name="install" value="true"> |
13 | - <?php if(count($_['errors']) > 0): ?> |
|
13 | + <?php if (count($_['errors']) > 0): ?> |
|
14 | 14 | <fieldset class="warning"> |
15 | - <legend><strong><?php p($l->t('Error'));?></strong></legend> |
|
16 | - <?php foreach($_['errors'] as $err): ?> |
|
15 | + <legend><strong><?php p($l->t('Error')); ?></strong></legend> |
|
16 | + <?php foreach ($_['errors'] as $err): ?> |
|
17 | 17 | <p> |
18 | - <?php if(is_array($err)):?> |
|
18 | + <?php if (is_array($err)):?> |
|
19 | 19 | <?php print_unescaped($err['error']); ?> |
20 | 20 | <span class='hint'><?php print_unescaped($err['hint']); ?></span> |
21 | 21 | <?php else: ?> |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | <?php endforeach; ?> |
26 | 26 | </fieldset> |
27 | 27 | <?php endif; ?> |
28 | - <?php if(!$_['htaccessWorking']): ?> |
|
28 | + <?php if (!$_['htaccessWorking']): ?> |
|
29 | 29 | <fieldset class="warning"> |
30 | - <legend><strong><?php p($l->t('Security warning'));?></strong></legend> |
|
31 | - <p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br> |
|
30 | + <legend><strong><?php p($l->t('Security warning')); ?></strong></legend> |
|
31 | + <p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.')); ?><br> |
|
32 | 32 | <?php print_unescaped($l->t( |
33 | 33 | 'For information how to properly configure your server, please see the <a href="%s" target="_blank">documentation</a>.', |
34 | 34 | link_to_docs('admin-install') |
@@ -36,35 +36,35 @@ discard block |
||
36 | 36 | </fieldset> |
37 | 37 | <?php endif; ?> |
38 | 38 | <fieldset id="adminaccount"> |
39 | - <legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend> |
|
39 | + <legend><?php print_unescaped($l->t('Create an <strong>admin account</strong>')); ?></legend> |
|
40 | 40 | <p class="grouptop"> |
41 | 41 | <input type="text" name="adminlogin" id="adminlogin" |
42 | - placeholder="<?php p($l->t( 'Username' )); ?>" |
|
42 | + placeholder="<?php p($l->t('Username')); ?>" |
|
43 | 43 | value="<?php p($_['adminlogin']); ?>" |
44 | 44 | autocomplete="off" autocapitalize="off" autocorrect="off" autofocus required> |
45 | - <label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label> |
|
45 | + <label for="adminlogin" class="infield"><?php p($l->t('Username')); ?></label> |
|
46 | 46 | </p> |
47 | 47 | <p class="groupbottom"> |
48 | 48 | <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" |
49 | - placeholder="<?php p($l->t( 'Password' )); ?>" |
|
49 | + placeholder="<?php p($l->t('Password')); ?>" |
|
50 | 50 | value="<?php p($_['adminpass']); ?>" |
51 | 51 | autocomplete="off" autocapitalize="off" autocorrect="off" required> |
52 | - <label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label> |
|
52 | + <label for="adminpass" class="infield"><?php p($l->t('Password')); ?></label> |
|
53 | 53 | <input type="checkbox" id="show" name="show"> |
54 | 54 | <label for="show" class="svg"></label> |
55 | 55 | </p> |
56 | 56 | </fieldset> |
57 | 57 | |
58 | - <?php if(!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
58 | + <?php if (!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
59 | 59 | <fieldset id="advancedHeader"> |
60 | - <legend><a id="showAdvanced"><?php p($l->t( 'Storage & database' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend> |
|
60 | + <legend><a id="showAdvanced"><?php p($l->t('Storage & database')); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend> |
|
61 | 61 | </fieldset> |
62 | 62 | <?php endif; ?> |
63 | 63 | |
64 | - <?php if(!$_['directoryIsSet'] OR count($_['errors']) > 0): ?> |
|
64 | + <?php if (!$_['directoryIsSet'] OR count($_['errors']) > 0): ?> |
|
65 | 65 | <fieldset id="datadirField"> |
66 | 66 | <div id="datadirContent"> |
67 | - <label for="directory"><?php p($l->t( 'Data folder' )); ?></label> |
|
67 | + <label for="directory"><?php p($l->t('Data folder')); ?></label> |
|
68 | 68 | <input type="text" name="directory" id="directory" |
69 | 69 | placeholder="<?php p(OC::$SERVERROOT.'/data'); ?>" |
70 | 70 | value="<?php p($_['directory']); ?>" |
@@ -73,19 +73,19 @@ discard block |
||
73 | 73 | </fieldset> |
74 | 74 | <?php endif; ?> |
75 | 75 | |
76 | - <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
76 | + <?php if (!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
77 | 77 | <fieldset id='databaseBackend'> |
78 | - <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) |
|
79 | - $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> |
|
80 | - <legend><?php p($l->t( 'Configure the database' )); ?></legend> |
|
78 | + <?php if ($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) |
|
79 | + $hasOtherDB = true; else $hasOtherDB = false; //other than SQLite ?> |
|
80 | + <legend><?php p($l->t('Configure the database')); ?></legend> |
|
81 | 81 | <div id="selectDbType"> |
82 | - <?php foreach($_['databases'] as $type => $label): ?> |
|
83 | - <?php if(count($_['databases']) === 1): ?> |
|
82 | + <?php foreach ($_['databases'] as $type => $label): ?> |
|
83 | + <?php if (count($_['databases']) === 1): ?> |
|
84 | 84 | <p class="info"> |
85 | - <?php p($l->t( 'Only %s is available.', array($label) )); ?> |
|
86 | - <?php p($l->t( 'Install and activate additional PHP modules to choose other database types.' )); ?><br> |
|
85 | + <?php p($l->t('Only %s is available.', array($label))); ?> |
|
86 | + <?php p($l->t('Install and activate additional PHP modules to choose other database types.')); ?><br> |
|
87 | 87 | <a href="<?php print_unescaped(link_to_docs('admin-source_install')); ?>" target="_blank"> |
88 | - <?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a> |
|
88 | + <?php p($l->t('For more details check out the documentation.')); ?> ↗</a> |
|
89 | 89 | </p> |
90 | 90 | <input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>"> |
91 | 91 | <?php else: ?> |
@@ -97,48 +97,48 @@ discard block |
||
97 | 97 | </div> |
98 | 98 | </fieldset> |
99 | 99 | |
100 | - <?php if($hasOtherDB): ?> |
|
100 | + <?php if ($hasOtherDB): ?> |
|
101 | 101 | <fieldset id='databaseField'> |
102 | 102 | <div id="use_other_db"> |
103 | 103 | <p class="grouptop"> |
104 | - <label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label> |
|
104 | + <label for="dbuser" class="infield"><?php p($l->t('Database user')); ?></label> |
|
105 | 105 | <input type="text" name="dbuser" id="dbuser" |
106 | - placeholder="<?php p($l->t( 'Database user' )); ?>" |
|
106 | + placeholder="<?php p($l->t('Database user')); ?>" |
|
107 | 107 | value="<?php p($_['dbuser']); ?>" |
108 | 108 | autocomplete="off" autocapitalize="off" autocorrect="off"> |
109 | 109 | </p> |
110 | 110 | <p class="groupmiddle"> |
111 | 111 | <input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword" |
112 | - placeholder="<?php p($l->t( 'Database password' )); ?>" |
|
112 | + placeholder="<?php p($l->t('Database password')); ?>" |
|
113 | 113 | value="<?php p($_['dbpass']); ?>" |
114 | 114 | autocomplete="off" autocapitalize="off" autocorrect="off"> |
115 | - <label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label> |
|
115 | + <label for="dbpass" class="infield"><?php p($l->t('Database password')); ?></label> |
|
116 | 116 | <input type="checkbox" id="dbpassword" name="dbpassword"> |
117 | 117 | <label for="dbpassword"></label> |
118 | 118 | </p> |
119 | 119 | <p class="groupmiddle"> |
120 | - <label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label> |
|
120 | + <label for="dbname" class="infield"><?php p($l->t('Database name')); ?></label> |
|
121 | 121 | <input type="text" name="dbname" id="dbname" |
122 | - placeholder="<?php p($l->t( 'Database name' )); ?>" |
|
122 | + placeholder="<?php p($l->t('Database name')); ?>" |
|
123 | 123 | value="<?php p($_['dbname']); ?>" |
124 | 124 | autocomplete="off" autocapitalize="off" autocorrect="off" |
125 | 125 | pattern="[0-9a-zA-Z$_-]+"> |
126 | 126 | </p> |
127 | - <?php if($_['hasOracle']): ?> |
|
127 | + <?php if ($_['hasOracle']): ?> |
|
128 | 128 | <div id="use_oracle_db"> |
129 | 129 | <p class="groupmiddle"> |
130 | - <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> |
|
130 | + <label for="dbtablespace" class="infield"><?php p($l->t('Database tablespace')); ?></label> |
|
131 | 131 | <input type="text" name="dbtablespace" id="dbtablespace" |
132 | - placeholder="<?php p($l->t( 'Database tablespace' )); ?>" |
|
132 | + placeholder="<?php p($l->t('Database tablespace')); ?>" |
|
133 | 133 | value="<?php p($_['dbtablespace']); ?>" |
134 | 134 | autocomplete="off" autocapitalize="off" autocorrect="off"> |
135 | 135 | </p> |
136 | 136 | </div> |
137 | 137 | <?php endif; ?> |
138 | 138 | <p class="groupbottom"> |
139 | - <label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label> |
|
139 | + <label for="dbhost" class="infield"><?php p($l->t('Database host')); ?></label> |
|
140 | 140 | <input type="text" name="dbhost" id="dbhost" |
141 | - placeholder="<?php p($l->t( 'Database host' )); ?>" |
|
141 | + placeholder="<?php p($l->t('Database host')); ?>" |
|
142 | 142 | value="<?php p($_['dbhost']); ?>" |
143 | 143 | autocomplete="off" autocapitalize="off" autocorrect="off"> |
144 | 144 | </p> |
@@ -149,20 +149,20 @@ discard block |
||
149 | 149 | |
150 | 150 | <div class="icon-loading-dark float-spinner"> </div> |
151 | 151 | |
152 | - <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
152 | + <?php if (!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
153 | 153 | <fieldset id="sqliteInformation" class="warning"> |
154 | - <legend><?php p($l->t('Performance warning'));?></legend> |
|
155 | - <p><?php p($l->t('SQLite will be used as database.'));?></p> |
|
156 | - <p><?php p($l->t('For larger installations we recommend to choose a different database backend.'));?></p> |
|
154 | + <legend><?php p($l->t('Performance warning')); ?></legend> |
|
155 | + <p><?php p($l->t('SQLite will be used as database.')); ?></p> |
|
156 | + <p><?php p($l->t('For larger installations we recommend to choose a different database backend.')); ?></p> |
|
157 | 157 | <p><?php p($l->t('Especially when using the desktop client for file syncing the use of SQLite is discouraged.')); ?></p> |
158 | 158 | </fieldset> |
159 | 159 | <?php endif ?> |
160 | 160 | |
161 | - <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>"></div> |
|
161 | + <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t('Finish setup')); ?>" data-finishing="<?php p($l->t('Finishing …')); ?>"></div> |
|
162 | 162 | |
163 | 163 | <p class="info"> |
164 | 164 | <span class="icon-info-white svg"></span> |
165 | - <?php p($l->t('Need help?'));?> |
|
166 | - <a target="_blank" href="<?php p(link_to_docs('admin-install')); ?>"><?php p($l->t('See the documentation'));?> ↗</a> |
|
165 | + <?php p($l->t('Need help?')); ?> |
|
166 | + <a target="_blank" href="<?php p(link_to_docs('admin-install')); ?>"><?php p($l->t('See the documentation')); ?> ↗</a> |
|
167 | 167 | </p> |
168 | 168 | </form> |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | <ul> |
16 | 16 | <li><?php p($l->t('Remote Address: %s', $_['remoteAddr'])) ?></li> |
17 | 17 | <li><?php p($l->t('Request ID: %s', $_['requestID'])) ?></li> |
18 | - <?php if($_['debugMode']): ?> |
|
18 | + <?php if ($_['debugMode']): ?> |
|
19 | 19 | <li><?php p($l->t('Type: %s', $_['errorClass'])) ?></li> |
20 | 20 | <li><?php p($l->t('Code: %s', $_['errorCode'])) ?></li> |
21 | 21 | <li><?php p($l->t('Message: %s', $_['errorMsg'])) ?></li> |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | <?php endif; ?> |
25 | 25 | </ul> |
26 | 26 | |
27 | - <?php if($_['debugMode']): ?> |
|
27 | + <?php if ($_['debugMode']): ?> |
|
28 | 28 | <br /> |
29 | 29 | <h2><strong><?php p($l->t('Trace')) ?></strong></h2> |
30 | 30 | <pre><?php p($_['trace']) ?></pre> |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | - /** @var array $_ */ |
|
3 | - /** @var OC_L10N $l */ |
|
2 | + /** @var array $_ */ |
|
3 | + /** @var OC_L10N $l */ |
|
4 | 4 | |
5 | 5 | style('core', ['styles', 'header']); |
6 | 6 | ?> |
@@ -14,10 +14,13 @@ |
||
14 | 14 | ?> |
15 | 15 | <?php if (isset($_['content'])): ?> |
16 | 16 | <?php print_unescaped($_['content']) ?> |
17 | -<?php else: ?> |
|
17 | +<?php else { |
|
18 | + : ?> |
|
18 | 19 | <ul> |
19 | 20 | <li class="error"> |
20 | - <?php p($l->t('File not found')); ?><br> |
|
21 | + <?php p($l->t('File not found')); |
|
22 | +} |
|
23 | +?><br> |
|
21 | 24 | <p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p> |
22 | 25 | <p class="hint"><a href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', array($theme->getName()))); ?></a></p> |
23 | 26 | </li> |
@@ -2,11 +2,11 @@ |
||
2 | 2 | /** @var $_ array */ |
3 | 3 | /** @var $l OC_L10N */ |
4 | 4 | if(!isset($_)) {//also provide standalone error page |
5 | - require_once '../../lib/base.php'; |
|
5 | + require_once '../../lib/base.php'; |
|
6 | 6 | |
7 | - $tmpl = new OC_Template( '', '404', 'guest' ); |
|
8 | - $tmpl->printPage(); |
|
9 | - exit; |
|
7 | + $tmpl = new OC_Template( '', '404', 'guest' ); |
|
8 | + $tmpl->printPage(); |
|
9 | + exit; |
|
10 | 10 | } |
11 | 11 | ?> |
12 | 12 | <?php if (isset($_['content'])): ?> |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** @var $_ array */ |
3 | 3 | /** @var $l OC_L10N */ |
4 | -if(!isset($_)) {//also provide standalone error page |
|
4 | +if (!isset($_)) {//also provide standalone error page |
|
5 | 5 | require_once '../../lib/base.php'; |
6 | 6 | |
7 | - $tmpl = new OC_Template( '', '404', 'guest' ); |
|
7 | + $tmpl = new OC_Template('', '404', 'guest'); |
|
8 | 8 | $tmpl->printPage(); |
9 | 9 | exit; |
10 | 10 | } |
@@ -13,8 +13,8 @@ |
||
13 | 13 | <?php |
14 | 14 | print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link']))); |
15 | 15 | if ( isset($_['expiration']) ) { |
16 | - p($l->t("The share will expire on %s.", array($_['expiration']))); |
|
17 | - print_unescaped('<br><br>'); |
|
16 | + p($l->t("The share will expire on %s.", array($_['expiration']))); |
|
17 | + print_unescaped('<br><br>'); |
|
18 | 18 | } |
19 | 19 | // TRANSLATORS term at the end of a mail |
20 | 20 | p($l->t('Cheers!')); |
@@ -2,8 +2,8 @@ discard block |
||
2 | 2 | <tr><td> |
3 | 3 | <table cellspacing="0" cellpadding="0" border="0" width="600px"> |
4 | 4 | <tr> |
5 | -<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px"> </td> |
|
6 | -<td bgcolor="<?php p($theme->getMailHeaderColor());?>"> |
|
5 | +<td bgcolor="<?php p($theme->getMailHeaderColor()); ?>" width="20px"> </td> |
|
6 | +<td bgcolor="<?php p($theme->getMailHeaderColor()); ?>"> |
|
7 | 7 | <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/> |
8 | 8 | </td> |
9 | 9 | </tr> |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;"> |
14 | 14 | <?php |
15 | 15 | print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link']))); |
16 | -if ( isset($_['expiration']) ) { |
|
16 | +if (isset($_['expiration'])) { |
|
17 | 17 | p($l->t("The share will expire on %s.", array($_['expiration']))); |
18 | 18 | print_unescaped('<br><br>'); |
19 | 19 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br> |
29 | 29 | <?php p($theme->getName()); ?> - |
30 | 30 | <?php p($theme->getSlogan()); ?> |
31 | -<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a> |
|
31 | +<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a> |
|
32 | 32 | </td> |
33 | 33 | </tr> |
34 | 34 | <tr> |
@@ -101,6 +101,6 @@ |
||
101 | 101 | }); |
102 | 102 | |
103 | 103 | // used for heartbeat |
104 | -$this->create('heartbeat', '/heartbeat')->action(function(){ |
|
104 | +$this->create('heartbeat', '/heartbeat')->action(function() { |
|
105 | 105 | // do nothing |
106 | 106 | }); |
@@ -33,17 +33,17 @@ discard block |
||
33 | 33 | |
34 | 34 | $application = new Application(); |
35 | 35 | $application->registerRoutes($this, [ |
36 | - 'routes' => [ |
|
37 | - ['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'], |
|
38 | - ['name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'], |
|
39 | - ['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'], |
|
40 | - ['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'], |
|
41 | - ['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'], |
|
42 | - ['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'], |
|
43 | - ['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'], |
|
44 | - ['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'], |
|
45 | - ['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'], |
|
46 | - ] |
|
36 | + 'routes' => [ |
|
37 | + ['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'], |
|
38 | + ['name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'], |
|
39 | + ['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'], |
|
40 | + ['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'], |
|
41 | + ['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'], |
|
42 | + ['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'], |
|
43 | + ['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'], |
|
44 | + ['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'], |
|
45 | + ['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'], |
|
46 | + ] |
|
47 | 47 | ]); |
48 | 48 | |
49 | 49 | // Post installation check |
@@ -52,80 +52,80 @@ discard block |
||
52 | 52 | // Core ajax actions |
53 | 53 | // Search |
54 | 54 | $this->create('search_ajax_search', '/core/search') |
55 | - ->actionInclude('core/search/ajax/search.php'); |
|
55 | + ->actionInclude('core/search/ajax/search.php'); |
|
56 | 56 | // AppConfig |
57 | 57 | $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php') |
58 | - ->actionInclude('core/ajax/appconfig.php'); |
|
58 | + ->actionInclude('core/ajax/appconfig.php'); |
|
59 | 59 | // Share |
60 | 60 | $this->create('core_ajax_share', '/core/ajax/share.php') |
61 | - ->actionInclude('core/ajax/share.php'); |
|
61 | + ->actionInclude('core/ajax/share.php'); |
|
62 | 62 | // Tags |
63 | 63 | $this->create('core_tags_tags', '/tags/{type}') |
64 | - ->get() |
|
65 | - ->action('OC\Core\Tags\Controller', 'getTags') |
|
66 | - ->requirements(array('type')); |
|
64 | + ->get() |
|
65 | + ->action('OC\Core\Tags\Controller', 'getTags') |
|
66 | + ->requirements(array('type')); |
|
67 | 67 | $this->create('core_tags_favorites', '/tags/{type}/favorites') |
68 | - ->get() |
|
69 | - ->action('OC\Core\Tags\Controller', 'getFavorites') |
|
70 | - ->requirements(array('type')); |
|
68 | + ->get() |
|
69 | + ->action('OC\Core\Tags\Controller', 'getFavorites') |
|
70 | + ->requirements(array('type')); |
|
71 | 71 | $this->create('core_tags_ids_for_tag', '/tags/{type}/ids') |
72 | - ->get() |
|
73 | - ->action('OC\Core\Tags\Controller', 'getIdsForTag') |
|
74 | - ->requirements(array('type')); |
|
72 | + ->get() |
|
73 | + ->action('OC\Core\Tags\Controller', 'getIdsForTag') |
|
74 | + ->requirements(array('type')); |
|
75 | 75 | $this->create('core_tags_favorite', '/tags/{type}/favorite/{id}/') |
76 | - ->post() |
|
77 | - ->action('OC\Core\Tags\Controller', 'favorite') |
|
78 | - ->requirements(array('type', 'id')); |
|
76 | + ->post() |
|
77 | + ->action('OC\Core\Tags\Controller', 'favorite') |
|
78 | + ->requirements(array('type', 'id')); |
|
79 | 79 | $this->create('core_tags_unfavorite', '/tags/{type}/unfavorite/{id}/') |
80 | - ->post() |
|
81 | - ->action('OC\Core\Tags\Controller', 'unFavorite') |
|
82 | - ->requirements(array('type', 'id')); |
|
80 | + ->post() |
|
81 | + ->action('OC\Core\Tags\Controller', 'unFavorite') |
|
82 | + ->requirements(array('type', 'id')); |
|
83 | 83 | $this->create('core_tags_tag', '/tags/{type}/tag/{id}/') |
84 | - ->post() |
|
85 | - ->action('OC\Core\Tags\Controller', 'tagAs') |
|
86 | - ->requirements(array('type', 'id')); |
|
84 | + ->post() |
|
85 | + ->action('OC\Core\Tags\Controller', 'tagAs') |
|
86 | + ->requirements(array('type', 'id')); |
|
87 | 87 | $this->create('core_tags_untag', '/tags/{type}/untag/{id}/') |
88 | - ->post() |
|
89 | - ->action('OC\Core\Tags\Controller', 'unTag') |
|
90 | - ->requirements(array('type', 'id')); |
|
88 | + ->post() |
|
89 | + ->action('OC\Core\Tags\Controller', 'unTag') |
|
90 | + ->requirements(array('type', 'id')); |
|
91 | 91 | $this->create('core_tags_add', '/tags/{type}/add') |
92 | - ->post() |
|
93 | - ->action('OC\Core\Tags\Controller', 'addTag') |
|
94 | - ->requirements(array('type')); |
|
92 | + ->post() |
|
93 | + ->action('OC\Core\Tags\Controller', 'addTag') |
|
94 | + ->requirements(array('type')); |
|
95 | 95 | $this->create('core_tags_delete', '/tags/{type}/delete') |
96 | - ->post() |
|
97 | - ->action('OC\Core\Tags\Controller', 'deleteTags') |
|
98 | - ->requirements(array('type')); |
|
96 | + ->post() |
|
97 | + ->action('OC\Core\Tags\Controller', 'deleteTags') |
|
98 | + ->requirements(array('type')); |
|
99 | 99 | // oC JS config |
100 | 100 | $this->create('js_config', '/core/js/oc.js') |
101 | - ->actionInclude('core/js/config.php'); |
|
101 | + ->actionInclude('core/js/config.php'); |
|
102 | 102 | // Routing |
103 | 103 | $this->create('core_ajax_preview', '/core/preview') |
104 | - ->actionInclude('core/ajax/preview.php'); |
|
104 | + ->actionInclude('core/ajax/preview.php'); |
|
105 | 105 | $this->create('core_ajax_preview', '/core/preview.png') |
106 | - ->actionInclude('core/ajax/preview.php'); |
|
106 | + ->actionInclude('core/ajax/preview.php'); |
|
107 | 107 | $this->create('core_ajax_update', '/core/ajax/update.php') |
108 | - ->actionInclude('core/ajax/update.php'); |
|
108 | + ->actionInclude('core/ajax/update.php'); |
|
109 | 109 | |
110 | 110 | // Sharing routes |
111 | 111 | $this->create('files_sharing.sharecontroller.showShare', '/s/{token}')->action(function($urlParams) { |
112 | - $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams); |
|
113 | - $app->dispatch('ShareController', 'showShare'); |
|
112 | + $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams); |
|
113 | + $app->dispatch('ShareController', 'showShare'); |
|
114 | 114 | }); |
115 | 115 | $this->create('files_sharing.sharecontroller.authenticate', '/s/{token}/authenticate')->post()->action(function($urlParams) { |
116 | - $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams); |
|
117 | - $app->dispatch('ShareController', 'authenticate'); |
|
116 | + $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams); |
|
117 | + $app->dispatch('ShareController', 'authenticate'); |
|
118 | 118 | }); |
119 | 119 | $this->create('files_sharing.sharecontroller.showAuthenticate', '/s/{token}/authenticate')->get()->action(function($urlParams) { |
120 | - $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams); |
|
121 | - $app->dispatch('ShareController', 'showAuthenticate'); |
|
120 | + $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams); |
|
121 | + $app->dispatch('ShareController', 'showAuthenticate'); |
|
122 | 122 | }); |
123 | 123 | $this->create('files_sharing.sharecontroller.downloadShare', '/s/{token}/download')->get()->action(function($urlParams) { |
124 | - $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams); |
|
125 | - $app->dispatch('ShareController', 'downloadShare'); |
|
124 | + $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams); |
|
125 | + $app->dispatch('ShareController', 'downloadShare'); |
|
126 | 126 | }); |
127 | 127 | |
128 | 128 | // used for heartbeat |
129 | 129 | $this->create('heartbeat', '/heartbeat')->action(function(){ |
130 | - // do nothing |
|
130 | + // do nothing |
|
131 | 131 | }); |
@@ -31,32 +31,32 @@ |
||
31 | 31 | \OC::$server->getSession()->close(); |
32 | 32 | |
33 | 33 | if (isset($_GET['query'])) { |
34 | - $query = $_GET['query']; |
|
34 | + $query = $_GET['query']; |
|
35 | 35 | } else { |
36 | - $query = ''; |
|
36 | + $query = ''; |
|
37 | 37 | } |
38 | 38 | if (isset($_GET['inApps'])) { |
39 | - $inApps = $_GET['inApps']; |
|
40 | - if (is_string($inApps)) { |
|
41 | - $inApps = array($inApps); |
|
42 | - } |
|
39 | + $inApps = $_GET['inApps']; |
|
40 | + if (is_string($inApps)) { |
|
41 | + $inApps = array($inApps); |
|
42 | + } |
|
43 | 43 | } else { |
44 | - $inApps = array(); |
|
44 | + $inApps = array(); |
|
45 | 45 | } |
46 | 46 | if (isset($_GET['page'])) { |
47 | - $page = (int)$_GET['page']; |
|
47 | + $page = (int)$_GET['page']; |
|
48 | 48 | } else { |
49 | - $page = 1; |
|
49 | + $page = 1; |
|
50 | 50 | } |
51 | 51 | if (isset($_GET['size'])) { |
52 | - $size = (int)$_GET['size']; |
|
52 | + $size = (int)$_GET['size']; |
|
53 | 53 | } else { |
54 | - $size = 30; |
|
54 | + $size = 30; |
|
55 | 55 | } |
56 | 56 | if($query) { |
57 | - $result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size); |
|
58 | - OC_JSON::encodedPrint($result); |
|
57 | + $result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size); |
|
58 | + OC_JSON::encodedPrint($result); |
|
59 | 59 | } |
60 | 60 | else { |
61 | - echo 'false'; |
|
61 | + echo 'false'; |
|
62 | 62 | } |
@@ -44,16 +44,16 @@ |
||
44 | 44 | $inApps = array(); |
45 | 45 | } |
46 | 46 | if (isset($_GET['page'])) { |
47 | - $page = (int)$_GET['page']; |
|
47 | + $page = (int) $_GET['page']; |
|
48 | 48 | } else { |
49 | 49 | $page = 1; |
50 | 50 | } |
51 | 51 | if (isset($_GET['size'])) { |
52 | - $size = (int)$_GET['size']; |
|
52 | + $size = (int) $_GET['size']; |
|
53 | 53 | } else { |
54 | 54 | $size = 30; |
55 | 55 | } |
56 | -if($query) { |
|
56 | +if ($query) { |
|
57 | 57 | $result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size); |
58 | 58 | OC_JSON::encodedPrint($result); |
59 | 59 | } |
@@ -56,7 +56,6 @@ |
||
56 | 56 | if($query) { |
57 | 57 | $result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size); |
58 | 58 | OC_JSON::encodedPrint($result); |
59 | -} |
|
60 | -else { |
|
59 | +} else { |
|
61 | 60 | echo 'false'; |
62 | 61 | } |
@@ -5,5 +5,5 @@ |
||
5 | 5 | */?> |
6 | 6 | |
7 | 7 | <?php foreach($_['forms'] as $form) { |
8 | - print_unescaped($form); |
|
8 | + print_unescaped($form); |
|
9 | 9 | }; |
@@ -4,6 +4,6 @@ |
||
4 | 4 | * See the COPYING-README file. |
5 | 5 | */?> |
6 | 6 | |
7 | -<?php foreach($_['forms'] as $form) { |
|
7 | +<?php foreach ($_['forms'] as $form) { |
|
8 | 8 | print_unescaped($form); |
9 | 9 | }; |
@@ -6,24 +6,24 @@ |
||
6 | 6 | */ |
7 | 7 | |
8 | 8 | script('settings', [ |
9 | - 'users/deleteHandler', |
|
10 | - 'users/filter', |
|
11 | - 'users/users', |
|
12 | - 'users/groups' |
|
9 | + 'users/deleteHandler', |
|
10 | + 'users/filter', |
|
11 | + 'users/users', |
|
12 | + 'users/groups' |
|
13 | 13 | ]); |
14 | 14 | script('core', [ |
15 | - 'multiselect', |
|
16 | - 'singleselect' |
|
15 | + 'multiselect', |
|
16 | + 'singleselect' |
|
17 | 17 | ]); |
18 | 18 | style('settings', 'settings'); |
19 | 19 | |
20 | 20 | $userlistParams = array(); |
21 | 21 | $allGroups=array(); |
22 | 22 | foreach($_["adminGroup"] as $group) { |
23 | - $allGroups[] = $group['name']; |
|
23 | + $allGroups[] = $group['name']; |
|
24 | 24 | } |
25 | 25 | foreach($_["groups"] as $group) { |
26 | - $allGroups[] = $group['name']; |
|
26 | + $allGroups[] = $group['name']; |
|
27 | 27 | } |
28 | 28 | $userlistParams['subadmingroups'] = $allGroups; |
29 | 29 | $userlistParams['allGroups'] = json_encode($allGroups); |
@@ -18,11 +18,11 @@ |
||
18 | 18 | style('settings', 'settings'); |
19 | 19 | |
20 | 20 | $userlistParams = array(); |
21 | -$allGroups=array(); |
|
22 | -foreach($_["adminGroup"] as $group) { |
|
21 | +$allGroups = array(); |
|
22 | +foreach ($_["adminGroup"] as $group) { |
|
23 | 23 | $allGroups[] = $group['name']; |
24 | 24 | } |
25 | -foreach($_["groups"] as $group) { |
|
25 | +foreach ($_["groups"] as $group) { |
|
26 | 26 | $allGroups[] = $group['name']; |
27 | 27 | } |
28 | 28 | $userlistParams['subadmingroups'] = $allGroups; |
@@ -46,28 +46,40 @@ discard block |
||
46 | 46 | <div id="userlistoptions"> |
47 | 47 | <p> |
48 | 48 | <input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation" |
49 | - class="checkbox" <?php if ($_['show_storage_location'] === 'true') print_unescaped('checked="checked"'); ?> /> |
|
49 | + class="checkbox" <?php if ($_['show_storage_location'] === 'true') { |
|
50 | + print_unescaped('checked="checked"'); |
|
51 | +} |
|
52 | +?> /> |
|
50 | 53 | <label for="CheckboxStorageLocation"> |
51 | 54 | <?php p($l->t('Show storage location')) ?> |
52 | 55 | </label> |
53 | 56 | </p> |
54 | 57 | <p> |
55 | 58 | <input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin" |
56 | - class="checkbox" <?php if ($_['show_last_login'] === 'true') print_unescaped('checked="checked"'); ?> /> |
|
59 | + class="checkbox" <?php if ($_['show_last_login'] === 'true') { |
|
60 | + print_unescaped('checked="checked"'); |
|
61 | +} |
|
62 | +?> /> |
|
57 | 63 | <label for="CheckboxLastLogin"> |
58 | 64 | <?php p($l->t('Show last log in')) ?> |
59 | 65 | </label> |
60 | 66 | </p> |
61 | 67 | <p> |
62 | 68 | <input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend" |
63 | - class="checkbox" <?php if ($_['show_backend'] === 'true') print_unescaped('checked="checked"'); ?> /> |
|
69 | + class="checkbox" <?php if ($_['show_backend'] === 'true') { |
|
70 | + print_unescaped('checked="checked"'); |
|
71 | +} |
|
72 | +?> /> |
|
64 | 73 | <label for="CheckboxUserBackend"> |
65 | 74 | <?php p($l->t('Show user backend')) ?> |
66 | 75 | </label> |
67 | 76 | </p> |
68 | 77 | <p> |
69 | 78 | <input type="checkbox" name="MailOnUserCreate" value="MailOnUserCreate" id="CheckboxMailOnUserCreate" |
70 | - class="checkbox" <?php if ($_['send_email'] === 'true') print_unescaped('checked="checked"'); ?> /> |
|
79 | + class="checkbox" <?php if ($_['send_email'] === 'true') { |
|
80 | + print_unescaped('checked="checked"'); |
|
81 | +} |
|
82 | +?> /> |
|
71 | 83 | <label for="CheckboxMailOnUserCreate"> |
72 | 84 | <?php p($l->t('Send email to new user')) ?> |
73 | 85 | </label> |
@@ -77,7 +89,10 @@ discard block |
||
77 | 89 | </p> |
78 | 90 | <p> |
79 | 91 | <input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress" |
80 | - class="checkbox" <?php if ($_['show_email'] === 'true') print_unescaped('checked="checked"'); ?> /> |
|
92 | + class="checkbox" <?php if ($_['show_email'] === 'true') { |
|
93 | + print_unescaped('checked="checked"'); |
|
94 | +} |
|
95 | +?> /> |
|
81 | 96 | <label for="CheckboxEmailAddress"> |
82 | 97 | <?php p($l->t('Show email address')) ?> |
83 | 98 | </label> |