[Asterisk-cvs] astcc Makefile, 1.5, 1.6 astcc-admin.cgi, 1.11, 1.12 astcc-users.cgi, 1.1, 1.2

markster at lists.digium.com markster at lists.digium.com
Sun Dec 19 17:40:48 CST 2004 

Update of /usr/cvsroot/astcc
In directory mongoose.digium.com:/tmp/cvs-serv6668

Modified Files:
	Makefile astcc-admin.cgi astcc-users.cgi 
Log Message:
Fix various Makefile and CGI issues (bug #3096)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/astcc/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	2 Oct 2004 02:48:25 -0000	1.5
+++ Makefile	19 Dec 2004 22:36:50 -0000	1.6
@@ -1,49 +1,51 @@
-HTTPDIR=$(shell if [ -d /var/www ]; then echo "/var/www"; else echo "/home/httpd"; fi)
-EXTENSIONS=/etc/asterisk/extensions.conf
-SOUNDSDIR=/var/lib/asterisk/sounds
+
 AGIDIR=/var/lib/asterisk/agi-bin
 ASTCC=/var/lib/astcc
+CONFDIR=/etc/asterisk
+EXTENSIONS=$(CONFDIR)/extensions.conf
+HTTPDIR=$(shell if [ -d /var/www ]; then echo "/var/www"; else echo "/home/httpd"; fi)
+SOUNDSDIR=/usr/share/asterisk/sounds
 USER=apache
 
 all:
 
 install: all
-		@[ -d $(DESTDIR)$(HTTPDIR) ] || ( echo "No HTTP directory" && exit 1 )
-		@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
-		@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
-		mkdir -p $(DESTDIR)$(HTTPDIR)/html/_astcc
-		mkdir -p $(DESTDIR)$(HTTPDIR)/cgi-bin/astcc-admin
-		chmod 755 ./astcc.agi
-		chmod 755 ./astcc-admin.cgi
-		echo | ./astcc.agi >/dev/null
-		./astcc-admin.cgi >/dev/null
-		install -m 755 -o $(USER) -g root astcc-admin.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/astcc-admin/astcc-admin.cgi
-		install -m 644 -o $(USER) -g root astcc.png $(DESTDIR)$(HTTPDIR)/html/_astcc/astcc.png
-		install -m 755 -o root -g root astcc.agi $(DESTDIR)$(AGIDIR)/astcc.agi
-		if ! grep -q "#include $(ASTCC)/astcc-exten.conf" $(EXTENSIONS); then \
-				echo ";" >> $(DESTDIR)$(EXTENSIONS); \
-				echo "; Include entries for Asterisk Calling Card" >> $(DESTDIR)$(EXTENSIONS); \
-				echo ";" >>$(DESTDIR)$(EXTENSIONS); \
-				echo '#include $(ASTCC)/astcc-exten.conf' >> $(EXTENSIONS); \
-		fi
-		mkdir -p $(DESTDIR)$(ASTCC)
-		touch $(DESTDIR)$(ASTCC)/astcc-exten.conf
-		chown $(USER) $(DESTDIR)$(ASTCC)/astcc-exten.conf
-		touch $(DESTDIR)$(ASTCC)/astcc-config.conf
-		chown $(USER) $(DESTDIR)$(ASTCC)/astcc-config.conf
-		touch $(DESTDIR)$(ASTCC)/users-astcc-config.conf
-		chown $(USER) $(DESTDIR)$(ASTCC)/users-astcc-config.conf
+	mkdir -p $(DESTDIR)$(HTTPDIR)
+	mkdir -p $(DESTDIR)$(HTTPDIR)/html/_astcc
+	mkdir -p $(DESTDIR)$(HTTPDIR)/cgi-bin/astcc-admin
+	chmod 755 ./astcc.agi
+	chmod 755 ./astcc-admin.cgi
+	echo | ./astcc.agi >/dev/null
+	./astcc-admin.cgi >/dev/null
+	install -m 755 -o $(USER) -g root astcc-admin.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/astcc-admin/astcc-admin.cgi
+	install -m 644 -o $(USER) -g root astcc.png $(DESTDIR)$(HTTPDIR)/html/_astcc/astcc.png
+	mkdir -p $(DESTDIR)$(AGIDIR)
+	install -m 755 -o root -g root astcc.agi $(DESTDIR)$(AGIDIR)/astcc.agi
+	mkdir -p $(DESTDIR)$(CONFDIR)
+	touch $(DESTDIR)$(EXTENSIONS)
+	if ! grep -q "#include $(ASTCC)/astcc-exten.conf" $(DESTDIR)$(EXTENSIONS); then \
+		echo ";" >> $(DESTDIR)$(EXTENSIONS); \
+		echo "; Include entries for Asterisk Calling Card" >> $(DESTDIR)$(EXTENSIONS); \
+		echo ";" >>$(DESTDIR)$(EXTENSIONS); \
+		echo '#include $(ASTCC)/astcc-exten.conf' >> $(DESTDIR)$(EXTENSIONS); \
+	fi
+	mkdir -p $(DESTDIR)$(ASTCC)
+	touch $(DESTDIR)$(ASTCC)/astcc-exten.conf
+	chown $(USER) $(DESTDIR)$(ASTCC)/astcc-exten.conf
+	touch $(DESTDIR)$(ASTCC)/astcc-config.conf
+	chown $(USER) $(DESTDIR)$(ASTCC)/astcc-config.conf
+	touch $(DESTDIR)$(ASTCC)/users-astcc-config.conf
+	chown $(USER) $(DESTDIR)$(ASTCC)/users-astcc-config.conf
 		
-		for x in sounds/*.gsm; do \
-			install -m 644 $$x $(DESTDIR)$(SOUNDSDIR); \
-		done
+	mkdir -p $(DESTDIR)$(SOUNDSDIR)
+	for x in sounds/*.gsm; do \
+		install -m 644 $$x $(DESTDIR)$(SOUNDSDIR); \
+	done
 		
-		@echo "/"
-		@echo "*"
-		@echo "* Please point your browser to:"
-		@echo "*"
-		@echo "* http://`hostname`/cgi-bin/astcc-admin/astcc-admin.cgi"
-		@echo "*"
-		@echo "* to get started..."
-		@echo "*"
-		@echo "\\"
+	@echo "/*"
+	@echo "* Please point your browser to:"
+	@echo "*"
+	@echo "* http://`hostname`/cgi-bin/astcc-admin/astcc-admin.cgi"
+	@echo "*"
+	@echo "* to get started..."
+	@echo "*/"

Index: astcc-admin.cgi
===================================================================
RCS file: /usr/cvsroot/astcc/astcc-admin.cgi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- astcc-admin.cgi	2 Oct 2004 02:48:25 -0000	1.11
+++ astcc-admin.cgi	19 Dec 2004 22:36:50 -0000	1.12
@@ -142,7 +142,7 @@
 			$fgcolor = "#999999";
 		}
 		$body .= "<tr><td bgcolor=\"$bgcolor\">" .
