mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
CaMer0n
2009-11-11 16:02:42 +00:00
parent d7a0825cab
commit 217a2a2bd1
4 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
class2.php
View File

@@ -9,9 +9,9 @@
* General purpose file * General purpose file
* *
* $Source: /cvs_backup/e107_0.8/class2.php,v $ * $Source: /cvs_backup/e107_0.8/class2.php,v $
* $Revision: 1.153 $ * $Revision: 1.154 $
* $Date: 2009-10-31 17:57:15 $ * $Date: 2009-11-11 16:02:36 $
* $Author: secretr $ * $Author: e107coders $
* *
*/ */
// //
@@ -1007,7 +1007,7 @@ if ((e_QUERY == 'logout') || (($pref['user_tracking'] == 'session') && isset($_S
} }
cookie(e_COOKIE, '', (time() - 2592000)); cookie(e_COOKIE, '', (time() - 2592000));
$e_event->trigger('logout'); e107::getEvent()->trigger('logout');
header('location:'.e_BASE.'index.php'); header('location:'.e_BASE.'index.php');
exit(); exit();
} }

10
e107_admin/plugin.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
| $Revision: 1.54 $ | $Revision: 1.55 $
| $Date: 2009-11-05 17:32:17 $ | $Date: 2009-11-11 16:02:38 $
| $Author: secretr $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -452,7 +452,9 @@ class pluginManager{
function pluginUpgrade() function pluginUpgrade()
{ {
global $plugin,$pref; global $plugin,$pref,$admin_log;
$sql = e107::getDb();
$emessage = eMessage::getInstance(); $emessage = eMessage::getInstance();

15
e107_files/shortcode/wmessage.php
View File

@@ -1,6 +1,6 @@
<?php <?php
// $Id: wmessage.php,v 1.2 2009-07-09 20:51:57 e107coders Exp $ // $Id: wmessage.php,v 1.3 2009-11-11 16:02:40 e107coders Exp $
function wmessage_shortcode($parm) function wmessage_shortcode($parm)
{ {
@@ -17,15 +17,18 @@ function wmessage_shortcode($parm)
$full_url = 'news.php'; // Set a default in case $full_url = 'news.php'; // Set a default in case
$front_qry = ''; $front_qry = '';
$uc_array = explode(',', USERCLASS_LIST); $uc_array = explode(',', USERCLASS_LIST);
foreach ($pref['frontpage'] as $fk => $fp) if(varset($pref['frontpage']))
{ {
if (in_array($fk,$uc_array)) foreach ($pref['frontpage'] as $fk => $fp)
{ {
$full_url = $fp; if (in_array($fk,$uc_array))
break; {
$full_url = $fp;
break;
}
} }
list($front_url, $front_qry) = explode('?', $full_url.'?'); // extra '?' ensure the array is filled
} }
list($front_url, $front_qry) = explode('?', $full_url.'?'); // extra '?' ensure the array is filled
} }
if (strpos($front_url, 'http') === FALSE) $front_url = SITEURL.$front_url; if (strpos($front_url, 'http') === FALSE) $front_url = SITEURL.$front_url;

17
e107_handlers/event_class.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/event_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/event_class.php,v $
| $Revision: 1.9 $ | $Revision: 1.10 $
| $Date: 2009-09-25 20:18:34 $ | $Date: 2009-11-11 16:02:42 $
| $Author: secretr $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -53,7 +53,7 @@ class e107_event
* @param mixed $data * @param mixed $data
* @return mixed * @return mixed
*/ */
function trigger($eventname, &$data) function trigger($eventname, $data='')
{ {
/*if (isset($this->includes[$eventname])) /*if (isset($this->includes[$eventname]))
{ {
@@ -78,10 +78,12 @@ class e107_event
} }
if(is_array($evt_func)) //class, method if(is_array($evt_func)) //class, method
{ {
$class = $evt_func[0];
$method = $evt_func[1];
try try
{ {
$class = $evt_func[0];
$method = $evt_func[1];
$tmp = new $class($eventname); $tmp = new $class($eventname);
$ret = $tmp->{$method}($data, $eventname); //let callback know what event is calling it $ret = $tmp->{$method}($data, $eventname); //let callback know what event is calling it
unset($tmp); unset($tmp);
@@ -93,6 +95,9 @@ class e107_event
catch(Exception $e) catch(Exception $e)
{ {
//TODO log errors $eventname, $location, $class, $method //TODO log errors $eventname, $location, $class, $method
// echo "event didn't work. Class=".$class." Method=".$method;
// echo "<br />".$e;
exit;
} }
} }
if (function_exists($evt_func)) if (function_exists($evt_func))