From 3da2090e4bbfaeda0e66a69e83092a5705919404 Mon Sep 17 00:00:00 2001
From: daeks <daeks@gmx.net>
Date: Wed, 7 Aug 2013 17:36:21 +0200
Subject: [PATCH 1/3] first commit

---
 components/install/process.php                |   7 +-
 components/market/class.market.php            | 291 ++++++++++++++++
 .../{theme_manager => market}/controller.php  |  24 +-
 .../{plugin_manager => market}/dialog.php     | 139 ++++----
 components/{plugin_manager => market}/init.js |  48 +--
 .../plugin_manager/class.plugin_manager.php   | 200 -----------
 components/plugin_manager/controller.php      |  71 ----
 components/right_bar.json                     |  11 +-
 .../theme_manager/class.theme_manager.php     | 200 -----------
 components/theme_manager/dialog.php           | 313 ------------------
 components/theme_manager/init.js              | 134 --------
 config.example.php                            |   7 +-
 plugins/README.md                             |   5 -
 themes/default/images/new.png                 | Bin 0 -> 2782 bytes
 14 files changed, 401 insertions(+), 1049 deletions(-)
 create mode 100644 components/market/class.market.php
 rename components/{theme_manager => market}/controller.php (77%)
 rename components/{plugin_manager => market}/dialog.php (66%)
 rename components/{plugin_manager => market}/init.js (74%)
 delete mode 100644 components/plugin_manager/class.plugin_manager.php
 delete mode 100644 components/plugin_manager/controller.php
 delete mode 100644 components/theme_manager/class.theme_manager.php
 delete mode 100644 components/theme_manager/dialog.php
 delete mode 100644 components/theme_manager/init.js
 delete mode 100644 plugins/README.md
 create mode 100644 themes/default/images/new.png

diff --git a/components/install/process.php b/components/install/process.php
index 7164aa3..b5324fe 100644
--- a/components/install/process.php
+++ b/components/install/process.php
@@ -208,11 +208,8 @@ define("WORKSPACE", BASE_PATH . "/workspace");
 // URLS
 define("WSURL", BASE_URL . "/workspace");
 
-// Plugin Market
-//define("PMURL", "http://codiad.com/plugins.json");
-
-// Theme Market
-//define("TMURL", "http://codiad.com/themes.json");
+// Marketplace
+//define("MARKETURL", "http://market.codiad.com");
 
 // Update Check
 //define("UPDATEURL", "http://update.codiad.com/?v={VER}&o={OS}&p={PHP}&w={WEB}&a={ACT}");
