version 0.9.1 berly

LobbyOS · Aug 8, 2016 · c63949f · c63949f
1 parent 9cd9f34
commit c63949f
Show file tree

Hide file tree

Showing 93 changed files with 3,533 additions and 3,039 deletions.
diff --git a/NOTICE.md b/NOTICE.md
@@ -1,5 +1,145 @@
 # Developers Behind This Project
 
-* Subin Siby - http://subinsb.com
-* Suriyaa Kudo - http://j.mp/ItsSuriyaa
-* Anandu B Ajith - http://anandu.net/
+* [Subin Siby](http://subinsb.com)
+* [Suriyaa Kudo](http://j.mp/ItsSuriyaa)
+* [Anandu B Ajith](http://anandu.net/)
+* [Sri Harsha Chilakapati](https://github.com/sriharshachilakapati)
+
+## LICENSES
+
+### Ubuntu Font
+
+-------------------------------
+UBUNTU FONT LICENCE Version 1.0
+-------------------------------
+
+PREAMBLE
+This licence allows the licensed fonts to be used, studied, modified and
+redistributed freely. The fonts, including any derivative works, can be
+bundled, embedded, and redistributed provided the terms of this licence
+are met. The fonts and derivatives, however, cannot be released under
+any other licence. The requirement for fonts to remain under this
+licence does not require any document created using the fonts or their
+derivatives to be published under this licence, as long as the primary
+purpose of the document is not to be a vehicle for the distribution of
+the fonts.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this licence and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Original Version" refers to the collection of Font Software components
+as received under this licence.
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to
+a new environment.
+
+"Copyright Holder(s)" refers to all individuals and companies who have a
+copyright ownership of the Font Software.
+
+"Substantially Changed" refers to Modified Versions which can be easily
+identified as dissimilar to the Font Software by users of the Font
+Software comparing the Original Version with the Modified Version.
+
+To "Propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification and with or without charging
+a redistribution fee), making available to the public, and in some
+countries other activities as well.
+
+PERMISSION & CONDITIONS
+This licence does not grant any rights under trademark law and all such
+rights are reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to propagate the Font Software, subject to
+the below conditions:
+
+1) Each copy of the Font Software must contain the above copyright
+notice and this licence. These can be included either as stand-alone
+text files, human-readable headers or in the appropriate machine-
+readable metadata fields within text or binary files as long as those
+fields can be easily viewed by the user.
+
+2) The font name complies with the following:
+(a) The Original Version must retain its name, unmodified.
+(b) Modified Versions which are Substantially Changed must be renamed to
+avoid use of the name of the Original Version or similar names entirely.
+(c) Modified Versions which are not Substantially Changed must be
+renamed to both (i) retain the name of the Original Version and (ii) add
+additional naming elements to distinguish the Modified Version from the
+Original Version. The name of such Modified Versions must be the name of
+the Original Version, with "derivative X" where X represents the name of
+the new work, appended to that name.
+
+3) The name(s) of the Copyright Holder(s) and any contributor to the
+Font Software shall not be used to promote, endorse or advertise any
+Modified Version, except (i) as required by this licence, (ii) to
+acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
+their explicit written permission.
+
+4) The Font Software, modified or unmodified, in part or in whole, must
+be distributed entirely under this licence, and must not be distributed
+under any other licence. The requirement for fonts to remain under this
+licence does not affect any document created using the Font Software,
+except any version of the Font Software extracted from a document
+created using the Font Software may only be distributed under this
+licence.
+
+TERMINATION
+This licence becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.
+
+### jQuery
+
+jQuery JavaScript Library v1.11.1
+http://jquery.com/
+
+Includes Sizzle.js
+http://sizzlejs.com/
+
+Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
+Released under the MIT license
+http://jquery.org/license
+
+### Composer
+
+See includes/src/vendor/composer/LICENSE
+
+### The Francium Project
+
+Copyright Subin Siby
+
+Released Under Apache License - LICENSE.md
+
+### Requests
+
+Copyright (c) 2010-2012 Ryan McCue and contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/README.md b/README.md
@@ -2,11 +2,17 @@ Lobby
 =====
 
 [![Join the chat at https://gitter.im/subins2000/lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/subins2000/lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 [![Build Status](https://travis-ci.org/LobbyOS/lobby.svg?branch=dev)](https://travis-ci.org/LobbyOS/lobby)
+[<img src="https://upload.wikimedia.org/wikipedia/commons/0/06/Facebook.svg" width="80">](https://www.facebook.com/groups/LobbyOS)
 
 The default branch is `dev` which means, most stuff are in development mode and can't be guaranteed to work.
 
+[Learn More here](https://lobby.subinsb.com)
+
+[Download & Install](https://lobby.subinsb.com/download)
+
+[Documentation](https://lobby.subinsb.com/docs)
+
 ## Branches
 
 ### master
@@ -19,13 +25,43 @@ The latest developments are in this branch.
 
 WARNING (Unstable) - This repo is for testing and may contain additional components (apps, themes etc.) that are under testing and does not represent the downloadable version of Lobby. You can get the stable version from [here](http://lobby.subinsb.com/download)
 
-[Learn More here](https://lobby.subinsb.com)
-
-[Download & Install](https://lobby.subinsb.com/download)
-
-[Documentation](https://lobby.subinsb.com/docs)
-
 ## Some things to note
 
 * The git repo has apps along with **ledit** that is in development. No guarantee that it will work.
 * The docs are not complete and I will be glad if you help. :-)
+
+## To Do
+
+* Documentation
+* "How To Create An App" Tutorials
+* Submit More Innovative Apps to Lobby Store
+
+## How To Do A New Release
+
+* Modify `lobby.json`
+* Remove logs, apps except **ledit**
+* Get the list of files removed :
+  ```bash
+  git diff --name-status master dev > removeFiles.txt
+  ```
+  You can get the hashes from `git log` too.
+
+  Then replace contents of removeFiles.txt :
+
+  ```regex
+  [M|A|T]	(.*?)\n  ->  ""
+  D	  ->  ""
+  ```
+
+  Extract only deleted files `D <file>` and paste it in `contents/update/removeFiles.php`
+* Change Lobby server inside `includes/config.php`
+* Zip the folder
+
+## Blog
+
+New page in `lobby/version-0-`
+
+## Server
+
+* Update version, release notes, blog post URL in App.php of lobby-server app
+* Add download url in api.php in src/Page of lobby-server app
diff --git a/admin/ajax/install-app-bg.php b/admin/ajax/install-app-bg.php
@@ -16,13 +16,13 @@
 use \Lobby\FS;
 use \Lobby\Update;
 
-if($argv[1] === \Lobby::$lid && isset($argv[3])){
+if($argv[1] === \Lobby::getLID() && isset($argv[3])){
   $appID = $argv[3];
 
   function sendStatusToLobby($statusID, $status){
     global $appID;
 
-    saveJSONOption("lobby_app_downloads", array(
+    Lobby\DB::saveJSONOption("lobby_app_downloads", array(
       $appID => array(
         "statusID" => $statusID,
         "status" => $status,
@@ -93,7 +93,7 @@ function sendStatusToLobby($statusID, $status){
       $App = new Apps($appID);
       $App->enableApp();
 
-      sendStatusToLobby("install_finished", "Installed <b>$appID</b>.<cl/><a href='". $App->info["URL"] ."' class='btn green'>Open App</a>");
+      sendStatusToLobby("install_finished", "Installed <b>$appID</b>.<cl/><a href='". $App->info["url"] ."' class='btn green'>Open App</a>");
     }
   }catch(\Exception $e){
     sendStatusToLobby("error", $e->getMessage());

diff --git a/admin/ajax/install-app.php b/admin/ajax/install-app.php
@@ -1,9 +1,9 @@
 <?php
 use \Fr\Process;
 
-$appID = \H::i("id", null, "POST");
+$appID = \Request::postParam("id");
 
-if(!csrf()){
+if(!CSRF::check()){
   echo json_encode(array(
     "statusID" => "error",
     "status" => "CSRF Token didn't match"
@@ -17,13 +17,13 @@
   /**
    * A queue of App downloads
    */
-  $appInstallQueue = getJSONOption("lobby_app_downloads");
+  $appInstallQueue = Lobby\DB::getJSONOption("lobby_app_downloads");
 
   /**
    * If the $appID is in the queue, then give the download status of it
    * If the updated value is less than 20 seconds ago, then restart the download
    */
-  if(isset($appInstallQueue[$appID]) && $appInstallQueue[$appID]["updated"] > strtotime("-20 seconds")){
+  if(isset($appInstallQueue[$appID]) && $appInstallQueue[$appID]["updated"] > strtotime("-35 seconds")){
     echo json_encode(array(
       "statusID" => $appInstallQueue[$appID]["statusID"],
       "status" => $appInstallQueue[$appID]["status"]
@@ -48,7 +48,7 @@
       $Process = new Process(Process::getPHPExecutable(), array(
         "arguments" => array(
           L_DIR . "/admin/ajax/install-app-bg.php",
-          \Lobby::$lid,
+          \Lobby::getLID(),
           base64_encode(serialize($_SERVER)),
           $appID
         )