diff --git a/class/core/plugin.py b/class/core/plugin.py index b94e56a0a..a54c4c56d 100755 --- a/class/core/plugin.py +++ b/class/core/plugin.py @@ -11,7 +11,7 @@ import json class plugin: __tasks = None __plugin_dir = "plugins" - __type = "data/type.json" + __type = "data/json/type.json" setupPath = None def __init__(self): diff --git a/data/type.json b/data/json/type.json similarity index 100% rename from data/type.json rename to data/json/type.json diff --git a/data/default.sql b/data/sql/default.sql similarity index 100% rename from data/default.sql rename to data/sql/default.sql diff --git a/data/system.sql b/data/sql/system.sql similarity index 100% rename from data/system.sql rename to data/sql/system.sql diff --git a/plugins/php/info.json b/plugins/php/info.json index 682e48aaa..7b5fa4bef 100755 --- a/plugins/php/info.json +++ b/plugins/php/info.json @@ -8,7 +8,7 @@ "versions": ["5.2","5.3","5.4","5.5","5.6","7.0","7.1","7.2"], "updates": ["5.2.17p1","5.3.29","5.4.45","5.5.38","5.6.32","7.0.26","7.1.12","7.2.0"], "tip": "soft", - "checks": "/www/server/php/VERSION/bin/php", + "checks": "server/php/VERSION/bin/php", "display": 1, "author": "Zend", "date": "2017-04-01", diff --git a/route/files.py b/route/files.py index fe96d5f5c..a55e3fc3b 100644 --- a/route/files.py +++ b/route/files.py @@ -176,5 +176,5 @@ def getDir(): continue data['DIR'] = sorted(dirnames) data['FILES'] = sorted(filenames) - data['PATH'] = "" + data['PATH'] = path return public.getJson(data) diff --git a/route/site.py b/route/site.py index 6ddc86d92..b14ead989 100644 --- a/route/site.py +++ b/route/site.py @@ -10,8 +10,3 @@ site = Blueprint('site', __name__, template_folder='templates') @site.route("/") def index(): return render_template('default/site.html') - - -# @site.route("/list") -# def list(): -# SQL = public.M('site')