Topic: A couple of fixes v2.1.1
Good afternoon. I saw that my thoughts and amendments, which I indicated in this message, were added to the release.
However, I noticed that some of my suggestions were added to the release as is.
In this case, some parts of the code will not work or will not work correctly.
I apologize for not specifying what is an assumption, and what is the correction of errors.
Today I want to clarify all the points, and also make some critical amendments.
All the code specified in this message can be used as is. This is not an assumption, but a fix option.
[fonts]
First of all, I want to note that there was a problem with loading fonts.
The "glyphicons" family placed not where they shuld.
For this time , they are located in (\libs\fonts\) with "fontawesome" fons.
And if "fontawesome" they are all right, then "glyphicons" not on worked place.
In version 2.1.0 - theme and skins has been changed and (bootstraps.css)
was moved to (\libs\css\themes\NAME).
But the font loading still refers to the (..\fonts\) directory from (bootstraps.css).
So it turns out that the "glyphicons" fonts should be located at (\libs\css\themes\fonts\).
There are two solutions.
1. The first is to move the fonts to worked place.
2. The second is rewrite all bootsrap.
From my point of view, that in the future not to get confused, it is easier to transfer fonts.
If you want to store all fonts in the same directory, then you should place all css
at the same level of relative distance to the fonts.
Now about code.
[/core/core.php] 1361
Corrected the output template for the function msg_info()
Corrected in connection with bootstrap
echo '<section><div class="container"><div class="alert alert-warning">';
echo '<strong>'.i18n('Warning!').' </strong> '.i18n($title).' <a href="'.$go_back.'" class="btn btn-warning btn-xs">OK</a>';
echo '</div></div></section>'; [/core/core.php] 1429
When I described adding the Login button to the menu,
I did not want that you add the button itself,
but suggested that you shuld install the Hook in that place, to adapt the menu.
Without a separate wrapper with pre-processing the "?Login" value, such link is useless.
I wrote a small hook, similar to the hook for an authorized menu to fix this issue.
I checked it for work and I already wrote a plug-in for expanding the menu for my needs.
You may add it to release.
// Make 'Top menu' for Guests
// Create a HOOK 'core/headermenu' and add One hided <li> menu.
// User may add new one with adding to the hook ARRAY('#URL','TITLE');
$headermenu = hook('core/headermenu', array ('version' => array()));
$menu_result = '';
foreach ($headermenu as $menu_key => $vol)
{
$menu_target = isset($vol[0]) ? $vol[0] : false;
$menu_title = isset($vol[1]) ? $vol[1] : false;
if (($menu_target) && ($menu_target[0] == '#')) {
$menu_target = substr($menu_target, 1);
} else {
$menu_target = PHP_SELF;
}
if ($menu_title) {
$menu_result .= '<li><a class="nav-top-item" href="'.$menu_target.'">'.i18n($menu_title).'</a></li>';
} else {
$menu_result .= '<!--li><a class="nav-top-item" href="'.PHP_SELF.'">'.VERSION_NAME.'</a></li-->';
}
}
if (isset($_SESSION['user']))
{
$skin_header = preg_replace("/{menu}/", $skin_menu, $skin_header);
}
else
{
$skin_header = preg_replace("/{menu}/", $menu_result, $skin_header);
}[/core/core.php] 3888
Now about redirection.
in the last message i told about reassign PHP_SELF.
I gave an example of the code for the case with the Disabled overwrite module.
However, you should also add a reassignment in case if the module is enabled.
This is necessary for the correct formation of links in the case of using "cn_rewrite_url" value.
In my case, I wrote a wrapper for dashboard, search, news and plug-ins in one script.
So I redirect all requests to one script. And I have both variants of events
like working with redirection through "cn_rewrite_url"
and working with GET \ POST directly with the script.
Otherwise, if you do not reassign PHP_SELF, then 'show_news.php' script may not get $PHP_SELF values.
define('CN_REWRITE', $layout);
if (isset($PHP_SELF))
{
define('PHP_SELF', $PHP_SELF);
}
else
{
define('PHP_SELF', pathinfo(str_replace($basedir, '', $layout),PATHINFO_BASENAME));
} [core/modules/dashboard.php] 415
The problem with overriding PHP_SELF and finding the cause of incorrect links
caused me to look at entire rewriting module.
And I found another inaccuracy in the code.
When apply rewrite settings and generating ".htaccess" file ,
the redirection is written to show_news.php script.
But in case we use a wrapper that we specify in
the field ('Real path to your layout file'),
is still written a standard value of show_news.php to the ".htaccess" file.
This is because in the code there is no validation and no substitution with layout.
Below is the code correcting this critical error.
In my case, in the past and now, I was manual rewrite in ".htaccess".
But I decided to deal with problem and fix this bug.
if ($URI == '/')
{
$URI = '/show_news.php';
}
else
{
if (!empty($post_cfg['rw_layout']))
{
$URI .= '/'.basename($post_cfg['rw_layout']);
}
else
{
$URI .= '/show_news.php';
}
}[core/modules/dashboard.php] 560
Another small problem was checking the Avatar when updating user data.
In order to save the data, we had to constantly substitute the avatar.
And half the verification code, just did not work.
Here is fix.
$correct = (empty($avatar_file['tmp_name']))? true : false;[/core/news.php] 261
Now about Hook for redefining the link to the user's questionnaire.
In my last mesage, I gave an example of how I use links to access a custom module. And suggested to setting up Hook there.
But inserting a link to the code without my module was a mistake. Without custom module, that link will not work.
I bring the ready-made code for the link-formation of the Hook Overriding.
In the code below, for example, the hook value is specified to invoke the author search.
Of course, only if a search script is initiated on the page.
thus calling a hook, any custom module can form a flexible link.
By the way, search by authors is not working. I have not looked yet for a reason, but i will if ill got time.
// user allow to show his email?
if (isset($user['e-hide']) && $user['e-hide'])
{
if (db_user_by_name($e['u'])) {
// Users can modify URL template for make custom querry
// by returning modified data from hook('news/authorurl')
$authorurl = hook('news/authorurl', '?dosearch=yes&user=');
return '<a href="' . PHP_SELF . $authorurl . $e['u'] . '">' . $username . '</a>';
} else {
return $username;
}
}
else
{
return cn_user_email_as_site($user['email'], $username);
}