Attachment #692364 for bug #739904




				$err="User $in{user} already exist \!\!\n";
			}
			else {
				system("touch /usr/share/plan/netplan.dir/$in{user}");
				system("echo  $in{server} > /usr/share/plan/netplan.dir/.$in{user}");
			}
		}
	}

			}
		}
		if ( $found == 1 ) {
			unlink "/usr/share/plan/netplan.dir/.$in{user}";
			unlink "/usr/share/plan/netplan.dir/$in{user}";
		} else {
			$err="User $in{user} does not exist \!\n";
		}

Lines 304-310 Link Here

(-)plan-1.9.orig/web/common.pl (-5 / +5 lines)
304	# Get the list of user on netplan server	304	# Get the list of user on netplan server
305	#--------------------------------------------------------------------------	305	#--------------------------------------------------------------------------
306	sub get_group {	306	sub get_group {
307	open(IN,"/usr/local/bin/plan -W localhost -F \| sort \|");	307	open(IN,"/usr/bin/plan -W localhost -F \| sort \|");
308	@PlanUsers=<IN>;	308	@PlanUsers=<IN>;
309	close(IN);	309	close(IN);
310		310
Lines 327-335 Link Here
327	$da=&firstdom($mo,$yr);	327	$da=&firstdom($mo,$yr);
328		328
329	if ( $jj eq 0 ) {	329	if ( $jj eq 0 ) {
330	open ( IN , "/usr/local/bin/plan -W $Who -i -t 1\.$mo\.$yr $days[$mo] \|" );	330	open ( IN , "/usr/bin/plan -W $Who -i -t 1\.$mo\.$yr $days[$mo] \|" );
331	} else {	331	} else {
332	open ( IN , "/usr/local/bin/plan -W $Who -i -t $jj\.$mo\.$yr 1 \|" );	332	open ( IN , "/usr/bin/plan -W $Who -i -t $jj\.$mo\.$yr 1 \|" );
333	}	333	}
334	@PlanData=<IN>;	334	@PlanData=<IN>;
335	close(IN);	335	close(IN);
Lines 341-347 Link Here
341	#--------------------------------------------------------------------------	341	#--------------------------------------------------------------------------
342	sub obtain_user {	342	sub obtain_user {
343	local(@PlanData);	343	local(@PlanData);
344	open ( IN , "/usr/local/bin/plan -W -F \| sort \| " );	344	open ( IN , "/usr/bin/plan -W -F \| sort \| " );
345	@PlanData=<IN>;	345	@PlanData=<IN>;
346	close(IN);	346	close(IN);
347		347
Lines 369-375 Link Here
369	sub get_holiday {	369	sub get_holiday {
370	local ($yr) = @_;	370	local ($yr) = @_;
371		371
372	open ( IN , "/usr/local/bin/plan -W -H $yr \|" );	372	open ( IN , "/usr/bin/plan -W -H $yr \|" );
373	@PlanHoliday=<IN>;	373	@PlanHoliday=<IN>;
374	close(IN);	374	close(IN);
375		375

Lines 25-35 Link Here

(-)plan-1.9.orig/web/help.html (-2 / +2 lines)
25	<LI> You need a <I>netplan</I> server version 1.8 or later running on	25	<LI> You need a <I>netplan</I> server version 1.8 or later running on
26	the same host that the web server running the WebPlan CGI scripts	26	the same host that the web server running the WebPlan CGI scripts
27	runs on. Its data directory must be named	27	runs on. Its data directory must be named
28	<I>/usr/local/lib/netplan.dir</I>, which must be writable for the	28	<I>/usr/share/plan/netplan.dir</I>, which must be writable for the
29	CGI scripts.<p>	29	CGI scripts.<p>
30		30
31	<LI> There must be a <I>plan</I> executable version 1.8 or later in the	31	<LI> There must be a <I>plan</I> executable version 1.8 or later in the
32	directory <I>/usr/local/bin</I> on the host that the web server is	32	directory <I>/usr/bin</I> on the host that the web server is
33	running on.	33	running on.
34	</UL>	34	</UL>
35	<p>There is no way to run the web interface without the help of an HTTP	35	<p>There is no way to run the web interface without the help of an HTTP

Lines 129-135 Link Here

(-)plan-1.9.orig/web/webAdd.cgi (-1 / +1 lines)
129	# user add a \0 appended to it ... that's why data was not passed	129	# user add a \0 appended to it ... that's why data was not passed
130	# to the dam script with system or open() statement	130	# to the dam script with system or open() statement
131		131
132	$cmd="/usr/local/bin/plan $start -W $long $rep -u $user \"$data\"";	132	$cmd="/usr/bin/plan $start -W $long $rep -u $user \"$data\"";
133	# system("$cmd");	133	# system("$cmd");
134	open ( IN , "$cmd \|");	134	open ( IN , "$cmd \|");
135	@error=<IN>;	135	@error=<IN>;

Lines 33-39 Link Here

(-)plan-1.9.orig/web/webmodDel.cgi (-1 / +1 lines)
33	return;	33	return;
34	}	34	}
35	else {	35	else {
36	open ( IN , "/usr/local/bin/plan -W -X $Row $Qui \|" );	36	open ( IN , "/usr/bin/plan -W -X $Row $Qui \|" );
37	@error=<IN>;	37	@error=<IN>;
38	close(IN);	38	close(IN);
39	foreach $line ( @error ) {	39	foreach $line ( @error ) {

Return to bug 739904

Lines 88-95 Link Here

(-)plan-1.9.orig/web/admin.cgi (-4 / +4 lines)
88	$err="User $in{user} already exist \!\!\n";	88	$err="User $in{user} already exist \!\!\n";
89	}	89	}
90	else {	90	else {
91	system("touch /usr/local/lib/netplan.dir/$in{user}");	91	system("touch /usr/share/plan/netplan.dir/$in{user}");
92	system("echo $in{server} > /usr/local/lib/netplan.dir/.$in{user}");	92	system("echo $in{server} > /usr/share/plan/netplan.dir/.$in{user}");
93	}	93	}
94	}	94	}
95	}	95	}
Lines 103-110 Link Here
103	}	103	}
104	}	104	}
105	if ( $found == 1 ) {	105	if ( $found == 1 ) {
106	unlink "/usr/local/lib/netplan.dir/.$in{user}";	106	unlink "/usr/share/plan/netplan.dir/.$in{user}";
107	unlink "/usr/local/lib/netplan.dir/$in{user}";	107	unlink "/usr/share/plan/netplan.dir/$in{user}";
108	} else {	108	} else {
109	$err="User $in{user} does not exist \!\n";	109	$err="User $in{user} does not exist \!\n";
110	}	110	}