Changeset 312 for messages

Timestamp:

05/30/08 16:59:14 (6 months ago)

Author:

dramirez

Message:

Messages 0.3

Files:

• messages/trunk/CHANGELOG.txt (modified) (1 diff)
• messages/trunk/CONTRIBUTORS.txt (modified) (1 diff)
• messages/trunk/README.txt (modified) (2 diffs)
• messages/trunk/default_template.php (modified) (1 diff)
• messages/trunk/index.php (modified) (1 diff)
• messages/trunk/languages/es_CO/LC_MESSAGES/elgg.mo (modified) (previous)
• messages/trunk/languages/es_CO/LC_MESSAGES/es_CO.po (modified) (5 diffs)
• messages/trunk/lib.php (modified) (5 diffs)
• messages/trunk/lib/messages_config.php (modified) (1 diff)
• messages/trunk/lib/messages_init.php (modified) (2 diffs)
• messages/trunk/lib/messages_message_detailedview.php (modified) (3 diffs)
• messages/trunk/lib/messages_new.php (modified) (1 diff)
• messages/trunk/lib/messages_sidebar_link.php (modified) (3 diffs)
• messages/trunk/lib/messages_view.php (modified) (3 diffs)
• messages/trunk/messages_actions.php (modified) (3 diffs)
• messages/trunk/plugin.info (modified) (1 diff)
• messages/trunk/templates/messages_detailed_message.html (modified) (2 diffs)
• messages/trunk/templates/messages_message.html (modified) (1 diff)
• messages/trunk/templates/messages_messages.html (modified) (2 diffs)

messages/trunk/CHANGELOG.txt

@@ -1 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-Version 0.2.1
-  Translations to nl (Thanks to Daniel Dubbeldam)

messages/trunk/CONTRIBUTORS.txt

