Skip to content
This repository has been archived by the owner on Apr 29, 2018. It is now read-only.

Commit

Permalink
Aktualizacja do 1.8.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Gigik committed Sep 12, 2015
1 parent d1ecdc0 commit a3cfe8d
Show file tree
Hide file tree
Showing 238 changed files with 3,598 additions and 2,415 deletions.
179 changes: 90 additions & 89 deletions Upload/admin/inc/class_form.php
View file

Large diffs are not rendered by default.

128 changes: 73 additions & 55 deletions Upload/admin/inc/class_page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class DefaultPage
/**
* Output the page header.
*
* @param string The title of the page.
* @param string $title The title of the page.
*/
function output_header($title="")
{
Expand Down Expand Up @@ -108,7 +108,7 @@ function output_header($title="")

echo " <script type=\"text/javascript\" src=\"../jscripts/jquery.js\"></script>\n";
echo " <script type=\"text/javascript\" src=\"../jscripts/jquery.plugins.min.js\"></script>\n";
echo " <script type=\"text/javascript\" src=\"../jscripts/general.js\"></script>\n";
echo " <script type=\"text/javascript\" src=\"../jscripts/general.js?ver=1806\"></script>\n";
echo " <script type=\"text/javascript\" src=\"./jscripts/admincp.js\"></script>\n";
echo " <script type=\"text/javascript\" src=\"./jscripts/tabs.js\"></script>\n";

Expand Down Expand Up @@ -191,6 +191,8 @@ function output_header($title="")

/**
* Output the page footer.
*
* @param bool $quit
*/
function output_footer($quit=true)
{
Expand Down Expand Up @@ -240,8 +242,8 @@ function output_footer($quit=true)
/**
* Add an item to the page breadcrumb trail.
*
* @param string The name of the item to add.
* @param string The URL to the item we're adding (if there is one)
* @param string $name The name of the item to add.
* @param string $url The URL to the item we're adding (if there is one)
*/
function add_breadcrumb_item($name, $url="")
{
Expand All @@ -250,6 +252,8 @@ function add_breadcrumb_item($name, $url="")

/**
* Generate a breadcrumb trail.
*
* @return bool|string
*/
function _generate_breadcrumb()
{
Expand Down Expand Up @@ -279,7 +283,7 @@ function _generate_breadcrumb()
/**
* Output a success message.
*
* @param string The message to output.
* @param string $message The message to output.
*/
function output_success($message)
{
Expand All @@ -289,8 +293,8 @@ function output_success($message)
/**
* Output an alert/warning message.
*
* @param string The message to output.
* @param string The ID of the alert/warning (optional)
* @param string $message The message to output.
* @param string $id The ID of the alert/warning (optional)
*/
function output_alert($message, $id="")
{
Expand All @@ -304,7 +308,7 @@ function output_alert($message, $id="")
/**
* Output an inline message.
*
* @param string The message to output.
* @param string $message The message to output.
*/
function output_inline_message($message)
{
Expand All @@ -314,7 +318,7 @@ function output_inline_message($message)
/**
* Output a single error message.
*
* @param string The message to output.
* @param string $error The message to output.
*/
function output_error($error)
{
Expand All @@ -326,7 +330,7 @@ function output_error($error)
/**
* Output one or more inline error messages.
*
* @param array Array of error messages to output.
* @param array $errors Array of error messages to output.
*/
function output_inline_error($errors)
{
Expand All @@ -350,8 +354,8 @@ function output_inline_error($errors)
/**
* Generate the login page.
*
* @param string The any message to output on the page if there is one.
* @param string The class name of the message (defaults to success)
* @param string $message The any message to output on the page if there is one.
* @param string $class The class name of the message (defaults to success)
*/
function show_login($message="", $class="success")
{
Expand Down Expand Up @@ -386,7 +390,7 @@ function show_login($message="", $class="success")
<meta name="copyright" content="Copyright {$copy_year} MyBB Group." />
<link rel="stylesheet" href="./styles/{$cp_style}/login.css" type="text/css" />
<script type="text/javascript" src="../jscripts/jquery.js"></script>
<script type="text/javascript" src="../jscripts/general.js"></script>
<script type="text/javascript" src="../jscripts/general.js?ver=1806"></script>
<script type="text/javascript" src="./jscripts/admincp.js"></script>
<script type="text/javascript">
//<![CDATA[
Expand Down Expand Up @@ -518,7 +522,7 @@ function show_2fa()
<meta name="copyright" content="Copyright {$copy_year} MyBB Group." />
<link rel="stylesheet" href="./styles/{$cp_style}/login.css" type="text/css" />
<script type="text/javascript" src="../jscripts/jquery.js"></script>
<script type="text/javascript" src="../jscripts/general.js"></script>
<script type="text/javascript" src="../jscripts/general.js?ver=1806"></script>
<script type="text/javascript" src="./jscripts/admincp.js"></script>
<script type="text/javascript">
//<![CDATA[
Expand Down Expand Up @@ -611,8 +615,8 @@ function show_lockedout()
/**
* Generate the lockout unlock page
*
* @param string The any message to output on the page if there is one.
* @param string The class name of the message (defaults to success)
* @param string $message The any message to output on the page if there is one.
* @param string $class The class name of the message (defaults to success)
*/
function show_lockout_unlock($message="", $class="success")
{
Expand Down Expand Up @@ -691,11 +695,11 @@ function show_lockout_unlock($message="", $class="success")
/**
* Add an item to the primary navigation menu.
*
* @param string The title of the menu item.
* @param string The ID of the menu item. This should correspond with the module the menu will run.
* @param string The link to follow when the menu item is clicked.
* @param int The display order of the menu item. Lower display order means closer to start of the menu.
* @param array Array of sub menu items if there are any.
* @param string $title The title of the menu item.
* @param string $id The ID of the menu item. This should correspond with the module the menu will run.
* @param string $link The link to follow when the menu item is clicked.
* @param int $order The display order of the menu item. Lower display order means closer to start of the menu.
* @param array $submenu Array of sub menu items if there are any.
*/
function add_menu_item($title, $id, $link, $order=10, $submenu=array())
{
Expand All @@ -709,6 +713,8 @@ function add_menu_item($title, $id, $link, $order=10, $submenu=array())

/**
* Build the actual navigation menu.
*
* @return bool|string
*/
function _build_menu()
{
Expand Down Expand Up @@ -748,8 +754,8 @@ function _build_menu()
/**
* Build a navigation sub menu if we have one.
*
* @param string A title for the sub menu.
* @param array Array of items for the sub menu.
* @param string $title A title for the sub menu.
* @param array $items Array of items for the sub menu.
*/
function _build_submenu($title, $items)
{
Expand All @@ -763,6 +769,8 @@ function _build_submenu($title, $items)

/**
* Switch between two different alternating background colours.
*
* @return string
*/
function get_alt_bg()
{
Expand All @@ -782,9 +790,9 @@ function get_alt_bg()
/**
* Output a Javascript based tab control on to the page.
*
* @param array Array of tabs in name => title format. Name should correspond to the name of a DIV containing the tab content.
* @param boolean Whether or not to run the event onload or instantly
* @param string The ID to use for the tabs for if you run multiple instances of the tabbing control in one html page
* @param array $tabs Array of tabs in name => title format. Name should correspond to the name of a DIV containing the tab content.
* @param boolean $observe_onload Whether or not to run the event onload or instantly
* @param string $id The ID to use for the tabs for if you run multiple instances of the tabbing control in one html page
*/
function output_tab_control($tabs=array(), $observe_onload=true, $id="tabs")
{
Expand Down Expand Up @@ -814,8 +822,8 @@ function output_tab_control($tabs=array(), $observe_onload=true, $id="tabs")
/**
* Output a series of primary navigation tabs for swithcing between items within a particular module/action.
*
* @param array Nested array of tabs containing possible keys of align, link_target, link, title.
* @param string The name of the active tab. Corresponds with the key of each tab item.
* @param array $tabs Nested array of tabs containing possible keys of align, link_target, link, title.
* @param string $active The name of the active tab. Corresponds with the key of each tab item.
*/
function output_nav_tabs($tabs=array(), $active='')
{
Expand Down Expand Up @@ -859,9 +867,9 @@ function output_nav_tabs($tabs=array(), $active='')
/**
* Output a page asking if a user wishes to continue performing a specific action.
*
* @param string The URL to be forwarded to.
* @param string The confirmation message to output.
* @param string The title to use in the output header
* @param string $url The URL to be forwarded to.
* @param string $message The confirmation message to output.
* @param string $title The title to use in the output header
*/
function output_confirm_action($url, $message="", $title="")
{
Expand Down Expand Up @@ -899,8 +907,9 @@ function output_confirm_action($url, $message="", $title="")
/**
* Build a clickable MyCode editor for the Admin CP.
*
* @param string The ID of the textarea to bind the editor to.
* @param string The language string for the editor.
* @param string $bind The ID of the textarea to bind the editor to.
* @param string $editor_language The language string for the editor.
* @param bool $smilies Whether or not smilies should be included
* @return string The build MyCode editor Javascript.
*/
function build_codebuttons_editor($bind, $editor_language, $smilies)
Expand All @@ -910,10 +919,14 @@ function build_codebuttons_editor($bind, $editor_language, $smilies)
// Smilies
$emoticon = "";
$emoticons_enabled = "false";
if($smilies && $mybb->settings['smilieinserter'] != 0 && $mybb->settings['smilieinsertercols'] && $mybb->settings['smilieinsertertot'])
if($smilies)
{
$emoticon = ",emoticon";
if($mybb->settings['smilieinserter'] && $mybb->settings['smilieinsertercols'] && $mybb->settings['smilieinsertertot'])
{
$emoticon = ",emoticon";
}
$emoticons_enabled = "true";

if(!$smiliecount)
{
$smilie_cache = $cache->read("smilies");
Expand All @@ -928,11 +941,8 @@ function build_codebuttons_editor($bind, $editor_language, $smilies)
}
foreach($smilie_cache as $smilie)
{
if($smilie['showclickable'] != 0)
{
$smilie['image'] = str_replace("{theme}", "images", $smilie['image']);
$smiliecache[$smilie['find']] = $smilie['image'];
}
$smilie['image'] = str_replace("{theme}", "images", $smilie['image']);
$smiliecache[$smilie['sid']] = $smilie;
}
}

Expand All @@ -945,21 +955,27 @@ function build_codebuttons_editor($bind, $editor_language, $smilies)
$dropdownsmilies = $moresmilies = $hiddensmilies = "";
$i = 0;

foreach($smiliecache as $find => $image)
foreach($smiliecache as $smilie)
{
$finds = explode("\n", $find);
$finds = explode("\n", $smilie['find']);
$finds_count = count($finds);

// Only show the first text to replace in the box
$find = str_replace(array('\\', '"'), array('\\\\', '\"'), htmlspecialchars_uni($finds[0]));
$image = str_replace(array('\\', '"'), array('\\\\', '\"'), htmlspecialchars_uni($image));
$image = str_replace(array('\\', '"'), array('\\\\', '\"'), htmlspecialchars_uni($smilie['image']));
if(substr($image, 0, 4) != "http")
{
$image = $mybb->settings['bburl']."/".$image;
}
if($i < $mybb->settings['smilieinsertertot'])

if(!$mybb->settings['smilieinserter'] || !$mybb->settings['smilieinsertercols'] || !$mybb->settings['smilieinsertertot'] || !$smilie['showclickable'])
{
$hiddensmilies .= '"'.$find.'": "'.$image.'",';
}
elseif($i < $mybb->settings['smilieinsertertot'])
{
$dropdownsmilies .= '"'.$find.'": "'.$image.'",';
++$i;
}
else
{
Expand All @@ -971,7 +987,6 @@ function build_codebuttons_editor($bind, $editor_language, $smilies)
$find = str_replace(array('\\', '"'), array('\\\\', '\"'), htmlspecialchars_uni($finds[$j]));
$hiddensmilies .= '"'.$find.'": "'.$image.'",';
}
++$i;
}
}
}
Expand Down Expand Up @@ -1044,6 +1059,7 @@ function build_codebuttons_editor($bind, $editor_language, $smilies)
rtl: {$lang->settings['rtl']},
locale: "mybblang",
enablePasteFiltering: true,
autoUpdate: true,
emoticonsEnabled: {$emoticons_enabled},
emoticons: {
// Emoticons to be included in the dropdown
Expand Down Expand Up @@ -1080,7 +1096,7 @@ function build_codebuttons_editor($bind, $editor_language, $smilies)
class DefaultSidebarItem
{
/**
* @var The title of the side bar block.
* @var string The title of the side bar block.
*/
private $_title;

Expand All @@ -1092,7 +1108,7 @@ class DefaultSidebarItem
/**
* Constructor. Set the title of the side bar block.
*
* @param string The title of the side bar block.
* @param string $title The title of the side bar block.
*/
function __construct($title="")
{
Expand All @@ -1102,8 +1118,8 @@ function __construct($title="")
/**
* Add menus item to the side bar block.
*
* @param array Array of menu items to add. Each menu item should be a nested array of id, link and title.
* @param string The ID of the active menu item if there is one.
* @param array $items Array of menu items to add. Each menu item should be a nested array of id, link and title.
* @param string $active The ID of the active menu item if there is one.
*/
function add_menu_items($items, $active)
{
Expand Down Expand Up @@ -1131,7 +1147,7 @@ function add_menu_items($items, $active)
/**
* Sets custom html to the contents variable
*
* @param string The custom html to set
* @param string $html The custom html to set
*/
function set_contents($html)
{
Expand All @@ -1140,6 +1156,8 @@ function set_contents($html)

/**
* Fetch the HTML markup for the side bar box.
*
* @return string
*/
function get_markup()
{
Expand Down Expand Up @@ -1177,8 +1195,8 @@ class DefaultPopupMenu
/**
* Initialise a new popup menu.
*
* @var string The ID of the popup menu.
* @var string The title of the popup menu.
* @var string $id The ID of the popup menu.
* @var string $title The title of the popup menu.
*/
function __construct($id, $title='')
{
Expand All @@ -1189,9 +1207,9 @@ function __construct($id, $title='')
/**
* Add an item to the popup menu.
*
* @param string The title of this item.
* @param string The page this item should link to.
* @param string The onclick event handler if we have one.
* @param string $text The title of this item.
* @param string $link The page this item should link to.
* @param string $onclick The onclick event handler if we have one.
*/
function add_item($text, $link, $onclick='')
{
Expand Down
Loading

0 comments on commit a3cfe8d

Please sign in to comment.