mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 03:24:20 +02:00
Code Issues Releases Wiki Activity

Closes #1801 Code cleanup. Deprecated method errors added.

Browse Source
This commit is contained in:
Cameron
2020-12-22 14:48:28 -08:00
parent 881670d92c
commit 402d1f4126
37 changed files with 347 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

512
e107_admin/emoticon.php
View File

@@ -29,8 +29,6 @@ require_once("auth.php");
$mes = e107::getMessage();
// Change the active emote pack
if (isset($_POST['active']))
{
@@ -38,7 +36,7 @@ if (isset($_POST['active']))
{
$pref['smiley_activate'] = (int) $_POST['smiley_activate'];
e107::getLog()->add($pref['smiley_activate'] ? 'EMOTE_02' : 'EMOTE_03', $pref['emotepack'], E_LOG_INFORMATIVE, '');
e107::getConfig()->set('smiley_activate',$pref['smiley_activate'])->save(true,true,true);
e107::getConfig()->set('smiley_activate', $pref['smiley_activate'])->save(true, true, true);
$update = true;
}
@@ -55,34 +53,34 @@ if (isset($_POST['active']))
$fl = e107::getFile();
$emote = new emotec;
$one_pack = FALSE;
$one_pack = false;
$filtered = e107::getParser()->filter($_POST);
// Check for pack-related buttons pressed
foreach($filtered as $key => $value)
foreach ($filtered as $key => $value)
{
if(strpos($key, "subPack_") !== false)
if (strpos($key, "subPack_") !== false)
{
$subpack = str_replace("subPack_", "", $key);
$emote->emoteConf($subpack);
break;
}
if(strpos($key, "XMLPack_") !== false)
if (strpos($key, "XMLPack_") !== false)
{
$subpack = str_replace("XMLPack_", "", $key);
$emote->emoteXML($subpack);
break;
}
if(strpos($key, "defPack_") !== false)
if (strpos($key, "defPack_") !== false)
{
e107::getConfig()->set('emotepack', str_replace("defPack_", "", $key))->save(true,true,true);
e107::getConfig()->set('emotepack', str_replace("defPack_", "", $key))->save(true, true, true);
e107::getLog()->add('EMOTE_01', $pref['emotepack'], E_LOG_INFORMATIVE, '');
break;
}
if(strpos($key, "scanPack_") !== false)
if (strpos($key, "scanPack_") !== false)
{
$one_pack = str_replace("scanPack_", "", $key);
break;
@@ -92,26 +90,27 @@ foreach($filtered as $key => $value)
// $ns->tablerender($caption, $mes->render() . $text);
$check = $emote->installCheck($one_pack);
if($check!==FALSE)
if ($check !== false)
{
$emote -> listPacks();
$emote->listPacks();
}
class emotec
{
var $packArray; // Stores an array of all available emote packs (as subdirectory names)
var $packArray; // Stores an array of all available emote packs (as subdirectory names)
function __construct()
{
/* constructor */
$fl = e107::getFile();
$this -> packArray = $fl->get_dirs(e_IMAGE."emotes");
$this->packArray = $fl->get_dirs(e_IMAGE . "emotes");
if(isset($_POST['sub_conf']))
{ // Update stored pack configuration
$this -> saveConf();
if (isset($_POST['sub_conf']))
{ // Update stored pack configuration
$this->saveConf();
}
}
@@ -119,24 +118,25 @@ class emotec
// List available emote packs
function listPacks()
{
$pref = e107::getPref();
$frm = e107::getForm();
$fl = e107::getFile();
$ns = e107::getRender();
$mes = e107::getMessage();
$mes = e107::getMessage();
$text = "
<ul class='nav nav-tabs'>
<li class='active'><a href='#emoticon-activate' data-toggle='tab'>".EMOLAN_1."</a></li>
<li><a href='#emoticon-packages' data-toggle='tab'>".EMOLAN_13."</a></li>
<li class='active'><a href='#emoticon-activate' data-toggle='tab'>" . EMOLAN_1 . "</a></li>
<li><a href='#emoticon-packages' data-toggle='tab'>" . EMOLAN_13 . "</a></li>
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='emoticon-activate'>
<fieldset>
<form method='post' action='".e_SELF."'>
<legend>".EMOLAN_1."</legend>
<form method='post' action='" . e_SELF . "'>
<legend>" . EMOLAN_1 . "</legend>
<table class='table adminform'>
<colgroup>
<col style='width:30%' />
@@ -145,18 +145,18 @@ class emotec
<tbody>
<tr>
<td>
".EMOLAN_4.":
" . EMOLAN_4 . ":
</td>
<td>
<div class='auto-toggle-area autocheck'>
".$frm->checkbox('smiley_activate', 1, varset($pref['smiley_activate'],0))."
" . $frm->checkbox('smiley_activate', 1, varset($pref['smiley_activate'], 0)) . "
</div>
</td>
</tr>
</tbody>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('active','active','update',LAN_UPDATE)."
" . $frm->admin_button('active', 'active', 'update', LAN_UPDATE) . "
</div>
<fieldset>
</form>
@@ -165,9 +165,9 @@ class emotec
$text .= "
<div class='tab-pane' id='emoticon-packages'>
<form method='post' action='".e_SELF."#etabTabContainer=emoticon-packages'>
<form method='post' action='" . e_SELF . "#etabTabContainer=emoticon-packages'>
<fieldset>
<legend>".EMOLAN_13."</legend>
<legend>" . EMOLAN_13 . "</legend>
<table class='table adminlist' style='margin-top:10px'>
<colgroup>
<col style='width:15%' />
@@ -177,59 +177,57 @@ class emotec
</colgroup>
<thead>
<tr>
<th class='center'>".LAN_NAME."</th>
<th class='center'>".EMOLAN_3."</th>
<th class='center'>".LAN_STATUS."</th>
<th class='center'>".LAN_OPTIONS."</th>
<th class='center'>" . LAN_NAME . "</th>
<th class='center'>" . EMOLAN_3 . "</th>
<th class='center'>" . LAN_STATUS . "</th>
<th class='center'>" . LAN_OPTIONS . "</th>
</tr>
</thead>
<tbody>
";
$reject = '~^emoteconf|\.html$|\.php$|\.txt$'; // Files to exclude
foreach($this -> packArray as $pack)
$reject = '~^emoteconf|\.html$|\.php$|\.txt$'; // Files to exclude
foreach ($this->packArray as $pack)
{
$can_scan = FALSE;
$emoteArray = $fl -> get_files(e_IMAGE.'emotes/'.$pack, $reject);
$can_scan = false;
$emoteArray = $fl->get_files(e_IMAGE . 'emotes/' . $pack, $reject);
$text .= "
<tr>
<td class='forumheader'>{$pack}</td>
<td class='forumheader'>
<td>{$pack}</td>
<td>
";
foreach($emoteArray as $emote)
foreach ($emoteArray as $emote)
{
if (strpos($emote['fname'], ".pak") !== false
|| strpos($emote['fname'], ".xml") !== false
|| strpos($emote['fname'], "phpBB") !== false)
|| strpos($emote['fname'], ".xml") !== false
|| strpos($emote['fname'], "phpBB") !== false)
{
$can_scan = TRUE; // Allow re-scan of config files
$can_scan = true; // Allow re-scan of config files
}
//elseif (!strstr($emote['fname'], ".txt") && !strstr($emote['fname'], ".bak") && !strstr($emote['fname'], ".html") && !strstr($emote['fname'], ".php") )
else
{ // Emote file found (might get other non-image files, but shouldn't)
$text .= "<img src='".$emote['path'].$emote['fname']."' alt='' /> ";
$text .= "<img src='" . $emote['path'] . $emote['fname'] . "' alt='' /> ";
}
}
$text .= "
</td>
<td class='center middle'>".($pref['emotepack'] == $pack ? "<span class='label label-success'>".LAN_ACTIVE."</span>" : "<button class='btn btn-primary' type='submit' name='defPack_".$pack."' value='".EMOLAN_11."'><span>".EMOLAN_11."</span></button>")."</td>
<td class='center middle'>" . ($pref['emotepack'] == $pack ? "<span class='label label-success'>" . LAN_ACTIVE . "</span>" : "<button class='btn btn-primary' type='submit' name='defPack_" . $pack . "' value='" . EMOLAN_11 . "'><span>" . EMOLAN_11 . "</span></button>") . "</td>
<td>";
$text .= $frm->admin_button('subPack_'.$pack,'edit','default',LAN_CONFIGURE);
$text .= $frm->admin_button('subPack_' . $pack, 'edit', 'default', LAN_CONFIGURE);
if ($can_scan && ($pack != 'default'))
{
// $text .= "<button class='btn btn-default submit' type='submit' name='scanPack_".$pack."'><span>".EMOLAN_26."</span></button>";
$text .= $frm->admin_button('scanPack_'.$pack,'active','default',EMOLAN_26);
// $text .= "<button class='btn btn-default submit' type='submit' name='scanPack_".$pack."'><span>".EMOLAN_26."</span></button>";
$text .= $frm->admin_button('scanPack_' . $pack, 'active', 'default', EMOLAN_26);
}
$text .= $frm->admin_button('XMLPack_'.$pack,'submit','default',EMOLAN_28);
$text .= $frm->admin_button('XMLPack_' . $pack, 'submit', 'default', EMOLAN_28);
$text .= "
</td>
</tr>
@@ -246,38 +244,39 @@ class emotec
";
$ns->tablerender(EMOLAN_PAGE_TITLE, $mes->render().$text);
$ns->tablerender(EMOLAN_PAGE_TITLE, $mes->render() . $text);
}
// Configure an individual emote pack
function emoteConf($packID)
{
global $e107, $sysprefs;
$frm = e107::getForm();
$tp = e107::getParser();
$fl = e107::getFile();
$ns = e107::getRender();
$ns = e107::getRender();
$packID = $tp->filter($packID);
$corea = "emote_".$packID;
$corea = "emote_" . $packID;
$emotecode = $sysprefs -> getArray($corea);
$reject = '~^emoteconf|\.html$|\.php$|\.txt$|\.pak$|\.xml|\.phpBB'; // Files to exclude
$emoteArray = $fl -> get_files(e_IMAGE."emotes/".$packID, $reject);
$emotecode = $sysprefs->getArray($corea);
$reject = '~^emoteconf|\.html$|\.php$|\.txt$|\.pak$|\.xml|\.phpBB'; // Files to exclude
$emoteArray = $fl->get_files(e_IMAGE . "emotes/" . $packID, $reject);
$eArray = array();
foreach($emoteArray as $value)
foreach ($emoteArray as $value)
{
$eArray[] = array('path' => $value['path'], 'fname' => $value['fname']);
}
//XXX Not sure if we need to know rhe number of files found - count($eArray) - <div class='info-bar'><strong>Total ".count($eArray)." files found</strong></div>
$text = "
<form method='post' action='".e_SELF."#etabTabContainer=emoticon-packages'>
<form method='post' action='" . e_SELF . "#etabTabContainer=emoticon-packages'>
<fieldset id='core-emoticon-configure'>
<legend class='e-hideme'>".LAN_EDIT."</legend>
<div class='info-bar' style='padding-bottom:10px'>".$tp->lanVars(EMOLAN_31, count($eArray))."</div>
<legend class='e-hideme'>" . LAN_EDIT . "</legend>
<div class='info-bar' style='padding-bottom:10px'>" . $tp->lanVars(EMOLAN_31, count($eArray)) . "</div>
<table class='table adminlist'>
<colgroup>
<col style='width:20px' />
@@ -286,15 +285,15 @@ class emotec
</colgroup>
<thead>
<tr>
<th>".EMOLAN_5."</th>
<th>".LAN_NAME."</th>
<th class='last'>".EMOLAN_6."<span class='field-help'> ( ".EMOLAN_7." )</span></th>
<th>" . EMOLAN_5 . "</th>
<th>" . LAN_NAME . "</th>
<th class='last'>" . EMOLAN_6 . "<span class='field-help'> ( " . EMOLAN_7 . " )</span></th>
</tr>
</thead>
<tbody>
";
foreach($eArray as $emote)
foreach ($eArray as $emote)
{
$ename = $emote['fname'];
$evalue = str_replace(".", "!", $ename);
@@ -303,18 +302,18 @@ class emotec
if (!isset($emotecode[$evalue]))
{
$file_back = '&nbsp;&nbsp;<span class="label label-danger error">'.EMOLAN_37.'</span>';
$file_back = '&nbsp;&nbsp;<span class="label label-danger error">' . EMOLAN_37 . '</span>';
}
elseif (!$emotecode[$evalue])
{
$text_back = '&nbsp;&nbsp;<span class="label label-danger error">'.EMOLAN_38.'</span>';
$text_back = '&nbsp;&nbsp;<span class="label label-danger error">' . EMOLAN_38 . '</span>';
}
$text .= "
<tr>
<td class='center'><img src='".$emote['path'].$ename."' alt='' /></td>
<td>".$ename."{$file_back}</td>
<td class='center'><img src='" . $emote['path'] . $ename . "' alt='' /></td>
<td>" . $ename . "{$file_back}</td>
<td>
<input class='tbox input-text' type='text' name='{$evalue}' value='".$tp->toForm(varset($emotecode[$evalue],''))."' maxlength='200' />{$text_back}
<input class='tbox input-text' type='text' name='{$evalue}' value='" . $tp->toForm(varset($emotecode[$evalue], '')) . "' maxlength='200' />{$text_back}
</td>
</tr>
";
@@ -325,23 +324,24 @@ class emotec
</table>
<div class='buttons-bar center'>
<input type='hidden' name='packID' value='{$packID}' />";
$text .= $frm->admin_button('sub_conf', 'no-value', 'update', LAN_SAVE);
$text .= $frm->admin_button('cancel','no-value', 'cancel' ,LAN_CANCEL);
$text .= $frm->admin_button('sub_conf', 'no-value', 'update', LAN_SAVE);
$text .= $frm->admin_button('cancel', 'no-value', 'cancel', LAN_CANCEL);
$text .= "
</div>
</fieldset>
</form>";
$ns->tablerender(EMOLAN_PAGE_TITLE.SEP.LAN_EDIT.": '".$packID."'", $text);
$ns->tablerender(EMOLAN_PAGE_TITLE . SEP . LAN_EDIT . ": '" . $packID . "'", $text);
}
// Generate an XML file - packname.xml in root emoticon directory
function emoteXML($packID, $strip_xtn = TRUE)
function emoteXML($packID, $strip_xtn = true)
{
global $sysprefs;
$mes = e107::getMessage();
$fl = e107::getFile();
@@ -349,34 +349,37 @@ class emotec
$packID = $tp->filter($packID);
$fname = e_IMAGE."emotes/".$packID."/emoticons.xml";
$backname = e_IMAGE."emotes/".$packID."/emoticons.bak";
$fname = e_IMAGE . "emotes/" . $packID . "/emoticons.xml";
$backname = e_IMAGE . "emotes/" . $packID . "/emoticons.bak";
$corea = "emote_".$packID;
$emotecode = $sysprefs -> getArray($corea);
$corea = "emote_" . $packID;
$emotecode = $sysprefs->getArray($corea);
$reject = '~^emoteconf|\.html$|\.php$|\.txt$|\.pak$|\.xml|\.phpBB'; // Files to exclude
$emoteArray = $fl -> get_files(e_IMAGE."emotes/".$packID, $reject);
$reject = '~^emoteconf|\.html$|\.php$|\.txt$|\.pak$|\.xml|\.phpBB'; // Files to exclude
$emoteArray = $fl->get_files(e_IMAGE . "emotes/" . $packID, $reject);
$eArray = array();
foreach($emoteArray as $value)
foreach ($emoteArray as $value)
{
$eArray[] = $value['fname'];
}
$f_string = "<?xml version=\"1.0\"?".">\n<messaging-emoticon-map >\n\n\n";
$f_string = "<?xml version=\"1.0\"?" . ">\n<messaging-emoticon-map >\n\n\n";
foreach($eArray as $emote)
foreach ($eArray as $emote)
{
// Optionally strip file extension
$evalue = str_replace(".", "!", $emote);
if ($strip_xtn) $ename = substr($emote,0,strrpos($emote,'.'));
if ($strip_xtn)
{
$ename = substr($emote, 0, strrpos($emote, '.'));
}
$f_string .= "<emoticon file=\"{$ename}\">\n";
foreach (explode(' ',$tp -> toForm($emotecode[$evalue])) as $v)
foreach (explode(' ', $tp->toForm($emotecode[$evalue])) as $v)
{
if (trim($v))
{
$f_string .= "\t<string>".htmlentities($v)."</string>\n";
$f_string .= "\t<string>" . htmlentities($v) . "</string>\n";
}
}
$f_string .= "</emoticon>\n";
@@ -384,17 +387,23 @@ class emotec
$f_string .= "\n</messaging-emoticon-map>\n";
if (is_file($backname)) unlink($backname); // Delete any old backup
if (is_file($fname)) rename($fname,$backname);
if (file_put_contents($fname,$f_string) === FALSE)
if (is_file($backname))
{
$mes->addWarning('<strong>'.EMOLAN_30.'</strong>:'.str_replace(e_IMAGE, e_IMAGE_ABS, $fname));
unlink($backname);
} // Delete any old backup
if (is_file($fname))
{
rename($fname, $backname);
}
if (file_put_contents($fname, $f_string) === false)
{
$mes->addWarning('<strong>' . EMOLAN_30 . '</strong>:' . str_replace(e_IMAGE, e_IMAGE_ABS, $fname));
}
else
{
$mes->addSuccess('<strong>'.EMOLAN_29.'</strong>:'.str_replace(e_IMAGE, e_IMAGE_ABS, $fname));
$mes->addSuccess('<strong>' . EMOLAN_29 . '</strong>:' . str_replace(e_IMAGE, e_IMAGE_ABS, $fname));
}
}
@@ -402,6 +411,7 @@ class emotec
// Save configuration for an emote pack that's been edited
function saveConf()
{
$sql = e107::getDb();
$tp = e107::getParser();
@@ -409,267 +419,286 @@ class emotec
$packID = $_POST['packID'];
unset($_POST['sub_conf'], $_POST['packID']);
$encoded_emotes = $tp->toDB($_POST);
// $tmp = addslashes(serialize($encoded_emotes));
$tmp = e107::getArrayStorage()->WriteArray($encoded_emotes);
// $tmp = addslashes(serialize($encoded_emotes));
$tmp = e107::serialize($encoded_emotes);
if ($sql->select("core", "*", "e107_name='emote_".$packID."'"))
if ($sql->select("core", "*", "e107_name='emote_" . $packID . "'"))
{
e107::getMessage()->addAuto($sql->update("core", "`e107_value`='{$tmp}' WHERE `e107_name`='emote_".$packID."' "), 'update', LAN_SETSAVED, false, false);
e107::getMessage()->addAuto($sql->update("core", "`e107_value`='{$tmp}' WHERE `e107_name`='emote_" . $packID . "' "), 'update', LAN_SETSAVED, false, false);
}
else
{
e107::getMessage()->addAuto($sql->insert("core", "'emote_".$packID."', '$tmp' "), 'insert', LAN_SETSAVED, false, false);
e107::getMessage()->addAuto($sql->insert("core", "'emote_" . $packID . "', '$tmp' "), 'insert', LAN_SETSAVED, false, false);
}
}
// Identify currently selected emote pack. Read in any new ones
// Return false to disable listing of packs
function installCheck($do_one = FALSE)
function installCheck($do_one = false)
{
global $e107;
$sql = e107::getDb();
$sql = e107::getDb();
$fl = e107::getFile();
$ns = e107::getRender();
$mes = e107::getMessage();
// Pick up a list of emote packs from the database
$pack_local = array();
if ($sql->select("core","*","`e107_name` LIKE 'emote_%'"))
if ($sql->select("core", "*", "`e107_name` LIKE 'emote_%'"))
{
while ($row = $sql->fetch())
{
$pack_local[substr($row['e107_name'],6)] = TRUE;
}
{
$pack_local[substr($row['e107_name'], 6)] = true;
}
}
foreach($this -> packArray as $value)
foreach ($this->packArray as $value)
{
if(strpos($value,' ')!==FALSE)
{ // Highlight any directory names containing spaces - not allowed
if (strpos($value, ' ') !== false)
{ // Highlight any directory names containing spaces - not allowed
$msg = "
<strong>".EMOLAN_17."</strong> ".EMOLAN_18.":
<div>".LAN_NAME.": {$value}</div>
<div>".EMOLAN_20.": ".e_IMAGE_ABS."emotes/</div>
<strong>" . EMOLAN_17 . "</strong> " . EMOLAN_18 . ":
<div>" . LAN_NAME . ": {$value}</div>
<div>" . EMOLAN_20 . ": " . e_IMAGE_ABS . "emotes/</div>
";
$mes->addError($msg);
$ns->tablerender(EMOLAN_PAGE_TITLE.' - '.EMOLAN_21, $mes->render());
return FALSE;
$ns->tablerender(EMOLAN_PAGE_TITLE . ' - ' . EMOLAN_21, $mes->render());
return false;
}
if (array_key_exists($value,$pack_local))
if (array_key_exists($value, $pack_local))
{
unset($pack_local[$value]);
}
if (($do_one == $value) || !$do_one && (!$sql->select("core", "*", "e107_name='emote_".$value."' ")))
if (($do_one == $value) || !$do_one && (!$sql->select("core", "*", "e107_name='emote_" . $value . "' ")))
{ // Pack info not in DB, or to be re-scanned
$no_error = TRUE;
$File_type = EMOLAN_32.":";
$no_error = true;
$File_type = EMOLAN_32 . ":";
// Array of all files in the directory of the selected emote pack
$fileArray = $fl -> get_files(e_IMAGE."emotes/".$value); // We actually want all the files in the directory
$fileArray = $fl->get_files(e_IMAGE . "emotes/" . $value); // We actually want all the files in the directory
$confFile = '';
foreach($fileArray as $k => $file)
foreach ($fileArray as $k => $file)
{
if(strpos($file['fname'], ".xml") !== false)
if (strpos($file['fname'], ".xml") !== false)
{
$confFile = array('file' => $file['fname'], 'type' => "xml");
}
else if(strpos($file['fname'], ".pak") !== false)
elseif (strpos($file['fname'], ".pak") !== false)
{
$confFile = array('file' => $file['fname'], 'type' => "pak");
}
else if(strpos($file['fname'], ".php") !== false)
elseif (strpos($file['fname'], ".php") !== false)
{
$confFile = array('file' => $file['fname'], 'type' => "php");
}
if ($confFile)
{
unset($fileArray[$k]);
break;
unset($fileArray[$k]);
break;
}
}
/* .pak file */
if($confFile['type'] == "pak")
if ($confFile['type'] == "pak")
{
$filename = e_IMAGE."emotes/".$value."/".$confFile['file'];
$pakconf = file ($filename);
$filename = e_IMAGE . "emotes/" . $value . "/" . $confFile['file'];
$pakconf = file($filename);
$contentArray = array();
foreach($pakconf as $line)
foreach ($pakconf as $line)
{
if(trim($line) && strpos($line, "=+") !== false && strpos($line, ".txt") === false && strpos($line, ".html") === false && strpos($line, "cvs") === false) $contentArray[] = $line;
if (trim($line) && strpos($line, "=+") !== false && strpos($line, ".txt") === false && strpos($line, ".html") === false && strpos($line, "cvs") === false)
{
$contentArray[] = $line;
}
}
$confArray = array();
foreach($contentArray as $pakline)
foreach ($contentArray as $pakline)
{
$tmp = explode("=+:", $pakline);
$confIC = str_replace(".", "!", $tmp[0]);
$confArray[$confIC] = trim($tmp[2]);
$tmp = explode("=+:", $pakline);
$confIC = str_replace(".", "!", $tmp[0]);
$confArray[$confIC] = trim($tmp[2]);
}
// $tmp = addslashes(serialize($confArray));
$tmp = e107::serialize($confArray);
$File_type = EMOLAN_22.":";
$File_type = EMOLAN_22 . ":";
}
/* end */
/* .xml file */
if($confFile['type'] == "xml")
if ($confFile['type'] == "xml")
{
$filename = e_IMAGE."emotes/".$value."/".$confFile['file'];
$filename = e_IMAGE . "emotes/" . $value . "/" . $confFile['file'];
$contents = file_get_contents($filename);
$confArray = array();
$xml_type = 0;
if ((strpos($contents, "<icon>") !== FALSE) && (strpos($contents, "<icondef>") !== FALSE))
{ // xep-0038 format
/* Example:
<icon>
<text>:-)</text>
<text>:)</text>
<object mime="image/png">happy.png</object>
<object mime="audio/x-wav">choir.wav</object>
</icon>*/
preg_match_all("#\<icon>(.*?)\<\/icon\>#si", $contents, $match);
if ((strpos($contents, "<icon>") !== false) && (strpos($contents, "<icondef>") !== false))
{ // xep-0038 format
/* Example:
<icon>
<text>:-)</text>
<text>:)</text>
<object mime="image/png">happy.png</object>
<object mime="audio/x-wav">choir.wav</object>
</icon>*/
preg_match_all("#\<icon>(.*?)\<\/icon\>#si", $contents, $match);
$xml_type = 1;
$xml_type = 1;
// $match[0] - complete emoticon entry
// $match[1] - match string and object specification
$item_index = 1;
$item_index = 1;
}
elseif (strpos($contents, "<emoticon") !== FALSE)
{ // "Original" E107 format (as used on KDE, although they may be changing to XEP-0038)
elseif (strpos($contents, "<emoticon") !== false)
{ // "Original" E107 format (as used on KDE, although they may be changing to XEP-0038)
//echo "Decoding standard XML file<br />";
preg_match_all("#\<emoticon file=\"(.*?)\"\>(.*?)\<\/emoticon\>#si", $contents, $match);
preg_match_all("#\<emoticon file=\"(.*?)\"\>(.*?)\<\/emoticon\>#si", $contents, $match);
$xml_type = 2;
$xml_type = 2;
// $match[0] - complete emoticon entry
// $match[1] - filename (may or may not not have file extension/suffix)
// $match[2] - match string(s) representing emote
$item_index = 2;
$item_index = 2;
}
if ($xml_type)
{
for($a=0, $aMax = count($match[0]); $a < $aMax; $a++)
{
$e_file = '';
switch ($xml_type)
for ($a = 0, $aMax = count($match[0]); $a < $aMax; $a++)
{
case 1 : // xep-0038
// Pull out a file name (only support first image type) - its in $fmatch[1]
if (preg_match("#\<object\s*?mime\=[\"\']image\/.*?\>(.*?)\<\/object\>#si",$match[1][$a],$fmatch))
$e_file = '';
switch ($xml_type)
{
$e_file = $fmatch[1];
case 1 : // xep-0038
// Pull out a file name (only support first image type) - its in $fmatch[1]
if (preg_match("#\<object\s*?mime\=[\"\']image\/.*?\>(.*?)\<\/object\>#si", $match[1][$a], $fmatch))
{
$e_file = $fmatch[1];
// echo "xep-0038 file: ".$e_file."<br />";
// Pull out all match strings - need to pick out any language definitions for posterity
// but currently accept all language strings
preg_match_all("#\<text(?:\s*?\>|\s*?xml\:lang\=\"(.*?)\"\>)(.*?)\<\/text\>#si", $match[1][$a], $match2);
// $match2[1] is the languages
// $match2[2] is the match strings
$codet = implode(" ",$match2[2]);
// Pull out all match strings - need to pick out any language definitions for posterity
// but currently accept all language strings
preg_match_all("#\<text(?:\s*?\>|\s*?xml\:lang\=\"(.*?)\"\>)(.*?)\<\/text\>#si", $match[1][$a], $match2);
// $match2[1] is the languages
// $match2[2] is the match strings
$codet = implode(" ", $match2[2]);
}
break;
case 2 :
$e_file = $match[1][$a];
// Now pull out all the 'match' strings
preg_match_all("#\<string\>(.*?)\<\/string\>#si", $match[2][$a], $match2);
$codet = implode(" ", $match2[1]);
break;
}
break;
case 2 :
$e_file = $match[1][$a];
// Now pull out all the 'match' strings
preg_match_all("#\<string\>(.*?)\<\/string\>#si", $match[2][$a], $match2);
$codet = implode(" ",$match2[1]);
break;
}
// $e_file has the emote file name
// $match2 has an array of substitution strings
// $e_file has the emote file name
// $match2 has an array of substitution strings
$file = '';
foreach($fileArray as $emote)
{ // Check that the file exists
if (strpos($e_file,".") === FALSE)
{ // File extension not specified - accept any file extension for match
if(strpos($emote['fname'], $e_file.".") === 0)
{
$file = str_replace(".", "!", $emote['fname']);
break;
$file = '';
foreach ($fileArray as $emote)
{ // Check that the file exists
if (strpos($e_file, ".") === false)
{ // File extension not specified - accept any file extension for match
if (strpos($emote['fname'], $e_file . ".") === 0)
{
$file = str_replace(".", "!", $emote['fname']);
break;
}
}
else
{ // File extension specified - do simple match
if ($emote['fname'] == $e_file)
{
$file = str_replace(".", "!", $emote['fname']);
break;
}
}
}
}
else
{ // File extension specified - do simple match
if($emote['fname'] == $e_file)
// Only add if the file exists. OK if no definition - might want to be added
if ($file)
{
$file = str_replace(".", "!", $emote['fname']);
break;
}
}
}
// Only add if the file exists. OK if no definition - might want to be added
if ($file)
{
$confArray[$file] = $codet;
$confArray[$file] = $codet;
}
}
}
}
else
{
//echo "Unsupported XML File Format<br /><br />";
$mes->addWarning(EMOLAN_33);
$no_error = FALSE;
//echo "Unsupported XML File Format<br /><br />";
$mes->addWarning(EMOLAN_33);
$no_error = false;
}
// Save pack info in the database
// $tmp = addslashes(serialize($confArray));
$tmp = e107::getArrayStorage()->WriteArray($confArray);
$File_type = EMOLAN_23.":";
// $tmp = addslashes(serialize($confArray));
$tmp = e107::serialize($confArray);
$File_type = EMOLAN_23 . ":";
}
if($confFile['type'] == "php")
if ($confFile['type'] == "php")
{
include_once(e_IMAGE."emotes/".$value."/".$confFile['file']);
$File_type = EMOLAN_24.":";
$tmp = $_emoteconf; // Use consistent name
include_once(e_IMAGE . "emotes/" . $value . "/" . $confFile['file']);
$File_type = EMOLAN_24 . ":";
$tmp = $_emoteconf; // Use consistent name
}
if ($no_error)
{
if ($do_one)
{ // Assume existing pack
$sql->update("core", "`e107_value`='{$tmp}' WHERE `e107_name`='emote_".$value."'");
}
else
{ // Assume new pack
$sql->insert("core", "'emote_".$value."', '{$tmp}' ");
}
$mes->addInfo("<strong>{$File_type}</strong> '{$value}'");
if ($do_one) // Assume existing pack
{
$update = array(
'e107_name' => 'emote_' . $value,
'e107_value' => $tmp,
'WHERE' => "e107_name = 'emote_" . $value . "'"
);
$sql->update("core", $update);
}
else
{ // Assume new pack
$insert = array(
'e107_name' => 'emote_' . $value,
'e107_value' => $tmp
);
$sql->insert("core", $insert);
}
$mes->addInfo("<strong>{$File_type}</strong> '{$value}'");
}
else
{ // Error occurred
$mes->addError(EMOLAN_27.": '{$value}'");
$mes->addError(EMOLAN_27 . ": '{$value}'");
}
}
}
if (count($pack_local))
{
foreach ($pack_local as $p => $d)
foreach ($pack_local as $p => $d)
{
if($p == '0')
if ($p == '0')
{
$p = '';
}
if($sql->delete("core","`e107_name` = 'emote_{$p}'"))
{
$mes->addInfo(EMOLAN_34.":".$p.EMOLAN_35);
}
if ($sql->delete("core", "`e107_name` = 'emote_{$p}'"))
{
$mes->addInfo(EMOLAN_34 . ":" . $p . EMOLAN_35);
}
}
}
return TRUE;
return true;
}
}
require_once("footer.php");
/**
* Handle page DOM within the page header
@@ -678,15 +707,16 @@ require_once("footer.php");
*/
function headerjs()
{
/* require_once(e_HANDLER.'js_helper.php');
/* require_once(e_HANDLER.'js_helper.php');
$ret = "
<script type='text/javascript'>
//add required core lan - delete confirm message
</script>
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
";
$ret = "
<script type='text/javascript'>
//add required core lan - delete confirm message
</script>
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
";
return $ret;*/
return $ret;*/
}
?>