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

Gui fixes. Restored cron pwd-generator button.

Browse Source
This commit is contained in:
Cameron
2013-02-23 05:17:03 -08:00
parent deb3059bfa
commit b6f45d838b
5 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_admin/cron.php
View File

@@ -103,7 +103,7 @@ class cron_admin_ui extends e_admin_ui
} }
if (!vartrue(e107::getPref('e_cron_pwd'))) if (!vartrue(e107::getPref('e_cron_pwd')) || varset($_POST['generate_pwd']))
{ {
$pwd = $this->setCronPwd(); $pwd = $this->setCronPwd();
} }
@@ -354,13 +354,17 @@ class cron_admin_ui extends e_admin_ui
} }
elseif (!$active) // show instructions elseif (!$active) // show instructions
{ {
$setpwd_message = LAN_CRON_15.":<br /><pre style='color:black'>".rtrim($_SERVER['DOCUMENT_ROOT'], '/').e_HTTP."cron.php ".$pref['e_cron_pwd']."</pre>". LAN_CRON_16; $setpwd_message = $frm->open("generate")
.LAN_CRON_15.":<br /><pre style='color:black'>".rtrim($_SERVER['DOCUMENT_ROOT'], '/').e_HTTP."cron.php ".$pref['e_cron_pwd'];
$setpwd_message .= "</pre>". LAN_CRON_16;
if(e_DOMAIN && file_exists("/usr/local/cpanel/version")) if(e_DOMAIN && file_exists("/usr/local/cpanel/version"))
{ {
$setpwd_message .= "<div style='margin-top:10px'><a rel='external' class='btn btn-primary' href='".e_DOMAIN."/cpanel'>Go to cPanel</a></div>"; $setpwd_message .= "<div style='margin-top:10px'><a rel='external' class='btn btn-primary' href='".e_DOMAIN."/cpanel'>Go to cPanel</a></div>";
} }
$setpwd_message .= $frm->admin_button('generate_pwd', 1, 'delete', 'Generate new cron password',array('class'=>'pull-right btn btn-small'));
$setpwd_message .= $frm->close();
$mes->add($setpwd_message, E_MESSAGE_INFO); $mes->add($setpwd_message, E_MESSAGE_INFO);
} }

2
e107_admin/ugflag.php
View File

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

10
e107_handlers/form_handler.php
View File

@@ -805,7 +805,7 @@ class e_form
// auto-height support // auto-height support
if(!vartrue($options['noresize'])) if(!vartrue($options['noresize']))
{ {
$options['class'] = (isset($options['class']) && $options['class']) ? $options['class'].' e-autoheight' : 'tbox textarea e-autoheight'; $options['class'] = (isset($options['class']) && $options['class']) ? $options['class'].' e-autoheight' : 'tbox span7 e-autoheight';
} }
$options = $this->format_options('textarea', $name, $options); $options = $this->format_options('textarea', $name, $options);
@@ -836,8 +836,8 @@ class e_form
case 'large': case 'large':
default: default:
$rows = '15'; $rows = '15';
$size = 'large'; $size = 'large span10';
$height = "style='height:500px;width:1025px'"; // inline required for wysiwyg // $height = "style='height:500px;width:1025px'"; // inline required for wysiwyg
break; break;
} }
@@ -1273,7 +1273,9 @@ class e_form
$btype = 'submit'; $btype = 'submit';
if(strpos($action, 'action') === 0) $btype = 'button'; if(strpos($action, 'action') === 0) $btype = 'button';
$options = $this->format_options('admin_button', $name, $options); $options = $this->format_options('admin_button', $name, $options);
$options['class'] = 'btn '.$action.' ';//shorthand
$options['class'] = vartrue($options['class']);
$options['class'] .= ' btn '.$action.' ';//shorthand
if(empty($label)) $label = $value; if(empty($label)) $label = $value;
switch ($action) switch ($action)

2
e107_handlers/user_handler.php
View File

@@ -1222,7 +1222,7 @@ class e_userperms
$tp = e107::getParser(); $tp = e107::getParser();
$plg = e107::getPlugin(); $plg = e107::getPlugin();
$allPlugins = $plg->getall(); $allPlugins = $plg->getall(1); // Needs all for 'reading' and 'installed' for writing.
foreach($allPlugins as $k=>$row2) foreach($allPlugins as $k=>$row2)
{ {

20
e107_plugins/faqs/admin_config.php
View File

@@ -77,14 +77,30 @@ class faq_cat_ui extends e_admin_ui
'faq_info_id' => array('title'=> LAN_ID, 'type' => 'number', 'width' =>'5%', 'forced'=> TRUE), 'faq_info_id' => array('title'=> LAN_ID, 'type' => 'number', 'width' =>'5%', 'forced'=> TRUE),
'faq_info_title' => array('title'=> LAN_TITLE, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'readParms'=>'editable=1'), 'faq_info_title' => array('title'=> LAN_TITLE, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'readParms'=>'editable=1'),
'faq_info_about' => array('title'=> LAN_DESCRIPTION, 'type' => 'bbarea', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name 'faq_info_about' => array('title'=> LAN_DESCRIPTION, 'type' => 'bbarea', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name
'faq_info_parent' => array('title'=> LAN_CATEGORY, 'type' => 'text', 'width' => '5%'), 'faq_info_parent' => array('title'=> LAN_CATEGORY, 'type' => 'dropdown', 'width' => '5%', 'writeParms'=>''),
'faq_info_class' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'width' => 'auto', 'data' => 'int', 'inline'=>true), 'faq_info_class' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'width' => 'auto', 'data' => 'int', 'inline'=>true),
'faq_info_order' => array('title'=> LAN_ORDER, 'type' => 'text', 'width' => '5%', 'thclass' => 'left' ), 'faq_info_order' => array('title'=> LAN_ORDER, 'type' => 'number', 'width' => '5%', 'thclass' => 'left' ),
'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'center','readParms'=>'sort=1') 'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'center','readParms'=>'sort=1')
); );
protected $categories = array();
public function init() public function init()
{ {
$sql = e107::getDb();
$this->categories[0] = "(Root)";
if($sql->select('faqs_info','*', 'faq_info_parent = 0 ORDER BY faq_info_title ASC'))
{
while ($row = $sql->fetch())
{
$this->categories[$row['faq_info_id']] = $row['faq_info_title'];
}
}
$this->fields['faq_info_parent']['writeParms'] = $this->categories;
/* /*
if(e_AJAX_REQUEST) // ajax link sorting. if(e_AJAX_REQUEST) // ajax link sorting.
{ {