Added merges to private server.

This commit is contained in:
xevidos 2019-03-04 15:10:43 -05:00
commit cb1a27e17b
6 changed files with 289 additions and 128 deletions

View File

@ -196,11 +196,11 @@ class Filemanager extends Common {
if ( $data['type'] == 'directory' ) {
$folders[] = array( "name"=>$data['name'], "type"=>$data['type'], "size"=>$data['size'] );
$folders[] = array( "name"=>htmlentities($data['name'], ENT_QUOTES), "type"=>$data['type'], "size"=>$data['size'] );
}
if ( $data['type'] == 'file' ) {
$files[] = array( "name"=>$data['name'], "type"=>$data['type'], "size"=>$data['size'] );
$files[] = array( "name"=>htmlentities($data['name'], ENT_QUOTES), "type"=>$data['type'], "size"=>$data['size'] );
}
}
@ -709,7 +709,7 @@ class Filemanager extends Common {
"url"=>$add,
"thumbnail_url"=>$add,
"delete_url"=>$add,
"delete_type"=>"DELETE"
"delete_type"=>'DELETE'
);
}
}
@ -785,4 +785,4 @@ class Filemanager extends Common {
return $path;
}
}
}

View File

@ -98,11 +98,12 @@ if ( ! ( defined( "DBHOST" ) && defined( "DBNAME" ) && defined( "DBUSER" ) && de
$aValidDBType = [
'mysql'
,'postgresql'
//,'sqlite'
];
//Is selected database type valid?
if(!in_array($dbtype,$aValidDBType)){
die( "Invalid database. Please select one of ".implode(", "$aValidDBType)."." );
die( "Invalid database. Please select one of ".implode(", ",$aValidDBType)."." );
}
try {
@ -115,130 +116,16 @@ if ( ! ( defined( "DBHOST" ) && defined( "DBNAME" ) && defined( "DBUSER" ) && de
}
$bind_vars = array();
$bind = "";
$sql = [];
$sql['mysql'] = "
--
-- Table structure for table options
--
CREATE TABLE IF NOT EXISTS options (
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
name varchar(255) NOT NULL,
value text NOT NULL,
CONSTRAINT option_name UNIQUE (name)
);
-- --------------------------------------------------------
--
-- Table structure for table projects
--
CREATE TABLE IF NOT EXISTS projects (
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
name varchar(255) NOT NULL,
path varchar(255) NOT NULL,
owner varchar(255) NOT NULL,
access text,
CONSTRAINT project UNIQUE (path, owner)
);
-- --------------------------------------------------------
--
-- Table structure for table users
--
CREATE TABLE IF NOT EXISTS users (
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
first_name varchar(255) DEFAULT NULL,
last_name varchar(255) DEFAULT NULL,
username varchar(255) NOT NULL,
password text NOT NULL,
email varchar(255) DEFAULT NULL,
project varchar(255) DEFAULT NULL,
access varchar(255) NOT NULL,
groups text,
token text,
CONSTRAINT username UNIQUE (username)
);
--
-- Table structure for table user_options
--
CREATE TABLE IF NOT EXISTS user_options (
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
name varchar(255) NOT NULL,
username varchar(255) NOT NULL,
value text NOT NULL,
CONSTRAINT option_name UNIQUE (name,username)
);
";
$sql['postgresql'] = "
--
-- Table structure for table options
--
CREATE TABLE IF NOT EXISTS options (
id SERIAL PRIMARY KEY,
name varchar(255) NOT NULL UNIQUE,
value TEXT NOT NULL
);
-- --------------------------------------------------------
--
-- Table structure for table projects
--
CREATE TABLE IF NOT EXISTS projects (
id SERIAL PRIMARY KEY,
name varchar(255) NOT NULL,
path varchar(255) NOT NULL UNIQUE,
owner varchar(255) NOT NULL UNIQUE,
access text
);
-- --------------------------------------------------------
--
-- Table structure for table users
--
CREATE TABLE IF NOT EXISTS users (
id SERIAL PRIMARY KEY,
first_name varchar(255) DEFAULT NULL,
last_name varchar(255) DEFAULT NULL,
username varchar(255) NOT NULL UNIQUE,
password text NOT NULL,
email varchar(255) DEFAULT NULL,
project varchar(255) DEFAULT NULL,
access varchar(255) NOT NULL,
groups text,
token text
);
--
-- Table structure for table user_options
--
CREATE TABLE IF NOT EXISTS user_options (
id SERIAL PRIMARY KEY,
name varchar(255) NOT NULL UNIQUE,
username varchar(255) NOT NULL UNIQUE,
value text NOT NULL
);
";
$database_sql_fullpath = $path.'/components/install/sql/'.$dbtype.".sql";
if(!is_file($database_sql_fullpath)){
die("Could not find the sql of the database ".$dbtype." to execute");
}
$sql = file_get_contents($database_sql_fullpath);
try {
$result = $connection->exec($sql[$dbtype]);
//Create the database
$result = $connection->exec($sql);
} catch( PDOException $e ) {
die($e->getMessage());
@ -405,4 +292,4 @@ define("WSURL", BASE_URL . "/workspace");
saveFile( $config, $config_data );
echo( "success" );
}
}

View File

@ -0,0 +1,57 @@
--
-- Table structure for table options
--
CREATE TABLE IF NOT EXISTS options (
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
name varchar(255) NOT NULL,
value text NOT NULL,
CONSTRAINT option_name UNIQUE (name)
);
-- --------------------------------------------------------
--
-- Table structure for table projects
--
CREATE TABLE IF NOT EXISTS projects (
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
name varchar(255) NOT NULL,
path varchar(255) NOT NULL,
owner varchar(255) NOT NULL,
access text,
CONSTRAINT project UNIQUE (path, owner)
);
-- --------------------------------------------------------
--
-- Table structure for table users
--
CREATE TABLE IF NOT EXISTS users (
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
first_name varchar(255) DEFAULT NULL,
last_name varchar(255) DEFAULT NULL,
username varchar(255) NOT NULL,
password text NOT NULL,
email varchar(255) DEFAULT NULL,
project varchar(255) DEFAULT NULL,
access varchar(255) NOT NULL,
groups text,
token text,
CONSTRAINT username UNIQUE (username)
);
--
-- Table structure for table user_options
--
CREATE TABLE IF NOT EXISTS user_options (
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
name varchar(255) NOT NULL,
username varchar(255) NOT NULL,
value text NOT NULL,
CONSTRAINT option_name UNIQUE (name,username)
);

View File

@ -0,0 +1,53 @@
--
-- Table structure for table options
--
CREATE TABLE IF NOT EXISTS options (
id SERIAL PRIMARY KEY,
name varchar(255) NOT NULL UNIQUE,
value TEXT NOT NULL
);
-- --------------------------------------------------------
--
-- Table structure for table projects
--
CREATE TABLE IF NOT EXISTS projects (
id SERIAL PRIMARY KEY,
name varchar(255) NOT NULL,
path varchar(255) NOT NULL UNIQUE,
owner varchar(255) NOT NULL UNIQUE,
access text
);
-- --------------------------------------------------------
--
-- Table structure for table users
--
CREATE TABLE IF NOT EXISTS users (
id SERIAL PRIMARY KEY,
first_name varchar(255) DEFAULT NULL,
last_name varchar(255) DEFAULT NULL,
username varchar(255) NOT NULL UNIQUE,
password text NOT NULL,
email varchar(255) DEFAULT NULL,
project varchar(255) DEFAULT NULL,
access varchar(255) NOT NULL,
groups text,
token text
);
--
-- Table structure for table user_options
--
CREATE TABLE IF NOT EXISTS user_options (
id SERIAL PRIMARY KEY,
name varchar(255) NOT NULL UNIQUE,
username varchar(255) NOT NULL UNIQUE,
value text NOT NULL
);

View File

@ -0,0 +1,53 @@
--
-- Table structure for table options
--
CREATE TABLE IF NOT EXISTS options (
id INTEGER PRIMARY KEY AUTOINCREMENT,
name CHAR(255) NOT NULL UNIQUE,
value TEXT NOT NULL
);
-- --------------------------------------------------------
--
-- Table structure for table projects
--
CREATE TABLE IF NOT EXISTS projects (
id INTEGER PRIMARY KEY AUTOINCREMENT,
name CHAR(255) NOT NULL,
path CHAR(255) NOT NULL UNIQUE,
owner CHAR(255) NOT NULL UNIQUE,
access text
);
-- --------------------------------------------------------
--
-- Table structure for table users
--
CREATE TABLE IF NOT EXISTS users (
id INTEGER PRIMARY KEY AUTOINCREMENT,
first_name CHAR(255) DEFAULT NULL,
last_name CHAR(255) DEFAULT NULL,
username CHAR(255) NOT NULL UNIQUE,
password text NOT NULL,
email CHAR(255) DEFAULT NULL,
project CHAR(255) DEFAULT NULL,
access CHAR(255) NOT NULL,
groups text,
token text
);
--
-- Table structure for table user_options
--
CREATE TABLE IF NOT EXISTS user_options (
id INTEGER PRIMARY KEY AUTOINCREMENT,
name CHAR(255) NOT NULL UNIQUE,
username CHAR(255) NOT NULL UNIQUE,
value text NOT NULL
);

111
languages/bn.php Normal file
View File

@ -0,0 +1,111 @@
<?php
$lang = array(
"Username" => "ব্যবহারকারীর নাম",
"Password" => "পাসওয়ার্ড",
"Theme" => "থিম",
"Default" => "ডিফল্ট",
"Login" => "লগইন",
"More" => "আরো",
"New File" => "নতুন ফাইল",
"New Folder" => "নতুন ফোল্ডার",
"Search" => "অনুসন্ধান",
"Upload Files" => "ফাইল আপলোড",
"Copy" => "কপি",
"Paste" => "পেস্ট",
"re name" => "পুনরায় নাম",
"Delete" => "মুছে ফেলুন",
"Re scan" => "পুনরায় স্ক্যান করুন",
"Directory" => "ডিরেক্টরি",
"File" => "ফাইল",
"Search Files:" => "ফাইল অনুসন্ধান করুন:",
"File Type:" => "ফাইলের ধরন:",
"Save" => "সংরক্ষণ করুন",
"Save All" => "সব সংরক্ষণ করুন",
"Color Tool" => "কালার টুল",
"Terminal" => "টার্মিনাল",
"Projects" => "প্রজেক্ট",
"Users" => "ব্যবহারকারী",
"Marketplace" => "মার্কেটপ্লেস",
"Codiad Marketplace" => "মার্কেটপ্লেস",
"Update Check" => "আপডেট চেক",
"Settings" => "সেটিংস",
"Password" => "পাসওয়ার্ড",
"New Password" => "নতুন পাসওয়ার্ড",
"Confirm Password" => "পাসওয়ার্ড নিশ্চিত করুন",
"Change %{username}%&apos;s Password" => "Ändere %{username}%&apos;s Passwort",
"Logout" => "লগআউট",
"Search File Contents" => "অনুসন্ধান ফাইল সামগ্রী",
"Rename Project" => "প্রকল্প পুনঃনামকরণ",
"Current Project" => "বর্তমান প্রকল্প",
"Workspace Projects" => "ওয়ার্কস্পেস প্রকল্প",
"Split" => "বিভক্ত",
"Editor Settings" => "সম্পাদক সেটিংস",
"Plugins" => "প্লাগইন",
"Theme" => "প্লাগইন",
"Font Size" => "ফন্ট সাইজ",
"Highlight Active Line" => "অ্যাক্টিভ লাইন হাইলাইট",
"Indent Guides" => "ইন্ডেন্ট গাইডস",
"On" => "অন",
"Off" => "বন্ধ",
"Print Margin" => "মুদ্রণ মার্জিন",
"Show" => "দেখান",
"Hide" => "লুকান",
"No wrap" => "No wrap",
"Wrap Lines" => "Wrap Lines",
"Tab Size" => "ট্যাব আকার",
"Filemanager Trigger" => "Vফাইল ম্যানেজার ট্রিগার",
"Single Click" => "একক ক্লিক",
"Double Click" => "ডাবল ক্লিক",
"Extensions" => "এক্সটেনশানস",
"Extension" => "এক্সটেনশান",
"Mode" => "মোড",
"Save Scheme" => "স্কীম সংরক্ষণ করুন",
"New Extension" => "নতুন এক্সটেনশান",
"Edit File Extensions" => "ফাইল এক্সটেনশানগুলি সম্পাদনা",
"Right Sidebar Trigger" => "রাইট সাইডবার ট্রিগার",
"Hover" => "হভার",
"Click" => "ক্লিক",
"Close" => "বন্ধ",
"Yes" => "হ্যাঁ",
"No" => "না",
"Split Horizontally" => "অনুভূমিকভাবে বিভক্ত",
"Split Vertically" => "উল্লম্বভাবে বিভক্ত",
"Merge all" => "সব মার্জ করুন",
"Explore" => "এক্সপ্লোর",
"You Must Choose A Value" => "একটি মান নির্বাচন করতে হবে",
"Warning: File Currently Opened By: " => "সতর্কতা: ফাইলটি বর্তমানে খোলা হয়েছে ",
"Close Unsaved File?" => "অসংরক্ষিত ফাইল বন্ধ?",
"Save & Close" => "সংরক্ষণ এবং বন্ধ করুন",
"Discard Changes" => "পরিবর্তনগুলি বাতিল ",
"Cancel" => "বাতিল",
"Recovered unsaved content for: " => "এর জন্য অসংরক্ষিত সামগ্রী উদ্ধার করা হয়েছে: ",
"You have unsaved files." => "আপনার কাছে অসংরক্ষিত ফাইল আছে।",
"No Open Files to save" => "সংরক্ষণের জন্য কোনও খোলা ফাইল নেই",
"No Open Files or Selected Text" => "কোনও খোলা ফাইল বা নির্বাচিত পাঠ্য নেই",
"No suggestion selected. Might be a bug." => "No suggestion selected. Might be a bug?",
"More than one suggestions selected. Might be a bug." => "More than one suggestions selected. Might be a bug?",
"Insert HEX" => "সন্নিবেশ HEX",
"Insert RGB" => "সন্নিবেশ RGB",
"Find:" => "খুঁজুন:",
"Replace:" => "প্রতিস্থাপন:",
"Find" => "খুঁজুন",
"Replace" => "প্রতিস্থাপন",
"Replace All" => "সকলকে প্রতিস্থাপন",
"Project Loaded" => "প্রকল্প লোড করা হয়েছে",
"File saved" => "ফাইল সংরক্ষিত",
"Copied to Clipboard" => "ক্লিপবোর্ডে অনুলিপি করা হয়েছে",
"Nothing in Your Clipboard" => "আপনার ক্লিপবোর্ডে কিছুই নেই",
"Cannot Paste Directory Into Itself" => "এখানে আপনি ডিরেক্টরি পেস্ট করতে পারবেন না ",
"File could not be saved" => "ফাইল সংরক্ষণ করা যায় নি",
//
"Project web Loaded" => "প্রকল্প ওয়েব লোড করা হয়েছে",
"System Settings" => "সিস্টেম সেটিংস",
"Administration" => "প্রশাসন",
"Account" => "অ্যাকাউন্ট",
"System" => "সিস্টেম",
"Help" => "সাহায্য",
);
?>