-			     "<font face=helvetica color=\"$fgcolor\">" .
+			     "<font face=verdana,helvetica color=\"$fgcolor\">" .
 				 "&nbsp;&nbsp;<a href=\"?mode=$tmp\">$tmp</a>" .
 				 "</td></tr>\n";
 	}
@@ -1345,9 +1345,9 @@
 
 	print "<title>Asterisk&trade; Calling Card manager: $mode</title>\n";
 	print "<body><table align=center width=800>\n";
-	print "   <tr><td><img src=\"/_astcc/astcc.png\"></td><td align=center><font face=helvetica size=5>Asterisk&trade; Calling Card Admin: <b>$mode</b></font>" .
-		"<br><font face=helvetica color=#444444>$msg</font></td></tr>";
-	print "   <tr><td height=350 valign=top>$menu</td><td valign=top width=90% align=center><font face=helvetica>$body</font></td></tr>";
-	print "<tr><td align=center colspan=2><hr><font face=helvetica size=-1>$copyright</font></td></tr>\n";
+	print "   <tr><td><img src=\"/_astcc/astcc.png\"></td><td align=center><font face=verdana,helvetica size=5>Asterisk&trade; Calling Card Admin: <b>$mode</b></font>" .
+		"<br><font face=verdana,helvetica color=#444444>$msg</font></td></tr>";
+	print "   <tr><td height=350 valign=top>$menu</td><td valign=top width=90% align=center><font face=verdana,helvetica>$body</font></td></tr>";
+	print "<tr><td align=center colspan=2><hr><font face=verdana,helvetica size=-1>$copyright</font></td></tr>\n";
 	print "</table></body>\n";
 }	

Index: astcc-users.cgi
===================================================================
RCS file: /usr/cvsroot/astcc/astcc-users.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- astcc-users.cgi	17 Sep 2004 03:55:57 -0000	1.1
+++ astcc-users.cgi	19 Dec 2004 22:36:50 -0000	1.2
@@ -127,8 +127,8 @@
 
 print "<title>Asterisk&trade; Calling Card Info Sheet</title>\n";
 print "<body><table align=center width=800>\n";
-print "   <tr><td><img src=\"/_astcc/astcc.png\"></td><td align=center><font face=helvetica size=5>Asterisk&trade; Calling Card Info Sheet</font>" .
-		"<br><font face=helvetica color=#444444>$msg</font></td></tr>";
-print "   <tr><td height=350 valign=top>$menu</td><td valign=top width=90% align=center><font face=helvetica>$body</font></td></tr>";
-print "<tr><td align=center colspan=2><hr><font face=helvetica size=-1>$copyright</font></td></tr>\n";
+print "   <tr><td><img src=\"/_astcc/astcc.png\"></td><td align=center><font face=verdana,helvetica size=5>Asterisk&trade; Calling Card Info Sheet</font>" .
+		"<br><font face=verdana,helvetica color=#444444>$msg</font></td></tr>";
+print "   <tr><td height=350 valign=top>$menu</td><td valign=top width=90% align=center><font face=verdana,helvetica>$body</font></td></tr>";
+print "<tr><td align=center colspan=2><hr><font face=verdana,helvetica size=-1>$copyright</font></td></tr>\n";
 print "</table></body>\n";

More information about the svn-commits mailing list