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

Notice removal

Browse Source
This commit is contained in:
Cameron
2012-12-15 18:06:55 -08:00
parent 0779798f89
commit d404081ce6
12 changed files with 73 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/admin_log.php
View File

@@ -56,7 +56,7 @@ if(is_array($pref['lan_log_list'])) //... and for any plugins which support it
{ {
$file = str_replace('--LAN--', e_LANGUAGE, $file); $file = str_replace('--LAN--', e_LANGUAGE, $file);
echo "orig = ".$file." "; // echo "orig = ".$file." ";
e107::lan($path,'log',true); e107::lan($path,'log',true);
//include_lan(e_PLUGIN.$path.'/'.$file); //include_lan(e_PLUGIN.$path.'/'.$file);
} }

20
e107_admin/links.php
View File

@@ -68,7 +68,7 @@ class links_admin_ui extends e_admin_ui
protected $perPage = 0; protected $perPage = 0;
protected $batchDelete = true; protected $batchDelete = true;
protected $batchCopy = true; protected $batchCopy = true;
protected $listOrder = 'link_order ASC'; protected $listOrder = 'link_category,link_order ASC';
protected $listSorting = true; // TODO - should enable the 'sort' icon in the 'options' column. protected $listSorting = true; // TODO - should enable the 'sort' icon in the 'options' column.
@@ -78,14 +78,14 @@ class links_admin_ui extends e_admin_ui
protected $fields = array( protected $fields = array(
'checkboxes' => array('title'=> '', 'width' => '3%','forced' => true, 'thclass' => 'center first','class' => 'center first'), 'checkboxes' => array('title'=> '', 'width' => '3%','forced' => true, 'thclass' => 'center first','class' => 'center first'),
'link_button' => array('title'=> LAN_ICON, 'type'=>'icon', 'width'=>'5%', 'thclass' => 'center', 'class'=>'center'), 'link_button' => array('title'=> LAN_ICON, 'type'=>'icon', 'width'=>'5%', 'thclass' => 'center', 'class'=>'center'),
'link_id' => array('title'=> ID, 'noedit'=>TRUE), 'link_id' => array('title'=> LAN_ID, 'noedit'=>TRUE),
'link_name' => array('title'=> LCLAN_15, 'width'=>'auto','type'=>'text', 'required' => true, 'validate' => true), 'link_name' => array('title'=> LCLAN_15, 'width'=>'auto','type'=>'text', 'required' => true, 'validate' => true),
'link_parent' => array('title'=> 'Sublink of', 'type' => 'method', 'width' => 'auto', 'batch'=>true, 'filter'=>true, 'thclass' => 'left first'), 'link_parent' => array('title'=> 'Sublink of', 'type' => 'method', 'width' => 'auto', 'batch'=>true, 'filter'=>true, 'thclass' => 'left first'),
'link_url' => array('title'=> LCLAN_93, 'width'=>'auto', 'type'=>'text', 'required'=>true,'validate' => true), 'link_url' => array('title'=> LCLAN_93, 'width'=>'auto', 'type'=>'text', 'required'=>true,'validate' => true),
'link_sefurl' => array('title'=> LAN_SEFURL, 'type' => 'text', 'width' => 'auto'), 'link_sefurl' => array('title'=> LAN_SEFURL, 'type' => 'text', 'width' => 'auto'),
'link_class' => array('title'=> LAN_USERCLASS, 'type' => 'userclass', 'writeParms' => 'classlist=public,guest,nobody,member,classes,admin,main', 'batch'=>true, 'filter'=>true, 'width' => 'auto'), 'link_class' => array('title'=> LAN_USERCLASS, 'type' => 'userclass', 'writeParms' => 'classlist=public,guest,nobody,member,classes,admin,main', 'batch'=>true, 'filter'=>true, 'width' => 'auto'),
'link_description' => array('title'=> LCLAN_17, 'type' => 'textarea', 'width' => 'auto'), // 'method'=>'tinymce_plugins', ? 'link_description' => array('title'=> LCLAN_17, 'type' => 'textarea', 'width' => 'auto'), // 'method'=>'tinymce_plugins', ?
'link_category' => array('title'=> LCLAN_12, 'type' => 'dropdown', 'batch'=>true, 'filter'=>true, 'width' => 'auto'), 'link_category' => array('title'=> LAN_TEMPLATE, 'type' => 'dropdown', 'batch'=>true, 'filter'=>true, 'width' => 'auto'),
'link_order' => array('title'=> LAN_ORDER, 'type' => 'number', 'width' => 'auto', 'nolist'=>true), 'link_order' => array('title'=> LAN_ORDER, 'type' => 'number', 'width' => 'auto', 'nolist'=>true),
'link_open' => array('title'=> LCLAN_19, 'type' => 'dropdown', 'width' => 'auto', 'batch'=>true, 'filter'=>true, 'thclass' => 'left first'), 'link_open' => array('title'=> LCLAN_19, 'type' => 'dropdown', 'width' => 'auto', 'batch'=>true, 'filter'=>true, 'thclass' => 'left first'),
'link_function' => array('title'=> 'Function', 'type' => 'method', 'data'=>'str', 'width' => 'auto', 'thclass' => 'left first'), 'link_function' => array('title'=> 'Function', 'type' => 'method', 'data'=>'str', 'width' => 'auto', 'thclass' => 'left first'),
@@ -111,15 +111,15 @@ class links_admin_ui extends e_admin_ui
{ {
$this->fields['link_category']['writeParms'] = array( $this->fields['link_category']['writeParms'] = array(
1 => "1 - Main", 1 => "1 - Main",
2 => "2 - Alt", 2 => "2 - Sidebar",
3 => "3 - Alt", 3 => "3 - Footer",
4 => "4 - Alt", 4 => "4 - Alt",
5 => "5 - Alt", 5 => "5 - Alt",
6 => "6 - Alt", // 6 => "6 - Alt", // If these are required, something is not right with the themeing method.
7 => "7 - Alt", // 7 => "7 - Alt",
8 => "8 - Alt", // 8 => "8 - Alt",
9 => "9 - Alt", // 9 => "9 - Alt",
10 => "10 - Alt" // 10 => "10 - Alt"
); );
$this->fields['link_open']['writeParms'] = array( $this->fields['link_open']['writeParms'] = array(

4
e107_admin/plugin.php
View File

@@ -299,7 +299,7 @@ class pluginManager{
$mes->addWarning("This area is experimental and may produce unpredictable results."); $mes->addWarning("This area is experimental and may produce unpredictable results.");
$from = intval($_GET['frm']); $from = intval(varset($_GET['frm']));
// $file = SITEURLBASE.e_PLUGIN_ABS."release/release.php"; // temporary testing // $file = SITEURLBASE.e_PLUGIN_ABS."release/release.php"; // temporary testing
$file = "http://e107.org/feed?frm=".$from; $file = "http://e107.org/feed?frm=".$from;
@@ -1317,7 +1317,7 @@ class pluginBuilder
$this->special['checkboxes'] = array('title'=> '','type' => null, 'data' => null, 'width'=>'5%', 'thclass' =>'center', 'forced'=> TRUE, 'class'=>'center', 'toggle' => 'e-multiselect', 'fieldpref'=>true); $this->special['checkboxes'] = array('title'=> '','type' => null, 'data' => null, 'width'=>'5%', 'thclass' =>'center', 'forced'=> TRUE, 'class'=>'center', 'toggle' => 'e-multiselect', 'fieldpref'=>true);
$this->special['options'] = array( 'title'=> LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced'=>TRUE, 'fieldpref'=>true); $this->special['options'] = array( 'title'=> LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced'=>TRUE, 'fieldpref'=>true);
if($_GET['newplugin']) if(vartrue($_GET['newplugin']))
{ {
$this->pluginName = $_GET['newplugin']; $this->pluginName = $_GET['newplugin'];
} }

16
e107_admin/prefs.php
View File

@@ -457,21 +457,21 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
<tr> <tr>
<td>".LAN_MAILOUT_87.":&nbsp;&nbsp;</td> <td>".LAN_MAILOUT_87.":&nbsp;&nbsp;</td>
<td> <td>
<input class='tbox' type='text' name='smtp_server' size='40' value='".$pref['smtp_server']."' maxlength='50' /> <input class='tbox' type='text' name='smtp_server' size='40' value='".vartrue($pref['smtp_server'])."' maxlength='50' />
</td> </td>
</tr> </tr>
<tr> <tr>
<td>".LAN_MAILOUT_88.":&nbsp;(".LAN_OPTIONAL.")&nbsp;&nbsp;</td> <td>".LAN_MAILOUT_88.":&nbsp;(".LAN_OPTIONAL.")&nbsp;&nbsp;</td>
<td style='width:50%;' > <td style='width:50%;' >
<input class='tbox' type='text' name='smtp_username' size='40' value=\"".$pref['smtp_username']."\" maxlength='50' /> <input class='tbox' type='text' name='smtp_username' size='40' value=\"".vartrue($pref['smtp_username'])."\" maxlength='50' />
</td> </td>
</tr> </tr>
<tr> <tr>
<td>".LAN_MAILOUT_89.":&nbsp;(".LAN_OPTIONAL.")&nbsp;&nbsp;</td> <td>".LAN_MAILOUT_89.":&nbsp;(".LAN_OPTIONAL.")&nbsp;&nbsp;</td>
<td> <td>
<input class='tbox' type='password' name='smtp_password' size='40' value='".$pref['smtp_password']."' maxlength='50' /> <input class='tbox' type='password' name='smtp_password' size='40' value='".vartrue($pref['smtp_password'])."' maxlength='50' />
</td> </td>
</tr> </tr>
@@ -505,7 +505,7 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
/* FIXME - posting SENDMAIL path triggers Mod-Security rules. /* FIXME - posting SENDMAIL path triggers Mod-Security rules.
// Sendmail. --------------> // Sendmail. -------------->
$senddisp = ($pref['mailer'] != 'sendmail') ? "style='display:none;'" : '';
$text .= "<div id='sendmail' {$senddisp}><table style='margin-right:0px;margin-left:auto;border:0px'>"; $text .= "<div id='sendmail' {$senddisp}><table style='margin-right:0px;margin-left:auto;border:0px'>";
$text .= " $text .= "
<tr> <tr>
@@ -517,8 +517,8 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
</table></div>"; </table></div>";
*/ */
$senddisp = (varset($pref['mailer']) != 'sendmail') ? "e-hideme" : '';
$text .= "<div class='s-message info e-hideme' id='sendmail' {$senddisp}> $text .= "<div class='s-message info {$senddisp}' id='sendmail' >
Not available in this release Not available in this release
</div>"; </div>";
@@ -536,7 +536,7 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
'texthtml' => LAN_MAILOUT_126, 'texthtml' => LAN_MAILOUT_126,
'texttheme' => LAN_MAILOUT_127 'texttheme' => LAN_MAILOUT_127
); );
$text .= $frm->selectbox('mail_sendstyle', $emFormat,$pref['mail_sendstyle']); $text .= $frm->selectbox('mail_sendstyle', $emFormat, vartrue($pref['mail_sendstyle']));
$text .= " $text .= "
</td> </td>
</tr> </tr>
@@ -1806,7 +1806,7 @@ $text .= "
<td>".PRFLAN_196."</td> <td>".PRFLAN_196."</td>
<td> <td>
".$frm->radio_switch('log_page_accesses', $pref['log_page_accesses'])." ".$frm->radio_switch('log_page_accesses', $pref['log_page_accesses'])."
<div class='field-help'>".PRFLAN_196a." <strong>".e_LOG_ABS."</strong></div> <div class='field-help'>".PRFLAN_196a." <strong>".e_LOG."</strong></div>
</td> </td>
</tr> </tr>
<tr> <tr>

8
e107_admin/search.php
View File

@@ -454,14 +454,16 @@ else
<tbody> <tbody>
"; ";
foreach ($search_prefs['comments_handlers'] as $key => $value) { foreach ($search_prefs['comments_handlers'] as $key => $value)
{
$path = ($value['dir'] == 'core') ? e_HANDLER.'search/comments_'.$key.'.php' : e_PLUGIN.$value['dir'].'/search/search_comments.php'; $path = ($value['dir'] == 'core') ? e_HANDLER.'search/comments_'.$key.'.php' : e_PLUGIN.$value['dir'].'/search/search_comments.php';
if(is_readable($path)){ if(is_readable($path))
{
require_once($path); require_once($path);
} }
$text .= " $text .= "
<tr> <tr>
<td>{$comments_title}</td> <td>".vartrue($comments_title)."</td>
<td> <td>
".r_userclass("comments_handlers[".$key."][class]", $search_prefs['comments_handlers'][$key]['class'], "off", "public,guest,nobody,member,admin,classes")." ".r_userclass("comments_handlers[".$key."][class]", $search_prefs['comments_handlers'][$key]['class'], "off", "public,guest,nobody,member,admin,classes")."
</td> </td>

2
e107_admin/ugflag.php
View File

@@ -103,7 +103,7 @@ $text .= "
</td> </td>
<td> <td>
".$frm->bbarea('maintainance_text', vartrue($pref['maintainance_text']), 'maintenance', 'maintenance_bbhelp')." ".$frm->bbarea('maintainance_text', vartrue($pref['maintainance_text']), 'maintenance', 'small')."
<div class='field-help'>".UGFLAN_6."</div> <div class='field-help'>".UGFLAN_6."</div>
</td> </td>
</tr> </tr>

7
e107_admin/updateadmin.php
View File

@@ -17,7 +17,8 @@
require_once('../class2.php'); require_once('../class2.php');
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); // include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
e107::lan('core','updateadmin',true);
$e_sub_cat = 'admin_pass'; $e_sub_cat = 'admin_pass';
@@ -93,8 +94,8 @@ else
</tr> </tr>
<tr> <tr>
<td>".UDALAN_5.":</td> <td>".UDALAN_5.":</td>
<td> <td>".$frm->password('a_password','',20,'generate=1&strength=1')."
<input class='tbox input-text' type='password' name='a_password' size='60' value='' maxlength='20' />
</td> </td>
</tr> </tr>
<tr> <tr>

2
e107_admin/userclass2.php
View File

@@ -901,7 +901,7 @@ class uclass_manager
$this->fields = array( $this->fields = array(
'userclass_icon' => array('title'=> UCSLAN_68, 'type' => 'icon', 'width' => '5%', 'thclass' => 'center', 'class' => 'center'), 'userclass_icon' => array('title'=> UCSLAN_68, 'type' => 'icon', 'width' => '5%', 'thclass' => 'center', 'class' => 'center'),
'userclass_id' => array('title'=> ID, 'type' => 'int', 'width' => '5%', 'thclass' => 'left'), 'userclass_id' => array('title'=> LAN_ID, 'type' => 'int', 'width' => '5%', 'thclass' => 'left'),
'userclass_name' => array('title'=> UCSLAN_12, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), 'userclass_name' => array('title'=> UCSLAN_12, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'),
'userclass_description' => array('title'=> UCSLAN_13, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), 'userclass_description' => array('title'=> UCSLAN_13, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'),
'userclass_editclass' => array('title'=> UCSLAN_24, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), 'userclass_editclass' => array('title'=> UCSLAN_24, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'),

42
e107_admin/users_extended.php
View File

@@ -523,7 +523,14 @@ class users_ext
function show_extended($current = '') // Show existing fields List. function show_extended($current = '') // Show existing fields List.
{ {
global $sql, $ns, $ue, $curtype, $tp, $mySQLdefaultdb, $action, $sub_action,$frm; global $ue, $curtype,$mySQLdefaultdb, $action, $sub_action;
$sql = e107::getDb();
$frm = e107::getForm();
$ns = e107::getRender();
$tp = e107::getParser();
if($current == 'new') if($current == 'new')
{ {
$mode = 'new'; $mode = 'new';
@@ -539,7 +546,7 @@ class users_ext
list($current_include, $current_regex, $current_regexfail, $current_hide) = explode("^,^",$current['user_extended_struct_parms']); list($current_include, $current_regex, $current_regexfail, $current_hide) = explode("^,^",$current['user_extended_struct_parms']);
} }
$text .= " $text = "
<form method='post' action='".e_SELF."?".e_QUERY."'> <form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-user-extended-create'>"; <fieldset id='core-user-extended-create'>";
@@ -552,16 +559,16 @@ class users_ext
<tr> <tr>
<td>".EXTLAN_10.":</td> <td>".EXTLAN_10.":</td>
<td>user_"; <td>user_";
if(is_array($current) && $current['user_extended_struct_name']) if(is_array($current) && varset($current['user_extended_struct_name']))
{ {
$text .= $current['user_extended_struct_name']." $text .= $current['user_extended_struct_name']."
<input type='hidden' name='user_field' value='".$current['user_extended_struct_name']."' /> <input type='hidden' name='user_field' value='".vartrue($current['user_extended_struct_name'])."' />
"; ";
} }
else else
{ {
$text .= " $text .= "
<input class='tbox' type='text' name='user_field' size='40' value='".$current['user_extended_struct_name']."' maxlength='50' /> <input class='tbox' type='text' name='user_field' size='40' value='".vartrue($current['user_extended_struct_name'])."' maxlength='50' />
"; ";
} }
$text .= " $text .= "
@@ -572,7 +579,7 @@ class users_ext
<tr> <tr>
<td>".EXTLAN_12.":</td> <td>".EXTLAN_12.":</td>
<td colspan='3'> <td colspan='3'>
<input class='tbox' type='text' name='user_text' size='40' value='".$current['user_extended_struct_text']."' maxlength='50' /><br /> <input class='tbox' type='text' name='user_text' size='40' value='".vartrue($current['user_extended_struct_text'])."' maxlength='50' /><br />
<span class='field-help'>".EXTLAN_13."</span> <span class='field-help'>".EXTLAN_13."</span>
</td> </td>
</tr> </tr>
@@ -584,7 +591,7 @@ class users_ext
<select onchange='changeHelp(this.value)' class='tbox' name='user_type' id='user_type'>"; <select onchange='changeHelp(this.value)' class='tbox' name='user_type' id='user_type'>";
foreach($ue->user_extended_types as $key => $val) foreach($ue->user_extended_types as $key => $val)
{ {
$selected = ($current['user_extended_struct_type'] == $key) ? " selected='selected'": ""; $selected = (vartrue($current['user_extended_struct_type']) == $key) ? " selected='selected'": "";
$text .= "<option value='".$key."' $selected>".$val."</option>"; $text .= "<option value='".$key."' $selected>".$val."</option>";
} }
$curtype = $current['user_extended_struct_type']; $curtype = $current['user_extended_struct_type'];
@@ -608,8 +615,9 @@ class users_ext
$text .= "<div id='values' style='display:$val_hide'>\n"; $text .= "<div id='values' style='display:$val_hide'>\n";
$text .= "<div id='value_container' >\n"; $text .= "<div id='value_container' >\n";
$curVals = explode(",",$current['user_extended_struct_values']); $curVals = explode(",",varset($current['user_extended_struct_values']));
if(count($curVals) == 0){ if(count($curVals) == 0)
{
$curVals[]=''; $curVals[]='';
} }
$i=0; $i=0;
@@ -622,7 +630,7 @@ class users_ext
} }
$text .= " $text .= "
</div> </div>
<input type='button' class='btn button' value='".EXTLAN_48."' onclick=\"duplicateHTML('value_line','value_container');\" /> <input type='button' class='btn btn-primary button' value='".EXTLAN_48."' onclick=\"duplicateHTML('value_line','value_container');\" />
<br /><span class='field-help'>".EXTLAN_17."</span></div>"; <br /><span class='field-help'>".EXTLAN_17."</span></div>";
// End of Values. -------------------------------------- // End of Values. --------------------------------------
$db_hide = ($current['user_extended_struct_type'] == 4) ? "visible" : "none"; $db_hide = ($current['user_extended_struct_type'] == 4) ? "visible" : "none";
@@ -691,7 +699,7 @@ class users_ext
<tr> <tr>
<td>".EXTLAN_16."</td> <td>".EXTLAN_16."</td>
<td colspan='3'> <td colspan='3'>
<input class='tbox' type='text' name='user_default' size='40' value='{$current['user_extended_struct_default']}' /> <input class='tbox' type='text' name='user_default' size='40' value='".vartrue($current['user_extended_struct_default'])."' />
</td> </td>
</tr> </tr>
@@ -726,7 +734,7 @@ class users_ext
<select class='tbox' name='user_parent'>"; <select class='tbox' name='user_parent'>";
foreach($this->catNums as $k) foreach($this->catNums as $k)
{ {
$sel = ($k == $current['user_extended_struct_parent']) ? " selected='selected' " : ""; $sel = ($k == varset($current['user_extended_struct_parent'])) ? " selected='selected' " : "";
$text .= "<option value='{$k}' {$sel}>".$this->catList[$k][0]['user_extended_struct_name']."</option>\n"; $text .= "<option value='{$k}' {$sel}>".$this->catList[$k][0]['user_extended_struct_name']."</option>\n";
} }
$text .= "</select> $text .= "</select>
@@ -740,9 +748,9 @@ class users_ext
<select class='tbox' name='user_required'> <select class='tbox' name='user_required'>
"; ";
$_r = array('0' => EXTLAN_65, '1' => EXTLAN_66, '2' => EXTLAN_67); $_r = array('0' => EXTLAN_65, '1' => EXTLAN_66, '2' => EXTLAN_67);
foreach($_r as $k => $v) foreach($_r as $k => $v) //FIXME change to $frm->selectbox()
{ {
$sel = ($current['user_extended_struct_required'] == $k ? " selected='selected' " : ""); $sel = (varset($current['user_extended_struct_required']) == $k ? " selected='selected' " : "");
$text .= "<option value='{$k}' {$sel}>{$v}</option>\n"; $text .= "<option value='{$k}' {$sel}>{$v}</option>\n";
} }
@@ -756,21 +764,21 @@ class users_ext
<tr> <tr>
<td >".EXTLAN_5."</td> <td >".EXTLAN_5."</td>
<td colspan='3'> <td colspan='3'>
".r_userclass("user_applicable", $current['user_extended_struct_applicable'], 'off', 'member, admin, main, classes, nobody')."<br /><span class='field-help'>".EXTLAN_20."</span> ".r_userclass("user_applicable", varset($current['user_extended_struct_applicable']), 'off', 'member, admin, main, classes, nobody')."<br /><span class='field-help'>".EXTLAN_20."</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>".EXTLAN_6."</td> <td>".EXTLAN_6."</td>
<td colspan='3'> <td colspan='3'>
".r_userclass("user_read", $current['user_extended_struct_read'], 'off', 'public, member, admin, main, readonly, classes')."<br /><span class='field-help'>".EXTLAN_22."</span> ".r_userclass("user_read", varset($current['user_extended_struct_read']), 'off', 'public, member, admin, main, readonly, classes')."<br /><span class='field-help'>".EXTLAN_22."</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>".EXTLAN_7."</td> <td>".EXTLAN_7."</td>
<td colspan='3'> <td colspan='3'>
".r_userclass("user_write", $current['user_extended_struct_write'], 'off', 'member, admin, main, classes')."<br /><span class='field-help'>".EXTLAN_21."</span> ".r_userclass("user_write", varset($current['user_extended_struct_write']), 'off', 'member, admin, main, classes')."<br /><span class='field-help'>".EXTLAN_21."</span>
</td> </td>
</tr> </tr>

18
e107_handlers/form_handler.php
View File

@@ -104,6 +104,8 @@ class e_form
$method = "post"; $method = "post";
} }
$class = "";
parse_str($options,$options); parse_str($options,$options);
$target = str_replace("&", "&amp;", $target); $target = str_replace("&", "&amp;", $target);
@@ -722,9 +724,11 @@ class e_form
{ {
if(is_string($options)) parse_str($options, $options); if(is_string($options)) parse_str($options, $options);
$addon = "";
if(vartrue($options['generate'])) if(vartrue($options['generate']))
{ {
$addon .= '&nbsp;<a href="#" class="smalltext" id="Spn_PasswordGenerator" >Generate</a> | <a class="smalltext" href="#" id="showPwd">Show</a><br />'; $addon .= '&nbsp;<a href="#" class="smalltext e-tip" id="Spn_PasswordGenerator" title="Generate a password">Generate</a> | <a class="smalltext e-tip" href="#" id="showPwd" title="Display the password">Show</a><br />';
} }
if(vartrue($options['strength'])) if(vartrue($options['strength']))
@@ -732,11 +736,11 @@ class e_form
$addon .= "<div><div id='pwdColor' class='progress' style='float:left;display:inline-block;width:215px'><div class='bar' id='pwdMeter' style='width:0%' ></div></div> <div id='pwdStatus' class='smalltext' style='float:left;display:inline-block;width:150px;margin-left:5px'></span></div>"; $addon .= "<div><div id='pwdColor' class='progress' style='float:left;display:inline-block;width:215px'><div class='bar' id='pwdMeter' style='width:0%' ></div></div> <div id='pwdStatus' class='smalltext' style='float:left;display:inline-block;width:150px;margin-left:5px'></span></div>";
} }
$options = $this->format_options('text', $name, $options);
$options['class'] = vartrue($options['class'],'e-password');
$options['pattern'] = vartrue($options['pattern'],'[\S]{4,}'); $options['pattern'] = vartrue($options['pattern'],'[\S]{4,}');
$options['required'] = vartrue($options['required'], 1); $options['required'] = vartrue($options['required'], 1);
$options['class'] = vartrue($options['class'],'e-password');
$options = $this->format_options('text', $name, $options);
//never allow id in format name-value for text fields //never allow id in format name-value for text fields
$text = "<input type='password' name='{$name}' value='{$value}' maxlength='{$maxlength}'".$this->get_attributes($options, $name)." />"; $text = "<input type='password' name='{$name}' value='{$value}' maxlength='{$maxlength}'".$this->get_attributes($options, $name)." />";
@@ -768,7 +772,7 @@ class e_form
} }
/** /**
* Bbcode Area. Name, value, template, form-id, size, options array eg. counter * Bbcode Area. Name, value, template, media-Cat, size, options array eg. counter
* IMPORTANT: $$mediaCat is also used is the media-manager category identifier * IMPORTANT: $$mediaCat is also used is the media-manager category identifier
*/ */
function bbarea($name, $value, $template = '', $mediaCat='_common', $size = 'large', $options = array()) function bbarea($name, $value, $template = '', $mediaCat='_common', $size = 'large', $options = array())
@@ -1725,7 +1729,7 @@ class e_form
// there is no other way for now - prepare user data // there is no other way for now - prepare user data
if('user' == vartrue($data['type']) /* && isset($data['readParms']['idField'])*/) if('user' == vartrue($data['type']) /* && isset($data['readParms']['idField'])*/)
{ {
if(is_string($data['readParms'])) parse_str($data['readParms'], $data['readParms']); if(varset($data['readParms']) && is_string($data['readParms'])) parse_str($data['readParms'], $data['readParms']);
if(isset($data['readParms']['idField'])) if(isset($data['readParms']['idField']))
{ {
$data['readParms']['__idval'] = $fieldvalues[$data['readParms']['idField']]; $data['readParms']['__idval'] = $fieldvalues[$data['readParms']['idField']];
@@ -1795,7 +1799,7 @@ class e_form
{ {
case 'options': case 'options':
if($attributes['type'] == "method") // Allow override with 'options' function. if(varset($attributes['type']) == "method") // Allow override with 'options' function.
{ {
$attributes['mode'] = "read"; $attributes['mode'] = "read";
if(isset($attributes['method']) && $attributes['method'] && method_exists($this, $attributes['method'])) if(isset($attributes['method']) && $attributes['method'] && method_exists($this, $attributes['method']))

4
e107_handlers/media_class.php
View File

@@ -284,8 +284,8 @@ class e_media
$qry .= "AND media_cat_class IN (".USERCLASS_LIST.") "; $qry .= "AND media_cat_class IN (".USERCLASS_LIST.") ";
$qry .= "ORDER BY media_cat_order"; $qry .= "ORDER BY media_cat_order";
e107::getDb()->db_Select_gen($qry); e107::getDb()->gen($qry);
while($row = e107::getDb()->db_Fetch(mySQL_ASSOC)) while($row = e107::getDb()->db_Fetch(MYSQL_ASSOC))
{ {
$id = $row['media_cat_category']; $id = $row['media_cat_category'];
$ret[$id] = $row; $ret[$id] = $row;

6
e107_plugins/_blank/admin_config.php
View File

@@ -259,9 +259,9 @@ class plugin_blank_admin_ui extends e_admin_ui
*/ */
protected $fields = array( protected $fields = array(
'checkboxes' => array('title'=> '', 'type' => null, 'data' => null, 'width'=>'5%', 'thclass' =>'center', 'forced'=> TRUE, 'class'=>'center', 'toggle' => 'e-multiselect'), 'checkboxes' => array('title'=> '', 'type' => null, 'data' => null, 'width'=>'5%', 'thclass' =>'center', 'forced'=> TRUE, 'class'=>'center', 'toggle' => 'e-multiselect'),
'blank_id' => array('title'=> ID, 'type' => 'number', 'data' => 'int', 'width'=>'5%', 'thclass' => '', 'class'=>'center', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable 'blank_id' => array('title'=> LAN_ID, 'type' => 'number', 'data' => 'int', 'width'=>'5%', 'thclass' => '', 'class'=>'center', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable
'blank_icon' => array('title'=> LAN_ICON, 'type' => 'icon', 'data' => 'str', 'width'=>'5%', 'thclass' => '', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable 'blank_icon' => array('title'=> LAN_ICON, 'type' => 'icon', 'data' => 'str', 'width'=>'5%', 'thclass' => '', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable
'blank_type' => array('title'=> 'Type', 'type' => 'method', 'data' => 'str', 'width'=>'auto', 'thclass' => '', 'batch' => TRUE, 'filter'=>TRUE), 'blank_type' => array('title'=> LAN_TYPE, 'type' => 'method', 'data' => 'str', 'width'=>'auto', 'thclass' => '', 'batch' => TRUE, 'filter'=>TRUE),
'blank_folder' => array('title'=> 'Folder', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'thclass' => ''), 'blank_folder' => array('title'=> 'Folder', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'thclass' => ''),
'blank_name' => array('title'=> 'Name', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'thclass' => ''), 'blank_name' => array('title'=> 'Name', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'thclass' => ''),
'blank_version' => array('title'=> 'Version', 'type' => 'number', 'data' => 'str', 'width' => 'auto', 'thclass' => ''), 'blank_version' => array('title'=> 'Version', 'type' => 'number', 'data' => 'str', 'width' => 'auto', 'thclass' => ''),
@@ -269,7 +269,7 @@ class plugin_blank_admin_ui extends e_admin_ui
'blank_authorURL' => array('title'=> "Url", 'type' => 'url', 'data' => 'str', 'width' => 'auto', 'thclass' => 'left'), 'blank_authorURL' => array('title'=> "Url", 'type' => 'url', 'data' => 'str', 'width' => 'auto', 'thclass' => 'left'),
'blank_date' => array('title'=> LAN_DATE, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'thclass' => '', 'readParms' => 'long', 'writeParms' => 'type=datetime'), 'blank_date' => array('title'=> LAN_DATE, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'thclass' => '', 'readParms' => 'long', 'writeParms' => 'type=datetime'),
'blank_compatibility' => array('title'=> 'Compatible', 'type' => 'text', 'data' => 'str', 'width' => '10%', 'thclass' => 'center' ), 'blank_compatibility' => array('title'=> 'Compatible', 'type' => 'text', 'data' => 'str', 'width' => '10%', 'thclass' => 'center' ),
'blank_url' => array('title'=> 'File Package', 'type' => 'file', 'data' => 'str', 'width' => '20%', 'thclass' => 'center', 'batch' => TRUE, 'filter'=>TRUE, 'parms' => 'truncate=30', 'validate' => false, 'help' => 'Enter blank URL here', 'error' => 'please, ener valid URL'), 'blank_url' => array('title'=> LAN_URL, 'type' => 'file', 'data' => 'str', 'width' => '20%', 'thclass' => 'center', 'batch' => TRUE, 'filter'=>TRUE, 'parms' => 'truncate=30', 'validate' => false, 'help' => 'Enter blank URL here', 'error' => 'please, ener valid URL'),
'test_list_1' => array('title'=> 'test 1', 'type' => 'boolean', 'data' => 'int', 'width' => '5%', 'thclass' => 'center', 'batch' => TRUE, 'filter'=>TRUE, 'noedit' => true), 'test_list_1' => array('title'=> 'test 1', 'type' => 'boolean', 'data' => 'int', 'width' => '5%', 'thclass' => 'center', 'batch' => TRUE, 'filter'=>TRUE, 'noedit' => true),
'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced'=>TRUE) 'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced'=>TRUE)
); );