mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-18 05:09:05 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/e107inc/e107 into dashboard

Browse Source
This commit is contained in:
lonalore 2016-11-07 14:28:53 +01:00
commit 93c52da3e4
13 changed files with 199 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
e107_admin/admin_log.php
View File

@ -162,7 +162,7 @@ class admin_log_ui extends e_admin_ui
'dblog_title' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'dblog_remarks' => array ( 'title' => RL_LAN_033, 'type' => 'method', 'data' => 'str', 'width' => '35%', 'filter'=>true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'options' => array ( 'title' => 'Options', 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
);
protected $fieldpref = array( 'dblog_datestamp', 'dblog_type', 'dblog_eventcode', 'dblog_user_id', 'dblog_ip', 'dblog_title', 'dblog_remarks');
@ -549,7 +549,7 @@ class admin_log_form_ui extends e_admin_form_ui
case 'filter':
case 'batch':
return array('Informative','Notice','Warning','Fatal');
return array(RL_LAN_132,RL_LAN_133,RL_LAN_134,RL_LAN_135);
break;
}
}
@ -639,7 +639,7 @@ class admin_log_form_ui extends e_admin_form_ui
if(strpos($text,'Array')!==false || strlen($text)>300)
{
$id = $this->getController()->getListModel()->get('dblog_id');
$ret ="<a class='e-expandit' href='#rem-".$id."'>Details</a>";
$ret ="<a class='e-expandit' href='#rem-".$id."'>".RL_LAN_087."</a>";
$ret .= "<div style='display:none' id='rem-".$id."'>";
$text = str_replace("<br />","\n",$text);
$text = str_replace("&#092;","/",$text);
@ -722,7 +722,7 @@ class audit_log_ui extends e_admin_ui
'dblog_ip' => array ( 'title' => LAN_IP, 'type' => 'ip', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'dblog_title' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'dblog_remarks' => array ( 'title' => 'Remarks', 'type' => 'method', 'data' => 'str', 'width' => '30%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'options' => array ( 'title' => 'Options', 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
);
protected $fieldpref = array('dblog_id', 'dblog_datestamp', 'dblog_microtime', 'dblog_eventcode', 'dblog_user_id', 'dblog_user_name', 'dblog_ip', 'dblog_title','dblog_remarks');
@ -777,7 +777,7 @@ class dblog_ui extends e_admin_ui
'dblog_caller' => array ( 'title' => 'Caller', 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
'dblog_title' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'dblog_remarks' => array ( 'title' => 'Remarks', 'type' => 'method', 'data' => 'str', 'width' => '30%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'options' => array ( 'title' => 'Options', 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
);
protected $fieldpref = array('dblog_id', 'dblog_datestamp', 'dblog_microtime', 'dblog_type', 'dblog_eventcode', 'dblog_user_id', 'dblog_user_name', 'dblog_ip', 'dblog_caller', 'dblog_title', 'dblog_remarks');
@ -1894,4 +1894,4 @@ function headerjs()
return $ret;
}*/
?>
?>

26
e107_admin/image.php
View File

@ -692,10 +692,10 @@ class media_admin_ui extends e_admin_ui
// protected $defaultOrder = 'desc';
protected $listOrder = 'm.media_id desc'; // show newest images first.
public $deleteConfirmScreen = true;
public $deleteConfirmMessage = 'You are about to delete [x] records and <strong>ALL CORRESPONDING FILES</strong>! Please confirm to continue!';
public $deleteConfirmMessage = IMALAN_129;
protected $preftabs = array('General',"Watermark", "Youtube");
protected $preftabs = array(IMALAN_78,IMALAN_89, "Youtube");
protected $fields = array(
'checkboxes' => array('title'=> '', 'type' => null, 'data'=> null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'),
@ -1313,10 +1313,10 @@ class media_admin_ui extends e_admin_ui
$text .= "<div style='text-align:right;padding:5px'>
<button type='submit' class='btn btn-success submit e-dialog-save' data-bbcode='".$options['bbcode']."' data-target='".$this->getQuery('tagid')."' name='save_image' value='Save it' >
<span>Save</span>
<span>".LAN_SAVE."</span>
</button>
<button type='submit' class=' btn btn-default submit e-dialog-close' name='cancel_image' value='Cancel' >
<span>Cancel</span>
<span>".LAN_CANCEL."</span>
</button>
</div>";
@ -1568,12 +1568,10 @@ class media_admin_ui extends e_admin_ui
}
else // empty key.
{
$items = "<div class='alert alert-info'><p>Youtube search requires a (free) YouTube v3 api key.<br />
This key is not required unless you wish to perform a keyword, playlist or channel search.<br />
Entering a Youtube video URL directly into the box above will still work without having an api key. <br />
<a style='color:black' target='_blank' href='".e_ADMIN."image.php?mode=main&action=prefs#/tab2'>Click here for more information and to enter your api key</a>.
</p>
</div>";
$link = '<a style="color:black" target="_blank" href="'.e_ADMIN.'image.php?mode=main&action=prefs#/tab2">'.IMALAN_177.'</a>';
$items = "<div class='alert alert-info'><p>".e107::getParser()->lanVars(e107::getParser()->toHTML(IMALAN_174, true), array('x'=>$link))."</p></div>";
}
}
@ -1603,7 +1601,7 @@ class media_admin_ui extends e_admin_ui
}
// return print_a($data,true);
$parms = array('width' => 200, 'height'=>113, 'type'=>'image', 'bbcode'=>'video', 'tagid'=> $this->getQuery('tagid'), 'action'=>'youtube','searchPlaceholder'=>'Search Youtube. Paste any YouTube URL here for a specific video/playlist/channel' );
$parms = array('width' => 200, 'height'=>113, 'type'=>'image', 'bbcode'=>'video', 'tagid'=> $this->getQuery('tagid'), 'action'=>'youtube','searchPlaceholder'=>IMALAN_175 );
$text = e107::getMedia()->browserCarousel($items, $parms);
if(E107_DEBUG_LEVEL > 0 && !empty($feed))
@ -1659,7 +1657,7 @@ class media_admin_ui extends e_admin_ui
if(!$fl->getRemoteFile($_POST['upload_url'], $fileName, 'import'))
{
$mes->addError("There was a problem grabbing the file");
$mes->addError(IMALAN_176);
}
elseif($import == true)
{
@ -2445,8 +2443,8 @@ class media_admin_ui extends e_admin_ui
// <td>".$frm->textarea('batch_import_diz['.$c.']', ($_POST['batch_import_diz'][$c] ? $_POST['batch_import_diz'][$c] : $default['description']))."</td>
$this->cats['_avatars_public'] = "Avatars Folder (user selectable)";
$this->cats['_avatars_private'] = "Avatars Folder (private)";
$this->cats['_avatars_public'] = IMALAN_178;
$this->cats['_avatars_private'] = IMALAN_179;
if(!isset($_POST['batch_category']) && substr($lastMime,0,5)=='image')
{

65
e107_handlers/admin_ui.php
View File

@ -1488,7 +1488,7 @@ class e_admin_dispatcher
$tmp = explode('/', trim($key, '/'), 3);
// sync with mode/route access
if(!$this->checkModeAccess($tmp[0]) || !$this->checkRouteAccess($tmp[0].'/'.$tmp[1]))
if(!$this->checkModeAccess($tmp[0]) || !$this->checkRouteAccess($tmp[0].'/'.varset($tmp[1])))
{
continue;
}
@ -3096,13 +3096,23 @@ class e_admin_controller_ui extends e_admin_controller
$selected[$i] = preg_replace('/[^\w-:.]/', '', $_sel);
}
}
if(substr($batch_trigger, 0, 6) === 'batch_')
{
list($tmp,$plugin,$command) = explode("_",$batch_trigger,3);
$this->setPosted(array());
$this->getRequest()->setAction('batch');
$cls = e107::getAddon($plugin,'e_admin',true);
e107::callMethod($cls,'process',$this,array('cmd'=>$command,'ids'=>$selected));
return $this;
}
$this->setTriggersEnabled(false); //disable further triggering
switch($trigger[0])
{
case 'delete': //FIXME - confirmation screen
case 'delete': //FIXME - confirmation popup
//method handleListDeleteBatch(); for custom handling of 'delete' batch
// if(empty($selected)) return $this;
// don't check selected data - subclass need to check additional post variables(confirm screen)
@ -4357,6 +4367,22 @@ class e_admin_ui extends e_admin_controller_ui
}
if(!empty($config['batchOptions']))
{
$opts = array();
foreach($config['batchOptions'] as $k=>$v)
{
$fieldName = 'batch_'.$plug.'_'.$k;
$opts[$fieldName] = $v; // ie. x_plugin_key
}
$batchCat = deftrue('LAN_PLUGIN_'.strtoupper($plug).'_NAME', $plug);
$this->batchOptions[$batchCat] = $opts;
}
if(!empty($config['tabs']))
@ -4475,8 +4501,8 @@ class e_admin_ui extends e_admin_controller_ui
{
$this->getTreeModel()->setMessages();
// FIXME lan
if($delcount) e107::getMessage()->addSuccess($tp->lanVars('[x] record(s) successfully deleted.', $delcount, true));
if($nfcount) e107::getMessage()->addError($tp->lanVars('[x] records not found and not deleted.', $nfcount,true));
if($delcount) e107::getMessage()->addSuccess($tp->lanVars(RL_LAN_085, $delcount, true));
if($nfcount) e107::getMessage()->addError($tp->lanVars(RL_LAN_086, $nfcount,true));
}
//$this->redirect();
@ -6052,7 +6078,7 @@ class e_admin_form_ui extends e_form
".$this->text('searchquery', $current_query[0], 50, $input_options)."
<i class='fa fa-search searchquery form-control-feedback form-control-feedback-left'></i>
<span>
".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))."
".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>RL_LAN_088))."
".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')."
".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')."
".$this->renderBatchFilter('filter', $current_query[1])."
@ -6266,7 +6292,22 @@ class e_admin_form_ui extends e_form
{
foreach($customBatchOptions as $key=>$val)
{
$text .= $this->option($val, $key, false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"'));
if(is_array($val))
{
$text .= $this->optgroup_open($key);
foreach($val as $k=>$v)
{
$text .= $this->option($v, $k, false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"'));
}
$text .= $this->optgroup_close();
}
else
{
$text .= $this->option($val, $key, false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"'));
}
}
}
@ -6471,11 +6512,11 @@ class e_admin_form_ui extends e_form
//TODO today, yesterday, this-month, last-month .
$dateFilters = array (
'hour' => "Past Hour",
"day" => "Past 24 hours",
"week" => "Past Week",
"month" => "Past Month",
"year" => "Past Year"
'hour' => RL_LAN_127,
"day" => RL_LAN_128,
"week" => RL_LAN_129,
"month" => RL_LAN_130,
"year" => RL_LAN_131
);
foreach($dateFilters as $k => $name)

5
e107_handlers/e_parse_class.php
View File

@ -4181,6 +4181,11 @@ TMPL;
echo "<h3>User-input &gg; toDb(\$text, true, false, 'no_html')</h3>";
print_a($dbText2);
echo "<div class='alert alert-warning'>";
$dbText3 = $tp->toDB($text, false, false, 'pReFs');
echo "<h3>User-input &gg; toDb(\$text, false, false, 'pReFs')</h3>";
print_a($dbText3);
// toClean
$filter3 = $tp->filter($text, 'wds');
echo "<h3>User-input &gg; filter(\$text, 'wds')</h3>";

2
e107_handlers/form_handler.php
View File

@ -3923,7 +3923,7 @@ class e_form
if(!$value) $value = '0';
if($parms)
{
if(!isset($parms['sep'])) $value = number_format($value, $parms['decimals']);
if(!isset($parms['sep'])) $value = number_format($value, varset($parms['decimals'],0));
else $value = number_format($value, $parms['decimals'], vartrue($parms['point'], '.'), vartrue($parms['sep'], ' '));
}

8
e107_handlers/js_manager.php
View File

@ -991,11 +991,15 @@ class e_jsmanager
break;
case 'plugin_css':
$file_path = explode(':', $file_path);
$file_path = $runtime_location.$this->_sep.'{e_PLUGIN}'.$file_path[0].'/'.trim($file_path[1], '/').$this->_sep.$pre.$this->_sep.$post;
$pfile_path = explode(':', $file_path,2);
$plugfile_path = $runtime_location.$this->_sep.'{e_PLUGIN}'.$pfile_path[0].'/'.trim($pfile_path[1], '/').$this->_sep.$pre.$this->_sep.$post;
// allow for URLs to be attributed to plugins. (loads after theme css in admin area header)
$file_path = ((strpos($pfile_path[1], 'http') !== 0 && strpos($pfile_path[1], '//') !== 0)) ? $plugfile_path : 'all'.$this->_sep.$pfile_path[1].$this->_sep.$pre.$this->_sep.$post;;
if(!isset($this->_e_css['plugin'])) $this->_e_css['plugin'] = array();
$registry = &$this->_e_css['plugin'];
$runtime = true;
break;
case 'theme_css':

4
e107_handlers/model_class.php
View File

@ -2657,6 +2657,10 @@ class e_front_model extends e_model
return $tp->toDB($value);
break;
case 'code':
return $tp->toDB($value, false, false, 'pReFs');
break;
case 'float':
return $this->toNumber($value);
break;

4
e107_handlers/pref_class.php
View File

@ -603,7 +603,7 @@ class e_pref extends e_front_model
$logId = 'PREFS_01';
}
$log->addSuccess('Settings successfully saved.', ($session_messages === null || $session_messages === true));
$log->addSuccess(LAN_SETSAVED, ($session_messages === null || $session_messages === true));
$uid = USERID;
@ -1203,4 +1203,4 @@ class prefs
$this->set($tmp, $name, $table, $uid);
}
}
?>
?>

15
e107_languages/English/admin/lan_admin_log.php
View File

@ -82,6 +82,10 @@ define("RL_LAN_081", "Mail bounces");
define("RL_LAN_082", "User bans");
define("RL_LAN_083", "Mail bounce resets");
define("RL_LAN_084", "Temporary accounts");
define("RL_LAN_085", "[x] record(s) successfully deleted!");
define("RL_LAN_086", "[x] records not found and not deleted!");
define("RL_LAN_087", "Details");
define("RL_LAN_088", "Filter the results below");
// Intentional gap
define("RL_LAN_090", "Download ID");
define("RL_LAN_091", "Detailed timings");
@ -122,5 +126,14 @@ define("RL_LAN_123", "User audit trail class");
define("RL_LAN_124", "User audit trail actions");
define("RL_LAN_125", "System Logs Maintenance");
define("RL_LAN_126", "Total [x] entries matching search condition");
define("RL_LAN_127", "Past Hour");
define("RL_LAN_128", "Past 24 hours");
define("RL_LAN_129", "Past Week");
define("RL_LAN_130", "Past Month");
define("RL_LAN_131", "Past Year");
define("RL_LAN_132", "Informative");
define("RL_LAN_133", "Notice");
define("RL_LAN_134", "Warning");
define("RL_LAN_135", "Fatal");
// define("RL_LAN_JS_CONFIRM", "Are you sure?");
?>
?>

25
e107_languages/English/admin/lan_image.php
View File

@ -5,21 +5,17 @@
* Admin Language File
*
*/
// Menu
define("LAN_IMA_M_01", "Media Library");
define("LAN_IMA_M_02", "Media Upload/Import");
define("LAN_IMA_M_03", "Media Categories");
define("LAN_IMA_M_04", "Create Category");
define("LAN_IMA_M_05", "Avatars");
// Errors / Info / Notices
define("LAN_IMA_001", "Modification is not permitted.");
define("LAN_IMA_002", "Not enough memory available to rotate");
define("LAN_IMA_003", "Rotated");
define("LAN_IMA_004", "Resizing");
// Options
define("LAN_IMA_O_001", "News Images");
define("LAN_IMA_O_002", "News [img] bbcode");
@ -27,9 +23,7 @@ define("LAN_IMA_O_003", "Page [img] bbcode");
define("LAN_IMA_O_004", "Featurebox Images");
define("LAN_IMA_O_005", "Featurebox [img] bbcode");
define("LAN_IMA_O_006", "[img] bbcode");
// Work in progress (Moc)
define("IMALAN_1", "Enable image display");
define("IMALAN_2", "Display images, this will apply sitewide (comments, chatbox etc) to images posted using the [img] bbcode");
define("IMALAN_3", "Resize method");
@ -56,7 +50,6 @@ define("IMALAN_23", "Avatars");
define("IMALAN_24", "Photograph");
define("IMALAN_25", "Click here to delete all unused images");
define("IMALAN_26", "image(s) deleted");
define("IMALAN_28", "deleted");
define("IMALAN_29", "No images");
// define("IMALAN_30", "Everyone (public)");
@ -65,7 +58,6 @@ define("IMALAN_29", "No images");
// define("IMALAN_33", "Admin only");
//define("IMALAN_34", "Enable PNG Fix");
//define("IMALAN_35", "Fixes transparent PNG-24's with alpha transparency in IE 5 / 6 (Applies Sitewide)");
define("IMALAN_36", "Validate avatar size and access");
define("IMALAN_37", "Avatar Validation");
define("IMALAN_38", "Maximum allowable width");
@ -82,31 +74,23 @@ define("IMALAN_48", "Total external avatars");
define("IMALAN_49", "Users with avatars");
define("IMALAN_50", "Total");
define("IMALAN_51", "Avatar for ");
define("IMALAN_52", "Path to ImageMagick appears to be incorrect");
define("IMALAN_53", "Path to ImageMagick appears to be correct, but convert file may not be valid");
define("IMALAN_54", "GD version installed:");
define('IMALAN_55', "Not installed");
//v0.8
//uploaded avatar list
define('IMALAN_56', "Click to select");
define('IMALAN_57', "Image too big - click to enlarge");
//avatar check
// define('IMALAN_61', "Options");
define('IMALAN_62', "Reason");
define('IMALAN_65', "Nothing found");
define('IMALAN_66', "Filename");
define('IMALAN_68', "Close");
define('IMALAN_69', "Folder");
define('IMALAN_70', "Non-system folder is found!");
// define("IMALAN_72", "Icons");
define('IMALAN_73', "Thumbnail Quality");
define('IMALAN_74', "Set this as low as possible before quality loss is apparent. Max. 100");
define('IMALAN_75', "Avatar Width");
@ -198,7 +182,7 @@ define('IMALAN_160', "Margin-Top");
define('IMALAN_161', "Margin-Bottom");
define('IMALAN_162', "Displaying [x] - [y] of [z] images.");
define('IMALAN_163', "Video");
define('IMALAN_164', ""); // Unused
define('IMALAN_164', "Deleted Icons from Media-Manager");
define('IMALAN_165', "No images");
define('IMALAN_166', "Upload images or files");
define('IMALAN_167', "No file");
@ -208,7 +192,8 @@ define('IMALAN_170', "Choose this avatar");
define('IMALAN_171', "Admin-Only Notice: The folder");
define('IMALAN_172', "is empty. Upload some default avatars images to this folder for users to choose avatars from.");
define('IMALAN_173', "No media owner found.");
define('IMALAN_174', "Youtube search requires a (free) YouTube v3 api key.[br]This key is not required unless you wish to perform a keyword, playlist or channel search.[br]Entering a Youtube video URL directly into the box above will still work without having an api key.[br][x]");
define('IMALAN_175', "Search Youtube. Paste any YouTube URL here for a specific video/playlist/channel");
define('IMALAN_176', "There was a problem grabbing the file");
define('IMALAN_177', "Click here for more information and to enter your api key");
?>

16
e107_plugins/_blank/e_admin.php
View File

@ -23,7 +23,9 @@ class _blank_admin
switch($type)
{
case "news": // hook into the news admin form.
$config['fields']['url'] = array ( 'title' =>"CUstom Field", 'type' => 'url', 'tab'=>1, 'writeParms'=> array('size'=>'xxlarge', 'placeholder'=>'', 'default'=>$defaultValue), 'width' => 'auto', 'help' => '', 'readParms' => '', 'class' => 'left', 'thclass' => 'left', );
$config['fields']['url'] = array ( 'title' =>"Custom Field", 'type' => 'url', 'tab'=>1, 'writeParms'=> array('size'=>'xxlarge', 'placeholder'=>'', 'default'=>$defaultValue), 'width' => 'auto', 'help' => '', 'readParms' => '', 'class' => 'left', 'thclass' => 'left', );
$config['batchOptions'] = array('custom' => 'Custom Batch Command');
break;
}
@ -37,20 +39,28 @@ class _blank_admin
/**
* Process Posted Data.
* @param object $ui admin-ui
* @param int $id - Primary ID of the record being created/edited/deleted
* @param int|array $id - Primary ID of the record being created/edited/deleted or array data of a batch process.
*/
public function process($ui, $id=0)
{
$data = $ui->getPosted();
$type = $ui->getEventName();
$action = $ui->getAction(); // current mode: create, edit, list
$action = $ui->getAction(); // current mode: create, edit, list, batch
if($action == 'delete')
{
return;
}
if($action == 'batch')
{
$arrayOfRecordIds = $id['ids'];
$command = $id['cmd'];
return;
}
if(!empty($id) )
{

69
e107_themes/bootstrap3/theme.php
View File

@ -13,18 +13,67 @@ define('VIEWPORT', "width=device-width, initial-scale=1.0");
// Warning: Some bootstrap CDNs are not compiled with popup.js
// use https if e107 is using https.
e107::js("url", "https://cdn.jsdelivr.net/bootstrap/3.3.6/js/bootstrap.min.js", 'jquery', 2);
/*
* jsdelivr
https://cdn.jsdelivr.net/bootstrap/3.3.7/js/bootstrap.min.js
https://cdn.jsdelivr.net/bootstrap/3.3.7/css/bootstrap-theme.min.css
https://cdn.jsdelivr.net/bootstrap/3.3.7/css/bootstrap.min.css
https://cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.min.css
https://cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.css
https://cdn.jsdelivr.net/bootswatch/3.3.7/cerulean/bootstrap.min.css
cdnjs
https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js
https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap-theme.css
https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap-theme.min.css
https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css
https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css
*/
$cndPref = e107::pref('theme', 'cdn','cdnjs');
$bootswatch = e107::pref('theme', 'bootswatch',false);
switch($cndPref)
{
case "jsdelivr":
e107::js("url", "https://cdn.jsdelivr.net/bootstrap/3.3.6/js/bootstrap.min.js", 'jquery', 2);
if($bootswatch)
{
e107::css('url', 'https://cdn.jsdelivr.net/bootswatch/3.3.7/'.$bootswatch.'/bootstrap.min.css');
}
else
{
e107::css('url', 'https://cdn.jsdelivr.net/bootstrap/3.3.7/css/bootstrap.min.css');
}
e107::css('url', 'https://cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.min.css');
break;
case "cdnjs":
default:
e107::js("url", "https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js", 'jquery', 2);
if($bootswatch)
{
e107::css('url', 'https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.7/'.$bootswatch.'/bootstrap.min.css');
}
else
{
e107::css('url', 'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css');
}
e107::css('url', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css');
}
if($bootswatch = e107::pref('theme', 'bootswatch',false))
{
e107::css('url', 'https://maxcdn.bootstrapcdn.com/bootswatch/3.3.6/'.$bootswatch.'/bootstrap.min.css');
}
else
{
e107::css('url', 'https://cdn.jsdelivr.net/bootstrap/3.3.6/css/bootstrap.min.css');
}
e107::css('url', 'https://cdn.jsdelivr.net/fontawesome/4.5.0/css/font-awesome.min.css');

22
e107_themes/bootstrap3/theme_config.php
View File

@ -16,14 +16,16 @@ class theme_bootstrap3 implements e_theme_config
$theme_pref['usernav_placement'] = $_POST['usernav_placement'];
$theme_pref['branding'] = $_POST['branding'];
$theme_pref['bootswatch'] = $_POST['bootswatch'];
$theme_pref['cdn'] = $_POST['cdn'];
$pref->set('sitetheme_pref', $theme_pref);
return $pref->dataHasChanged();
}
function config()
function config($type='front')
{
$frm = e107::getForm();
$frm = e107::getForm();
$brandingOpts = array('sitename'=>LAN_THEMEPREF_04, 'logo' => LAN_THEMEPREF_05, 'sitenamelogo'=>LAN_THEMEPREF_06);
@ -60,6 +62,13 @@ class theme_bootstrap3 implements e_theme_config
"yeti"=> 'Yeti',
);
$cdnFront = array(
'cdnjs' => "CDNJS (Cloudflare)",
'jsdelivr' => "jsDelivr"
// google ? No fontawesome support?
);
$previewLink = " <a class='btn btn-default e-modal' data-modal-caption=\"Use the 'Themes' menu to view the selection.\" href='http://bootswatch.com/default/'>".LAN_PREVIEW."</a>";
@ -67,15 +76,22 @@ class theme_bootstrap3 implements e_theme_config
$var[3]['html'] = "<div class='form-inline'>".$frm->select('bootswatch', $bootswatch, e107::pref('theme', 'bootswatch', ''),null,LAN_DEFAULT ).$previewLink."</div>";
$var[3]['help'] = "";
$var[4]['caption'] = "CDN";
$var[4]['html'] = $frm->select('cdn', $cdnFront, e107::pref('theme', 'cdn', '') );
$var[4]['help'] = "";
// $var[1]['caption'] = "Sample configuration field 2";
// $var[1]['html'] = $frm->text('_blank_example2', e107::pref('theme', 'example2', 'default'));
return $var;
}
function help()
{
return '';