@@ -9 +9 @@
-  Daniel Dubbeldam
-    Translations to nl
-  Pasi Havia (http://www.elgg.org/encore)
-        Translations to fi
-        Some 0.9 compatibility bug fixes

messages/trunk/README.txt

@@ +1 @@
+-------------------------------------------------------------------------------------------------------
+NOTE:
+  If your are using Elgg (<=0.9.2) or a svn checkout previous to the changeset 1595 
+  you need to apply the patch provided with the ticket #359 (http://classic.elgg.org/trac/ticket/359)
+
+-------------------------------------------------------------------------------------------------------
+
-Add the following lines to the .htacess file:
-
@@ -18 +25 @@
-If you want to change this behavior you must change the value of MESSAGES_SIDEBAR_NO_MEMBER_LINK
-in the 'messages/lib/messages_config.php' file.
-
-By default the plugin enable send messages for communities. 
-
-If you want to change this behavior you must change the value of MESSAGES_COMMUNITY_MESSAGES in 
-the 'messages/lib/messages_config.php' file.

messages/trunk/default_template.php

@@ -6 +6 @@
- * @copyright Corporación Somos Más - 2007
-*/
+global $template;
+global $template_definition;
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-?>

messages/trunk/index.php

@@ -11 +11 @@
-
-define("context", "messages");
+
-templates_page_setup();
+templates_js_setup("messages");
-
-$title = run("profile:display:name") . " :: " . __gettext("Messages");

messages/trunk/languages/es_CO/LC_MESSAGES/es_CO.po

@@ -1 @@
-
-
+
-# This file is distributed under the same license as the PACKAGE package.
-FIRST AUTHOR <EMAIL@ADDRESS>, YEAR
+Nicols Martn <nicolas@somosmas.org>, 2007
-#
-msgid ""
@@ -9 +8 @@
-"POT-Creation-Date: 2007-01-06 02:52+0000\n"
-"PO-Revision-Date: 2007-02-17 16:14+0000\n"
-ás Martín <
+s Martn  
-"Language-Team: Spanish (O2O) <nicolas@somosmas.org>\n"
-"MIME-Version: 1.0\n"
@@ -106 +105 @@
-#: lib.php:26
-msgid "Your Messages"
-is M
+
-
-#: lib.php:40
@@ -114 +113 @@
-#: lib.php:45
-msgid "Compose"
-Compone
+Redacta
-
-#: lib.php:50
@@ -231 +230 @@
-msgid "Send Message"
-msgstr "Enviar mensaje"
+
+#: lib/messages_new.php:69:
+msgid "Send"
+msgstr "Enviar"
+
+#: lib/messages_message_detailedview.php:59:
+msgid "Previous"
+msgstr "Anterior"
+
+#: lib/messages_init.php:22:
+msgid "You must be logged in to send a message to another user!."
+msgstr "Para enviar mensajes a usuarios del sitio debes ingresar primero!"
+
+#: lib/messages_init.php:23:
+msgid "If you are not registered in this site yet, please fill the following form."
+msgstr "Si no te has registrado aún, puedes hacerlo llenando el siguiente formulario."
+

messages/trunk/lib.php

@@ -10 +10 @@
-
-  if (isloggedin() && user_info("user_type", $_SESSION['userid']) != "external") {
-    // Add the JavaScript functions
-    // Lose the trailing slash
-    $url= substr($CFG->wwwroot, 0, -1);
-    $metatags .= "<script language=\"javascript\" type=\"text/javascript\" src=\"$url/mod/messages/messages.js\"></script>";
-    $metatags .= "<link rel=\"stylesheet\" href=\"" . $CFG->wwwroot . "mod/messages/css.css\" type=\"text/css\" media=\"screen\" />";
-
@@ -21 +17 @@
-        'name' => 'messages',
-        'html' => '<li><a href="' . $CFG->wwwroot . $_SESSION['username'] . '/messages/" class="selected">' .
-            
+
-    } else {
-      $PAGE->menu[]= array (
@@ -79 +75 @@
-  $function['users:infobox:menu:text'][] = $CFG->dirroot ."/mod/messages/lib/messages_sidebar_link.php";
-
-
+
+
-  // Inits the display field module param for the 'select' input field
-  // I know, I know this is a big cannon to kill a fly, but I want to use the display_input_field function :P
@@ -88 +85 @@
-    $CFG->display_field_module["as_select"]= "messages";
-  }
+  
-}
-
@@ -132 +130 @@
-}
-
+function messages_send_message($from,$recipients,$title,$message,$sent_user_msg=false){
+  global $CFG,$messages;
+
+  $recipients = (!is_array($recipients))?array($recipients):$recipients;
+
+  $msgs = 0;
+  $msg = new StdClass;
+  $msg->from_id = trim($from);
+  $msg->title = trim($title);
+  $msg->posted = time();
+
+  foreach ($recipients as $rcpt) {
+    $msg->to_id = trim($rcpt);
+    $message_ = str_replace("{{USER}}",user_info("name",$rcpt),$message);
+    $msg->body = trim($message_);
+    $insert_id = insert_record('messages', $msg);
+    if ($insert_id != -1) {
+      $msgs++;
+    }
+    // Send the email confirmation if configured
+    // Don't use the weblog plug-in hook because it inserts data in the messages table too
+    $notifications = user_flag_get("emailnotifications", $msg->to_id);
+    if ($notifications) {
+      $email_from = new StdClass;
+      $email_from->email = $CFG->noreplyaddress;
+      $email_from->name = $CFG->sitename;
+       
+      if(!$sent_user_msg){
+        $email_message = sprintf(__gettext("You have received a message from %s."), user_info("name", $msg->from_id));
+        $email_message .= "\n\n";
+        $email_message .= sprintf(__gettext("To reply, click here: %s"), $CFG->wwwroot . user_info("username", $msg->to_id) . "/messages/");
+        $email_message = wordwrap($email_message);
+      }
+      else{
+        $email_message = wordwrap($message);
+      }
+      if ($email_to = get_record_sql("select * from " . $CFG->prefix . "users where ident = " . $msg->to_id)) {
+        if (!email_to_user($email_to, $email_from, $msg->title, $email_message . "\n\n\n" . __gettext("You cannot reply to this message by email."))) {
+          $messages[] = __gettext("Failed to send email. An unknown error occurred.");
+        }
+      }
+    }
+  }
+  return $msgs;
+}
+
-?>

messages/trunk/lib/messages_config.php

@@ -8 +8 @@
- * @copyright Corporación Somos Más - 2007
- */
- 
- /**
-would be
+if
-  * Type: boolean
-  */
-
-
-
-
-
-
-
+
-?>

messages/trunk/lib/messages_init.php

