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

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

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

Modified Paths:
--------------
    XoopsModules/webdav/trunk/modules/webdav/class/clients.php
    XoopsModules/webdav/trunk/modules/webdav/include/data/apache2-ssl-config-template.conf
    XoopsModules/webdav/trunk/modules/webdav/xoops_version.php

Modified: XoopsModules/webdav/trunk/modules/webdav/class/clients.php
===================================================================
--- XoopsModules/webdav/trunk/modules/webdav/class/clients.php	2017-07-30 15:35:03 UTC (rev 13264)
+++ XoopsModules/webdav/trunk/modules/webdav/class/clients.php	2017-07-30 18:17:34 UTC (rev 13265)
@@ -61,6 +61,42 @@
 		$this->initVar("staged",        	XOBJ_DTYPE_INT,     	null, false);
     }
     
+    
+    
+    function xoops_getBlowfishes($single = false)
+    {
+    	if (!defined('XOOPS_BLOWFISH_ALPHA') && !defined('XOOPS_BLOWFISH_GAMMA') && !defined('XOOPS_BLOWFISH_OMEGA'))
+    		return false;
+    		
+    		$result = array();
+    		foreach(array('XOOPS_BLOWFISH_ALPHA', 'XOOPS_BLOWFISH_GAMMA', 'XOOPS_BLOWFISH_OMEGA') as $blowcharley)
+    		{
+    			$result[] = constant($blowalpha);
+    			foreach(array('XOOPS_BLOWFISH_ALPHA', 'XOOPS_BLOWFISH_GAMMA', 'XOOPS_BLOWFISH_OMEGA') as $blowbeta)
+    			{
+    				$result[] = constant($blowalpha) . constant($blowbeta);
+    				$result[] = constant($blowbeta) . constant($blowalpha);
+    				$result[] = constant($blowalpha) . constant($blowalpha);
+    				$result[] = constant($blowbeta) . constant($blowbeta);
+    				foreach(array('XOOPS_BLOWFISH_ALPHA', 'XOOPS_BLOWFISH_GAMMA', 'XOOPS_BLOWFISH_OMEGA') as $blowcharley)
+    				{
+    					$result[] = constant($blowalpha) . constant($blowbeta) . constant($blowcharley);
+    					$result[] = constant($blowbeta) . constant($blowalpha) . constant($blowcharley);
+    					$result[] = constant($blowcharley) . constant($blowbeta) . constant($blowalpha);
+    					$result[] = constant($blowbeta) . constant($blowcharley) . constant($blowalpha);
+    					$result[] = constant($blowcharley) . constant($blowalpha) . constant($blowbeta);
+    					$result[] = constant($blowcharley) . constant($blowbeta) . constant($blowalpha);
+    					$result[] = constant($blowalpha) . constant($blowcharley) . constant($blowbeta);
+    				}
+    			}
+    		}
+    		shuffle($result);
+    		shuffle($result);
+    		shuffle($result);
+    		if ($single == true)
+    			return $result[mt_rand(0, count($result)-1)];
+    		return $result;
+    }
     /**
      * Assigns Variable to Object
      * 
@@ -80,7 +116,8 @@
 	    			$staged = true;
 	   				$value = '';
 	   				$this->_staging_file_exists = false;
-	   				$this->setVar($key, $value);
+	   				parent::assignVar($key, $value);
+	   				return $this->setVar($key, $value);
 	    		} elseif (!empty($value) && file_exists(XOOPS_VAR_PATH . DIRECTORY_SEPARATOR . $webdavConfigsList['folder_data'] . DIRECTORY_SEPARATOR . 'staging' . DIRECTORY_SEPARATOR . $value))
 	    		{
 	    			$staged = false;
@@ -91,7 +128,7 @@
     			if ($staged == true)
     			{
     				$value = time();
-    				$this->setVar($key, $value);
+    				return $this->setVar($key, $value);
     			}
     			break;
     	}

Modified: XoopsModules/webdav/trunk/modules/webdav/include/data/apache2-ssl-config-template.conf
===================================================================
--- XoopsModules/webdav/trunk/modules/webdav/include/data/apache2-ssl-config-template.conf	2017-07-30 15:35:03 UTC (rev 13264)
+++ XoopsModules/webdav/trunk/modules/webdav/include/data/apache2-ssl-config-template.conf	2017-07-30 18:17:34 UTC (rev 13265)
@@ -30,4 +30,8 @@
          AuthUserFile %htpasswd%
          Require valid-user
     </Directory>
+    SSLEngine on
+	SSLCertificateFile %sslcertfile%
+	SSLCertificateKeyFile %sslcertkey%
+	SSLCertificateChainFile %sslcertchain%
 </VirtualHost>
\ No newline at end of file

Modified: XoopsModules/webdav/trunk/modules/webdav/xoops_version.php
===================================================================
--- XoopsModules/webdav/trunk/modules/webdav/xoops_version.php	2017-07-30 15:35:03 UTC (rev 13264)
+++ XoopsModules/webdav/trunk/modules/webdav/xoops_version.php	2017-07-30 18:17:34 UTC (rev 13265)
@@ -418,6 +418,15 @@
 											);
 
 $modversion["config"][] 				= array(
+													"name"          => "api_url_profile_field",
+													"title"         => "WEBDAV_MI_API_URL_PROFILE_FIELD",
+													"description"   => "WEBDAV_MI_API_URL_PROFILE_FIELD_DESC",
+													"formtype"      => "textbox",
+													"valuetype"     => "text",
+													"default"       => "callback_api_url",
+													"category"		=> "users"
+											);
+$modversion["config"][] 				= array(
 													"name"          => "populate_groups",
 													"title"         => "WEBDAV_MI_POPULATEGROUPS",
 													"description"   => "WEBDAV_MI_POPULATEGROUPS_DESC",
@@ -426,8 +435,58 @@
 													"default"       => explode(",", XOOPS_GROUPS_EXTRA),
 													"category"		=> "users"
 											);
+/**
+ * Have to enable on ubuntu/debian the following shell command
+ *
+ * $ sudo a2enmod ssl
+ *
+ */
+$modversion["config"][] 				= array(
+													"name"          => "ssl_cert_file",
+													"title"         => "WEBDAV_MI_SSL_CERTIFICATE_FILE",
+													"description"   => "WEBDAV_MI_SSL_CERTIFICATE_FILE_DESC",
+													"formtype"      => "textbox",
+													"valuetype"     => "text",
+													"default"       => "/path/to/".basename(__DIR__) . '.' . parse_url(XOOPS_URL, PHP_URL_HOST).".crt",
+													"category"		=> "users"
+											);
 
 $modversion["config"][] 				= array(
+													"name"          => "ssl_cert_key",
+													"title"         => "WEBDAV_MI_SSL_CERTIFICATE_KEY",
+													"description"   => "WEBDAV_MI_SSL_CERTIFICATE_KEY_DESC",
+													"formtype"      => "textbox",
+													"valuetype"     => "text",
+													"default"       => "/path/to/".basename(__DIR__) . '.' . parse_url(XOOPS_URL, PHP_URL_HOST).".key",
+													"category"		=> "users"
+											);
+											
+$modversion["config"][] 				= array(
+													"name"          => "ssl_cert_chain",
+													"title"         => "WEBDAV_MI_SSL_CERTIFICATE_CHAIN",
+													"description"   => "WEBDAV_MI_SSL_CERTIFICATE_CHAIN_DESC",
+													"formtype"      => "textbox",
+													"valuetype"     => "text",
+													"default"       => "/path/to/".parse_url(XOOPS_URL, PHP_URL_HOST).".crt",
+													"category"		=> "users"
+															);
+/**
+ * Have to install on ubuntu/debian the following shell command
+ * 
+ * $ sudo apt-get install apache2-utils
+ * 
+ */
+$modversion["config"][] 				= array(
+													"name"          => "webdav_htpasswd",
+													"title"         => "WEBDAV_MI_WEBDAV_HTPASSWD",
+													"description"   => "WEBDAV_MI_WEBDAV_HTPASSWD_DESC",
+													"formtype"      => "textbox",
+													"valuetype"     => "text",
+													"default"       => "htpasswd -c %s %s %s",
+													"category"		=> "users"
+											);
+
+$modversion["config"][] 				= array(
 													"name"          => "webdav_htpasswd_title",
 													"title"         => "WEBDAV_MI_WEBDAV_HTPASSWD_TITLE",
 													"description"   => "WEBDAV_MI_WEBDAV_HTPASSWD_TITLE_DESC",