Author: ralfbecker
New Revision: 56058
URL: http://svn.stylite.de/viewvc/egroupware?rev=56058&view=rev
Log:
use new API for notifiations
Removed:
trunk/notifications/setup/etemplates.inc.php
Modified:
trunk/notifications/download.php
trunk/notifications/inc/class.notifications.inc.php
trunk/notifications/inc/class.notifications_ajax.inc.php
trunk/notifications/inc/class.notifications_email.inc.php
trunk/notifications/inc/class.notifications_iface.inc.php
trunk/notifications/inc/class.notifications_jdesk_ajax.inc.php
trunk/notifications/inc/class.notifications_jpopup.inc.php
trunk/notifications/inc/class.notifications_popup.inc.php
trunk/notifications/inc/class.notifications_push.inc.php
trunk/notifications/inc/class.notifications_winpopup.inc.php
trunk/notifications/inc/hook_admin.inc.php
trunk/notifications/inc/hook_after_navbar.inc.php
trunk/notifications/setup/setup.inc.php
trunk/notifications/setup/tables_update.inc.php
— trunk/notifications/download.php (original)
+++ trunk/notifications/download.php Fri May 6 11:19:36 2016
@@ -9,6 +9,8 @@
-
@package notifications
-
@version $Id$
*/
+use EGroupware\Api;
$GLOBALS[‘egw_info’] = array(
‘flags’ => array(
@@ -31,8 +33,8 @@
error_log("copy(’$document’, ‘$archive’ returned ".array2string($ret));
$document = ‘zip://’.$archive.’#’.($config_file = ‘lib/conf/egwnotifier.const.xml’);
-$xml = file_get_contents($document);
-//html::content_header(‘egwnotifier.const.xml’, ‘application/xml’, bytes($xml)); echo $xml; exit;
+$xml_in = file_get_contents($document);
+//Api\Header\Content::type(‘egwnotifier.const.xml’, ‘application/xml’, bytes($xml_in)); echo $xml_in; exit;
function replace_callback($matches)
{
@@ -90,11 +92,11 @@
$htmlscflags = 16; // #define ENT_XML1 16
}
- return ‘<’.$matches[1].’>’.htmlspecialchars($replacement, $htmlscflags, translation::charset()).’</’.$matches[1].’>’;
- return ‘<’.$matches[1].’>’.htmlspecialchars($replacement, $htmlscflags, Api\Translation::charset()).’</’.$matches[1].’>’;
}
-$xml = preg_replace_callback(’/<((egw_|MI_)[^>]+)>(.)</[a-z0-9_-]+>/iU’, ‘replace_callback’, $xml);
-//html::content_header(‘egwnotifier.replace.xml’, ‘application/xml’, bytes($xml)); echo $xml; exit;
+$xml = preg_replace_callback(’/<((egw_|MI_)[^>]+)>(.)</[a-z0-9_-]+>/iU’, ‘replace_callback’, $xml_in);
+//Api\Header\Content::type(‘egwnotifier.const.xml’, ‘application/xml’, bytes($xml)); echo $xml; exit;
/* does NOT work, fails in addFromString 
$zip = new ZipArchive;
@@ -115,7 +117,7 @@
clearstatcache();
ob_end_clean();
-html::content_header(‘egroupware-notifier-’.$GLOBALS[‘egw_info’][‘user’][‘account_lid’].’.jar’, ‘application/x-java-archive’, filesize($archive));
+Api\Header\Content::type(‘egroupware-notifier-’.$GLOBALS[‘egw_info’][‘user’][‘account_lid’].’.jar’, ‘application/x-java-archive’, filesize($archive));
readfile($archive,‘rb’);
@unlink($archive);
— trunk/notifications/inc/class.notifications.inc.php (original)
+++ trunk/notifications/inc/class.notifications.inc.php Fri May 6 11:19:36 2016
@@ -9,7 +9,7 @@
-if (!defined(‘SEP’)) define(‘SEP’,’/’);
+use EGroupware\Api;
/**
- Notifies users according to their preferences.
@@ -179,13 +179,13 @@
*/
public function __construct() {
-
-
@param boolean $reset=false true: reset all errors
-
-
@param boolean $reset =false true: reset all errors
-
@return array
*/
public static function errors($reset=false)
@@ -480,9 +480,9 @@
$ids[] = $receiver->account_id;
if ($GLOBALS[‘egw’]->acl->get_specific_rights_for_account($ids,‘run’,‘notifications’)) {
// read the users notification chain
-
$prefs = new preferences($receiver->account_id);
-
$preferences = $prefs->read();
-
$preferences = (object)$preferences[self::_appname];
-
$prefs = new Api\Preferences($receiver->account_id);
-
$preferences_all = $prefs->read();
-
$preferences = (object)$preferences_all[self::_appname];
if($preferences->notification_chain) {
// fallback: admin disabled user-chosen chain
if(!$notification_chain = $available_chains[$preferences->notification_chain]) {
@@ -508,6 +508,7 @@
}
foreach($notification_chain as $backend => $action) {
@@ -517,7 +518,7 @@
}
$notification_backend = self::_appname.'_'.$backend;
-
if(!file_exists(EGW_INCLUDE_ROOT.'/'. self::_appname.'/inc/class.'. $notification_backend. '.inc.php')) {
throw new Exception('file for '.$notification_backend. ' does not exist');
}
$obj = new $notification_backend( $this->sender, $receiver, $this->config, $preferences );
@@ -581,7 +582,7 @@
if(!empty($_message_plain)) {
$messages[‘plain’] = $_message_plain;
} else {
@@ -601,7 +602,7 @@
*/
public static function plain2html($_plain)
{
- private function get_addresspart($_address, $_part=‘email’) {
- private function get_addresspart($_address, $_part=‘email’)
- {
-
$parts = null;
if(strpos($_address,'<') && preg_match('/^(.*)\S?\<(.*)\>/',$_address, $parts)) { // _address contains a fullname part
$fullname = trim(trim($parts[1]),'\"');
$email = $parts[2];
@@ -649,11 +652,9 @@
switch($_part) {
case ‘fullname’:
return $fullname;
@@ -689,7 +690,7 @@
foreach($this->notification_chains as $key => $chain) {
$allow_chain = true;
if(is_array($chain)) {
@@ -728,7 +729,7 @@
// create descriptions for each chain key in each group
foreach($chain_groups as $name => $arr_name) {
${$arr_name.$suffix} = array();
@@ -744,12 +745,10 @@
}
}
return $chains_final;
— trunk/notifications/inc/class.notifications_ajax.inc.php (original)
+++ trunk/notifications/inc/class.notifications_ajax.inc.php Fri May 6 11:19:36 2016
@@ -10,6 +10,8 @@
+use EGroupware\Api;
+
/**
- Ajax methods for notifications
/
@@ -58,7 +60,7 @@
/*
- reference to global db object
-
-
-
@var Api\Db
*/
private $db;
@@ -81,7 +83,7 @@
/**
* the xml response object
*
-
-
@var Api\Json\Response
*/
private $response;
@@ -90,12 +92,12 @@
*
*/
public function __construct() {
@@ -116,7 +118,7 @@
// call a hook for notifications on new mail
//if ($GLOBALS['egw_info']['user']['apps']['mail']) $this->check_mailbox();
@@ -170,11 +172,11 @@
{
$message = substr_replace($message, ‘’, strpos($message, lang(‘Linked entries:’)));
}
-
$message = preg_replace('#</?a[^>]*>#is','',$message);
-
-
$message = 'data:text/html;charset=' . translation::charset() .';base64,'.base64_encode($message);
-
$message2 = preg_replace('#</?a[^>]*>#is','',$message);
-
-
$message3 = 'data:text/html;charset=' . Api\Translation::charset() .';base64,'.base64_encode($message2);
}
-
$this->response->apply('app.notifications.append',array($notification['notify_id'],$notification['notify_message'],$message));
-
$this->response->apply('app.notifications.append',array($notification['notify_id'],$notification['notify_message'],$message3));
}
switch($this->preferences[self::_appname]['egwpopup_verbosity']) {
— trunk/notifications/inc/class.notifications_email.inc.php (original)
+++ trunk/notifications/inc/class.notifications_email.inc.php Fri May 6 11:19:36 2016
@@ -1,6 +1,6 @@
<?php
/**
- * eGroupWare - Notifications
+ * EGroupware - Notifications
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package notifications
@@ -9,6 +9,8 @@
* @author Christian Binder
* @version $Id$
*/
+
+use EGroupware\Api;
/**
* User notification via email.
@@ -44,7 +46,7 @@
/**
* holds preferences object of user to notify
*
- * @var preferences
+ * @var Api\Preferences
*/
private $preferences;
@@ -74,7 +76,7 @@
{
unset($this->mail);
}
- $this->mail = new egw_mailer();
+ $this->mail = new Api\Mailer();
}
/**
@@ -139,13 +141,13 @@
if(is_null($_render_html)) { $_render_html = false; }
if(is_null($_render_external)) { $_render_external = true; }
$newline = $_render_html ? "
" : "\n";
- $hruler = $_render_html ? html::hr() : '';
+ $hruler = $_render_html ? Api\Html::hr() : '';
$rendered_links = array();
foreach($_links as $link) {
if($_render_external || ! $link->popup) { $link->view['no_popup'] = 1; }
// do not expose sensitive data
- $url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',html::link('/index.php', $link->view));
+ $url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',Api\Html::link('/index.php', $link->view));
// complete missing protocol and domain part if needed
if ($url{0} == '/' && $_render_external) {
$url = ($_SERVER['HTTPS'] || $GLOBALS['egw_info']['server']['enforce_ssl'] ? 'https://' : 'http://').
Modified: trunk/notifications/inc/class.notifications_iface.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/notifications/inc/class.notifications_iface.inc.php?rev=56058&r1=56057&r2=56058&view=diff
==============================================================================
--- trunk/notifications/inc/class.notifications_iface.inc.php (original)
+++ trunk/notifications/inc/class.notifications_iface.inc.php Fri May 6 11:19:36 2016
@@ -1,6 +1,6 @@
<?php
/**
- * eGroupWare - Notifications
+ * EGroupware - Notifications
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package notifications
@@ -15,7 +15,7 @@
interface notifications_iface {
/**
- * constructor
+ * constructor
*
* @param object $_sender
* @param object $_recipient
@@ -23,7 +23,7 @@
* @param object $_preferences
*/
public function __construct($_sender, $_recipient, $_config = null, $_preferences = null);
-
+
/**
* sends one notification to one recipient
*
Modified: trunk/notifications/inc/class.notifications_jdesk_ajax.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/notifications/inc/class.notifications_jdesk_ajax.inc.php?rev=56058&r1=56057&r2=56058&view=diff
==============================================================================
--- trunk/notifications/inc/class.notifications_jdesk_ajax.inc.php (original)
+++ trunk/notifications/inc/class.notifications_jdesk_ajax.inc.php Fri May 6 11:19:36 2016
@@ -8,6 +8,8 @@
* @link http://www.egroupware.org
* @author Stefan Werfling , Maik H�ttner
*/
+
+use EGroupware\Api;
/**
* jdesk Json methods for notifications
@@ -57,14 +59,14 @@
/**
* reference to global db object
*
- * @var egw_db
+ * @var Api\Db
*/
private $db;
/**
* the xml response object
*
- * @var xajaxResponse
+ * @var Api\Json\Response
*/
private $response;
@@ -74,17 +76,13 @@
*/
public function __construct()
{
- if( class_exists('xajaxResponse') )
- {
- $this->response = new xajaxResponse();
- }
+ $this->response = new Api\Json\Response();
$this->recipient = (object)$GLOBALS['egw']->accounts->read($GLOBALS['egw_info']['user']['account_id']);
- $this->config = (object)config::read(self::_appname);
+ $this->config = (object)Api\Config::read(self::_appname);
- $prefs = new preferences($this->recipient->account_id);
- $preferences = $prefs->read();
+ $prefs = new Api\Preferences($this->recipient->account_id);
$this->preferences = $prefs->read();
$this->db = $GLOBALS['egw']->db;
@@ -123,8 +121,6 @@
"message" => $message,
"details" => $details));
*/
-
- return $this->response->getXML();
}
/**
@@ -150,7 +146,9 @@
*
* @return boolean true or false
*/
- private function get_egwpopup($browserNotify = false) {
+ private function get_egwpopup($browserNotify = false)
+ {
+ unset($browserNotify); // not used
$message = '';
Modified: trunk/notifications/inc/class.notifications_jpopup.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/notifications/inc/class.notifications_jpopup.inc.php?rev=56058&r1=56057&r2=56058&view=diff
==============================================================================
--- trunk/notifications/inc/class.notifications_jpopup.inc.php (original)
+++ trunk/notifications/inc/class.notifications_jpopup.inc.php Fri May 6 11:19:36 2016
@@ -1,5 +1,4 @@
<?php
-
/**
* EGroupware - Notifications Java Desktop App
*
@@ -9,6 +8,8 @@
* @link http://www.egroupware.org
* @author Stefan Werfling , Maik H�ttner
*/
+
+use EGroupware\Api;
class notifications_jpopup implements notifications_iface
{
@@ -59,7 +60,7 @@
/**
* holds db object of SQL database
*
- * @var egw_db
+ * @var Api\Db
*/
private $db;
@@ -93,6 +94,8 @@
*/
public function send(array $_messages, $_subject=false, $_links=false, $_attachments=false)
{
+ unset($_attachments); // not used
+
$jmessage = array();
// app-message
@@ -119,7 +122,7 @@
}
$message = $this->render_infos($_subject)
- .html::hr()
+ .Api\Html::hr()
.$_messages['html'];
$jmessage['msghtml'] = $message;
@@ -133,7 +136,7 @@
* renders additional infos from sender and subject
*
* @param string $_subject
- * @return html rendered info as complete string
+ * @return string html rendered info as complete string
*/
private function render_infos($_subject = false) {
$infos = array();
@@ -141,7 +144,7 @@
$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
$infos[] = lang('Message from').': '.$sender;
- if(!empty($_subject)) { $infos[] = html::bold($_subject); }
+ if(!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
return implode($newline,$infos);
}
Modified: trunk/notifications/inc/class.notifications_popup.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/notifications/inc/class.notifications_popup.inc.php?rev=56058&r1=56057&r2=56058&view=diff
==============================================================================
--- trunk/notifications/inc/class.notifications_popup.inc.php (original)
+++ trunk/notifications/inc/class.notifications_popup.inc.php Fri May 6 11:19:36 2016
@@ -10,6 +10,8 @@
* @version $Id$
*/
+use EGroupware\Api;
+
/**
* Instant user notification with egroupware popup.
*
@@ -67,7 +69,7 @@
/**
* holds db object of SQL database
*
- * @var egw_db
+ * @var Api\Db
*/
private $db;
@@ -98,15 +100,17 @@
* @param array $_links
* @param array $_attachments
*/
- public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false) {
+ public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false)
+ {
+ unset($_attachments); // not used
// Check access log to see if user is still logged in
- if ( !egw_session::notifications_active($this->recipient->account_id) )
+ if ( !Api\Session::notifications_active($this->recipient->account_id) )
{
throw new Exception("User {$this->recipient->account_lid} isn't online. Can't send notification via popup");
}
$message = $this->render_infos($_subject)
- .html::hr()
+ .Api\Html::hr()
.(isset($_messages['popup'])&&!empty($_messages['popup'])?$_messages['popup']:$_messages['html'])
.$this->render_links($_links);
@@ -133,7 +137,7 @@
* should be moved to the ajax class later - like mentioned in the Todo
*
* @param array $_links
- * @return html rendered link(s) as complete string with jspopup or a new window
+ * @return string html rendered link(s) as complete string with jspopup or a new window
*/
private function render_links($_links = false) {
if(!is_array($_links) || count($_links) == 0) { return false; }
@@ -143,20 +147,19 @@
foreach($_links as $link) {
if(!$link->popup) { $link->view['no_popup'] = 1; }
- $url = html::link('/index.php', $link->view);
// do not expose sensitive data
- $url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$url);
+ $url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',
+ Api\Html::link('/index.php', $link->view));
// extract application-icon from menuaction
if($link->view['menuaction']) {
$menuaction_arr = explode('.',$link->view['menuaction']);
$application = $menuaction_arr[0];
- $image = $application ? html::image($application,'navbar',$link->text,'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
+ $image = $application ? Api\Html::image($application,'navbar',$link->text,'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
} else {
$image = '';
}
if($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
{
- $dimensions = explode('x', $link->popup);
$data = array(
"data-app = '{$link->app}'",
"data-id = '{$link->id}'",
@@ -164,14 +167,14 @@
"data-popup = '{$link->popup}'"
);
- $rendered_links[] = html::div($image.$link->text,implode(' ',$data),'link');
+ $rendered_links[] = Api\Html::div($image.$link->text,implode(' ',$data),'link');
} else {
- $rendered_links[] = html::div('
'.$image.$link->text.'','','link');
+ $rendered_links[] = Api\Html::div('
'.$image.$link->text.'','','link');
}
}
if(count($rendered_links) > 0) {
- return html::hr().html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
+ return Api\Html::hr().Api\Html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
}
}
@@ -179,9 +182,9 @@
* returns javascript to open a popup window: window.open(...)
*
* @param string $link link or this.href
- * @param string $target='_blank' name of target or this.target
- * @param int $width=750 width of the window
- * @param int $height=400 height of the window
+ * @param string $target ='_blank' name of target or this.target
+ * @param int $width =750 width of the window
+ * @param int $height =400 height of the window
* @return string javascript (using single quotes)
*/
private function jspopup($link,$target='_blank',$width=750,$height=410)
@@ -202,7 +205,7 @@
* renders additional infos from sender and subject
*
* @param string $_subject
- * @return html rendered info as complete string
+ * @return string html rendered info as complete string
*/
private function render_infos($_subject = false) {
$infos = array();
@@ -210,7 +213,7 @@
$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
$infos[] = lang('Message from').': '.$sender;
- if(!empty($_subject)) { $infos[] = html::bold($_subject); }
+ if(!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
return implode($newline,$infos);
}
Modified: trunk/notifications/inc/class.notifications_push.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/notifications/inc/class.notifications_push.inc.php?rev=56058&r1=56057&r2=56058&view=diff
==============================================================================
--- trunk/notifications/inc/class.notifications_push.inc.php (original)
+++ trunk/notifications/inc/class.notifications_push.inc.php Fri May 6 11:19:36 2016
@@ -10,9 +10,8 @@
* @version $Id$
*/
+use EGroupware\Api;
use EGroupware\Api\Json;
-
-use EGroupware\Api;
/**
* Class to push via notification polling and other json requests from client-side
@@ -34,7 +33,7 @@
/**
* Reference to global DB object
*
- * @var egw_db
+ * @var Api\Db
*/
public static $db;
@@ -113,7 +112,7 @@
{
self::$db->delete(self::TABLE, array(
'notify_type' => self::TYPE,
- 'notify_created < '.self::$db->from_unixtime(egw_session::heartbeat_limit()),
+ 'notify_created < '.self::$db->from_unixtime(Api\Session::heartbeat_limit()),
), __LINE__, __FILE__, self::APP);
}
Modified: trunk/notifications/inc/class.notifications_winpopup.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/notifications/inc/class.notifications_winpopup.inc.php?rev=56058&r1=56057&r2=56058&view=diff
==============================================================================
--- trunk/notifications/inc/class.notifications_winpopup.inc.php (original)
+++ trunk/notifications/inc/class.notifications_winpopup.inc.php Fri May 6 11:19:36 2016
@@ -9,6 +9,8 @@
* @author Christian Binder
* @version $Id$
*/
+
+use EGroupware\Api;
/**
* User notification via winpopup.
@@ -100,9 +102,12 @@
* @param array $_links
* @param array $_attachments
*/
- public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false) {
+ public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false)
+ {
+ unset($_links, $_attachments); // not used
+
$user_sessions = array();
- foreach (egw_session::session_list(0, 'asc', 'session_dla', true) as $session) {
+ foreach (Api\Session::session_list(0, 'asc', 'session_dla', true) as $session) {
if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) {
if($this->valid_ip($session['session_ip'])) {
$user_sessions[] = $session['session_ip'];
@@ -138,6 +143,7 @@
'/\[SENDER\]/' => $this->sender->account_fullname ? escapeshellarg($this->sender->account_fullname) : escapeshellarg($this->sender->account_email),
);
$command = preg_replace(array_keys($placeholders), $placeholders, $this->netbios_command);
+ $output = $returncode = null;
exec($command,$output,$returncode);
if($returncode != 0) {
throw new Exception("Failed sending notification message via winpopup. Error while executing the specified command.");
Modified: trunk/notifications/inc/hook_admin.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/notifications/inc/hook_admin.inc.php?rev=56058&r1=56057&r2=56058&view=diff
==============================================================================
--- trunk/notifications/inc/hook_admin.inc.php (original)
+++ trunk/notifications/inc/hook_admin.inc.php Fri May 6 11:19:36 2016
@@ -9,7 +9,9 @@
* @version $Id: hook_preferences.inc.php 22498 2006-09-25 10:20:46Z jaytraxx $
*/
-$file = Array( 'Site Configuration' => egw::link('/index.php', array(
+use EGroupware\Api\Egw;
+
+$file = Array( 'Site Configuration' => Egw::link('/index.php', array(
'menuaction' => 'admin.admin_config.index',
'appname' => $appname,
'ajax' => 'true',
Modified: trunk/notifications/inc/hook_after_navbar.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/notifications/inc/hook_after_navbar.inc.php?rev=56058&r1=56057&r2=56058&view=diff
==============================================================================
--- trunk/notifications/inc/hook_after_navbar.inc.php (original)
+++ trunk/notifications/inc/hook_after_navbar.inc.php Fri May 6 11:19:36 2016
@@ -1,6 +1,7 @@
<?php
/**
- * eGroupWare - Notifications
+ * EGroupware - Notifications
+ *
* serves the hook "after_navbar" to create the notificationwindow
*
* @abstract notificatonwindow is an empty and non displayed 1px div which gets rezised
@@ -12,17 +13,19 @@
* @author Cornelius Weiss
* @version $Id$
*/
+
+use EGroupware\Api;
if ($GLOBALS['egw_info']['user']['apps']['notifications'])
{
- $notification_config = config::read('notifications');
- translation::add_app('notifications');
+ $notification_config = Api\Config::read('notifications');
+ Api\Translation::add_app('notifications');
$popup_poll_interval = empty($notification_config['popup_poll_interval']) ? 60 : $notification_config['popup_poll_interval'];
echo '';
echo '
'.lang('Notification'). ''.
- html::submit_button('egwpopup_close_button', 'X', '', true, 'id="egwpopup_close_button"', 'close.button') .
+ Api\Html::submit_button('egwpopup_close_button', 'X', '', true, 'id="egwpopup_close_button"', 'close.button') .
'
Modified: trunk/notifications/setup/setup.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/notifications/setup/setup.inc.php?rev=56058&r1=56057&r2=56058&view=diff
==============================================================================
--- trunk/notifications/setup/setup.inc.php (original)
+++ trunk/notifications/setup/setup.inc.php Fri May 6 11:19:36 2016
@@ -15,7 +15,7 @@
}
$setup_info[NOTIFICATION_APP]['name'] = NOTIFICATION_APP;
-$setup_info[NOTIFICATION_APP]['version'] = '14.3';
+$setup_info[NOTIFICATION_APP]['version'] = '16.1';
$setup_info[NOTIFICATION_APP]['app_order'] = 1;
$setup_info[NOTIFICATION_APP]['tables'] = array('egw_notificationpopup');
$setup_info[NOTIFICATION_APP]['enable'] = 2;
@@ -37,11 +37,6 @@
/* Dependencies for this app to work */
$setup_info[NOTIFICATION_APP]['depends'][] = array(
- 'appname' => 'phpgwapi',
- 'versions' => Array('14.1')
+ 'appname' => 'api',
+ 'versions' => Array('16.1')
);
-$setup_info[NOTIFICATION_APP]['depends'][] = array(
- 'appname' => 'etemplate',
- 'versions' => Array('14.1')
-);
-
Modified: trunk/notifications/setup/tables_update.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/notifications/setup/tables_update.inc.php?rev=56058&r1=56057&r2=56058&view=diff
==============================================================================
--- trunk/notifications/setup/tables_update.inc.php (original)
+++ trunk/notifications/setup/tables_update.inc.php Fri May 6 11:19:36 2016
@@ -123,3 +123,7 @@
return $GLOBALS['setup_info']['notifications']['currentver'] = '14.3';
}
+function notifications_upgrade14_3()
+{
+ return $GLOBALS['setup_info']['notifications']['currentver'] = '16.1';
+}
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