@@ -1 +1 @@
-<?php
+
-/*
- * This script initialize the enviroment for the private messages plug-in.
@@ -10 +11 @@
-global $USER, $messages;
-if ($profile_name = optional_param('profile_name')) {
-  
-    
-  
+       
+               
+       
-}
-
-if (empty ($profile_id)) {
-  
+       
-}
-
-if (!logged_on) {
-
-
+
+
+
+
+
-}
-if ($profile_id != $USER->ident || !logged_on) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-?>

messages/trunk/lib/messages_message_detailedview.php

@@ -30 +30 @@
-    $author->ident= -1;
-  }
-
+,60
-
-  $date= strftime("%d %b %Y, %H:%M", $msg->posted);
@@ -46 +46 @@
-  $links .= '&nbsp;<a href="' . $CFG->wwwroot . 'mod/messages/messages_actions.php?action=delete&amp;sent=' . $sent . '&amp;msg_id=' . $msg->ident . '" onclick="return confirm(\'' . $returnConfirm . '\')">' . $Delete . '</a> |';
-
+  // Obtaining the previous and next messages for put the links here for easy navigation
+  $msgs_ids = $_SESSION['messages_ids'.$sent];
+
+  for($ii=0; $ii < count($msgs_ids); $ii++){
+        if($msgs_ids[$ii] == $msg->ident){
+                $previous = ($ii>0)? $msgs_ids[$ii-1] : -1;
+      $next = (($ii + 1) < count($msgs_ids))? $msgs_ids[$ii+1] : -1;
+        }
+  }  
+
+  if($previous!=-1){
+    $msg_nav= '<a href="' . url . $_SESSION['username'] . '/messages/view/' . $previous . "/$sent\">" . __gettext("Previous") . "</a>";
+  }
+  $msg_nav.="&nbsp;|&nbsp;";
+  if($next!=-1){
+    $msg_nav.= '<a href="' . url . $_SESSION['username'] . '/messages/view/' . $next . "/$sent\">" . __gettext("Next") . "</a>";
+  }
+  
-  // Updated the message to the read status
-  if ($msg->status == "unread" && $msg->to_id == $profile_id) {
@@ -60 +78 @@
-    'from_icon' => $author->icon,
-    'body' => $body,
-
+
+
-  ));
-}

messages/trunk/lib/messages_new.php

@@ -28 +28 @@
-      $friend = get_record("users", "ident", $friend->friend);
-      if ($friend) {
-
-
-
-
-
+
+
+
-        }
-      }

messages/trunk/lib/messages_sidebar_link.php

@@ -1 +1 @@
-<?php
+
+
-/*
- * This script shows the 'Send Message' link in the sidebar
- *
-,$USER
+
- *
- * @author Diego Andrés Ramírez Aragón <diego@somosmas.org>
@@ -10 +12 @@
-
-global $CFG, $USER;
-
+page_
-
-$community_membership_query = 'SELECT COUNT(u.ident) FROM ' . $CFG->prefix . 'friends f';
@@ -16 +18 @@
-$community_membership_query .= ' WHERE f.owner = ? AND f.friend = ?';
-
-owner != $_SESSION['userid'] && $
-
-
-
-
+page_owner != $_SESSION['userid'] && $page_
+page_
+ 
+page_
+page_
-    $messages_link = '';
-  }
-  else if(!MESSAGES_COMMUNITY_MESSAGES && user_type($owner) == "community" ){
-        $messages_link = '';
-  }
-  $run_result .= $messages_link;

messages/trunk/lib/messages_view.php

@@ -51 +51 @@
-}
-
-//$posts = get_records_select('messages', "$where_sent AND from_id != -1 ", null, 'posted DESC', '*', $msg_offset, $msgs_per_page);
-//$numberofposts = count_records_select('messages', "$where_sent AND from_id != -1 ");
-
-
+
+
+
+
+
-$numberofposts = count_records_select('messages', "$where_sent");
-
@@ -70 +72 @@
-  $next = __gettext("Next");
-
-  if ($numberofposts - ($msg_offset + $msgs_per_page) > 0) {
-    $display_msg_offset = $msg_offset + $msgs_per_page;
-    $pagging .=<<< END
-
-                <a href="{$CFG->wwwroot}{$msg_name}/messages/{$filterlink}msg_offset/{$display_msg_offset}">$next &gt;&gt;</a>
-
-END;
-  }
-  if ($msg_offset > 0) {
-    $display_msg_offset = $msg_offset - $msgs_per_page;
@@ -85 +79 @@
-    $pagging .=<<< END
-
- <a href="{$CFG->wwwroot}{$msg_name}/messages/{$filterlink}msg_offset/{$display_msg_offset}">&lt;&lt;
+<a href="{$CFG->wwwroot}{$msg_name}/messages/{$filterlink}msg_offset/{$display_msg_offset}"><small>&lt;&lt;</small>
-
-END;
-  }
-
+  if ($numberofposts - ($msg_offset + $msgs_per_page) > 0) {
+    $display_msg_offset = $msg_offset + $msgs_per_page;
+    $pagging .=<<< END
+
+                &nbsp;&nbsp;<a href="{$CFG->wwwroot}{$msg_name}/messages/{$filterlink}msg_offset/{$display_msg_offset}">$next <small>&gt;&gt;</small></a>
+
+END;
+  }
-}
-

messages/trunk/messages_actions.php

@@ -34 +34 @@
- * @author Diego Andrés Ramírez Aragón <diego@somosmas.org>
- * @copyright Corporación Somos Más - 2007
-
+ 
-
-require_once (dirname(dirname(__FILE__)) . "/../includes.php");
-require_once (dirname(__FILE__) . "/lib/messages_config.php");
-
-/**
@@ -96 +95 @@
-    if ($from != -1 && $to != -1) {
-      if (trim($body) != "" && trim($subject) != "") {
-        $msg = new StdClass;
-        $msg->from_id = trim($from);
-        $msg->title = trim($subject);
-        $msg->body = trim($body);
-        $msg->posted = time();
-
-        $recipients = array ();
-        $recipient = get_record("users", "ident", $to);
-       
-        if($recipient->user_type == "community" && !MESSAGES_COMMUNITY_MESSAGES){
-                $messages[] = __gettext("The administrator doesn't allow send community messages");
-          define('redirect_url', $redirect_url);
-          break;
-        }
-        
-        if ($recipient->user_type == "community") {
-          $members = get_records_sql('SELECT u.*, f.ident AS friendident FROM ' . $CFG->prefix . 'friends f ' .
-                                     'JOIN ' . $CFG->prefix . 'users u ON u.ident = f.owner ' .
-                                     'WHERE f.friend = ? AND u.user_type = ?', array ($to,'person'));
-
-          foreach ($members as $key => $infoMember) {
-            $recipients[] = $key;
-          }
+          $subject = "[" . $recipient->name . "] " .$subject;
-        } else {
-          $recipients[] = $to;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        if ($msgs == count($recipients)) {
-          $messages[] = __gettext("Your message was sent");
@@ -176 +133 @@
-        switch ($action_type) {
-          case "read";
-  
-  
-  
-  
-  
+
+
+
+
+
-          case "unread";
-  
-  
-  
-  
-  
+
+
+
+
+
-          case "delete";
-  
-  
+
+
-        }
-      }

messages/trunk/plugin.info

@@ -1 +1 @@
-Maintainer: Diego Andrés Ramírez Aragón <diego@somosmas.org>
-Title: Messages plugin
-2.
+
-Package: messages
-Distribution-URL: http://elgg.org/mod/plugins/plugin.php?id=18

messages/trunk/templates/messages_detailed_message.html

@@ -2 +2 @@
-   <h2>{{title}}</h2>
-        <div class="user"><!-- Open class user -->
-
+
-        </div><!-- Close class user -->
-        <div class="post"><!-- Open class post -->
@@ -9 +9 @@
-    <div class="info"><!-- Open class info -->
-            <p>
-
+
+
-            </p>
-        </div><!-- Close class info -->

messages/trunk/templates/messages_message.html

@@ -2 +2 @@
-      <td {{msg_style}} style="text-align:center;padding-left:2px;padding-right:2px">{{index}}</td>
-      <td {{msg_style}} style="text-align:center;padding-left:2px;padding-right:2px">{{mark}}</td>
-valign="middle">{{from_icon}}&nbsp;{{from_name}}
-{{title}}
-{{date}}
+align="center" valign="middle">{{from_icon}}<br/><small>{{from_name}}</small>
+<p>{{title}}</p>
+<p>{{date}}</p>
-     </tr>

messages/trunk/templates/messages_messages.html

@@ -2 +2 @@
-<form method="post" name="message_form" action="{{action_form}}" onsubmit="return submitForm();">
-   <input type="hidden" name="sent" value="{{sent}}">
-2>{{title}}</h2
+3>{{title}}</h3
-    <table id="messages_table" cellspacing="0" width="100%">
-     <tr>
-      <th colspan="4" style="text-align:left">
-        
+       <p>
-        <select name="message_action_type" id="message_action_type" onchange="submitMessagesAction(this,message_form,'{{returnConfirm}}')">
-          <option value="-1">{{actionMsg}}</option>
-          {{action_options}}
-      </select
+     </select></p
-      </th>
-      <th>&nbsp;</th>
@@ -16 +16 @@
-     <tr>
-      <th width="4%" colspan="2">&nbsp;</th>
-{{from_to}}
-{{subject}}
-{{date}}
+<p>{{from_to}}</p>
+<p>{{subject}}</p>
+<p>{{date}}</p>
-     </tr>
-        {{messages}}
-     <tr>
-{{paging}}
+<p>{{paging}}</p>
-      <th>&nbsp;</th>
-     </tr>