From 738c95447626fe46f58981f4e36000325dddae8b Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 1 Jun 2004 17:02:20 +0000 Subject: [PATCH] - enable admin login if board disabled - new reply image for pm's (fits better into the style) git-svn-id: file:///svn/phpbb/trunk@4906 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/pagestart.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- .../subSilver/imageset/en/btn_reply_pm.gif | Bin 0 -> 1667 bytes phpBB/styles/subSilver/imageset/imageset.cfg | 2 +- phpBB/ucp.php | 7 ++++++- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 phpBB/styles/subSilver/imageset/en/btn_reply_pm.gif diff --git a/phpBB/adm/pagestart.php b/phpBB/adm/pagestart.php index d69f5c9b86..cf39dcc367 100644 --- a/phpBB/adm/pagestart.php +++ b/phpBB/adm/pagestart.php @@ -36,7 +36,7 @@ $user->setup('admin'); // Did user forget to login? Give 'em a chance to here ... if ($user->data['user_id'] == ANONYMOUS) { - login_box("{$phpbb_root_path}adm/index.$phpEx$SID", '', $user->lang['LOGIN_ADMIN']); + login_box("./adm/index.$phpEx$SID", '', $user->lang['LOGIN_ADMIN']); } $auth->acl($user->data); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 4032fcec73..d48a67f00f 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -305,7 +305,7 @@ INSERT INTO phpbb_styles (style_id, style_name, style_copyright, template_id, th # MSSQL IDENTITY phpbb_styles_imageset ON # # -- phpbb_styles_imageset -INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_ip, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, karma_left, karma_center, karma_right, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES (1, 'subSilver', '© phpBB Group', 'subSilver', '', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_reply.gif*27*97', '{LANG}/reply.gif*25*95', '{LANG}/btn_locked.gif*27*97', '{LANG}/btn_profile.gif*20*72', '{LANG}/btn_pm.gif*20*72', '{LANG}/btn_delete.gif*20*20', '{LANG}/btn_ip.gif*20*20', '{LANG}/btn_quote.gif*20*90', '{LANG}/btn_search.gif*20*72', '{LANG}/btn_edit.gif*20*90', '{LANG}/btn_report.gif*20*20', '{LANG}/btn_email.gif*20*72', '{LANG}/btn_www.gif*20*72', '{LANG}/btn_icq.gif*20*72', '{LANG}/btn_aim.gif*20*72', '{LANG}/btn_yim.gif*20*72', '{LANG}/btn_msnm.gif*20*72', '{LANG}/btn_jabber.gif*20*72', '{LANG}/btn_online.gif*20*72', '{LANG}/btn_offline.gif*20*72', '', '', 'icon_unapproved.gif*18*19', 'icon_reported.gif*18*19', 'icon_attach.gif*18*14', 'icon_minipost.gif*9*12', 'icon_minipost_new.gif*9*12', 'icon_latest_reply.gif*9*18', 'icon_newest_reply.gif*9*18', 'folder_big.gif*25*46', 'folder_new_big.gif*25*46', 'folder_locked_big.gif*25*46', 'folder_link_big.gif*25*46', 'subfolder_big.gif*25*46', 'subfolder_new_big.gif*25*46', 'folder.gif*18*19', 'folder_posted.gif*18*19', 'folder_new.gif*18*19', 'folder_new_posted.gif*18*19', 'folder_hot.gif*18*19', 'folder_hot_posted.gif*18*19', 'folder_new_hot.gif*18*19', 'folder_new_hot_posted.gif*18*19', 'folder_lock.gif*18*19', 'folder_lock_posted.gif*18*19', 'folder_lock_new.gif*18*19', 'folder_lock_new_posted.gif*18*19', 'folder_sticky.gif*18*19', 'folder_sticky_posted.gif*18*19', 'folder_sticky_new.gif*18*19', 'folder_sticky_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', '', '', '', '', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4', '', 'karma/karma{SUFFIX}.gif*6*69', '', '', '', '', '', '', '', '', '', '', ''); +INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_ip, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, karma_left, karma_center, karma_right, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES (1, 'subSilver', '© phpBB Group', 'subSilver', '', '{LANG}/btn_post.gif*27*97', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_reply.gif*27*97', '{LANG}/btn_reply_pm.gif*20*90', '{LANG}/btn_locked.gif*27*97', '{LANG}/btn_profile.gif*20*72', '{LANG}/btn_pm.gif*20*72', '{LANG}/btn_delete.gif*20*20', '{LANG}/btn_ip.gif*20*20', '{LANG}/btn_quote.gif*20*90', '{LANG}/btn_search.gif*20*72', '{LANG}/btn_edit.gif*20*90', '{LANG}/btn_report.gif*20*20', '{LANG}/btn_email.gif*20*72', '{LANG}/btn_www.gif*20*72', '{LANG}/btn_icq.gif*20*72', '{LANG}/btn_aim.gif*20*72', '{LANG}/btn_yim.gif*20*72', '{LANG}/btn_msnm.gif*20*72', '{LANG}/btn_jabber.gif*20*72', '{LANG}/btn_online.gif*20*72', '{LANG}/btn_offline.gif*20*72', '', '', 'icon_unapproved.gif*18*19', 'icon_reported.gif*18*19', 'icon_attach.gif*18*14', 'icon_minipost.gif*9*12', 'icon_minipost_new.gif*9*12', 'icon_latest_reply.gif*9*18', 'icon_newest_reply.gif*9*18', 'folder_big.gif*25*46', 'folder_new_big.gif*25*46', 'folder_locked_big.gif*25*46', 'folder_link_big.gif*25*46', 'subfolder_big.gif*25*46', 'subfolder_new_big.gif*25*46', 'folder.gif*18*19', 'folder_posted.gif*18*19', 'folder_new.gif*18*19', 'folder_new_posted.gif*18*19', 'folder_hot.gif*18*19', 'folder_hot_posted.gif*18*19', 'folder_new_hot.gif*18*19', 'folder_new_hot_posted.gif*18*19', 'folder_lock.gif*18*19', 'folder_lock_posted.gif*18*19', 'folder_lock_new.gif*18*19', 'folder_lock_new_posted.gif*18*19', 'folder_sticky.gif*18*19', 'folder_sticky_posted.gif*18*19', 'folder_sticky_new.gif*18*19', 'folder_sticky_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', '', '', '', '', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4', '', 'karma/karma{SUFFIX}.gif*6*69', '', '', '', '', '', '', '', '', '', '', ''); # MSSQL IDENTITY phpbb_styles_imageset OFF # diff --git a/phpBB/styles/subSilver/imageset/en/btn_reply_pm.gif b/phpBB/styles/subSilver/imageset/en/btn_reply_pm.gif new file mode 100644 index 0000000000000000000000000000000000000000..c476f06a446dbc206aecd8bc31a50d07469e1c14 GIT binary patch literal 1667 zcmV-}27LKPNk%w1VOjtb0QUd@00030|Ns2_{rmj<`uh9&`ug|y`1JJk@$vEO?d|C3 z=-}Ys&(F`u$jAU)j66I&P*72BZf{ptSpEI}`}_R&_xSeq_x1Jm?d|UA>FVR-+Qou2#r{pRQByuZO8EHuH^;-$C2%iihg@%7!}BP*?+27*X-QNIAaSmL94pep>UwfPX`{bdf|Yx( z$atT!f~L2Vy3Lrs(woB7nX$ZRb$hnU)x6Q$#oFY_-R8;K;@RfxxyjJZ+~U~c=Goxm z>+bJGNlN_v{rUR(^Yrxa@$v2M?&#_1=jiC>=jY$x;M&{U*xA|2%ge>a#=E?{u(7eN zuC8lqV1t8pJUli(KRQlMNHsMvfq{8pVO%#iHRk5uMMXn)c5}kQzFJyXSXfr?@9Vd> zv}kB%n3$G|iirRJ{r~^|>+9;QtgET0nBw8h-P^^8hkAB(YN4Q%&C9xNY-4+Raj&kW z*w@YB-pAkE#@pD#tg4z}U|7e*u}Voql97y4Qck|Sv}|i<_{rUO%^z`)e z^YilZ^6>ER@9*#J?d|2|<>KPv;o;%m-{0Ka+}GFF)z#I~($dh-(9X`z&CSim#>T|N z#KXhG!NI}6z`(w~zP-J@y1Kf#xw*Eswzajjva+(MsHmf(qoJXppP!$dot>JRnv#-| zk&%&(j*g0oiiwGdg@uKEeSLd-dunQGU0q#NR8&q*PCq|CK0ZD>J3Bc!IWaLYE-o%A zDk>2X5&!@HA^8LW00930EC2ui09pVP000R80RIUbI1qq4di($=B*?I#!-o(fN}MPW zK!E@l=Ov`bv7^V24&enjc467LdkaCTT*>kufD8sK1jvA@p1*x9bLwp9pr->GdHm#A zM-GyQ34{uTP_x3P)2C3QN}Wozs!xVC_)G|ZEZ?GO$&xilC(>9xRP>HvT+6nt+qZDz z%9ZOugpGj?_z0jtAziy-sNk&&_sm!TR``gG+Ge1Dpg0*7YDy?(3&fK>Eses{n zuz;BX0ssamAb>^maDo#hM6m-7PLM#r7C7K=LJtmx_s0o$5a`5!9CkQh1sOo1-Z95i zBF_ZIP=FCL*Hm&&0H@p{Og)Y$Vu1lT=BOi%LbL&h8F%2&#~(sKVSpSn03yf`N*viF z6H6G-#|dQYXyuhVBGL#o>RE6>2NLjOPbj7=ph^I%tfI;A_cpkPK5g4XHiqje^tK{e_jlMFLk>LZIKzhp8DDx#FK z$t#?^vjHmzq^jzwstz$nszWUQF@_#sc!9tbZlv193%4$jst$1AfCsC@7E5e13oxMG zGR&}|fjYJ1q6;jvxN=D^m}v4!C+0}QNCM!7D{iJ z#~W)rQHBCm@X$ucX(-@D78Vbp0v8#_EOX3_KvT^&>NWCAG|_CpK?CT-Lk~Wl^b!j% zyYSNhH5)A8^wUsBE%nn=7~ym@Qh$-c8B=%dwKN=PGl_b7Ok)iL*kseqB;kZ3PC4$( zW6wVKfRoKN4CJl%-hB69tv3}(_|3o%F2o`D;eto9O*nW2_m2&Fa1coY*=)m&H*AYD z4mp%iV$L|*G$8uuq?c~`>8FDL0_v=@o{c0U)W8r_E3Cjm3oW?t0t_+807DB_1uy*Y NR_$c`@f`&O06QuCa})po literal 0 HcmV?d00001 diff --git a/phpBB/styles/subSilver/imageset/imageset.cfg b/phpBB/styles/subSilver/imageset/imageset.cfg index fcbb68a398..dc85dc25ae 100644 --- a/phpBB/styles/subSilver/imageset/imageset.cfg +++ b/phpBB/styles/subSilver/imageset/imageset.cfg @@ -5,7 +5,7 @@ site_logo*** btn_post*{LANG}/btn_post.gif*27*97 btn_post_pm*{LANG}/btn_post_pm.gif*27*97 btn_reply*{LANG}/btn_reply.gif*27*97 -btn_reply_pm*{LANG}/reply.gif*25*95 +btn_reply_pm*{LANG}/btn_reply_pm.gif*20*90 btn_locked*{LANG}/btn_locked.gif*27*97 btn_profile*{LANG}/btn_profile.gif*20*72 btn_pm*{LANG}/btn_pm.gif*20*72 diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 35063d6184..bbc77b3ad9 100755 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -33,6 +33,12 @@ define('IN_PHPBB', true); $phpbb_root_path = './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); + +// This small snippet is required to let admins login if the board is disabled... +if ($_REQUEST['mode'] == 'login') +{ + define('IN_LOGIN', true); +} include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . '/includes/functions_user.'.$phpEx); @@ -273,7 +279,6 @@ switch ($mode) redirect("index.$phpEx$SID"); } - define('IN_LOGIN', true); login_box("ucp.$phpEx$SID&mode=login", '', '', true); $redirect = request_var('redirect', "index.$phpEx$SID");