mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Message Handler - base functionality finished, Image administration is using it now

Browse Source
This commit is contained in:
secretr
2008-12-11 22:09:11 +00:00
parent 87d254582c
commit 6ee09faaef
2 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
e107_admin/image.php
View File

@@ -9,8 +9,8 @@
* Image Administration Area * Image Administration Area
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
* $Revision: 1.14 $ * $Revision: 1.15 $
* $Date: 2008-12-11 11:25:21 $ * $Date: 2008-12-11 22:09:11 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -25,7 +25,9 @@ $e_sub_cat = 'image';
require_once("auth.php"); require_once("auth.php");
require_once(e_HANDLER."form_handler.php"); require_once(e_HANDLER."form_handler.php");
require_once(e_HANDLER."userclass_class.php"); require_once(e_HANDLER."userclass_class.php");
require_once(e_HANDLER."message_handler.php");
$rs = new form; $rs = new form;
$emessage = &eMessage::getInstance();
/* /*
* CLOSE - GO TO MAIN SCREEN * CLOSE - GO TO MAIN SCREEN
@@ -95,9 +97,8 @@ if (isset($_POST['submit_show_delete_multi']))
if(!empty($message)) if(!empty($message))
{ {
$admin_log->log_event('IMALAN_01', implode('[!br!]', $message), E_LOG_INFORMATIVE, ''); $admin_log->log_event('IMALAN_01', implode('[!br!]', $message), E_LOG_INFORMATIVE, '');
$message = implode(', ', $message).' '.IMALAN_28; $emessage->add(implode(', ', $message).' '.IMALAN_28, E_MESSAGE_SUCCESS);
} }
else $message = '';
} }
} }
@@ -131,6 +132,7 @@ if (isset($_POST['submit_show_deleteall']))
} }
$message = $count." ".IMALAN_26; $message = $count." ".IMALAN_26;
$emessage->add($message, E_MESSAGE_SUCCESS);
$admin_log->log_event('IMALAN_02', $message.$imgList,E_LOG_INFORMATIVE, ''); $admin_log->log_event('IMALAN_02', $message.$imgList,E_LOG_INFORMATIVE, '');
unset($imgList); unset($imgList);
} }
@@ -175,8 +177,9 @@ if (isset($_POST['submit_avdelete_multi']))
$sql->db_Update("user", "user_image='' WHERE user_id IN (".implode(',', $uids).")"); $sql->db_Update("user", "user_image='' WHERE user_id IN (".implode(',', $uids).")");
} }
$message = IMALAN_51.'<strong>'.implode(', ', $tmp).'</strong> '.IMALAN_28; $emessage->add(IMALAN_51.'<strong>'.implode(', ', $tmp).'</strong> '.IMALAN_28, E_MESSAGE_SUCCESS);
$admin_log->log_event('IMALAN_03', implode('[!br!]', $avList), E_LOG_INFORMATIVE, ''); $admin_log->log_event('IMALAN_03', implode('[!br!]', $avList), E_LOG_INFORMATIVE, '');
unset($search_users); unset($search_users);
} }
unset($avList, $tmp, $uids); unset($avList, $tmp, $uids);
@@ -199,30 +202,14 @@ if (isset($_POST['update_options']))
if ($admin_log->logArrayDiffs($tmp, $pref, 'IMALAN_04')) if ($admin_log->logArrayDiffs($tmp, $pref, 'IMALAN_04'))
{ {
save_prefs(); // Only save if changes save_prefs(); // Only save if changes
$message = IMALAN_9; $emessage->add(IMALAN_9, E_MESSAGE_SUCCESS);
} }
else else
{ {
$message = IMALAN_20; $emessage->add(IMALAN_20, E_MESSAGE_INFO);
} }
} }
/*
* SYSTEM MESSAGE
*/
//FIXME - better message handler, sysmessages CSS rules
if (varsettrue($message))
{
//no tablerender for sys-messages anymore
$message = "
<div class='s-message info'><span>".$message."</span></div>
";
}
else
{
$message = '';
}
/* /*
* SHOW AVATARS SCREEN * SHOW AVATARS SCREEN
*/ */
@@ -338,7 +325,7 @@ if (isset($_POST['show_avatars']))
} }
$ns->tablerender(IMALAN_18, $message.$text); $ns->tablerender(IMALAN_18, $emessage->render().$text);
} }
/* /*
@@ -512,7 +499,7 @@ if (isset($_POST['check_avatar_sizes']))
</table> </table>
"; ";
$ns->tablerender(IMALAN_37, $message.$text); $ns->tablerender(IMALAN_37, $emessage->render().$text);
} }
/* /*
@@ -642,7 +629,8 @@ $text = "
</div> </div>
</fieldset> </fieldset>
</form>"; </form>";
$ns->tablerender(IMALAN_7, $message.$text);
$ns->tablerender(IMALAN_7, $emessage->render().$text);
//Just in case... //Just in case...
if(!e_AJAX_REQUEST) require_once("footer.php"); if(!e_AJAX_REQUEST) require_once("footer.php");

28
e107_handlers/message_handler.php
View File

@@ -9,8 +9,8 @@
* Message Handler * Message Handler
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/message_handler.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/message_handler.php,v $
* $Revision: 1.4 $ * $Revision: 1.5 $
* $Date: 2008-12-11 18:13:10 $ * $Date: 2008-12-11 22:09:11 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -164,7 +164,7 @@ class eMessage
* @param bool $session merge with session messages * @param bool $session merge with session messages
* @return array|string messages * @return array|string messages
*/ */
function render($raw = true, $reset = true, $session = true) function render($raw = false, $reset = true, $session = true)
{ {
if($session) if($session)
{ {
@@ -278,6 +278,28 @@ class eMessage
return (array_key_exists($type, $this->_type_map())); return (array_key_exists($type, $this->_type_map()));
} }
/**
* Check for messages
*
* @param mixed $type
* @param bool $session
* @return bool
*/
function hasMessage($type = false, $session = true)
{
if(false === $type)
{
foreach ($this->_get_types() as $_type)
{
if($this->get($_type, true, false) || ($session && $this->getSession($_type, true, false)))
{
return true;
}
}
}
return ($this->get($type, true, false) || ($session && $this->getSession($type, true, false)));
}
/** /**
* Balnk type array structure * Balnk type array structure
* *