mirror of
https://github.com/e107inc/e107.git
synced 2025-03-14 01:19:44 +01:00
More Iconpicker and icon folder cleanup.
This commit is contained in:
CaMer0n
parent
5f1933c3fa
commit
afcf85cd8e
@ -9,9 +9,9 @@
|
||||
* Image Administration Area
|
||||
*
|
||||
* $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
|
||||
* $Revision: 1.20 $
|
||||
* $Date: 2009-01-09 17:25:50 $
|
||||
* $Author: secretr $
|
||||
* $Revision: 1.21 $
|
||||
* $Date: 2009-07-16 08:15:35 $
|
||||
* $Author: e107coders $
|
||||
*
|
||||
*/
|
||||
require_once("../class2.php");
|
||||
@ -39,9 +39,34 @@ if(isset($_POST['submit_cancel_show']))
|
||||
exit();
|
||||
}
|
||||
|
||||
$action = e_QUERY;
|
||||
|
||||
|
||||
if(isset($_POST['delpref']) || (isset($_POST['delpref_checked']) && isset($_POST['delpref2'])))
|
||||
{
|
||||
del_pref_val();
|
||||
}
|
||||
|
||||
if($action == "icons")
|
||||
{
|
||||
icon_editor();
|
||||
}
|
||||
|
||||
if($action == "avatars")
|
||||
{
|
||||
show_avatars();
|
||||
}
|
||||
|
||||
if($action !='avatars' && $action !='icons')
|
||||
{
|
||||
main_config();
|
||||
}
|
||||
/*
|
||||
* DELETE CHECKED AVATARS - SHOW AVATAR SCREEN
|
||||
*/
|
||||
|
||||
|
||||
|
||||
if (isset($_POST['submit_show_delete_multi']))
|
||||
{
|
||||
if(varset($_POST['multiaction']))
|
||||
@ -214,8 +239,10 @@ if (isset($_POST['update_options']))
|
||||
/*
|
||||
* SHOW AVATARS SCREEN
|
||||
*/
|
||||
if (isset($_POST['show_avatars']))
|
||||
function show_avatars()
|
||||
{
|
||||
global $ns, $sql, $frm, $tp, $emessage, $e107, $pref;
|
||||
|
||||
$handle = opendir(e_FILE."public/avatars/");
|
||||
$dirlist = array();
|
||||
while ($file = readdir($handle))
|
||||
@ -236,7 +263,7 @@ if (isset($_POST['show_avatars']))
|
||||
else
|
||||
{
|
||||
$text = "
|
||||
<form method='post' action='".e_SELF."' id='core-iamge-show-avatars-form'>
|
||||
<form method='post' action='".e_SELF."?avatars' id='core-iamge-show-avatars-form'>
|
||||
<fieldset id='core-iamge-show-avatars'>
|
||||
";
|
||||
|
||||
@ -252,7 +279,9 @@ if (isset($_POST['show_avatars']))
|
||||
$row = $sql->db_Fetch();
|
||||
if($row['user_image'] == '-upload-'.$image_name) $image_pre = '-upload-';
|
||||
$users .= "<a href='".$e107->url->getUrl('core:user', 'main', 'func=profile&id='.$row['user_id'])."'>{$row['user_name']}</a> <span class='smalltext'>(".($row['user_sess'] == $image_name ? IMALAN_24 : IMALAN_23).")</span>";
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
$users = '<span class="warning">'.IMALAN_22.'</span>';
|
||||
}
|
||||
|
||||
@ -317,7 +346,7 @@ if (isset($_POST['show_avatars']))
|
||||
}
|
||||
|
||||
|
||||
$ns->tablerender(IMALAN_18, $emessage->render().$text);
|
||||
$ns->tablerender(LAN_IMAGEMANAGER." :: ".IMALAN_18, $emessage->render().$text);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -347,7 +376,7 @@ if (isset($_POST['check_avatar_sizes']))
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class='center'>".IMALAN_61."</th>
|
||||
<th class='center'>".LAN_OPTIONS."</th>
|
||||
<th class='center'>".IMALAN_64."</th>
|
||||
<th class='center'>".IMALAN_62."</th>
|
||||
<th class='center last'>".IMALAN_63."</th>
|
||||
@ -453,39 +482,40 @@ if (isset($_POST['check_avatar_sizes']))
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
<table cellpadding='0' cellspacing='0' class='admininfo'>
|
||||
<colgroup span='2'>
|
||||
<col style='width:20%'></col>
|
||||
<col style='width:80%'></col>
|
||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
||||
<colgroup span='2'>
|
||||
<col class='col-label' />
|
||||
<col class='col-control' />
|
||||
</colgroup>
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_38."</td>
|
||||
<td class='control'>{$allowedWidth}</td>
|
||||
<td>".IMALAN_38."</td>
|
||||
<td>{$allowedWidth}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_39."</td>
|
||||
<td class='control'>{$allowedHeight}</td>
|
||||
<td>".IMALAN_39."</td>
|
||||
<td>{$allowedHeight}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_45."</td>
|
||||
<td class='control'>{$iAVnotfound}</td>
|
||||
<td>".IMALAN_45."</td>
|
||||
<td>{$iAVnotfound}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_46."</td>
|
||||
<td class='control'>{$iAVtoobig}</td>
|
||||
<td>".IMALAN_46."</td>
|
||||
<td>{$iAVtoobig}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_47."</td>
|
||||
<td class='control'>{$iAVinternal}</td>
|
||||
<td>".IMALAN_47."</td>
|
||||
<td>{$iAVinternal}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_48."</td>
|
||||
<td class='control'>{$iAVexternal}</td>
|
||||
<td>".IMALAN_48."</td>
|
||||
<td>{$iAVexternal}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_49."</td>
|
||||
<td class='control'>".($iAVexternal+$iAVinternal)." (".(int)(100.0*(($iAVexternal+$iAVinternal)/$iUserCount)).'%, '.$iUserCount." ".IMALAN_50.")</td>
|
||||
<td>".IMALAN_49."</td>
|
||||
<td>".($iAVexternal+$iAVinternal)." (".(int)(100.0*(($iAVexternal+$iAVinternal)/$iUserCount)).'%, '.$iUserCount." ".IMALAN_50.")</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@ -497,136 +527,283 @@ if (isset($_POST['check_avatar_sizes']))
|
||||
/*
|
||||
* MAIN CONFIG SCREEN
|
||||
*/
|
||||
if(function_exists('gd_info'))
|
||||
{
|
||||
$gd_info = gd_info();
|
||||
$gd_version = $gd_info['GD Version'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$gd_version = "<span class='error'> ".IMALAN_55."</span>";
|
||||
}
|
||||
|
||||
$IM_NOTE = "";
|
||||
if($pref['im_path'] != "")
|
||||
{
|
||||
$im_file = $pref['im_path'].'convert';
|
||||
if(!file_exists($im_file))
|
||||
function main_config()
|
||||
{
|
||||
global $pref, $frm, $tp, $sql, $ns, $emessage;
|
||||
if(function_exists('gd_info'))
|
||||
{
|
||||
$IM_NOTE = "<span class='error'>".IMALAN_52."</span>";
|
||||
$gd_info = gd_info();
|
||||
$gd_version = $gd_info['GD Version'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$cmd = "{$im_file} -version";
|
||||
$tmp = `$cmd`;
|
||||
if(strpos($tmp, "ImageMagick") === FALSE)
|
||||
$gd_version = "<span class='error'> ".IMALAN_55."</span>";
|
||||
}
|
||||
|
||||
$IM_NOTE = "";
|
||||
if($pref['im_path'] != "")
|
||||
{
|
||||
$im_file = $pref['im_path'].'convert';
|
||||
if(!file_exists($im_file))
|
||||
{
|
||||
$IM_NOTE = "<span class='error'>".IMALAN_53."</span>";
|
||||
$IM_NOTE = "<span class='error'>".IMALAN_52."</span>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$cmd = "{$im_file} -version";
|
||||
$tmp = `$cmd`;
|
||||
if(strpos($tmp, "ImageMagick") === FALSE)
|
||||
{
|
||||
$IM_NOTE = "<span class='error'>".IMALAN_53."</span>";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$text = "
|
||||
<form method='post' action='".e_SELF."'>
|
||||
<fieldset id='core-image-settings'>
|
||||
<legend class='e-hideme'>".IMALAN_7."</legend>
|
||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
||||
<colgroup span='2'>
|
||||
<col class='col-label'></col>
|
||||
<col class='col-control'></col>
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class='label'>
|
||||
".IMALAN_1."
|
||||
</td>
|
||||
<td class='control'>
|
||||
<div class='auto-toggle-area autocheck'>
|
||||
".$frm->checkbox('image_post', 1, $pref['image_post'])."
|
||||
<div class='smalltext field-help'>".IMALAN_2."</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='label'>
|
||||
".IMALAN_10."
|
||||
</td>
|
||||
<td class='control'>
|
||||
".r_userclass('image_post_class',$pref['image_post_class'],"off","public,guest,nobody,member,admin,main,classes")."
|
||||
<div class='smalltext field-help'>".IMALAN_11."</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>
|
||||
".IMALAN_12."
|
||||
</td>
|
||||
<td class='control'>
|
||||
".$frm->select_open('image_post_disabled_method')."
|
||||
".$frm->option(IMALAN_14, '0', ($pref['image_post_disabled_method'] == "0"))."
|
||||
".$frm->option(IMALAN_15, '1', ($pref['image_post_disabled_method'] == "1"))."
|
||||
".$frm->select_close()."
|
||||
<div class='smalltext field-help'>".IMALAN_13."</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_3."<div class='label-note'>".IMALAN_54." {$gd_version}</div></td>
|
||||
<td class='control'>
|
||||
".$frm->select_open('resize_method')."
|
||||
".$frm->option('gd1', 'gd1', ($pref['resize_method'] == "gd1"))."
|
||||
".$frm->option('gd2', 'gd2', ($pref['resize_method'] == "gd2"))."
|
||||
".$frm->option('ImageMagick', 'ImageMagick', ($pref['resize_method'] == "ImageMagick"))."
|
||||
".$frm->select_close()."
|
||||
<div class='smalltext field-help'>".IMALAN_4."</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_5."<div class='label-note'>{$IM_NOTE}</div></td>
|
||||
<td class='control'>
|
||||
".$frm->text('im_path', $pref['im_path'])."
|
||||
<div class='smalltext field-help'>".IMALAN_6."</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_34."
|
||||
</td>
|
||||
<td class='control'>
|
||||
<div class='auto-toggle-area autocheck'>
|
||||
".$frm->checkbox('enable_png_image_fix', 1, ($pref['enable_png_image_fix']))."
|
||||
<div class='smalltext field-help'>".IMALAN_35."</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_36."</td>
|
||||
<td class='control'>
|
||||
".$frm->admin_button('check_avatar_sizes', IMALAN_17)."
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class='buttons-bar center'>
|
||||
".$frm->admin_button('update_options', IMALAN_8, 'update')."
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>";
|
||||
|
||||
$ns->tablerender(LAN_IMAGEMANAGER." :: ".IMALAN_7, $emessage->render().$text);
|
||||
}
|
||||
|
||||
$text = "
|
||||
<form method='post' action='".e_SELF."'>
|
||||
<fieldset id='core-image-settings'>
|
||||
<legend class='e-hideme'>".IMALAN_7."</legend>
|
||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
||||
<colgroup span='2'>
|
||||
<col class='col-label'></col>
|
||||
<col class='col-control'></col>
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class='label'>
|
||||
".IMALAN_1."
|
||||
</td>
|
||||
<td class='control'>
|
||||
<div class='auto-toggle-area autocheck'>
|
||||
".$frm->checkbox('image_post', 1, $pref['image_post'])."
|
||||
<div class='smalltext field-help'>".IMALAN_2."</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='label'>
|
||||
".IMALAN_10."
|
||||
</td>
|
||||
<td class='control'>
|
||||
".r_userclass('image_post_class',$pref['image_post_class'],"off","public,guest,nobody,member,admin,main,classes")."
|
||||
<div class='smalltext field-help'>".IMALAN_11."</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>
|
||||
".IMALAN_12."
|
||||
</td>
|
||||
<td class='control'>
|
||||
".$frm->select_open('image_post_disabled_method')."
|
||||
".$frm->option(IMALAN_14, '0', ($pref['image_post_disabled_method'] == "0"))."
|
||||
".$frm->option(IMALAN_15, '1', ($pref['image_post_disabled_method'] == "1"))."
|
||||
".$frm->select_close()."
|
||||
<div class='smalltext field-help'>".IMALAN_13."</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_3."<div class='label-note'>".IMALAN_54." {$gd_version}</div></td>
|
||||
<td class='control'>
|
||||
".$frm->select_open('resize_method')."
|
||||
".$frm->option('gd1', 'gd1', ($pref['resize_method'] == "gd1"))."
|
||||
".$frm->option('gd2', 'gd2', ($pref['resize_method'] == "gd2"))."
|
||||
".$frm->option('ImageMagick', 'ImageMagick', ($pref['resize_method'] == "ImageMagick"))."
|
||||
".$frm->select_close()."
|
||||
<div class='smalltext field-help'>".IMALAN_4."</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_5."<div class='label-note'>{$IM_NOTE}</div></td>
|
||||
<td class='control'>
|
||||
".$frm->text('im_path', $pref['im_path'])."
|
||||
<div class='smalltext field-help'>".IMALAN_6."</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_34."
|
||||
</td>
|
||||
<td class='control'>
|
||||
<div class='auto-toggle-area autocheck'>
|
||||
".$frm->checkbox('enable_png_image_fix', 1, ($pref['enable_png_image_fix']))."
|
||||
<div class='smalltext field-help'>".IMALAN_35."</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_16."</td>
|
||||
<td class='control'>
|
||||
".$frm->admin_button('show_avatars', IMALAN_17)."
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='label'>".IMALAN_36."</td>
|
||||
<td class='control'>
|
||||
".$frm->admin_button('check_avatar_sizes', IMALAN_17)."
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class='buttons-bar center'>
|
||||
".$frm->admin_button('update_options', IMALAN_8, 'update')."
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>";
|
||||
|
||||
$ns->tablerender(IMALAN_7, $emessage->render().$text);
|
||||
|
||||
//Just in case...
|
||||
if(!e_AJAX_REQUEST) require_once("footer.php");
|
||||
|
||||
|
||||
|
||||
|
||||
function icon_editor()
|
||||
{
|
||||
global $iconpool, $e107, $emessage, $frm, $tp;
|
||||
ksort($iconpool);
|
||||
|
||||
$text = "
|
||||
<form method='post' action='".e_SELF."?icons' id='icon_edit'>
|
||||
<fieldset id='core-imagemanager-icons'>
|
||||
<legend class='e-hideme'>".DBLAN_20."</legend>
|
||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
||||
<colgroup span='4'>
|
||||
<col style='width: 5%'></col>
|
||||
<col style='width: 20%'></col>
|
||||
<col style='width: 70%'></col>
|
||||
<col style='width: 5%'></col>
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class='center'>".LAN_DELETE."</th>
|
||||
<th>".LAN_CATEGORY."</th>
|
||||
<th>".IMALAN_72."</th>
|
||||
<th class='center last'>".LAN_OPTIONS."</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
";
|
||||
$tmp = array(16, 32, 48, 64, 128);
|
||||
|
||||
foreach($iconpool as $key => $val)
|
||||
{
|
||||
$tmp1 = array();
|
||||
foreach($val as $icon)
|
||||
{
|
||||
$filepath = $icon;
|
||||
$filepath_abs = $tp->replaceConstants($icon);
|
||||
$icon_file = basename($filepath_abs);
|
||||
|
||||
$str = "<img class='icon picker list%%size%%' src='{$filepath_abs}' alt='{$icon_file}' />";
|
||||
foreach ($tmp as $isize)
|
||||
{
|
||||
if(strpos($icon_file, '_'.$isize.'.') !== false)
|
||||
{
|
||||
$tmp1[$isize] = varset($tmp1[$isize]).str_replace('%%size%%', ' S'.$isize, $str);
|
||||
continue 2;
|
||||
}
|
||||
}
|
||||
$tmp1['other'] = varset($tmp1['other']).$str;//other
|
||||
}
|
||||
|
||||
$ptext = "<div class='field-spacer iconeditor'>".str_replace('%%size%%', '', implode('</div><div class="field-spacer iconeditor">', $tmp1))."</div>";
|
||||
|
||||
// $ptext = (is_array($val)) ? "<pre>".print_r($val, TRUE)."</pre>" : htmlspecialchars($val, ENT_QUOTES, CHARSET);
|
||||
// $ptext = $e107->tp->textclean($ptext, 80);
|
||||
|
||||
$text .= "
|
||||
<tr>
|
||||
<td class='center autocheck e-pointer'>".$frm->checkbox("delpref2[$key]", 1)."</td>
|
||||
<td>{$key}</td>
|
||||
<td>{$ptext}</td>
|
||||
<td class='center'>".$frm->submit_image("delpref[$key]", LAN_DELETE, 'delete', LAN_CONFIRMDEL." [$key]")."</td>
|
||||
</tr>
|
||||
";
|
||||
}
|
||||
|
||||
$text .= "
|
||||
</tbody>
|
||||
</table>
|
||||
<div class='buttons-bar center'>
|
||||
".$frm->admin_button('delpref_checked', LAN_DELCHECKED, 'delete')."
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
|
||||
";
|
||||
//$text .= "<div style='text-align:center'><a href='".e_SELF."'>".DBLAN_13."</a></div>\n";
|
||||
$e107->ns->tablerender(LAN_IMAGEMANAGER." :: ".IMALAN_71, $emessage->render().$text);
|
||||
|
||||
return $text;
|
||||
}
|
||||
|
||||
function del_pref_val()
|
||||
{
|
||||
global $iconpool, $e107cache, $emessage;
|
||||
$del = array_keys($_POST['delpref']);
|
||||
$delpref = key($_POST['delpref']);
|
||||
|
||||
if($delpref)
|
||||
{
|
||||
unset($iconpool[$delpref]);
|
||||
$deleted_list .= "<li>".$delpref."</li>";
|
||||
}
|
||||
|
||||
if($_POST['delpref2'])
|
||||
{
|
||||
|
||||
foreach($_POST['delpref2'] as $k => $v)
|
||||
{
|
||||
$deleted_list .= "<li>".$k."</li>";
|
||||
unset($iconpool[$k]);
|
||||
}
|
||||
}
|
||||
|
||||
if(save_prefs('iconpool'))
|
||||
{
|
||||
$emessage->add(LAN_DELETED."<ul>".$deleted_list."</ul>");
|
||||
$e107cache->clear();
|
||||
}
|
||||
//$e107->ns->tablerender(LAN_DELETED,$message);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
function image_adminmenu()
|
||||
{
|
||||
global $action;
|
||||
if($action == "")
|
||||
{
|
||||
$action = "main";
|
||||
}
|
||||
$var['main']['text'] = IMALAN_7;
|
||||
$var['main']['link'] = e_SELF;
|
||||
|
||||
$var['icons']['text'] = IMALAN_71;
|
||||
$var['icons']['link'] = e_SELF."?icons";
|
||||
|
||||
$var['avatars']['text'] = IMALAN_23;
|
||||
$var['avatars']['link'] = e_SELF."?avatars";
|
||||
|
||||
|
||||
$var['editor']['text'] = "Image Manipulation (future release)";
|
||||
$var['editor']['link'] = e_SELF."?editor";
|
||||
|
||||
|
||||
e_admin_menu(LAN_IMAGEMANAGER, $action, $var);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Handle page DOM within the page header
|
||||
*
|
||||
|
||||
@ -9,9 +9,9 @@
|
||||
* Administration Area - User classes
|
||||
*
|
||||
* $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $
|
||||
* $Revision: 1.22 $
|
||||
* $Date: 2009-07-14 19:26:01 $
|
||||
* $Author: e107steved $
|
||||
* $Revision: 1.23 $
|
||||
* $Date: 2009-07-16 08:15:35 $
|
||||
* $Author: e107coders $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -27,7 +27,8 @@ $e_sub_cat = 'userclass';
|
||||
require_once(e_HANDLER."userclass_class.php"); // Modified class handler
|
||||
$uclass = new e_userclass; // Class management functions - legacy stuff from 0.7
|
||||
$e_userclass = new user_class_admin; // Admin functions - should just obliterate any previous object created in class2.php
|
||||
|
||||
require_once (e_HANDLER.'form_handler.php');
|
||||
$frm = new e_form();
|
||||
|
||||
$message = '';
|
||||
|
||||
@ -348,12 +349,12 @@ switch ($action)
|
||||
|
||||
$text = "<div style='text-align:center'>
|
||||
<form method='post' action='".e_SELF."' id='classForm'>
|
||||
<table class='fborder' style='".ADMIN_WIDTH."'>
|
||||
<colgroup>
|
||||
<col style='width:30%' />
|
||||
<col style='width:40%' />
|
||||
<col style='width:30%' />
|
||||
</colgroup>
|
||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
||||
<colgroup span='2'>
|
||||
<col class='col-label' />
|
||||
<col class='col-control' />
|
||||
<col class='col-else' />
|
||||
</colgroup>
|
||||
<tr>
|
||||
<td class='fcaption' style='text-align:center' colspan='3'>";
|
||||
|
||||
@ -390,36 +391,8 @@ switch ($action)
|
||||
$text .= "
|
||||
<tr>
|
||||
<td class='forumheader3'>".UCSLAN_68."</td>
|
||||
<td class='forumheader3'>
|
||||
<input class='tbox' type='text' size='60' maxlength='85' name='userclass_icon' id='userclass_icon' value='{$userclass_icon}' /><br />
|
||||
<div id='linkbut' style='display:block; vertical-align:top;'>
|
||||
<table style='text-align:left; width:100%;'>
|
||||
<tr><td style='width:20%; padding-right:10px;'>";
|
||||
$selectjs = " onchange=\"document.getElementById('userclass_icon').value=this.options[this.selectedIndex].value;
|
||||
if(this.options[this.selectedIndex].value!=''){document.getElementById('iconview').src='".$iconpath."'+this.options[this.selectedIndex].value;
|
||||
document.getElementById('iconview').style.display='block';}else{document.getElementById('iconview').src='';
|
||||
document.getElementById('iconview').style.display='none';}\"";
|
||||
$text .= "<select name='uc_icon_select' class='tbox' {$selectjs}>\n";
|
||||
$text .= "<option value=''".($userclass_icon ? '' : " selected='selected'").">".UCSLAN_9."</option>\n";
|
||||
foreach($iconlist as $icon)
|
||||
{
|
||||
$text .= "<option value='{$icon['fname']}'".($icon['fname'] == $userclass_icon ? " selected='selected'" : "").">{$icon['fname']}</option>\n";
|
||||
}
|
||||
$text .= "</select>\n";
|
||||
if($userclass_icon)
|
||||
{
|
||||
$img = $iconpath.$userclass_icon;
|
||||
}
|
||||
else
|
||||
{
|
||||
$blank_display = 'display: none';
|
||||
$img = e_IMAGE_ABS."generic/blank.gif";
|
||||
}
|
||||
$text .= "</td><td><img id='iconview' src='".$img."' style='border:0; ".$blank_display."' alt='' />
|
||||
</td></tr></table>
|
||||
</div>
|
||||
</td>
|
||||
<td class='forumheader3'>".UCSLAN_69.$IMAGES_DIRECTORY.UC_CLASS_ICON_DIR."</td>
|
||||
<td class='forumheader3'>".$frm->iconpicker('userclass_icon', $userclass_icon, LAN_CHOOSE)."</td>
|
||||
<td class='forumheader3'>".UCSLAN_69."</td>
|
||||
</tr>
|
||||
";
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*
|
||||
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
|
||||
* $Id: iconpicker.php,v 1.2 2009-07-16 02:55:19 e107coders Exp $
|
||||
* $Id: iconpicker.php,v 1.3 2009-07-16 08:15:35 e107coders Exp $
|
||||
*
|
||||
* Image picker shortcode
|
||||
*
|
||||
@ -44,7 +44,7 @@ function iconpicker_shortcode($parm)
|
||||
|
||||
global $iconpool,$tp;
|
||||
|
||||
$iconlist = $iconpool;
|
||||
$iconlist = $iconpool; // this overrides most of the code above - needs reviewing.
|
||||
|
||||
foreach($iconlist as $folder)
|
||||
{
|
||||
@ -58,7 +58,7 @@ function iconpicker_shortcode($parm)
|
||||
$filepath_abs = $tp->replaceConstants($icon);
|
||||
$icon_file = basename($filepath_abs);
|
||||
|
||||
$str = "<a href='#{$filepath}' title='{$filepath}' onclick=\"e107Helper.insertText('{$filepath}','{$name}','{$name}-iconpicker'); return false; \"><img class='icon picker list%%size%%' src='{$filepath_abs}' alt='{$filepath}' /></a>";
|
||||
$str = "<a href='#{$filepath}' title='{$filepath}' onclick=\"e107Helper.insertText('{$filepath}','{$name}','{$name}-iconpicker'); return false; \"><img class='icon picker list%%size%%' src='{$filepath_abs}' alt='{$icon_file}' /></a>";
|
||||
|
||||
foreach ($tmp as $isize)
|
||||
{
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
* Form Handler
|
||||
*
|
||||
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
|
||||
* $Revision: 1.33 $
|
||||
* $Date: 2009-07-15 09:38:00 $
|
||||
* $Revision: 1.34 $
|
||||
* $Date: 2009-07-16 08:15:35 $
|
||||
* $Author: e107coders $
|
||||
*
|
||||
*/
|
||||
@ -87,6 +87,11 @@ class e_form
|
||||
|
||||
function iconpicker($name, $default, $label, $sc_parameters = '', $ajax = true)
|
||||
{
|
||||
// TODO - Hide the <input type='text'> element, and display the icon itself after it has been chosen.
|
||||
// eg. <img id='iconview' src='".$img."' style='border:0; ".$blank_display."' alt='' />
|
||||
// The button itself could be replaced with an icon just for this purpose.
|
||||
|
||||
|
||||
$e107 = &e107::getInstance();
|
||||
$id = $this->name2id($name);
|
||||
$sc_parameters .= '&id='.$id;
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
|
||||
| $Revision: 1.68 $
|
||||
| $Date: 2009-07-16 02:55:19 $
|
||||
| $Revision: 1.69 $
|
||||
| $Date: 2009-07-16 08:15:35 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -268,7 +268,7 @@ class e107plugin
|
||||
|
||||
function manage_icons($plugin='')
|
||||
{
|
||||
global $sql,$tp, $iconpool;
|
||||
global $sql,$tp, $iconpool,$pref;
|
||||
|
||||
$query = "SELECT * FROM #plugin WHERE plugin_installflag =0 ORDER BY plugin_path ASC";
|
||||
$sql->db_Select_gen($query);
|
||||
@ -285,7 +285,7 @@ class e107plugin
|
||||
require_once(e_HANDLER."file_class.php");
|
||||
$fl = new e_file;
|
||||
|
||||
$filesrch = implode("|",array("_16.png","_16.PNG","_32.png","_32.PNG","_48.png","_48.PNG","_64.png","_64.PNG","_128.png","_128.png"));
|
||||
$filesrch = implode("|",array("/images(*.)_16.png","_16.PNG","_32.png","_32.PNG","_48.png","_48.PNG","_64.png","_64.PNG","_128.png","_128.png"));
|
||||
|
||||
if($plugin_icons = $fl->get_files(e_PLUGIN,$filesrch,$reject_plugin,2))
|
||||
{
|
||||
@ -297,6 +297,11 @@ class e107plugin
|
||||
sort($core_icons);
|
||||
}
|
||||
|
||||
if($theme_icons = $fl->get_files(e_THEME.$pref['sitetheme']."/images/",$filesrch,$reject_core,2))
|
||||
{
|
||||
sort($theme_icons);
|
||||
}
|
||||
|
||||
$srch = array(e_IMAGE,"/");
|
||||
$repl = array("","-");
|
||||
|
||||
@ -309,8 +314,8 @@ class e107plugin
|
||||
$iconpool[$key][] = $tp->createConstants($file['path'],1).$file['fname'];
|
||||
}
|
||||
|
||||
$srch = array(e_PLUGIN,"/images/");
|
||||
$repl = array("","");
|
||||
$srch = array(e_PLUGIN,"/images/","/icons/");
|
||||
$repl = array("","","");
|
||||
|
||||
foreach($plugin_icons as $file)
|
||||
{
|
||||
@ -319,6 +324,14 @@ class e107plugin
|
||||
$iconpool[$key][] = $tp->createConstants($file['path'],1).$file['fname'];
|
||||
}
|
||||
|
||||
foreach($theme_icons as $file)
|
||||
{
|
||||
$path = str_replace($srch,$repl,$file['path']);
|
||||
$key = "theme-".$path;
|
||||
$iconpool[$key][] = $tp->createConstants($file['path'],1).$file['fname'];
|
||||
}
|
||||
|
||||
|
||||
|
||||
return (save_prefs("iconpool")) ? TRUE : FALSE;
|
||||
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/userclass_class.php,v $
|
||||
| $Revision: 1.35 $
|
||||
| $Date: 2009-07-08 06:58:00 $
|
||||
| $Revision: 1.36 $
|
||||
| $Date: 2009-07-16 08:15:35 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -45,7 +45,7 @@ define('e_UC_NEWUSER',247); // Users in 'probationary' period
|
||||
define('e_UC_SPECIAL_BASE',245); // Assign class IDs 245 and above for fixed/special purposes
|
||||
define('e_UC_SPECIAL_END',255); // Highest 'special' class
|
||||
|
||||
define('UC_CLASS_ICON_DIR','userclasses/'); // Directory for userclass icons
|
||||
// define('UC_CLASS_ICON_DIR','userclasses/'); // Directory for userclass icons - deprecated - the icon will be saved with the full path. {e_IMAGE} or {e_PLUGIN} / images/ etc.
|
||||
define('UC_ICON_DIR',e_IMAGE.'generic/'); // Directory for the icons used in the admin tree displays
|
||||
|
||||
define('e_UC_BLANK','-1');
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*
|
||||
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
|
||||
* $Id: lan_admin.php,v 1.21 2009-07-15 09:38:00 e107coders Exp $
|
||||
* $Id: lan_admin.php,v 1.22 2009-07-16 08:15:35 e107coders Exp $
|
||||
*
|
||||
* Admin Language File
|
||||
*/
|
||||
@ -287,6 +287,7 @@ define("LAN_NEWVERSION","New Version Available");
|
||||
|
||||
define("LAN_CHECKALL", 'Check All');
|
||||
define("LAN_UNCHECKALL", 'Uncheck All');
|
||||
define("LAN_DELCHECKED", "Delete Checked");
|
||||
|
||||
define("LAN_USERCLASS", "Userclass");
|
||||
define("LAN_AUTHOR", "Author");
|
||||
@ -294,6 +295,6 @@ define("LAN_CATEGORY", "Category");
|
||||
|
||||
define("LAN_HELP", "Help");
|
||||
define("LAN_MENULAYOUT", "Menu Layout");
|
||||
|
||||
define("LAN_IMAGEMANAGER", "Image Manager");
|
||||
|
||||
?>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*
|
||||
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
|
||||
* $Id: lan_image.php,v 1.8 2008-12-14 21:01:59 secretr Exp $
|
||||
* $Id: lan_image.php,v 1.9 2009-07-16 08:15:35 e107coders Exp $
|
||||
*
|
||||
* Admin Language File
|
||||
*
|
||||
@ -24,12 +24,12 @@ define("IMALAN_14", "Show image URL");
|
||||
define("IMALAN_15", "Show nothing");
|
||||
define("IMALAN_16", "Show uploaded avatars");
|
||||
define("IMALAN_17", "Click here");
|
||||
define("IMALAN_18", "Uploaded images");
|
||||
define("IMALAN_18", "Uploaded Avatar Images");
|
||||
define("IMALAN_19", "Show 'disabled' message");
|
||||
define('IMALAN_20', 'Nothing changed');
|
||||
define("IMALAN_21", "Used by");
|
||||
define("IMALAN_22", "Image not in use");
|
||||
define("IMALAN_23", "Avatar");
|
||||
define("IMALAN_23", "Avatars");
|
||||
define("IMALAN_24", "Photograph");
|
||||
define("IMALAN_25", "Click here to delete all unused images");
|
||||
define("IMALAN_26", "image(s) deleted");
|
||||
@ -76,7 +76,7 @@ define('IMALAN_60', 'Uncheck All');
|
||||
|
||||
|
||||
//avatar check
|
||||
define('IMALAN_61', 'Options');
|
||||
// define('IMALAN_61', 'Options');
|
||||
define('IMALAN_62', 'Reason');
|
||||
define('IMALAN_63', 'URL');
|
||||
define('IMALAN_64', 'User');
|
||||
@ -87,4 +87,9 @@ define('IMALAN_67', 'Are you sure?');
|
||||
define('IMALAN_68', 'Close');
|
||||
define('IMALAN_69', 'Folder');
|
||||
define('IMALAN_70', 'Non-system folder is found!');
|
||||
|
||||
define("IMALAN_71", "Icon Pool");
|
||||
define("IMALAN_72", "Icons");
|
||||
|
||||
|
||||
?>
|
||||
Loading…
x
Reference in New Issue
Block a user