diff --git a/airtime_mvc/application/models/Auth.php b/airtime_mvc/application/models/Auth.php index b474a04cf..52dda5154 100644 --- a/airtime_mvc/application/models/Auth.php +++ b/airtime_mvc/application/models/Auth.php @@ -120,8 +120,11 @@ class Application_Model_Auth */ public static function pinSessionToClient($auth) { + $CC_CONFIG = Config::getConfig(); + $serverName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : ""; $remoteAddr = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : ""; - $auth->setStorage(new Zend_Auth_Storage_Session('Airtime' . $serverName . $remoteAddr . Application_Model_Preference::GetClientId())); + $sessionIdentifier = 'Airtime' . '-' . $serverName . '-' . $remoteAddr . '-' . Application_Model_Preference::GetClientId() . '-' . $CC_CONFIG["baseDir"]; + $auth->setStorage(new Zend_Auth_Storage_Session($sessionIdentifier)); } } diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index 2a2fa824c..5b0522f73 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -29,8 +29,10 @@ echo "----------------------------------------------------" dist=`lsb_release -is` code=`lsb_release -cs` +set +e apache2 -v | grep "2\.4" > /dev/null apacheversion=$? +set -e #enable squeeze backports to get lame packages if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then