Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 6ab4db7

Browse files
committed
Fix share.php rewrite, remove blank line at the beginning of the file
1 parent b745b30 commit 6ab4db7

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

dist/php/6.5.2.pgsql

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
/* SEPARATOR */
12
DROP TABLE IF EXISTS ajxp_tasks;
2-
3+
/* SEPARATOR */
34
CREATE TABLE IF NOT EXISTS ajxp_tasks (
45
uid VARCHAR(255) NOT NULL ,
56
type INTEGER NOT NULL,
@@ -18,13 +19,15 @@ CREATE TABLE IF NOT EXISTS ajxp_tasks (
1819
nodes VARCHAR(500) NOT NULL,
1920
creation_date INTEGER NOT NULL DEFAULT 0,
2021
status_update INTEGER NOT NULL DEFAULT 0,
21-
2222
PRIMARY KEY (uid)
2323
);
24-
25-
24+
/* SEPARATOR */
2625
CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
26+
/* SEPARATOR */
2727
CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
28+
/* SEPARATOR */
2829
CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
30+
/* SEPARATOR */
2931
CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
30-
CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
32+
/* SEPARATOR */
33+
CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);

dist/php/6.5.2.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,12 @@ function updateSharePhpContent($installPath, $publicFolder){
3333
}, explode("/", trim($publicFolder, "/")));
3434
$baseConfPath = implode("/", $folders);
3535

36-
$content = '
37-
<?php
36+
$content = '<?php
3837
include_once("'.$baseConfPath.'/base.conf.php");
3938
define(\'AJXP_EXEC\', true);
4039
require_once AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/vendor/autoload.php";
4140
$base = rtrim(dirname($_SERVER["SCRIPT_NAME"]), "/");
42-
\Pydio\Share\ShareCenter::publicRoute($base, "/proxy", ["hash" => $_GET["hash"]]);
43-
';
41+
\Pydio\Share\ShareCenter::publicRoute($base, "/proxy", ["hash" => $_GET["hash"]]);';
4442
file_put_contents($sharePhpPath, $content);
4543

4644
}

dist/php/6.5.2.sqlite

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
DROP TABLE IF EXISTS ajxp_tasks;
2-
2+
/* SEPARATOR */
33
CREATE TABLE IF NOT EXISTS ajxp_tasks (
44
uid VARCHAR(255) NOT NULL ,
55
type INTEGER NOT NULL,
@@ -18,13 +18,15 @@ CREATE TABLE IF NOT EXISTS ajxp_tasks (
1818
nodes VARCHAR(500) NOT NULL,
1919
creation_date INTEGER NOT NULL DEFAULT 0,
2020
status_update INTEGER NOT NULL DEFAULT 0,
21-
2221
PRIMARY KEY (uid)
2322
);
24-
25-
23+
/* SEPARATOR */
2624
CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
25+
/* SEPARATOR */
2726
CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
27+
/* SEPARATOR */
2828
CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
29+
/* SEPARATOR */
2930
CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
30-
CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
31+
/* SEPARATOR */
32+
CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);

0 commit comments

Comments
 (0)