You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
543 lines
25 KiB
543 lines
25 KiB
// SettingsAck_p.java
|
|
// -----------------------
|
|
// part of YaCy
|
|
// (C) by Michael Peter Christen; mc@yacy.net
|
|
// first published on http://www.anomic.de
|
|
// Frankfurt, Germany, 2004, 2005
|
|
//
|
|
// $LastChangedDate$
|
|
// $LastChangedRevision$
|
|
// $LastChangedBy$
|
|
//
|
|
// This program is free software; you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation; either version 2 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program; if not, write to the Free Software
|
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
// You must compile this file with
|
|
// javac -classpath .:../Classes SettingsAck_p.java
|
|
// if the shell's current path is HTROOT
|
|
|
|
import java.net.InetSocketAddress;
|
|
import java.net.SocketException;
|
|
import java.util.HashMap;
|
|
import java.util.Iterator;
|
|
import java.util.StringTokenizer;
|
|
import java.util.regex.Pattern;
|
|
import java.util.regex.PatternSyntaxException;
|
|
|
|
import net.yacy.cora.document.MultiProtocolURI;
|
|
import net.yacy.cora.protocol.Domains;
|
|
import net.yacy.cora.protocol.RequestHeader;
|
|
import net.yacy.kelondro.order.Base64Order;
|
|
import net.yacy.kelondro.order.Digest;
|
|
import net.yacy.kelondro.util.DateFormatter;
|
|
import net.yacy.kelondro.util.Formatter;
|
|
|
|
import de.anomic.http.server.HTTPDemon;
|
|
import de.anomic.http.server.HTTPDProxyHandler;
|
|
import de.anomic.search.Switchboard;
|
|
import de.anomic.server.serverCore;
|
|
import de.anomic.server.serverObjects;
|
|
import de.anomic.server.serverSwitch;
|
|
import de.anomic.yacy.yacyCore;
|
|
import de.anomic.yacy.yacySeed;
|
|
import de.anomic.yacy.yacySeedUploader;
|
|
|
|
public class SettingsAck_p {
|
|
|
|
private static boolean nothingChanged = false;
|
|
|
|
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
|
|
// return variable that accumulates replacements
|
|
final serverObjects prop = new serverObjects();
|
|
final Switchboard sb = (Switchboard) env;
|
|
|
|
// get referer for backlink
|
|
final MultiProtocolURI referer = header.referer();
|
|
prop.put("referer", (referer == null) ? "Settings_p.html" : referer.toNormalform(true, true));
|
|
//if (post == null) System.out.println("POST: NULL"); else System.out.println("POST: " + post.toString());
|
|
|
|
if (post == null) {
|
|
prop.put("info", "1");//no information submitted
|
|
return prop;
|
|
}
|
|
|
|
// admin password
|
|
if (post.containsKey("adminaccount")) {
|
|
// read and process data
|
|
final String user = post.get("adminuser");
|
|
final String pw1 = post.get("adminpw1");
|
|
final String pw2 = post.get("adminpw2");
|
|
// do checks
|
|
if ((user == null) || (pw1 == null) || (pw2 == null)) {
|
|
prop.put("info", "1");//error with submitted information
|
|
return prop;
|
|
}
|
|
if (user.length() == 0) {
|
|
prop.put("info", "2");//username must be given
|
|
return prop;
|
|
}
|
|
if (!(pw1.equals(pw2))) {
|
|
prop.put("info", "3");//pw check failed
|
|
return prop;
|
|
}
|
|
// check passed. set account:
|
|
env.setConfig(HTTPDemon.ADMIN_ACCOUNT_B64MD5, Digest.encodeMD5Hex(Base64Order.standardCoder.encodeString(user + ":" + pw1)));
|
|
env.setConfig("adminAccount", "");
|
|
prop.put("info", "5");//admin account changed
|
|
prop.putHTML("info_user", user);
|
|
return prop;
|
|
}
|
|
|
|
|
|
// proxy password
|
|
if (post.containsKey("proxyaccount")) {
|
|
/*
|
|
* set new port
|
|
*/
|
|
final String port = post.get("port");
|
|
prop.putHTML("info_port", port);
|
|
if (!env.getConfig("port", port).equals(port)) {
|
|
// validation port
|
|
final serverCore theServerCore = (serverCore) env.getThread("10_httpd");
|
|
try {
|
|
final InetSocketAddress theNewAddress = theServerCore.generateSocketAddress(port);
|
|
final String hostName = Domains.getHostName(theNewAddress.getAddress());
|
|
prop.put("info_restart", "1");
|
|
prop.put("info_restart_ip",(hostName.equals("0.0.0.0"))? "localhost" : hostName);
|
|
prop.put("info_restart_port", theNewAddress.getPort());
|
|
|
|
env.setConfig("port", port);
|
|
|
|
theServerCore.reconnect(5000);
|
|
} catch (final SocketException e) {
|
|
prop.put("info", "26");
|
|
return prop;
|
|
}
|
|
} else {
|
|
prop.put("info_restart", "0");
|
|
}
|
|
|
|
// read and process data
|
|
String filter = (post.get("proxyfilter")).trim();
|
|
String use_proxyAccounts="";
|
|
if(post.containsKey("use_proxyaccounts")){
|
|
//needed? or set to true by default?
|
|
use_proxyAccounts = ((post.get("use_proxyaccounts")).equals("on") ? "true" : "false" );
|
|
}else{
|
|
use_proxyAccounts = "false";
|
|
}
|
|
// do checks
|
|
if ((filter == null) || (use_proxyAccounts == null)) {
|
|
prop.put("info", "1");//error with submitted information
|
|
return prop;
|
|
}
|
|
/*if (user.length() == 0) {
|
|
prop.put("info", 2);//username must be given
|
|
return prop;
|
|
}*/
|
|
/*if (!(pw1.equals(pw2))) {
|
|
prop.put("info", 3);//pw check failed
|
|
return prop;
|
|
}*/
|
|
|
|
if (filter.length() == 0) filter = "*";
|
|
else if (!filter.equals("*")){
|
|
// testing proxy filter
|
|
int patternCount = 0;
|
|
String patternStr = null;
|
|
try {
|
|
final StringTokenizer st = new StringTokenizer(filter,",");
|
|
while (st.hasMoreTokens()) {
|
|
patternCount++;
|
|
patternStr = st.nextToken();
|
|
Pattern.compile(patternStr);
|
|
}
|
|
} catch (final PatternSyntaxException e) {
|
|
prop.put("info", "27");
|
|
prop.putHTML("info_filter", filter);
|
|
prop.put("info_nr", patternCount);
|
|
prop.putHTML("info_error", e.getMessage());
|
|
prop.putHTML("info_pattern", patternStr);
|
|
return prop;
|
|
}
|
|
}
|
|
|
|
// check passed. set account:
|
|
env.setConfig("proxyClient", filter);
|
|
env.setConfig("use_proxyAccounts", use_proxyAccounts);//"true" or "false"
|
|
if (use_proxyAccounts.equals("false")){
|
|
prop.put("info", "6");//proxy account has changed(no pw)
|
|
prop.putHTML("info_filter", filter);
|
|
} else {
|
|
prop.put("info", "7");//proxy account has changed
|
|
//prop.put("info_user", user);
|
|
prop.putHTML("info_filter", filter);
|
|
}
|
|
return prop;
|
|
}
|
|
|
|
// http networking
|
|
if (post.containsKey("httpNetworking")) {
|
|
|
|
// set transparent proxy flag
|
|
HTTPDProxyHandler.isTransparentProxy = post.containsKey("isTransparentProxy");
|
|
env.setConfig("isTransparentProxy", HTTPDProxyHandler.isTransparentProxy ? "true" : "false");
|
|
prop.put("info_isTransparentProxy", HTTPDProxyHandler.isTransparentProxy ? "on" : "off");
|
|
|
|
// setting the keep alive property
|
|
HTTPDemon.keepAliveSupport = post.containsKey("connectionKeepAliveSupport");
|
|
env.setConfig("connectionKeepAliveSupport", HTTPDemon.keepAliveSupport ? "true" : "false");
|
|
prop.put("info_connectionKeepAliveSupport", HTTPDemon.keepAliveSupport ? "on" : "off");
|
|
|
|
// setting via header property
|
|
env.setConfig("proxy.sendViaHeader", post.containsKey("proxy.sendViaHeader")?"true":"false");
|
|
prop.put("info_proxy.sendViaHeader", post.containsKey("proxy.sendViaHeader")? "on" : "off");
|
|
|
|
// setting X-Forwarded-for header property
|
|
env.setConfig("proxy.sendXForwardedForHeader", post.containsKey("proxy.sendXForwardedForHeader")?"true":"false");
|
|
prop.put("info_proxy.sendXForwardedForHeader", post.containsKey("proxy.sendXForwardedForHeader")? "on" : "off");
|
|
|
|
prop.put("info", "20");
|
|
return prop;
|
|
}
|
|
|
|
// server access
|
|
if (post.containsKey("serveraccount")) {
|
|
|
|
// static IP
|
|
String staticIP = (post.get("staticIP")).trim();
|
|
if (staticIP.startsWith("http://")) {
|
|
if (staticIP.length() > 7) { staticIP = staticIP.substring(7); } else { staticIP = ""; }
|
|
} else if (staticIP.startsWith("https://")) {
|
|
if (staticIP.length() > 8) { staticIP = staticIP.substring(8); } else { staticIP = ""; }
|
|
}
|
|
// TODO IPv6 support!
|
|
if (staticIP.indexOf(":") > 0) {
|
|
staticIP = staticIP.substring(0, staticIP.indexOf(":"));
|
|
}
|
|
if (staticIP.length() == 0) {
|
|
serverCore.useStaticIP = false;
|
|
} else {
|
|
serverCore.useStaticIP = true;
|
|
}
|
|
if (yacySeed.isProperIP(staticIP) == null) sb.peers.mySeed().setIP(staticIP);
|
|
env.setConfig("staticIP", staticIP);
|
|
|
|
// server access data
|
|
String filter = (post.get("serverfilter")).trim();
|
|
/*String user = (String) post.get("serveruser");
|
|
String pw1 = (String) post.get("serverpw1");
|
|
String pw2 = (String) post.get("serverpw2");*/
|
|
// do checks
|
|
if (filter == null) {
|
|
//if ((filter == null) || (user == null) || (pw1 == null) || (pw2 == null)) {
|
|
prop.put("info", "1");//error with submitted information
|
|
return prop;
|
|
}
|
|
/* if (user.length() == 0) {
|
|
prop.put("info", 2);//username must be given
|
|
return prop;
|
|
}
|
|
if (!(pw1.equals(pw2))) {
|
|
prop.put("info", 3);//pw check failed
|
|
return prop;
|
|
}*/
|
|
if (filter.length() == 0) filter = "*";
|
|
else if (!filter.equals("*")){
|
|
// testing proxy filter
|
|
int patternCount = 0;
|
|
String patternStr = null;
|
|
try {
|
|
final StringTokenizer st = new StringTokenizer(filter,",");
|
|
while (st.hasMoreTokens()) {
|
|
patternCount++;
|
|
patternStr = st.nextToken();
|
|
Pattern.compile(patternStr);
|
|
}
|
|
} catch (final PatternSyntaxException e) {
|
|
prop.put("info", "27");
|
|
prop.putHTML("info_filter", filter);
|
|
prop.put("info_nr", patternCount);
|
|
prop.putHTML("info_error", e.getMessage());
|
|
prop.putHTML("info_pattern", patternStr);
|
|
return prop;
|
|
}
|
|
}
|
|
|
|
// check passed. set account:
|
|
env.setConfig("serverClient", filter);
|
|
|
|
prop.put("info", "8");//server access filter updated
|
|
//prop.put("info_user", user);
|
|
prop.putHTML("info_filter", filter);
|
|
return prop;
|
|
}
|
|
|
|
if (post.containsKey("proxysettings")) {
|
|
|
|
/* ====================================================================
|
|
* Reading out the remote proxy settings
|
|
* ==================================================================== */
|
|
final boolean useRemoteProxy = post.containsKey("remoteProxyUse");
|
|
final boolean useRemoteProxy4Yacy = post.containsKey("remoteProxyUse4Yacy");
|
|
final boolean useRemoteProxy4SSL = post.containsKey("remoteProxyUse4SSL");
|
|
|
|
final String remoteProxyHost = post.get("remoteProxyHost", "");
|
|
final String remoteProxyPortStr = post.get("remoteProxyPort", "");
|
|
int remoteProxyPort = 0;
|
|
try {
|
|
remoteProxyPort = Integer.parseInt(remoteProxyPortStr);
|
|
} catch (final NumberFormatException e) {
|
|
remoteProxyPort = 3128;
|
|
}
|
|
|
|
final String remoteProxyUser = post.get("remoteProxyUser", "");
|
|
final String remoteProxyPwd = post.get("remoteProxyPwd", "");
|
|
|
|
final String remoteProxyNoProxyStr = post.get("remoteProxyNoProxy", "");
|
|
//String[] remoteProxyNoProxyPatterns = remoteProxyNoProxyStr.split(",");
|
|
|
|
/* ====================================================================
|
|
* Storing settings into config file
|
|
* ==================================================================== */
|
|
env.setConfig("remoteProxyHost", remoteProxyHost);
|
|
env.setConfig("remoteProxyPort", Integer.toString(remoteProxyPort));
|
|
env.setConfig("remoteProxyUser", remoteProxyUser);
|
|
env.setConfig("remoteProxyPwd", remoteProxyPwd);
|
|
env.setConfig("remoteProxyNoProxy", remoteProxyNoProxyStr);
|
|
env.setConfig("remoteProxyUse", (useRemoteProxy) ? "true" : "false");
|
|
env.setConfig("remoteProxyUse4Yacy", (useRemoteProxy4Yacy) ? "true" : "false");
|
|
env.setConfig("remoteProxyUse4SSL", (useRemoteProxy4SSL) ? "true" : "false");
|
|
|
|
/* ====================================================================
|
|
* Enabling settings
|
|
* ==================================================================== */
|
|
sb.initRemoteProxy();
|
|
|
|
prop.put("info", "15"); // The remote-proxy setting has been changed
|
|
return prop;
|
|
}
|
|
|
|
if (post.containsKey("seedUploadRetry")) {
|
|
String error;
|
|
if ((error = yacyCore.saveSeedList(sb)) == null) {
|
|
// trying to upload the seed-list file
|
|
prop.put("info", "13");
|
|
prop.put("info_success", "1");
|
|
} else {
|
|
prop.put("info", "14");
|
|
prop.putHTML("info_errormsg",error.replaceAll("\n","<br>"));
|
|
env.setConfig("seedUploadMethod","none");
|
|
}
|
|
return prop;
|
|
}
|
|
|
|
if (post.containsKey("seedSettings")) {
|
|
// get the currently used uploading method
|
|
final String oldSeedUploadMethod = env.getConfig("seedUploadMethod","none");
|
|
final String newSeedUploadMethod = post.get("seedUploadMethod");
|
|
final String oldSeedURLStr = sb.peers.mySeed().get(yacySeed.SEEDLISTURL, "");
|
|
final String newSeedURLStr = post.get("seedURL");
|
|
|
|
final boolean seedUrlChanged = !oldSeedURLStr.equals(newSeedURLStr);
|
|
boolean uploadMethodChanged = !oldSeedUploadMethod.equals(newSeedUploadMethod);
|
|
if (uploadMethodChanged) {
|
|
uploadMethodChanged = yacyCore.changeSeedUploadMethod(newSeedUploadMethod);
|
|
}
|
|
|
|
if (seedUrlChanged || uploadMethodChanged) {
|
|
env.setConfig("seedUploadMethod", newSeedUploadMethod);
|
|
sb.peers.mySeed().put(yacySeed.SEEDLISTURL, newSeedURLStr);
|
|
|
|
// try an upload
|
|
String error;
|
|
if ((error = yacyCore.saveSeedList(sb)) == null) {
|
|
// we have successfully uploaded the seed-list file
|
|
prop.put("info_seedUploadMethod", newSeedUploadMethod);
|
|
prop.putHTML("info_seedURL",newSeedURLStr);
|
|
prop.put("info_success", newSeedUploadMethod.equalsIgnoreCase("none") ? "0" : "1");
|
|
prop.put("info", "19");
|
|
} else {
|
|
prop.put("info", "14");
|
|
prop.putHTML("info_errormsg", error.replaceAll("\n","<br>"));
|
|
env.setConfig("seedUploadMethod","none");
|
|
}
|
|
return prop;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Loop through the available seed uploaders to see if the
|
|
* configuration of one of them has changed
|
|
*/
|
|
final HashMap<String, String> uploaders = yacyCore.getSeedUploadMethods();
|
|
final Iterator<String> uploaderKeys = uploaders.keySet().iterator();
|
|
while (uploaderKeys.hasNext()) {
|
|
// get the uploader module name
|
|
final String uploaderName = uploaderKeys.next();
|
|
|
|
|
|
// determining if the user has reconfigured the settings of this uploader
|
|
if (post.containsKey("seed" + uploaderName + "Settings")) {
|
|
nothingChanged = true;
|
|
final yacySeedUploader theUploader = yacyCore.getSeedUploader(uploaderName);
|
|
final String[] configOptions = theUploader.getConfigurationOptions();
|
|
if (configOptions != null) {
|
|
for (int i=0; i<configOptions.length; i++) {
|
|
final String newSettings = post.get(configOptions[i],"");
|
|
final String oldSettings = env.getConfig(configOptions[i],"");
|
|
// bitwise AND with boolean is same as logic AND
|
|
nothingChanged &= newSettings.equals(oldSettings);
|
|
if (!nothingChanged) {
|
|
env.setConfig(configOptions[i],newSettings);
|
|
}
|
|
}
|
|
}
|
|
if (!nothingChanged) {
|
|
// if the seed upload method is equal to the seed uploader whose settings
|
|
// were changed, we now try to upload the seed list with the new settings
|
|
if (env.getConfig("seedUploadMethod","none").equalsIgnoreCase(uploaderName)) {
|
|
String error;
|
|
if ((error = yacyCore.saveSeedList(sb)) == null) {
|
|
|
|
// we have successfully uploaded the seed file
|
|
prop.put("info", "13");
|
|
prop.put("info_success", "1");
|
|
} else {
|
|
// if uploading failed we print out an error message
|
|
prop.put("info", "14");
|
|
prop.putHTML("info_errormsg",error.replaceAll("\n","<br>"));
|
|
env.setConfig("seedUploadMethod","none");
|
|
}
|
|
} else {
|
|
prop.put("info", "13");
|
|
prop.put("info_success", "0");
|
|
}
|
|
} else {
|
|
prop.put("info", "13");
|
|
prop.put("info_success", "0");
|
|
}
|
|
return prop;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Message forwarding configuration
|
|
*/
|
|
if (post.containsKey("msgForwarding")) {
|
|
env.setConfig("msgForwardingEnabled",post.containsKey("msgForwardingEnabled")?"true":"false");
|
|
env.setConfig("msgForwardingCmd",post.get("msgForwardingCmd"));
|
|
env.setConfig("msgForwardingTo",post.get("msgForwardingTo"));
|
|
|
|
prop.put("info", "21");
|
|
prop.put("info_msgForwardingEnabled", post.containsKey("msgForwardingEnabled") ? "on" : "off");
|
|
prop.putHTML("info_msgForwardingCmd", post.get("msgForwardingCmd"));
|
|
prop.putHTML("info_msgForwardingTo", post.get("msgForwardingTo"));
|
|
|
|
return prop;
|
|
}
|
|
|
|
// Crawler settings
|
|
if (post.containsKey("crawlerSettings")) {
|
|
|
|
// get Crawler Timeout
|
|
String timeoutStr = post.get("crawler.clientTimeout");
|
|
if (timeoutStr==null||timeoutStr.length()==0) timeoutStr = "10000";
|
|
|
|
int crawlerTimeout;
|
|
try {
|
|
crawlerTimeout = Integer.parseInt(timeoutStr);
|
|
if (crawlerTimeout < 0) crawlerTimeout = 0;
|
|
env.setConfig("crawler.clientTimeout", Integer.toString(crawlerTimeout));
|
|
} catch (final NumberFormatException e) {
|
|
prop.put("info", "29");
|
|
prop.putHTML("info_crawler.clientTimeout",post.get("crawler.clientTimeout"));
|
|
return prop;
|
|
}
|
|
|
|
// get maximum http file size
|
|
String maxSizeStr = post.get("crawler.http.maxFileSize");
|
|
if (maxSizeStr==null||maxSizeStr.length()==0) maxSizeStr = "-1";
|
|
|
|
long maxHttpSize;
|
|
try {
|
|
maxHttpSize = Integer.parseInt(maxSizeStr);
|
|
if(maxHttpSize < 0) {
|
|
maxHttpSize = -1;
|
|
}
|
|
env.setConfig("crawler.http.maxFileSize", Long.toString(maxHttpSize));
|
|
} catch (final NumberFormatException e) {
|
|
prop.put("info", "30");
|
|
prop.putHTML("info_crawler.http.maxFileSize",post.get("crawler.http.maxFileSize"));
|
|
return prop;
|
|
}
|
|
|
|
// get maximum ftp file size
|
|
maxSizeStr = post.get("crawler.ftp.maxFileSize");
|
|
if (maxSizeStr==null||maxSizeStr.length()==0) maxSizeStr = "-1";
|
|
|
|
long maxFtpSize;
|
|
try {
|
|
maxFtpSize = Integer.parseInt(maxSizeStr);
|
|
env.setConfig("crawler.ftp.maxFileSize", Long.toString(maxFtpSize));
|
|
} catch (final NumberFormatException e) {
|
|
prop.put("info", "31");
|
|
prop.putHTML("info_crawler.ftp.maxFileSize",post.get("crawler.ftp.maxFileSize"));
|
|
return prop;
|
|
}
|
|
|
|
maxSizeStr = post.get("crawler.smb.maxFileSize");
|
|
if (maxSizeStr==null||maxSizeStr.length()==0) maxSizeStr = "-1";
|
|
|
|
long maxSmbSize;
|
|
try {
|
|
maxSmbSize = Integer.parseInt(maxSizeStr);
|
|
env.setConfig("crawler.smb.maxFileSize", Long.toString(maxSmbSize));
|
|
} catch (final NumberFormatException e) {
|
|
prop.put("info", "31");
|
|
prop.putHTML("info_crawler.smb.maxFileSize",post.get("crawler.smb.maxFileSize"));
|
|
return prop;
|
|
}
|
|
|
|
maxSizeStr = post.get("crawler.file.maxFileSize");
|
|
if (maxSizeStr==null||maxSizeStr.length()==0) maxSizeStr = "-1";
|
|
|
|
long maxFileSize;
|
|
try {
|
|
maxFileSize = Integer.parseInt(maxSizeStr);
|
|
env.setConfig("crawler.file.maxFileSize", Long.toString(maxFileSize));
|
|
} catch (final NumberFormatException e) {
|
|
prop.put("info", "31");
|
|
prop.putHTML("info_crawler.file.maxFileSize",post.get("crawler.file.maxFileSize"));
|
|
return prop;
|
|
}
|
|
|
|
// everything is ok
|
|
prop.put("info_crawler.clientTimeout",(crawlerTimeout==0) ? "0" :DateFormatter.formatInterval(crawlerTimeout));
|
|
prop.put("info_crawler.http.maxFileSize",(maxHttpSize==-1)? "-1":Formatter.bytesToString(maxHttpSize));
|
|
prop.put("info_crawler.ftp.maxFileSize", (maxFtpSize==-1) ? "-1":Formatter.bytesToString(maxFtpSize));
|
|
prop.put("info_crawler.smb.maxFileSize", (maxSmbSize==-1) ? "-1":Formatter.bytesToString(maxSmbSize));
|
|
prop.put("info_crawler.file.maxFileSize", (maxFileSize==-1) ? "-1":Formatter.bytesToString(maxFileSize));
|
|
prop.put("info", "28");
|
|
return prop;
|
|
}
|
|
|
|
|
|
// nothing made
|
|
prop.put("info", "1");//no information submitted
|
|
return prop;
|
|
}
|
|
|
|
}
|