From ea9c73c24494b9c8be7c0e2e4f4c84d96859303f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= <sebastien@slucas.fr>
Date: Mon, 6 May 2013 17:45:27 +0200
Subject: [PATCH] Remove the unneeded option to use CDN. it's too confusing and
 is not really needed.

---
 CHANGELOG          |  2 +-
 config_default.php |  7 -------
 index.php          | 13 ++-----------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6d24387..d885a27 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 0.3.5 - 201305??
   * Add multiple database support. Check the documentation of $config['calibre_directory'] in config-default.php to see how ot enable it.
-  * Include jquery library in COPS's repository to be sure that COPS will work on LAN (without Internet access). You can enable CDN resources with $config['cops_use_local_resources'].
+  * Include jquery library in COPS's repository to be sure that COPS will work on LAN (without Internet access).
   * Prepare the switch to HTML5. Thanks to Thomas Severinsen for most of the code.
   * Update the locale strings to be more strict with plurals. Thanks to Tobias Ausländer for the code.
   * If Fancybox is not enabled ($config['cops_use_fancyapps'] = "0") then it's not used at all (even in the about box).
diff --git a/config_default.php b/config_default.php
index 340827c..ac5e721 100644
--- a/config_default.php
+++ b/config_default.php
@@ -166,12 +166,5 @@
      * 0 : No
      */
     $config['cops_provide_kepub'] = "0";
-    
-    /*
-     * Use local JS resources instead if external resources hosted on CDN
-     * 1 : Yes (enable)
-     * 0 : No
-     */
-    $config['cops_use_local_resources'] = "1";
 
 ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 7b9c8f9..e535a0b 100644
--- a/index.php
+++ b/index.php
@@ -54,21 +54,12 @@
     <meta http-equiv="imagetoolbar" content="no" />
     <meta name="viewport" content="width=device-width, height=device-height, user-scalable=no" />
     <title><?php echo htmlspecialchars ($currentPage->title) ?></title>
-    <?php if ($config['cops_use_local_resources'] == 0) { ?>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.3.1/jquery.cookie.min.js"></script>
-        <?php if ($config['cops_use_fancyapps'] == 1) { ?>
-    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.4/jquery.fancybox.pack.js"></script>
-    <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.4/jquery.fancybox.css" media="screen" />
-        <?php } ?>
-    <?php } else { ?>
     <script type="text/javascript" src="<?php echo getUrlWithVersion("js/jquery-1.9.1.min.js") ?>"></script>
     <script type="text/javascript" src="<?php echo getUrlWithVersion("js/jquery.cookies.js") ?>"></script>
-        <?php if ($config['cops_use_fancyapps'] == 1) { ?>
+<?php if ($config['cops_use_fancyapps'] == 1) { ?>
     <script type="text/javascript" src="fancybox/jquery.fancybox.pack.js?v=2.1.4"></script>
     <link rel="stylesheet" type="text/css" href="fancybox/jquery.fancybox.css?v=2.1.4" media="screen" />
-        <?php } ?>
-    <?php } ?>
+<?php } ?>
     <script type="text/javascript" src="<?php echo getUrlWithVersion("js/jquery.sortElements.js") ?>"></script>
     <link rel="related" href="<?php echo $config['cops_full_url'] ?>feed.php" type="application/atom+xml;profile=opds-catalog" title="<?php echo $config['cops_title_default']; ?>" /> 
     <link rel="icon" type="image/vnd.microsoft.icon" href="<?php echo $currentPage->favicon ?>" />