From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).

---
 install/tpl/apache_apps.vhost.master |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/install/tpl/apache_apps.vhost.master b/install/tpl/apache_apps.vhost.master
index ceb9c3a..068158c 100644
--- a/install/tpl/apache_apps.vhost.master
+++ b/install/tpl/apache_apps.vhost.master
@@ -5,11 +5,23 @@
 ######################################################
 
 {vhost_port_listen} Listen {apps_vhost_port}
-NameVirtualHost *:{apps_vhost_port}
+# NameVirtualHost *:{apps_vhost_port}
 
 <VirtualHost {apps_vhost_ip}:{apps_vhost_port}>
   ServerAdmin webmaster@localhost
   {apps_vhost_servername}
+  
+  <IfModule mod_php5.c>
+    DocumentRoot {apps_vhost_dir}
+    AddType application/x-httpd-php .php
+    <Directory {apps_vhost_dir}>
+      # php_admin_value open_basedir "{apps_vhost_dir}:/usr/share:/tmp"
+      Options FollowSymLinks
+      AllowOverride None
+      Order allow,deny
+      Allow from all
+    </Directory>
+  </IfModule>
   
   <IfModule mod_fcgid.c>
     DocumentRoot {apps_vhost_dir}
@@ -18,18 +30,7 @@
       Options Indexes FollowSymLinks MultiViews +ExecCGI
       AllowOverride AuthConfig Indexes Limit Options FileInfo
       AddHandler fcgid-script .php
-      FCGIWrapper /var/www/php-fcgi-scripts/apps/.php-fcgi-starter .php
-      Order allow,deny
-      Allow from all
-    </Directory>
-  </IfModule>
-  
-  <IfModule mod_php5.c>
-    DocumentRoot {apps_vhost_dir}
-    AddType application/x-httpd-php .php
-    <Directory {apps_vhost_dir}>
-      Options FollowSymLinks
-      AllowOverride None
+      FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
       Order allow,deny
       Allow from all
     </Directory>

--
Gitblit v1.9.1