]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
correction bookmarklet
authorNicolas Lœuillet <nicolas@coteo.com>
Wed, 3 Apr 2013 13:22:19 +0000 (15:22 +0200)
committerNicolas Lœuillet <nicolas@coteo.com>
Wed, 3 Apr 2013 13:22:19 +0000 (15:22 +0200)
README.md
cache/footer.32a3c4422ad65642b8dbb7e731f4d990.rtpl.php [deleted file]
cache/index.0b3442bc62f6c429fc13004b3c821ba0.rtpl.php [deleted file]
index.php

index b66aba185871c9723e39fbd6f68604121214d92d..96d9b93b66d8101044344553c8370e409b90c7a1 100755 (executable)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # poche
 
-Abandon Pocket, Instapaper and other Readibility service : adopt poche. It is the same, but it is open source.
+Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is open source.
 
 ## Usage
 
diff --git a/cache/footer.32a3c4422ad65642b8dbb7e731f4d990.rtpl.php b/cache/footer.32a3c4422ad65642b8dbb7e731f4d990.rtpl.php
deleted file mode 100644 (file)
index e069cab..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php if(!class_exists('raintpl')){exit;}?><footer>
-       <div>  
-       Copyright &copy; <a href="http://www.memiks.fr/">memiks.fr</a> | <a href="http://shaarli.memiks.fr/">Liens</a> / <a href="http://rss.memiks.fr/">RSS</a> / <a href="http://wiki.memiks.fr/">Wiki</a>  / <a href="mailto:&#109;&#101;&#109;&#105;&#107;&#115;&#064;&#109;&#101;&#109;&#105;&#107;&#115;&#046;&#102;&#114;">Contact</a><br>
-                       Licence: WTF Licence<br>
-                       More information HERE: <a href="http://www.memiks.fr/readityourself/">http://www.memiks.fr/readityourself/</a> Version : <span class="version"><?php echo $version;?></span>
-       </div>
-</footer>
diff --git a/cache/index.0b3442bc62f6c429fc13004b3c821ba0.rtpl.php b/cache/index.0b3442bc62f6c429fc13004b3c821ba0.rtpl.php
deleted file mode 100644 (file)
index 6dd72a4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php if(!class_exists('raintpl')){exit;}?><html>
-       <head>
-               <link rel='stylesheet' href='./css/reset.css' type='text/css' media='all' />
-               <link rel='stylesheet' href='./css/typography.css' type='text/css' media='all' />
-       
-               <title><?php echo $title;?></title>
-       </head>
-       <body>
-               <article>
-                       <h1><a href="<?php echo $url;?>"><?php echo $title;?></a></h1>
-                       <div id="readityourselfcontent">
-                               <?php echo $content;?>
-
-                       </div>
-                       <span class="comeFrom">Come From : <a href="<?php echo $url;?>"><?php echo $url;?></a>
-               </article>
-               <?php $tpl = new RainTPL;$tpl_dir_temp = self::$tpl_dir;$tpl->assign( $this->var );$tpl->draw( dirname("footer") . ( substr("footer",-1,1) != "/" ? "/" : "" ) . basename("footer") );?>
-
-       </body>
-</html>
index 8861d31e5bbfdb24754292b615308444d8f12696..9e6e2256465f5be981d3e6b2b24154f41e1f858a 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -51,6 +51,11 @@ switch ($action) {
     default:
         break;
 }
+
+function url(){
+  $protocol = ($_SERVER['HTTPS'] && $_SERVER['HTTPS'] != "off") ? "https" : "http";
+  return $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+}
 ?>
 <!DOCTYPE html>
 <!--[if lte IE 6]> <html class="no-js ie6 ie67 ie678" lang="en"> <![endif]-->
@@ -75,7 +80,7 @@ switch ($action) {
                                <li><a href="index.php">home</a></li>
                                <li><a href="#">favorites</a></li>
                                <li><a href="#">archive</a></li>
-                <li><a href="javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('http://localhost/poche/index.php?action=add&url='%20+%20encodeURIComponent(url),'_self');})();">bookmarklet</a></li>
+                <li><a href="javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('<? echo url()?>index.php?action=add&url='%20+%20encodeURIComponent(url),'_self');})();">poche it !</a></li>
                        </ul>
                <?php
                        $query = $db_handle->prepare("SELECT * FROM entries WHERE read=?");
@@ -91,7 +96,7 @@ switch ($action) {
                        </ul>
                </div>
                <footer class="mr2 mt3">
-            <p class="smaller">poche is a read it later open source system, based on <a href="http://www.memiks.fr/readityourself/">ReadItYourself</a>. poche is developed by <a href="http://nicolas.loeuillet.org">Nicolas Lœuillet</a> under the <a href="http://www.wtfpl.net/">Do What the Fuck You Want to Public License</a></p>
+            <p class="smaller"><a href="http://github.com/nicosomb/poche">poche</a> is a read it later open source system, based on <a href="http://www.memiks.fr/readityourself/">ReadItYourself</a>. poche is developed by <a href="http://nicolas.loeuillet.org">Nicolas Lœuillet</a> under the <a href="http://www.wtfpl.net/">Do What the Fuck You Want to Public License</a></p>
         </footer>
        </body>
 </html>
\ No newline at end of file