![](".e_IMAGE."generic/lite/edit.png)
" : "";
-SC_END
-
-SC_BEGIN DOWNLOAD_CATEGORY
-global $dl;
-return $dl['download_category_name'];
-SC_END
-
-SC_BEGIN DOWNLOAD_CATEGORY_ICON
-global $dl;
-list($present,$missing) = explode(chr(1),$dl['download_category_icon']);
-if($present)
-{
- return "";
-
- if ($ratearray = $rater->getrating("download", $dl['download_id'])) {
- for($c = 1; $c <= $ratearray[1]; $c++) {
- $text .= "![](".e_IMAGE."rate/star.png) ";
- }
- if ($ratearray[2]) {
- $text .= "![](".e_IMAGE."rate/".$ratearray[2].".png) ";
- }
- if ($ratearray[2] == "") {
- $ratearray[2] = 0;
- }
- $text .= " ".$ratearray[1].".".$ratearray[2]." - ".$ratearray[0]." ";
- $text .= ($ratearray[0] == 1 ? LAN_dl_43 : LAN_dl_44);
- } else {
- $text .= LAN_dl_13;
- }
- $text .= " | "; - - if (!$rater->checkrated("download", $dl['download_id']) && USER) { - $text .= $rater->rateselect(" ".LAN_dl_14, "download", $dl['download_id']).""; - } - else if(!USER) { - $text .= " "; - } else { - $text .= LAN_THANK_YOU; - } - $text .= " |
getScObject('news_shortcodes', 'myplug', 'news2_shortcodes');
*
* @param string $className
- * @param string $plugName if true className is used., if string, string value is used.
+ * @param null $pluginName
* @param string $overrideClass if true, $className is used
* @return e_shortcode
+ * @internal param string $plugName if true className is used., if string, string value is used.
*/
public function getScObject($className, $pluginName = null, $overrideClass = null)
{
@@ -320,8 +331,10 @@ class e_parse_shortcode
e_shortcode.php = {plugin}_shortcode
{plugin}_shortcodes.php = {plugin}_shortcodes
*/
+
+ $path = null;
- if(trim($className)==""){ return; }
+ if(trim($className)==""){ return null; }
$_class_fname = $className;
if($pluginName === TRUE) //XXX When called manually by a plugin, not e_shortcode.php eg. $sc = e107::getScBatch('faqs',TRUE); for faqs_shortcode.php with class faqs_shortcode
@@ -625,6 +638,9 @@ class e_parse_shortcode
/**
* Common Auto-Register function for class methods.
+ * @param $class
+ * @param $path
+ * @param bool $force
* @return e_parse_shortcode
*/
protected function registerClassMethods($class, $path, $force = false)
@@ -735,8 +751,7 @@ class e_parse_shortcode
* ONLY globally register shortcodes when they are declared in e_shortcode.php - this is consistent with the logic of e_xxxx which affect e107 Outside of the plugin/sript. (gallery plugin follows this logic)
*
*/
-
-
+
if(isset($sc_style) && is_array($sc_style))
{
$this->sc_style = array_merge($sc_style, $this->sc_style); // XXX Commenting this out will fix #2 above.
@@ -814,8 +829,8 @@ class e_parse_shortcode
$this->addedCodes = $saveCodes;
$this->eVars = $saveVars; // restore eVars
$this->debug_legacy = null;
-
-
+ $this->legacyBatch = array();
+
// $this->sc_style = array(); //XXX Adding this will also fix #2 above.
@@ -824,12 +839,14 @@ class e_parse_shortcode
/**
- * Callback looks up and substitutes a shortcode
+ * Callback looks up and substitutes a shortcode
+ * @param $matches
+ * @return bool|int|mixed|string
*/
function doCode($matches)
{
// print_a($matches);
-
+
if(in_array($matches[0],$this->ignoreCodes)) // Ignore all {e_PLUGIN}, {THEME} etc. otherwise it will just return blank for these items.
{
return $matches[0];
@@ -896,7 +913,7 @@ class e_parse_shortcode
if (E107_DBG_BBSC || E107_DBG_SC || E107_DBG_TIMEDETAILS)
{
- $sql->db_Mark_Time("SC $code");
+ $sql->db_Mark_Time("SC ".$code);
}
if (E107_DBG_SC)
@@ -942,10 +959,22 @@ class e_parse_shortcode
}
}
- elseif (is_array($this->addedCodes) && array_key_exists($code, $this->addedCodes)) // Its array-based shortcode. Load the code for evaluation later.
+ elseif(is_array($this->addedCodes) && array_key_exists($code, $this->addedCodes)) // Its array-based shortcode. Load the code for evaluation later.
{
-
- $ret = $this->addedCodes[$code];
+
+ // $ret = $this->addedCodes[$code];
+
+ //$this->legacyBatch
+ if(in_array($code,$this->legacyBatch))
+ {
+ $scCode = $this->addedCodes[$code];
+ }
+ else
+ {
+ $ret = $this->addedCodes[$code];
+ }
+
+
// $_class = "n/a";
// $_function = "n/a";
$_type = 'array';
@@ -1079,11 +1108,14 @@ class e_parse_shortcode
if(!empty($scFile))
{
+ $_type = 'file';
+
if(file_exists($scFile))
{
$scCode = file_get_contents($scFile);
$this->scList[$code] = $scCode;
$_path = $scFile;
+
}
else
{
@@ -1111,28 +1143,31 @@ class e_parse_shortcode
if ($scCode) // legacy shortode to be evaluated.
{
+
try
{
$ret = @eval($scCode);
}
catch (Throwable $t) { // Executed only in PHP 7, will not match in PHP 5.x
- $string = print_a($scCode,true);
- $string .= "