share email +twitter / class messages

4 files changed, 268 insertions, 6 deletions

diff --git a/inc/3rdparty/class.messages.php b/inc/3rdparty/class.messages.php
new file mode 100755
index 00000000..e60bd3a1
--- /dev/null
+++ b/inc/3rdparty/class.messages.php
@@ -0,0 +1,231 @@
+<?php

+//--------------------------------------------------------------------------------------------------

+// Session-Based Flash Messages v1.0

+// Copyright 2012 Mike Everhart (http://mikeeverhart.net)

+//

+//   Licensed under the Apache License, Version 2.0 (the "License");

+//   you may not use this file except in compliance with the License.

+//   You may obtain a copy of the License at

+//

+//     http://www.apache.org/licenses/LICENSE-2.0

+//

+//   Unless required by applicable law or agreed to in writing, software

+//   distributed under the License is distributed on an "AS IS" BASIS,

+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+//   See the License for the specific language governing permissions and

+//       limitations under the License.

+//       

+//------------------------------------------------------------------------------

+// Description:

+//------------------------------------------------------------------------------

+//

+//      Stores messages in Session data to be easily retrieved later on.

+//      This class includes four different types of messages:

+//  - Success

+//  - Error

+//  - Warning

+//  - Information

+// 

+//  See README for basic usage instructions, or see samples/index.php for more advanced samples

+//

+//--------------------------------------------------------------------------------------------------

+// Changelog

+//--------------------------------------------------------------------------------------------------

+// 

+//      2011-05-15 - v1.0 - Initial Version

+//

+//--------------------------------------------------------------------------------------------------

+

