diff --git a/class2.php b/class2.php index b955b305d..589d31fd7 100644 --- a/class2.php +++ b/class2.php @@ -764,6 +764,7 @@ if(!empty($pref['xurl']) && is_array($pref['xurl'])) define('XURL_FLICKR', vartrue($pref['xurl']['flickr'], false)); define('XURL_INSTAGRAM', vartrue($pref['xurl']['instagram'], false)); define('XURL_PINTEREST', vartrue($pref['xurl']['pinterest'], false)); + define('XURL_STEAM', vartrue($pref['xurl']['steam'], false)); define('XURL_VIMEO', vartrue($pref['xurl']['vimeo'], false)); } else @@ -777,6 +778,7 @@ else define('XURL_FLICKR', false); define('XURL_INSTAGRAM', false); define('XURL_PINTEREST', false); + define('XURL_STEAM', false); define('XURL_VIMEO', false); } @@ -2503,7 +2505,7 @@ class e_http_header if($this->compression_server_support == true && $this->compression_browser_support == true) { - $this->compress_output = varset(e107::getPref('compress_output'),false); + $this->compress_output = (bool) varset(e107::getPref('compress_output'),false); } else { @@ -2594,7 +2596,7 @@ class e_http_header $text .=print_a($server,true); - if($this->compress_output == true) + if($this->compress_output === true) { $text = gzencode($text, $this->compression_level); @@ -2642,28 +2644,18 @@ class e_http_header } - if($this->compress_output != false) + if($this->compress_output !== false) { - // $this->setHeader("ETag: \"{$this->etag}-gzip\""); - $this->setHeader('ETag: "'.$this->etag.'-gzip"', true); + $this->setHeader('ETag: "'.$this->etag.'-gzip"', true); $this->content = gzencode($this->content, $this->compression_level); + $this->length = strlen($this->content); $this->setHeader('Content-Encoding: gzip', true); $this->setHeader("Content-Length: ".$this->length, true); - } else { -/* - if($this->compression_browser_support ==true) - { - $this->setHeader('ETag: "'.$this->etag.'-gzip"', true); - } - else - {*/ - $this->setHeader('ETag: "'.$this->etag.'"', true); - // } - + $this->setHeader('ETag: "'.$this->etag.'"', true); $this->setHeader("Content-Length: ".$this->length, true); } diff --git a/cron.php b/cron.php old mode 100644 new mode 100755 index 168673ace..ed752748b --- a/cron.php +++ b/cron.php @@ -1,220 +1,41 @@ #!/usr/bin/php -q /dev/null 2>&1 + * Using curl: + * /usr/bin/curl --silent --compressed http://example.com/cron.php?token=TOKEN > /dev/null 2>&1 + * Using lynx: + * /usr/bin/lynx -source http://example.com/cron.php?token=TOKEN > /dev/null 2>&1 + * Using PHP: + * /usr/bin/php -q /var/www/example.com/cron.php token=TOKEN + * /usr/bin/php -q /var/www/example.com/cron.php TOKEN + * Using as Shell script: + * /var/www/example.com/cron.php token=TOKEN + * /var/www/example.com/cron.php TOKEN + */ $_E107['cli'] = true; $_E107['debug'] = false; $_E107['no_online'] = true; $_E107['no_forceuserupdate'] = true; $_E107['no_menus'] = true; -$_E107['allow_guest'] = true; // allow crons to run while in members-only mode. +$_E107['allow_guest'] = true; // allow crons to run while in members-only mode. $_E107['no_maintenance'] = true; -// we allow theme init as cron jobs might need to access current theme templates (e.g. custom email templates) +require_once(realpath(dirname(__FILE__) . "/class2.php")); +require_once(e_HANDLER . "cron_class.php"); - -require_once(realpath(dirname(__FILE__)."/class2.php")); - - - $pwd = ($_E107['debug'] && $_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : trim($_SERVER['argv'][1]); - - if(!empty($_GET['token'])) - { - $pwd = e107::getParser()->filter($_GET['token']); - } - else - { - $pwd = str_replace('token=','',$pwd); - } - - if(($pref['e_cron_pwd'] != $pwd) || empty($pref['e_cron_pwd'])) - { - - if(!empty($pwd)) - { - require_once(e_HANDLER."mail.php"); - - $message = "Your Cron Schedule is not configured correctly. Your passwords do not match. -

- Sent from cron: ".$pwd."
- Stored in e107: ".$pref['e_cron_pwd']."

- You should regenerate the cron command in admin and enter it again in your server configuration. - "; - - $message .= "

Debug Info

"; - $message .= "

_SERVER

"; - $message .= print_a($_SERVER,true); - $message .= "

_ENV

"; - $message .= print_a($_ENV,true); - $message .= "

_GET

"; - $message .= print_a($_GET,true); - - sendemail($pref['siteadminemail'], "e107 - Cron Schedule Misconfigured.", $message, $pref['siteadmin'],$pref['siteadminemail'], $pref['siteadmin']); - } - - exit; - } - - -// e107::getCache()->CachePageMD5 = '_'; -@file_put_contents(e_CACHE.'cronLastLoad.php',time()); - - - -// from the plugin directory: -// realpath(dirname(__FILE__)."/../../")."/"; - - $list = array(); - - $sql = e107::getDb(); - if($sql->select("cron",'cron_function,cron_tab','cron_active =1')) - { - while($row = $sql->fetch()) - { - list($class,$function) = explode("::",$row['cron_function'],2); - $key = $class."__".$function; - - $list[$key] = array( - 'path' => $class, - 'active' => 1, - 'tab' => $row['cron_tab'], - 'function' => $function, - 'class' => $class - ); - } - } - - - // foreach($pref['e_cron_pref'] as $func=>$cron) - // { - // if($cron['active']==1) - // { - // $list[$func] = $cron; - // } - // } - - - -if($_E107['debug'] && $_SERVER['QUERY_STRING']) -{ - echo "

Cron Lists

"; - print_a($list); -} - -require_once(e_HANDLER."cron_class.php"); - - -$cron = new CronParser(); - -require_once(e_HANDLER."mail.php"); -foreach($list as $func=>$val) -{ - $cron->calcLastRan($val['tab']); - $due = $cron->getLastRanUnix(); - - if($_E107['debug']) - { - echo "
Cron: ".$val['function']; - } - - if($due > (time()-45)) - { - if($_E107['debug']) { echo "
Running Now...
path: ".$val['path']; } - - if(($val['path']=='_system') || is_readable(e_PLUGIN.$val['path']."/e_cron.php")) - { - if($val['path'] != '_system') // this is correct. - { - include_once(e_PLUGIN.$val['path']."/e_cron.php"); - } - - $classname = $val['class']."_cron"; - if(class_exists($classname, false)) - { - $obj = new $classname; - if(method_exists($obj,$val['function'])) - { - // $mes->add("Executing config function ".$key." : ".$method_name."()", E_MESSAGE_DEBUG); - if($_E107['debug']) { echo "
Method Found: ".$classname."::".$val['function']."()"; } - - // Exception handling - $methodname = $val['function']; - $status = false; - try - { - $status = $obj->$methodname(); - } - catch (Exception $e) - { - $errorMData = $e->getFile().' '.$e->getLine(); - $errorMData .= "\n\n".$e->getCode().''.$e->getMessage(); - $errorMData .= "\n\n".implode("\n", $e->getTrace()); - //TODO log error in admin log. Pref for sending email to Administator - sendemail($pref['siteadminemail'], $pref['siteadmin'].": Cron Schedule Exception", $errorMData, $pref['siteadmin'],$pref['siteadminemail'], $pref['siteadmin']); - } - // $status = call_user_func(array($obj,$val['function'])); - - // If task returns value which is not boolean (bc), it'll be used as a message (send email, logs) - if($status && true !== $status) - { - //TODO log error in admin log. Pref for sending email to Administator - // echo "\nerror running the function ".$func.".\n"; // log the error. - if($_E107['debug']) { echo "
Method returned message: [{$classname}::".$val['function'].'] '.$status; } - sendemail($pref['siteadminemail'], $pref['siteadmin'].": Cron Schedule Task Report", "Method returned message: [{$classname}::".$val['function'].'] '.$status, $pref['siteadmin'], $pref['siteadminemail'], $pref['siteadmin']); - } - } - else - { - if($_E107['debug']) { echo "
Couldn't find method: ".$val['function']; } - } - } - else - { - if($_E107['debug']) { echo "
Couldn't find class: ".$classname; } - } - - } - } - // echo "Cron Unix = ". $cron->getLastRanUnix(); - // echo "
Now = ".time(); - -} - - - - - -// echo "
Cron '$cron_str0' last due at: " . date('r', $cron->getLastRanUnix()) . "

"; -// $cron->getLastRan() returns last due time in an array -// print_a($cron->getLastRan()); -// echo "Debug:
" . nl2br($cron->getDebug()); - /* -$cron_str1 = "3 12 * * *"; -if ($cron->calcLastRan($cron_str1)) -{ - echo "

Cron '$cron_str1' last due at: " . date('r', $cron->getLastRanUnix()) . "

"; - print_r($cron->getLastRan()); -} -else -{ - echo "Error parsing"; -} -echo "Debug:
" . nl2br($cron->getDebug()); -*/ - -exit; -?> \ No newline at end of file +$cron = new cronScheduler(); +$cron->run(); diff --git a/e107.htaccess b/e107.htaccess index 7b029135a..ccd43512b 100644 --- a/e107.htaccess +++ b/e107.htaccess @@ -106,10 +106,12 @@ - Header set Cache-Control "public" - Header unset Cookie - Header unset Set-Cookie - # Header set Access-Control-Allow-Origin "http://mydomain.com" + + Header set Cache-Control "public" + Header unset Cookie + Header unset Set-Cookie + # Header set Access-Control-Allow-Origin "http://mydomain.com" + diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 5aa6f1417..387e9deaa 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -229,7 +229,8 @@ class admin_start } else { - $mes->addWarning("Unable to create ".$dr.". Please check your folder permissions."); + $message = e107::getParser()->lanVars(ADLAN_187,$dr,true); + $mes->addWarning($message); } } } @@ -245,7 +246,8 @@ class admin_start if(e107::getDate()->isValidTimezone($timezone) == false) { - $mes->addWarning("Your timezone setting (".$timezone.") is invalid. It has been reset to UTC. To Modify, please go to Admin -> Preferences -> Date Display Options.", 'default', true); + $message = e107::getParser()->lanVars(ADLAN_188, $timezone); + $mes->addWarning($message, 'default', true); e107::getConfig()->set('timezone','UTC')->save(false,true,false); $this->refresh = true; } @@ -522,7 +524,7 @@ TMPO; if($inCompatText) { $text = "

"; - $mes->addWarning("The following plugins are not compatible with this version of e107 and should be uninstalled: ".$text."uninstall"); + $mes->addWarning(ADLAN_189." ".$text."".LAN_UNINSTALL.""); } } diff --git a/e107_admin/boot.php b/e107_admin/boot.php index b132cde92..659251352 100644 --- a/e107_admin/boot.php +++ b/e107_admin/boot.php @@ -56,7 +56,7 @@ if(ADMIN && e_AJAX_REQUEST && varset($_GET['mode']) == 'core' && ($_GET['type'] $text .= '
-

'.$row['title'].' — '.$row['pubDate'].'

+

'.$row['title'].' — '.$row['pubDate'].'

'.$tp->text_truncate($description,150).'
'; $count++; @@ -103,7 +103,7 @@ if(ADMIN && (e_AJAX_REQUEST || deftrue('e_DEBUG_FEEDS')) && varset($_GET['mode'] $rows = e107::getXml()->parseXml($data, 'advanced'); // print_a($rows); // exit; - $link = ($type == 'plugin') ? e_ADMIN."plugin.php?mode=online" : e_ADMIN."theme.php?mode=online"; + $link = ($type == 'plugin') ? e_ADMIN."plugin.php?mode=online" : e_ADMIN."theme.php?mode=main&action=online"; $text = "
"; @@ -471,4 +471,4 @@ if (!function_exists("parse_admin")) } } } -} \ No newline at end of file +} diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 894457c52..6d47a4e7f 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -665,13 +665,14 @@ class page_admin_ui extends e_admin_ui } - if(vartrue($_POST['menu_delete'])) // Delete a Menu (or rather, remove it's data ) + if(!empty($_POST['menu_delete'])) // Delete a Page/Menu combination (or rather, remove it's data ) { $key = key($_POST['menu_delete']); if($key) { - e107::getDb()->update('page',"menu_name = '' WHERE page_id=".intval($key)." LIMIT 1"); + //e107::getDb()->update('page',"menu_name = '' WHERE page_id=".intval($key)." LIMIT 1"); + e107::getDb()->delete('page',"page_id=".intval($key)); } } diff --git a/e107_admin/credits.php b/e107_admin/credits.php index 5462eef29..140c197dc 100644 --- a/e107_admin/credits.php +++ b/e107_admin/credits.php @@ -50,7 +50,7 @@ require_once(e_ADMIN."auth.php"); Nuvolo Icons, PHPMailer, TCPDF, PHP UTF8

-
Copyright e107 Inc. 2008-2017
+
Copyright e107 Inc. 2008-2017
@@ -63,4 +63,4 @@ require_once(e_ADMIN."footer.php"); exit; -?> \ No newline at end of file +?> diff --git a/e107_admin/header.php b/e107_admin/header.php index 4c1abd030..254886ca7 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -53,62 +53,42 @@ if(!deftrue('e_MENUMANAGER_ACTIVE')) function loadJSAddons() { - if(deftrue('e_MENUMANAGER_ACTIVE')) { return; } - -// e107::js('core', 'bootstrap/js/bootstrap-modal.js', 'jquery', 2); // Special Version see: https://github.com/twitter/bootstrap/pull/4224 - e107::css('core', 'bootstrap-select/bootstrap-select.min.css', 'jquery'); - e107::js('core', 'bootstrap-select/bootstrap-select.min.js', 'jquery', 2); + // TODO use Library Manager. Remove unused libraries... + + e107::css('core', 'bootstrap-select/bootstrap-select.min.css', 'jquery'); + e107::js('footer', '{e_WEB}js/bootstrap-select/bootstrap-select.min.js', 'jquery', 2); -// e107::css('core', 'bootstrap-multiselect/css/bootstrap-multiselect.css', 'jquery'); - e107::js('core', 'bootstrap-multiselect/js/bootstrap-multiselect.js', 'jquery', 2); + // e107::css('core', 'bootstrap-multiselect/css/bootstrap-multiselect.css', 'jquery'); + e107::js('footer', '{e_WEB}js/bootstrap-multiselect/js/bootstrap-multiselect.js', 'jquery', 2); // TODO: remove typeahead. - e107::js('core', 'bootstrap-jasny/js/jasny-bootstrap.js', 'jquery', 2); + e107::js('footer', '{e_WEB}js/bootstrap-jasny/js/jasny-bootstrap.js', 'jquery', 2); - e107::css('core', 'bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css', 'jquery'); - e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2); + e107::css('core', 'bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css', 'jquery'); + e107::js('footer', '{e_WEB}js/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2); - e107::js('core', 'jquery.h5validate.min.js','jquery',2); + e107::js('footer','{e_WEB}js/jquery.h5validate.min.js','jquery', 2); - e107::js('core', 'jquery.elastic.js', 'jquery', 2); - e107::js('core', 'jquery.at.caret.min.js', 'jquery', 2); - - // e107::js('core', 'jquery-ui-timepicker-addon.js', 'jquery', 2); - - - //e107::css('core', 'chosen/chosen.css', 'jquery'); - //e107::js('core', 'chosen/chosen.jquery.min.js', 'jquery', 2); - - // e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2); // loaded in form-handler. - - // e107::css('core', 'bootstrap-tag/bootstrap-tag.css', 'jquery'); -// e107::js('core', 'bootstrap-tag/bootstrap-tag.js', 'jquery', 2); - - -// e107::js("core", "tags/jquery.tagit.js","jquery",3); -// e107::css('core', 'tags/jquery.tagit.css', 'jquery'); + e107::js('footer', '{e_WEB}js/jquery.elastic.js', 'jquery', 2); + e107::js('footer', '{e_WEB}js/jquery.at.caret.min.js', 'jquery', 2); - e107::css('core', 'core/admin.jquery.css', 'jquery'); - e107::js("core", "core/admin.jquery.js","jquery",4); // Load all default functions. - e107::css('core', 'core/all.jquery.css', 'jquery'); + e107::css('core', 'core/admin.jquery.css', 'jquery'); + e107::css('core', 'core/all.jquery.css', 'jquery'); - e107::js("core", "core/all.jquery.js","jquery",4); // Load all default functions. + e107::js('footer', '{e_WEB}js/core/admin.jquery.js', 'jquery', 5); // Load all default functions. + e107::js('footer', '{e_WEB}js/core/all.jquery.js', 'jquery', 5); // Load all default functions. - $plUpload = "plupload/i18n/".e_LAN.".js"; + $plUpload = '{e_WEB}js/plupload/i18n/' . e_LAN . '.js'; - if(e_LAN != 'en' && file_exists(e_WEB_JS.$plUpload)) + if(e_LAN != 'en' && file_exists(e_WEB_JS . $plUpload)) { - e107::js('core', $plUpload); + e107::js('footer', $plUpload, 'jquery', 5); } - - - - } // Load library dependencies. diff --git a/e107_admin/image.php b/e107_admin/image.php index 55084f763..289060321 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -621,7 +621,7 @@ class media_form_ui extends e_admin_form_ui { $text = $this->renderValue('options',$value,'',$id); } - + return "
".$text."
"; } @@ -896,6 +896,8 @@ class media_admin_ui extends e_admin_ui function init() { + + $this->prefs['youtube_apikey']['writeParms']['post'] = " ".LAN_MORE.""; if(E107_DEBUG_LEVEL > 0) @@ -1021,10 +1023,11 @@ class media_admin_ui extends e_admin_ui } - + if($this->getQuery('iframe')) { + // e107::js('tinymce4','plugins/compat3x/tiny_mce_popup.js'); $this->getResponse()->setIframeMod(); // disable header/footer menus etc. @@ -1050,9 +1053,8 @@ class media_admin_ui extends e_admin_ui function navPage() // no functioning correctly - see e_AJAX_REQUEST above. { - - - $bbcodeMode = ($this->getQuery('bbcode')=='img') ? 'bbcode=img' : FALSE; + + $bbcodeMode = ($this->getQuery('bbcode') =='img' ) ? 'bbcode=img' : FALSE; if($_GET['from']) { @@ -1068,11 +1070,26 @@ class media_admin_ui extends e_admin_ui } - + public function ListAjaxObserver() + { + $cat = $this->getQuery('for'); + $file = (preg_match('/_file(_[\d]{1,2})?$/',$cat)) ? true : false; + + if($file === true) // Make sure dialog mode is used when ajax searches occur. + { + $this->setQuery('action','dialog'); + $this->setFileListMode($cat); + } + + $this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, 0, false, $this->listQry))->load(); + } + function dialogPage() // Popup dialogPage for Image Selection. { + + $cat = $this->getQuery('for'); $file = (preg_match('/_file(_[\d]{1,2})?$/',$cat)) ? TRUE : FALSE; $mes = e107::getMessage(); @@ -1091,28 +1108,7 @@ class media_admin_ui extends e_admin_ui if($file) { - $cat = e107::getParser()->toDB($cat); - if(!isset($this->cats[$cat])) - { - return; - } - - $this->listQry = "SELECT m.*,u.user_id,u.user_name FROM #core_media AS m LEFT JOIN #user AS u ON m.media_author = u.user_id WHERE m.media_category = '".$cat."' "; // without any Order or Limit. - - unset($this->fields['checkboxes']); - $this->fields['options']['type'] = 'method'; - $this->fields['media_category']['nolist'] = true; - $this->fields['media_userclass']['nolist'] = true; - $this->fields['media_dimensions']['nolist'] = true; - $this->fields['media_description']['nolist'] = true; - $this->fields['media_type']['nolist'] = true; - - foreach($this->fields as $k=>$v) - { - $this->fields[$k]['filter'] = false; - } - - + $this->setFileListMode($cat); echo $this->mediaSelectUpload('file'); @@ -1121,7 +1117,6 @@ class media_admin_ui extends e_admin_ui echo '
'.IMALAN_167.'
'; - } else { @@ -1130,7 +1125,34 @@ class media_admin_ui extends e_admin_ui } - + private function setFileListMode($cat) + { + $cat = e107::getParser()->toDB($cat); + + if(!isset($this->cats[$cat])) + { + return; + } + + $this->listQry = "SELECT m.*,u.user_id,u.user_name FROM #core_media AS m LEFT JOIN #user AS u ON m.media_author = u.user_id WHERE FIND_IN_SET('".$cat."', m.media_category) "; // without any Order or Limit. + + unset($this->fields['checkboxes']); + $this->fields['options']['type'] = 'method'; + $this->fields['media_category']['nolist'] = true; + $this->fields['media_userclass']['nolist'] = true; + $this->fields['media_dimensions']['nolist'] = true; + $this->fields['media_description']['nolist'] = true; + $this->fields['media_type']['nolist'] = true; + $this->fields['media_url']['nolist'] = true; + $this->fields['media_sef']['nolist'] = true; + + foreach($this->fields as $k=>$v) + { + $this->fields[$k]['filter'] = false; + } + + + } function uploadTab() @@ -2545,7 +2567,7 @@ class media_admin_ui extends e_admin_ui { if(empty($f)) { - e107::getMessage()->addWarning("0 byte file found in: ".e_IMPORT."
Please remove before proceeding."); + e107::getMessage()->addWarning(IMALAN_180." ".e_IMPORT."
".IMALAN_181); ////rename(e_IMPORT.$f['path'].$f['fname'],e_IMPOT.$f['path'].$f['fname']."-bad"); continue; } diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index c2763a822..aa695e51c 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -243,6 +243,7 @@ class mailout_admin extends e_admin_dispatcher 'sent/list' => array('caption'=> LAN_MAILOUT_192, 'perm' => 'W'), 'other2' => array('divider'=> true), 'prefs/prefs' => array('caption'=> LAN_PREFS, 'perm' => '0'), + 'maint/maint' => array('caption'=> ADLAN_40, 'perm' => '0'), 'main/templates' => array('caption'=> LAN_MAILOUT_262, 'perm' => '0'), ); @@ -256,6 +257,19 @@ class mailout_admin extends e_admin_dispatcher protected $adminMenuIcon = 'e-mail-24'; protected $menuTitle = LAN_MAILOUT_15; + + + function init() + { + $mailer = e107::getPref('bulkmailer'); + + if($mailer === 'smtp' ) + { + $this->adminMenu['other3'] = array('divider'=> true); + $this->adminMenu['prefs/test'] =array('caption'=> LAN_MAILOUT_270, 'perm' => '0'); //TODO LAN + } + + } } class mailout_main_ui extends e_admin_ui @@ -603,7 +617,7 @@ class mailout_main_ui extends e_admin_ui $options = array('mailer'=>$pref['bulkmailer']); - if (!e107::getEmail($options)->sendEmail($sendto, LAN_MAILOUT_189, $eml)) + if (e107::getEmail($options)->sendEmail($sendto, LAN_MAILOUT_189, $eml) !== true) { $mes->addError(($pref['bulkmailer'] == 'smtp') ? LAN_MAILOUT_67 : LAN_MAILOUT_106); } @@ -961,8 +975,102 @@ class mailout_main_ui extends e_admin_ui } return $text; - } - + } + + + /** + * @TODO Do NOT translate, this is for debugging ONLY. + * + */ + function testPage() + { + + require_once(e_HANDLER. 'phpmailer/PHPMailerAutoload.php'); + + $smtp = new SMTP; + $smtp->do_debug = SMTP::DEBUG_CONNECTION; + + $mes = e107::getMessage(); + $pref = e107::getPref(); + + $username = $pref['smtp_username']; + $pwd = $pref['smtp_password']; + $port = ($pref['smtp_port'] != 465) ? $pref['smtp_port'] : 25; + + // var_dump($pref['smtp_password']); + // print_a($pref['smtp_password']); + + ob_start(); + + try + { + //Connect to an SMTP server + if(!$smtp->connect($pref['smtp_server'], $port)) + { + $mes->addError('Connect failed'); + } + //Say hello + if(!$smtp->hello(gethostname())) + { + $mes->addError('EHLO failed: ' . $smtp->getError()['error']); + } + //Get the list of ESMTP services the server offers + $e = $smtp->getServerExtList(); + //If server can do TLS encryption, use it + if(is_array($e) && array_key_exists('STARTTLS', $e)) + { + $mes->addSuccess("TLS is supported. "); + $tlsok = $smtp->startTLS(); + if(!$tlsok) + { + $mes->addError('Failed to start encryption: ' . $smtp->getError()['error']); + } + //Repeat EHLO after STARTTLS + if(!$smtp->hello(gethostname())) + { + $mes->addError('EHLO (2) failed: ' . $smtp->getError()['error']); + } + //Get new capabilities list, which will usually now include AUTH if it didn't before + $e = $smtp->getServerExtList(); + } + else + { + $mes->addWarning("TLS is not supported. "); + + } + //If server supports authentication, do it (even if no encryption) + if(is_array($e) && array_key_exists('AUTH', $e)) + { + if($smtp->authenticate($username, $pwd)) + { + $mes->addSuccess("Connected ok!"); + } + else + { + $msg = e107::getParser()->lanVars(LAN_MAILOUT_271,array('x'=>$username, 'y'=>$pwd), true); + $mes->addError($msg . $smtp->getError()['error']); + } + } + } + catch(Exception $e) + { + $mes->addError('SMTP error: ' . $e->getMessage()); + } + //Whatever happened, close the connection. + $smtp->quit(true); + + $content = ob_get_contents(); + + ob_end_clean(); + + print_a($content); + + } + + + + + function sendPage() { diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index a1e74f8e0..d987cbb92 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -1154,7 +1154,7 @@ $text .= " - ".$frm->tags('profanity_words', $pref['profanity_words'])." + ".$frm->tags('profanity_words', $pref['profanity_words'], 250, array('maxItems'=>40))."
".PRFLAN_44."
diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index 2329b9fd4..145983a3f 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -594,6 +594,20 @@ function update_core_database($type = '') e107::getPlugin()->refresh('social'); } + + if(empty($pref['themecss'])) // FIX + { + if($just_check) + { + return update_needed("Theme CSS pref value is blank."); + } + + e107::getConfig()->set('themecss','style.css')->save(false,true,false); + } + + + + return $just_check; // List of changed menu locations. diff --git a/e107_admin/users.php b/e107_admin/users.php index a1bae866d..25e7f5783 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -1771,7 +1771,7 @@ class users_admin_ui extends e_admin_ui 'rankName' => array('title' => USRLAN_208, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'class' => 'left'), 'lowThresh' => array('title' => USRLAN_209, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'class' => 'left'), 'langPrefix' => array('title' => USRLAN_210, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'class' => 'left'), - 'rankImage' => array('title' => USRLAN_210, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'class' => 'left'), + 'rankImage' => array('title' => USRLAN_211, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'class' => 'left'), ); diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php index a95551abb..f597658a3 100644 --- a/e107_core/shortcodes/batch/news_shortcodes.php +++ b/e107_core/shortcodes/batch/news_shortcodes.php @@ -1087,7 +1087,7 @@ class news_shortcodes extends e_shortcode { if(trim($val)) { - $url = e107::getUrl()->create('news/list/tag',array('tag'=>$val)); // e_BASE."news.php?tag=".$val + $url = e107::getUrl()->create('news/list/tag',array('tag'=>rawurlencode($val))); // e_BASE."news.php?tag=".$val $words[] = "".$start.$val.$end.""; } } diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php index d69593873..6db33f753 100644 --- a/e107_core/templates/header_default.php +++ b/e107_core/templates/header_default.php @@ -31,18 +31,17 @@ e107::getTheme('current', true)->loadLibrary(); if(deftrue('BOOTSTRAP')) { - e107::js('core', 'bootstrap-notify/js/bootstrap-notify.js','jquery'); - e107::css('core', 'bootstrap-notify/css/bootstrap-notify.css','jquery'); + e107::js('footer', '{e_WEB}js/bootstrap-notify/js/bootstrap-notify.js', 'jquery', 2); + e107::css('core', 'bootstrap-notify/css/bootstrap-notify.css', 'jquery'); } // ------------------ -// e107::js('core', 'jquery.elastic.js', 'jquery', 2); -e107::js('core', 'rate/js/jquery.raty.js', 'jquery', 2); -e107::css('core', 'core/all.jquery.css', 'jquery'); +e107::js('footer', '{e_WEB}js/rate/js/jquery.raty.js', 'jquery', 2); +e107::css('core', 'core/all.jquery.css', 'jquery'); -e107::js("core", "core/front.jquery.js","jquery",5); // Load all default functions. -e107::js("core", "core/all.jquery.js","jquery",5); // Load all default functions. +e107::js('footer', '{e_WEB}js/core/front.jquery.js', 'jquery', 5); // Load all default functions. +e107::js('footer', '{e_WEB}js/core/all.jquery.js', 'jquery', 5); // Load all default functions. $js_body_onload = array(); // Legacy array of code to load with page. @@ -163,7 +162,8 @@ if ($e_headers && is_array($e_headers)) } unset($e_headers); -echo e107::getUrl()->response()->renderMeta()."\n"; // render all the e107::meta() entries. +// echo e107::getUrl()->response()->renderMeta()."\n"; // render all the e107::meta() entries. +echo e107::getSingleton('eResponse')->renderMeta()."\n"; echo "".(defined('e_PAGETITLE') ? e_PAGETITLE.' - ' : (defined('PAGE_NAME') ? PAGE_NAME.' - ' : "")).SITENAME."\n\n"; @@ -490,8 +490,15 @@ function render_meta($type) } // legay meta-tag checks. +/* $isKeywords = e107::getUrl()->response()->getMetaKeywords(); $isDescription = e107::getUrl()->response()->getMetaDescription(); +*/ + +$isKeywords = e107::getSingleton('eResponse')->getMetaKeywords(); +$isDescription = e107::getSingleton('eResponse')->getMetaDescription(); + + if(empty($isKeywords)) { echo (defined("META_KEYWORDS")) ? "\n\n" : render_meta('keywords'); diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml index 57ed03112..9405d172e 100644 --- a/e107_core/xml/default_install.xml +++ b/e107_core/xml/default_install.xml @@ -1208,7 +1208,7 @@ City, State, Country 1 Misc - + misc 254 diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index 5d28eabfc..e7f0ba1f8 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -6663,7 +6663,7 @@ class e_admin_form_ui extends e_form ".$this->text('searchquery', $current_query[0], 50, $input_options)." - + ".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>LAN_FILTER))." ".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')." ".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')." @@ -6731,13 +6731,12 @@ class e_admin_form_ui extends e_form ",'prototype'); // TODO implement ajax queue - // FIXME - dirty way to register events after ajax update - DO IT RIGHT - see all.jquery, create object - // and use handler, re-register them global after ajax update (context) + // FIXME + // dirty way to register events after ajax update - DO IT RIGHT - see all.jquery, create object and use handler, + // re-register them global after ajax update (context)... use behaviors and call e107.attachBehaviors(); e107::js('footer-inline'," var filterRunning = false, request; var applyAfterAjax = function(context) { - \$('.e-hideme', context).hide(); - \$('.e-expandit', context).show(); \$('.e-expandit', context).click(function () { var href = (\$(this).is('a')) ? \$(this).attr('href') : ''; if(href == '' && \$(this).attr('data-target')) @@ -6786,7 +6785,10 @@ class e_admin_form_ui extends e_form return; } cont.html(data).css({ opacity: 1 }); + // TODO remove applyAfterAjax() and use behaviors! applyAfterAjax(cont); + // Attach behaviors to the newly loaded contents. + e107.attachBehaviors(); }, 700); }, 'html') .error(function() { @@ -7256,6 +7258,7 @@ class e_admin_form_ui extends e_form */ public function getController() { + return $this->_controller; } } diff --git a/e107_handlers/application.php b/e107_handlers/application.php index edda9f97a..3a5f3b85b 100644 --- a/e107_handlers/application.php +++ b/e107_handlers/application.php @@ -389,7 +389,8 @@ class eFront $router = new eRouter(); $this->setRouter($router); - $response = new eResponse(); + // $response = new eResponse(); + $response = e107::getSingleton('eResponse'); $this->setResponse($response); return $this; @@ -4273,8 +4274,8 @@ class eResponse $attrData = ''; e107::getEvent()->trigger('system_meta_pre'); - - foreach ($this->_meta as $attr) + + foreach ($this->_meta as $attr) { $attrData .= ' $v) diff --git a/e107_handlers/cron_class.php b/e107_handlers/cron_class.php index 95b302cc9..b317ea8d6 100644 --- a/e107_handlers/cron_class.php +++ b/e107_handlers/cron_class.php @@ -920,4 +920,324 @@ class CronParser } } -?> \ No newline at end of file + + +/** + * Class cronScheduler. + * + * @see cron.php + * + * TODO: + * - Log error in admin log. + * - Pref for sending email to Administrator. + * - LANs + */ +class cronScheduler +{ + + /** + * Cron parser class. + * + * @var \CronParser. + */ + private $cron; + + /** + * Debug mode. + * + * @var bool + */ + private $debug; + + /** + * System preferences. + * + * @var array|mixed + */ + private $pref; + + /** + * Constructor. + */ + public function __construct() + { + global $_E107, $pref; + + $this->cron = new CronParser(); + $this->debug = $_E107['debug']; + $this->pref = $pref; + } + + /** + * Runs all cron jobs. + * + * @return bool + */ + public function run() + { + $valid = $this->validateToken(); + + if(!$valid) + { + return false; + } + + @file_put_contents(e_CACHE . 'cronLastLoad.php', time()); + + // Get active cron jobs. + $cron_jobs = $this->getCronJobs(true); + + if($this->debug && $_SERVER['QUERY_STRING']) + { + echo "

Cron Lists

"; + print_a($cron_jobs); + } + + foreach($cron_jobs as $job) + { + $this->runJob($job); + } + } + + /** + * Runs a cron job. + * + * @param array $job + * Contains the current cron job. Each element is an array with following + * properties: + * - 'path' string '_system' or plugin name. + * - 'active' int 1 if active, 0 if inactive + * - 'tab' string cron tab + * - 'function' string function name + * - 'class' string class name + * + * @return bool $status + */ + public function runJob($job) + { + $status = false; + + if(empty($job['active'])) + { + return $status; + } + + // Calculate the last due time before this moment. + $this->cron->calcLastRan($job['tab']); + $due = $this->cron->getLastRanUnix(); + + if($this->debug) + { + echo "
Cron: " . $job['function']; + } + + if($due <= (time() - 45)) + { + return $status; + } + + if($job['path'] != '_system' && !is_readable(e_PLUGIN . $job['path'] . "/e_cron.php")) + { + return $status; + } + + if($this->debug) + { + echo "
Running Now...
path: " . $job['path']; + } + + // This is correct. + if($job['path'] != '_system') + { + include_once(e_PLUGIN . $job['path'] . "/e_cron.php"); + } + + $class = $job['class'] . "_cron"; + + if(!class_exists($class, false)) + { + if($this->debug) + { + echo "
Couldn't find class: " . $class; + } + + return $status; + } + + $obj = new $class; + + if(!method_exists($obj, $job['function'])) + { + if($this->debug) + { + echo "
Couldn't find method: " . $job['function']; + } + + return $status; + } + + if($this->debug) + { + echo "
Method Found: " . $class . "::" . $job['function'] . "()"; + } + + // Exception handling. + $method = $job['function']; + + try + { + $status = $obj->$method(); + } catch(Exception $e) + { + $msg = $e->getFile() . ' ' . $e->getLine(); + $msg .= "\n\n" . $e->getCode() . '' . $e->getMessage(); + $msg .= "\n\n" . implode("\n", $e->getTrace()); + + $mail = array( + 'to_mail' => $this->pref['siteadminemail'], + 'to_name' => $this->pref['siteadmin'], + 'from_mail' => $this->pref['siteadminemail'], + 'from_name' => $this->pref['siteadmin'], + 'message' => $msg, + 'subject' => 'e107 - Cron Schedule Exception', + ); + + $this->sendMail($mail); + } + + // If task returns value which is not boolean (BC), it will be used as a + // message (send email, logs). + if($status && true !== $status) + { + if($this->debug) + { + echo "
Method returned message: [{$class}::" . $job['function'] . '] ' . $status; + } + + $msg = 'Method returned message: [{' . $class . '}::' . $job['function'] . '] ' . $status; + + $mail = array( + 'to_mail' => $this->pref['siteadminemail'], + 'to_name' => $this->pref['siteadmin'], + 'from_mail' => $this->pref['siteadminemail'], + 'from_name' => $this->pref['siteadmin'], + 'message' => $msg, + 'subject' => 'e107 - Cron Schedule Task Report', + ); + + $this->sendMail($mail); + } + + return $status; + } + + /** + * Validate Cron Token. + * + * @return bool + */ + public function validateToken() + { + $pwd = ($this->debug && $_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : trim($_SERVER['argv'][1]); + + if(!empty($_GET['token'])) + { + $pwd = e107::getParser()->filter($_GET['token']); + } + else + { + $pwd = str_replace('token=', '', $pwd); + } + + if(($this->pref['e_cron_pwd'] != $pwd) || empty($this->pref['e_cron_pwd'])) + { + if(!empty($pwd)) + { + $msg = "Your Cron Schedule is not configured correctly. Your passwords do not match."; + $msg .= "

"; + $msg .= "Sent from cron: " . $pwd; + $msg .= "
"; + $msg .= "Stored in e107: " . $this->pref['e_cron_pwd']; + $msg .= "

"; + $msg .= "You should regenerate the cron command in admin and enter it again in your server configuration."; + + $msg .= "

" . "Debug Info" . "

"; + $msg .= "

_SERVER

"; + $msg .= print_a($_SERVER, true); + $msg .= "

_ENV

"; + $msg .= print_a($_ENV, true); + $msg .= "

_GET

"; + $msg .= print_a($_GET, true); + + $mail = array( + 'to_mail' => $this->pref['siteadminemail'], + 'to_name' => $this->pref['siteadmin'], + 'from_mail' => $this->pref['siteadminemail'], + 'from_name' => $this->pref['siteadmin'], + 'message' => $msg, + 'subject' => 'e107 - Cron Schedule Misconfigured', + ); + + $this->sendMail($mail); + } + + return false; + } + + return true; + } + + /** + * Get available Cron jobs. + * + * @param bool $only_active + * Set to TRUE for active cron jobs. + * + * @return array + * Array contains cron jobs. + */ + public function getCronJobs($only_active = false) + { + $list = array(); + + $sql = e107::getDb(); + + $where = '1'; + + if($only_active === true) + { + $where = 'cron_active = 1'; + } + + if($sql->select("cron", 'cron_function,cron_tab,cron_active', $where)) + { + while($row = $sql->fetch()) + { + list($class, $function) = explode("::", $row['cron_function'], 2); + $key = $class . "__" . $function; + + $list[$key] = array( + 'path' => $class, + 'active' => $row['cron_active'], + 'tab' => $row['cron_tab'], + 'function' => $function, + 'class' => $class, + ); + } + } + + return $list; + } + + /** + * Helper method to send email message. + * + * @param array $mail + */ + public function sendMail($mail) + { + require_once(e_HANDLER . "mail.php"); + sendemail($mail['to_mail'], $mail['subject'], $mail['message'], $mail['to_name'], $mail['from_mail'], $mail['from_name']); + } + +} diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index d7f012f5d..9b6658235 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -2276,17 +2276,20 @@ class e107 */ public static function meta($name = null, $content = null, $extended = array()) { + $response = self::getSingleton('eResponse'); + if($name === 'description') { - self::getUrl()->response()->addMetaDescription($content); //Cam: TBD + $response->addMetaDescription($content); //Cam: TBD } if($name === 'keywords') { - self::getUrl()->response()->addMetaKeywords($content); //Cam: TBD + $response->addMetaKeywords($content); //Cam: TBD } - - return self::getUrl()->response()->addMeta($name, $content, $extended); + + return $response->addMeta($name, $content, $extended); + // return self::getUrl()->response()->addMeta($name, $content, $extended); } /** diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index b877690e3..54982dc64 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -852,13 +852,11 @@ class e_form $mlength = vartrue($maxlength) ? "maxlength=".$maxlength : ""; - $min = varset($options['min']) ? 'min="'.$options['min'].'"' : ''; - $max = vartrue($options['max']) ? 'max="'.$options['max'].'"' : ''; + $min = isset($options['min']) ? 'min="'.$options['min'].'"' : ''; + $max = isset($options['max']) ? 'max="'.$options['max'].'"' : ''; $options = $this->format_options('text', $name, $options); - - //never allow id in format name-value for text fields if(THEME_LEGACY === false) { @@ -1028,7 +1026,7 @@ class e_form if($localonly == true) { $text = ""; - $text .= "Click on the avatar to change it"; + $text .= "".LAN_EFORM_001.""; } else { @@ -1205,9 +1203,12 @@ class e_form { $ret = "
"; $thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $default_thumb; - $label = "
"; - $label .= $tp->toIcon($default_url); + $label = "
"; + $label .= $tp->toIcon($default_url,array('class'=>'img-responsive img-fluid')); + + //$label = "
"; + //$label .= $tp->toIcon($default_url); $label .= "
"; @@ -1428,11 +1429,10 @@ class e_form $text .= ""; } - // Load it in the footer. - // FIXME use Library Manager (e107::library()) instead? + // TODO use Library Manager... e107::css('core', 'bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css', 'jquery'); - e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2); - e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.init.js', 'jquery', 2); + e107::js('footer', '{e_WEB}js/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 4); + e107::js('footer', '{e_WEB}js/bootstrap-datetimepicker/js/bootstrap-datetimepicker.init.js', 'jquery', 5); if(e_LANGUAGE !== 'English') { @@ -1835,7 +1835,7 @@ class e_form public function pagination($url='', $total=0, $from=0, $perPage=10, $options=array()) { - if(empty($total)) + if(empty($total) || empty($perPage)) { return ''; } @@ -2709,9 +2709,9 @@ class e_form - if(is_array($filter)) + if(is_array($filterArray)) { - $text .= $this->selectbox($$filterName, $filterArray, $filterVal); + $text .= $this->selectbox($filterName, $filterArray, $filterVal); } // $text .= $this->admin_button($submitName,LAN_SEARCH,'search'); @@ -4129,9 +4129,16 @@ class e_form } */ + $sf = $this->getController()->getSortField(); + + if(!isset($parms['sort']) && !empty($sf)) + { + $parms['sort'] = true; + } + $value = "
"; - if(!empty($parms['sort']) && empty($attributes['grid']))//FIXME use a global variable such as $fieldpref + if(!empty($parms['sort']) && empty($attributes['grid'])) { $mode = preg_replace('/[^\w]/', '', vartrue($_GET['mode'], '')); $from = intval(vartrue($_GET['from'],0)); @@ -5670,8 +5677,9 @@ class e_form else { $lenabled = vartrue($parms['enabled'], 'LAN_ON'); - $ldisabled = vartrue($parms['disabled'], 'LAN_OFF'); + $ldisabled = (!empty($parms['disabled']) && is_string($parms['disabled'])) ? $parms['disabled'] : 'LAN_OFF'; } + unset($parms['enabled'], $parms['disabled'], $parms['label']); $ret = vartrue($parms['pre']).$this->radio_switch($key, $value, defset($lenabled, $lenabled), defset($ldisabled, $ldisabled),$parms).vartrue($parms['post']); break; diff --git a/e107_handlers/mail.php b/e107_handlers/mail.php index 180955801..d54a22154 100644 --- a/e107_handlers/mail.php +++ b/e107_handlers/mail.php @@ -297,11 +297,11 @@ class e107Email extends PHPMailer { case 'TLS' : $this->SMTPSecure = 'tls'; - $this->Port = $smtpPort; // Can also use port 587, and maybe even 25 + $this->Port = ($smtpPort != 465) ? $smtpPort : 25; // Can also use port 587, and maybe even 25 break; case 'SSL' : $this->SMTPSecure = 'ssl'; - $this->Port = $smtpPort; + $this->Port = ($smtpPort != 587) ? $smtpPort : 465; break; default : if ($this->debug) echo "Invalid option: {$smtp_options['secure']}
"; @@ -1071,10 +1071,13 @@ class e107Email extends PHPMailer if(!empty($eml['SMTPDebug'])) { e107::getMessage()->addError($this->ErrorInfo); + $tmp = $this; + $tmp->pref = array(); + e107::getMessage()->addDebug(print_a($tmp,true)); } } - - + + $this->clearAddresses(); // In case we send another email $this->clearCustomHeaders(); diff --git a/e107_handlers/mail_manager_class.php b/e107_handlers/mail_manager_class.php index 59a93c0db..dbe23f11e 100644 --- a/e107_handlers/mail_manager_class.php +++ b/e107_handlers/mail_manager_class.php @@ -231,7 +231,7 @@ class e107MailManager $this->mailOverrides = $overrides; - if(deftrue('e_DEBUG')) + if(deftrue('e_DEBUG_BULKMAIL')) { $this->debugMode = true; } diff --git a/e107_handlers/mysql_class.php b/e107_handlers/mysql_class.php index c4e6ed2db..902037264 100644 --- a/e107_handlers/mysql_class.php +++ b/e107_handlers/mysql_class.php @@ -2679,7 +2679,7 @@ class e_db_mysql $header = "-- e107 Database Backup File \n"; $header .= "-- Host: ".$_SERVER['SERVER_NAME']."\n"; $header .= "-- Generation Time: ".date('r')."\n"; - $header .= "-- Encoding: ANSI\n\n\n"; + $header .= "-- Encoding: UTF-8\n\n\n"; file_put_contents($backupFile,$header, FILE_APPEND); @@ -2710,12 +2710,12 @@ class e_db_mysql $d = array(); foreach($fields as $val) { - $d[] = is_numeric($row[$val]) ? $row[$val] : "'".mysqli_real_escape_string($row[$val])."'"; + $d[] = is_numeric($row[$val]) ? $row[$val] : "'".$this->escape($row[$val])."'"; } $data_array = "(".implode(", ",$d).");\n"; file_put_contents($backupFile, $data_array, FILE_APPEND); // Do this here to save memory. - + } $text = "\n\n\n"; diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php index e30784685..78c6bb83d 100644 --- a/e107_handlers/news_class.php +++ b/e107_handlers/news_class.php @@ -272,8 +272,8 @@ class news { $tmp = array(); $tmp['caticon'] = defset('ICONSTYLE'); - $tmp['commentoffstring'] = defset('COMMENTOFFSTRING'); - $tmp['commentlink'] = defset('COMMENTLINK'); + $tmp['commentoffstring'] = defset('COMMENTOFFSTRING', ''); + $tmp['commentlink'] = defset('COMMENTLINK', e107::getParser()->toGlyph('fa-comment')); $tmp['trackbackstring'] = defset('TRACKBACKSTRING'); $tmp['trackbackbeforestring'] = defset('TRACKBACKBEFORESTRING'); $tmp['trackbackafterstring'] = defset('TRACKBACKAFTERSTRING'); diff --git a/e107_handlers/phpmailer/class.phpmailer.php b/e107_handlers/phpmailer/class.phpmailer.php index 8ff13f110..1b31ec14c 100644 --- a/e107_handlers/phpmailer/class.phpmailer.php +++ b/e107_handlers/phpmailer/class.phpmailer.php @@ -31,7 +31,7 @@ class PHPMailer * The PHPMailer Version number. * @var string */ - public $Version = '5.2.21'; + public $Version = '5.2.23'; /** * Email priority. @@ -2492,6 +2492,7 @@ class PHPMailer /** * Add an attachment from a path on the filesystem. + * Never use a user-supplied path to a file! * Returns false if the file could not be found or read. * @param string $path Path to the attachment. * @param string $name Overrides the attachment name. @@ -3017,6 +3018,7 @@ class PHPMailer * displayed inline with the message, not just attached for download. * This is used in HTML messages that embed the images * the HTML refers to using the $cid value. + * Never use a user-supplied path to a file! * @param string $path Path to the attachment. * @param string $cid Content ID of the attachment; Use this to reference * the content when using an embedded image in HTML. @@ -3380,12 +3382,14 @@ class PHPMailer * Create a message body from an HTML string. * Automatically inlines images and creates a plain-text version by converting the HTML, * overwriting any existing values in Body and AltBody. - * $basedir is used when handling relative image paths, e.g. + * Do not source $message content from user input! + * $basedir is prepended when handling relative URLs, e.g. and must not be empty * will look for an image file in $basedir/images/a.png and convert it to inline. - * If you don't want to apply these transformations to your HTML, just set Body and AltBody yourself. + * If you don't provide a $basedir, relative paths will be left untouched (and thus probably break in email) + * If you don't want to apply these transformations to your HTML, just set Body and AltBody directly. * @access public * @param string $message HTML message string - * @param string $basedir base directory for relative paths to images + * @param string $basedir Absolute path to a base directory to prepend to relative paths to images * @param boolean|callable $advanced Whether to use the internal HTML to text converter * or your own custom converter @see PHPMailer::html2text() * @return string $message The transformed message Body @@ -3394,6 +3398,10 @@ class PHPMailer { preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images); if (array_key_exists(2, $images)) { + if (strlen($basedir) > 1 && substr($basedir, -1) != '/') { + // Ensure $basedir has a trailing / + $basedir .= '/'; + } foreach ($images[2] as $imgindex => $url) { // Convert data URIs into embedded images if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) { @@ -3411,18 +3419,24 @@ class PHPMailer $message ); } - } elseif (substr($url, 0, 4) !== 'cid:' && !preg_match('#^[a-z][a-z0-9+.-]*://#i', $url)) { - // Do not change urls for absolute images (thanks to corvuscorax) + continue; + } + if ( + // Only process relative URLs if a basedir is provided (i.e. no absolute local paths) + !empty($basedir) + // Ignore URLs containing parent dir traversal (..) + && (strpos($url, '..') === false) // Do not change urls that are already inline images + && substr($url, 0, 4) !== 'cid:' + // Do not change absolute URLs, including anonymous protocol + && !preg_match('#^[a-z][a-z0-9+.-]*:?//#i', $url) + ) { $filename = basename($url); $directory = dirname($url); if ($directory == '.') { $directory = ''; } $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2 - if (strlen($basedir) > 1 && substr($basedir, -1) != '/') { - $basedir .= '/'; - } if (strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; } diff --git a/e107_handlers/phpmailer/class.pop3.php b/e107_handlers/phpmailer/class.pop3.php index 373c886cd..c464f90c6 100644 --- a/e107_handlers/phpmailer/class.pop3.php +++ b/e107_handlers/phpmailer/class.pop3.php @@ -34,7 +34,7 @@ class POP3 * @var string * @access public */ - public $Version = '5.2.21'; + public $Version = '5.2.23'; /** * Default POP3 port number. diff --git a/e107_handlers/phpmailer/class.smtp.php b/e107_handlers/phpmailer/class.smtp.php index 270162b26..01cee8209 100644 --- a/e107_handlers/phpmailer/class.smtp.php +++ b/e107_handlers/phpmailer/class.smtp.php @@ -30,7 +30,7 @@ class SMTP * The PHPMailer SMTP version number. * @var string */ - const VERSION = '5.2.21'; + const VERSION = '5.2.23'; /** * SMTP line break constant. @@ -81,7 +81,7 @@ class SMTP * @deprecated Use the `VERSION` constant instead * @see SMTP::VERSION */ - public $Version = '5.2.21'; + public $Version = '5.2.23'; /** * SMTP server port number. @@ -150,16 +150,16 @@ class SMTP */ public $Timelimit = 300; - /** - * @var array patterns to extract smtp transaction id from smtp reply - * Only first capture group will be use, use non-capturing group to deal with it - * Extend this class to override this property to fulfil your needs. - */ - protected $smtp_transaction_id_patterns = array( - 'exim' => '/[0-9]{3} OK id=(.*)/', - 'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/', - 'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/' - ); + /** + * @var array patterns to extract smtp transaction id from smtp reply + * Only first capture group will be use, use non-capturing group to deal with it + * Extend this class to override this property to fulfil your needs. + */ + protected $smtp_transaction_id_patterns = array( + 'exim' => '/[0-9]{3} OK id=(.*)/', + 'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/', + 'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/' + ); /** * The socket for the server connection. @@ -231,8 +231,7 @@ class SMTP preg_replace('/[\r\n]+/', '', $str), ENT_QUOTES, 'UTF-8' - ) - . "
\n"; + ) . "
\n"; break; case 'echo': default: @@ -242,7 +241,7 @@ class SMTP "\n", "\n \t ", trim($str) - )."\n"; + ) . "\n"; } } @@ -276,7 +275,8 @@ class SMTP } // Connect to the SMTP server $this->edebug( - "Connection: opening to $host:$port, timeout=$timeout, options=".var_export($options, true), + "Connection: opening to $host:$port, timeout=$timeout, options=" . + var_export($options, true), self::DEBUG_CONNECTION ); $errno = 0; @@ -362,14 +362,14 @@ class SMTP } // Begin encrypted connection - if (!stream_socket_enable_crypto( + set_error_handler(array($this, 'errorHandler')); + $crypto_ok = stream_socket_enable_crypto( $this->smtp_conn, true, $crypto_method - )) { - return false; - } - return true; + ); + restore_error_handler(); + return $crypto_ok; } /** @@ -398,8 +398,7 @@ class SMTP } if (array_key_exists('EHLO', $this->server_caps)) { - // SMTP extensions are available. Let's try to find a proper authentication method - + // SMTP extensions are available; try to find a proper authentication method if (!array_key_exists('AUTH', $this->server_caps)) { $this->setError('Authentication is not allowed at this stage'); // 'at this stage' means that auth may be allowed after the stage changes @@ -424,7 +423,7 @@ class SMTP $this->setError('No supported authentication methods found'); return false; } - self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL); + self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL); } if (!in_array($authtype, $this->server_caps['AUTH'])) { @@ -550,7 +549,7 @@ class SMTP * Works like hash_hmac('md5', $data, $key) * in case that function is not available * @param string $data The data to hash - * @param string $key The key to hash with + * @param string $key The key to hash with * @access protected * @return string */ @@ -893,7 +892,8 @@ class SMTP $code_ex = (count($matches) > 2 ? $matches[2] : null); // Cut off error code from each response line $detail = preg_replace( - "/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m", + "/{$code}[ -]" . + ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . "/m", '', $this->last_reply ); @@ -1105,7 +1105,7 @@ class SMTP // Now check if reads took too long if ($endtime and time() > $endtime) { $this->edebug( - 'SMTP -> get_lines(): timelimit reached ('. + 'SMTP -> get_lines(): timelimit reached (' . $this->Timelimit . ' sec)', self::DEBUG_LOWLEVEL ); @@ -1208,42 +1208,44 @@ class SMTP * Reports an error number and string. * @param integer $errno The error number returned by PHP. * @param string $errmsg The error message returned by PHP. + * @param string $errfile The file the error occurred in + * @param integer $errline The line number the error occurred on */ - protected function errorHandler($errno, $errmsg) + protected function errorHandler($errno, $errmsg, $errfile = '', $errline = 0) { - $notice = 'Connection: Failed to connect to server.'; + $notice = 'Connection failed.'; $this->setError( $notice, $errno, $errmsg ); $this->edebug( - $notice . ' Error number ' . $errno . '. "Error notice: ' . $errmsg, + $notice . ' Error #' . $errno . ': ' . $errmsg . " [$errfile line $errline]", self::DEBUG_CONNECTION ); } - /** - * Will return the ID of the last smtp transaction based on a list of patterns provided - * in SMTP::$smtp_transaction_id_patterns. - * If no reply has been received yet, it will return null. - * If no pattern has been matched, it will return false. - * @return bool|null|string - */ - public function getLastTransactionID() - { - $reply = $this->getLastReply(); + /** + * Will return the ID of the last smtp transaction based on a list of patterns provided + * in SMTP::$smtp_transaction_id_patterns. + * If no reply has been received yet, it will return null. + * If no pattern has been matched, it will return false. + * @return bool|null|string + */ + public function getLastTransactionID() + { + $reply = $this->getLastReply(); - if (empty($reply)) { - return null; - } + if (empty($reply)) { + return null; + } - foreach($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) { - if(preg_match($smtp_transaction_id_pattern, $reply, $matches)) { - return $matches[1]; - } - } + foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) { + if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) { + return $matches[1]; + } + } - return false; + return false; } } diff --git a/e107_handlers/pref_class.php b/e107_handlers/pref_class.php index f169dc387..71b1cee00 100644 --- a/e107_handlers/pref_class.php +++ b/e107_handlers/pref_class.php @@ -469,10 +469,10 @@ class e_pref extends e_front_model $id = $this->prefid; $data = $force ? false : $this->getPrefCache(true); - if($data !== false) + if(!empty($data)) { $this->pref_cache = e107::getArrayStorage()->WriteArray($data, false); //runtime cache - $this->loadData($data, false); + $this->loadData((array) $data, false); return $this; } diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php index 64ce05122..993738304 100644 --- a/e107_handlers/shortcode_handler.php +++ b/e107_handlers/shortcode_handler.php @@ -814,7 +814,8 @@ class e_parse_shortcode if(isset($this->editableCodes['perms']) && getperms($this->editableCodes['perms'])) { - e107::js('core', 'jquery.contenteditable.js', 'jquery'); + // TODO use Library Manager... + e107::js('footer', '{e_WEB}js/jquery.contenteditable.js', 'jquery', 2); $_SESSION['editable'][e_TOKEN] = $this->editableCodes; diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 3179360f0..c8d3a0abd 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -198,6 +198,9 @@ define("ADLAN_171", "Install Site Stats Plugin"); define("ADLAN_185", "Toggle Sidebar"); define("ADLAN_186", "The following old files can be safely deleted from your system:"); +define("ADLAN_187", "Unable to create [x]. Please check your folder permissions."); +define("ADLAN_188", "Your timezone setting [x] is invalid. It has been reset to UTC. To Modify, please go to Admin -> Preferences -> Date Display Options."); +define("ADLAN_189", "The following plugins are not compatible with this version of e107 and should be uninstalled: "); // define("ADLAN_CL_1", "Settings"); define("ADLAN_CL_2", "Users"); @@ -516,6 +519,7 @@ define("LAN_PERSONALIZE", "Personalize"); define("LAN_SETTINGS_NOT_SAVED_NO_CHANGES_MADE", "Settings not saved as no changes were made."); define("LAN_DASHBOARD_LAYOUT", "Dashboard Layout"); define("LAN_UNAVAILABLE", "Unavailable"); +define("LAN_UNINSTALL", "Uninstall"); define("LAN_NO_LABEL_PROVIDED", "No Label Provided"); define("LAN_NOT_FOUND", "Not Found!"); define("LAN_FIELD", "Field"); diff --git a/e107_languages/English/admin/lan_image.php b/e107_languages/English/admin/lan_image.php index 7b4a462be..b83fb2c68 100644 --- a/e107_languages/English/admin/lan_image.php +++ b/e107_languages/English/admin/lan_image.php @@ -199,5 +199,6 @@ define("IMALAN_177", "Click here for more information and to enter your api key" define("IMALAN_178", "Avatars Folder (user selectable)"); define("IMALAN_179", "Avatars Folder (private)"); - +define('IMALAN_180', "0 byte file found in:"); +define("IMALAN_181", "Please remove before proceeding."); diff --git a/e107_languages/English/admin/lan_mailout.php b/e107_languages/English/admin/lan_mailout.php index 12716aff4..77fa06d04 100644 --- a/e107_languages/English/admin/lan_mailout.php +++ b/e107_languages/English/admin/lan_mailout.php @@ -291,4 +291,10 @@ define("LAN_MAILOUT_267", "Generate Public/Private keys"); define("LAN_MAILOUT_268", "Developer Mode Only"); define("LAN_MAILOUT_269", "Send Later"); -?> +define("LAN_MAILOUT_270", "Test SMTP Connection"); +define("LAN_MAILOUT_271", "Authentication failed with username ([x]) and password ([y]):"); + + + + +?> \ No newline at end of file diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php index f20fd3e55..7a07c71d7 100644 --- a/e107_languages/English/lan_signup.php +++ b/e107_languages/English/lan_signup.php @@ -160,3 +160,4 @@ define("LAN_SIGNUP_117", "Send a Test Activation"); define("LAN_SIGNUP_118", "To [x]"); define("LAN_SIGNUP_119", "Don't send email"); define("LAN_SIGNUP_120", "OR"); +define("LAN_SIGNUP_121", "Use a different email address"); diff --git a/e107_plugins/download/download.php b/e107_plugins/download/download.php index c625c46d2..d13ed7c5d 100644 --- a/e107_plugins/download/download.php +++ b/e107_plugins/download/download.php @@ -21,8 +21,12 @@ if (!e107::isInstalled('download')) e107::lan('download',false, true); // Loads e_PLUGIN.'download/languages/'.e_LANGUAGE.'/English_front.php' $bcList = array( - 'LAN_dl_19' => 'LAN_CATEGORY', + 'LAN_dl_7' => 'LAN_DESCRIPTION', + 'LAN_dl_10' => 'LAN_SIZE', + 'LAN_dl_11' => 'LAN_IMAGE', 'LAN_dl_17' => 'LAN_FILES', + 'LAN_dl_18' => 'LAN_PLUGIN_DOWNLOAD_NAME', + 'LAN_dl_19' => 'LAN_CATEGORY', "LAN_dl_20" => "LAN_FILES", "LAN_dl_21" => "LAN_SIZE", "LAN_dl_22" => "LAN_DATE", @@ -31,7 +35,9 @@ if (!e107::isInstalled('download')) "LAN_dl_25" => "LAN_ASCENDING", "LAN_dl_26" => "LAN_DESCENDING", "LAN_dl_27" => "LAN_GO", - "LAN_dl_28" => "LAN_NAME" + "LAN_dl_28" => "LAN_NAME", + 'LAN_dl_32' => "LAN_DOWNLOAD", + 'LAN_dl_35' => "LAN_BACK", ); e107::getLanguage()->bcDefs($bcList); diff --git a/e107_plugins/featurebox/admin_config.php b/e107_plugins/featurebox/admin_config.php index 77fc29dbb..01ba0a291 100644 --- a/e107_plugins/featurebox/admin_config.php +++ b/e107_plugins/featurebox/admin_config.php @@ -38,10 +38,10 @@ class fb_admin extends e_admin_dispatcher ); protected $adminMenu = array( - 'main/list' => array('caption'=> 'Featurebox List', 'perm' => 'P'), + 'main/list' => array('caption'=> LAN_MANAGE, 'perm' => 'P'), 'main/create' => array('caption'=> LAN_CREATE, 'perm' => 'P'), 'category/list' => array('caption'=> LAN_CATEGORIES, 'perm' => 'P'), - 'category/create' => array('caption'=> "Create Category", 'perm' => 'P'), + 'category/create' => array('caption'=> LAN_CREATE_CATEGORY, 'perm' => 'P'), 'main/prefs' => array('caption'=> LAN_PREFS, 'perm' => '0'), // 'main/custom' => array('caption'=> 'Custom Page', 'perm' => '0') ); @@ -68,11 +68,11 @@ class fb_category_ui extends e_admin_ui 'fb_category_id' => array('title'=> LAN_ID, 'type' => 'number', 'data' => 'int', 'width' =>'5%', 'forced'=> TRUE), 'fb_category_icon' => array('title'=> LAN_ICON, 'type' => 'icon', 'data' => 'str', 'width' => '5%', 'thclass' => 'center', 'class'=>'center'), 'fb_category_title' => array('title'=> LAN_TITLE, 'type' => 'text', 'data' => 'str', 'inline'=>true, 'width' => 'auto', 'help' => 'up to 200 characters', 'thclass' => 'left', 'writeParms'=>'size=xlarge'), - 'fb_category_template' => array('title'=> 'Category template', 'type' => 'layouts', 'inline'=>true, 'data' => 'str', 'width' => 'auto', 'thclass' => 'left', 'writeParms' => 'plugin=featurebox&id=featurebox_category&merge=1', 'filter' => true), - 'fb_category_random' => array('title'=> 'Random', 'type' => 'boolean', 'data' => 'int', 'width' => '5%', 'thclass' => 'center', 'class' => 'center', 'batch' => true, 'filter' => true), + 'fb_category_template' => array('title'=> FBLAN_30, 'type' => 'layouts', 'inline'=>true, 'data' => 'str', 'width' => 'auto', 'thclass' => 'left', 'writeParms' => 'plugin=featurebox&id=featurebox_category&merge=1', 'filter' => true), + 'fb_category_random' => array('title'=> FBLAN_31, 'type' => 'boolean', 'data' => 'int', 'width' => '5%', 'thclass' => 'center', 'class' => 'center', 'batch' => true, 'filter' => true), 'fb_category_class' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'filter' => true, 'batch' => true), - 'fb_category_limit' => array('title'=> 'Limit', 'type' => 'number', 'data' => 'int', 'width' => '5%', 'thclass' => 'left', 'help' => 'number of items to be shown, 0 - show all'), - 'fb_category_parms' => array('title'=> 'Parameters (optional)', 'type' => 'textarea', 'data' => 'str', 'width' => 'auto', 'thclass' => 'left', 'class' => 'left','writeParms' => 'expand=Advanced&help=Optional Javascript Parameters (format subject to change)'), + 'fb_category_limit' => array('title'=> LAN_LIMIT, 'type' => 'number', 'data' => 'int', 'width' => '5%', 'thclass' => 'left', 'help' => 'number of items to be shown, 0 - show all'), + 'fb_category_parms' => array('title'=> FBLAN_32, 'type' => 'textarea', 'data' => 'str', 'width' => 'auto', 'thclass' => 'left', 'class' => 'left','writeParms' => array('expand'=>LAN_ADVANCED), 'help'=>FBLAN_33), 'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'center') ); @@ -209,13 +209,13 @@ class fb_main_ui extends e_admin_ui 'fb_id' => array('title'=> LAN_ID, 'type' => 'number', 'data'=> 'int', 'width' =>'5%', 'forced'=> TRUE), 'fb_category' => array('title'=> LAN_CATEGORY, 'type' => 'dropdown', 'inline'=>true, 'data'=> 'int', 'width' => '10%', 'filter'=>TRUE, 'batch'=>TRUE), 'fb_title' => array('title'=> LAN_TITLE, 'type' => 'text', 'inline'=>true, 'width' => 'auto', 'thclass' => 'left'), - 'fb_image' => array('title'=> "Image/Video", 'type' => 'image', 'width' => '100px', 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60','writeParms'=>'size=xxlarge&media=featurebox&video=1'), + 'fb_image' => array('title'=> FBLAN_26, 'type' => 'image', 'width' => '100px', 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60','writeParms'=>'size=xxlarge&media=featurebox&video=1'), 'fb_text' => array('title'=> FBLAN_08, 'type' => 'bbarea', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1','writeParms'=>'template=admin'), //DEPRECATED 'fb_mode' => array('title'=> FBLAN_12, 'type' => 'dropdown', 'data'=> 'int', 'width' => '5%', 'filter'=>TRUE, 'batch'=>TRUE), //DEPRECATED 'fb_rendertype' => array('title'=> FBLAN_22, 'type' => 'dropdown', 'data'=> 'int', 'width' => 'auto', 'noedit' => TRUE), 'fb_template' => array('title'=> LAN_TEMPLATE, 'type' => 'layouts', 'data'=> 'str', 'width' => 'auto', 'writeParms' => 'plugin=featurebox', 'filter' => true, 'batch' => true), // Photo - 'fb_imageurl' => array('title'=> "Image Link", 'type' => 'url', 'width' => 'auto','writeParms'=>'size=xxlarge'), + 'fb_imageurl' => array('title'=> FBLAN_27, 'type' => 'url', 'width' => 'auto','writeParms'=>'size=xxlarge'), 'fb_class' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'filter' => true, 'batch' => true), // User id 'fb_order' => array('title'=> LAN_ORDER, 'type' => 'number', 'data'=> 'int','width' => '5%' ), 'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center', 'readParms'=>'sort=1') @@ -224,7 +224,7 @@ class fb_main_ui extends e_admin_ui protected $fieldpref = array('checkboxes', 'fb_id', 'fb_category', 'fb_title', 'fb_template', 'fb_class', 'fb_order', 'options'); protected $prefs = array( - 'menu_category' => array('title'=> "Featurebox Menu Category", 'type'=>'dropdown', 'help' => 'Category to use for the featurebox menu') + 'menu_category' => array('title'=> FBLAN_28, 'type'=>'dropdown', 'help' => FBLAN_29) ); @@ -270,4 +270,4 @@ e107::getAdminUI()->runPage(); require_once(e_ADMIN."footer.php"); exit; -?> \ No newline at end of file +?> diff --git a/e107_plugins/featurebox/featurebox_menu.php b/e107_plugins/featurebox/featurebox_menu.php index 18d2516c8..2f96d9ff9 100644 --- a/e107_plugins/featurebox/featurebox_menu.php +++ b/e107_plugins/featurebox/featurebox_menu.php @@ -8,13 +8,14 @@ if (!defined('e107_INIT')) { exit; } // e107::Lan('featurebox', 'front'); +e107::includeLan(e_PLUGIN.'featurebox/languages/'.e_LANGUAGE.'_admin_featurebox.php'); // This line added to admin warning $type = vartrue(e107::getPlugPref('featurebox','menu_category'),'bootstrap_carousel'); $text = e107::getParser()->parseTemplate("{FEATUREBOX|".$type."}"); if(!$text) { - echo "
There are no featurebox items assigned to the ".$type." template
"; + echo "
".$message = e107::getParser()->lanVars(FBLAN_25, array('x'=>$type))."
"; // e107::getMessage()->addDebug("There are no featurebox items using the ".$type." template"); } diff --git a/e107_plugins/featurebox/languages/English_admin_featurebox.php b/e107_plugins/featurebox/languages/English_admin_featurebox.php index 3830e76cb..e5c488efe 100644 --- a/e107_plugins/featurebox/languages/English_admin_featurebox.php +++ b/e107_plugins/featurebox/languages/English_admin_featurebox.php @@ -37,8 +37,14 @@ define("FBLAN_14", "Show this message only"); define("FBLAN_22", "Render type"); define("FBLAN_23", "In theme box"); define("FBLAN_24", "Plain"); -//define("FBLAN_25", "Template"); //FIXME LAN - use generic. -//define("FBLAN_26", "you can use a different template for each message, add templates to e107_plugins/featurebox/templates/ folder"); +define("FBLAN_25", "There are no featurebox items assigned to the [x] template."); +define("FBLAN_26", "Image/Video"); +define("FBLAN_27", "Image Link"); +define("FBLAN_28", "Featurebox Menu Category"); +define("FBLAN_29", "Category to use for the featurebox menu"); +define("FBLAN_30", "Category template"); +define("FBLAN_31", "Random"); +define("FBLAN_32", "Parameters (optional)"); +define("FBLAN_33", "Optional Javascript Parameters (format subject to change)"); - -?> \ No newline at end of file +?> diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php index ec12b2dbe..97449aafb 100644 --- a/e107_plugins/forum/forum_viewforum.php +++ b/e107_plugins/forum/forum_viewforum.php @@ -999,11 +999,11 @@ function fadminoptions($thread_info) - $text .= "
  • ".LAN_DELETE." ".$tp->toGlyph('trash'); + $text .= "
  • ".LAN_DELETE." ".$tp->toGlyph('trash')."
    • "; $text .= "
  • ".$lan[$stickUnstick]." ".$icon[$stickUnstick]."
    • "; $text .= "
  • ".$lan[$lockUnlock]." ".$icon[$lockUnlock]."
    • "; - $text .= "
  • ".LAN_FORUM_2042." ".$tp->toGlyph('move')."
    • "; + $text .= "
  • ".LAN_FORUM_2042." ".$tp->toGlyph('move')."
    • "; if(e_DEVELOPER) { diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php index c93635235..58f0a4fac 100644 --- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php @@ -181,7 +181,7 @@ class forum_shortcodes extends e_shortcode - +
    diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php index bd23b9284..8e4a17167 100644 --- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php @@ -772,7 +772,7 @@ if($type == 'thread') { $url = e107::url('forum', 'move', array('thread_id' => $this->postInfo['post_thread'])); - $text .= "
  • " . LAN_FORUM_2042 . " " . $tp->toGlyph('move') . "
    • "; + $text .= "
  • " . LAN_FORUM_2042 . " " . $tp->toGlyph('move') . "
    • "; } elseif(e_DEVELOPER === true) //TODO { diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php index b935b898b..f2ea0b965 100644 --- a/e107_plugins/forum/templates/forum_viewforum_template.php +++ b/e107_plugins/forum/templates/forum_viewforum_template.php @@ -307,21 +307,19 @@ $FORUM_VIEWFORUM_TEMPLATE['header'] = "
    {BREADCRU $FORUM_VIEWFORUM_TEMPLATE['item'] = " - {ICON} - -
    -
    - {THREADNAME} -
    ".LAN_FORUM_1004.": {POSTER} {THREADTIMELAPSE}  
    -
    {PAGESX}
    -
    -
    + {ICON} + +
    +
    + {THREADNAME} +
    ".LAN_FORUM_1004.": {POSTER} {THREADTIMELAPSE}  
    +
    {PAGESX}
    +
    + + {REPLIESX}{VIEWSX} + {LASTPOSTUSER} {LASTPOSTDATE}
    {ADMINOPTIONS}
    + \n"; - -
    - {REPLIESX}{VIEWSX} - {LASTPOSTUSER} {LASTPOSTDATE}
    {ADMINOPTIONS}
    - \n"; $FORUM_VIEWFORUM_TEMPLATE['item-sticky'] = $FORUM_VIEWFORUM_TEMPLATE['item'] ; // "{THREADNAME}\n"; $FORUM_VIEWFORUM_TEMPLATE['item-announce'] = $FORUM_VIEWFORUM_TEMPLATE['item'] ; // "{THREADNAME}\n"; diff --git a/e107_plugins/login_menu/login_menu_shortcodes.php b/e107_plugins/login_menu/login_menu_shortcodes.php index 5063061ca..1c0ccedc5 100755 --- a/e107_plugins/login_menu/login_menu_shortcodes.php +++ b/e107_plugins/login_menu/login_menu_shortcodes.php @@ -85,7 +85,7 @@ e107::getLanguage()->bcDefs($bcDefs); // If logging in with email address - ignore pref and increase to 100 chars. $maxLength = ($this->allowEmailLogin == 1 || $this->allowEmailLogin) ? 100 : varset($pref['loginname_maxlength'],30); - return "\n"; + return "\n"; } @@ -98,7 +98,7 @@ e107::getLanguage()->bcDefs($bcDefs); function sc_lm_password_input($parm='') { $pref = e107::getPref(); - $t_password = "\n"; + $t_password = "\n"; if (!USER && e107::getSession()->is('challenge') && varset($pref['password_CHAP'],0)) $t_password .= "\n\n"; return $t_password; } diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php index 86e9d8de6..7ecf02928 100644 --- a/e107_plugins/news/news.php +++ b/e107_plugins/news/news.php @@ -163,7 +163,7 @@ class news_front } $this->action = $action; - $this->subAction= $sub_action; + $this->subAction= e107::getParser()->filter($sub_action); } @@ -461,11 +461,11 @@ class news_front $tmp = explode(",", $iurl); foreach($tmp as $mimg) { - if(substr($mimg,-8) == '.youtube') + if(substr($mimg,-8) == '.youtube' || empty($mimg)) { continue; } - e107::meta('og:image',$tp->thumbUrl($tmp[0],'w=500',false,true) ); + e107::meta('og:image',$tp->thumbUrl($mimg,'w=500',false,true) ); // e107::meta('og:image',$mimg); } @@ -1529,6 +1529,11 @@ class news_front { $news = $newsAr[$i]; + if(!isset($this->newsUrlparms['category_sef']) && !empty($news['category_sef'])) + { + $this->newsUrlparms['category_sef'] = $news['category_sef']; + } + // Set the Values for the social shortcode usage. if($socialInstalled == true) { @@ -1580,6 +1585,7 @@ class news_front $amount = ITEMVIEW; $nitems = defined('NEWS_NEXTPREV_NAVCOUNT') ? '&navcount='.NEWS_NEXTPREV_NAVCOUNT : '' ; $url = rawurlencode(e107::getUrl()->create($this->route, $this->newsUrlparms)); + // Example of passing route data instead building the URL outside the shortcode - for a reference only // $url = rawurlencode('url::'.$newsRoute.'::'.http_build_query($newsUrlparms, null, '&')); $parms = 'tmpl_prefix='.deftrue('NEWS_NEXTPREV_TMPL', 'default').'&total='.$news_total.'&amount='.$amount.'¤t='.$this->from.$nitems.'&url='.$url; diff --git a/e107_plugins/online/templates/online_menu_template.php b/e107_plugins/online/templates/online_menu_template.php index 30e0024b8..b596118b8 100644 --- a/e107_plugins/online/templates/online_menu_template.php +++ b/e107_plugins/online/templates/online_menu_template.php @@ -93,7 +93,7 @@ $ONLINE_MENU_TEMPLATE['extended']['online_member_newest'] = "{SETIMAGE $ONLINE_MENU_WRAPPER['extended']['ONLINE_GUESTS'] = "
  • ".LAN_ONLINE_1."{---}
    • "; $ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS'] = "
  • ".LAN_ONLINE_2."{---}
    • "; $ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_LIST'] = "
      {---}
    "; -$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_LIST_EXTENDED'] = "
      {---}
    "; +$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_LIST_EXTENDED'] = "
    • {---}
    • "; $ONLINE_MENU_WRAPPER['extended']['ONLINE_ONPAGE'] = "
  • ".LAN_ONLINE_3."{---}
    • "; $ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_TOTAL'] = "
  • ".LAN_ONLINE_2."{---}
    • "; $ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBER_NEWEST'] = "
  • ".LAN_ONLINE_6."
    • {---}
    • "; @@ -101,5 +101,5 @@ $ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST'] = "{---}"; +$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_REGISTERED'] = "
  • ".LAN_ONLINE_11."{---}
    • "; $ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBER_PAGE'] = LAN_ONLINE_7." {---}"; diff --git a/e107_plugins/pm/pm.php b/e107_plugins/pm/pm.php index c234c5c7f..4b12cc0eb 100755 --- a/e107_plugins/pm/pm.php +++ b/e107_plugins/pm/pm.php @@ -238,7 +238,9 @@ $PM_INBOX['end'] = $this->updateTemplate($PM_INBOX_FOOTER); } - if(empty($PM_INBOX)) + + + if(empty($PM_INBOX['item'])) { $PM_INBOX = e107::getTemplate('pm', 'pm', 'inbox'); } @@ -270,6 +272,7 @@ { $rec['pm_subject'] = '[' . LAN_PM_61 . ']'; } + $sc->setVars($rec); $txt .= $tp->parseTemplate($PM_INBOX['item'], true, $sc); } @@ -311,7 +314,7 @@ $PM_OUTBOX['end'] = $this->updateTemplate($PM_OUTBOX_FOOTER); } - if(empty($PM_OUTBOX)) + if(empty($PM_OUTBOX['item'])) { $PM_OUTBOX = e107::getTemplate('pm', 'pm', 'outbox'); } @@ -682,7 +685,7 @@ } - function breadcrumb($type = '', $other) + function breadcrumb($type = '', $other='') { if(!deftrue('BOOTSTRAP')) { @@ -701,7 +704,7 @@ $array[1] = $type; } - if($other) + if(!empty($other)) { $array[2] = array('text' => $other, 'url' => null); } diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index b6a0cbd3e..09b2525a7 100644 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -632,7 +632,7 @@ if(!class_exists('plugin_pm_pm_shortcodes')) // pm_id is mapped insisde the config to id key $ret = "
    var)."'> - ".LAN_PM_54."     + ".LAN_PM_54."    
    "; return $ret; diff --git a/e107_plugins/pm/templates/pm_template.php b/e107_plugins/pm/templates/pm_template.php index 1d3b5eb38..1cafacf85 100644 --- a/e107_plugins/pm/templates/pm_template.php +++ b/e107_plugins/pm/templates/pm_template.php @@ -84,7 +84,7 @@ $PM_WRAPPER['PM_ATTACHMENTS']= "
    {---}< $PM_WRAPPER['PM_EMOTES']= "".LAN_PM_7.": {---}"; $PM_WRAPPER['PM_ATTACHMENT']= "".LAN_PM_8.": {---}"; $PM_WRAPPER['PM_RECEIPT']= "".LAN_PM_9.": {---}"; -$PM_WRAPPER['PM_REPLY']= "{---}"; +$PM_WRAPPER['PM_REPLY']= "{---}"; //$PM_SEND_PM = "
    $PM_TEMPLATE['send'] = "
    @@ -272,7 +272,7 @@ $PM_TEMPLATE['show'] = "
    - diff --git a/e107_plugins/poll/languages/English.php b/e107_plugins/poll/languages/English.php index c3e3ee8b0..8eeca1ece 100644 --- a/e107_plugins/poll/languages/English.php +++ b/e107_plugins/poll/languages/English.php @@ -46,7 +46,7 @@ define("POLLAN_19", "User ID (only members can vote)"); //define("POLLAN_25", "Clear form");//LAN_CLEAR //define("POLLAN_26", "votes");//NOT USED // define("POLLAN_27", "Comments"); -define("POLLAN_28", "Previous polls"); +define("POLLAN_28", "All Previous polls"); //define("POLLAN_29", "posted by");//NOT USED //define("POLLAN_30", "Submit");//NOT USED define("POLLAN_31", "Votes"); @@ -66,6 +66,8 @@ define("POLLAN_43", "You do not have the required permissions to vote in this po //define("POLLAN_45", "Poll successfully updated");//NOT USED //define("POLLAN_46", "Field(s) left blank"); +define("POLLAN_50", "Active from [x] to [y]"); + // TODO NEED TO BE RENAMED! diff --git a/e107_plugins/poll/oldpolls.php b/e107_plugins/poll/oldpolls.php index d3e3686b5..99c6e2de0 100644 --- a/e107_plugins/poll/oldpolls.php +++ b/e107_plugins/poll/oldpolls.php @@ -51,7 +51,7 @@ if(e_QUERY) $text .= "
    - ".LAN_POSTED_BY." ".$userlink."
    ".LAN_ACTIVE.": ".LAN_FROM." ".$start_datestamp." ".LAN_TO." ".$end_datestamp."
    + ".LAN_POSTED_BY." ".$userlink."
    ".$tp->lanVars(POLLAN_50, array('x'=>$start_datestamp, 'y'=> $end_datestamp))."     "; @@ -82,23 +82,7 @@ if(e_QUERY) } */ - $query = "SELECT c.*, u.* FROM #comments AS c - LEFT JOIN #user AS u ON c.comment_author_id = u.user_id - WHERE comment_item_id=".intval($row['poll_id'])." AND comment_type='4' ORDER BY comment_datestamp"; - - if ($comment_total = $sql->gen($query)) - { - $text .= "
    "; - - while ($row2 = $sql->fetch()) - { - $text .= e107::getComment()->render_comment($row2, 'poll', 'comment'); - } - $text .= "
    "; - } - - - // $text .= "
    +

    {PM_SUBJECT} {PM_DATE}

    {PM_FROM_TO} {PM_READ} {PM_DELETE}
    "; + $text .= e107::getComment()->compose_comment('poll', 'comment', intval( $row['poll_id'] ), null, '', false, 'html'); $ns->tablerender(LAN_PLUGIN_POLL_NAME." #".$row['poll_id'], $text); echo "
    "; } @@ -159,7 +143,7 @@ if(e_QUERY) $text .= "     {$poll_title} ".$userlink." - ".$from." ".LAN_TO." ".$to." + ".$tp->lanVars(POLLAN_50, array('x'=>$from, 'y'=> $to))." \n"; } diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php index 3fc07d2d2..20012d805 100644 --- a/e107_plugins/poll/poll_class.php +++ b/e107_plugins/poll/poll_class.php @@ -11,6 +11,7 @@ if (!defined('e107_INIT')) { exit; } e107::includeLan(e_PLUGIN.'poll/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_admin.php'); define('POLLCLASS', TRUE); define('POLL_MODE_COOKIE', 0); define('POLL_MODE_IP', 1); @@ -333,8 +334,20 @@ class poll $ns = e107::getRender(); $tp = e107::getParser(); $sql = e107::getDb(); - + + $sc = e107::getScBatch('poll'); + global $POLLSTYLE; + + if ($type == 'preview') + { + $POLLMODE = 'notvoted'; + $sc->pollType = $type; + } + elseif ($type == 'forum') + { + $sc->pollPreview = true; + } switch ($POLLMODE) { @@ -359,6 +372,9 @@ class poll $POLLMODE = 'results'; break; + case 'notvoted': + break; + default: if(ADMIN) { @@ -452,7 +468,6 @@ class poll } - $sc = e107::getScBatch('poll'); $sc->setVars($pollArray); if ($pollArray['poll_comment']) // Only get comments if they're allowed on poll. And we only need the count ATM @@ -466,14 +481,7 @@ class poll $sc->pollRenderType = $type; - if ($type == 'preview') - { - $POLLMODE = 'notvoted'; - } - elseif ($type == 'forum') - { - $sc->pollPreview = true; - } + $text = ''; diff --git a/e107_plugins/social/admin_config.php b/e107_plugins/social/admin_config.php index e09d26b6a..16da615a1 100644 --- a/e107_plugins/social/admin_config.php +++ b/e107_plugins/social/admin_config.php @@ -454,6 +454,7 @@ class social_ui extends e_admin_ui 'flickr' => array('label'=>"Flickr", "placeholder"=>""), 'instagram' => array('label'=>"Instagram", "placeholder"=>""), 'pinterest' => array('label'=>"Pinterest", "placeholder"=>""), + 'steam' => array('label'=>"Steam", "placeholder"=>"eg. http://steamcommunity.com"), 'vimeo' => array('label'=>"Vimeo", "placeholder"=>""), ); diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php index e95a9b092..d66e663df 100644 --- a/e107_plugins/social/e_shortcode.php +++ b/e107_plugins/social/e_shortcode.php @@ -76,6 +76,7 @@ class social_shortcodes extends e_shortcode 'flickr' => array('href'=> deftrue('XURL_FLICKR'), 'title'=>'Flickr'), 'instagram' => array('href'=> deftrue('XURL_INSTAGRAM'), 'title'=>'Instagram'), 'youtube' => array('href'=> deftrue('XURL_YOUTUBE'), 'title'=>'YouTube'), + 'steam' => array('href'=> deftrue('XURL_STEAM'), 'title'=>'Steam'), 'vimeo' => array('href'=> deftrue('XURL_VIMEO'), 'title'=>'Vimeo') ); @@ -234,7 +235,8 @@ class social_shortcodes extends e_shortcode $defaultUrl = vartrue($this->var['url'], e_REQUEST_URL); $defaultTitle = vartrue($this->var['title'], deftrue('e_PAGETITLE'). " | ". SITENAME); - $defaultDiz = vartrue($this->var['description'], e107::getUrl()->response()->getMetaDescription()); + // $defaultDiz = vartrue($this->var['description'], e107::getUrl()->response()->getMetaDescription()); + $defaultDiz = vartrue($this->var['description'], e107::getSingleton('eResponse')->getMetaDescription()); $defaultTags = vartrue($this->var['tags'],''); $tp = e107::getParser(); diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css index 8943ab1ec..dff7ce24b 100644 --- a/e107_themes/bootstrap3/admin_style.css +++ b/e107_themes/bootstrap3/admin_style.css @@ -1345,6 +1345,7 @@ li.rssRow > div { .selectize-control div.item { border-radius:3px; } .selectize-control div.item .remove { margin-top:3px } .selectize-input.focus { box-shadow: inherit; } +.form-control.selectize-input { min-height:38px; height:auto; } /* diff --git a/e107_themes/bootstrap3/theme.php b/e107_themes/bootstrap3/theme.php index 9abf6ea1a..6e971e0ed 100644 --- a/e107_themes/bootstrap3/theme.php +++ b/e107_themes/bootstrap3/theme.php @@ -52,7 +52,7 @@ define('OTHERNEWS_COLS',false); // no tables, only divs. define('OTHERNEWS_LIMIT', 3); // Limit to 3. define('OTHERNEWS2_COLS',false); // no tables, only divs. define('OTHERNEWS2_LIMIT', 3); // Limit to 3. -define('COMMENTLINK', e107::getParser()->toGlyph('fa-comment')); +// define('COMMENTLINK', e107::getParser()->toGlyph('fa-comment')); define('COMMENTOFFSTRING', ''); define('PRE_EXTENDEDSTRING', '
    '); diff --git a/e107_themes/bootstrap3/theme_shortcodes.php b/e107_themes/bootstrap3/theme_shortcodes.php index 9ff5bb57c..ea81b954f 100644 --- a/e107_themes/bootstrap3/theme_shortcodes.php +++ b/e107_themes/bootstrap3/theme_shortcodes.php @@ -137,8 +137,8 @@ class theme_shortcodes extends e_shortcode $text .='
    -

    {LM_USERNAME_INPUT}

    -

    {LM_PASSWORD_INPUT}

    +

    {LM_USERNAME_INPUT: idprefix=bs3-}

    +

    {LM_PASSWORD_INPUT: idprefix=bs3-}

    @@ -147,10 +147,10 @@ class theme_shortcodes extends e_shortcode
    -
    - + '; $text .= ' @@ -195,8 +195,14 @@ class theme_shortcodes extends e_shortcode $text = ' -
      -
    • {PM_NAV}
      • +
        '; + + if( e107::isInstalled('pm') ) + { + $text .= '
      • {PM_NAV}
        • '; + } + + $text .= '
      • {SETIMAGE: w=30} {USER_AVATAR: shape=circle} '. $userNameLabel.'
        • diff --git a/e107_web/css/backcompat.css b/e107_web/css/backcompat.css index cd0938736..235cf8654 100644 --- a/e107_web/css/backcompat.css +++ b/e107_web/css/backcompat.css @@ -41,6 +41,8 @@ ul.breadcrumb li span.divider { padding-left:5px; } .img-responsive { max-width:100%; } .logo.img-responsive { height: auto; } +table.table { width: 100% } + .media-list { padding-left: 0; list-style: none; diff --git a/e107_web/js/bootstrap3-editable/img/loading.gif b/e107_web/js/bootstrap3-editable/img/loading.gif index ad7025064..1313adc47 100644 Binary files a/e107_web/js/bootstrap3-editable/img/loading.gif and b/e107_web/js/bootstrap3-editable/img/loading.gif differ diff --git a/e107_web/js/core/all.jquery.js b/e107_web/js/core/all.jquery.js index d5d6d087b..cd8179c33 100644 --- a/e107_web/js/core/all.jquery.js +++ b/e107_web/js/core/all.jquery.js @@ -207,6 +207,8 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}}; { $(context).find('.e-expandit').once('e-expandit').each(function () { + $(this).show(); + // default 'toggle'. $(this).click(function () { @@ -254,8 +256,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}}; if(href === "#" || href == "") { - var idt = $(this).nextAll("div"); - $(idt).slideToggle("slow"); + $(this).nextAll("div").slideToggle("slow"); return true; } @@ -315,6 +316,21 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}}; } }; + /** + * Behavior to hide elements. + * + * @type {{attach: e107.behaviors.eHideMe.attach}} + */ + e107.behaviors.eHideMe = { + attach: function (context, settings) + { + $(context).find('.e-hideme').once('e-hide-me').each(function () + { + $(this).hide(); + }); + } + }; + /** * Check if the selector is valid. * @@ -715,12 +731,6 @@ $.ajaxSetup({ $(document).ready(function() { - $(".e-hideme").hide(); - $(".e-expandit").show(); - - // $(".e-spinner").spinner(); //FIXME breaks tooltips - - //check all $("#check-all").click(function(event){ var val = $(this).val(), selector = '.field-spacer'; diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js index b6d10f7da..9e5b1a8be 100644 --- a/e107_web/js/core/mediaManager.js +++ b/e107_web/js/core/mediaManager.js @@ -313,8 +313,12 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}}; var $preview = $('#preview'); var $path = $('#path'); - $this.addClass("media-select-active"); - $this.closest("img").addClass("active"); + // Remove "selected" class from elements. + $('.e-media-select').removeClass('media-select-active'); + + // Add "selected" class to clicked element. + $this.addClass('media-select-active'); + $this.closest('img').addClass('active'); if(bbcode == "file") // not needed for Tinymce { @@ -540,19 +544,22 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}}; $('#e-modal-loading', window.parent.document).show(); $('iframe', window.parent.document).attr('scrolling', 'no'); // hide the scrollbar. + // TODO use loading screen instead? $(id).hide('slide', {direction: outDir}, 1500, function () { - }); - - $.get(src, function (data) - { - $(id).html(data); - newVal = $('#admin-ui-media-select-count-hidden').text(); - $('#admin-ui-media-select-count').text(newVal).fadeIn(); - - $(id).show('slide', {direction: inDir}, 500, function () + $.get(src, function (data) { - $('#e-modal-loading', window.parent.document).hide(); + $(id).html(data); + newVal = $('#admin-ui-media-select-count-hidden').text(); + $('#admin-ui-media-select-count').text(newVal).fadeIn(); + + $(id).show('slide', {direction: inDir}, 500, function () + { + $('#e-modal-loading', window.parent.document).hide(); + }); + + // We need to attach behaviors to the newly loaded contents. + e107.attachBehaviors(); }); }); diff --git a/print.php b/print.php index 1e1ddf1a4..962967c55 100644 --- a/print.php +++ b/print.php @@ -71,7 +71,7 @@ else { //$con = new convert; - $query = "SELECT n.*,c.* FROM `#news` AS n LEFT JOIN `#news_category` AS c ON n.news_category = c.category_id WHERE n.news_id=".intval($parms); + $query = "SELECT n.*, c.*, u.user_id, u.user_name FROM `#news` AS n LEFT JOIN `#news_category` AS c ON n.news_category = c.category_id LEFT JOIN `#user` AS u ON n.news_author = u.user_id WHERE n.news_id = " . intval($parms); //$sql->db_Select("news", "*", "news_id='{$parms}'"); $sql = e107::getDb(); diff --git a/signup.php b/signup.php index 4b45e3481..5ff31ea1c 100644 --- a/signup.php +++ b/signup.php @@ -280,7 +280,7 @@ class signup } else { - e107::getMessage()->setTitle(LAN_ERROR,E_MESSAGE_SUCCESS)->addSuccess(LAN_SIGNUP_44." ".$row['user_email']." - ".LAN_SIGNUP_45); + e107::getMessage()->setTitle(LAN_SIGNUP_61,E_MESSAGE_SUCCESS)->addSuccess(LAN_SIGNUP_44." ".$row['user_email']." - ".LAN_SIGNUP_45); $ns->tablerender(null,e107::getMessage()->render()); $do_log['signup_result'] = LAN_SIGNUP_61; } @@ -308,7 +308,7 @@ class signup ".LAN_SIGNUP_48." ".$frm->text('resend_email','',80)." - Use a different email address + ".LAN_SIGNUP_121."