git.cweiske.de
/
grauphel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9150b1d
)
CS: tab2spaces
author
Christian Weiske
<cweiske@cweiske.de>
Thu, 21 Aug 2014 15:03:19 +0000
(17:03 +0200)
committer
Christian Weiske
<cweiske@cweiske.de>
Thu, 21 Aug 2014 15:03:19 +0000
(17:03 +0200)
controller/apicontroller.php
patch
|
blob
|
history
controller/guicontroller.php
patch
|
blob
|
history
controller/oauthcontroller.php
patch
|
blob
|
history
lib/notestorage.php
patch
|
blob
|
history
templates/settings.php
patch
|
blob
|
history
diff --git
a/controller/apicontroller.php
b/controller/apicontroller.php
index 7f6bc67d7e9391977cdfaad2107e0cb8fddfe3ad..4c7af4856d379703bc922a52b0d69a890c0e9b68 100644
(file)
--- a/
controller/apicontroller.php
+++ b/
controller/apicontroller.php
@@
-34,13
+34,13
@@
use \OCA\Grauphel\Lib\Response\ErrorResponse;
*/
class ApiController extends Controller
{
*/
class ApiController extends Controller
{
-
/**
-
* constructor of the controller
+ /**
+ * constructor of the controller
*
*
-
* @param string $appName Name of the app
-
* @param IRequest $request Instance of the request
-
*/
-
public function __construct($appName, \OCP\IRequest $request, $user)
+ * @param string $appName Name of the app
+ * @param IRequest $request Instance of the request
+ */
+ public function __construct($appName, \OCP\IRequest $request, $user)
{
parent::__construct($appName, $request);
$this->user = $user;
{
parent::__construct($appName, $request);
$this->user = $user;
diff --git
a/controller/guicontroller.php
b/controller/guicontroller.php
index e3753d7fc0f5f1d8a861323109aeed739799b7ba..79c6447d8fcbe11cf1978b4e4032f5cf4829f5d8 100644
(file)
--- a/
controller/guicontroller.php
+++ b/
controller/guicontroller.php
@@
-29,13
+29,13
@@
use \OCP\AppFramework\Http\TemplateResponse;
*/
class GuiController extends Controller
{
*/
class GuiController extends Controller
{
-
/**
-
* constructor of the controller
+ /**
+ * constructor of the controller
*
*
-
* @param string $appName Name of the app
-
* @param IRequest $request Instance of the request
-
*/
-
public function __construct($appName, \OCP\IRequest $request, $user, $urlGen)
+ * @param string $appName Name of the app
+ * @param IRequest $request Instance of the request
+ */
+ public function __construct($appName, \OCP\IRequest $request, $user, $urlGen)
{
parent::__construct($appName, $request);
$this->user = $user;
{
parent::__construct($appName, $request);
$this->user = $user;
diff --git
a/controller/oauthcontroller.php
b/controller/oauthcontroller.php
index ceaa935f2814de8f3e8ef7b41db973b42f79a753..d02b7b8b46a5a4fc214e2f3e5fe5afa11235f870 100644
(file)
--- a/
controller/oauthcontroller.php
+++ b/
controller/oauthcontroller.php
@@
-41,13
+41,13
@@
class OauthController extends Controller
{
protected $user;
{
protected $user;
-
/**
-
* constructor of the controller
+ /**
+ * constructor of the controller
*
*
-
* @param string $appName Name of the app
-
* @param IRequest $request Instance of the request
-
*/
-
public function __construct($appName, \OCP\IRequest $request, $user)
+ * @param string $appName Name of the app
+ * @param IRequest $request Instance of the request
+ */
+ public function __construct($appName, \OCP\IRequest $request, $user)
{
parent::__construct($appName, $request);
$this->user = $user;
{
parent::__construct($appName, $request);
$this->user = $user;
diff --git
a/lib/notestorage.php
b/lib/notestorage.php
index 121f5cb201a6c3335cab56fc015a89718463a113..77c8fc692a74fd47f33ab86e84c9fc0f89991f9c 100644
(file)
--- a/
lib/notestorage.php
+++ b/
lib/notestorage.php
@@
-262,8
+262,8
@@
class NoteStorage
\OC_DB::executeAudited(
'DELETE FROM `*PREFIX*grauphel_notes`'
. ' WHERE `note_user` = ? AND `note_guid` = ?',
\OC_DB::executeAudited(
'DELETE FROM `*PREFIX*grauphel_notes`'
. ' WHERE `note_user` = ? AND `note_guid` = ?',
-
array($username, $guid)
-
);
+ array($username, $guid)
+ );
}
/**
}
/**
@@
-277,15
+277,15
@@
class NoteStorage
*/
public function loadNotesOverview($username, $since = null)
{
*/
public function loadNotesOverview($username, $since = null)
{
-
$result = \OC_DB::executeAudited(
+ $result = \OC_DB::executeAudited(
'SELECT `note_guid`, `note_title`, `note_last_sync_revision`'
. ' FROM `*PREFIX*grauphel_notes`'
. ' WHERE note_user = ?',
'SELECT `note_guid`, `note_title`, `note_last_sync_revision`'
. ' FROM `*PREFIX*grauphel_notes`'
. ' WHERE note_user = ?',
-
array($username)
-
);
+ array($username)
+ );
-
$notes = array();
-
while ($row = $result->fetchRow()) {
+ $notes = array();
+ while ($row = $result->fetchRow()) {
if ($since !== null && $row['note_last_sync_revision'] <= $since) {
continue;
}
if ($since !== null && $row['note_last_sync_revision'] <= $since) {
continue;
}
@@
-305,7
+305,7
@@
class NoteStorage
),
'title' => $row['note_title'],
);
),
'title' => $row['note_title'],
);
-
}
+ }
return $notes;
}
return $notes;
}
@@
-321,19
+321,19
@@
class NoteStorage
*/
public function loadNotesFull($username, $since = null)
{
*/
public function loadNotesFull($username, $since = null)
{
-
$result = \OC_DB::executeAudited(
+ $result = \OC_DB::executeAudited(
'SELECT * FROM `*PREFIX*grauphel_notes`'
. ' WHERE note_user = ?',
'SELECT * FROM `*PREFIX*grauphel_notes`'
. ' WHERE note_user = ?',
-
array($username)
-
);
+ array($username)
+ );
-
$notes = array();
-
while ($row = $result->fetchRow()) {
+ $notes = array();
+ while ($row = $result->fetchRow()) {
if ($since !== null && $row['note_last_sync_revision'] <= $since) {
continue;
}
$notes[] = $this->noteFromRow($row);
if ($since !== null && $row['note_last_sync_revision'] <= $since) {
continue;
}
$notes[] = $this->noteFromRow($row);
-
}
+ }
return $notes;
}
return $notes;
}
diff --git
a/templates/settings.php
b/templates/settings.php
index 476a202c3d57f7389b5d36315b45d0fd68e32400..7f22bc9726f02da22cbedaef52d30084d2b9fd13 100755
(executable)
--- a/
templates/settings.php
+++ b/
templates/settings.php
@@
-1,8
+1,8
@@
<form id="apptemplate">
<form id="apptemplate">
-
<div class="section">
-
<h2><?php p($l->t('App Template'));?></h2>
-
<input type="text" name="somesetting" id="somesetting" value="<?php p($_['url']); ?>" placeholder="<?php p($l->t('Some Setting'));?>" />
-
<br />
-
<span class="msg"></span>
-
</div>
+ <div class="section">
+ <h2><?php p($l->t('App Template'));?></h2>
+ <input type="text" name="somesetting" id="somesetting" value="<?php p($_['url']); ?>" placeholder="<?php p($l->t('Some Setting'));?>" />
+ <br />
+ <span class="msg"></span>
+ </div>
</form>
</form>