-
+
';
$active = '';
@@ -622,50 +980,46 @@ class e_layout
- private function getHeadFoot($_MLAYOUT=null)
+ private function getHeadFoot()
{
- $theme = e107::getPref('sitetheme');
-
+
$H = array();
$F = array();
- require(e_THEME.$theme."/theme.php");
-
-
- if(is_string($HEADER))
+ if(is_string($this->HEADER))
{
- $H['default'] = $HEADER;
- $F['default'] = $FOOTER;
+ $H['default'] = $this->HEADER;
+ $F['default'] = $this->FOOTER;
}
else
{
- $H = $HEADER;
- $F = $FOOTER;
+ $H = $this->HEADER;
+ $F = $this->FOOTER;
}
+
// 0.6 / 0.7-1.x
- if(isset($CUSTOMHEADER) && isset($CUSTOMHEADER))
+ if(isset($this->CUSTOMHEADER) && isset($this->CUSTOMHEADER))
{
- if(!is_array($CUSTOMHEADER))
+ if(!is_array($this->CUSTOMHEADER))
{
- $H['legacyCustom'] = $CUSTOMHEADER;
- $F['legacyCustom'] = $CUSTOMFOOTER;
+ $H['legacyCustom'] = $this->CUSTOMHEADER;
+ $F['legacyCustom'] = $this->CUSTOMFOOTER;
}
else
{
- foreach($CUSTOMHEADER as $k=>$v)
+ foreach($this->CUSTOMHEADER as $k=>$v)
{
- $H[$k] = $v;
- $F[$k] = $v;
- }
+ $H[$k] = $v;
+ }
+ foreach($this->CUSTOMFOOTER as $k=>$v)
+ {
+ $F[$k] = $v;
+ }
}
}
-
- if($_MLAYOUT)
- {
- // return array('HEADER'=>$H[$_MLAYOUT], 'FOOTER'=>$F[$_MLAYOUT]);
- }
+
return array('HEADER'=>$H, 'FOOTER'=>$F);
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index ee8554026..4f349eef5 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -15,6 +15,81 @@ if (!defined('e107_INIT')) { exit; }
class admin_shortcodes
{
+
+ function cronUpdateRender($parm,$cacheData)
+ {
+ $mes = e107::getMessage();
+
+ if($cacheData == 'up-to-date')
+ {
+ return '';
+ }
+
+ $installUrl = "#"; // TODO
+
+
+ if($parm=='alert')
+ {
+ $text = 'A new update is ready to install! Click to unzip and install v'.$cacheData.'.
+ Install';
+
+ $mes->addInfo($text);
+ return $mes->render();
+ }
+
+ if($parm=='icon')
+ {
+
+ return '
+ ';
+
+
+ }
+
+ }
+
+ // {ADMIN_COREUPDATE}
+ function sc_admin_coreupdate($parm='')
+ {
+ $che = e107::getCache();
+ $mes = e107::getMessage();
+
+ $che->setMD5(e_LANGUAGE);
+
+ $cacheData = $che->retrieve("releasecheck",3600, TRUE); // 2.0.1 | 'up-to-date' | false ;
+
+ $cacheData = 2.1; // XXX Remove to test for real.
+
+ if($cacheData)
+ {
+ return $this->cronUpdateRender($parm, $cacheData);
+ }
+
+
+ require_once(e_HANDLER."cron_class.php");
+ $cron = new _system_cron();
+
+ if($result = $cron->checkCoreUpdate())
+ {
+ return $this->cronUpdateRender($parm, $cacheData);
+ }
+
+
+ }
+
+
+
+
function sc_admin_credits()
{
if (!ADMIN) { return ''; }
@@ -61,9 +136,8 @@ class admin_shortcodes
$ns = e107::getRender();
$pref = e107::getPref();
- if(function_exists('e_help')) // new in v2.x for non-admin-ui admin pages.
+ if(function_exists('e_help') && ($tmp = e_help())) // new in v2.x for non-admin-ui admin pages.
{
- $tmp = e_help();
return $ns->tablerender($tmp['caption'],$tmp['text'],'e_help',true);
}
diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php
index cea1a2e41..5eab2a6a2 100644
--- a/e107_core/shortcodes/batch/news_shortcodes.php
+++ b/e107_core/shortcodes/batch/news_shortcodes.php
@@ -125,7 +125,13 @@ class news_shortcodes extends e_shortcode
{
$NEWIMAGE = $param['image_nonew_small'];
}
- return (!$news_item['news_allow_comments'] ? ''.($pref['comments_icon'] ? $NEWIMAGE : '')." ".$param['commentlink'].intval($news_item['news_comment_total']).'' : vartrue($param['commentoffstring'],'Disabled') );
+
+ if(deftrue('e_BOOTSTRAP')) // Should be done with CSS, not like above.
+ {
+ $NEWIMAGE = "";
+ }
+
+ return (!$news_item['news_allow_comments'] ? ''.($pref['comments_icon'] ? $NEWIMAGE.' ' : '')."".$param['commentlink'].intval($news_item['news_comment_total']).'' : vartrue($param['commentoffstring'],'Disabled') );
}
function sc_trackback($parm)
diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php
index a43d74dbb..2682e79bf 100644
--- a/e107_core/shortcodes/batch/user_shortcodes.php
+++ b/e107_core/shortcodes/batch/user_shortcodes.php
@@ -226,7 +226,9 @@ class user_shortcodes extends e_shortcode
function sc_user_email_link($parm)
{
$tp = e107::getParser();
- return ($this->var['user_hideemail'] && !ADMIN) ? "".LAN_USER_35."" : $tp->parseTemplate("{email={$this->var['user_email']}-link}");
+ return /* Condition */ ($this->var['user_hideemail'] && !ADMIN) ?
+ /* Hidden and Not Admin */ "".LAN_USER_35."" :
+ /* Not Hidden or Admin */ $tp->parseTemplate("{email={$this->var['user_email']}-link}");
}
@@ -234,7 +236,30 @@ class user_shortcodes extends e_shortcode
function sc_user_email($parm)
{
$tp = e107::getParser();
- return ($this->var['user_hideemail'] && !ADMIN) ? "".LAN_USER_35."" : $tp->toHTML($this->var['user_email'],"no_replace");
+ return /* Condition */ ($this->var['user_hideemail'] && !ADMIN) ?
+ /* Hidden and Not Admin */ "".LAN_USER_35."" :
+ /* Not Hidden or Admin */ "" . strrev($tp->toHTML($this->var['user_email'],"no_replace")) . "";
+ ########################################################
+ # Security Note - 04 May 2013 #
+ ########################################################
+ # #
+ # The CSS code direction rtl is an effective way to #
+ # prevent spam bots from scraping emails that are #
+ # not hidden. #
+ # #
+ # You can find empirical support for this method at #
+ # {USER_EMAIL_ICON} ".LAN_USER_60."
- {USER_EMAIL_LINK}
+ {USER_EMAIL}
Download Manually"; + + if(E107_DEBUG_LEVEL > 0) + { + $status .= 'local='.$localfile; + } + + echo $status; + exit; + } + else + { + $contents = file_get_contents(e_TEMP.$localfile); + if(strlen($contents) < 400) + { + echo ""; + return; + } + } + + chmod(e_TEMP.$localfile, 0755); + require_once(e_HANDLER."pclzip.lib.php"); + + $archive = new PclZip(e_TEMP.$localfile); + $unarc = ($fileList = $archive -> extract(PCLZIP_OPT_PATH, e_TEMP, PCLZIP_OPT_SET_CHMOD, 0755)); // Store in TEMP first. + $dir = $this->getRootFolder($unarc); + $destpath = ($type == 'theme') ? e_THEME : e_PLUGIN; + $typeDiz = ucfirst($type); + + @copy(e_TEMP.$localfile, e_BACKUP.$dir.".zip"); // Make a Backup in the system folder. + + if($dir && is_dir($destpath.$dir)) + { + $alert = $tp->toJS(ucfirst($type)." Already Installed".$destpath.$dir); + echo ""; + echo "Already Installed"; + @unlink(e_TEMP.$localfile); + exit; + } + + if($dir == '') + { + echo ""; + @unlink(e_TEMP.$localfile); + exit; + } + + if(is_dir(e_TEMP.$dir)) + { + $status = "Unzipping..."; + if(!rename(e_TEMP.$dir,$destpath.$dir)) + { + $alert = $tp->toJS("Couldn't Move ".e_TEMP.$dir." to ".$destpath.$dir." Folder"); + echo ""; + @unlink(e_TEMP.$localfile); + exit; + } + + $alert = $tp->toJS("Download Complete!"); + echo ""; + + // $dir = basename($unarc[0]['filename']); + // $plugPath = preg_replace("/[^a-z0-9-\._]/", "-", strtolower($dir)); + $status = "Done"; // ADMIN_TRUE_ICON; + + } + else + { + $status = ADMIN_FALSE_ICON."
Download Manually"; + if(E107_DEBUG_LEVEL > 0) + { + $status .= print_a($unarc, true); + } + } + + echo $status; + @unlink(e_TEMP.$localfile); + exit; + } + + // Grab a remote file and save it in the /temp directory. requires CURL + function getRemoteFile($remote_url, $local_file, $type='temp') + { + $path = ($type == 'media') ? e_MEDIA : e_TEMP; + + $fp = fopen($path.$local_file, 'w'); // media-directory is the root. + + $cp = curl_init($remote_url); + curl_setopt($cp, CURLOPT_FILE, $fp); + curl_setopt($cp, CURLOPT_REFERER, e_REQUEST_HTTP); + curl_setopt($cp, CURLOPT_HEADER, 0); + curl_setopt($cp, CURLOPT_USERAGENT, "Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)"); + curl_setopt($cp, CURLOPT_COOKIEFILE, e_SYSTEM.'cookies.txt'); + + $buffer = curl_exec($cp); + + curl_close($cp); + fclose($fp); + + return ($buffer) ? true : false; + } +} + +class e_marketplace_adapter_wsdl extends e_marketplace_adapter_abstract +{ + /** + * e107.org WSDL URL + * @var string + */ + protected $wsdl = 'http://e107.org/e107_plugins/addons/service.php?wsdl'; + + /** + * Soap client instance + * @var SoapClient + */ + protected $client = null; + + public function __construct() + { + e107_ini_set('soap.wsdl_cache_enabled', 0); + e107_ini_set('soap.wsdl_cache_ttl', 0); + + $options = array( + "trace" => true, + 'exception' => true, + "uri" => "http://server.soap.e107.inc.com/", + 'cache_wsdl' => WSDL_CACHE_NONE, + 'connection_timeout' => 10, + ); + + $this->client = new SoapClient($this->wsdl, $options); + + if(function_exists('xdebug_disable')) + { + //xdebug_disable(); + } + } + + public function test($input) + { + try + { + $res = $this->client->get_echo($input); + } + catch(Exception $e) + { + $res = $e->getMessage(); + } + return $res; + + } + + /** + * Generic call method + */ + public function _call($method, $args, $apply = true) + { + $result = array( + 'data' => null, + //'error'=> array('code' => 0, 'message' => null) + ); + $ret = null; + + // authorize on every call, service class decides what to do on every method call + $auth = new stdClass; + $auth->authKey = $this->getAuthKey(); + $header = new SoapHeader('http://e107.org/services/auth', 'checkAuthHeader', $auth); + + try + { + $this->client->__setSoapHeaders(array($header)); + if(is_array($args) && $apply) + { + $ret = call_user_func_array(array($this->client, $method), $args); + } + else $ret = $this->client->$method($args); + + if(isset($ret['exception'])) + { + $result['error']['message'] = "API Exception [call::{$method}]: (#".$ret['exception']['code'].") ".$ret['exception']['message']; + $result['error']['code'] = $ret['exception']['code']; + unset($ret['exception']); + } + $result['data'] = $ret['data']; + } + catch(SoapFault $e) + { + $result['error']['message'] = "SoapFault Exception [call::{$method}]: (#".$e->getCode().") ".$e->getMessage(); + $result['error']['code'] = 'SOAP_'.$e->getCode(); + } + catch(Exception $e) + { + $result['error']['message'] = "Generic Exception [call::{$method}]: (#".$e->getCode().") ".$e->getMessage(); + $result['error']['code'] = 'GEN_'.$e->getCode(); + } + if(E107_DEBUG_LEVEL) + { + print_a($this->client->__getLastRequest()); + } + return $result; + } + + /** + * Public call method + */ + public function call($method, $data, $apply = true) + { + return $this->_call($method, $data, $apply); + } + + /** + * Prepare the result, not needed for WSDL + * SUBJECT OF REMOVAL + */ + public function fetch($method, &$result) + { + if(isset($result['error'])) + { + return $result; + } + + switch ($method) + { + case 'getList': + break; + } + return $result; + } + + public function __destruct() + { + $this->client = null; + //echo "SOAP Client destroyed", PHP_EOL; + } +} + +class e_marketplace_adapter_xmlrpc extends e_marketplace_adapter_abstract +{ + /** + * e107.org XML-rpc service + * @var xmlClass + */ + protected $url = 'http://e107.org/e107_plugins/addons/xservice.php'; + + public function __construct() + { + } + + public function test($input) + { + + } + + public function call($method, $data, $apply = true) + { + $client = $this->client(); + + // settings based on current method + $this->prepareClient($client); + + // authorization data + $data['auth'] = $this->getAuthKey(); + $data['action'] = $method; + + // build the request query + $qry = str_replace(array('s%5B', '%5D'), array('[', ']'), http_build_query($data, null, '&')); + $url = $this->url.'?'.$qry; + + // call it + $result = $client->loadXMLfile($url,'advanced'); + //var_dump($url, $result); + return $result; + } + + public function fetch($method, &$result) + { + + } + + public function prepareClient($method, &$client) + { + switch ($method) + { + case 'getList': + $client->setOptArrayTags('plugin'); + break; + } + } + + public function client() + { + return e107::getXml(false); + } +} diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index bb7edb6d5..0488ba9f2 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -413,7 +413,7 @@ class e_form if($localonly == true) { $text = ""; - $text .= "
'; } - $sq->delete('private_msg', 'pm_id = '.$pmid); + $sql->delete('private_msg', 'pm_id = '.$pmid); } else { diff --git a/e107_themes/bootstrap/admin_template.php b/e107_themes/bootstrap/admin_template.php index 2e30fbc0b..d0cc49acf 100644 --- a/e107_themes/bootstrap/admin_template.php +++ b/e107_themes/bootstrap/admin_template.php @@ -174,6 +174,7 @@ $ADMIN_HEADER = '