+class Messages {

+        

+        //-----------------------------------------------------------------------------------------------

+        // Class Variables

+        //-----------------------------------------------------------------------------------------------       

+        var $msgId;

+        var $msgTypes = array( 'help', 'info', 'warning', 'success', 'error' );

+        var $msgClass = 'messages';

+        var $msgWrapper = "<div class='%s %s'><a href='#' class='closeMessage'>X</a>\n%s</div>\n";

+        var $msgBefore = '<p>';

+        var $msgAfter = "</p>\n";

+

+        

+        /**

+         * Constructor

+         * @author Mike Everhart

+         */

+        public function __construct() {

+        

+                // Generate a unique ID for this user and session

+                $this->msgId = md5(uniqid());

+                

+                // Create the session array if it doesnt already exist

+                if( !array_key_exists('flash_messages', $_SESSION) ) $_SESSION['flash_messages'] = array();

+                

+        }

+        

+        /**

+         * Add a message to the queue

+         * 

+         * @author Mike Everhart

+         * 

+         * @param  string   $type               The type of message to add

+         * @param  string   $message            The message

+         * @param  string   $redirect_to        (optional) If set, the user will be redirected to this URL

+         * @return  bool 

+         * 

+         */

+        public function add($type, $message, $redirect_to=null) {

+                

+                if( !isset($_SESSION['flash_messages']) ) return false;

+                

+                if( !isset($type) || !isset($message[0]) ) return false;

+

+                // Replace any shorthand codes with their full version

+                if( strlen(trim($type)) == 1 ) {

+                        $type = str_replace( array('h', 'i', 'w', 'e', 's'), array('help', 'info', 'warning', 'error', 'success'), $type );

+                

+                // Backwards compatibility...

+                } elseif( $type == 'information' ) {

+                        $type = 'info'; 

+                }

+                

+                // Make sure it's a valid message type

+                if( !in_array($type, $this->msgTypes) ) die('"' . strip_tags($type) . '" is not a valid message type!' );

+                

+                // If the session array doesn't exist, create it

+                if( !array_key_exists( $type, $_SESSION['flash_messages'] ) ) $_SESSION['flash_messages'][$type] = array();

+                

+                $_SESSION['flash_messages'][$type][] = $message;

+

+                if( !is_null($redirect_to) ) {

+                        header("Location: $redirect_to");

+                        exit();

+                }

+                

+                return true;

+                

+        }

+        

+        //-----------------------------------------------------------------------------------------------

+        // display()

+        // print queued messages to the screen

+        //-----------------------------------------------------------------------------------------------

+        /**

+         * Display the queued messages

+         * 

+         * @author Mike Everhart

+         * 

+         * @param  string   $type     Which messages to display

+         * @param  bool         $print    True  = print the messages on the screen

+         * @return mixed              

+         * 

+         */

+        public function display($type='all', $print=true) {

+                $messages = '';

+                $data = '';

+                

+                if( !isset($_SESSION['flash_messages']) ) return false;

+                

+                if( $type == 'g' || $type == 'growl' ) {

+                        $this->displayGrowlMessages();

+                        return true;

+                }

+                

+                // Print a certain type of message?

+                if( in_array($type, $this->msgTypes) ) {

+                        foreach( $_SESSION['flash_messages'][$type] as $msg ) {

+                                $messages .= $this->msgBefore . $msg . $this->msgAfter;

+                        }

+

+                        $data .= sprintf($this->msgWrapper, $this->msgClass, $type, $messages);

+                        

+                        // Clear the viewed messages

+                        $this->clear($type);

+                

+                // Print ALL queued messages

+                } elseif( $type == 'all' ) {

+                        foreach( $_SESSION['flash_messages'] as $type => $msgArray ) {

+                                $messages = '';

+                                foreach( $msgArray as $msg ) {

+                                        $messages .= $this->msgBefore . $msg . $this->msgAfter; 

+                                }

+                                $data .= sprintf($this->msgWrapper, $this->msgClass, $type, $messages);

+                        }

+                        

+                        // Clear ALL of the messages

+                        $this->clear();

+                

+                // Invalid Message Type?

+                } else { 

+                        return false;

+                }

+                

+                // Print everything to the screen or return the data

+                if( $print ) { 

+                        echo $data; 

+                } else { 

+                        return $data; 

+                }

+        }

+        

+        

+        /**

+         * Check to  see if there are any queued error messages

+         * 

+         * @author Mike Everhart

+         * 

+         * @return bool  true  = There ARE error messages

+         *               false = There are NOT any error messages

+         * 

+         */

+        public function hasErrors() { 

+                return empty($_SESSION['flash_messages']['error']) ? false : true;      

+        }

+        

+        /**

+         * Check to see if there are any ($type) messages queued

+         * 

+         * @author Mike Everhart

+         * 

+         * @param  string   $type     The type of messages to check for

+         * @return bool                   

+         * 

+         */

+        public function hasMessages($type=null) {

+                if( !is_null($type) ) {

+                        if( !empty($_SESSION['flash_messages'][$type]) ) return $_SESSION['flash_messages'][$type];     

+                } else {

+                        foreach( $this->msgTypes as $type ) {

+                                if( !empty($_SESSION['flash_messages']) ) return true;  

+                        }

+                }

+                return false;

+        }

+        

+        /**

+         * Clear messages from the session data

+         * 

+         * @author Mike Everhart

+         * 

+         * @param  string   $type     The type of messages to clear

+         * @return bool 

+         * 

+         */

+        public function clear($type='all') { 

+                if( $type == 'all' ) {

+                        unset($_SESSION['flash_messages']); 

+                } else {

+                        unset($_SESSION['flash_messages'][$type]);

+                }

+                return true;

+        }

+        

+        public function __toString() { return $this->hasMessages();     }

+

+        public function __destruct() {

+                //$this->clear();

+        }

+

+

+} // end class

+?>
\ No newline at end of file
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index f9bcf85b..80bf6919 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -12,6 +12,7 @@ class Poche
 {
     public $store;
     public $tpl;
+    public $messages;
 
     function __construct($storage_type)
     {
@@ -41,6 +42,9 @@ class Poche
             'cache' => CACHE,
         ));
         $this->tpl->addExtension(new Twig_Extensions_Extension_I18n());
+        # filter to display domain name of an url
+        $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
+        $this->tpl->addFilter($filter);
 
         Tools::initPhp();
         Session::init();
@@ -113,10 +117,12 @@ class Poche
             case 'toggle_fav' :
                 $this->store->favoriteById($id);
                 Tools::logm('mark as favorite link #' . $id);
+                Tools::redirect();
                 break;
             case 'toggle_archive' :
                 $this->store->archiveById($id);
                 Tools::logm('archive link #' . $id);
+                Tools::redirect();
                 break;
             default:
                 break;
