'); // must use single quotes.
define("ADMIN_TRUE_ICON", "");
define("ADMIN_FALSE_ICON", "");
define("ADMIN_WARNING_ICON", "");
diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php
index 823e45e65..9cf7e7ffb 100644
--- a/e107_core/templates/header_default.php
+++ b/e107_core/templates/header_default.php
@@ -168,10 +168,6 @@ echo e107::getUrl()->response()->renderMeta()."\n"; // render all the e107::meta
echo "'.LAN_UI_404_BODY_ERROR.'
'; // TODO - lan
+ return ''.LAN_UI_404_BODY_ERROR.'
';
}
@@ -2184,7 +2184,7 @@ class e_admin_controller
public function E403Page()
{
- return ''.LAN_UI_403_BODY_ERROR.'
'; // TODO - lan
+ return ''.LAN_UI_403_BODY_ERROR.'
';
}
@@ -2345,6 +2345,10 @@ class e_admin_controller_ui extends e_admin_controller
/**
* @var array UI field data
*/
+
+
+ protected $pid;
+
protected $fields = array();
/**
@@ -2415,6 +2419,16 @@ class e_admin_controller_ui extends e_admin_controller
* @var string field containing the order number
*/
protected $sortField = null;
+
+ /**
+ * @var string field containing the order number
+ */
+ protected $treePrefix = null;
+
+ /**
+ * @var string field containing the parent field
+ */
+ protected $sortParent = null;
/**
* @var int reorder step
@@ -2611,6 +2625,26 @@ class e_admin_controller_ui extends e_admin_controller
{
return $this->sortField;
}
+
+ /**
+ * Get Sort Field data
+ * @return string
+ */
+ public function getSortParent()
+ {
+ return $this->sortParent;
+ }
+
+
+
+ /**
+ * Get Sort Field data
+ * @return string
+ */
+ public function getTreePrefix()
+ {
+ return $this->treePrefix;
+ }
/**
* Get Tab data
@@ -3140,7 +3174,22 @@ class e_admin_controller_ui extends e_admin_controller
switch($trigger[0])
{
+ case 'sefgen':
+ $field = $trigger[1];
+ $value = $trigger[2];
+
+ //handleListBatch(); for custom handling of all field names
+ if(empty($selected)) return $this;
+ $method = 'handle'.$this->getRequest()->getActionName().'SefgenBatch';
+ if(method_exists($this, $method)) // callback handling
+ {
+ $this->$method($selected, $field, $value);
+ }
+ break;
+
+
case 'export':
+ if(empty($selected)) return $this;
$method = 'handle'.$this->getRequest()->getActionName().'ExportBatch';
if(method_exists($this, $method)) // callback handling
{
@@ -3246,8 +3295,7 @@ class e_admin_controller_ui extends e_admin_controller
// check userclass manager class
if (!isset($e_userclass->class_tree[$id]) || !$user->checkClass($e_userclass->class_tree[$id]))
{
- // TODO lan
- $msg = $tp->lanVars("You don't have management permissions on [x]",$label);
+ $msg = $tp->lanVars(LAN_NO_ADMIN_PERMISSION,$label);
$this->getTreeModel()->addMessageWarning($msg);
unset($classes[$id],$msg);
}
@@ -3304,11 +3352,11 @@ class e_admin_controller_ui extends e_admin_controller
case 'datestamp':
$dateConvert = array(
- "hour" => "1 hour ago",
- "day" => "24 hours ago",
- "week" => "1 week ago",
- "month" => "1 month ago",
- "year" => "1 year ago"
+ "hour" => LAN_UI_FILTER_PAST_HOUR,//"1 hour ago",//etc
+ "day" => LAN_UI_FILTER_PAST_24_HOURS,
+ "week" => LAN_UI_FILTER_PAST_WEEK,
+ "month" => LAN_UI_FILTER_PAST_MONTH,
+ "year" => LAN_UI_FILTER_PAST_YEAR
);
$ky = $filter[2];
@@ -3998,10 +4046,24 @@ class e_admin_controller_ui extends e_admin_controller
$qry .= "\n".implode("\n", $joins);
}
}
- else
+ else // default listQry
{
+ if(!empty($listQry))
+ {
+ $qry = $this->parseCustomListQry($listQry);
+ }
+ elseif($this->sortField && $this->sortParent) // automated 'tree' sorting.
+ {
+ // $qry = "SELECT SQL_CALC_FOUND_ROWS a. *, CASE WHEN a.".$this->sortParent." = 0 THEN a.".$this->sortField." ELSE b.".$this->sortField." + (( a.".$this->sortField.")/1000) END AS treesort FROM `#".$this->table."` AS a LEFT JOIN `#".$this->table."` AS b ON a.".$this->sortParent." = b.".$this->pid;
+ $qry = $this->getParentChildQry();
+ $this->listOrder = '_treesort '; // .$this->sortField;
+ // $this->orderStep = ($this->orderStep === 1) ? 100 : $this->orderStep;
+ }
+ else
+ {
+ $qry = "SELECT SQL_CALC_FOUND_ROWS ".$tableSFields." FROM ".$tableFrom;
+ }
- $qry = $listQry ? $this->parseCustomListQry($listQry) : "SELECT SQL_CALC_FOUND_ROWS ".$tableSFields." FROM ".$tableFrom;
}
// group field - currently auto-added only if there are joins
@@ -4118,6 +4180,94 @@ class e_admin_controller_ui extends e_admin_controller
return $qry;
}
+
+ /**
+ * Return a Parent/Child SQL Query based on sortParent and sortField variables
+ * @param bool|false $orderby - include 'ORDER BY' in the qry.
+ * @return string
+ */
+ public function getParentChildQry($orderby=false)
+ {
+
+ $parent= $this->getSortParent();
+ $table = $this->getTableName();
+ $pid = $this->getPrimaryName();
+ $order = $this->getSortField();
+
+
+
+ $sql = "DROP FUNCTION IF EXISTS `getDepth` ;";
+
+ e107::getDb()->gen($sql);
+
+
+ $sql = "
+ CREATE FUNCTION `getDepth` (project_id INT) RETURNS int
+ BEGIN
+ DECLARE depth INT;
+ SET depth=1;
+
+ WHILE project_id > 0 DO
+
+ SELECT IFNULL(".$parent.",-1)
+ INTO project_id
+ FROM ( SELECT ".$parent." FROM `#".$table."` WHERE ".$pid." = project_id) AS t;
+
+ IF project_id > 0 THEN
+ SET depth = depth + 1;
+ END IF;
+
+ END WHILE;
+
+ RETURN depth;
+
+ END
+ ;
+ ";
+
+
+ e107::getDb()->gen($sql);
+
+ $sql = "DROP FUNCTION IF EXISTS `getTreeSort`;";
+
+ e107::getDb()->gen($sql);
+ $sql = "
+ CREATE FUNCTION getTreeSort(incid INT)
+ RETURNS CHAR(255)
+ BEGIN
+ SET @parentstr = CONVERT(incid, CHAR);
+ SET @parent = -1;
+ label1: WHILE @parent != 0 DO
+ SET @parent = (SELECT ".$parent." FROM `#".$table."` WHERE ".$pid." =incid);
+ SET @order = (SELECT ".$order." FROM `#".$table."` WHERE ".$pid." =incid);
+ SET @parentstr = CONCAT(if(@parent = 0,'',@parent), LPAD(@order,4,0), @parentstr);
+ SET incid = @parent;
+ END WHILE label1;
+
+ RETURN @parentstr;
+ END
+ ;
+
+ ";
+
+
+ e107::getDb()->gen($sql);
+
+ $qry = "SELECT SQL_CALC_FOUND_ROWS *, getTreeSort(".$pid.") as _treesort, getDepth(".$pid.") as _depth FROM `#".$table."` ";
+
+ if($orderby === true)
+ {
+ $qry .= " ORDER BY _treesort";
+ }
+
+ return $qry;
+ }
+
+
+
+
+
+
/**
* Manage submit item
* Note: $callbackBefore will break submission if returns false
@@ -4164,7 +4314,26 @@ class e_admin_controller_ui extends e_admin_controller
// - Autoincrement sortField on 'Create'.
- if(($_posted['etrigger_submit'] === 'create') && !empty($this->sortField) && empty($this->sortParent) && empty($_posted[$this->sortField]) )
+
+ // Prevent parent being assigned as self.
+ if(!empty($this->sortParent) && $this->getAction() === 'edit' && ($model->getId() == $_posted[$this->sortParent] ) )
+ {
+ $vars = array(
+ 'x'=> $this->getFieldAttr($this->sortParent,'title'),
+ 'y'=> $this->getFieldAttr($this->pid,'title'),
+ );
+
+ $message = e107::getParser()->lanVars(LAN_UI_X_CANT_EQUAL_Y, $vars);
+ $model->addMessageWarning($message);
+ $model->setMessages();
+ $this->getUI()->addWarning($this->sortParent);
+ return false;
+ }
+
+
+
+
+ if(($this->getAction() === 'create') && !empty($this->sortField) && empty($this->sortParent) && empty($_posted[$this->sortField]) )
{
$incVal = e107::getDb()->max($this->table, $this->sortField) + 1;
@@ -4296,6 +4465,7 @@ class e_admin_ui extends e_admin_controller_ui
protected $sortField;
protected $sortParent;
protected $orderStep;
+ protected $treePrefix;
/**
@@ -4601,6 +4771,59 @@ class e_admin_ui extends e_admin_controller_ui
}
+ /**
+ * Batch Export trigger
+ * @param array $selected
+ * @return void
+ */
+ protected function handleListSefgenBatch($selected, $field, $value)
+ {
+
+ $tree = $this->getTreeModel();
+ $c= 0;
+ foreach($selected as $id)
+ {
+ if(!$tree->hasNode($id))
+ {
+ e107::getMessage()->addError('Item #ID '.htmlspecialchars($id).' not found.');
+ continue;
+ }
+
+ $model = $tree->getNode($id);
+
+ $name = $model->get($value);
+
+ $sef = eHelper::title2sef($name,'dashl');
+
+
+
+
+
+ $model->set($field, $sef);
+
+
+ $model->save();
+
+ $data = $model->getData();
+
+ if($model->isModified())
+ {
+ $this->getModel()->setData($data)->save(false,true);
+ $c++;
+ }
+ }
+
+
+
+ $caption = e107::getParser()->lanVars(LAN_UI_BATCH_BOOL_SUCCESS, $c, true);
+ e107::getMessage()->addSuccess($caption);
+
+ // e107::getMessage()->moveToSession();
+ // redirect
+ // $this->redirect();
+ }
+
+
/**
* Batch URL trigger
@@ -4669,32 +4892,32 @@ class e_admin_ui extends e_admin_controller_ui
$res = $sql->insert('links', $linkArray);
- // FIXME lans
if($res !== FALSE)
{
- e107::getMessage()->addSuccess('Created Sitelink: '.($name ? $name : 'n/a')."");
- $scount++;
+ e107::getMessage()->addSuccess(LAN_CREATED.": ".LAN_SITELINK.": ".($name ? $name : 'n/a'));
+ $scount++;
}
else
{
if($sql->getLastErrorNumber())
{
- e107::getMessage()->addError('SQL Link Creation Error'); //TODO - Lan
+ e107::getMessage()->addError(LAN_CREATED_FAILED.": ".LAN_SITELINK.": ".$name.": ".LAN_SQL_ERROR);
e107::getMessage()->addDebug('SQL Link Creation Error #'.$sql->getLastErrorNumber().': '.$sql->getLastErrorText());
- }
+ }
else
{
- e107::getMessage()->addError('Unknown error: '.$name." not added");
+ e107::getMessage()->addError(LAN_CREATED_FAILED.": ".LAN_SITELINK.": ".$name.": ".LAN_UNKNOWN_ERROR);//Unknown Error
}
}
-
+
}
- if($scount > 0)
- {
- e107::getMessage()->addSuccess("{$scount} new sitelinks were added but are currently unassigned. You should now modify these links to your liking.
Modify Links"); + if($scount > 0) + { + e107::getMessage()->addSuccess(LAN_CREATED." (".$scount.") ".ADLAN_138); + e107::getMessage()->addSuccess("".LAN_CONFIGURE." ".ADLAN_138.""); return $scount; - } + } return false; @@ -4749,30 +4972,29 @@ class e_admin_ui extends e_admin_controller_ui $res = $sql->insert('featurebox', $fbArray); - // FIXME lans if($res !== FALSE) { - e107::getMessage()->addSuccess('Created Featurebox Item: '.($name ? $name : 'n/a').""); - $scount++; + e107::getMessage()->addSuccess(LAN_CREATED.": ".LAN_PLUGIN_FEATUREBOX_NAME.": ".($name ? $name : 'n/a')); + $scount++; } else { if($sql->getLastErrorNumber()) { - e107::getMessage()->addError('SQL Featurebox Creation Error'); //TODO - Lan - e107::getMessage()->addDebug('SQL Featurebox Creation Error #'.$sql->getLastErrorNumber().': '.$sql->getLastErrorText()); + e107::getMessage()->addError(LAN_CREATED_FAILED.": ".LAN_PLUGIN_FEATUREBOX_NAME.": ".$name.": ".LAN_SQL_ERROR); + e107::getMessage()->addDebug('SQL Featurebox Creation Error #'.$sql->getLastErrorNumber().': '.$sql->getLastErrorText()); } else { - e107::getMessage()->addError('Unknown error: '.$name." not added"); + e107::getMessage()->addError(LAN_CREATED_FAILED.": ".$name.": ".LAN_UNKNOWN_ERROR); } } - } if($scount > 0) { - e107::getMessage()->addSuccess("
{$scount} new featurebox items were added but are currently unassigned. You should now modify these items to your liking.
Modify Featurebox Items"); + e107::getMessage()->addSuccess(LAN_CREATED." (".$scount.") ".LAN_PLUGIN_FEATUREBOX_NAME); + e107::getMessage()->addSuccess(""); return $scount; } @@ -4891,8 +5113,8 @@ class e_admin_ui extends e_admin_controller_ui } else { - // TODO lan - $this->getTreeModel()->addMessageWarning("Comma list is empty, aborting.")->setMessages(); + $this->getTreeModel()->addMessageWarning(LAN_UPDATED_FAILED)->setMessages();//"Comma list is empty, aborting." + $this->getTreeModel()->addDebug(LAN_UPDATED_FAILED.": Comma list is empty, aborting.")->setMessages(); } break; @@ -4984,7 +5206,10 @@ class e_admin_ui extends e_admin_controller_ui { return; } - + + + + $cnt = $this->getTreeModel()->update($field, $val, $selected, true, false); if($cnt) { @@ -5139,7 +5364,7 @@ class e_admin_ui extends e_admin_controller_ui { header($protocol.': 404 Not Found', true, 404); header("Status: 404 Not Found", true, 404); - echo 'Field not found'; // FIXME lan + echo LAN_FIELD.": ".$this->fields[$_POST['name']].": ".LAN_NOT_FOUND; // Field: x: not found! $this->logajax('Field not found'); return; } @@ -5154,7 +5379,7 @@ class e_admin_ui extends e_admin_controller_ui { header($protocol.': 403 Forbidden', true, 403); header("Status: 403 Forbidden", true, 403); - echo 'Forbidden'; // FIXME lan + echo ADLAN_86; //Forbidden $this->logajax("Forbidden"); return; } @@ -5255,10 +5480,18 @@ class e_admin_ui extends e_admin_controller_ui $updated[] = "#".$id." -- ".$this->sortField." = ".$c; } // echo($sql->getLastQuery()."\n"); - $c += $step; + $c++; // += $step; } + + if(!empty($this->sortParent) && !empty($this->sortField) ) + { + return null; + } + + //file_put_contents(e_LOG."sortAjax.log", print_r($_POST['all'],true)); + // Increment every other record after the current page of records. // $changed = (intval($_POST['neworder']) * $step) + $from ; $changed = $c - $step; @@ -5268,10 +5501,10 @@ class e_admin_ui extends e_admin_controller_ui // ------------ Fix Child Order when parent is used. ---------------- - +/* if(!empty($this->sortParent) && !empty($this->sortField) ) // Make sure there is space for at least 99 { - + $parent = array(); $data2 = $sql->retrieve($this->table,$this->pid.','.$this->sortField,$this->sortParent .' = 0',true); foreach($data2 as $val) @@ -5307,7 +5540,7 @@ class e_admin_ui extends e_admin_controller_ui } - +*/ $this->afterSort($result, $_POST); // e107::getLog()->addDebug(print_r($_POST,true))->toFile('SortAjax','Admin-UI Ajax Sort Log', true); @@ -5823,6 +6056,7 @@ class e_admin_form_ui extends e_form protected $_controller = null; + /** * Constructor * @param e_admin_ui $controller @@ -5876,8 +6110,77 @@ class e_admin_form_ui extends e_form { } + + /** + * @todo Get a 'depth/level' field working with mysql and change the 'level' accordingly + * @param mixed $curVal + * @param string $mode read|write|inline + * @param array $parm + * @return array|string + */ + public function treePrefix($curVal, $mode, $parm) + { + $controller = $this->getController(); + $parentField = $controller->getSortParent(); + $treePrefixField = $controller->getTreePrefix(); + $parent = $controller->getListModel()->get($parentField); + $level = $controller->getListModel()->get("_depth"); + + + if($mode === 'read') + { + + $inline = $this->getController()->getFieldAttr($treePrefixField,'inline'); + + if($inline === true) + { + return $curVal; + } + + $level_image = $parent ? str_replace('level-x','level-'.$level, ADMIN_CHILD_ICON) : ''; + + return ($parent) ? $level_image.$curVal : $curVal; + + } + + + if($mode === 'inline') + { + $ret = array('inlineType'=>'text'); + + if(!empty($parent)) + { + $ret['inlineParms'] = array('pre'=> str_replace('level-x','level-'.$level, ADMIN_CHILD_ICON)); + } + + + return $ret; + } + + +/* + if($mode == 'write') // not used. + { + // return $frm->text('forum_name',$curVal,255,'size=xxlarge'); + } + + if($mode == 'filter') + { + return; + } + if($mode == 'batch') + { + return; + } +*/ + + + + + } + + /** - * TODO - lans * Generic DB Record Creation Form. * @return string */ @@ -5942,7 +6245,6 @@ class e_admin_form_ui extends e_form } /** - * TODO - lans * Generic Settings Form. * @return string */ @@ -6033,6 +6335,22 @@ class e_admin_form_ui extends e_form $fields['options']['sort'] = false; } + if($treefld = $controller->getTreePrefix()) + { + $fields[$treefld]['type'] = 'method'; + $fields[$treefld]['method'] = 'treePrefix'; /* @see e_admin_form_ui::treePrefix(); */ + + $tr = $controller->getTreeModel()->toArray(); + + foreach($tr as $row) + { + e107::getDebug()->log($row[$treefld].' > '.$row['_treesort']); + } + + } + + + // ------------------------------------------ $coreBatchOptions = array( @@ -6040,7 +6358,8 @@ class e_admin_form_ui extends e_form 'copy' => $controller->getBatchCopy(), 'url' => $controller->getBatchLink(), 'featurebox' => $controller->getBatchFeaturebox(), - 'export' => $controller->getBatchExport() + 'export' => $controller->getBatchExport(), + ); @@ -6399,8 +6718,8 @@ class e_admin_form_ui extends e_form
";
$selectStart = "
- ![](".e_IMAGE_ABS."generic/branchbottom.gif)
-
-
+ ".ADMIN_CHILD_ICON."
+
".$this->select_open('etrigger_batch', array('class' => 'tbox form-control input-large select batch e-autosubmit reset', 'id' => false))."
".$this->option(LAN_BATCH_LABEL_SELECTED, '', false);
@@ -6414,6 +6733,10 @@ class e_admin_form_ui extends e_form
$selectOpt .= !empty($options['url']) ? $this->option(LAN_UI_BATCH_CREATELINK, 'url', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
$selectOpt .= !empty($options['featurebox']) ? $this->option(LAN_PLUGIN_FEATUREBOX_BATCH, 'featurebox', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '';
+ // if(!empty($parms['sef'])
+
+
+
if(!empty($customBatchOptions))
{
foreach($customBatchOptions as $key=>$val)
@@ -6499,6 +6822,17 @@ class e_admin_form_ui extends e_form
switch($val['type'])
{
+
+ case 'text';
+
+ if(!empty($parms['sef']))
+ {
+ $option['sefgen__'.$key.'__'.$parms['sef']] = LAN_GENERATE;
+ }
+
+ break;
+
+
case 'bool':
case 'boolean': //TODO modify description based on $val['parm]
if(vartrue($parms['reverse'])) // reverse true/false values;
@@ -6536,12 +6870,12 @@ class e_admin_form_ui extends e_form
if(isset($options['addAll']))
{
- $option['attach_all__'.$key] = vartrue($options['addAll'], '(add all)');
+ $option['attach_all__'.$key] = vartrue($options['addAll'], "(".LAN_ADD_ALL.")");
unset($options['addAll']);
}
if(isset($options['clearAll']))
{
- $_option['deattach_all__'.$key] = vartrue($options['clearAll'], '(clear all)');
+ $_option['deattach_all__'.$key] = vartrue($options['clearAll'], "(".LAN_CLEAR_ALL.")");
unset($options['clearAll']);
}
@@ -6549,16 +6883,16 @@ class e_admin_form_ui extends e_form
{
foreach ($options as $value)
{
- $option['attach__'.$key.'__'.$value] = 'Add '.$value;
- $_option['deattach__'.$key.'__'.$value] = 'Remove '.$value;
+ $option['attach__'.$key.'__'.$value] = LAN_ADD." ".$value;
+ $_option['deattach__'.$key.'__'.$value] = LAN_REMOVE." ".$value;
}
}
else
{
foreach ($options as $value => $label)
{
- $option['attach__'.$key.'__'.$value] = 'Add '.$label;
- $_option['deattach__'.$key.'__'.$value] = 'Remove '.$label;
+ $option['attach__'.$key.'__'.$value] = LAN_ADD." ".$label;
+ $_option['deattach__'.$key.'__'.$value] = LAN_REMOVE." ".$label;
}
}
$option = array_merge($option, $_option);
@@ -6648,14 +6982,12 @@ class e_admin_form_ui extends e_form
break;
case 'datestamp':
- //TODO today, yesterday, this-month, last-month .
-
- $dateFilters = array (
+ $dateFilters = array (
'hour' => LAN_UI_FILTER_PAST_HOUR,
- "day" => LAN_UI_FILTER_PAST_24_HOURS,
- "week" => LAN_UI_FILTER_PAST_WEEK,
- "month" => LAN_UI_FILTER_PAST_MONTH,
- "year" => LAN_UI_FILTER_PAST_YEAR
+ "day" => LAN_UI_FILTER_PAST_24_HOURS,
+ "week" => LAN_UI_FILTER_PAST_WEEK,
+ "month" => LAN_UI_FILTER_PAST_MONTH,
+ "year" => LAN_UI_FILTER_PAST_YEAR
);
foreach($dateFilters as $k => $name)
@@ -6679,14 +7011,13 @@ class e_admin_form_ui extends e_form
if($type === 'batch')
{
- // FIXME Lan
foreach ($classes as $k => $v)
{
- $option['ucadd__'.$key.'__'.$k] = LAN_ADD.' '.$v;
- $_option['ucremove__'.$key.'__'.$k] = 'Remove '.$v;
+ $option['ucadd__'.$key.'__'.$k] = LAN_ADD.' '.$v;
+ $_option['ucremove__'.$key.'__'.$k] = LAN_REMOVE." ".$v;
}
- $option['ucaddall__'.$key] = '(add all)';
- $_option['ucdelall__'.$key] = '(clear all)';
+ $option['ucaddall__'.$key] = "(".LAN_ADD_ALL.")";
+ $_option['ucdelall__'.$key] = "(".LAN_CLEAR_ALL.")";
$option = array_merge($option, $_option);
}
else
@@ -6741,7 +7072,7 @@ class e_admin_form_ui extends e_form
}
else
{
- $option[$key.'__'.$k] = vartrue($data['user_name'],'Unknown');
+ $option[$key.'__'.$k] = vartrue($data['user_name'],LAN_UNKNOWN);
}
diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php
index ae6413392..a6f9b19a3 100644
--- a/e107_handlers/db_debug_class.php
+++ b/e107_handlers/db_debug_class.php
@@ -782,7 +782,7 @@ class e107_db_debug {
$message = "
".print_r($message,true).""; } - if (!E107_DBG_BASIC && !E107_DBG_ALLERRORS && !E107_DBG_SQLDETAILS && !E107_DBG_NOTICES) + if (!deftrue('E107_DBG_BASIC') && !deftrue('E107_DBG_ALLERRORS') && !deftrue('E107_DBG_SQLDETAILS') && !deftrue('E107_DBG_NOTICES')) { return false; } diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 30a85f4dd..6013776bc 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -2416,6 +2416,73 @@ class e107 return FALSE; } + /** + * Retrieves the e_url config - new v2.1.6 + * @return array + */ + public static function getUrlConfig($mode='config') + { + $new_addon = array(); + + $filename = 'e_url'; + $elist = self::getPref($filename.'_list'); + $className = substr($filename, 2); // remove 'e_' + $methodName = 'config'; + + $profile = null; // for future use. + + if(!empty($elist)) + { + foreach(array_keys($elist) as $key) + { + if(is_readable(e_PLUGIN.$key.'/'.$filename.'.php')) + { + include_once(e_PLUGIN.$key.'/'.$filename.'.php'); + + $class_name = $key.'_'.$className; + + if(is_object($class_name)) + { + $obj = $class_name; + $class_name = get_class($obj); + } + else + { + $obj = new $class_name; + } + + if($mode === 'alias') + { + if(!empty($obj->alias)) + { + $new_addon[$key] = $obj->alias; + } + + continue; + } + + $array = self::callMethod($obj, $methodName,$profile); + + if($array) + { + foreach($array as $k=>$v) + { + if(empty($v['alias']) && !empty($obj->alias)) + { + $v['alias'] = $obj->alias; + } + $new_addon[$key][$k] = $v; + + } + + } + + } + } + } + + return $new_addon; + } /** * Get theme name or path. @@ -3157,7 +3224,7 @@ class e107 if(!$tmp = self::getRegistry('core/e107/addons/e_url')) { - $tmp = self::getAddonConfig('e_url'); + $tmp = self::getUrlConfig(); self::setRegistry('core/e107/addons/e_url',$tmp); } @@ -3165,6 +3232,8 @@ class e107 $pref = self::getPref('e_url_alias'); $sefActive = self::getPref('e_url_list'); + $rootNamespace = self::getPref('url_main_module'); + if(is_string($options)) // backwards compat. { @@ -3185,12 +3254,22 @@ class e107 $options['fragment'] = '#' . $options['fragment']; } - if(varset($tmp[$plugin][$key]['sef'])) + if(!empty($tmp[$plugin][$key]['sef'])) { if(!empty($tmp[$plugin][$key]['alias'])) { $alias = (!empty($pref[e_LAN][$plugin][$key])) ? $pref[e_LAN][$plugin][$key] : $tmp[$plugin][$key]['alias']; - $tmp[$plugin][$key]['sef'] = str_replace('{alias}', $alias, $tmp[$plugin][$key]['sef']); + + if(!empty($rootNamespace) && $rootNamespace === $plugin) + { + $replaceAlias = array('{alias}\/','{alias}/'); + $tmp[$plugin][$key]['sef'] = str_replace($replaceAlias, '', $tmp[$plugin][$key]['sef']); + } + else + { + $tmp[$plugin][$key]['sef'] = str_replace('{alias}', $alias, $tmp[$plugin][$key]['sef']); + } + } diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 488f64a17..0380f9284 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -1350,23 +1350,25 @@ class e_parse extends e_parser $text = html_entity_decode($text,ENT_QUOTES,'utf-8'); - return mb_strimwidth($text, 0, $len, $more); + if(function_exists('mb_strimwidth')) + { + return mb_strimwidth($text, 0, $len, $more); + } - // $ret = $this->usubstr($text, 0, $len); + $ret = $this->usubstr($text, 0, $len); // search for possible broken html entities // - if an & is in the last 8 chars, removing it and whatever follows shouldn't hurt // it should work for any characters encoding -/* - $leftAmp = $this->ustrrpos($this->usubstr($ret, -8), '&'); if($leftAmp) { $ret = $this->usubstr($ret, 0, $this->ustrlen($ret) - 8 + $leftAmp); } - return $ret.$more;*/ + return $ret.$more; + } @@ -1539,17 +1541,25 @@ class e_parse extends e_parser } // Turn off a few things if not enabled in options - if(!vartrue($pref['smiley_activate'])) + if(empty($pref['smiley_activate'])) { - $opts['emotes'] = FALSE; + $opts['emotes'] = false; } - if(!vartrue($pref['make_clickable'])) + + if(empty($pref['make_clickable'])) { - $opts['link_click'] = FALSE; + $opts['link_click'] = false; } - if(!vartrue($pref['link_replace'])) + + if(empty($pref['link_replace'])) { - $opts['link_replace'] = FALSE; + $opts['link_replace'] = false; + } + + if($this->isHtml($text)) //BC FIx for when HTML is saved without [html][/html] + { + $opts['nobreak'] = true; + $text = trim($text); } $fromadmin = $opts['fromadmin']; @@ -1568,7 +1578,7 @@ class e_parse extends e_parser $text = strip_tags($text); } - if (MAGIC_QUOTES_GPC == TRUE) // precaution for badly saved data. + if (MAGIC_QUOTES_GPC === true) // precaution for badly saved data. { $text = stripslashes($text); } @@ -1590,7 +1600,7 @@ class e_parse extends e_parser - if ($parseBB == FALSE) + if ($parseBB == false) { $content = array($text); } @@ -4077,17 +4087,25 @@ class e_parser */ function isBBcode($text) { - $bbsearch = array('[/h]','[/b]','[/link]', '[/right]'); - - if(str_replace($bbsearch,'',$text)) - { - return true; - } - else + if(preg_match('#(?<=<)\w+(?=[^<]*?>)#', $text)) { return false; } + $bbsearch = array('[/h]', '[/b]', '[/link]', '[/right]', '[/center]', '[/flash]', '[/code]', '[/table]'); + + foreach($bbsearch as $v) + { + if(strpos($text,$v)!==false) + { + return true; + } + + } + + return false; + + } diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 9e0259750..9a8a70ba2 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -66,6 +66,7 @@ class e_form protected $_tabindex_counter = 0; protected $_tabindex_enabled = true; protected $_cached_attributes = array(); + protected $_field_warnings = array(); @@ -84,6 +85,13 @@ class e_form $this->setRequiredString('* '); } + + public function addWarning($field) + { + $this->_field_warnings[] = $field; + + } + /** * Open a new form * @param string name @@ -802,10 +810,22 @@ class e_form function number($name, $value=0, $maxlength = 200, $options = array()) { if(is_string($options)) parse_str($options, $options); - if (empty($options['maxlength'])) $maxlength = $options['maxlength']; + + if(!empty($options['maxlength'])) + { + $maxlength = $options['maxlength']; + } + unset($options['maxlength']); - if(empty($options['size'])) $options['size'] = 15; - if(empty($options['class'])) $options['class'] = 'tbox number e-spinner input-small '; + + if(empty($options['size'])) + { + $options['size'] = 15; + } + if(empty($options['class'])) + { + $options['class'] = 'tbox number e-spinner input-small '; + } if(!empty($options['size'])) { @@ -2995,9 +3015,14 @@ class e_form $text = '
- ';
-
+
foreach($array as $val)
{
+ if($val['url'] === e_REQUEST_URI) // automatic link removal for current page.
+ {
+ $val['url']= null;
+ }
+
$ret = "";
$ret .= vartrue($val['url']) ? "" : "";
$ret .= vartrue($val['text'],'');
@@ -3995,6 +4020,67 @@ class e_form
return $text;
}
+ /**
+ * Check if a value should be linked and wrap in tag if required.
+ * @todo global pref for the target option?
+ * @param mixed $value
+ * @param array $parms
+ * @param $id
+ * @return string
+ */
+ private function renderLink($value, $parms, $id=null)
+ {
+ if(empty($parms['link']) && empty($parms['url']))
+ {
+ return $value;
+ }
+
+ $dialog = vartrue($parms['target']) =='dialog' ? " e-modal" : ""; // iframe
+ $ext = vartrue($parms['target']) =='blank' ? " rel='external' " : ""; // new window
+ $modal = vartrue($parms['target']) =='modal' ? " data-toggle='modal' data-cache='false' data-target='#uiModal' " : "";
+
+
+ if(!empty($parms['url'])) // ie. use e_url.php
+ {
+ $plugin = $this->getController()->getPluginName();
+ $data = $this->getController()->getListModel()->getData();
+ $link = e107::url($plugin,$parms['url'],$data);
+ }
+ else // old way.
+ {
+ $tp = e107::getParser();
+
+ $link = str_replace('[id]',$id,$parms['link']);
+ $link = $tp->replaceConstants($link); // SEF URL is not important since we're in admin.
+
+
+ if($parms['link'] === 'sef' && $this->getController()->getListModel())
+ {
+ $model = $this->getController()->getListModel();
+
+ if(!$model->getUrl())
+ {
+ $model->setUrl($this->getController()->getUrl());
+ }
+ // assemble the url
+ $link = $model->url(null);
+ }
+ elseif(!empty($data[$parms['link']])) // support for a field-name as the link. eg. link_url.
+ {
+ $data = $this->getController()->getListModel()->getData();
+ $link = $tp->replaceConstants(vartrue($data[$parms['link']]));
+ }
+ }
+ // in case something goes wrong...
+ if($link)
+ {
+ return "".$value."";
+ }
+
+ return $value;
+
+ }
+
/**
@@ -4026,6 +4112,7 @@ class e_form
}
+
if(!empty($attributes['inline'])) $parms['editable'] = true; // attribute alias
if(!empty($attributes['sort'])) $parms['sort'] = true; // attribute alias
@@ -4034,6 +4121,9 @@ class e_form
$attributes['type'] = $parms['type'];
}
+
+
+
$this->renderValueTrigger($field, $value, $parms, $id);
$tp = e107::getParser();
@@ -4152,11 +4242,16 @@ class e_form
}
- if(!vartrue($attributes['noedit']) && vartrue($parms['editable']) && !vartrue($parms['link'])) // avoid bad markup, better solution coming up
+ if(empty($attributes['noedit']) && !empty($parms['editable']) && empty($parms['link'])) // avoid bad markup, better solution coming up
{
$mode = preg_replace('/[^\w]/', '', vartrue($_GET['mode'], ''));
$value = "".$value."";
}
+ else
+ {
+ $value = $this->renderLink($value,$parms,$id);
+ }
+
$value = vartrue($parms['pre']).$value.vartrue($parms['post']);
// else same
@@ -4303,19 +4398,22 @@ class e_form
$value = defset($value, $value);
}
- if(vartrue($parms['truncate']))
+ if(!empty($parms['truncate']))
{
$value = $tp->text_truncate($value, $parms['truncate'], '...');
}
- elseif(vartrue($parms['htmltruncate']))
+ elseif(!empty($parms['htmltruncate']))
{
$value = $tp->html_truncate($value, $parms['htmltruncate'], '...');
}
- if(vartrue($parms['wrap']))
+ if(!empty($parms['wrap']))
{
$value = $tp->htmlwrap($value, (int) $parms['wrap'], varset($parms['wrapChar'], ' '));
}
- if(vartrue($parms['link']) && $id/* && is_numeric($id)*/)
+
+ $value = $this->renderLink($value,$parms,$id);
+ /*
+ if(!empty($parms['link']) && $id)
{
$link = str_replace('[id]', $id, $parms['link']);
$link = $tp->replaceConstants($link); // SEF URL is not important since we're in admin.
@@ -4324,9 +4422,7 @@ class e_form
$ext = vartrue($parms['target']) == 'blank' ? " rel='external' " : ""; // new window
$modal = vartrue($parms['target']) == 'modal' ? " data-toggle='modal' data-cache='false' data-target='#uiModal' " : "";
- if($parms['link'] == 'sef' && $this->getController()
- ->getListModel()
- )
+ if($parms['link'] == 'sef' && $this->getController()->getListModel())
{
$model = $this->getController()->getListModel();
// copy url config
@@ -4337,6 +4433,7 @@ class e_form
// assemble the url
$link = $model->url();
}
+
elseif(vartrue($data[$parms['link']])) // support for a field-name as the link. eg. link_url.
{
$link = $tp->replaceConstants(vartrue($data[$parms['link']]));
@@ -4347,7 +4444,7 @@ class e_form
{
$value = "" . $value . "";
}
- }
+ }*/
if(empty($value))
{
@@ -4403,7 +4500,11 @@ class e_form
{
$value = $tp->htmlwrap($value, (int)$parms['wrap'], varset($parms['wrapChar'], ' '));
}
- if(vartrue($parms['link']) && $id/* && is_numeric($id)*/)
+
+ $value = $this->renderLink($value,$parms,$id);
+
+ /*
+ if(vartrue($parms['link']) && $id)
{
$link = str_replace('[id]',$id,$parms['link']);
$link = $tp->replaceConstants($link); // SEF URL is not important since we're in admin.
@@ -4427,7 +4528,7 @@ class e_form
// in case something goes wrong...
if($link) $value = "".$value."";
- }
+ }*/
if(empty($value))
{
@@ -4867,11 +4968,11 @@ class e_form
}
// print_a($attributes);
// Inline Editing.
- if(!vartrue($attributes['noedit']) && vartrue($parms['editable'])) // avoid bad markup, better solution coming up
+ if(empty($attributes['noedit']) && !empty($parms['editable'])) // avoid bad markup, better solution coming up
{
$mode = preg_replace('/[^\w]/', '', vartrue($_GET['mode'], ''));
- $methodParms = call_user_func_array(array($this, $method), array($value, 'inline', $parms));
+ $methodParms = call_user_func_array(array($this, $meth), array($value, 'inline', $parms));
$inlineParms = (!empty($methodParms['inlineParms'])) ? $methodParms['inlineParms'] : null;
@@ -4979,6 +5080,7 @@ class e_form
//TODO - order
default:
+ $value = $this->renderLink($value,$parms,$id);
//unknown type
break;
}
@@ -5961,7 +6063,17 @@ class e_form
}
*/
-
+ if(in_array($key,$this->_field_warnings))
+ {
+ if(is_string($writeParms))
+ {
+ parse_str($writeParms,$writeParms);
+ }
+
+ $writeParms['tdClassRight'] .= ' has-warning';
+
+ }
+
$leftCell = $required."'; - $text .= ""; + $text .= ""; // $text .= "bablalal"; // $text .= ''; $text .= '‹›'; diff --git a/e107_handlers/mysql_class.php b/e107_handlers/mysql_class.php index d52e733d1..80156c71b 100644 --- a/e107_handlers/mysql_class.php +++ b/e107_handlers/mysql_class.php @@ -328,7 +328,10 @@ class e_db_mysql $this->db_Set_Charset(); $this->setSQLMode(); - if ($db_ConnectionID == NULL){ $db_ConnectionID = $this->mySQLaccess; } + //if ($db_ConnectionID == NULL){ + $db_ConnectionID = $this->mySQLaccess; + + // } return true; } @@ -347,18 +350,26 @@ class e_db_mysql /** * Select the database to use. - * @param string database name - * @param string table prefix . eg. e107_ + * @param string $database name + * @param string $table prefix . eg. e107_ + * @param boolean $multiple set to maintain connection to a secondary database. * @return boolean true when database selection was successful otherwise false. */ - public function database($database, $prefix = MPREFIX) + public function database($database, $prefix = MPREFIX, $multiple=false) { $this->mySQLdefaultdb = $database; $this->mySQLPrefix = $prefix; - + + if($multiple === true) + { + $this->mySQLPrefix = "`".$database."`.".$prefix; + return true; + } + if($this->pdo) { - try + + try { $this->mySQLaccess->query("use ".$database); // $this->mySQLaccess->select_db($database); $dbh->query("use newdatabase"); @@ -1816,7 +1827,8 @@ class e_db_mysql $this->mySQLcurTable = $table; $this->tabset = true; } - return ' `'.$this->mySQLPrefix.$table.'`'.substr($matches[0],-1); + + return " ".$this->mySQLPrefix.$table.substr($matches[0],-1); } diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php index 0481a4273..e30784685 100644 --- a/e107_handlers/news_class.php +++ b/e107_handlers/news_class.php @@ -882,6 +882,12 @@ class e_news_tree extends e_front_tree_model if($tablerender) { $caption = vartrue($parms['caption']) ? defset($parms['caption'], $parms['caption']) : LAN_NEWSLATEST_MENU_TITLE; // found in plugins/news/languages/English.php + + if(!empty($parms['caption'][e_LANGUAGE])) + { + $caption = $parms['caption'][e_LANGUAGE]; + } + $mod = true === $tablerender ? 'news_latest_menu' : $tablerender; return e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return); } @@ -1096,6 +1102,12 @@ class e_news_category_tree extends e_front_tree_model if($tablerender) { $caption = vartrue($parms['caption']) ? defset($parms['caption'], $parms['caption']) : LAN_NEWSCAT_MENU_TITLE; // found in plugins/news/languages/English.php + + if(!empty($parms['caption'][e_LANGUAGE])) + { + $caption = $parms['caption'][e_LANGUAGE]; + } + $mod = true === $tablerender ? 'news_categories_menu' : $tablerender; return e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return); } diff --git a/e107_handlers/search_class.php b/e107_handlers/search_class.php index 63051d666..9dab98f14 100644 --- a/e107_handlers/search_class.php +++ b/e107_handlers/search_class.php @@ -226,7 +226,7 @@ class e_search foreach ($search_fields as $field_key => $field) { - $search_query[] = "(". varset($weights[$field_key],0.6)." * (MATCH(".$field.") AGAINST ('".$this -> query."' IN BOOLEAN MODE)))"; + $search_query[] = "(". varset($weights[$field_key],0.6)." * (MATCH(".$field.") AGAINST ('".str_replace(" ","+",$this -> query)."' IN BOOLEAN MODE)))"; $field_query[] = "MATCH(".$field.") AGAINST ('".$this -> query."' IN BOOLEAN MODE)"; } @@ -239,8 +239,8 @@ class e_search { $sql_order .= ', '.$sort_key.' '.$sort_value; } - - $limit = " LIMIT ".$result_flag.",".$search_res; + + $limit = " LIMIT ".intval($result_flag).",".$search_res; $sql_query = "SELECT SQL_CALC_FOUND_ROWS ".$return_fields.", (".$match_query.") AS relevance FROM #".$table." WHERE ".$where." (".$field_query.") HAVING relevance > 0 ORDER BY relevance DESC ".$sql_order.$limit.";"; @@ -250,7 +250,7 @@ class e_search if(E107_DBG_SQLQUERIES) { - echo e107::getMessage()->addDebug($sql_query)->render(); + echo e107::getMessage()->addDebug(str_replace('#',MPREFIX,$sql_query))->render(); } diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php index 6320d6f13..e487a9e7f 100644 --- a/e107_languages/English/English.php +++ b/e107_languages/English/English.php @@ -50,6 +50,7 @@ define("EMESSLAN_TITLE_SUCCESS", "Success"); define("EMESSLAN_TITLE_WARNING", "Warning"); define("EMESSLAN_TITLE_DEBUG", "System Debug"); +define("LAN_NO_PERMISSIONS", "You do not have permission to view this page."); define("LAN_EDIT","Edit"); define("LAN_DELETE","Delete"); define("LAN_DEFAULT","Default"); diff --git a/e107_languages/English/admin/help/menus.php b/e107_languages/English/admin/help/menus.php index da1348d44..59d12b738 100644 --- a/e107_languages/English/admin/help/menus.php +++ b/e107_languages/English/admin/help/menus.php @@ -16,11 +16,6 @@ if (!getperms("2")) exit; } -if(!deftrue("e_DEBUG_MENUMANAGER")) -{ - return; -} - $sql = e107::getDb(); $tp = e107::getParser(); diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index c1bb5e53d..32f664c12 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -244,6 +244,7 @@ define("LAN_INSTALLED","Installed");//TODO elsewhere define("LAN_LAST_UPDATED","Last Updated"); define("LAN_UPDATE_AVAILABLE","Update Available"); define("LAN_ADD", "Add"); +define("LAN_REMOVE", "Remove"); define("LAN_ADD_MORE", "Add More"); define("LAN_MULTIPLE_CHOICE", "Multiple Choice"); @@ -272,6 +273,9 @@ define("LAN_NEVER", "Never"); define("LAN_PRUNE", "Prune"); define("LAN_RESET","Reset"); define("LAN_CLEAR","Clear"); +define("LAN_ADD_ALL", "Add All"); +define("LAN_CLEAR_ALL", "Clear All"); +define("LAN_UNKNOWN", "Unknown"); define("LAN_ALL","All"); define("LAN_IMPORT","Import"); // define("LAN_OK","OK"); // defined in e107_languages/English/English.php @@ -357,6 +361,7 @@ define("LAN_CONFIGURE", "Configure"); // define("LAN_BACK", "Back"); @see e107_languages/English.php define("LAN_NOPERMISSION", "no permissions"); +define("LAN_NO_ADMIN_PERMISSION", "You do not have administrator permissions for [x]"); define("LAN_CREDITS","Credits"); define("LAN_NEWVERSION","e107 v[x] Available"); @@ -444,6 +449,8 @@ define("LAN_UI_404_METHOD_ERROR", "Action [x] not found!"); define("LAN_UI_403_BODY_ERROR", "Access to the requested page is denied."); define("LAN_UI_403_TITLE_ERROR", "Access denied"); define("LAN_UI_FORM_METHOD_ERROR", "FATAL ERROR: The field name [x] is not allowed. Please rename the key [x] to something else in your fields array and database table (if required)."); +define("LAN_UNKNOWN_ERROR", "Unknown Error"); +define("LAN_SQL_ERROR", "SQL Error"); define("LAN_UI_BATCH_UPDATE_SUCCESS", "[x] set for [y] record(s)."); define("LAN_UI_BATCH_REVERSED_SUCCESS", "[x] records successfully reversed."); @@ -501,6 +508,7 @@ define("LAN_DASHBOARD_LAYOUT", "Dashboard Layout"); define("LAN_UNAVAILABLE", "Unavailable"); define("LAN_NO_LABEL_PROVIDED", "No Label Provided"); define("LAN_NOT_FOUND", "Not Found!"); +define("LAN_FIELD", "Field"); define("LAN_MAINTENANCE", "Maintenance"); define("LAN_RETURN_TO_FRONT_PANEL", "Return to Front Panel"); @@ -516,3 +524,5 @@ define("LAN_ENGINE", "Engine"); define("LAN_SOURCE", "Source"); define("LAN_ERROR_CONNECTION","Unable to connect for updates. Please check firewall and/or internet connection."); + +define("LAN_UI_X_CANT_EQUAL_Y", "[x] cannot be the same as [y]"); diff --git a/e107_languages/English/admin/lan_cpage.php b/e107_languages/English/admin/lan_cpage.php index 8f8e77c7d..8edabf18c 100644 --- a/e107_languages/English/admin/lan_cpage.php +++ b/e107_languages/English/admin/lan_cpage.php @@ -6,6 +6,12 @@ * */ +define("CUSLAN_1", "Overview"); +define("CUSLAN_2", "Page Title"); +define("CUSLAN_3", "Items per Page"); +define("CUSLAN_4", "Custom Fields"); +define("CUSLAN_5", "(New Book)"); + define("CUSLAN_9", "Text"); define("CUSLAN_11", "Meta description"); define("CUSLAN_12", "Create Page/Menu"); @@ -92,4 +98,4 @@ define("CUSLAN_79", "You must enter either a page title or a menu name."); -?> \ No newline at end of file +?> diff --git a/e107_languages/English/lan_login.php b/e107_languages/English/lan_login.php index d28679461..e7a04b0b7 100644 --- a/e107_languages/English/lan_login.php +++ b/e107_languages/English/lan_login.php @@ -12,7 +12,7 @@ define("LAN_LOGIN_1", "User name"); define("LAN_LOGIN_2", "User password"); define("LAN_LOGIN_3", "Protected server"); -define("LAN_LOGIN_4", "Please sign in"); // XXX Modified +define("LAN_LOGIN_4", "Please sign in"); // XXX Modified define("LAN_LOGIN_5", "Click here to Sign-Up"); define("LAN_LOGIN_6", "Not accepting new members at this time"); define("LAN_LOGIN_7", "Enter visible code"); @@ -40,5 +40,8 @@ define("LAN_LOGIN_28", "Email"); define("LAN_LOGIN_29", "Username or Email"); define("LAN_LOGIN_30", "Error adding new alt_auth user to DB"); define("LAN_LOGIN_31", "Your credentials could not be added to the system"); - +define("LAN_LOGIN_32", "You are seeing this message because you are currently logged in as the Main Admin."); +define("LAN_LOGIN_33", "[Return to the homepage]"); // the [ ] brackets are replaced with a button link +define("LAN_LOGIN_34", "User registration and/or login is currently disabled."); +define("LAN_LOGIN_35", "[Enable it]"); // the [ ] brackets are replaced with a button link ?> \ No newline at end of file diff --git a/e107_plugins/_blank/admin_config.php b/e107_plugins/_blank/admin_config.php index 79f333b9b..e2c48f210 100644 --- a/e107_plugins/_blank/admin_config.php +++ b/e107_plugins/_blank/admin_config.php @@ -98,22 +98,6 @@ class plugin_blank_admin_ui extends e_admin_ui */ protected $table = "blank"; - /** - * If present this array will be used to build your list query - * You can link fileds from $field array with 'table' parameter, which should equal to a key (table) from this array - * 'leftField', 'rightField' and 'fields' attributes here are required, the rest is optional - * Table alias is supported - * Note: - * - 'leftTable' could contain only table alias - * - 'leftField' and 'rightField' shouldn't contain table aliases, they will be auto-added - * - 'whereJoin' and 'where' should contain table aliases e.g. 'whereJoin' => 'AND u.user_ban=0' - * - * @var array [optional] table_name => array join parameters - */ - protected $tableJoin = array( - //'u.user' => array('leftField' => 'comment_author_id', 'rightField' => 'user_id', 'fields' => '*'/*, 'leftTable' => '', 'joinType' => 'LEFT JOIN', 'whereJoin' => '', 'where' => ''*/) - ); - /** * This is only needed if you need to JOIN tables AND don't wanna use $tableJoin * Write your list query without any Order or Limit. @@ -132,14 +116,17 @@ class plugin_blank_admin_ui extends e_admin_ui // optional protected $perPage = 20; - // default - true - TODO - move to displaySettings protected $batchDelete = true; - // UNDER CONSTRUCTION - protected $displaySettings = array(); + // protected \$sortField = 'somefield_order'; + + + // protected \$sortParent = 'somefield_parent'; + + + // protected \$treePrefix = 'somefield_title'; + - // UNDER CONSTRUCTION - protected $disallowPages = array('main/create', 'main/prefs'); //TODO change the blank_url type back to URL before blank. // required diff --git a/e107_plugins/download/download.php b/e107_plugins/download/download.php index b5558b3a7..c625c46d2 100644 --- a/e107_plugins/download/download.php +++ b/e107_plugins/download/download.php @@ -44,7 +44,6 @@ if (!e107::isInstalled('download')) $dl = new download(); - if(!defined("e_PAGETITLE")) {define("e_PAGETITLE", LAN_PLUGIN_DOWNLOAD_NAME);} if(!defined("USER_WIDTH") && !deftrue('BOOTSTRAP')) { define("USER_WIDTH","width:100%"); } @@ -92,6 +91,9 @@ if (!e107::isInstalled('download')) $texts = $dl->render(); // Load before header. + + if(!defined("e_PAGETITLE")) {define("e_PAGETITLE", LAN_PLUGIN_DOWNLOAD_NAME);} + require_once (HEADERF); diff --git a/e107_plugins/download/download_shortcodes.php b/e107_plugins/download/download_shortcodes.php index 0c1c74274..452882ea1 100644 --- a/e107_plugins/download/download_shortcodes.php +++ b/e107_plugins/download/download_shortcodes.php @@ -25,6 +25,9 @@ class download_shortcodes extends e_shortcode public $dlsubrow; public $dlsubsubrow; public $mirror; + + public $parent; + public $grandparent; /** * download_shortcodes constructor @@ -43,6 +46,7 @@ class download_shortcodes extends e_shortcode $breadcrumb = array(); + switch ($this->qry['action']) { case 'mirror': @@ -58,6 +62,17 @@ class download_shortcodes extends e_shortcode default: $breadcrumb[] = array('text' => LAN_PLUGIN_DOWNLOAD_NAME, 'url' => $url->create('download/index')); + + if(!empty($this->grandparent)) + { + $breadcrumb[] = array('text' => $this->grandparent['download_category_name'], 'url' => ($this->grandparent['download_category_id']) ? $url->create('download/list/category', array('id'=>$this->grandparent['download_category_id'],'name'=>$this->grandparent['download_category_sef'])) : null); + } + + if(!empty($this->parent)) + { + $breadcrumb[] = array('text' => $this->parent['download_category_name'], 'url' => ($this->parent['download_category_id']) ? $url->create('download/list/category', array('id'=>$this->parent['download_category_id'],'name'=>$this->parent['download_category_sef'])) : null); + } + $breadcrumb[] = array('text' => $this->var['download_category_name'], 'url' => ($this->var['download_category_id']) ? $url->create('download/list/category', array('id'=>$this->var['download_category_id'],'name'=>$this->var['download_category_sef'])) : null); $breadcrumb[] = array('text' => $this->var['download_name'], 'url' => null); break; @@ -154,7 +169,9 @@ class download_shortcodes extends e_shortcode $tp = e107::getParser(); if ($this->dlsubsubrow['d_count']) { - return "".$tp->toHTML($this->dlsubsubrow['download_category_name'], FALSE, 'TITLE').""; + $url = e107::getUrl()->create('download/list/category', array('id'=>$this->dlsubsubrow['download_category_id'], 'name'=> vartrue($this->dlsubsubrow['download_category_sef'],'--sef-not-set--'))); + // e_PLUGIN_ABS."download/download.php?action=list&id=".$this->dlsubsubrow['download_category_id'] + return "".$tp->toHTML($this->dlsubsubrow['download_category_name'], FALSE, 'TITLE').""; } else { @@ -944,7 +961,18 @@ class download_shortcodes extends e_shortcode function sc_download_back_to_category_list() { - return "".LAN_dl_9.""; + $url = e107::getUrl(); + + if(!empty($this->parent)) + { + $link = $url->create('download/list/category', array('id'=>$this->parent['download_category_id'],'name'=>$this->parent['download_category_sef'])); + } + else + { + $link = ($this->var['download_category_id']) ? $url->create('download/list/category', array('id'=>$this->var['download_category_id'],'name'=>$this->var['download_category_sef'])) : null; + } + + return "".LAN_dl_9.""; } @@ -996,7 +1024,7 @@ class download_shortcodes extends e_shortcode if (!$source) return " "; // list($ret[TRUE],$ret[FALSE]) = explode(chr(1), $source.chr(1)); //XXX ??? // if (!$ret[FALSE]) $ret[FALSE] = $ret[TRUE]; //XXX ??? - $parms = array('legacy'=> e_IMAGE."icons/"); + $parms = array('legacy'=> "{e_IMAGE}icons/"); return e107::getParser()->toIcon($source, $parms); //return "
"; } diff --git a/e107_plugins/download/e_search.php b/e107_plugins/download/e_search.php index 4afe14adb..606cada13 100644 --- a/e107_plugins/download/e_search.php +++ b/e107_plugins/download/e_search.php @@ -46,10 +46,10 @@ class download_search extends e_search // include plugin-folder in the name. 'author'=> array('type' => 'author', 'text' => LAN_SEARCH_61) ), - 'return_fields' => array('d.download_id', 'd.download_sef','d.download_category', 'download_category_id', 'd.download_name', 'd.download_description', 'd.download_author', 'd.download_author_website', 'd.download_datestamp', 'd.download_class', 'c.download_category_name', 'c.download_category_class'), - 'search_fields' => array('d.download_name'=> '1.2', 'd.download_url' => '0.9', 'd.download_description'=>'0.6', 'd.download_author'=>'0.6', 'd.download_author_website'=>'0.4'), // fields and weights. + 'return_fields' => array('d.download_id', 'd.download_sef','d.download_category', 'c.download_category_id', 'd.download_name', 'd.download_description', 'd.download_author', 'd.download_author_website', 'd.download_datestamp', 'd.download_class', 'c.download_category_name', 'c.download_category_class'), + 'search_fields' => array('d.download_name'=> '1.2', 'd.download_url' => '0.9', 'd.download_description'=>'0.6', 'd.download_author'=>'0.6', 'd.download_author_website'=>'0.4'), // fields and weights. - 'order' => array('download_datestamp' => DESC), + 'order' => array('download_datestamp' => 'DESC'), 'refpage' => e_PLUGIN_ABS.'download/download.php' ); @@ -94,7 +94,7 @@ class download_search extends e_search // include plugin-folder in the name. { $tp = e107::getParser(); - $qry = "download_active > '0' AND d.download_visible IN (".USERCLASS_LIST.") AND c.download_category_class IN (".USERCLASS_LIST.") AND".$advanced_where; + $qry = "download_active > '0' AND d.download_visible IN (".USERCLASS_LIST.") AND c.download_category_class IN (".USERCLASS_LIST.") AND"; if (isset($parm['cat']) && is_numeric($parm['cat'])) { diff --git a/e107_plugins/download/handlers/download_class.php b/e107_plugins/download/handlers/download_class.php index 03376f42d..465791ad1 100644 --- a/e107_plugins/download/handlers/download_class.php +++ b/e107_plugins/download/handlers/download_class.php @@ -19,6 +19,9 @@ class download private $templateHeader = ''; private $templateFooter = ''; + + private $subCategories = array(); + private $categories = array(); function __construct() { @@ -35,7 +38,53 @@ class download $this->templateHeader = ''; $this->templateFooter = ''; } - + + $pref = e107::getPref(); + + // $catObj = new downloadCategory(varset($pref['download_subsub'],1),USERCLASS_LIST,null, varset($pref['download_incinfo'], false)); + // $this->categories = $catObj->cat_tree; + $this->loadCategories(); + + + } + + private function loadCategories() + { + $sql = e107::getDb(); + $data = $sql->retrieve("download_category", '*', 'ORDER BY download_category_order',true); + + foreach($data as $row) + { + + $id = $row['download_category_parent']; + $sub= $row['download_category_id']; + + $this->subCategories[$id][$sub] = $row; + if(check_class($row['download_category_class'])) + { + $this->categories[$sub] = $row; + } + + } + + return $this; + } + + private function getCategory($id) + { + return !empty($this->categories[$id]) ? $this->categories[$id] : false; + + } + + private function getParent($id) + { + $parent = $this->categories[$id]['download_category_parent']; + return $this->getCategory($parent); + } + + private function getChildren($parent) + { + return !empty($this->subCategories[$parent]) ? $this->subCategories[$parent] : false; } public function init() @@ -158,13 +207,14 @@ class download $ns = e107::getRender(); $pref = e107::getPref(); - + // if ($cacheData = $e107cache->retrieve("download_cat".$maincatval,720)) // expires every 12 hours. //TODO make this an option { // echo $cacheData; // return; } - + + if(deftrue('BOOTSTRAP')) // v2.x { @@ -182,6 +232,13 @@ class download } else // Legacy v1.x { + $DOWNLOAD_CAT_TABLE_START = null; + $DOWNLOAD_CAT_PARENT_TABLE = null; + $DOWNLOAD_CAT_CHILD_TABLE = null; + $DOWNLOAD_CAT_SUBSUB_TABLE = null; + $DOWNLOAD_CAT_TABLE_END = null; + + $template_name = 'download_template.php'; if (is_readable(THEME."templates/".$template_name)) @@ -234,8 +291,11 @@ class download } } } + + e107::getDebug()->log($dlcat->cat_tree); + - $dl_text .= $tp->parseTemplate($this->templateHeader, TRUE, $sc); + $dl_text = $tp->parseTemplate($this->templateHeader, TRUE, $sc); $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_START, TRUE, $sc); $dl_text .= $download_cat_table_string; $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $sc); @@ -255,8 +315,25 @@ class download } + /** + * Meta for 'view' mode..to be expanded to handle list and maincats etc. + * @param array $row + * @todo modes for different actions based on $this->qry['action'] + */ + private function setMeta($row) + { + $tp = e107::getParser(); + $metaImage = $tp->thumbUrl($row['download_image'], array('w'=>500), null, true); + $metaDescription = $tp->toHtml($row['download_description'],true); + e107::meta('description', $tp->toText($metaDescription)); + e107::meta('keywords', $row['download_keywords']); + e107::meta('og:description', $tp->toText($metaDescription)); + e107::meta('og:image', $metaImage); + e107::meta('twitter:image:src', $metaImage); + + } @@ -276,7 +353,7 @@ class download $DOWNLOAD_VIEW_TABLE = $template['item']; $DOWNLOAD_VIEW_TABLE_END = varset($template['end']); $DL_VIEW_NEXTPREV = varset($template['nextprev']); - // $DL_VIEW_PAGETITLE = varset($template['pagetitle']); + $DL_VIEW_PAGETITLE = varset($template['pagetitle']); $DL_VIEW_CAPTION = varset($template['caption'],"{DOWNLOAD_VIEW_CAPTION}"); } else // Legacy v1.x @@ -328,27 +405,26 @@ class download //require_once(FOOTERF); //exit; } - - - $dlrow = $sql->fetch(); - $sc->setVars($dlrow); - - // $comment_edit_query = 'comment.download.'.$id; - + if(!defined("DL_IMAGESTYLE")) { define("DL_IMAGESTYLE","border:0px"); } - + + $dlrow = $sql->fetch(); + $sc->setVars($dlrow); + $this->setMeta($dlrow); + + if(!isset($DL_VIEW_PAGETITLE)) { - $DL_VIEW_PAGETITLE = LAN_PLUGIN_DOWNLOAD_NAME." / {DOWNLOAD_CATEGORY} / {DOWNLOAD_VIEW_NAME}"; + $DL_VIEW_PAGETITLE = "{DOWNLOAD_VIEW_NAME} / {DOWNLOAD_CATEGORY} / ".LAN_PLUGIN_DOWNLOAD_NAME; } $DL_TITLE = $tp->parseTemplate($DL_VIEW_PAGETITLE, TRUE, $sc); - + define("e_PAGETITLE", $DL_TITLE); - + $DL_TEMPLATE = $DOWNLOAD_VIEW_TABLE_START.$DOWNLOAD_VIEW_TABLE.$DOWNLOAD_VIEW_TABLE_END; @@ -426,8 +502,8 @@ class download $DOWNLOAD_LIST_NEXTPREV = $template['list']['nextprev']; $DOWNLOAD_CAT_TABLE_START = varset($template['categories']['start']); - $DOWNLOAD_CAT_PARENT_TABLE = $template['categories']['parent']; - $DOWNLOAD_CAT_CHILD_TABLE = $template['categories']['child']; + // $DOWNLOAD_CAT_PARENT_TABLE = $template['categories']['parent']; + // $DOWNLOAD_CAT_CHILD_TABLE = $template['categories']['child']; $DOWNLOAD_CAT_SUBSUB_TABLE = $template['categories']['subchild']; $DOWNLOAD_CAT_TABLE_END = varset($template['categories']['end']); } @@ -460,16 +536,29 @@ class download $sc->qry = $this->qry; - + //if (!isset($this->qry['from'])) $this->qry['from'] = 0; // Get category type, page title - if ($sql->select("download_category", "download_category_name,download_category_sef,download_category_description,download_category_parent,download_category_class", "(download_category_id='{$this->qry['id']}') AND (download_category_class IN (".USERCLASS_LIST."))") ) + // if ($sql->select("download_category", "download_category_name,download_category_sef,download_category_description,download_category_parent,download_category_class", "(download_category_id='{$this->qry['id']}') AND (download_category_class IN (".USERCLASS_LIST."))") ) + + if($dlrow = $this->getCategory($this->qry['id'])) { - $dlrow = $sql->fetch(); - $sc->setVars($dlrow); // Used below for header / breadcrumb. - $type = $dlrow['download_category_name']; - + // $dlrow = $sql->fetch(); + + + $sc->setVars($dlrow); // Used below for header / breadcrumb. + + $sc->parent = $this->getParent($this->qry['id']); + + if(!empty( $sc->parent['download_category_parent'])) + { + $sc->grandparent = $this->getParent( $sc->parent['download_category_id']); + } + + // $type = $dlrow['download_category_name']; + + $this->qry['name'] = $dlrow['download_category_sef']; define("e_PAGETITLE", LAN_PLUGIN_DOWNLOAD_NAME." / ".$dlrow['download_category_name']); @@ -477,7 +566,7 @@ class download else { // No access to this category define("e_PAGETITLE", LAN_PLUGIN_DOWNLOAD_NAME); - return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "
".LAN_dl_3."",'download-list',true); + return $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "".LAN_NO_RECORDS_FOUND."",'download-list',true); } if ($dlrow['download_category_parent'] == 0) // It's a main category - change the listing type required @@ -492,12 +581,9 @@ class download /* SHOW SUBCATS ... */ - $qry = "SELECT download_category_id,download_category_class FROM #download_category WHERE download_category_parent=".intval($this->qry['id']); - - if($sql->gen($qry)) + if($this->getChildren($this->qry['id'])) { - - + /* there are subcats - display them ... */ $qry = " SELECT dc.*, dc2.download_category_name AS parent_name, dc2.download_category_icon as parent_icon, SUM(d.download_filesize) AS d_size, @@ -515,6 +601,8 @@ class download { $scArray = $sql->db_getList(); + + $subText = ""; /** @DEPRECATED **/ // if(!defined("DL_IMAGESTYLE")) @@ -523,20 +611,24 @@ class download // } $download_cat_table_string = ""; - - $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_PRE, TRUE, $sc); - $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_START, TRUE, $sc); + + if(!empty($DOWNLOAD_CAT_TABLE_PRE)) // 0.8 BC Fix. + { + $subText .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_PRE, TRUE, $sc); + } + $subText .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_START, TRUE, $sc); foreach($scArray as $dlsubsubrow) { $sc->dlsubsubrow = $dlsubsubrow; - $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_SUBSUB_TABLE, TRUE, $sc); + $sc->dlsubrow = $dlsubsubrow; + $subText .= $tp->parseTemplate($DOWNLOAD_CAT_SUBSUB_TABLE, TRUE, $sc); } - $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $sc); + $subText .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $sc); - $text = $ns->tablerender($dl_title, $dl_text, 'download-list', true); + $dl_text .= $ns->tablerender($dl_title, $subText, 'download-list', true); } }// End of subcategory display @@ -546,23 +638,15 @@ class download if(!check_class($download_category_class)) { - - - $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, " -- " . LAN_dl_3 . " -"); - - return; - // require_once (FOOTERF); - // exit ; + $ns->tablerender(LAN_PLUGIN_DOWNLOAD_NAME, "" . LAN_NO_RECORDS_FOUND . ""); + return null; } + if($total_downloads < $this->qry['view']) { $this->qry['from'] = 0; } - if(!defined("DL_IMAGESTYLE")) { define("DL_IMAGESTYLE", "border:1px solid blue"); @@ -576,20 +660,27 @@ class download // $this->qry['view'] - number of entries per page // $total_downloads - total number of entries matching search criteria $filetotal = $sql->select("download", "*", "download_category='{$this->qry['id']}' AND download_active > 0 AND download_visible IN (" . USERCLASS_LIST . ") ORDER BY download_{$this->qry['order']} {$this->qry['sort']} LIMIT {$this->qry['from']}, ".$this->qry['view']); - - if($filetotal) + + + $caption = varset($DOWNLOAD_LIST_CAPTION) ? $tp->parseTemplate($DOWNLOAD_LIST_CAPTION, TRUE, $sc) : LAN_PLUGIN_DOWNLOAD_NAME; + + if(empty($filetotal)) { - $caption = varset($DOWNLOAD_LIST_CAPTION) ? $tp->parseTemplate($DOWNLOAD_LIST_CAPTION, TRUE, $sc) : LAN_PLUGIN_DOWNLOAD_NAME; - // Only show list if some files in it - $dl_text .= $tp->parseTemplate($DOWNLOAD_LIST_TABLE_START, TRUE, $sc); - - global $dlft, $dltdownloads; - - $dlft = ($filetotal < $this->qry['view'] ? $filetotal: $this->qry['view']); + $dl_text .= $tp->parseTemplate($this->templateFooter, TRUE, $sc); + return ($dl_text) ? $ns->tablerender($caption, $dl_text, 'download-list', true) : ''; + } - while($dlrow = $sql->fetch()) - { + + // Only show list if some files in it + $dl_text .= $tp->parseTemplate($DOWNLOAD_LIST_TABLE_START, TRUE, $sc); + + global $dlft, $dltdownloads; + + $dlft = ($filetotal < $this->qry['view'] ? $filetotal: $this->qry['view']); + + while($dlrow = $sql->fetch()) + { $sc->setVars($dlrow); $agreetext = $tp->toHTML($pref['agree_text'], TRUE, 'DESCRIPTION'); @@ -603,20 +694,14 @@ class download - } - - $dl_text .= $tp->parseTemplate($DOWNLOAD_LIST_TABLE_END, TRUE, $sc); - - if($sql->select("download_category", "*", "download_category_id='{$download_category_parent}' ")) - { - $parent = $sql->fetch(); - } - - $dl_text .= $tp->parseTemplate($this->templateFooter, TRUE, $sc); - - $text .= $ns->tablerender($caption, $dl_text, 'download-list', true); } + $dl_text .= $tp->parseTemplate($DOWNLOAD_LIST_TABLE_END, TRUE, $sc); + $dl_text .= $tp->parseTemplate($this->templateFooter, TRUE, $sc); + + $text = $ns->tablerender($caption, $dl_text, 'download-list', true); + + if(!isset($DOWNLOAD_LIST_NEXTPREV)) { $sc_style['DOWNLOAD_LIST_NEXTPREV']['pre'] = " diff --git a/e107_plugins/download/includes/admin.php b/e107_plugins/download/includes/admin.php index 67c51f7fa..e51444e91 100644 --- a/e107_plugins/download/includes/admin.php +++ b/e107_plugins/download/includes/admin.php @@ -126,49 +126,91 @@ class plugin_download_admin extends e_admin_dispatcher class download_cat_ui extends e_admin_ui { - protected $pluginTitle = LAN_PLUGIN_DOWNLOAD_NAME; - protected $pluginName = 'download'; - protected $table = "download_category"; - protected $pid = "download_category_id"; - protected $perPage = 0; //no limit - protected $listOrder = 'download_category_order'; - // protected $defaultOrderField = 'download_category_parent,download_category_order'; - // protected $listQry = "SELECT * FROM #faq_info"; // without any Order or Limit. - // protected $editQry = "SELECT * FROM #faq_info WHERE faq_info_id = {ID}"; + protected $pluginTitle = LAN_PLUGIN_DOWNLOAD_NAME; + protected $pluginName = 'download'; + protected $table = "download_category"; + protected $pid = "download_category_id"; + protected $perPage = 0; //no limit + + protected $batchCopy = true; + + // initiate as a parent/child tree. + protected $sortField = 'download_category_order'; + protected $sortParent = 'download_category_parent'; + protected $treePrefix = 'download_category_name'; + // protected $orderStep = // automatic + // protected $listOrder = // automatic + + //legacy URL scheme + protected $url = array('route'=>'download/list/category', 'vars' => array('id' => 'download_category_id', 'name' => 'download_category_sef'), 'name' => 'download_category_name', 'description' => ''); // 'link' only needed if profile not provided. + protected $fields = array( 'checkboxes' => array('title'=> '', 'type' => null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'), 'download_category_icon' => array('title'=> LAN_ICON, 'type' => 'method', 'width' => '5%', 'thclass' => 'center','class'=>'center','writeParms'=>'glyphs=1' ), - 'download_category_id' => array('title'=> LAN_ID, 'type' => 'number', 'width' =>'5%', 'forced'=> TRUE), - 'download_category_name' => array('title'=> LAN_TITLE, 'type' => 'text', 'inline' => true, 'width' => 'auto', 'thclass' => 'left', 'writeParms'=>'size=xxlarge'), - 'download_category_sef' => array('title'=> LAN_SEFURL, 'type' => 'text', 'inline' => true, 'width' => 'auto', 'thclass' => 'left', 'writeParms'=>'size=xxlarge'), + 'download_category_id' => array('title'=> LAN_ID, 'type' => 'number', 'width' =>'5%', 'forced'=> TRUE, 'readParms'=>'link=sef&target=blank'), + 'download_category_name' => array('title'=> LAN_TITLE, 'type' => 'text', 'data'=>'str', 'inline' => true, 'width' => 'auto', 'thclass' => 'left', 'writeParms'=>'size=xxlarge'), + 'download_category_sef' => array('title'=> LAN_SEFURL, 'type' => 'text', 'data'=>'str', 'batch'=>true, 'inline' => true, 'width' => 'auto', 'thclass' => 'left', 'writeParms'=>'sef=download_category_name&size=xxlarge'), - 'download_category_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'bbarea', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name + 'download_category_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'bbarea', 'data'=>'str', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name 'download_category_parent' => array('title'=> LAN_PARENT, 'type' => 'method', 'width' => '5%', 'batch' => TRUE, 'filter'=>TRUE), 'download_category_class' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'inline' => true, 'width' => 'auto', 'data' => 'int', 'batch' => TRUE, 'filter'=>TRUE), - 'download_category_order' => array('title'=> LAN_ORDER, 'type' => 'number', 'data'=>'int', 'width' => '5%', 'thclass' => 'right', 'class'=> 'right' ), - 'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'center') + 'download_category_order' => array('title'=> LAN_ORDER, 'type' => 'number', 'nolist'=>true, 'data'=>'int', 'width' => '5%', 'thclass' => 'right', 'class'=> 'right' ), + 'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'center', 'sort'=>1) ); - - function getDownloadCategoryTree($id = false, $default = 'n/a') + protected $fieldpref = array('download_category_icon', 'download_category_id', 'download_category_name', 'download_category_sef', 'download_category_class', 'download_category_order'); + + protected $downloadCats = array(); + + function init() { - // TODO get faq category tree + if(deftrue('e_DEBUG')) + { + $this->fields['download_category_order']['nolist'] = false; + } + + $this->setDownloadCategoryTree(); + + } + + + private function setDownloadCategoryTree() + { + + $sql = e107::getDb(); - $sql -> gen('SELECT * FROM #download_category ORDER BY download_category_order'); - $cats = array(); - $cats[0] = $default; + $qry = $this->getParentChildQry(true); + $sql->gen($qry); + + $this->downloadCats[0] = LAN_NONE; + while($row = $sql->fetch()) { - $cats[$row['download_category_id']] = $row['download_category_name']; + $num = $row['_depth'] - 1; + $id = $row['download_category_id']; + $this->downloadCats[$id] = str_repeat(" ",$num).$row['download_category_name']; } - + + if($this->getAction() === 'edit') // make sure parent is not the same as ID. + { + $r = $this->getId(); + unset($this->downloadCats[$r]); + } + + } + + + + function getDownloadCategoryTree($id = false) + { + if($id) { - return $cats[$id]; + return $this->downloadCats[$id]; } - return $cats; + return $this->downloadCats; } } @@ -187,7 +229,7 @@ class download_cat_form_ui extends e_admin_form_ui break; case 'write': - return $this->selectbox('download_category_parent', $controller->getDownloadCategoryTree(), $curVal); + return $this->select('download_category_parent', $controller->getDownloadCategoryTree(), $curVal); break; case 'filter': @@ -258,14 +300,17 @@ class download_main_admin_ui extends e_admin_ui // default - true - TODO - move to displaySettings protected $batchDelete = true; + protected $url = array('route'=>'download/view/item', 'vars' => array('id' => 'download_id', 'name' => 'download_sef'), 'name' => 'download_name', 'description' => ''); // 'link' only needed if profile not provided. + + protected $fields = array( 'checkboxes' => array('title'=> '', 'type' => null, 'data' => null, 'width'=>'5%', 'thclass' =>'center', 'forced'=> TRUE, 'class'=>'center', 'toggle' => 'e-multiselect'), - 'download_id' => array('title'=> ID, 'type' => 'number', 'data' => 'int', 'width'=>'5%', 'thclass' => '', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable + 'download_id' => array('title'=> LAN_ID, 'type' => 'text', 'data' => 'int', 'width'=>'5%', 'thclass' => '', 'forced'=> TRUE, 'readParms'=>'link=sef&target=blank', 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable 'download_name' => array('title'=> LAN_TITLE, 'type' => 'text', 'data' => 'str', 'inline'=>true, 'width' => 'auto', 'thclass' => ''), 'download_url' => array('title'=> DOWLAN_13, 'type' => 'url', 'data' => 'str', 'width'=>'auto', 'thclass' => '', 'batch' => TRUE, 'filter'=>TRUE), 'download_sef' => array('title'=> LAN_SEFURL, 'type' => 'text', 'inline'=>true, 'data' => 'str', 'width'=>'auto', 'thclass' => '', 'batch' => TRUE, 'filter'=>TRUE, 'writeParms'=>'sef=download_name'), - 'download_keywords' => array('title'=> LAN_KEYWORDS, 'type' => 'tags', 'inline'=>true, 'data' => 'str', 'width'=>'auto', 'thclass' => ''), + 'download_keywords' => array('title'=> LAN_KEYWORDS, 'type' => 'tags', 'inline'=>true, 'data' => 'str', 'width'=>'auto', 'thclass' => ''), 'download_author' => array('title'=> LAN_AUTHOR, 'type' => 'user', 'data' => 'str', 'width' => 'auto', 'thclass' => 'left'), 'download_author_email' => array('title'=> DOWLAN_16, 'type' => 'email', 'data' => 'str', 'width' => 'auto', 'thclass' => 'left'), @@ -619,11 +664,11 @@ $columnInfo = array(".$row['limit_id']." ".r_userclass_name($row['limit_classnum'])." -+ ".DOWLAN_109." ".DOWLAN_110." -+ ".DOWLAN_111." ".DOWLAN_109." ".DOWLAN_110." @@ -643,11 +688,11 @@ $columnInfo = array(".r_userclass("newlimit_class", 0, "off", "guest, member, admin, classes, language")." -+ ".DOWLAN_109." ".DOWLAN_110." -+ ".DOWLAN_111." ".DOWLAN_109." ".DOWLAN_110." diff --git a/e107_plugins/download/request.php b/e107_plugins/download/request.php index 979731318..11414e549 100644 --- a/e107_plugins/download/request.php +++ b/e107_plugins/download/request.php @@ -215,8 +215,11 @@ if ($type == "file") echo $binary_data; exit(); } - if (strstr($download_url, "http://") || strstr($download_url, "ftp://") || strstr($download_url, "https://")) { - header("Location: {$download_url}"); + if (strstr($download_url, "http://") || strstr($download_url, "ftp://") || strstr($download_url, "https://")) + { + $download_url = e107::getParser()->parseTemplate($download_url,true); // support for shortcode-driven dynamic URLS. + e107::redirect($download_url); + // header("Location: {$download_url}"); exit(); } else diff --git a/e107_plugins/download/templates/download_template.php b/e107_plugins/download/templates/download_template.php index 151e71237..4bcf2fa8f 100644 --- a/e107_plugins/download/templates/download_template.php +++ b/e107_plugins/download/templates/download_template.php @@ -419,7 +419,7 @@ $DOWNLOAD_TEMPLATE['categories']['end'] = " -+"; @@ -438,8 +438,9 @@ $DOWNLOAD_WRAPPER['view']['DOWNLOAD_VIEW_AUTHORWEBSITE'] = "{DOWNLOAD_CAT_NEWDOWNLOAD_TEXT}{DOWNLOAD_CAT_SEARCH}".LAN_FORUM_0068." "; @@ -424,7 +424,7 @@ foreach ($forumList['parents'] as $parent) if (isset($FORUM_MAIN_PARENT_END)) { //-- $forum_string .= $tp->simpleParse($FORUM_MAIN_PARENT_END, $pVars); - $forum_string .= $tp->parseTemplate($FORUM_MAIN_PARENT_END, false, $sc); + $forum_string .= $tp->parseTemplate($FORUM_MAIN_PARENT_END, true, $sc); } } } @@ -629,20 +629,20 @@ if (e_QUERY == 'new') //-- $forum_newstring .= $tp->simpleParse($FORUM_NEWPOSTS_MAIN, $nVars); $sc->setVars($thread); - $forum_newstring .= $tp->parseTemplate($FORUM_NEWPOSTS_MAIN, false, $sc); + $forum_newstring .= $tp->parseTemplate($FORUM_NEWPOSTS_MAIN, true, $sc); } if (empty($newThreadList)) { //-- $nVars->NEWSPOSTNAME = LAN_FORUM_0029; //-- $forum_newstring = $tp->simpleParse($FORUM_NEWPOSTS_MAIN, $nVars); - $forum_newstring = $tp->parseTemplate($FORUM_NEWPOSTS_MAIN, false, $sc); + $forum_newstring = $tp->parseTemplate($FORUM_NEWPOSTS_MAIN, true, $sc); } //-- $forum_new_start = $tp->simpleParse($FORUM_NEWPOSTS_START, $nVars); //-- $forum_new_end = $tp->simpleParse($FORUM_NEWPOSTS_END, $nVars); - $forum_new_start = $tp->parseTemplate($FORUM_NEWPOSTS_START, false, $sc); - $forum_new_end = $tp->parseTemplate($FORUM_NEWPOSTS_END, false, $sc); + $forum_new_start = $tp->parseTemplate($FORUM_NEWPOSTS_START, true, $sc); + $forum_new_end = $tp->parseTemplate($FORUM_NEWPOSTS_END, true, $sc); if ($forum->prefs->get('enclose')) { @@ -664,11 +664,11 @@ $breadarray = array( //-- $forum_main_start = $tp->simpleParse($FORUM_MAIN_START, $fVars); $sc->wrapper('forum/main/start'); -$forum_main_start = $tp->parseTemplate($FORUM_MAIN_START, false, $sc); +$forum_main_start = $tp->parseTemplate($FORUM_MAIN_START, true, $sc); //-- $forum_main_end = $tp->simpleParse($FORUM_MAIN_END, $fVars); $sc->wrapper('forum/main/end'); -$forum_main_end = $tp->parseTemplate($FORUM_MAIN_END, false, $sc); +$forum_main_end = $tp->parseTemplate($FORUM_MAIN_END, true, $sc); if ($forum->prefs->get('enclose')) { diff --git a/e107_plugins/forum/forum_admin.php b/e107_plugins/forum/forum_admin.php index d1ea7e54b..c2f21f6be 100644 --- a/e107_plugins/forum/forum_admin.php +++ b/e107_plugins/forum/forum_admin.php @@ -138,7 +138,7 @@ if(!deftrue('OLD_FORUMADMIN')) 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), 'forum_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'forum_name' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'inline'=>true, 'data' => 'str', 'width' => '40%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'forum_sef' => array ( 'title' => LAN_SEFURL, 'type' => 'text', 'inline'=>true, 'noedit'=>false, 'data' => 'str', 'width' => 'auto', 'help' => 'Leave blank to auto-generate it from the title above.', 'readParms' => '', 'writeParms' => 'size=xxlarge', 'class' => 'left', 'thclass' => 'left', ), + 'forum_sef' => array ( 'title' => LAN_SEFURL, 'type' => 'text', 'batch'=>true, 'inline'=>true, 'noedit'=>false, 'data' => 'str', 'width' => 'auto', 'help' => 'Leave blank to auto-generate it from the title above.', 'readParms' => '', 'writeParms' => 'sef=forum_name&size=xxlarge', 'class' => 'left', 'thclass' => 'left', ), 'forum_description' => array ( 'title' => LAN_DESCRIPTION, 'type' => 'textarea', 'data' => 'str', 'width' => '30%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'forum_parent' => array ( 'title' => FORLAN_75, 'type' => 'dropdown', 'data' => 'int', 'width' => '10%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'forum_sub' => array ( 'title' => LAN_FORUM_1002, 'type' => 'dropdown', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), @@ -822,7 +822,9 @@ if(!deftrue('OLD_FORUMADMIN')) } $linkQ = e_SELF."?searchquery=&filter_options=page_chapter__".$id."&mode=page&action=list"; - $level_image = $parent ? ' ' : '';
+ // $level_image = $parent ? ' ' : '';
+
+ $level_image = $parent ? str_replace('level-x','level-'.$level, ADMIN_CHILD_ICON) : '';
return ($parent) ? $level_image.$curVal : $curVal;
}
@@ -858,7 +860,10 @@ if(!deftrue('OLD_FORUMADMIN'))
$level = 2;
}
- $ret['inlineParms'] = array('pre'=>'');
+ // $ret['inlineParms'] = array('pre'=>'');
+
+ $ret['inlineParms'] = array('pre'=> str_replace('level-x','level-'.$level, ADMIN_CHILD_ICON));
+
}
diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index 10423545f..ec12b2dbe 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -559,9 +559,9 @@ if($container_only)
//var_dump ($FORUM_VIEW_START);
// var_dump ($FORUM_VIEW_SUB);
-$forum_view_start = $tp->parseTemplate($FORUM_VIEW_START_CONTAINER.$FORUM_VIEW_START, false, $sc);
-$forum_view_forum = $tp->parseTemplate($forum_view_forum, false, $sc);
-$forum_view_end = $tp->parseTemplate($FORUM_VIEW_END.$FORUM_VIEW_END_CONTAINER, false, $sc);
+$forum_view_start = $tp->parseTemplate($FORUM_VIEW_START_CONTAINER.$FORUM_VIEW_START, true, $sc);
+$forum_view_forum = $tp->parseTemplate($forum_view_forum, true, $sc);
+$forum_view_end = $tp->parseTemplate($FORUM_VIEW_END.$FORUM_VIEW_END_CONTAINER, true, $sc);
//$forum_view_start .= "
FVARS FORUM
".$tp->simpleParse($FORUM_VIEW_START, $fVars); //$forum_view_end = $tp->simpleParse($FORUM_VIEW_END, $fVars); @@ -569,7 +569,7 @@ $forum_view_end = $tp->parseTemplate($FORUM_VIEW_END.$FORUM_VIEW_END_CONTAINER, if ($forum->prefs->get('enclose')) { // $forum_view_subs???? - $caption = varset($FORUM_VIEW_CAPTION) ? $tp->parseTemplate($FORUM_VIEW_CAPTION, TRUE, $sc) : $forum->prefs->get('title'); + $caption = varset($FORUM_VIEW_CAPTION) ? $tp->parseTemplate($FORUM_VIEW_CAPTION, true, $sc) : $forum->prefs->get('title'); $ns->tablerender($caption, $forum_view_start.$forum_view_subs.$forum_view_forum.$forum_view_end, array('forum_viewforum', 'main1')); } diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php index 05ca2f9c8..4799dc5a6 100644 --- a/e107_plugins/forum/forum_viewtopic.php +++ b/e107_plugins/forum/forum_viewtopic.php @@ -616,7 +616,7 @@ require_once (HEADERF); if ($forum->prefs->get('enclose')) { - $forumTitle = empty($FORUMCAPTION) ? e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME) : $tp->parseTemplate($FORUMCAPTION, TRUE, $sc); + $forumTitle = empty($FORUMCAPTION) ? e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME) : $tp->parseTemplate($FORUMCAPTION, true, $sc); $ns->tablerender($forumTitle, $mes->render().$forumstring, array('forum_viewtopic', 'main')); } else diff --git a/e107_plugins/forum/newforumposts_menu.php b/e107_plugins/forum/newforumposts_menu.php index 5b05385f4..b550106b0 100755 --- a/e107_plugins/forum/newforumposts_menu.php +++ b/e107_plugins/forum/newforumposts_menu.php @@ -111,7 +111,7 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php) $sc = e107::getScBatch('view', 'forum')->setScVar('param',$param); - $list = $tp->parseTemplate($template['start'],true); + $list = $tp->parseTemplate($template['start'], true); while($row = $sql->fetch()) { @@ -119,7 +119,7 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php) $sc->setScVar('postInfo', $row); $sc->setVars($row); - $list .= $tp->parseTemplate($template['item'],false,$sc); + $list .= $tp->parseTemplate($template['item'], true, $sc); /* @@ -189,7 +189,7 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php) - $list .= $tp->parseTemplate($template['end'],true); + $list .= $tp->parseTemplate($template['end'], true); $text = $list; diff --git a/e107_plugins/import/admin_import.php b/e107_plugins/import/admin_import.php index 07865b2ee..1244c47fb 100644 --- a/e107_plugins/import/admin_import.php +++ b/e107_plugins/import/admin_import.php @@ -94,18 +94,21 @@ class import_main_ui extends e_admin_ui // Definitions of available areas to import protected $importTables = array( 'users' => array('message' => LAN_CONVERT_25, 'classfile' => 'import_user_class.php', 'classname' => 'user_import'), + 'userclass' => array('message' => LAN_CONVERT_73, 'nolist'=>true, 'classfile' => 'import_user_class.php', 'classname' => 'userclass_import'), + 'news' => array('message' => LAN_CONVERT_28, 'classfile' => 'import_news_class.php', 'classname' => 'news_import'), - 'page' => array('message' => "Pages", 'classfile' => 'import_page_class.php', 'classname' => 'page_import'), - 'links' => array('message' => "Links", 'classfile' => 'import_links_class.php', 'classname' => 'links_import'), - 'media' => array('message' => "Media", 'classfile' => 'import_media_class.php', 'classname' => 'media_import'), - 'forum' => array('message' => "Forum", 'classfile' => 'import_forum_class.php', 'classname' => 'forum_import'), - 'forumthread' => array('message' => "Forum Topics/Threads", 'classfile' => 'import_forum_class.php', 'classname' => 'forumthread_import', 'nolist'=>true), - 'forumpost' => array('message' => "Forum Posts", 'classfile' => 'import_forum_class.php', 'classname' => 'forumpost_import', 'nolist'=>true), - 'forumtrack' => array('message' => "Forum Track", 'classfile' => 'import_forum_class.php', 'classname' => 'forumtrack_import', 'nolist'=>true), - // 'forumpost' => array('message' => "Media", 'classfile' => 'import_media_class.php', 'classname' => 'media_import'), - 'comments' => array('message'=> LAN_COMMENTS), - // 'forumdefs' => array('message' => LAN_CONVERT_26), - // 'forumposts' => array('message' => LAN_CONVERT_48), + 'newscategory' => array('message' => LAN_CONVERT_74, 'nolist'=>true, 'classfile' => 'import_news_class.php', 'classname' => 'newscategory_import'), + + 'page' => array('message' => LAN_CONVERT_65, 'classfile' => 'import_page_class.php', 'classname' => 'page_import'), + 'pagechapter' => array('message' => LAN_CONVERT_66, 'nolist'=>true, 'classfile' => 'import_page_class.php', 'classname' => 'pagechapter_import'), + 'links' => array('message' => LAN_CONVERT_67, 'classfile' => 'import_links_class.php', 'classname' => 'links_import'), + 'media' => array('message' => LAN_CONVERT_68, 'classfile' => 'import_media_class.php', 'classname' => 'media_import'), + 'forum' => array('message' => LAN_CONVERT_69, 'classfile' => 'import_forum_class.php', 'classname' => 'forum_import'), + 'forumthread' => array('message' => LAN_CONVERT_70, 'classfile' => 'import_forum_class.php', 'classname' => 'forumthread_import', 'nolist'=>true), + 'forumpost' => array('message' => LAN_CONVERT_71, 'classfile' => 'import_forum_class.php', 'classname' => 'forumpost_import', 'nolist'=>true), + 'forumtrack' => array('message' => LAN_CONVERT_72, 'classfile' => 'import_forum_class.php', 'classname' => 'forumtrack_import', 'nolist'=>true), + // 'comments' => array('message'=> LAN_COMMENTS), + // 'polls' => array('message' => LAN_CONVERT_27) ); @@ -121,26 +124,31 @@ class import_main_ui extends e_admin_ui foreach($importClassList as $file) { + + $tag = str_replace('_class.php','',$file['fname']); $key = str_replace("_import_class.php","",$file['fname']); + if($key === 'template') + { + continue; + } + include_once($file['path'].$file['fname']); // This will set up the variables $this->providers[$key] = $this->getMeta($tag); - if(vartrue($_GET['type'])) + if(!empty($_GET['type'])) { - $this->importClass = $_GET['type']."_import"; - + $this->importClass = filter_var($_GET['type'])."_import"; } - - } - - - + + + uksort($this->providers,'strcasecmp'); + } @@ -235,13 +243,20 @@ class import_main_ui extends e_admin_ui ".$frm->hidden('mode','main')." ".$frm->hidden('action','import')." -