Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer

Browse source
This commit is contained in:
Albert Santoni 2014-10-29 17:57:25 -04:00
commit c590869311
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/models/Auth.php
View file

@ -120,8 +120,11 @@ class Application_Model_Auth
*/ */
public static function pinSessionToClient($auth) public static function pinSessionToClient($auth)
{ {
$CC_CONFIG = Config::getConfig();
$serverName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : ""; $serverName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : "";
$remoteAddr = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : ""; $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));
} }
} }

2
install_full/ubuntu/airtime-full-install
View file

@ -29,8 +29,10 @@ echo "----------------------------------------------------"
dist=`lsb_release -is` dist=`lsb_release -is`
code=`lsb_release -cs` code=`lsb_release -cs`
set +e
apache2 -v | grep "2\.4" > /dev/null apache2 -v | grep "2\.4" > /dev/null
apacheversion=$? apacheversion=$?
set -e
#enable squeeze backports to get lame packages #enable squeeze backports to get lame packages
if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then