@@ -174,16 +180,21 @@ class Poche
 
     public function updatePassword()
     {
-        if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
-            if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
-                if (!MODE_DEMO) {
+        if (MODE_DEMO) {
+            $this->messages->add('i', 'in demo mode, you can\'t update your password');
+            Tools::logm('in demo mode, you can\'t do this');
+        }
+        else {
+            if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
+                if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
                     Tools::logm('password updated');
+                    $this->messages->add('s', 'your password has been updated');
                     $this->store->updatePassword(Tools::encodeString($_POST['password'] . $_SESSION['login']));
                     Session::logout();
                     Tools::redirect();
                 }
                 else {
-                    Tools::logm('in demo mode, you can\'t do this');
+                    $this->messages->add('e', 'the two fields have to be filled & the password must be the same in the two fields');
                 }
             }
         }
@@ -194,7 +205,7 @@ class Poche
         if (!empty($_POST['login']) && !empty($_POST['password'])) {
             if (Session::login($_SESSION['login'], $_SESSION['pass'], $_POST['login'], Tools::encodeString($_POST['password'] . $_POST['login']))) {
                 Tools::logm('login successful');
-
+                $this->messages->add('s', 'login successful, welcome to your poche');
                 if (!empty($_POST['longlastingsession'])) {
                     $_SESSION['longlastingsession'] = 31536000;
                     $_SESSION['expires_on'] = time() + $_SESSION['longlastingsession'];
@@ -205,9 +216,11 @@ class Poche
                 session_regenerate_id(true);
                 Tools::redirect($referer);
             }
+            $this->messages->add('e', 'login failed, bad login or password');
             Tools::logm('login failed');
             Tools::redirect();
         } else {
+            $this->messages->add('e', 'login failed, you have to fill all fields');
             Tools::logm('login failed');
             Tools::redirect();
         }
@@ -215,6 +228,7 @@ class Poche
 
     public function logout()
     {
+        $this->messages->add('s', 'logout successful, see you soon!');
         Tools::logm('logout');
         Session::logout();
         Tools::redirect();
@@ -244,6 +258,7 @@ class Poche
             # the second <ol> is for read links
             $read = 1;
         }
+        $this->messages->add('s', 'import from instapaper completed');
         Tools::logm('import from instapaper completed');
         Tools::redirect();
     }
@@ -272,6 +287,7 @@ class Poche
             # the second <ul> is for read links
             $read = 1;
         }
+        $this->messages->add('s', 'import from pocket completed');
         Tools::logm('import from pocket completed');
         Tools::redirect();
     }
@@ -300,6 +316,7 @@ class Poche
             if ($url->isCorrect())
                 $this->action('add', $url);
         }
+        $this->messages->add('s', 'import from Readability completed');
         Tools::logm('import from Readability completed');
         Tools::redirect();
     }
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 834940ff..7bc8830a 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -210,4 +210,15 @@ class Tools
     {
         return ((isset ($_REQUEST["$var"])) ? htmlentities($_REQUEST["$var"]) : $default);
     }
+
+    public static function getDomain($url)
+    {
+      $pieces = parse_url($url);
+      $domain = isset($pieces['host']) ? $pieces['host'] : '';
+      if (preg_match('/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.[a-z\.]{2,6})$/i', $domain, $regs)) {
+        return $regs['domain'];
+      }
+      
+      return FALSE;
+    }
 }
\ No newline at end of file
diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php
index 27be1857..d49df190 100644
--- a/inc/poche/config.inc.php
+++ b/inc/poche/config.inc.php
@@ -15,6 +15,7 @@ define ('CONVERT_LINKS_FOOTNOTES', FALSE);
 define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
 define ('DOWNLOAD_PICTURES', FALSE);
 define ('SHARE_TWITTER', TRUE);
+define ('SHARE_MAIL', TRUE);
 define ('SALT', '464v54gLLw928uz4zUBqkRJeiPY68zCX');
 define ('ABS_PATH', 'assets/');
 define ('TPL', './tpl');
@@ -34,9 +35,11 @@ require_once './inc/store/store.class.php';
 require_once './inc/store/' . $storage_type . '.class.php';
 require_once './vendor/autoload.php';
 require_once './inc/3rdparty/simple_html_dom.php';
+require_once './inc/3rdparty/class.messages.php';
 
 if (DOWNLOAD_PICTURES) {
     require_once './inc/poche/pochePictures.php';
 }
 
-$poche = new Poche($storage_type);
\ No newline at end of file
+$poche = new Poche($storage_type);
+$poche->messages = new Messages();
\ No newline at end of file