Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x

LICENSE

@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
+                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 3, 19 November 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
+  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works.
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
+software for all its users.
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
+  Developers that use our General Public Licenses protect your rights
-these rights or asking you to surrender the rights.  Therefore, you have
+with two steps: (1) assert copyright on the software, and (2) offer
-certain responsibilities if you distribute copies of the software, or if
+you this License which gives you legal permission to copy, distribute
-you modify it: responsibilities to respect the freedom of others.
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
+  A secondary benefit of defending all users' freedom is that
-gratis or for a fee, you must pass on to the recipients the same
+improvements made in alternate versions of the program, if they
-freedoms that you received.  You must make sure that they, too, receive
+receive widespread use, become available for other developers to
-or can get the source code.  And you must show them these terms so they
+incorporate.  Many developers of free software are heartened and
-know their rights.
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  Developers that use the GNU GPL protect your rights with two steps:
+  The GNU Affero General Public License is designed specifically to
-(1) assert copyright on the software, and (2) offer you this License
+ensure that, in such cases, the modified source code becomes available
-giving you legal permission to copy, distribute and/or modify it.
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  For the developers' and authors' protection, the GPL clearly explains
+  An older license, called the Affero General Public License and
-that there is no warranty for this free software.  For both users' and
+published by Affero, was designed to accomplish similar goals.  This is
-authors' sake, the GPL requires that modified versions be marked as
+a different license, not a version of the Affero GPL, but Affero has
-changed, so that their problems will not be attributed erroneously to
+released a new version of the Affero GPL which permits relicensing under
-authors of previous versions.
+this license.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
+but the work with which it is combined will remain governed by version
-section 13, concerning interaction through a network will apply to the
+3 of the GNU General Public License.
-combination as such.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+the GNU Affero General Public License from time to time.  Such new versions
-be similar in spirit to the present version, but may differ in detail to
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -635,41 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+    it under the terms of the GNU Affero General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
+  If your software can interact with users remotely through a computer
-notice like this when it starts in an interactive mode:
+network, you should also make sure that it provides a way for users to
-
+get its source.  For example, if your program is a web application, its
-    <program>  Copyright (C) <year>  <name of author>
+interface could display a "Source" link that leads users to an archive
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+of the code.  There are many ways you could offer source, and different
-    This is free software, and you are welcome to redistribute it
+solutions will be better for different programs; see section 13 for the
-    under certain conditions; type `show c' for details.
+specific requirements.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
 <http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-

airtime_mvc/application/controllers/LoginController.php

@@ -56,6 +56,8 @@ class LoginController extends Zend_Controller_Action
                     
                     $result = $auth->authenticate($authAdapter);
                     if ($result->isValid()) {
+                        //  Regenerate session id on login to prevent session fixation.
+                        Zend_Session::regenerateId();
                         //all info about this user from the login table omit only the password
                         $userInfo = $authAdapter->getResultRowObject(null, 'password');
 

airtime_mvc/application/controllers/PluploadController.php

@@ -24,15 +24,33 @@ class PluploadController extends Zend_Controller_Action
         $this->view->headScript()->appendFile($baseUrl.'js/plupload/i18n/'.$locale.'.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
 
         $this->view->headLink()->appendStylesheet($baseUrl.'css/plupload.queue.css?'.$CC_CONFIG['airtime_version']);
+
+        $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
+        $csrf_namespace->setExpirationSeconds(5*60*60);
+        $csrf_namespace->authtoken = sha1(uniqid(rand(),1));
+
+        $csrf_element = new Zend_Form_Element_Hidden('csrf');
+        $csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
+        $csrf_form = new Zend_Form();
+        $csrf_form->addElement($csrf_element);
+        $this->view->form = $csrf_form;
     }
 
     public function uploadAction()
     {
-        $upload_dir = ini_get("upload_tmp_dir") . DIRECTORY_SEPARATOR . "plupload";
+        $current_namespace = new Zend_Session_Namespace('csrf_namespace');
-        $tempFilePath = Application_Model_StoredFile::uploadFile($upload_dir);
+        $observed_csrf_token = $this->_getParam('csrf_token');
-        $tempFileName = basename($tempFilePath);
+        $expected_csrf_token = $current_namespace->authtoken;
 
-        $this->_helper->json->sendJson(array("jsonrpc" => "2.0", "tempfilepath" => $tempFileName));
+        if($observed_csrf_token == $expected_csrf_token){
+            $upload_dir = ini_get("upload_tmp_dir") . DIRECTORY_SEPARATOR . "plupload";
+            $tempFilePath = Application_Model_StoredFile::uploadFile($upload_dir);
+            $tempFileName = basename($tempFilePath);
+         
+            $this->_helper->json->sendJson(array("jsonrpc" => "2.0", "tempfilepath" => $tempFileName));
+        }else{
+            $this->_helper->json->sendJson(array("jsonrpc" => "2.0", "valid" => false, "error" => "CSRF token did not match."));
+        }
     }
 
     public function copyfileAction()

airtime_mvc/application/controllers/PreferenceController.php

@@ -201,6 +201,10 @@ class PreferenceController extends Zend_Controller_Action
         $num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
         $form = new Application_Form_StreamSetting();
 
+        $form->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
+
         $form->setSetting($setting);
         $form->startFrom();
 

airtime_mvc/application/forms/AddUser.php

@@ -21,6 +21,10 @@ class Application_Form_AddUser extends Zend_Form
         $hidden->setDecorators(array('ViewHelper'));
         $this->addElement($hidden);
 
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
+
         $login = new Zend_Form_Element_Text('login');
         $login->setLabel(_('Username:'));
         $login->setAttrib('class', 'input_text');

airtime_mvc/application/forms/EditUser.php

@@ -22,6 +22,10 @@ class Application_Form_EditUser extends Zend_Form
         $this->setDecorators(array(
                 array('ViewScript', array('viewScript' => 'form/edit-user.phtml', "currentUser" => $currentUser->getLogin()))));
         $this->setAttrib('id', 'current-user-form');
+
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
         
         $hidden = new Zend_Form_Element_Hidden('cu_user_id');
         $hidden->setDecorators(array('ViewHelper'));

airtime_mvc/application/forms/Login.php

@@ -10,6 +10,10 @@ class Application_Form_Login extends Zend_Form
         // Set the method for the display form to POST
         $this->setMethod('post');
 
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
+
         $this->setDecorators(array(
             array('ViewScript', array('viewScript' => 'form/login.phtml'))
         ));

airtime_mvc/application/forms/Preferences.php

@@ -15,6 +15,14 @@ class Application_Form_Preferences extends Zend_Form
         ));
 
         $general_pref = new Application_Form_GeneralPreferences();
+
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique',
+           'decorators' => array(
+                'ViewHelper'
+            )
+        ));
+
         $this->addSubForm($general_pref, 'preferences_general');
 
             $email_pref = new Application_Form_EmailServerPreferences();

airtime_mvc/application/models/Auth.php

@@ -111,8 +111,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));
     }
 }

airtime_mvc/application/models/Locale.php

@@ -15,7 +15,7 @@ class Application_Model_Locale
             "hr_HR" => "Hrvatski",
             "hu_HU" => "Magyar",
             "it_IT" => "Italiano",
-            "ja"    => "日本語",
+            "ja_JP"    => "日本語",
             "ko_KR" => "한국어",
             "pl_PL" => "Polski",
             "pt_BR" => "Português (Brasil)",

airtime_mvc/application/views/scripts/form/edit-user.phtml

@@ -157,6 +157,9 @@
                 </ul>
             <?php endif; ?> 
         </dd>
+
+        <?php echo $this->element->getElement('csrf') ?>
+
         <button type="submit" id="cu_save_user" class="btn btn-small right-floated"><?php echo _("Save")?></button>
     </dl>
 </form>

airtime_mvc/application/views/scripts/form/login.phtml

@@ -27,6 +27,8 @@
     <dd id="locale-element">
       <?php echo $this->element->getElement('locale') ?>
     </dd>
+
+    <?php echo $this->element->getElement('csrf') ?>
     
     <?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
         <dt id="reset-label" class="hidden">&nbsp;</dt>

airtime_mvc/application/views/scripts/form/preferences.phtml

@@ -1,5 +1,5 @@
 <form method="<?php echo $this->element->getMethod() ?>" enctype="multipart/form-data">
-
+    <?php echo $this->element->getElement('csrf') ?>
     <?php echo $this->element->getSubform('preferences_general') ?>
     
     <h3 class="collapsible-header" id="email-server-heading"><span class="arrow-icon"></span><?php echo _("Email / Mail Server Settings"); ?></h3>

airtime_mvc/application/views/scripts/plupload/index.phtml

@@ -4,6 +4,7 @@
 }
 </style> 
 <form id="plupload_form">
+        <?php echo $this->form->getElement('csrf') ?>
 	<div id="plupload_files"></div>	
 </form>
 <div id="plupload_error">

airtime_mvc/application/views/scripts/preference/stream-setting.phtml

@@ -4,6 +4,7 @@
     <?php if($this->enable_stream_conf == "true"){?>
     <form method="post" id="stream_form" enctype="application/x-www-form-urlencoded">
     <button name="stream_save" id="stream_save" type="button" class="btn btn-small right-floated"><?php echo _("Save") ?></button>
+    <?php echo $this->form->getElement('csrf') ?>
     <div style="clear:both"></div>
     <?php }?>
   <?php echo $this->statusMsg;?>

airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-07-31 10:11+0000\n"
+"PO-Revision-Date: 2014-10-07 13:41+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/airtime/language/en_GB/)\n"
 "MIME-Version: 1.0\n"

airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po

@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-07-29 09:55+0000\n"
+"PO-Revision-Date: 2014-10-09 04:26+0000\n"
-"Last-Translator: Daniel James <daniel@64studio.com>\n"
+"Last-Translator: Víctor Carranza <victor.carranza@sourcefabric.org>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/airtime/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-09-11 09:33+0000\n"
+"PO-Revision-Date: 2014-10-07 13:41+0000\n"
 "Last-Translator: AlbertFR <albert.bruc.ab@gmail.com>\n"
 "Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"

airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-08-21 14:11+0000\n"
+"PO-Revision-Date: 2014-10-07 13:41+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/airtime/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"

airtime_mvc/locale/ja/LC_MESSAGES/airtime.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-09-09 09:17+0000\n"
+"PO-Revision-Date: 2014-10-03 05:40+0000\n"
 "Last-Translator: Kazuhiro Shimbo <kazuhiro.shimbo@mail.rakuten.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/airtime/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -75,7 +75,7 @@ msgstr "キューアウトの設定"
 
 #: airtime_mvc/application/layouts/scripts/layout.phtml:73
 msgid "Cursor"
-msgstr ""
+msgstr "カーソル"
 
 #: airtime_mvc/application/layouts/scripts/layout.phtml:74
 #: airtime_mvc/application/controllers/LocaleController.php:274
@@ -145,7 +145,7 @@ msgstr "ムード"
 #: airtime_mvc/application/controllers/LocaleController.php:77
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:61
 msgid "Label"
-msgstr ""
+msgstr "レーベル"
 
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/services/HistoryService.php:1166
@@ -394,7 +394,7 @@ msgstr "追加"
 msgid ""
 "Rescan watched directory (This is useful if it is network mount and may be "
 "out of sync with Airtime)"
-msgstr ""
+msgstr "同期済み一覧を再スキャンする (もしネットワーク実装であったりRakuten.FMと同期していないと思われる場合に便利です)"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:44
 msgid "Remove watched directory"
@@ -402,7 +402,7 @@ msgstr "同期ディレクトリを削除する"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
-msgstr ""
+msgstr "いかなるメディアフォルダも見ていません"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:1
 msgid "Register Airtime"
@@ -535,7 +535,7 @@ msgstr "マスターソース接続URL："
 #: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:115
 #: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:159
 msgid "Override"
-msgstr ""
+msgstr "オーバーライド"
 
 #: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:120
 #: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:164
@@ -779,7 +779,7 @@ msgstr "ON AIR"
 
 #: airtime_mvc/application/views/scripts/partialviews/header.phtml:55
 msgid "Listen"
-msgstr ""
+msgstr "試聴"
 
 #: airtime_mvc/application/views/scripts/partialviews/header.phtml:59
 msgid "Station time"
@@ -819,7 +819,7 @@ msgstr "録音と再配信"
 
 #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:29
 msgid "Who"
-msgstr ""
+msgstr "DJ"
 
 #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:33
 msgid "Style"
@@ -1007,11 +1007,11 @@ msgstr "オリジナルの長さ："
 
 #: airtime_mvc/application/views/scripts/playlist/update.phtml:54
 msgid "Expand Static Block"
-msgstr ""
+msgstr "スマート・ブロックの拡張"
 
 #: airtime_mvc/application/views/scripts/playlist/update.phtml:59
 msgid "Expand Dynamic Block"
-msgstr ""
+msgstr "自動生成スマート・ブロックを拡張する"
 
 #: airtime_mvc/application/views/scripts/playlist/update.phtml:135
 msgid "Empty smart block"
@@ -1023,7 +1023,7 @@ msgstr "プレイリストを空にする"
 
 #: airtime_mvc/application/views/scripts/error/error.phtml:6
 msgid "Zend Framework Default Application"
-msgstr ""
+msgstr "Zend Framework Default Application"
 
 #: airtime_mvc/application/views/scripts/error/error.phtml:10
 msgid "Page not found!"
@@ -1215,7 +1215,7 @@ msgstr "年："
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:19
 #: airtime_mvc/application/forms/EditAudioMD.php:67
 msgid "Label:"
-msgstr ""
+msgstr "ラベル："
 
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:20
 #: airtime_mvc/application/forms/EditAudioMD.php:96
@@ -1275,11 +1275,11 @@ msgstr "ウェブ配信"
 
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:46
 msgid "Dynamic Smart Block"
-msgstr ""
+msgstr "自動生成スマート・ブロック"
 
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:47
 msgid "Static Smart Block"
-msgstr ""
+msgstr "スマート・ブロック"
 
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:48
 msgid "Audio Track"
@@ -1291,11 +1291,11 @@ msgstr "プレイリストの内容："
 
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:65
 msgid "Static Smart Block Contents: "
-msgstr ""
+msgstr "スマート・ブロックの内容："
 
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:104
 msgid "Dynamic Smart Block Criteria: "
-msgstr ""
+msgstr "自動生成スマート・ブロックの基準："
 
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:137
 msgid "Limit to "
@@ -1348,17 +1348,17 @@ msgstr "国の選択"
 #: airtime_mvc/application/models/MusicDir.php:160
 #, php-format
 msgid "%s is already watched."
-msgstr ""
+msgstr "%sは同期済みです。"
 
 #: airtime_mvc/application/models/MusicDir.php:164
 #, php-format
 msgid "%s contains nested watched directory: %s"
-msgstr ""
+msgstr "%sは同期している次のフォルダを含んでいます： %s "
 
 #: airtime_mvc/application/models/MusicDir.php:168
 #, php-format
 msgid "%s is nested within existing watched directory: %s"
-msgstr ""
+msgstr "%sは同期している次のフォルダに含まれています： %s "
 
 #: airtime_mvc/application/models/MusicDir.php:189
 #: airtime_mvc/application/models/MusicDir.php:368
@@ -1370,18 +1370,18 @@ msgstr "%sは有効なディレクトリではありません。"
 #, php-format
 msgid ""
 "%s is already set as the current storage dir or in the watched folders list"
-msgstr ""
+msgstr "%sはすでに保存ディレクトリまたは同期フォルダに設定されています。"
 
 #: airtime_mvc/application/models/MusicDir.php:386
 #, php-format
 msgid ""
 "%s is already set as the current storage dir or in the watched folders list."
-msgstr ""
+msgstr "%sはすでに保存ディレクトリまたは同期フォルダに設定されています。"
 
 #: airtime_mvc/application/models/MusicDir.php:429
 #, php-format
 msgid "%s doesn't exist in the watched list."
-msgstr ""
+msgstr "%sは同期リストの中に存在しません。"
 
 #: airtime_mvc/application/models/Block.php:333
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:120
@@ -1415,7 +1415,7 @@ msgstr "キューアウトをキューインより小さく設定することは
 #: airtime_mvc/application/models/Block.php:1340
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:48
 msgid "Select criteria"
-msgstr "選択してください"
+msgstr "基準を選択してください"
 
 #: airtime_mvc/application/models/Block.php:1342
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:50
@@ -1495,19 +1495,19 @@ msgstr "ウェブサイト"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:366
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:404
 msgid "Select modifier"
-msgstr "選択してください"
+msgstr "条件を選択してください"
 
 #: airtime_mvc/application/models/Block.php:1372
 #: airtime_mvc/application/controllers/LocaleController.php:142
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:88
 msgid "contains"
-msgstr "含む"
+msgstr "以下を含む"
 
 #: airtime_mvc/application/models/Block.php:1373
 #: airtime_mvc/application/controllers/LocaleController.php:143
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:89
 msgid "does not contain"
-msgstr "含まない"
+msgstr "以下を含まない"
 
 #: airtime_mvc/application/models/Block.php:1374
 #: airtime_mvc/application/models/Block.php:1378
@@ -1515,7 +1515,7 @@ msgstr "含まない"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:90
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:104
 msgid "is"
-msgstr "一致する"
+msgstr "以下と一致する"
 
 #: airtime_mvc/application/models/Block.php:1375
 #: airtime_mvc/application/models/Block.php:1379
@@ -1523,19 +1523,19 @@ msgstr "一致する"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:91
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:105
 msgid "is not"
-msgstr "一致しない"
+msgstr "以下と一致しない"
 
 #: airtime_mvc/application/models/Block.php:1376
 #: airtime_mvc/application/controllers/LocaleController.php:146
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:92
 msgid "starts with"
-msgstr "始まる"
+msgstr "以下で始まる"
 
 #: airtime_mvc/application/models/Block.php:1377
 #: airtime_mvc/application/controllers/LocaleController.php:147
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:93
 msgid "ends with"
-msgstr "終る"
+msgstr "以下で終わる"
 
 #: airtime_mvc/application/models/Block.php:1380
 #: airtime_mvc/application/controllers/LocaleController.php:148
@@ -1623,17 +1623,17 @@ msgstr "リンクした番組の外に項目を移動することはできませ
 
 #: airtime_mvc/application/models/Scheduler.php:119
 msgid "The schedule you're viewing is out of date! (sched mismatch)"
-msgstr ""
+msgstr "参照中のスケジュールはの有効ではありません。"
 
 #: airtime_mvc/application/models/Scheduler.php:124
 msgid "The schedule you're viewing is out of date! (instance mismatch)"
-msgstr ""
+msgstr "参照中のスケジュールは有効ではありません。"
 
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:444
 #: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
-msgstr ""
+msgstr "参照中のスケジュールは有効ではありません。"
 
 #: airtime_mvc/application/models/Scheduler.php:142
 #, php-format
@@ -1658,7 +1658,7 @@ msgstr "番組 %s は以前に更新されています。"
 msgid ""
 "Content in linked shows must be scheduled before or after any one is "
 "broadcasted"
-msgstr ""
+msgstr "同期された配信内容を配信中に変更することはできません。"
 
 #: airtime_mvc/application/models/Scheduler.php:200
 #: airtime_mvc/application/models/Scheduler.php:289
@@ -1874,7 +1874,7 @@ msgstr "プレイリストに追加できるのはトラック・スマートブ
 
 #: airtime_mvc/application/controllers/LocaleController.php:53
 msgid "Please select a cursor position on timeline."
-msgstr ""
+msgstr "タイムライン上のカーソル位置を選択して下さい。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:58
 msgid "Add to selected show"
@@ -2015,7 +2015,7 @@ msgstr "お使いのブラウザはこのファイル形式の再生に対応し
 
 #: airtime_mvc/application/controllers/LocaleController.php:117
 msgid "Dynamic block is not previewable"
-msgstr ""
+msgstr "自動生成スマート・ブロックはプレビューできません"
 
 #: airtime_mvc/application/controllers/LocaleController.php:118
 msgid "Limit to: "
@@ -2034,7 +2034,7 @@ msgid ""
 "Airtime is unsure about the status of this file. This can happen when the "
 "file is on a remote drive that is unaccessible or the file is in a directory"
 " that isn't 'watched' anymore."
-msgstr ""
+msgstr "このファイルのステータスが不明です。これは、ファイルがアクセス不能な外付けドライブに存在するか、またはファイルが同期されていないディレクトリに存在する場合に起こります。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:124
 #, php-format
@@ -2111,7 +2111,7 @@ msgstr "保存先のフォルダを変更しますか？Rakuten.FMライブラ
 
 #: airtime_mvc/application/controllers/LocaleController.php:157
 msgid "Are you sure you want to remove the watched folder?"
-msgstr ""
+msgstr "同期されているフォルダを削除してもよろしいですか？"
 
 #: airtime_mvc/application/controllers/LocaleController.php:158
 msgid "This path is currently not accessible."
@@ -2164,19 +2164,19 @@ msgid ""
 " every song. If you are using an OGG stream and your listeners do not "
 "require support for these audio players, then feel free to enable this "
 "option."
-msgstr ""
+msgstr "このオプションをチェックしてOGGストリームのメタデータを有効にしてください（ストリームメタデータとは、トラックタイトル、アーティスト、オーディオプレーヤーに表示される名前のことです）。メタデータ情報を有効にしてOGG/ Vorbisのストリームを再生すると、VLCとmplayerはすべての曲を再生した後にストリームから切断される重大なバグを発生させます。OGGストリームを使用していて、リスナーがこれらのオーディオプレーヤーのためのサポートを必要としない場合は、このオプションを有効にして下さい。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:170
 msgid ""
 "Check this box to automatically switch off Master/Show source upon source "
 "disconnection."
-msgstr ""
+msgstr "このボックスにチェックを入れると、ソースが切断された時に番組ソースに自動的に切り替わります。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:171
 msgid ""
 "Check this box to automatically switch on Master/Show source upon source "
 "connection."
-msgstr ""
+msgstr "このボックスをクリックすると、ソースが接続された時にマスターソースに自動的に切り替わります。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:172
 msgid ""
@@ -2233,20 +2233,20 @@ msgstr "この番組の配信回が存在しません。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:186
 msgid "Warning: Shows cannot be re-linked"
-msgstr ""
+msgstr "注意：番組は再度リンクできません。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:187
 msgid ""
 "By linking your repeating shows any media items scheduled in any repeat show"
 " will also get scheduled in the other repeat shows"
-msgstr ""
+msgstr "配信内容を同期すると、配信内容の変更が対応するすべての再配信にも反映されます。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:188
 msgid ""
 "Timezone is set to the station timezone by default. Shows in the calendar "
 "will be displayed in your local time defined by the Interface Timezone in "
 "your user settings."
-msgstr ""
+msgstr "タイムゾーンは初期設定ではステーション所在地に合わせて設定されています。タイムゾーンを変更するには、ユーザー設定からインターフェイスのタイムゾーンを変更して下さい。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:192
 msgid "Show"
@@ -2507,7 +2507,7 @@ msgstr "終了"
 
 #: airtime_mvc/application/controllers/LocaleController.php:266
 msgid "Duration"
-msgstr ""
+msgstr "長さ"
 
 #: airtime_mvc/application/controllers/LocaleController.php:276
 msgid "Show Empty"
@@ -2593,7 +2593,7 @@ msgstr "ディスク"
 
 #: airtime_mvc/application/controllers/LocaleController.php:308
 msgid "Look in"
-msgstr ""
+msgstr "閲覧"
 
 #: airtime_mvc/application/controllers/LocaleController.php:310
 msgid "Open"
@@ -2681,7 +2681,7 @@ msgstr "ユーザー管理"
 
 #: airtime_mvc/application/controllers/LocaleController.php:331
 msgid "Manage watched folders"
-msgstr ""
+msgstr "同期されているフォルダを管理"
 
 #: airtime_mvc/application/controllers/LocaleController.php:332
 #: airtime_mvc/application/forms/SupportSettings.php:112
@@ -2797,7 +2797,7 @@ msgstr "%d/%d ファイルをアップロードしました。"
 
 #: airtime_mvc/application/controllers/LocaleController.php:370
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: airtime_mvc/application/controllers/LocaleController.php:371
 msgid "Drag files here."
@@ -2867,7 +2867,7 @@ msgstr "エントリーを作成"
 
 #: airtime_mvc/application/controllers/LocaleController.php:390
 msgid "Edit History Record"
-msgstr ""
+msgstr "配信履歴を編集"
 
 #: airtime_mvc/application/controllers/LocaleController.php:393
 #, php-format
@@ -2926,11 +2926,11 @@ msgstr "Liquidsoapに問題があります。"
 
 #: airtime_mvc/application/controllers/ShowbuilderController.php:196
 msgid "Select cursor"
-msgstr ""
+msgstr "カーソルを選択"
 
 #: airtime_mvc/application/controllers/ShowbuilderController.php:197
 msgid "Remove cursor"
-msgstr ""
+msgstr "カーソルを削除"
 
 #: airtime_mvc/application/controllers/ShowbuilderController.php:216
 msgid "show does not exist"
@@ -2956,7 +2956,7 @@ msgstr "%sの古いバージョンを閲覧しています。"
 
 #: airtime_mvc/application/controllers/PlaylistController.php:123
 msgid "You cannot add tracks to dynamic blocks."
-msgstr ""
+msgstr "自動生成スマート・ブロックにトラックを追加することはできません。"
 
 #: airtime_mvc/application/controllers/PlaylistController.php:144
 #, php-format
@@ -3024,7 +3024,7 @@ msgstr "インポートフォルダ："
 
 #: airtime_mvc/application/forms/WatchedDirPreferences.php:25
 msgid "Watched Folders:"
-msgstr ""
+msgstr "同期フォルダ："
 
 #: airtime_mvc/application/forms/WatchedDirPreferences.php:40
 msgid "Not a valid Directory"
@@ -3216,7 +3216,7 @@ msgstr "24時間を越える長さに設定することはできません。"
 
 #: airtime_mvc/application/forms/AddShowRepeats.php:10
 msgid "Link:"
-msgstr "リンク："
+msgstr "配信内容を同期する："
 
 #: airtime_mvc/application/forms/AddShowRepeats.php:16
 msgid "Repeat Type:"
@@ -3252,11 +3252,11 @@ msgstr "リピート間隔："
 
 #: airtime_mvc/application/forms/AddShowRepeats.php:50
 msgid "day of the month"
-msgstr ""
+msgstr "毎月特定日"
 
 #: airtime_mvc/application/forms/AddShowRepeats.php:50
 msgid "day of the week"
-msgstr ""
+msgstr "毎月特定曜日"
 
 #: airtime_mvc/application/forms/AddShowRepeats.php:56
 #: airtime_mvc/application/forms/DateRange.php:44
@@ -3289,15 +3289,15 @@ msgstr "パスワード"
 
 #: airtime_mvc/application/forms/PasswordChange.php:28
 msgid "Confirm new password"
-msgstr ""
+msgstr "新しいパスワードを確認してください。"
 
 #: airtime_mvc/application/forms/PasswordChange.php:36
 msgid "Password confirmation does not match your password."
-msgstr ""
+msgstr "パスワード確認がパスワードと一致しません。"
 
 #: airtime_mvc/application/forms/PasswordChange.php:43
 msgid "Get new password"
-msgstr ""
+msgstr "新しいパスワードを入手"
 
 #: airtime_mvc/application/forms/SupportSettings.php:21
 #: airtime_mvc/application/forms/GeneralPreferences.php:21
@@ -3439,7 +3439,7 @@ msgstr "Icecastサーバーを使用する際はマウント欄を入力して
 
 #: airtime_mvc/application/forms/StreamSetting.php:22
 msgid "Hardware Audio Output"
-msgstr ""
+msgstr "オーディオ出力"
 
 #: airtime_mvc/application/forms/StreamSetting.php:33
 msgid "Output Type"
@@ -3467,7 +3467,7 @@ msgstr "ステーション名 - 番組名"
 
 #: airtime_mvc/application/forms/StreamSetting.php:63
 msgid "Off Air Metadata"
-msgstr ""
+msgstr "オフエアーメタデータ"
 
 #: airtime_mvc/application/forms/StreamSetting.php:69
 msgid "Enable Replay Gain"
@@ -3495,7 +3495,7 @@ msgstr "再配信"
 
 #: airtime_mvc/application/forms/EmailServerPreferences.php:17
 msgid "Enable System Emails (Password Reset)"
-msgstr ""
+msgstr "システムメールを有効化 (パスワードリセット)"
 
 #: airtime_mvc/application/forms/EmailServerPreferences.php:27
 msgid "Reset Password 'From' Email"
@@ -3588,7 +3588,7 @@ msgstr "デフォルトフェードアウト（初期値）："
 msgid ""
 "Allow Remote Websites To Access \"Schedule\" Info?%s (Enable this to make "
 "front-end widgets work.)"
-msgstr ""
+msgstr "外部サイトからの「スケジュール」情報へのアクセスを許可しますか?%s （フロントエンドのウィジェットを機能させる場合は、これを有効にしてください）"
 
 #: airtime_mvc/application/forms/GeneralPreferences.php:90
 msgid "Disabled"
@@ -3620,7 +3620,7 @@ msgstr "メール"
 
 #: airtime_mvc/application/forms/PasswordRestore.php:36
 msgid "Restore password"
-msgstr ""
+msgstr "パスワードをリセット"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:118
 msgid "hours"
@@ -3636,11 +3636,11 @@ msgstr "スマートブロックの形式："
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:170
 msgid "Static"
-msgstr ""
+msgstr "スマート･ブロック"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:171
 msgid "Dynamic"
-msgstr ""
+msgstr "自動生成スマート・ブロック"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:285
 msgid "Allow Repeat Tracks:"
@@ -3681,7 +3681,7 @@ msgstr "設定できるアイテムの最大数は500です。"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:529
 msgid "You must select Criteria and Modifier"
-msgstr ""
+msgstr "「基準」と「条件」を選択してください。"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:536
 msgid "'Length' should be in '00:00:00' format"
@@ -3733,7 +3733,7 @@ msgstr "SoundCloudへのアップロードを有効化"
 
 #: airtime_mvc/application/forms/SoundcloudPreferences.php:36
 msgid "Automatically Mark Files \"Downloadable\" on SoundCloud"
-msgstr ""
+msgstr "自動的にSoundCloud上で「Downloadable」ファイルとしてアップロードする。"
 
 #: airtime_mvc/application/forms/SoundcloudPreferences.php:47
 msgid "SoundCloud Email"
@@ -3809,7 +3809,7 @@ msgstr "Other"
 
 #: airtime_mvc/application/forms/SoundcloudPreferences.php:133
 msgid "Default License:"
-msgstr "トライセンス（初期値）："
+msgstr "ライセンス（初期値）："
 
 #: airtime_mvc/application/forms/SoundcloudPreferences.php:137
 msgid "The work is in the public domain"
@@ -3881,7 +3881,7 @@ msgstr "メディアフォルダ"
 
 #: airtime_mvc/application/configs/navigation.php:64
 msgid "Streams"
-msgstr "配信"
+msgstr "配信設定"
 
 #: airtime_mvc/application/configs/navigation.php:83
 msgid "Listener Stats"
@@ -3913,4 +3913,4 @@ msgstr "選択してください。"
 
 #: airtime_mvc/library/propel/contrib/pear/HTML_QuickForm_Propel/Propel.php:531
 msgid "No Records"
-msgstr ""
+msgstr "録画なし"

airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-08-21 14:11+0000\n"
+"PO-Revision-Date: 2014-10-07 13:41+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/airtime/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"

airtime_mvc/public/index.php

@@ -1,5 +1,15 @@
 <?php
 
+//  Only enable cookie secure if we are supporting https.
+//  Ideally, this would always be on and we would force https,
+//  but the default installation configs are likely to be installed by
+//  amature users on the setup that does not have https.  Forcing
+//  cookie_secure on non https would result in confusing login problems.
+if(!empty($_SERVER['HTTPS'])){
+        ini_set('session.cookie_secure', '1');
+}
+ini_set('session.cookie_httponly', '1');
+
 error_reporting(E_ALL|E_STRICT);
 
 function exception_error_handler($errno, $errstr, $errfile, $errline)

airtime_mvc/public/js/airtime/library/plupload.js

@@ -11,7 +11,10 @@ $(document).ready(function() {
 		multiple_queues : 'true',
 		filters : [
 			{title: "Audio Files", extensions: "ogg,mp3,oga,flac,wav,m4a,mp4,opus"}
-		]
+		],
+                multipart_params : {
+                    "csrf_token" : $("#csrf").attr('value'),
+                }
 	});
 
 	uploader = $("#plupload_files").pluploadQueue();

airtime_mvc/public/js/plupload/i18n/ja_JP.js

@@ -0,0 +1,27 @@
+//Japanese
+plupload.addI18n({
+    'Select files' : $.i18n._('Select files'),
+    'Add files to the upload queue and click the start button.' : $.i18n._('Add files to the upload queue and click the start button.'),
+    'Filename' : $.i18n._('Filename'),
+    'Status' : $.i18n._('Status'),
+    'Size' : $.i18n._('Size'),
+    'Add files' : $.i18n._('Add files'),
+    'Stop current upload' : $.i18n._('Stop current upload'),
+    'Start uploading queue' : $.i18n._('Start uploading queue'),
+    'Uploaded %d/%d files': $.i18n._('Uploaded %d/%d files'),
+    'N/A' : $.i18n._('N/A'),
+    'Drag files here.' : $.i18n._('Drag files here.'),
+    'File extension error.': $.i18n._('File extension error.'),
+    'File size error.': $.i18n._('File size error.'),
+    'Init error.': $.i18n._('Init error.'),
+    'HTTP Error.': $.i18n._('HTTP Error.'),
+    'Security error.': $.i18n._('Security error.'),
+    'Generic error.': $.i18n._('Generic error.'),
+    'IO error.': $.i18n._('IO error.'),
+    'Stop Upload': $.i18n._('Stop Upload'),
+    'Add Files': $.i18n._('Add Files'),
+    'Start Upload': $.i18n._('Start Upload'),
+    'Start upload': $.i18n._('Start upload'),
+    '%d files queued': $.i18n._('%d files queued'),
+    "Error: Invalid file extension: " : $.i18n._("Error: Invalid file extension: ")
+});

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