From 1c6c58c66da210d29b9fcbe424a943e8bbd30316 Mon Sep 17 00:00:00 2001
From: Valerian Saliou <valerian@valeriansaliou.name>
Date: Thu, 9 Jun 2016 11:59:46 +0200
Subject: Jappix.org is no more

Signed-off-by: Valerian Saliou <valerian@valeriansaliou.name>
---
 README.md                    | 8 --------
 app/javascripts/presence.js  | 2 +-
 package.json                 | 2 +-
 server/desktop.php           | 4 ++--
 server/functions-manager.php | 2 +-
 server/functions.php         | 4 ++--
 server/generate-chat.php     | 2 +-
 7 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 1d704371..f8e7e544 100644
--- a/README.md
+++ b/README.md
@@ -30,18 +30,10 @@ Start translating on https://www.transifex.com/projects/p/jappix/ (new translato
 Links
 -----
 
-* Jappix project website: https://jappix.org/
 * Jappix project dev panel: https://github.com/jappix/jappix
 * Jappix main service: https://jappix.com/
 
 
-MUC Links
----------
-
-* Jappix.org support room: https://jappix.com/?r=support@muc.jappix.org
-* Jappix.org development room: https://jappix.com/?r=dev@muc.jappix.org
-
-
 Social networking
 -----------------
 
diff --git a/app/javascripts/presence.js b/app/javascripts/presence.js
index 7c915f8a..9cd14d25 100644
--- a/app/javascripts/presence.js
+++ b/app/javascripts/presence.js
@@ -1488,7 +1488,7 @@ var Presence = (function () {
             presence.appendNode('c', {
                 'xmlns': NS_CAPS,
                 'hash': 'sha-1',
-                'node': 'https://jappix.org/',
+                'node': 'https://jappix.com/',
                 'ver': Caps.mine()
             });
 
diff --git a/package.json b/package.json
index 20f530ba..cbe3ea9d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "jappix",
   "description": "Jappix, a full-featured XMPP web-client (Jappix Desktop, Jappix Mobile & Jappix Mini).",
   "version": "1.1.7-dev",
-  "homepage": "https://jappix.org/",
+  "homepage": "https://jappix.com/",
 
   "repository": {
     "type": "git",
diff --git a/server/desktop.php b/server/desktop.php
index 162c9362..aa6c3bf7 100644
--- a/server/desktop.php
+++ b/server/desktop.php
@@ -177,9 +177,9 @@ if(!anonymousMode() && !httpAuthEnabled()) { ?>
                     </a>
                 </div>
 
-                <h2>Jappix.org</h2>
+                <h2>Jappix.com</h2>
                 <div class="tabulate">
-                    <a href="https://jappix.org/">
+                    <a href="https://jappix.com/">
                         <span class="name">Jappix Download</span>
                         <span class="desc"><?php _e("Get Jappix, get support."); ?></span>
                     </a>
diff --git a/server/functions-manager.php b/server/functions-manager.php
index ee4689c7..c879937f 100644
--- a/server/functions-manager.php
+++ b/server/functions-manager.php
@@ -208,7 +208,7 @@ function newUpdates($force) {
     // No cache, obsolete one or refresh forced
     if(!file_exists($cache_path) || (file_exists($cache_path) && (time() - (filemtime($cache_path)) >= 86400)) || $force) {
         // Get the content
-        $last_version = readUrl('https://jappix.org/xml/version.xml');
+        $last_version = readUrl('https://project.jappix.com/xml/version.xml');
 
         // Write the content
         file_put_contents($cache_path, $last_version, LOCK_EX);
diff --git a/server/functions.php b/server/functions.php
index 7939f2ff..18d91d73 100644
--- a/server/functions.php
+++ b/server/functions.php
@@ -141,7 +141,7 @@ function readXML($type, $xmlns) {
     return false;
 }
 
-// Creates a secure download context (StartSSL provider, used on Jappix.org which is the update source)
+// Creates a secure download context (StartSSL provider, used on Jappix.com which is the update source)
 function requestContext($remote_url, $type = 'default', $opt = null) {
     $options = array();
     $url_parse = parse_url($remote_url);
@@ -149,7 +149,7 @@ function requestContext($remote_url, $type = 'default', $opt = null) {
     $ca_path = JAPPIX_BASE.'/misc/certs/';
 
     // Official update host?
-    if($url_parse['scheme'] === 'https' && $url_parse['host'] === 'jappix.org') {
+    if($url_parse['scheme'] === 'https' && $url_parse['host'] === 'project.jappix.com') {
         if($type === 'curl') {
             curl_setopt($opt, CURLOPT_SSL_VERIFYPEER, TRUE);
             curl_setopt($opt, CURLOPT_CAPATH, $ca_path);
diff --git a/server/generate-chat.php b/server/generate-chat.php
index 1a070af0..b3c33d57 100644
--- a/server/generate-chat.php
+++ b/server/generate-chat.php
@@ -229,7 +229,7 @@ if(isset($_POST['content']) && isset($_POST['xid']) && !empty($_POST['xid']) &&
         <h3><a href="'.$xid_link.'">'.$xid.'</a></h3>
         <h5>'.$date.'</h5>
 
-        <a class="logo" href="https://jappix.org/" target="_blank">
+        <a class="logo" href="https://jappix.com/" target="_blank">
             <img src="data:image/png;base64,'.$logo.'" alt="" />
         </a>
     </div>
-- 
cgit v1.2.3