@@ -165,16 +163,10 @@ e107::coreLan('footer', true);
}
-
-
-
// Get Icon constants, theme override (theme/templates/admin_icons_template.php) is allowed
include_once(e107::coreTemplatePath('admin_icons'));
-
-
-
if(!defset('e_ADMIN_UI') && !defset('e_PAGETITLE'))
{
$array_functions = e107::getNav()->adminLinks('legacy'); // replacement see e107_handlers/sitelinks.php
@@ -478,4 +470,4 @@ if (!function_exists("parse_admin"))
}
}
}
-}
+}
\ No newline at end of file
diff --git a/e107_admin/cache.php b/e107_admin/cache.php
index d8d983aff..c5589928e 100644
--- a/e107_admin/cache.php
+++ b/e107_admin/cache.php
@@ -8,28 +8,17 @@
*
* Cache Administration Area
*
- * $URL$
- * $Id$
- *
*/
-/**
- * Admin page - cache management
- *
- * @package e107
- * @subpackage admin
- * @version $Id$;
- * @author e107 Inc
- */
-
require_once("../class2.php");
+
if (!getperms("C"))
{
e107::redirect('admin');
exit;
}
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('cache', true);
$e_sub_cat = 'cache';
diff --git a/e107_admin/comment.php b/e107_admin/comment.php
index 101a6cb08..e69c7a5b7 100644
--- a/e107_admin/comment.php
+++ b/e107_admin/comment.php
@@ -73,7 +73,7 @@ class comments_admin_ui extends e_admin_ui
'comment_type' => array('title'=> LAN_TYPE, 'type' => 'method', 'width' => '10%', 'filter'=>TRUE),
- 'comment_item_id' => array('title'=> LAN_ITEM." ".LAN_ID, 'type' => 'text', 'readonly'=>2, 'data'=>'int', 'width' => '5%'),
+ 'comment_item_id' => array('title'=> LAN_ITEM, 'type' => 'text', 'readonly'=>2, 'data'=>'int', 'width' => '5%'),
'comment_subject' => array('title'=> LAN_SUBJECT, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first', 'writeParms'=>array('size'=>'xxlarge')), // Display name
'comment_comment' => array('title'=> LAN_COMMENTS, 'type' => 'textarea', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1', 'writeParms'=>'size=xxlarge'), // Display name
'comment_author_id' => array('title'=> LAN_AUTHOR, 'type' => 'user', 'data' => 'int', 'width' => 'auto', 'writeParms' => 'nameField=comment_author_name'), // User id
diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index 4d8066a06..89746a993 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -9,7 +9,7 @@
* Custom Menus/Pages Administration
* Admin-related functions for custom page and menu creation
*/
-define('e_MINIMAL',true);
+//define('e_MINIMAL',true);
require_once('../class2.php');
if (!getperms("5|J")) { e107::redirect('admin'); exit; }
@@ -19,12 +19,11 @@ e107::css('inline',"
.e-wysiwyg { height: 400px }
");
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_page.php');
+e107::coreLan('cpage', true);
+e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_page.php');
$e_sub_cat = 'custom';
-
class page_admin extends e_admin_dispatcher
{
@@ -78,6 +77,19 @@ class page_admin extends e_admin_dispatcher
);
protected $menuTitle = ADLAN_42;
+
+
+ function init()
+ {
+
+
+
+
+
+ }
+
+
+
}
class page_admin_form_ui extends e_admin_form_ui
@@ -122,7 +134,7 @@ class page_admin_form_ui extends e_admin_form_ui
$text = "
".ADMIN_EDIT_ICON."";
- $text .= $this->submit_image('menu_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-default'.$delcls));
+ $text .= $this->submit_image('menu_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-default'));
return $text;
}
@@ -160,13 +172,13 @@ class page_chapters_ui extends e_admin_ui
'chapter_name' => array('title'=> CUSLAN_53, 'type' => 'method', 'width' => 'auto', 'thclass' => 'left', 'readonly'=>FALSE, 'writeParms'=>'size=xxlarge'),
'chapter_template' => array('title'=> LAN_TEMPLATE, 'type' => 'dropdown', 'width' => 'auto','filter' => true, 'batch'=>true, 'inline'=>true, 'writeParms'=>''),
- 'chapter_meta_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'textarea', 'width' => 'auto', 'thclass' => 'left','readParms' => 'expand=...&truncate=150&bb=1', 'readonly'=>FALSE),
+ 'chapter_meta_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'textarea', 'width' => 'auto', 'thclass' => 'left','readParms' => 'expand=...&truncate=150&bb=1', 'writeParms'=>'size=xxlarge', 'readonly'=>FALSE),
'chapter_meta_keywords' => array('title'=> LAN_KEYWORDS, 'type' => 'tags', 'inline'=>true, 'width' => 'auto', 'thclass' => 'left', 'readonly'=>FALSE),
- 'chapter_sef' => array('title'=> LAN_SEFURL, 'type' => 'text', 'width' => 'auto', 'readonly'=>FALSE, 'inline'=>true, 'writeParms'=>'size=xxlarge&inline-empty=1'), // Display name
+ 'chapter_sef' => array('title'=> LAN_SEFURL, 'type' => 'text', 'width' => 'auto', 'readonly'=>FALSE, 'inline'=>true, 'writeParms'=>'size=xxlarge&inline-empty=1&sef=chapter_name', ), // Display name
'chapter_manager' => array('title'=> CUSLAN_55, 'type' => 'userclass', 'inline'=>true, 'width' => 'auto', 'data' => 'int','batch'=>TRUE, 'filter'=>TRUE),
'chapter_order' => array('title'=> LAN_ORDER, 'type' => 'text', 'width' => 'auto', 'thclass' => 'right', 'class'=> 'right' ),
'chapter_visibility' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'inline'=>true, 'width' => 'auto', 'data' => 'int','batch'=>TRUE, 'filter'=>TRUE),
-
+ 'chapter_fields' => array('title', 'hidden', 'type'=>'hidden'),
'options' => array('title'=> LAN_OPTIONS, 'type' => 'method', 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'left', 'readParms'=>'sort=1')
);
@@ -178,10 +190,19 @@ class page_chapters_ui extends e_admin_ui
function init()
{
- if($this->getAction() == 'list')
+ // e107::getMessage()->addWarning("Experimental: Custom Fields");
+ $this->tabs = array(LAN_GENERAL,"Custom Fields");
+ $this->fields['chapter_fields'] = array('title'=>"Fields", 'tab'=>1, 'type'=>'method', 'data'=>'json', 'writeParms'=>array('nolabel'=>2));
+
+ if($this->getAction() === 'list')
{
$this->fields['chapter_parent']['title'] = CUSLAN_56;
}
+ elseif(deftrue('e_DEBUG'))
+ {
+ $this->fields['chapter_sef']['title'] = LAN_SEFURL.' / '.LAN_NAME;
+ $this->fields['chapter_sef']['help'] = 'May also be used in shortcode {CHAPTER_MENUS: name=x}';
+ }
$sql = e107::getDb();
$sql->gen("SELECT chapter_id,chapter_name FROM #page_chapters WHERE chapter_parent =0");
@@ -231,6 +252,8 @@ class page_chapters_ui extends e_admin_ui
e107::getMessage()->addError(CUSLAN_57);
return false;
}
+
+ $new_data = e107::getCustomFields()->processConfigPost('chapter_fields', $new_data);
return $new_data;
}
@@ -238,9 +261,40 @@ class page_chapters_ui extends e_admin_ui
public function beforeUpdate($new_data, $old_data, $id)
{
- // return $this->beforeCreate($new_data);
+ // return $this->beforeCreate($new_data);
+
+ $new_data = e107::getCustomFields()->processConfigPost('chapter_fields', $new_data);
+
+ return $new_data;
}
+/*
+ private function processCustomFields($newdata)
+ {
+ if(empty($newdata))
+ {
+ return null;
+ }
+
+ $new = array();
+ foreach($newdata as $fields)
+ {
+ if(empty($fields['key']) || empty($fields['type']))
+ {
+ continue;
+ }
+
+
+ $key = $fields['key'];
+ unset($fields['key']);
+ $new[$key] = $fields;
+
+
+ }
+
+ return $new;
+ }*/
+
}
@@ -272,18 +326,42 @@ class page_chapters_form_ui extends e_admin_form_ui
if($mode == 'filter')
{
- return;
+ return null;
}
if($mode == 'batch')
{
- return;
+ return null;
}
}
-
-
-
+ function chapter_fields($curVal,$mode,$parm)
+ {
+ $fieldAmount = (deftrue('e_DEBUG')) ? 20 :10;
+
+
+ if($mode == 'read')
+ {
+
+ }
+
+ if($mode == 'write')
+ {
+ return e107::getCustomFields()->loadConfig($curVal)->renderConfigForm('chapter_fields');
+ }
+
+ if($mode == 'filter')
+ {
+ return;
+ }
+ if($mode == 'batch')
+ {
+ return;
+ }
+ }
+
+
+
// Override the default Options field.
function options($parms, $value, $id, $attributes)
@@ -474,14 +552,14 @@ class page_admin_ui extends e_admin_ui
// PAGE LIST/EDIT and MENU EDIT modes.
protected $fields = array(
'checkboxes' => array('title'=> '', 'type' => null, 'width' =>'3%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'),
- 'page_id' => array('title'=> LAN_ID, 'type' => 'text', 'tab' => 0, 'width'=>'5%', 'forced'=> TRUE, 'readParms'=>'link=sef&target=dialog'),
+ 'page_id' => array('title'=> LAN_ID, 'type' => 'text', 'tab' => 0, 'width'=>'5%', 'forced'=> TRUE, 'readParms'=>'link=sef&target=blank'),
'page_title' => array('title'=> LAN_TITLE, 'tab' => 0, 'type' => 'text', 'inline'=>true, 'width'=>'25%', 'writeParms'=>'size=block-level'),
'page_chapter' => array('title'=> CUSLAN_63, 'tab' => 0, 'type' => 'dropdown', 'width' => '20%', 'filter' => true, 'batch'=>true, 'inline'=>true),
- 'page_template' => array('title'=> LAN_TEMPLATE, 'tab' => 0, 'type' => 'dropdown', 'width' => 'auto','filter' => true, 'batch'=>true, 'inline'=>true, 'writeParms'=>''),
+ 'page_template' => array('title'=> LAN_TEMPLATE, 'tab' => 0, 'type' => 'dropdown', 'width' => 'auto','filter' => true, 'batch'=>true, 'inline'=>true, 'writeParms'=>array()),
'page_author' => array('title'=> LAN_AUTHOR, 'tab' => 0, 'type' => 'user', 'inline'=>true, 'data'=>'int','width' => 'auto', 'thclass' => 'left'),
- 'page_text' => array('title'=> CUSLAN_9, 'tab' => 0, 'type' => 'bbarea', 'data'=>'str', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1', 'writeParms'=>'media=page&template=page'),
+ 'page_text' => array('title'=> CUSLAN_9, 'tab' => 0, 'type' => 'bbarea', 'data'=>'str', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1', 'writeParms'=>array('media'=>'page', 'template'=>'page')),
// Options Tab.
@@ -495,7 +573,9 @@ class page_admin_ui extends e_admin_ui
'page_metadscr' => array('title'=> CUSLAN_11, 'tab' => 1, 'type' => 'text', 'width' => 'auto', 'writeParms'=>'size=xxlarge'),
'page_order' => array('title'=> LAN_ORDER, 'tab' => 1, 'type' => 'number', 'width' => 'auto', 'inline'=>true),
-
+ 'page_fields' => array('title'=>'Custom Fields', 'tab'=>4, 'type'=>'hidden', 'data'=>'json', 'width'=>'auto'),
+
+
// Menu Tab XXX 'menu_name' is 'menu_name' - not caption.
'menu_name' => array('title'=> CUSLAN_64, 'tab' => 2, 'type' => 'text', 'width' => 'auto','nolist'=>true, "help"=>"Will be listed in the Menu-Manager under this name or may be called using {CMENU=name} in your theme. Must use ASCII characters only and be all lowercase."),
'menu_title' => array('title'=> CUSLAN_65, 'nolist'=>true, 'tab' => 2, 'type' => 'text', 'inline'=>true, 'width'=>'25%', "help"=>"Caption displayed on the menu item.", 'writeParms'=>'size=xxlarge'),
@@ -529,9 +609,13 @@ class page_admin_ui extends e_admin_ui
protected $books = array();
protected $cats = array(0 => LAN_NONE);
protected $templates = array();
+ protected $chapterFields = array();
function init()
{
+
+
+
if(vartrue($_POST['menu_delete'])) // Delete a Menu (or rather, remove it's data )
{
@@ -544,12 +628,12 @@ class page_admin_ui extends e_admin_ui
}
// USED IN Menu LIST/INLINE-EDIT MODE ONLY.
- if($this->getMode() == 'menu' && ($this->getACtion() == 'list' || $this->getACtion() == 'inline'))
+ if($this->getMode() == 'menu' && ($this->getAction() == 'list' || $this->getAction() == 'inline'))
{
- $this->listQry = "SELECT SQL_CALC_FOUND_ROWS p.*,u.user_id,u.user_name FROM #page AS p LEFT JOIN #user AS u ON p.page_author = u.user_id WHERE p.menu_name != '' "; // without any Order or Limit.
+ $this->listQry = "SELECT SQL_CALC_FOUND_ROWS p.*,u.user_id,u.user_name FROM #page AS p LEFT JOIN #user AS u ON p.page_author = u.user_id WHERE (p.menu_name != '' OR p.menu_image != '' OR p.menu_icon !='') "; // without any Order or Limit.
- $this->listOrder = 'p.page_id desc';
+ $this->listOrder = 'p.page_order asc'; // 'p.page_id desc';
$this->batchDelete = false;
$this->fields = array(
@@ -579,7 +663,7 @@ class page_admin_ui extends e_admin_ui
$this->fieldpref = array("page_id","menu_name", "menu_title", 'menu_image', 'menu_template', 'menu_icon', 'page_chapter', 'menu_class');
- if(e_DEBUG)
+ if(deftrue('e_DEBUG'))
{
$this->fields['menu_name']['inline'] = true;
}
@@ -594,7 +678,18 @@ class page_admin_ui extends e_admin_ui
$this->parseAliases();
}
-
+
+ if($this->getAction() == 'create' && e_DEBUG === true)
+ {
+
+ $tmp = e107::getCoreTemplate('page', 'default');
+ if(!empty($tmp['editor']))
+ {
+ $this->fields['page_text']['writeParms']['default'] = $tmp['editor'];
+ }
+
+ }
+
$this->templates = e107::getLayouts('', 'page', 'front', '', true, false);
unset($this->templates['panel'], $this->templates['nav']);
@@ -618,9 +713,8 @@ class page_admin_ui extends e_admin_ui
$this->prefs['listBooksTemplate']['writeParms'] = $tmpl;
$sql = e107::getDb();
-
-
- $sql->gen("SELECT chapter_id,chapter_name,chapter_parent FROM #page_chapters ORDER BY chapter_parent asc, chapter_order");
+
+ $sql->gen("SELECT chapter_id,chapter_name,chapter_parent, chapter_fields FROM #page_chapters ORDER BY chapter_parent asc, chapter_order");
while($row = $sql->fetch())
{
$cat = $row['chapter_id'];
@@ -633,15 +727,163 @@ class page_admin_ui extends e_admin_ui
{
$book = $row['chapter_parent'];
$this->cats[$cat] = $this->books[$book] . " : ".$row['chapter_name'];
- }
+ }
+
+ if(!empty($row['chapter_fields']))
+ {
+ $this->chapterFields[$cat] = ($row['chapter_fields']);
+ }
+
+
}
// asort($this->cats);
$this->fields['page_chapter']['writeParms']['optArray'] = $this->cats;
$this->fields['page_chapter']['writeParms']['size'] = 'xxlarge';
+ if($this->getAction() === 'create')
+ {
+ $this->fields['page_chapter']['writeParms']['ajax'] = array('src'=>e_SELF."?mode=page&action=chapter-change",'target'=>'tabadditional');
+ }
+
+
+ if(e_AJAX_REQUEST)
+ {
+ // @todo insert placeholder examples in params input when 'type' dropdown value is changed
+ }
+
+
+
+
+ if(e_AJAX_REQUEST && isset($_POST['page_chapter']) ) //&& $this->getAction() === 'chapter-change'
+ {
+
+ $this->initCustomFields($_POST['page_chapter']);
+
+ $elid = 'core-page-create';
+ $model = $this->getModel();
+ $tabId = 'additional';
+
+ $data = array(
+ 'tabs' => $this->getTabs(),
+ 'legend' => '',
+ 'fields' => $this->getFields(),
+ );
+
+ $text = $this->getUI()->renderCreateFieldset($elid, $data, $model, $tabId);
+
+ $ajax = e107::getAjax();
+ $commands = array();
+
+ if(empty($text))
+ {
+ $text = ""; // There are no additional fields for the selected chapter.
+ $commands[] = $ajax->commandInvoke('a[href="#tab' . $tabId . '"]', 'fadeOut');
+ }
+ else
+ {
+ $commands[] = $ajax->commandInvoke('a[href="#tab' . $tabId . '"]', 'fadeInAdminTab');
+ }
+
+ $commands[] = $ajax->commandInvoke('#tab' . $tabId, 'html', array($text));
+
+ $ajax->response($commands);
+ exit;
+ }
}
+ /*
+ * @todo Move to admin-ui ?
+ */
+ private function initCustomFields($chap=null)
+ {
+ $tabId = 'additional';
+
+ if(!empty($this->chapterFields[$chap]))
+ {
+ e107::getCustomFields()->setTab($tabId, "Additional")->loadConfig($this->chapterFields[$chap])->setAdminUIConfig('page_fields',$this);
+ }
+ else
+ {
+ e107::css('inline', '.nav-tabs li a[href="#tab' . $tabId . '"] { display: none; }');
+ }
+ }
+
+ private function loadCustomFieldsData()
+ {
+ $row = e107::getDb()->retrieve('page', 'page_chapter, page_fields', 'page_id='.$this->getId());
+
+ $cf = e107::getCustomFields();
+
+ $cf->loadData($row['page_fields'])->setAdminUIData('page_fields',$this);
+
+ // e107::getDebug()->log($cf);
+
+
+ }
+
+
+ function CreateObserver()
+ {
+ parent::CreateObserver();
+ $this->initCustomFields(0);
+
+ }
+
+
+
+ // Override default so we can alter the field db table data after it is loaded. .
+ function EditObserver()
+ {
+
+ parent::EditObserver();
+
+ $row = e107::getDb()->retrieve('page', 'page_chapter, page_fields', 'page_id='.$this->getId());
+ $chap = intval($row['page_chapter']);
+
+ $this->initCustomFields($chap);
+ $this->loadCustomFieldsData();
+
+ }
+
+ /**
+ * Filter/Process Posted page_field data;
+ * @param $new_data
+ * @return null
+ *//*
+ private function processCustomFieldData($new_data)
+ {
+ if(empty($new_data))
+ {
+ return null;
+ }
+
+ unset($new_data['page_fields']); // Reset.
+
+ foreach($new_data as $k=>$v)
+ {
+ if(substr($k,0,11) === "page_fields")
+ {
+ list($tmp,$newkey) = explode("__",$k);
+ $new_data['page_fields'][$newkey] = $v;
+ unset($new_data[$k]);
+
+
+ }
+
+ }
+
+
+
+ return $new_data;
+
+
+ }
+*/
+
+
+
+
/**
* Overrid
@@ -711,7 +953,10 @@ class page_admin_ui extends e_admin_ui
$newdata['page_sef'] = eHelper::secureSef($newdata['page_sef']);
}
-
+
+ // $newdata = $this->processCustomFieldData($newdata);
+
+
$sef = e107::getParser()->toDB($newdata['page_sef']);
if(isset($newdata['page_title']) && isset($newdata['menu_name']) && empty($newdata['page_title']) && empty($newdata['menu_name']))
@@ -732,11 +977,17 @@ class page_admin_ui extends e_admin_ui
function beforeUpdate($newdata,$olddata, $id)
{
+
+ $newdata = e107::getCustomFields()->processDataPost('page_fields',$newdata);
+
if(isset($newdata['menu_name']))
{
$newdata['menu_name'] = preg_replace('/[^\w-*]/','',$newdata['menu_name']);
}
+
+
+
return $newdata;
}
@@ -771,6 +1022,8 @@ class page_admin_ui extends e_admin_ui
}
+
+
public function afterDelete($deleted_data, $id, $deleted_check)
{
$sql = e107::getDb();
diff --git a/e107_admin/credits.php b/e107_admin/credits.php
index 0c6549a79..5462eef29 100644
--- a/e107_admin/credits.php
+++ b/e107_admin/credits.php
@@ -50,7 +50,7 @@ require_once(e_ADMIN."auth.php");
Nuvolo Icons, PHPMailer, TCPDF, PHP UTF8
-
Copyright e107 Inc. 2008-2013
+ Copyright e107 Inc. 2008-2017
![".COMLAN_318."](".THEME_ABS."images/commentedit.png "\".COMLAN_318.\"")
" : "Edit");
+ $adop_icon = (file_exists(THEME."images/commentedit.png") ? "![](".THEME_ABS."images/user_birthday.png)
";
}
-
+
return "![](".e_IMAGE_ABS."user_icons/user_birthday.png){kind=icon}
";
}
-
-
+
function sc_user_birthday($parm='')
{
if ($this->var['user_birthday'] != "" && $this->var['user_birthday'] != "0000-00-00" && preg_match("/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})/", $this->var['user_birthday'], $regs))
@@ -456,9 +456,8 @@ class user_shortcodes extends e_shortcode
return "".LAN_USER_33."";
}
}
-
-
-
+
+
function sc_user_signature($parm)
{
$tp = e107::getParser();
@@ -466,7 +465,6 @@ class user_shortcodes extends e_shortcode
}
-
function sc_user_comments_link($parm)
{
if($this->commentsDisabled)
@@ -679,14 +677,14 @@ class user_shortcodes extends e_shortcode
if(!$ext->hasPermission($fld,'read'))
{
+ // e107::getDebug()->log("Wrong permissions for user_euf: ".$fld);
return false;
}
$val = $this->var[$fld];
+ $type = $ext->getFieldType($fld);
- // e107::getDebug()->log(print_a($ext,true));
-
- return $ext->renderValue($val); //TODO auto-detect type, from within the user-extended class.
+ return $ext->renderValue($val,$type);
}
diff --git a/e107_core/shortcodes/batch/usersettings_shortcodes.php b/e107_core/shortcodes/batch/usersettings_shortcodes.php
index 5f2e61ec3..29f36637a 100755
--- a/e107_core/shortcodes/batch/usersettings_shortcodes.php
+++ b/e107_core/shortcodes/batch/usersettings_shortcodes.php
@@ -18,6 +18,7 @@ if (!defined('e107_INIT')) { exit; }
class usersettings_shortcodes extends e_shortcode
{
private $extendedTabs = false;
+ public $legacyTemplate = array();
function sc_username($parm) // This is the 'display name'
{
@@ -375,22 +376,25 @@ class usersettings_shortcodes extends e_shortcode
return $ret;
}
-
-
-
- function sc_userextended_cat($parm='')
- {
- global $usersettings_shortcodes, $USER_EXTENDED_CAT, $extended_showed;
-
- if(deftrue('BOOTSTRAP')===3)
+
+
+ function sc_userextended_cat($parm = '')
+ {
+ global $extended_showed;
+
+ if(THEME_LEGACY === true)
{
- $USER_EXTENDED_CAT = e107::getCoreTemplate('usersettings','extended-category');
+ $USER_EXTENDED_CAT = $this->legacyTemplate['USER_EXTENDED_CAT'];
}
-
-
+ else
+ {
+ $USER_EXTENDED_CAT = e107::getCoreTemplate('usersettings', 'extended-category');
+ }
+
+
$sql = e107::getDb();
$tp = e107::getParser();
-
+
if(isset($extended_showed['cat'][$parm]))
{
return "";
@@ -401,26 +405,27 @@ class usersettings_shortcodes extends e_shortcode
{
$qry = "
SELECT * FROM #user_extended_struct
- WHERE user_extended_struct_applicable IN (".$tp -> toDB($this->var['userclass_list'], true).")
- AND user_extended_struct_write IN (".USERCLASS_LIST.")
- AND user_extended_struct_id = ".intval($parm)."
+ WHERE user_extended_struct_applicable IN (" . $tp->toDB($this->var['userclass_list'], true) . ")
+ AND user_extended_struct_write IN (" . USERCLASS_LIST . ")
+ AND user_extended_struct_id = " . intval($parm) . "
";
if($sql->gen($qry))
{
$catInfo = $sql->fetch();
}
}
-
+
if($catInfo)
{
$qry = "
SELECT * FROM #user_extended_struct
- WHERE user_extended_struct_applicable IN (".$tp -> toDB($this->var['userclass_list'], true).")
- AND user_extended_struct_write IN (".USERCLASS_LIST.")
- AND user_extended_struct_parent = ".intval($parm)."
+ WHERE user_extended_struct_applicable IN (" . $tp->toDB($this->var['userclass_list'], true) . ")
+ AND user_extended_struct_write IN (" . USERCLASS_LIST . ")
+ AND user_extended_struct_parent = " . intval($parm) . "
AND user_extended_struct_type != 0
ORDER BY user_extended_struct_order ASC
";
+
if($sql->gen($qry))
{
$fieldList = $sql->db_getList();
@@ -429,94 +434,115 @@ class usersettings_shortcodes extends e_shortcode
cachevars("extendedfield_{$field['user_extended_struct_name']}", $field);
//TODO use $this instead of parseTemplate();
$ret .= $this->sc_userextended_field($field['user_extended_struct_name']);
- // $ret .= $tp->parseTemplate("{USEREXTENDED_FIELD={$field['user_extended_struct_name']}}", TRUE, $usersettings_shortcodes);
+ // $ret .= $tp->parseTemplate("{USEREXTENDED_FIELD={$field['user_extended_struct_name']}}", TRUE, $usersettings_shortcodes);
}
}
}
-
+
if($ret && $this->extendedTabs == false)
{
$catName = $catInfo['user_extended_struct_text'] ? $catInfo['user_extended_struct_text'] : $catInfo['user_extended_struct_name'];
- if(defined($catName)) $catName = constant($catName);
- $ret = str_replace("{CATNAME}", $tp->toHTML($catName, FALSE, 'emotes_off,defs'), $USER_EXTENDED_CAT).$ret;
+ if(defined($catName))
+ {
+ $catName = constant($catName);
+ }
+ $ret = str_replace("{CATNAME}", $tp->toHTML($catName, false, 'emotes_off,defs'), $USER_EXTENDED_CAT) . $ret;
}
-
+
$extended_showed['cat'][$parm] = 1;
+
return $ret;
}
-
-
-
- function sc_userextended_field($parm='')
- {
- global $usersettings_shortcodes, $extended_showed, $ue, $USEREXTENDED_FIELD, $REQUIRED_FIELD;
-
- if(deftrue('BOOTSTRAP')===3)
+
+
+ function sc_userextended_field($parm = '')
+ {
+ global $extended_showed;
+
+ $ue = e107::getUserExt();
+
+
+ if(THEME_LEGACY === true)
{
- $USEREXTENDED_FIELD = e107::getCoreTemplate('usersettings','extended-field');
+ $USEREXTENDED_FIELD = $this->legacyTemplate['USEREXTENDED_FIELD'];
+ $REQUIRED_FIELD = $this->legacyTemplate['REQUIRED_FIELD'];
}
-
-
+ else
+ {
+ $USEREXTENDED_FIELD = e107::getCoreTemplate('usersettings', 'extended-field');
+ $REQUIRED_FIELD = '';
+ }
+
+
if(isset($extended_showed['field'][$parm]))
{
return "";
}
-
+
$sql = e107::getDb();
$tp = e107::getParser();
-
-
+
$ret = "";
-
+
$fInfo = getcachedvars("extendeddata_{$parm}");
+
if(!$fInfo)
{
$qry = "
SELECT * FROM #user_extended_struct
- WHERE user_extended_struct_applicable IN (".$tp -> toDB($this->var['userclass_list'], true).")
- AND user_extended_struct_write IN (".USERCLASS_LIST.")
- AND user_extended_struct_name = '".$tp -> toDB($parm, true)."'
+ WHERE user_extended_struct_applicable IN (" . $tp->toDB($this->var['userclass_list'], true) . ")
+ AND user_extended_struct_write IN (" . USERCLASS_LIST . ")
+ AND user_extended_struct_name = '" . $tp->toDB($parm, true) . "'
";
if($sql->gen($qry))
{
$fInfo = $sql->fetch();
}
}
-
+
if($fInfo)
{
$fname = $fInfo['user_extended_struct_text'];
- if(defined($fname)) $fname = constant($fname);
+
+ if(defined($fname))
+ {
+ $fname = constant($fname);
+ }
+
$fname = $tp->toHTML($fname, "", "emotes_off, defs");
-
+
if($fInfo['user_extended_struct_required'] == 1 && !deftrue('BOOTSTRAP'))
{
$fname = str_replace("{FIELDNAME}", $fname, $REQUIRED_FIELD);
}
-
- $parms = explode("^,^",$fInfo['user_extended_struct_parms']);
-
- $fhide="";
+
+ $parms = explode("^,^", $fInfo['user_extended_struct_parms']);
+
+ $fhide = "";
+
if(varset($parms[3]))
{
- $chk = (strpos($this->var['user_hidden_fields'], "^user_".$parm."^") === FALSE) ? FALSE : TRUE;
+ $chk = (strpos($this->var['user_hidden_fields'], "^user_" . $parm . "^") === false) ? false : true;
+
if(isset($_POST['updatesettings']))
{
- $chk = isset($_POST['hide']['user_'.$parm]);
+ $chk = isset($_POST['hide']['user_' . $parm]);
}
+
$fhide = $ue->user_extended_hide($fInfo, $chk);
}
-
- $uVal = str_replace(chr(1), "", $this->var['user_'.$parm]);
+
+ $uVal = str_replace(chr(1), "", $this->var['user_' . $parm]);
$fval = $ue->user_extended_edit($fInfo, $uVal);
-
+
$ret = $USEREXTENDED_FIELD;
$ret = str_replace("{FIELDNAME}", $fname, $ret);
$ret = str_replace("{FIELDVAL}", $fval, $ret);
$ret = str_replace("{HIDEFIELD}", $fhide, $ret);
}
-
+
$extended_showed['field'][$parm] = 1;
+
return $ret;
}
diff --git a/e107_core/shortcodes/single/custom.php b/e107_core/shortcodes/single/custom.php
index cc628efd4..2e632d2dc 100644
--- a/e107_core/shortcodes/single/custom.php
+++ b/e107_core/shortcodes/single/custom.php
@@ -9,7 +9,7 @@ function custom_shortcode($parm)
{
case 'login':
case 'login noprofile':
- include_lan(e_PLUGIN.'login_menu/languages/'.e_LANGUAGE.'.php');
+ e107::includeLan(e_PLUGIN.'login_menu/languages/'.e_LANGUAGE.'.php');
$ret = '';
$sep = (defined('LOGINC_SEP')) ? LOGINC_SEP : "