[Xoops-svn] SF.net SVN: xoops-svn:[13262] XoopsModules/webdav/trunk/modules/webdav

[<wis...@us...>]

Revision: 13262
          http://sourceforge.net/p/xoops/svn/13262
Author:   wishcraft
Date:     2017-07-30 12:38:47 +0000 (Sun, 30 Jul 2017)
Log Message:
-----------
Webdav User Propogation & Management module!

Modified Paths:
--------------
    XoopsModules/webdav/trunk/modules/webdav/xoops_version.php

Added Paths:
-----------
    XoopsModules/webdav/trunk/modules/webdav/preloads/
    XoopsModules/webdav/trunk/modules/webdav/sql/mysql.sql

Added: XoopsModules/webdav/trunk/modules/webdav/sql/mysql.sql
===================================================================
--- XoopsModules/webdav/trunk/modules/webdav/sql/mysql.sql	                        (rev 0)
+++ XoopsModules/webdav/trunk/modules/webdav/sql/mysql.sql	2017-07-30 12:38:47 UTC (rev 13262)
@@ -0,0 +1,167 @@
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `webdav_clients`
+--
+
+CREATE TABLE `webdav_clients` (
+  `clientid` mediumint(15) NOT NULL,
+  `webdavid` int(11) NOT NULL DEFAULT '0',
+  `uid` int(11) NOT NULL DEFAULT '0',
+  `username` varchar(45) NOT NULL DEFAULT '',
+  `password` varchar(32) NOT NULL DEFAULT '',
+  `email` varchar(196) NOT NULL DEFAULT '',
+  `name` varchar(64) NOT NULL DEFAULT '',
+  `staging-file` varchar(64) NOT NULL DEFAULT '',
+  `created` int(11) NOT NULL DEFAULT '0',
+  `staged` int(11) NOT NULL DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `webdav_files`
+--
+
+CREATE TABLE `webdav_files` (
+  `fileid` mediumint(42) NOT NULL,
+  `folderid` mediumint(32) NOT NULL DEFAULT '0',
+  `webdavid` int(11) NOT NULL DEFAULT '0',
+  `type` enum('script','image','data','unknown') NOT NULL DEFAULT 'unknown',
+  `commonality-key` varchar(32) NOT NULL DEFAULT '',
+  `releases-hashinfo` varchar(32) NOT NULL DEFAULT '',
+  `fingerprint` varchar(44) NOT NULL DEFAULT '',
+  `path` varchar(255) NOT NULL DEFAULT '',
+  `filename` varchar(128) NOT NULL DEFAULT '',
+  `mime-type` varchar(64) NOT NULL DEFAULT '',
+  `extension` varchar(32) NOT NULL DEFAULT '',
+  `bytes` int(11) NOT NULL DEFAULT '0',
+  `found` int(11) NOT NULL DEFAULT '0',
+  `fingerprinted` int(11) NOT NULL DEFAULT '0',
+  `shipped` int(11) NOT NULL DEFAULT '0',
+  `written` int(11) NOT NULL DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `webdav_folders`
+--
+
+CREATE TABLE `webdav_folders` (
+  `folderid` mediumint(32) NOT NULL,
+  `parent_fid` mediumint(32) NOT NULL,
+  `webdavid` int(11) NOT NULL,
+  `commonality-key` varchar(32) NOT NULL DEFAULT '',
+  `releases-hashinfo` varchar(32) NOT NULL DEFAULT '',
+  `primary` varchar(64) NOT NULL DEFAULT '',
+  `path` varchar(255) NOT NULL DEFAULT '',
+  `fingerprint` varchar(44) NOT NULL DEFAULT '',
+  `folders` int(11) NOT NULL DEFAULT '0',
+  `deleted` int(11) NOT NULL DEFAULT '0',
+  `renegade` int(11) NOT NULL DEFAULT '0',
+  `files` int(11) NOT NULL DEFAULT '0',
+  `bytes-files` mediumint(24) NOT NULL DEFAULT '0',
+  `bytes-deleted` mediumint(24) NOT NULL DEFAULT '0',
+  `bytes-renegade` mediumint(24) NOT NULL DEFAULT '0',
+  `created` int(11) NOT NULL DEFAULT '0',
+  `hunted` int(11) NOT NULL DEFAULT '0',
+  `fingerprinted` int(11) DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `webdav_webdavs`
+--
+
+CREATE TABLE `webdav_webdavs` (
+  `webdav_id` int(11) NOT NULL,
+  `uid` int(11) NOT NULL,
+  `username` varchar(45) NOT NULL DEFAULT '',
+  `hashinfo` varchar(15) NOT NULL DEFAULT '',
+  `hostname` varchar(255) NOT NULL DEFAULT '',
+  `path` varchar(255) NOT NULL DEFAULT '',
+  `site-config-file` varchar(255) NOT NULL DEFAULT '',
+  `support-ssl` enum('Yes','No') NOT NULL DEFAULT 'No',
+  `online` int(11) NOT NULL DEFAULT '0',
+  `staging-cron` varchar(128) NOT NULL DEFAULT '',
+  `salt` varchar(64) NOT NULL DEFAULT '',
+  `created` int(11) NOT NULL DEFAULT '0',
+  `staged` int(11) NOT NULL DEFAULT '0',
+  `folders-created` int(11) NOT NULL DEFAULT '0',
+  `folders-exist` int(11) NOT NULL DEFAULT '0',
+  `folders-deleted` int(11) NOT NULL DEFAULT '0',
+  `files-created` int(11) NOT NULL DEFAULT '0',
+  `files-exist` int(11) NOT NULL DEFAULT '0',
+  `files-deleted` int(11) NOT NULL DEFAULT '0',
+  `bytes-files-created` mediumint(28) NOT NULL DEFAULT '0',
+  `bytes-files-exist` mediumint(28) NOT NULL DEFAULT '0',
+  `bytes-files-deleted` mediumint(28) NOT NULL DEFAULT '0',
+  `reneaged-created` int(11) NOT NULL DEFAULT '0',
+  `reneaged-exist` int(11) NOT NULL DEFAULT '0',
+  `reneaged-deleted` int(11) NOT NULL DEFAULT '0',
+  `bytes-reneaged-created` mediumint(28) NOT NULL DEFAULT '0',
+  `bytes-reneaged-exist` mediumint(28) NOT NULL DEFAULT '0',
+  `bytes-reneaged-deleted` mediumint(28) NOT NULL DEFAULT '0',
+  `root-folders` mediumtext,
+  `folders-hunted` int(11) NOT NULL DEFAULT '0',
+  `files-hunted` int(11) NOT NULL DEFAULT '0',
+  `renegade-hunted` int(11) NOT NULL DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+--
+-- Indexes for dumped tables
+--
+
+--
+-- Indexes for table `webdav_clients`
+--
+ALTER TABLE `webdav_clients`
+  ADD PRIMARY KEY (`clientid`);
+
+--
+-- Indexes for table `webdav_files`
+--
+ALTER TABLE `webdav_files`
+  ADD PRIMARY KEY (`fileid`),
+  ADD KEY `SEARCH` (`folderid`,`webdavid`,`commonality-key`,`type`,`releases-hashinfo`,`fingerprint`,`path`,`filename`,`mime-type`,`extension`,`found`,`fingerprinted`,`shipped`,`written`);
+
+--
+-- Indexes for table `webdav_folders`
+--
+ALTER TABLE `webdav_folders`
+  ADD PRIMARY KEY (`folderid`),
+  ADD KEY `SEARCH` (`parent_fid`,`webdavid`,`fingerprint`,`primary`,`folders`,`deleted`,`renegade`,`files`,`hunted`,`created`,`fingerprinted`);
+
+--
+-- Indexes for table `webdav_webdavs`
+--
+ALTER TABLE `webdav_webdavs`
+  ADD PRIMARY KEY (`webdav_id`,`uid`),
+  ADD KEY `SEARCH` (`uid`,`webdav_id`,`username`,`hashinfo`,`support-ssl`,`staging-cron`);
+
+--
+-- AUTO_INCREMENT for dumped tables
+--
+
+--
+-- AUTO_INCREMENT for table `webdav_clients`
+--
+ALTER TABLE `webdav_clients`
+  MODIFY `clientid` mediumint(15) NOT NULL AUTO_INCREMENT;
+--
+-- AUTO_INCREMENT for table `webdav_files`
+--
+ALTER TABLE `webdav_files`
+  MODIFY `fileid` mediumint(42) NOT NULL AUTO_INCREMENT;
+--
+-- AUTO_INCREMENT for table `webdav_folders`
+--
+ALTER TABLE `webdav_folders`
+  MODIFY `folderid` mediumint(32) NOT NULL AUTO_INCREMENT;
+--
+-- AUTO_INCREMENT for table `webdav_webdavs`
+--
+ALTER TABLE `webdav_webdavs`
+  MODIFY `webdav_id` int(11) NOT NULL AUTO_INCREMENT;

Modified: XoopsModules/webdav/trunk/modules/webdav/xoops_version.php
===================================================================
--- XoopsModules/webdav/trunk/modules/webdav/xoops_version.php	2017-07-30 10:15:16 UTC (rev 13261)
+++ XoopsModules/webdav/trunk/modules/webdav/xoops_version.php	2017-07-30 12:38:47 UTC (rev 13262)
@@ -73,8 +73,10 @@
 // database tables
 $modversion["sqlfile"]["mysql"] 		= "sql/mysql.sql";
 $modversion["tables"] 					= array(
-												"languages_languages",
-												"languages_users"
+												"webdav_clients",
+												"webdav_files",
+												"webdav_folders",
+												"webdav_webdavs"
 											);
 
 // Main
@@ -89,7 +91,7 @@
 // Search
 $modversion["hasSearch"] 				= WEBDAV_MI_HASSEARCH;
 $modversion['search']['file'] 			= "include/search.inc.php";
-$modversion['search']['func'] 			= "languages_search";
+$modversion['search']['func'] 			= "webdav_search";
 
 // Comments
 $modversion["hasComments"] 				= WEBDAV_MI_HASCOMMENTS;
@@ -200,7 +202,7 @@
 													"description"   => "WEBDAV_MI_ROOT_PATH_DESC",
 													"formtype"      => "textbox",
 													"valuetype"     => "text",
-													"default"       => strtolower('/var/www/'.basename(__DIR__) . '.' . parse_url(XOOPS_URL, PHP_URL_HOST)),
+													"default"       => strtolower('/var/www/' . basename(__DIR__) . '.' . parse_url(XOOPS_URL, PHP_URL_HOST)),
 													"category"		=> "paths"
 											);
 
@@ -220,7 +222,7 @@
 													"description"   => "WEBDAV_MI_HTPASSWD_PATH_DESC",
 													"formtype"      => "textbox",
 													"valuetype"     => "text",
-													"default"       => strtolower('/var/www/'.basename(__DIR__) . '.' . parse_url(XOOPS_URL, PHP_URL_HOST) . DIRECTORY_SEPARATOR . '.htpasswd'),
+													"default"       => strtolower('/var/www/' . basename(__DIR__) . '.' . parse_url(XOOPS_URL, PHP_URL_HOST) . DIRECTORY_SEPARATOR . '.htpasswd'),
 													"category"		=> "paths"
 											);
 
@@ -235,6 +237,16 @@
 											);
 
 $modversion["config"][] 				= array(
+													"name"          => "folder_data",
+													"title"         => "WEBDAV_MI_FOLDER_DATA",
+													"description"   => "WEBDAV_MI_FOLDER_DATA_DESC",
+													"formtype"      => "textbox",
+													"valuetype"     => "text",
+													"default"       => basename(__DIR__),
+													"category"		=> "paths"
+											);
+
+$modversion["config"][] 				= array(
 													"name"          => "folder_core",
 													"title"         => "WEBDAV_MI_FOLDER_CORE",
 													"description"   => "WEBDAV_MI_FOLDER_CORE_DESC",
@@ -405,21 +417,21 @@
 											);
 
 $modversion["config"][] 				= array(
-													"name"          => "path_element",
-													"title"         => "WEBDAV_MI_PATHELEMENT",
-													"description"   => "WEBDAV_MI_PATHELEMENT_DESC",
+													"name"          => "hostname_element",
+													"title"         => "WEBDAV_MI_HOSTNAME_ELEMENT",
+													"description"   => "WEBDAV_MI_HOSTNAME_ELEMENT_DESC",
 													"formtype"      => "radio",
 													"valuetype"     => "text",
 													"default"       => "hashinfo",
-													"options"       => array(	"hashinfo" => WEBDAV_MI_PATHELEMENT_HASHINFO,
-																				"username" => WEBDAV_MI_PATHELEMENT_USERNAME	),
+													"options"       => array(	"hashinfo" => WEBDAV_MI_HOSTNAME_ELEMENT_HASHINFO,
+																				"username" => WEBDAV_MI_HOSTNAME_ELEMENT_USERNAME	),
 													"category"		=> "users"
 											);
 
 $modversion["config"][] 				= array(
-													"name"          => "permissiables_mode",
-													"title"         => "WEBDAV_MI_PERMISSIABLES_MODE",
-													"description"   => "WEBDAV_MI_PERMISSIABLES_MODE_DESC",
+													"name"          => "permissiables_files",
+													"title"         => "WEBDAV_MI_PERMISSIABLES_FILES",
+													"description"   => "WEBDAV_MI_PERMISSIABLES_FILES_DESC",
 													"formtype"      => "textbox",
 													"valuetype"     => "text",
 													"default"       => 'chmod -Rf 0777 %s',
@@ -427,9 +439,9 @@
 											);
 		
 $modversion["config"][] 				= array(
-													"name"          => "permissiables_user",
-													"title"         => "WEBDAV_MI_PERMISSIABLES_USER",
-													"description"   => "WEBDAV_MI_PERMISSIABLES_USER_DESC",
+													"name"          => "permissiables_apache2",
+													"title"         => "WEBDAV_MI_PERMISSIABLES_APACHE2",
+													"description"   => "WEBDAV_MI_PERMISSIABLES_APACHE2_DESC",
 													"formtype"      => "textbox",
 													"valuetype"     => "text",
 													"default"       => 'chown -Rf www-data:www-data %s',