diff --git a/components/market/class.market.php b/components/market/class.market.php
new file mode 100644
index 0000000..f045977
--- /dev/null
+++ b/components/market/class.market.php
@@ -0,0 +1,291 @@
+<?php
+
+/*
+*  Copyright (c) Codiad & daeks (codiad.com), distributed
+*  as-is and without warranty under the MIT License. See
+*  [root]/license.txt for more. This information must remain intact.
+*/
+
+require_once('../../common.php');
+
+class Market extends Common {
+
+    //////////////////////////////////////////////////////////////////
+    // PROPERTIES
+    //////////////////////////////////////////////////////////////////
+
+    public $local       = array();
+    public $url         = 'http://market.codiad.com';
+    public $remote      = null;
+    public $tmp         = array();
+    public $old         = '';
+
+    //////////////////////////////////////////////////////////////////
+    // METHODS
+    //////////////////////////////////////////////////////////////////
+
+    // -----------------------------||----------------------------- //
+
+    //////////////////////////////////////////////////////////////////
+    // Construct
+    //////////////////////////////////////////////////////////////////
+
+    public function __construct(){
+        if(!file_exists(DATA.'/plugins.php')) {
+          saveJSON('plugins.php', array(''));
+        }
+        if(!file_exists(DATA.'/themes.php')) {
+          saveJSON('themes.php', array(''));
+        }
+        if(!file_exists(DATA.'/cache')) {
+          mkdir(DATA.'/cache');
+        }
+        $this->local['plugins'] = getJSON('plugins.php');
+        $this->local['themes'] = getJSON('themes.php');
+        $this->url = Common::getConstant('MARKETURL', $this->url);
+        if(!file_exists(DATA.'/cache/market.current')) {
+          file_put_contents(DATA.'/cache/market.current',file_get_contents($this->url));
+          copy(DATA.'/cache/market.current',DATA.'/cache/market.last');
+        } else {
+          if (time()-filemtime(DATA.'/cache/market.current') > 24 * 3600) {
+            copy(DATA.'/cache/market.current',DATA.'/cache/market.last');
+            file_put_contents(DATA.'/market.cache',file_get_contents($this->url));
+          }
+        }
+        $this->old = json_decode(file_get_contents(DATA.'/cache/market.last'),true);
+        $this->remote = json_decode(file_get_contents(DATA.'/cache/market.current'),true);
+        foreach($this->remote as $key=>$data) {
+          if(substr($data['url'],-4) == '.git') {
+              $data['url'] = substr($data['url'],0,-4);
+          }
+          if(file_exists(BASE_PATH.'/'.$data['type'].substr($data['url'],strrpos($data['url'],'/')))) {
+              $data['folder'] = substr($data['url'],strrpos($data['url'],'/')+1);
+          } else {
+            if(file_exists(BASE_PATH.'/'.$data['type'].substr($data['url'],strrpos($data['url'],'/')).'-master')) {
+                $data['folder'] = substr($data['url'],strrpos($data['url'],'/')+1).'-master';
+            }
+          }
+          
+          if(isset($data['folder'])) {
+              $local = json_decode(file_get_contents(BASE_PATH.'/'.$data['type'].'/'.$data['folder'].'/'.rtrim($data['type'],'s').'.json'),true);
+              $remote = json_decode(file_get_contents(str_replace('github.com','raw.github.com',$data['url']).'/master/'.rtrim($data['type'],'s').'.json'),true);
+              $data['version'] = $local[0]['version'];
+              if($remote[0]['version'] != $local[0]['version']) {
+                $data['update'] = $remote[0]['version'];
+              }
+          }
+
+          $found = false;
+          foreach($this->old as $key=>$old) {
+            if($old['name'] == $data['name']) {
+              $found = true;
+              break;
+            }
+          }
+          
+          if(!$found && !isset($data['folder'])) {
+            $data['new'] = '1';
+          }
+             
+          array_push($this->tmp, $data);
+        }
+        
+        $this->remote = $this->tmp;
+        
+        // Scan plugins directory for missing plugins
+        foreach (scandir(PLUGINS) as $fname){
+                if($fname == '.' || $fname == '..' ){
+                    continue;
+                }
+                if(is_dir(PLUGINS.'/'.$fname)){
+                    $found = false;
+                    foreach($this->remote as $key=>$data) {
+                      if(isset($data['folder']) && $data['folder'] == $fname) {
+                        $found = true;
+                        break;
+                      }
+                    }
+                    if(!$found && file_exists(PLUGINS . "/" . $fname . "/plugin.json")) {
+                        $data = file_get_contents(PLUGINS . "/" . $fname . "/plugin.json");
+                        $data = json_decode($data,true);
+                        $data[0]['name'] = $fname;
+                        $data[0]['type'] = 'plugins';
+                        $data[0]['image'] = '';
+                        $data[0]['count'] = -1;
+                        $data[0]['description'] = 'Manual Installation found.';
+                        array_push($this->remote, $data[0]);
+                    }
+                }
+         }
+         
+        // Scan theme directory for missing plugins
+        foreach (scandir(THEMES) as $fname){
+                if($fname == '.' || $fname == '..' || $fname == 'default'){
+                    continue;
+                }
+                if(is_dir(THEMES.'/'.$fname)){
+                    $found = false;
+                    foreach($this->remote as $key=>$data) {
+                      if(isset($data['folder']) && $data['folder'] == $fname) {
+                        $found = true;
+                        break;
+                      }
+                    }
+                    if(!$found && file_exists(THEMES . "/" . $fname . "/theme.json")) {
+                        $data = file_get_contents(THEMES . "/" . $fname . "/theme.json");
+                        $data = json_decode($data,true);
+                        $data[0]['name'] = $fname;
+                        $data[0]['type'] = 'themes';
+                        $data[0]['image'] = '';
+                        $data[0]['count'] = -1;
+                        $data[0]['description'] = 'Manual Installation found.';
+                        array_push($this->remote, $data[0]);
+                    }
+                }
+         }
+    }
+
+    //////////////////////////////////////////////////////////////////
+    // Deactivate Plugin
+    //////////////////////////////////////////////////////////////////
+
+    public function Deactivate($type, $name){
+        saveJSON($type.'.php',array_diff($this->local[$type], array($name)));
+        echo formatJSEND("success",null);
+    }
+
+    //////////////////////////////////////////////////////////////////
+    // Activate Plugin
+    //////////////////////////////////////////////////////////////////
+
+    public function Activate($type, $name){
+        $this->local[$type][] = $name;
+        saveJSON($type.'.php',$this->local[$type]);
+        echo formatJSEND("success",null);
+    }
+
+    //////////////////////////////////////////////////////////////////
+    // Install Plugin
+    //////////////////////////////////////////////////////////////////
+
+    public function Install($type, $name, $repo){
+        if(substr($repo,-4) == '.git') {
+            $repo = substr($repo,0,-4);
+        }
+        if(file_put_contents(BASE_PATH.'/'.$type.'/'.$name.'.zip', fopen($repo.'/archive/master.zip', 'r'))) {
+            $zip = new ZipArchive;
+            $res = $zip->open(BASE_PATH.'/'.$type.'/'.$name.'.zip');
+            // open downloaded archive
+            if ($res === TRUE) {
+              // extract archive
+              if($zip->extractTo(BASE_PATH.'/'.$type) === true) {
+                $zip->close();
+              } else {
+                die(formatJSEND("error","Unable to open ".$name.".zip"));
+              }
+            } else {
+                die(formatJSEND("error","ZIP Extension not found"));
+            }
+
+            unlink(BASE_PATH.'/'.$type.'/'.$name.'.zip');
+            // Response
+            $this->Activate($type, substr($repo, strrpos($repo, "/") + 1)."-master");
+        } else {
+            die(formatJSEND("error","Unable to download ".$repo));
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////
+    // Remove Plugin
+    //////////////////////////////////////////////////////////////////
+
+    public function Remove($type, $name){
+        function rrmdir($path){
+            return is_file($path)?
+            @unlink($path):
+            @array_map('rrmdir',glob($path.'/*'))==@rmdir($path);
+        }
+
+        rrmdir(BASE_PATH.'/'.$type.'/'.$name);
+        $this->Deactivate($type, $name);
+    }
+
+    //////////////////////////////////////////////////////////////////
+    // Update Plugin
+    //////////////////////////////////////////////////////////////////
+
+    public function Update($type, $name){
+        function rrmdir($path){
+            return is_file($path)?
+            @unlink($path):
+            @array_map('rrmdir',glob($path.'/*'))==@rmdir($path);
+        }
+
+        function cpy($source, $dest, $ign){
+            if(is_dir($source)) {
+                $dir_handle=opendir($source);
+                while($file=readdir($dir_handle)){
+                    if(!in_array($file, $ign)){
+                        if(is_dir($source."/".$file)){
+                            if(!file_exists($dest."/".$file)) {
+                              mkdir($dest."/".$file);
+                            }
+                            cpy($source."/".$file, $dest."/".$file, $ign);
+                        } else {
+                            copy($source."/".$file, $dest."/".$file);
+                        }
+                    }
+                }
+                closedir($dir_handle);
+            } else {
+                copy($source, $dest);
+            }
+        }
+
+        if(file_exists(BASE_PATH.'/'.$type.'/'.$name.'/plugin.json')) {
+            $data = json_decode(file_get_contents(BASE_PATH.'/'.$type.'/'.$name.'/'.rtrim($type, "s").'.json'),true);
+            $local[0]['url'] = rtrim($local[0]['url'], ".git");
+            $local[0]['url'] .= '/archive/master.zip';
+
+            $ign = array(".","..");
+            if(isset($local[0]['exclude'])) {
+              foreach(explode(",",$local[0]['exclude']) as $exclude) {
+                array_push($ign, $exclude);
+              }
+            }
+
+            if(file_exists(BASE_PATH.'/'.$type.'/_'.session_id()) || mkdir(BASE_PATH.'/'.$type.'/_'.session_id())) {
+              if(file_put_contents(BASE_PATH.'/'.$type.'/_'.session_id().'/'.$name.'.zip', fopen($local[0]['url'], 'r'))) {
+                  $zip = new ZipArchive;
+                  $res = $zip->open(BASE_PATH.'/'.$type.'/_'.session_id().'/'.$name.'.zip');
+                  // open downloaded archive
+                  if ($res === TRUE) {
+                    // extract archive
+                    if($zip->extractTo(BASE_PATH.'/'.$type.'/_'.session_id().'') === true) {
+                      $zip->close();
+                      $srcname = $name;
+                      if(substr($srcname, -6) != "master") {
+                        $srcname = $srcname.'-master';
+                      }
+                      cpy(BASE_PATH.'/'.$type.'/_'.session_id().'/'.$srcname, BASE_PATH.'/'.$type.'/'.$name, $ign);
+                    } else {
+                      die(formatJSEND("error","Unable to open ".$name.".zip"));
+                    }
+                  } else {
+                      die(formatJSEND("error","ZIP Extension not found"));
+                  }
+
+                  rrmdir(BASE_PATH.'/'.$type.'/_'.session_id());
+                  // Response
+                  echo formatJSEND("success",null);
+              } else {
+                  die(formatJSEND("error","Unable to download ".$repo));
+              }
+            } else {
+              die(formatJSEND("error","Unable to create temp dir "));
+            }
+        } else {
+            echo formatJSEND("error","Unable to find ".$name);
+        }
+    }
+}
diff --git a/components/theme_manager/controller.php b/components/market/controller.php
similarity index 77%
rename from components/theme_manager/controller.php
rename to components/market/controller.php
index c7be0aa..ac6f75d 100644
--- a/components/theme_manager/controller.php
+++ b/components/market/controller.php
@@ -8,7 +8,7 @@
 
 
     require_once('../../common.php');
-    require_once('class.theme_manager.php');
+    require_once('class.market.php');
 
     //////////////////////////////////////////////////////////////////
     // Verify Session or Key
@@ -16,55 +16,55 @@
 
     checkSession();
 
-    $Theme_manager = new Theme_manager();
+    $market = new Market();
     
     //////////////////////////////////////////////////////////////////
-    // Deactivate Theme
+    // Deactivate
     //////////////////////////////////////////////////////////////////
 
     if($_GET['action']=='deactivate'){
         if(checkAccess()) {
-            $Theme_manager->Deactivate($_GET['name']);
+            $market->Deactivate($_GET['type'], $_GET['name']);
         }
     }
     
     //////////////////////////////////////////////////////////////////
-    // Activate Theme
+    // Activate
     //////////////////////////////////////////////////////////////////
 
     if($_GET['action']=='activate'){
         if(checkAccess()) {
-            $Theme_manager->Activate($_GET['name']);
+            $market->Activate($_GET['type'], $_GET['name']);
         }
     }
     
     //////////////////////////////////////////////////////////////////
-    // Install Theme
+    // Install
     //////////////////////////////////////////////////////////////////
 
     if($_GET['action']=='install'){
         if(checkAccess()) {
-            $Theme_manager->Install($_GET['name'], $_GET['repo']);
+            $market->Install($_GET['type'], $_GET['name'], $_GET['repo']);
         }
     }
     
     //////////////////////////////////////////////////////////////////
-    // Remove Theme
+    // Remove 
     //////////////////////////////////////////////////////////////////
 
     if($_GET['action']=='remove'){
         if(checkAccess()) {
-            $Theme_manager->Remove($_GET['name']);
+            $market->Remove($_GET['type'], $_GET['name']);
         }
     }
     
     //////////////////////////////////////////////////////////////////
-    // Update Theme
+    // Update
     //////////////////////////////////////////////////////////////////
 
     if($_GET['action']=='update'){
         if(checkAccess()) {
-            $Theme_manager->Update($_GET['name']);
+            $market->Update($_GET['type'], $_GET['name']);
         }
     }
 
diff --git a/components/plugin_manager/dialog.php b/components/market/dialog.php
similarity index 66%
rename from components/plugin_manager/dialog.php
rename to components/market/dialog.php
index a6bb894..cb00bae 100644
--- a/components/plugin_manager/dialog.php
+++ b/components/market/dialog.php
@@ -18,93 +18,88 @@
     switch($_GET['action']){
     
         //////////////////////////////////////////////////////////////
-        // Plugin Market
+        // Marketplace
         //////////////////////////////////////////////////////////////
         
-        case 'market':
+        case 'list':
         
-            require_once('class.plugin_manager.php');
-            $pm = new Plugin_manager();
-            $market = $pm->Market();
+            require_once('class.market.php');
+            $market = new Market();
             ?>
-            <label><?php i18n("Plugin Market"); ?></label>
-            <div id="plugin-list">
+            <label><?php i18n("Codiad Marketplace"); ?></label>
+            <div id="market-list">
             <table width="100%">
                 <tr>
-                    <th><?php i18n("Plugin Name"); ?></th>
-                    <th><?php i18n("Description"); ?></th>
-                    <th><?php i18n("Author"); ?></th>
-                    <th><?php i18n("Download"); ?></th>
+                    <th valign="middle"><button style="margin:0;" class="btn-left" onclick="codiad.market.list();return false;">All</button><button class="btn-mid" style="margin:0;"  onclick="codiad.market.list('plugins');return false;">Plugins</button><button class="btn-right" style="margin:0;" onclick="codiad.market.list('themes');return false;">Themes</button></th>
+                    <th valign="middle" width="30%"><input style="margin:0;display:inline" placeholder="Search"></th>
                 </tr>
+             </table>
+             <div style="height: 450px; width: 100%; overflow-y: auto; overflow-x: hidden;">
+             <table width="100%">
             <?php
-            if($market != '') {
-                $marketlist = array();
-                foreach($market as $plugin) {
-                    if(!isset($plugin['category']) || $plugin['category'] == '') {
-                        $plugin['category'] = 'Common';
+                $marketplace = array();
+                foreach($market->remote as $data) {
+                    if(!isset($data['category']) || $data['category'] == '') {
+                        $data['category'] = 'Common';
                     }
-                    if(!array_key_exists($plugin['category'], $marketlist)) {
-                        $marketlist[$plugin['category']] = array();
+                    if(!array_key_exists($data['type'], $marketplace)) {
+                        $marketplace[$data['type']] = array();
+                    }
+                    if(!array_key_exists($data['category'], $marketplace[$data['type']])) {
+                        $marketplace[$data['type']][$data['category']] = array();
                     } 
-                    array_push($marketlist[$plugin['category']], $plugin);
+                    array_push($marketplace[$data['type']][$data['category']], $data);
                 }
+                ksort($marketplace);
                 
-                ksort($marketlist);
-                $isDownloadable = (is_writeable(PLUGINS) && extension_loaded('zip') && extension_loaded('openssl') && ini_get('allow_url_fopen') == 1);
+                function sort_name($a, $b) { return strnatcmp($a['name'], $b['name']); }
                 
-                foreach($marketlist as $category=>$pluginlist) {
-                    ?>
-                    <tr>
-                    <th colspan="4"><?php echo $category;?></th>
-                    </tr>
-                    <?php
-                    foreach($pluginlist as $plugin) {
-                        if(substr($plugin['url'],-4) == '.git') {
-                            $plugin['url'] = substr($plugin['url'],0,-4);
-                        }
-                    
-                        ?>
-                        <tr>
-                            <td><?php echo $plugin['name']; ?></td>
-                            <td width="400px"><?php echo $plugin['description']; ?></td>
-                            <td><?php echo $plugin['author']; ?></td>
-                            <?php
-                                if(file_exists(PLUGINS.substr($plugin['url'],strrpos($plugin['url'],'/'))) || file_exists(PLUGINS.substr($plugin['url'],strrpos($plugin['url'],'/')).'-master')) {
-                                    ?>
-                                    <td><div class="icon-check icon"></div></td>
-                                    <?php
-                                } else {
-                                    if(checkAccess()){
-                                        if($isDownloadable) {
-                                        ?>
-                                         <td><table style="text-align:center;border-spacing:0;border-collapse:collapse;"><tr><td style="border: 0;padding: 0;"><a class="icon-download icon" onclick="codiad.plugin_manager.install('<?php echo $plugin['name']; ?>','<?php echo $plugin['url']; ?>');return false;"></a></td><td style="border: 0;padding: 0;"><a class="icon-github icon" onclick="codiad.plugin_manager.openInBrowser('<?php echo $plugin['url']; ?>');return false;"></a></td></tr></table></td>   
-                                        <?php       
-                                        } else {
-                                        ?>
-                                        <td><a class="icon-download icon" onclick="codiad.plugin_manager.openInBrowser('<?php echo $plugin['url']; ?>');return false;"></a></td>
-                                        <?php
-                                        }                             
-                                    } else {
-                                        ?>
-                                        <td><div class="icon-block icon"></div></td>
-                                        <?php
-                                    }
-                                }
-                            ?>
-                        </tr>
-                        <?php
+                foreach($marketplace as $type=>$data) {
+                    ksort($data);
+                    if($_GET['type'] == 'undefined' || $_GET['type'] == $type) {
+                      foreach($data as $category=>$subdata) {
+                          usort($subdata, 'sort_name');
+                          foreach($subdata as $addon){
+                            echo '<tr><td><div style="position:relative;height:110px">';
+                            $left = 0;
+                            if($addon['image'] != '') {
+                              echo '<div style="margin-top:5px;"><a onclick="codiad.market.openInBrowser(\''.$addon['image'].'\');return false;"><img src="'.$addon['image'].'" width="150" height="100"></a></div>';
+                              $left = 150;
+                            } else {
+                              if(isset($addon['new'])) {
+                                $left = $left + 40;
+                              }
+                            }
+                            if(isset($addon['new'])) {
+                                echo '<div style="position:absolute;top:0px;left:0px;z-index:10000;"><img src="./themes/default/images/new.png"></div>';
+                            }
+                            echo '<div style="position:absolute;top:0px;left:'.($left+10).'px;"><a style="font-weight:bold;" onclick="codiad.market.openInBrowser(\''.$addon['url'].'\');return false;">'.$addon['name'].'</a></div>';
+                            echo '<div style="position:absolute;top:15px;left:'.($left+10).'px;"><font style="font-size:10px">'.ucfirst(rtrim($type,'s')).' - '.ucfirst($category).' | <a style="font-weight:bold;text-decoration:underline;" onclick="codiad.market.openInBrowser(\'https://github.com/'.$addon['author'].'\');return false;">'.$addon['author'].'</a> | '.$addon['count'].' Users</font></div>';
+                            echo '<div style="position:absolute;top:25px;left:'.($left+5).'px;"><pre style="height:60px;color:#a8a6a8;width:'.(550-$left).'px;white-space: pre-wrap;">'.$addon['description'].'</pre></div>';
+                            if(isset($addon['version'])) {
+                              if(!isset($addon['update'])) {
+                                  echo '<div style="position:absolute;top:5px;left:575px;"><font style="color:green">Latest Version v'.$addon['version'].'</font></div>';
+                              } else {
+                                 echo '<div style="position:absolute;top:-5px;left:575px;"><button style="color: blue; width:140px" onclick="codiad.market.update(\''.$type.'\', \''.$addon['folder'].'\');return false;">Update '.ucfirst(rtrim($type,'s')).'</button></div>';
+                              }
+                              echo '<div style="position:absolute;top:30px;left:575px;"><button style="color: red; width:140px" onclick="codiad.market.remove(\''.$type.'\', \''.$addon['folder'].'\');return false;">Delete '.ucfirst(rtrim($type,'s')).'</button><div>';
+                            } else {
+                              echo '<div style="position:absolute;top:-5px;left:575px;"><button style="width:140px" onclick="codiad.market.install(\''.$type.'\', \''.$addon['name'].'\',\''.$addon['url'].'\');return false;">Install '.ucfirst(rtrim($type,'s')).'</button><div>';
+                            }
+                            echo '</div></td></tr>';
+                          }
+                      }
                     }
-                }
-            } else {
-                ?>
-                <tr><td colspan="4"><?php i18n("Plugin Market currently unavailable."); ?></td></tr>
-                <?php
-            }
-            
+                }            
             ?>
-            </table>
+            </table></div>
             </div>
-            <button class="btn-left" onclick="codiad.plugin_manager.list();return false;"><?php i18n("Installed Plugins"); ?></button><button class="btn-mid" onclick="codiad.plugin_manager.check();return false;"><?php i18n("Update Check"); ?></button><button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
+            <table width="100%">
+                <tr>
+                    <th valign="middle"><input style="margin:0;display:inline" placeholder="Enter GitHub Repository Url..."></th>
+                    <th valign="middle" align="right" width="222px"><button class="btn-left" onclick="codiad.market.list();return false;"><?php i18n("Install Manually"); ?></button><button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button></th>
+                </tr>
+             </table>
             <?php
             
             break;
@@ -113,7 +108,7 @@
         // List Plugins
         //////////////////////////////////////////////////////////////
         
-        case 'list':
+        case 'list2':
             ?>
             <label><?php i18n("Plugin List"); ?></label>
             <div id="plugin-list">
diff --git a/components/plugin_manager/init.js b/components/market/init.js
similarity index 74%
rename from components/plugin_manager/init.js
rename to components/market/init.js
index cb3b01a..2284cb1 100644
--- a/components/plugin_manager/init.js
+++ b/components/market/init.js
@@ -9,16 +9,15 @@
     var codiad = global.codiad;
 
     $(function() {
-        codiad.plugin_manager.init();
+        codiad.market.init();
     });
 
-    codiad.plugin_manager = {
+    codiad.market = {
 
-        controller: 'components/plugin_manager/controller.php',
-        dialog: 'components/plugin_manager/dialog.php',
+        controller: 'components/market/controller.php',
+        dialog: 'components/market/dialog.php',
 
-        init: function() {
-           
+        init: function() {  
         },
         
         //////////////////////////////////////////////////////////////////
@@ -32,13 +31,13 @@
         },
 
         //////////////////////////////////////////////////////////////////
-        // Open the plugin manager dialog
+        // Open marketplace
         //////////////////////////////////////////////////////////////////
 
-        list: function() {
+        list: function(type) {
             $('#modal-content form')
                 .die('submit'); // Prevent form bubbling
-            codiad.modal.load(500, this.dialog + '?action=list');
+            codiad.modal.load(800, this.dialog + '?action=list&type='+type);
         },
         
         //////////////////////////////////////////////////////////////////
@@ -56,13 +55,13 @@
         },
         
         //////////////////////////////////////////////////////////////////
-        // Install Plugin
+        // Install
         //////////////////////////////////////////////////////////////////
 
-        install: function(name, repo) {
+        install: function(type, name, repo) {
             var _this = this;
             $('#modal-content').html('<div id="modal-loading"></div><div align="center">Installing ' + name + '...</div><br>');
-            $.get(_this.controller + '?action=install&name=' + name + '&repo=' + repo, function(data) {
+            $.get(_this.controller + '?action=install&type=' + type + '&name=' + name + '&repo=' + repo, function(data) {
                 var response = codiad.jsend.parse(data);
                 if (response == 'error') {
                     codiad.message.error(response.message);
@@ -73,12 +72,13 @@
         },
         
         //////////////////////////////////////////////////////////////////
-        // Remove Plugin
+        // Remove
         //////////////////////////////////////////////////////////////////
 
-        remove: function(name) {
+        remove: function(type, name) {
             var _this = this;
-            $.get(_this.controller + '?action=remove&name=' + name, function(data) {
+            $('#modal-content').html('<div id="modal-loading"></div><div align="center">Deleting ' + name + '...</div><br>');
+            $.get(_this.controller + '?action=remove&type=' + type + '&name=' + name, function(data) {
                 var response = codiad.jsend.parse(data);
                 if (response == 'error') {
                     codiad.message.error(response.message);
@@ -88,13 +88,13 @@
         },
         
         //////////////////////////////////////////////////////////////////
-        // Update Plugin
+        // Update
         //////////////////////////////////////////////////////////////////
 
-        update: function(name) {
+        update: function(type, name) {
             var _this = this;
             $('#modal-content').html('<div id="modal-loading"></div><div align="center">Updating ' + name + '...</div><br>');
-            $.get(_this.controller + '?action=update&name=' + name, function(data) {
+            $.get(_this.controller + '?action=update&type=' + type + '&name=' + name, function(data) {
                 var response = codiad.jsend.parse(data);
                 if (response == 'error') {
                     codiad.message.error(response.message);
@@ -104,12 +104,12 @@
         },
 
         //////////////////////////////////////////////////////////////////
-        // Activate Plugin
+        // Activate
         //////////////////////////////////////////////////////////////////
 
-        activate: function(name) {
+        activate: function(type, name) {
             var _this = this;
-            $.get(this.controller + '?action=activate&name=' + name, function(data) {
+            $.get(this.controller + '?action=activate&type=' + type + '&name=' + name, function(data) {
                 var response = codiad.jsend.parse(data);
                 if (response != 'error') {
                     _this.list();
@@ -118,12 +118,12 @@
         },
 
         //////////////////////////////////////////////////////////////////
-        // Deactivate Plugin
+        // Deactivate
         //////////////////////////////////////////////////////////////////
 
-        deactivate: function(name) {
+        deactivate: function(type, name) {
             var _this = this;
-            $.get(this.controller + '?action=deactivate&name=' + name, function(data) {
+            $.get(this.controller + '?action=deactivate&type=' + type + '&name=' + name, function(data) {
                 var response = codiad.jsend.parse(data);
                 if (response != 'error') {
                     _this.list();
diff --git a/components/plugin_manager/class.plugin_manager.php b/components/plugin_manager/class.plugin_manager.php
deleted file mode 100644
index 489a5f0..0000000
--- a/components/plugin_manager/class.plugin_manager.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/*
-*  Copyright (c) Codiad & daeks (codiad.com), distributed
-*  as-is and without warranty under the MIT License. See
-*  [root]/license.txt for more. This information must remain intact.
-*/
-
-require_once('../../common.php');
-
-class Plugin_manager extends Common {
-
-    //////////////////////////////////////////////////////////////////
-    // PROPERTIES
-    //////////////////////////////////////////////////////////////////
-
-    public $plugins     = '';
-    public $market      = 'http://codiad.com/plugins.json';
-
-    //////////////////////////////////////////////////////////////////
-    // METHODS
-    //////////////////////////////////////////////////////////////////
-
-    // -----------------------------||----------------------------- //
-
-    //////////////////////////////////////////////////////////////////
-    // Construct
-    //////////////////////////////////////////////////////////////////
-
-    public function __construct(){
-        if(!file_exists(DATA.'/plugins.php')) {
-          saveJSON('plugins.php', array(''));
-        }  
-        $this->plugins = getJSON('plugins.php');
-        $this->market = Common::getConstant('PMURL', $this->market);
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Get Market list
-    //////////////////////////////////////////////////////////////////
-
-    public function Market(){
-        return json_decode(file_get_contents($this->market),true);
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Deactivate Plugin
-    //////////////////////////////////////////////////////////////////
-
-    public function Deactivate($name){
-        $revised_array = array();
-        foreach($this->plugins as $plugin){
-            if($plugin!=$name){
-                $revised_array[] = $plugin;
-            }
-        }
-        // Save array back to JSON
-        saveJSON('plugins.php',$revised_array);
-        // Response
-        echo formatJSEND("success",null);
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Activate Plugin
-    //////////////////////////////////////////////////////////////////
-
-    public function Activate($name){
-        $this->plugins[] = $name;
-        saveJSON('plugins.php',$this->plugins);
-        // Response
-        echo formatJSEND("success",null);
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Install Plugin
-    //////////////////////////////////////////////////////////////////
-
-    public function Install($name, $repo){
-        if(substr($repo,-4) == '.git') {
-            $repo = substr($repo,0,-4);
-        }
-        if(file_put_contents(PLUGINS.'/'.$name.'.zip', fopen($repo.'/archive/master.zip', 'r'))) {
-            $zip = new ZipArchive;
-            $res = $zip->open(PLUGINS.'/'.$name.'.zip');
-            // open downloaded archive
-            if ($res === TRUE) {
-              // extract archive
-              if($zip->extractTo(PLUGINS) === true) {
-                $zip->close();
-              } else {
-                die(formatJSEND("error","Unable to open ".$name.".zip"));
-              }
-            } else {
-                die(formatJSEND("error","ZIP Extension not found"));
-            }
-
-            unlink(PLUGINS.'/'.$name.'.zip');
-            // Response
-            $this->Activate(substr($repo, strrpos($repo, "/") + 1)."-master");
-        } else {
-            die(formatJSEND("error","Unable to download ".$repo));
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Remove Plugin
-    //////////////////////////////////////////////////////////////////
-
-    public function Remove($name){
-        function rrmdir($path){
-            return is_file($path)?
-            @unlink($path):
-            @array_map('rrmdir',glob($path.'/*'))==@rmdir($path);
-        }
-
-        rrmdir(PLUGINS.'/'.$name);
-        $this->Deactivate($name);
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Update Plugin
-    //////////////////////////////////////////////////////////////////
-
-    public function Update($name){
-        function rrmdir($path){
-            return is_file($path)?
-            @unlink($path):
-            @array_map('rrmdir',glob($path.'/*'))==@rmdir($path);
-        }
-
-        function cpy($source, $dest, $ign){
-            if(is_dir($source)) {
-                $dir_handle=opendir($source);
-                while($file=readdir($dir_handle)){
-                    if(!in_array($file, $ign)){
-                        if(is_dir($source."/".$file)){
-                            if(!file_exists($dest."/".$file)) {
-                              mkdir($dest."/".$file);
-                            }
-                            cpy($source."/".$file, $dest."/".$file, $ign);
-                        } else {
-                            copy($source."/".$file, $dest."/".$file);
-                        }
-                    }
-                }
-                closedir($dir_handle);
-            } else {
-                copy($source, $dest);
-            }
-        }
-
-        if(file_exists(PLUGINS.'/'.$name.'/plugin.json')) {
-            $data = json_decode(file_get_contents(PLUGINS.'/'.$name.'/plugin.json'),true);
-            if(substr($data[0]['url'],-4) == '.git') {
-                $data[0]['url'] = substr($data[0]['url'],0,-4);
-            }
-            $data[0]['url'] .= '/archive/master.zip';
-
-            $ign = array(".","..");
-            if(isset($data[0]['exclude'])) {
-              foreach(explode(",",$data[0]['exclude']) as $exclude) {
-                array_push($ign, $exclude);
-              }
-            }
-
-            if(file_exists(PLUGINS.'/_'.session_id()) || mkdir(PLUGINS.'/_'.session_id())) {
-              if(file_put_contents(PLUGINS.'/_'.session_id().'/'.$name.'.zip', fopen($data[0]['url'], 'r'))) {
-                  $zip = new ZipArchive;
-                  $res = $zip->open(PLUGINS.'/_'.session_id().'/'.$name.'.zip');
-                  // open downloaded archive
-                  if ($res === TRUE) {
-                    // extract archive
-                    if($zip->extractTo(PLUGINS.'/_'.session_id().'') === true) {
-                      $zip->close();
-                      $srcname = $name;
-                      if(substr($srcname, -6) != "master") {
-                        $srcname = $srcname.'-master';
-                      }
-                      cpy(PLUGINS.'/_'.session_id().'/'.$srcname, PLUGINS.'/'.$name, $ign);
-                    } else {
-                      die(formatJSEND("error","Unable to open ".$name.".zip"));
-                    }
-                  } else {
-                      die(formatJSEND("error","ZIP Extension not found"));
-                  }
-
-                  rrmdir(PLUGINS.'/_'.session_id());
-                  // Response
-                  echo formatJSEND("success",null);
-              } else {
-                  die(formatJSEND("error","Unable to download ".$repo));
-              }
-            } else {
-              die(formatJSEND("error","Unable to create temp dir "));
-            }
-        } else {
-            echo formatJSEND("error","Unable to find plugin ".$name);
-        }
-    }
-}
diff --git a/components/plugin_manager/controller.php b/components/plugin_manager/controller.php
deleted file mode 100644
index 3282fdc..0000000
--- a/components/plugin_manager/controller.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-    /*
-    *  Copyright (c) Codiad & daeks (codiad.com), distributed
-    *  as-is and without warranty under the MIT License. See
-    *  [root]/license.txt for more. This information must remain intact.
-    */
-
-
-    require_once('../../common.php');
-    require_once('class.plugin_manager.php');
-
-    //////////////////////////////////////////////////////////////////
-    // Verify Session or Key
-    //////////////////////////////////////////////////////////////////
-
-    checkSession();
-
-    $Plugin_manager = new Plugin_manager();
-    
-    //////////////////////////////////////////////////////////////////
-    // Deactivate Plugin
-    //////////////////////////////////////////////////////////////////
-
-    if($_GET['action']=='deactivate'){
-        if(checkAccess()) {
-            $Plugin_manager->Deactivate($_GET['name']);
-        }
-    }
-    
-    //////////////////////////////////////////////////////////////////
-    // Activate Plugin
-    //////////////////////////////////////////////////////////////////
-
-    if($_GET['action']=='activate'){
-        if(checkAccess()) {
-            $Plugin_manager->Activate($_GET['name']);
-        }
-    }
-    
-    //////////////////////////////////////////////////////////////////
-    // Install Plugin
-    //////////////////////////////////////////////////////////////////
-
-    if($_GET['action']=='install'){
-        if(checkAccess()) {
-            $Plugin_manager->Install($_GET['name'], $_GET['repo']);
-        }
-    }
-    
-    //////////////////////////////////////////////////////////////////
-    // Remove Plugin
-    //////////////////////////////////////////////////////////////////
-
-    if($_GET['action']=='remove'){
-        if(checkAccess()) {
-            $Plugin_manager->Remove($_GET['name']);
-        }
-    }
-    
-    //////////////////////////////////////////////////////////////////
-    // Update Plugin
-    //////////////////////////////////////////////////////////////////
-
-    if($_GET['action']=='update'){
-        if(checkAccess()) {
-            $Plugin_manager->Update($_GET['name']);
-        }
-    }
-
-?>
\ No newline at end of file
diff --git a/components/right_bar.json b/components/right_bar.json
index 3cbd8ce..65afcd5 100755
--- a/components/right_bar.json
+++ b/components/right_bar.json
@@ -40,14 +40,9 @@
         "onclick": "codiad.modal.load(400, 'components/editor/dialog.php?action=settings');codiad.modal.hideOverlay();"
     },
     {
-        "title": "Plugins",
-        "icon": "icon-tag",
-        "onclick": "codiad.plugin_manager.list();"
-    },
-      {
-        "title": "Themes",
-        "icon": "icon-picture",
-        "onclick": "codiad.theme_manager.list();"
+        "title": "Marketplace",
+        "icon": "icon-cloud",
+        "onclick": "codiad.market.list();"
     },
     {
         "title": "break",
diff --git a/components/theme_manager/class.theme_manager.php b/components/theme_manager/class.theme_manager.php
deleted file mode 100644
index 6a87393..0000000
--- a/components/theme_manager/class.theme_manager.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/*
-*  Copyright (c) Codiad & daeks (codiad.com), distributed
-*  as-is and without warranty under the MIT License. See
-*  [root]/license.txt for more. This information must remain intact.
-*/
-
-require_once('../../common.php');
-
-class Theme_manager extends Common {
-
-    //////////////////////////////////////////////////////////////////
-    // PROPERTIES
-    //////////////////////////////////////////////////////////////////
-
-    public $themes     = '';
-    public $market      = 'http://codiad.com/themes.json';
-
-    //////////////////////////////////////////////////////////////////
-    // METHODS
-    //////////////////////////////////////////////////////////////////
-
-    // -----------------------------||----------------------------- //
-
-    //////////////////////////////////////////////////////////////////
-    // Construct
-    //////////////////////////////////////////////////////////////////
-
-    public function __construct(){
-        if(!file_exists(DATA.'/themes.php')) {
-          saveJSON('themes.php', array(''));
-        }  
-        $this->themes = getJSON('themes.php');
-        $this->market = Common::getConstant('TMURL', $this->market);
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Get Market list
-    //////////////////////////////////////////////////////////////////
-
-    public function Market(){
-        return json_decode(file_get_contents($this->market),true);
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Deactivate Theme
-    //////////////////////////////////////////////////////////////////
-
-    public function Deactivate($name){
-        $revised_array = array();
-        foreach($this->themes as $theme){
-            if($theme!=$name){
-                $revised_array[] = $theme;
-            }
-        }
-        // Save array back to JSON
-        saveJSON('themes.php',$revised_array);
-        // Response
-        echo formatJSEND("success",null);
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Activate Theme
-    //////////////////////////////////////////////////////////////////
-
-    public function Activate($name){
-        $this->themes[] = $name;
-        saveJSON('themes.php',$this->themes);
-        // Response
-        echo formatJSEND("success",null);
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Install Theme
-    //////////////////////////////////////////////////////////////////
-
-    public function Install($name, $repo){
-        if(substr($repo,-4) == '.git') {
-            $repo = substr($repo,0,-4);
-        }
-        if(file_put_contents(THEMES.'/'.$name.'.zip', fopen($repo.'/archive/master.zip', 'r'))) {
-            $zip = new ZipArchive;
-            $res = $zip->open(THEMES.'/'.$name.'.zip');
-            // open downloaded archive
-            if ($res === TRUE) {
-              // extract archive
-              if($zip->extractTo(THEMES) === true) {
-                $zip->close();
-              } else {
-                die(formatJSEND("error","Unable to open ".$name.".zip"));
-              }
-            } else {
-                die(formatJSEND("error","ZIP Extension not found"));
-            }
-
-            unlink(THEMES.'/'.$name.'.zip');
-            // Response
-            $this->Activate(substr($repo, strrpos($repo, "/") + 1)."-master");
-        } else {
-            die(formatJSEND("error","Unable to download ".$repo));
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Remove theme
-    //////////////////////////////////////////////////////////////////
-
-    public function Remove($name){
-        function rrmdir($path){
-            return is_file($path)?
-            @unlink($path):
-            @array_map('rrmdir',glob($path.'/*'))==@rmdir($path);
-        }
-
-        rrmdir(THEMES.'/'.$name);
-        $this->Deactivate($name);
-    }
-
-    //////////////////////////////////////////////////////////////////
-    // Update Theme
-    //////////////////////////////////////////////////////////////////
-
-    public function Update($name){
-        function rrmdir($path){
-            return is_file($path)?
-            @unlink($path):
-            @array_map('rrmdir',glob($path.'/*'))==@rmdir($path);
-        }
-
-        function cpy($source, $dest, $ign){
-            if(is_dir($source)) {
-                $dir_handle=opendir($source);
-                while($file=readdir($dir_handle)){
-                    if(!in_array($file, $ign)){
-                        if(is_dir($source."/".$file)){
-                            if(!file_exists($dest."/".$file)) {
-                              mkdir($dest."/".$file);
-                            }
-                            cpy($source."/".$file, $dest."/".$file, $ign);
-                        } else {
-                            copy($source."/".$file, $dest."/".$file);
-                        }
-                    }
-                }
-                closedir($dir_handle);
-            } else {
-                copy($source, $dest);
-            }
-        }
-
-        if(file_exists(THEMES.'/'.$name.'/theme.json')) {
-            $data = json_decode(file_get_contents(THEMES.'/'.$name.'/theme.json'),true);
-            if(substr($data[0]['url'],-4) == '.git') {
-                $data[0]['url'] = substr($data[0]['url'],0,-4);
-            }
-            $data[0]['url'] .= '/archive/master.zip';
-
-            $ign = array(".","..");
-            if(isset($data[0]['exclude'])) {
-              foreach(explode(",",$data[0]['exclude']) as $exclude) {
-                array_push($ign, $exclude);
-              }
-            }
-
-            if(file_exists(THEMES.'/_'.session_id()) || mkdir(THEMES.'/_'.session_id())) {
-              if(file_put_contents(THEMES.'/_'.session_id().'/'.$name.'.zip', fopen($data[0]['url'], 'r'))) {
-                  $zip = new ZipArchive;
-                  $res = $zip->open(THEMES.'/_'.session_id().'/'.$name.'.zip');
-                  // open downloaded archive
-                  if ($res === TRUE) {
-                    // extract archive
-                    if($zip->extractTo(THEMES.'/_'.session_id().'') === true) {
-                      $zip->close();
-                      $srcname = $name;
-                      if(substr($srcname, -6) != "master") {
-                        $srcname = $srcname.'-master';
-                      }
-                      cpy(THEMES.'/_'.session_id().'/'.$srcname, THEMES.'/'.$name, $ign);
-                    } else {
-                      die(formatJSEND("error","Unable to open ".$name.".zip"));
-                    }
-                  } else {
-                      die(formatJSEND("error","ZIP Extension not found"));
-                  }
-
-                  rrmdir(THEMES.'/_'.session_id());
-                  // Response
-                  echo formatJSEND("success",null);
-              } else {
-                  die(formatJSEND("error","Unable to download ".$repo));
-              }
-            } else {
-              die(formatJSEND("error","Unable to create temp dir "));
-            }
-        } else {
-            echo formatJSEND("error","Unable to find theme ".$name);
-        }
-    }
-}
diff --git a/components/theme_manager/dialog.php b/components/theme_manager/dialog.php
deleted file mode 100644
index a07981c..0000000
--- a/components/theme_manager/dialog.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-
-    /*
-    *  Copyright (c) Codiad & daeks (codiad.com), distributed
-    *  as-is and without warranty under the MIT License. See 
-    *  [root]/license.txt for more. This information must remain intact.
-    */
-
-
-    require_once('../../common.php');
-    
-    //////////////////////////////////////////////////////////////////
-    // Verify Session or Key
-    //////////////////////////////////////////////////////////////////
-    
-    checkSession();
-
-    switch($_GET['action']){
-    
-        //////////////////////////////////////////////////////////////
-        // Theme Market
-        //////////////////////////////////////////////////////////////
-        
-        case 'market':
-        
-            require_once('class.theme_manager.php');
-            $tm = new Theme_manager();
-            $market = $tm->Market();
-            ?>
-            <label><?php i18n("Theme Market"); ?></label>
-            <div id="theme-list">
-            <table width="100%">
-                <tr>
-                    <th><?php i18n("Theme Name"); ?></th>
-                    <th><?php i18n("Description"); ?></th>
-                    <th><?php i18n("Author"); ?></th>
-                    <th><?php i18n("Download"); ?></th>
-                </tr>
-            <?php
-            if($market != '') {
-                $marketlist = array();
-                foreach($market as $theme) {
-                    if(!isset($theme['category']) || $theme['category'] == '') {
-                        $theme['category'] = 'Common';
-                    }
-                    if(!array_key_exists($theme['category'], $marketlist)) {
-                        $marketlist[$theme['category']] = array();
-                    } 
-                    array_push($marketlist[$theme['category']], $theme);
-                }
-                
-                ksort($marketlist);
-                $isDownloadable = (is_writeable(THEMES) && extension_loaded('zip') && extension_loaded('openssl') && ini_get('allow_url_fopen') == 1);
-                
-                foreach($marketlist as $category=>$themelist) {
-                    ?>
-                    <tr>
-                    <th colspan="4"><?php echo $category;?></th>
-                    </tr>
-                    <?php
-                    foreach($themelist as $theme) {
-                        if(substr($theme['url'],-4) == '.git') {
-                            $theme['url'] = substr($theme['url'],0,-4);
-                        }
-                    
-                        ?>
-                        <tr>
-                            <td><?php echo $theme['name']; ?></td>
-                            <td width="400px"><?php echo $theme['description']; ?></td>
-                            <td><?php echo $theme['author']; ?></td>
-                            <?php
-                                if(file_exists(THEMES.substr($theme['url'],strrpos($theme['url'],'/'))) || file_exists(THEMES.substr($theme['url'],strrpos($theme['url'],'/')).'-master')) {
-                                    ?>
-                                    <td><div class="icon-check icon"></div></td>
-                                    <?php
-                                } else {
-                                    if(checkAccess()){
-                                        if($isDownloadable) {
-                                        ?>
-                                         <td><table style="text-align:center;border-spacing:0;border-collapse:collapse;"><tr><td style="border: 0;padding: 0;"><a class="icon-download icon" onclick="codiad.theme_manager.install('<?php echo $theme['name']; ?>','<?php echo $theme['url']; ?>');return false;"></a></td><td style="border: 0;padding: 0;"><a class="icon-github icon" onclick="codiad.theme_manager.openInBrowser('<?php echo $theme['url']; ?>');return false;"></a></td></tr></table></td>   
-                                        <?php       
-                                        } else {
-                                        ?>
-                                        <td><a class="icon-download icon" onclick="codiad.theme_manager.openInBrowser('<?php echo $theme['url']; ?>');return false;"></a></td>
-                                        <?php
-                                        }                             
-                                    } else {
-                                        ?>
-                                        <td><div class="icon-block icon"></div></td>
-                                        <?php
-                                    }
-                                }
-                            ?>
-                        </tr>
-                        <?php
-                    }
-                }
-            } else {
-                ?>
-                <tr><td colspan="4"><?php i18n("Theme Market currently unavailable."); ?></td></tr>
-                <?php
-            }
-            
-            ?>
-            </table>
-            </div>
-            <button class="btn-left" onclick="codiad.theme_manager.list();return false;"><?php i18n("Installed Themes"); ?></button><button class="btn-mid" onclick="codiad.theme_manager.check();return false;"><?php i18n("Update Check"); ?></button><button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
-            <?php
-            
-            break;
-        
-        //////////////////////////////////////////////////////////////
-        // List Themes
-        //////////////////////////////////////////////////////////////
-        
-        case 'list':
-            ?>
-            <label><?php i18n("Theme List"); ?></label>
-            <div id="theme-list">
-            <table width="100%">
-                <tr>
-                    <th><?php i18n("Theme Name"); ?></th>
-                    <th><?php i18n("Version"); ?></th>
-                    <th><?php i18n("Author"); ?></th>
-                    <th width="5"><?php i18n("Active"); ?></th>
-                    <?php if(is_writeable(THEMES)) { ?>
-                    <th width="5"><?php i18n("Delete"); ?></th>
-                    <?php } ?>
-                </tr>
-            <?php
-            
-            if(!file_exists(DATA.'/themes.php')) {
-              saveJSON('themes.php', array(''));
-            }  
-            
-            // Get JSON data
-            $themes = getJSON('themes.php');
-            $availablethemes = array();
-            $themecount = 0;
-            foreach (scandir(THEMES) as $fname){
-                if($fname == '.' || $fname == '..' ){
-                    continue;
-                }
-                if(is_dir(THEMES.'/'.$fname)){
-                    $availablethemes[] = $fname;
-                    if(file_exists(THEMES . "/" . $fname . "/theme.json")) {
-                        $data = file_get_contents(THEMES . "/" . $fname . "/theme.json");
-                        $data = json_decode($data,true);
-                        ?>
-                        <tr>
-                            <td><?php if($data[0]['name'] != '') { echo $data[0]['name']; } else { echo $fname; } ?></td>
-                            <td><?php echo $data[0]['version']; ?></td>
-                            <td><?php echo $data[0]['author']; ?></td>
-                            <?php
-                                if(checkAccess()){
-                                    if(in_array($fname, $themes)) {
-                                    ?>
-                                    <td><a onclick="codiad.theme_manager.deactivate('<?php echo($fname); ?>');" class="icon-check icon"></a></td>
-                                    <?php 
-                                    } else {
-                                    ?>
-                                     <td><a onclick="codiad.theme_manager.activate('<?php echo($fname); ?>');" class="icon-block icon"></a></td>   
-                                    <?php                                    
-                                    }
-                                    if(is_writeable(THEMES)) {
-                                        ?>
-                                        <td><a onclick="codiad.theme_manager.remove('<?php echo($fname); ?>');" class="icon-cancel-circled icon"></a></td>
-                                        <?php
-                                    }
-                                } else {
-                                    ?>
-                                    <td><div class="<?php if(in_array($fname, $themes)) { echo 'icon-check'; } else { echo 'icon-block'; } ?> icon"></div></td>
-                                    <?php if(is_writeable(THEMES)) { ?>
-                                    <td></td>
-                                    <?php
-                                    }
-                                }
-                            ?>
-                        </tr>
-                        <?php
-                        $themecount++;
-                    }
-                }
-            }
-            
-            $colspan = 4;            
-            if(is_writeable(THEMES)) {
-                $colspan = 5;
-            }
-            
-            if($themecount == 0) {
-            ?>
-            <tr><td colspan="<?php echo $colspan;?>"><?php i18n("No Themes installed. Check Theme Market."); ?></td></tr>
-            <?php
-            } else {
-            ?>
-            <tr><td colspan="<?php echo $colspan;?>" align="right"><?php echo $themecount; ?> <?php i18n("Themes installed."); ?></td></tr>
-            <?php
-            }
-            
-            // clean old Themes from json file
-            $revised_array = array();
-            foreach($themes as $theme){
-                if(in_array($theme, $availablethemes)){
-                    $revised_array[] = $theme;
-                }
-            }
-            // Save array back to JSON
-            saveJSON('themes.php',$revised_array);
-            
-            ?>
-            </table>
-            </div>
-            <button class="btn-mid" onclick="codiad.theme_manager.market();return false;"><?php i18n("Theme Market"); ?></button><button class="btn-mid" onclick="codiad.theme_manager.check();return false;"><?php i18n("Update Check"); ?></button><button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
-            <?php
-            
-            break;
-            
-        //////////////////////////////////////////////////////////////
-        // Update Themes
-        //////////////////////////////////////////////////////////////
-        
-        case 'check':
-            ?>
-            <label><?php i18n("Theme Update Check"); ?></label>
-            <div id="theme-list">
-            <table width="100%">
-                <tr>
-                    <th><?php i18n("Theme Name"); ?></th>
-                    <th><?php i18n("Your Version"); ?></th>
-                    <th><?php i18n("Latest Version"); ?></th>
-                    <th><?php i18n("Download"); ?></th>
-                </tr>
-            <?php
-            
-            $isDownloadable = (is_writeable(THEMES) && extension_loaded('zip') && extension_loaded('openssl') && ini_get('allow_url_fopen') == 1);
-            
-            // Get projects JSON data
-            $themes = getJSON('themes.php');
-            $themecount = 0;
-            foreach (scandir(THEMES) as $fname){
-                if($fname == '.' || $fname == '..' ){
-                    continue;
-                }
-                if(is_dir(THEMES.'/'.$fname)){
-                    if(file_exists(THEMES . "/" . $fname . "/theme.json")) {
-                        $data = file_get_contents(THEMES . "/" . $fname . "/theme.json");
-                        $data = json_decode($data,true);
-                        
-                        if($data[0]['url'] != '') {
-                            $url = str_replace('github.com','raw.github.com',$data[0]['url']);
-                            if(substr($url,-4) == '.git') {
-                                $url = substr($url,0,-4);
-                            }
-                            $url = $url.'/master/theme.json';
-                            $remote = json_decode(file_get_contents($url),true);
-                        }
-                        
-                        ?>
-                        <tr>
-                            <td><?php if($data[0]['name'] != '') { echo $data[0]['name']; } else { echo $fname; } ?></td>
-                            <td><?php echo $data[0]['version']; ?></td>
-                            <?php
-                                if($data[0]['url'] != '') {                                   
-                                    ?>
-                                    <td><?php if($remote[0]['version'] != '') { echo($remote[0]['version']); } else { echo 'n/a'; } ?></td>
-                                    <?php
-                                    if($remote[0]['version'] != $data[0]['version']) {
-                                        if($isDownloadable) {
-                                        ?>
-                                            <td><table style="text-align:center;border-spacing:0;border-collapse:collapse;"><tr><td style="border: 0;padding: 0;"><a class="icon-download icon" onclick="codiad.theme_manager.update('<?php echo $fname; ?>');return false;"></a></td><td style="border: 0;padding: 0;"><a class="icon-github icon" onclick="codiad.theme_manager.openInBrowser('<?php echo $data[0]['url']; ?>');return false;"></a></td></tr></table></td>
-                                        <?php
-                                        } else {
-                                        ?>
-                                        <td><a class="icon-download icon" onclick="codiad.theme_manager.openInBrowser('<?php echo $data[0]['url']; ?>');return false;"></a></td>
-                                        <?php
-                                        }
-                                    } else {
-                                        ?>
-                                            <td><font style="color:green"><?php i18n("Latest"); ?></font></td>
-                                        <?php
-                                    }
-                                } else {
-                                    ?>
-                                    <td>n/a</td>
-                                    <td></td> 
-                                    <?php 
-                                }
-                            ?>
-                        </tr>
-                        <?php
-                        $themecount++;
-                    }
-                }
-            }
-            
-            if($themecount == 0) {
-            ?>
-            <tr><td colspan="4"><?php i18n("No Themes installed. Check Themes Market."); ?></td></tr>
-            <?php
-            }             
-            ?>
-            </table>
-            </div>
-            <button class="btn-left" onclick="codiad.theme_manager.check();return false;"><?php i18n("Rescan"); ?></button><button class="btn-mid" onclick="codiad.theme_manager.list();return false;"><?php i18n("Installed Themes"); ?></button><button class="btn-mid" onclick="codiad.theme_manager.market();return false;"><?php i18n("Theme Market"); ?></button><button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
-            <?php
-            
-            break;
-                    
-    }
-    
-?>
-        
diff --git a/components/theme_manager/init.js b/components/theme_manager/init.js
deleted file mode 100644
index 573e991..0000000
--- a/components/theme_manager/init.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *  Copyright (c) Codiad & daeks (codiad.com), distributed
- *  as-is and without warranty under the MIT License. See
- *  [root]/license.txt for more. This information must remain intact.
- */
-
-(function(global, $){
-
-    var codiad = global.codiad;
-
-    $(function() {
-        codiad.theme_manager.init();
-    });
-
-    codiad.theme_manager = {
-
-        controller: 'components/theme_manager/controller.php',
-        dialog: 'components/theme_manager/dialog.php',
-
-        init: function() {
-           
-        },
-        
-        //////////////////////////////////////////////////////////////////
-        // Open the theme manager market
-        //////////////////////////////////////////////////////////////////
-        
-        market: function() {
-            $('#modal-content form')
-                .die('submit'); // Prevent form bubbling
-            codiad.modal.load(500, this.dialog + '?action=market');
-        },
-
-        //////////////////////////////////////////////////////////////////
-        // Open the theme manager dialog
-        //////////////////////////////////////////////////////////////////
-
-        list: function() {
-            $('#modal-content form')
-                .die('submit'); // Prevent form bubbling
-            codiad.modal.load(500, this.dialog + '?action=list');
-        },
-        
-        //////////////////////////////////////////////////////////////////
-        // Checks for theme updates
-        //////////////////////////////////////////////////////////////////
-
-        check: function() {
-            $('#modal-content form')
-                .die('submit'); // Prevent form bubbling
-            codiad.modal.load(500, this.dialog + '?action=check');
-        },
-        
-        openInBrowser: function(path) {
-            window.open(path, '_newtab');
-        },
-        
-        //////////////////////////////////////////////////////////////////
-        // Install theme
-        //////////////////////////////////////////////////////////////////
-
-        install: function(name, repo) {
-            var _this = this;
-            $('#modal-content').html('<div id="modal-loading"></div><div align="center">Installing ' + name + '...</div><br>');
-            $.get(_this.controller + '?action=install&name=' + name + '&repo=' + repo, function(data) {
-                var response = codiad.jsend.parse(data);
-                if (response == 'error') {
-                    codiad.message.error(response.message);
-                } else {
-                    _this.list();
-                }
-            });
-        },
-        
-        //////////////////////////////////////////////////////////////////
-        // Remove theme
-        //////////////////////////////////////////////////////////////////
-
-        remove: function(name) {
-            var _this = this;
-            $.get(_this.controller + '?action=remove&name=' + name, function(data) {
-                var response = codiad.jsend.parse(data);
-                if (response == 'error') {
-                    codiad.message.error(response.message);
-                }
-                _this.list();
-            });
-        },
-        
-        //////////////////////////////////////////////////////////////////
-        // Update theme
-        //////////////////////////////////////////////////////////////////
-
-        update: function(name) {
-            var _this = this;
-            $('#modal-content').html('<div id="modal-loading"></div><div align="center">Updating ' + name + '...</div><br>');
-            $.get(_this.controller + '?action=update&name=' + name, function(data) {
-                var response = codiad.jsend.parse(data);
-                if (response == 'error') {
-                    codiad.message.error(response.message);
-                }
-                _this.check();
-            });
-        },
-
-        //////////////////////////////////////////////////////////////////
-        // Activate theme
-        //////////////////////////////////////////////////////////////////
-
-        activate: function(name) {
-            var _this = this;
-            $.get(this.controller + '?action=activate&name=' + name, function(data) {
-                var response = codiad.jsend.parse(data);
-                if (response != 'error') {
-                    _this.list();
-                }
-            });
-        },
-
-        //////////////////////////////////////////////////////////////////
-        // Deactivate theme
-        //////////////////////////////////////////////////////////////////
-
-        deactivate: function(name) {
-            var _this = this;
-            $.get(this.controller + '?action=deactivate&name=' + name, function(data) {
-                var response = codiad.jsend.parse(data);
-                if (response != 'error') {
-                    _this.list();
-                }
-            });
-        }
-    };
-})(this, jQuery);
diff --git a/config.example.php b/config.example.php
index 0a7b865..72dc7f5 100644
--- a/config.example.php
+++ b/config.example.php
@@ -43,11 +43,8 @@ define("WORKSPACE", BASE_PATH . "/workspace");
 // URLS
 define("WSURL", BASE_URL . "/workspace");
 
-// Plugin Market
-//define("PMURL", "http://codiad.com/plugins.json");
-
-// Theme Market
-//define("TMURL", "http://codiad.com/themes.json");
+// Marketplace
+//define("MARKETURL", "http://market.codiad.com");
 
 // Update Check
 //define("UPDATEURL", "http://update.codiad.com/?v={VER}&o={OS}&p={PHP}&w={WEB}&a={ACT}");
diff --git a/plugins/README.md b/plugins/README.md
deleted file mode 100644
index 5325aba..0000000
--- a/plugins/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Plugins
-
-The plugins directory is where you place plugins :-)
-
-[GET SOME...](http://www.codiad.com/plugins.html)
\ No newline at end of file
diff --git a/themes/default/images/new.png b/themes/default/images/new.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fec6c9a2da863b31b3a228812948d762fb08513
GIT binary patch
literal 2782
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

literal 0
HcmV?d00001


From e8b18a55330b87988614bda5e75816639e46afb6 Mon Sep 17 00:00:00 2001
From: daeks <daeks@gmx.net>
Date: Wed, 7 Aug 2013 17:40:25 +0200
Subject: [PATCH 2/3] added manual repo

---
 components/market/class.market.php |  2 ++
 components/market/dialog.php       |  4 ++--
 components/market/init.js          | 22 +++++++++++++---------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/components/market/class.market.php b/components/market/class.market.php
index f045977..b449423 100644
--- a/components/market/class.market.php
+++ b/components/market/class.market.php
@@ -109,6 +109,7 @@ class Market extends Common {
                         $data = file_get_contents(PLUGINS . "/" . $fname . "/plugin.json");
                         $data = json_decode($data,true);
                         $data[0]['name'] = $fname;
+                        $data[0]['folder'] = $fname;
                         $data[0]['type'] = 'plugins';
                         $data[0]['image'] = '';
                         $data[0]['count'] = -1;
@@ -135,6 +136,7 @@ class Market extends Common {
                         $data = file_get_contents(THEMES . "/" . $fname . "/theme.json");
                         $data = json_decode($data,true);
                         $data[0]['name'] = $fname;
+                        $data[0]['folder'] = $fname;
                         $data[0]['type'] = 'themes';
                         $data[0]['image'] = '';
                         $data[0]['count'] = -1;
diff --git a/components/market/dialog.php b/components/market/dialog.php
index cb00bae..b853720 100644
--- a/components/market/dialog.php
+++ b/components/market/dialog.php
@@ -96,8 +96,8 @@
             </div>
             <table width="100%">
                 <tr>
-                    <th valign="middle"><input style="margin:0;display:inline" placeholder="Enter GitHub Repository Url..."></th>
-                    <th valign="middle" align="right" width="222px"><button class="btn-left" onclick="codiad.market.list();return false;"><?php i18n("Install Manually"); ?></button><button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button></th>
+                    <th valign="middle"><input style="margin:0;display:inline" id="repourl" placeholder="Enter GitHub Repository Url..."></th>
+                    <th valign="middle" align="right" width="222px"><button class="btn-left" onclick="codiad.market.install('','Manually',getElementById('repourl').value);return false;"><?php i18n("Install Manually"); ?></button><button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button></th>
                 </tr>
              </table>
             <?php
diff --git a/components/market/init.js b/components/market/init.js
index 2284cb1..1c0779e 100644
--- a/components/market/init.js
+++ b/components/market/init.js
@@ -60,15 +60,19 @@
 
         install: function(type, name, repo) {
             var _this = this;
-            $('#modal-content').html('<div id="modal-loading"></div><div align="center">Installing ' + name + '...</div><br>');
-            $.get(_this.controller + '?action=install&type=' + type + '&name=' + name + '&repo=' + repo, function(data) {
-                var response = codiad.jsend.parse(data);
-                if (response == 'error') {
-                    codiad.message.error(response.message);
-                } else {
-                    _this.list();
-                }
-            });
+            if(repo != '') {
+              $('#modal-content').html('<div id="modal-loading"></div><div align="center">Installing ' + name + '...</div><br>');
+              $.get(_this.controller + '?action=install&type=' + type + '&name=' + name + '&repo=' + repo, function(data) {
+                  var response = codiad.jsend.parse(data);
+                  if (response == 'error') {
+                      codiad.message.error(response.message);
+                  } else {
+                      _this.list();
+                  }
+              });
+            } else {
+               codiad.message.error('No Repository URL');
+            }
         },
         
         //////////////////////////////////////////////////////////////////

From 7a9e3b4fc3ae482f79e2947df7008ba6505e197f Mon Sep 17 00:00:00 2001
From: daeks <daeks@gmx.net>
Date: Wed, 7 Aug 2013 17:47:42 +0200
Subject: [PATCH 3/3] install manually

---
 components/market/class.market.php | 13 +++++++++++++
 components/market/init.js          |  3 +--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/components/market/class.market.php b/components/market/class.market.php
index b449423..3a7e380 100644
--- a/components/market/class.market.php
+++ b/components/market/class.market.php
@@ -174,6 +174,19 @@ class Market extends Common {
         if(substr($repo,-4) == '.git') {
             $repo = substr($repo,0,-4);
         }
+        if($type == '') {
+          $file_headers = @get_headers(str_replace('github.com','raw.github.com',$repo.'/master/plugin.json'));
+          if($file_headers[0] != 'HTTP/1.1 404 Not Found') {
+              $type = 'plugins';
+          } else {
+              $file_headers = @get_headers(str_replace('github.com','raw.github.com',$repo.'/master/theme.json'));
+              if($file_headers[0] != 'HTTP/1.1 404 Not Found') {
+                  $type = 'themes';
+              } else {
+                  die(formatJSEND("error","No type for ".$repo));
+              }
+          }
+        }
         if(file_put_contents(BASE_PATH.'/'.$type.'/'.$name.'.zip', fopen($repo.'/archive/master.zip', 'r'))) {
             $zip = new ZipArchive;
             $res = $zip->open(BASE_PATH.'/'.$type.'/'.$name.'.zip');
diff --git a/components/market/init.js b/components/market/init.js
index 1c0779e..cce14f3 100644
--- a/components/market/init.js
+++ b/components/market/init.js
@@ -66,9 +66,8 @@
                   var response = codiad.jsend.parse(data);
                   if (response == 'error') {
                       codiad.message.error(response.message);
-                  } else {
-                      _this.list();
                   }
+                  _this.list();
               });
             } else {
                codiad.message.error('No Repository URL');