license headers

e1a8d221 · Oleg Dzhimiev · 8ce388f5 · e1a8d221 · e1a8d221
Commit e1a8d221 authored Jan 13, 2017 by Oleg Dzhimiev
Hide whitespace changes
Inline Side-by-side

Showing with 49 additions and 15 deletions

update_nand.php src/update/update_nand.php +23 -7

update_software.js src/update/update_software.js +26 -8

No files found.
--- a/src/update/update_nand.php
+++ b/src/update/update_nand.php
 <?php
-/*
-FILE NAME  : update_software.php
-DESCRIPTION: update software on nand flash
-REVISION: 1.00
-AUTHOR: Oleg Dzhimiev <oleg@elphel.com>
-LICENSE: AGPL, see http://www.gnu.org/licenses/agpl.txt
-Copyright (C) 2016 Elphel, Inc.
+/**
+ * @file update_software.php
+ * @brief update software on nand flash
+ * @version 1.0
+ * @copyright Copyright (C) 2016 Elphel Inc.
+ * @author Oleg Dzhimiev <oleg@elphel.com>
+ *
+ * @par <b>License</b>:
+ *  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
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 # hardcoded
@@ -230,6 +243,9 @@ if (isset($_GET['cmd']))
 else if (isset($argv[1]))
  $cmd = $argv[1];

+// default Content-Type is text/html - LibreJS (if turned on) can add extra tags: <html><head></head><body>response</body></html>
+header("Content-Type: text/plain");
+  
 switch($cmd){
  case "flash":
    $flash_list = verify(false);

--- a/src/update/update_software.js
+++ b/src/update/update_software.js
-/*
-FILE NAME  : update_software.js
-DESCRIPTION: update software on nand flash
-REVISION: 1.00
-AUTHOR: Oleg Dzhimiev <oleg@elphel.com>
-LICENSE: AGPL, see http://www.gnu.org/licenses/agpl.txt
-Copyright (C) 2016 Elphel, Inc.
-*/
+/** 
+ * @file update_software.js
+ * @brief update software on nand flash
+ * @copyright Copyright (C) 2016 Elphel Inc.
+ * @author Oleg Dzhimiev <oleg@elphel.com>
+ *
+ * @licstart  The following is the entire license notice for the 
+ * JavaScript code in this page.
+ *
+ *   The JavaScript code in this page is free software: you can
+ *   redistribute it and/or modify it under the terms of the GNU
+ *   General Public License (GNU GPL) as published by the Free Software
+ *   Foundation, either version 3 of the License, or (at your option)
+ *   any later version.  The code is distributed WITHOUT ANY WARRANTY;
+ *   without even the implied warranty of MERCHANTABILITY or FITNESS
+ *   FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+ *
+ *   As additional permission under GNU GPL version 3 section 7, you
+ *   may distribute non-source (e.g., minimized or compacted) forms of
+ *   that code without the copy of the GNU GPL normally required by
+ *   section 4, provided you include this license notice and a URL
+ *   through which recipients can access the Corresponding Source.
+ *
+ *  @licend  The above is the entire license notice
+ *  for the JavaScript code in this page.
+ */

 var blink_intvl;