Menu
▾
▴
[Tikiwiki-cvs] tiki tiki-admin_include_wiki.php,1.28,1.29 tiki-admin_score.php,1.2,1.3 tiki-editpage.php,1.90,1.91 tiki-friends.php,1.3,1.4 tiki-login.php,1.30,1.31 tiki-pagehistory.php,1.15,1.16 tiki-setup.php,1.243,1.244
Update of /cvsroot/tikiwiki/tiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25633 Modified Files: tiki-admin_include_wiki.php tiki-admin_score.php tiki-editpage.php tiki-friends.php tiki-login.php tiki-pagehistory.php tiki-setup.php Log Message: Merge from BRANCH-1-9 to HEAD, thankyou for travelling tiki :) Index: tiki-admin_include_wiki.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_wiki.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- tiki-admin_include_wiki.php 30 Jun 2004 20:25:30 -0000 1.28 +++ tiki-admin_include_wiki.php 1 Jul 2004 00:07:02 -0000 1.29 @@ -584,6 +584,22 @@ $smarty->assign("feature_wiki_ext_icon", 'n'); } + if (isset($_REQUEST["feature_wiki_userpage"]) && $_REQUEST["feature_wiki_userpage"] == "on") { + $tikilib->set_preference("feature_wiki_userpage", 'y'); + $smarty->assign("feature_wiki_userpage", 'y'); + } else { + $tikilib->set_preference("feature_wiki_userpage", 'n'); + $smarty->assign("feature_wiki_userpage", 'n'); + } + + if (isset($_REQUEST["feature_wiki_userpage_prefix"]) && $_REQUEST["feature_wiki_userpage_prefix"]) { + $tikilib->set_preference("feature_wiki_userpage_prefix", $_REQUEST["feature_wiki_userpage_prefix"]); + $smarty->assign("feature_wiki_userpage_prefix", $_REQUEST["feature_wiki_userpage_prefix"]); + } else { + $tikilib->set_preference("feature_wiki_userpage_prefix", 'UserPage'); + $smarty->assign("feature_wiki_userpage_prefix", 'UserPage'); + } + } if (isset($_REQUEST["wikisetprefs"])) { Index: tiki-admin_score.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_score.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- tiki-admin_score.php 8 Apr 2004 05:45:56 -0000 1.2 +++ tiki-admin_score.php 1 Jul 2004 00:07:02 -0000 1.3 @@ -2,10 +2,25 @@ require_once('tiki-setup.php'); include_once('lib/score/scorelib.php'); +if ($tiki_p_admin != 'y') { + $smarty->assign('msg', tra("You dont have permission to use this feature")); + + $smarty->display("error.tpl"); + die; +} + +if ($feature_score != 'y') { + $smarty->assign('msg', tra("Feature disabled")); + $smarty->display("error.tpl"); + die; +} + if (isset($_REQUEST['events']) && is_array($_REQUEST['events'])) { + check_ticket('admin-score'); $scorelib->update_events($_REQUEST['events']); } +ask_ticket('admin-score'); $smarty->assign('events',$scorelib->get_all_events()); $smarty->assign('mid','tiki-admin_score.tpl'); Index: tiki-editpage.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-editpage.php,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- tiki-editpage.php 27 Jun 2004 03:05:41 -0000 1.90 +++ tiki-editpage.php 1 Jul 2004 00:07:02 -0000 1.91 @@ -69,6 +69,12 @@ return $a1["version"] - $a2["version"]; } +if (isset($_REQUEST['cancel_edit'])) { + $page = urlencode($page); + header("location: tiki-index.php?page=$page"); + die; +} + if (isset($_FILES['userfile1']) && is_uploaded_file($_FILES['userfile1']['tmp_name'])) { check_ticket('edit-page'); require ("lib/webmail/mimeDecode.php"); @@ -360,15 +366,17 @@ $_REQUEST['edit'] .= $sdta; } // -if(strcasecmp(substr($page,0,8),"UserPage")==0) { - $name = substr($page,8); - if(strcasecmp($user,$name)!=0) { - if($tiki_p_admin != 'y') { - $smarty->assign('msg',tra("You cannot edit this page because it is a user personal page")); - $smarty->display("error.tpl"); - die; - } - } +if ($feature_wiki_userpage == 'y') { + if(strcasecmp(substr($page,0,strlen($feature_wiki_userpage_prefix)),$feature_wiki_userpage_prefix)==0) { + $name = substr($page,strlen($feature_wiki_userpage_prefix)); + if(strcasecmp($user,$name)!=0) { + if($tiki_p_admin != 'y') { + $smarty->assign('msg',tra("You cannot edit this page because it is a user personal page")); + $smarty->display("error.tpl"); + die; + } + } + } } if ($_REQUEST["page"] == 'SandBox' && $feature_sandbox != 'y') { Index: tiki-friends.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-friends.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tiki-friends.php 28 Jun 2004 16:16:24 -0000 1.3 +++ tiki-friends.php 1 Jul 2004 00:07:02 -0000 1.4 @@ -1,7 +1,6 @@ <?php // Initialization require_once('tiki-setup.php'); -include_once("lib/imagegals/imagegallib.php"); include_once('lib/messu/messulib.php'); if(!$user) { @@ -16,6 +15,7 @@ die; } +// TODO: all messages should be translated to receiver language, not sender. if (isset($_REQUEST['request_friendship'])) { $friend = $_REQUEST['request_friendship']; Index: tiki-login.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-login.php,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- tiki-login.php 27 Jun 2004 03:05:41 -0000 1.30 +++ tiki-login.php 1 Jul 2004 00:07:02 -0000 1.31 @@ -34,19 +34,17 @@ // $_SESSION['loginfrom'] = basename($_SERVER['HTTP_REFERER']); $_url = parse_url($_SERVER['HTTP_REFERER']); $_SESSION['loginfrom'] = $_url['path']; + if (!empty($_url['query'])) { + $_SESSION['loginfrom'] .= '?'.$_url['query']; + } } else { //Oh well, back to tikiIndex // $_SESSION['loginfrom'] = basename($tikiIndex); $_url = parse_url($tikiIndex); $_SESSION['loginfrom'] = $_url['path']; - } -} - -if (isset($_REQUEST['page'])) { - if ($_REQUEST['page'] == 'tikiIndex') { - $_SESSION['loginfrom'] = $tikiIndex; - } else { - $_SESSION['loginfrom'] = $_REQUEST['page']; + if (!empty($_url['query'])) { + $_SESSION['loginfrom'] .= '?'.$_url['query']; + } } } Index: tiki-pagehistory.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-pagehistory.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- tiki-pagehistory.php 11 Jun 2004 20:35:01 -0000 1.15 +++ tiki-pagehistory.php 1 Jul 2004 00:07:02 -0000 1.16 @@ -90,7 +90,7 @@ $smarty->assign('diff2', 'n'); if (isset($_REQUEST["diff2"])) { - require_once('lib/diff.php'); + require_once('lib/diff/difflib.php'); $diff = $histlib->get_version($page, $_REQUEST["diff2"]); $info = $tikilib->get_page_info($page); Index: tiki-setup.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-setup.php,v retrieving revision 1.243 retrieving revision 1.244 diff -u -d -r1.243 -r1.244 --- tiki-setup.php 27 Jun 2004 03:05:41 -0000 1.243 +++ tiki-setup.php 1 Jul 2004 00:07:02 -0000 1.244 @@ -572,6 +572,11 @@ $smarty->assign('feature_sheet', $feature_sheet); $feature_multilingual = 'y'; $smarty->assign('feature_multilingual', $feature_multilingual); +$feature_wiki_userpage = 'y'; +$smarty->assign('feature_wiki_userpage', $feature_wiki_userpage); +$feature_wiki_userpage_prefix = 'UserPage'; +$smarty->assign('feature_wiki_userpage_prefix', $feature_wiki_userpage_prefix); + $rss_forums = 'y'; $rss_forum = 'y'; @@ -1613,53 +1618,43 @@ } else { $chkpage = NULL; } - //When tiki-index or tiki-editpage is loading, check if page is locked - if (!empty($chkpage) && $tikilib->semaphore_is_set($chkpage, $warn_on_edit_time * 60)) { - //When tiki-editpage.php is loading, check to see if there is an editing conflict - if ($current_page == 'tiki-editpage' && $tikilib->get_semaphore_user($chkpage) != $user) { - $smarty->assign('editpageconflict', 'y'); - $editpageconflict = 'y'; - } - $smarty->assign('semUser', $tikilib->get_semaphore_user($chkpage)); - $smarty->assign('beingEdited', 'y'); - $beingedited = 'y'; - } elseif (!empty($chkpage) && $current_page == 'tiki-editpage' && !isset($_REQUEST['save'])) { // Don't lock page when saving - //Lock the page that is being edited - $_SESSION["edit_lock_$chkpage"] = $tikilib->semaphore_set($chkpage); - $smarty->assign('beingEdited', 'y'); - $beingedited = 'y'; - } elseif (!empty($chkpage) && $current_page == 'tiki-editpage' && isset($_REQUEST['save'])) { - //Unlock the page when saving - $tikilib->semaphore_unset($chkpage, $_SESSION["edit_lock_$chkpage"]); - } - } - -/* -// since modern browsers can open pages in new windows or tabs, it is a bad idea to unlock a page -// just because a user browsed from tiki-editpage to another page; commenting out this code - // Remove pagelock if user just came from tiki-editpage without saving - // If the referer is editpage then unset semaphore, taking the pagename from the query - if (!empty($_SERVER['HTTP_REFERER'])) { - if (strstr($_SERVER['HTTP_REFERER'], 'tiki-editpage')) { - $purl = parse_url($_SERVER['HTTP_REFERER']); - if (!empty($purl["query"])) { - parse_str($purl["query"], $purlquery); - $chkpage = $purlquery["page"]; - if (!empty($chkpage)) { - if (isset($_SESSION["edit_lock_$chkpage"])) { - $tikilib->semaphore_unset($chkpage, $_SESSION["edit_lock_$chkpage"]); - } - } - } - } + if (!empty($chkpage)) { + if ($current_page == 'tiki-index' && $tikilib->semaphore_is_set($chkpage, $warn_on_edit_time * 60)) { + $smarty->assign('semUser', $tikilib->get_semaphore_user($chkpage)); + $smarty->assign('beingEdited', 'y'); + $beingedited = 'y'; + } elseif ($current_page == 'tiki-editpage' && isset($_REQUEST['cancel_edit'])) { + //Unlock the page when cancelling + if (!empty($_SESSION["edit_lock_$chkpage"])) { + $tikilib->semaphore_unset($chkpage, $_SESSION["edit_lock_$chkpage"]); + } + } elseif ($current_page == 'tiki-editpage' && !isset($_REQUEST['save'])) { + //When tiki-editpage.php is loading, check to see if there is an editing conflict + if ($current_page == 'tiki-editpage' && $tikilib->semaphore_is_set($chkpage, $warn_on_edit_time * 60) && $tikilib->get_semaphore_user($chkpage) != $user) { + $smarty->assign('editpageconflict', 'y'); + $editpageconflict = 'y'; + } else { + //Lock the page that is being edited + $_SESSION["edit_lock_$chkpage"] = $tikilib->semaphore_set($chkpage); + } + $smarty->assign('semUser', $tikilib->get_semaphore_user($chkpage)); + $smarty->assign('beingEdited', 'y'); + $beingedited = 'y'; + } elseif ($current_page == 'tiki-editpage' && isset($_REQUEST['save'])) { + //Unlock the page when saving + if (!empty($_SESSION["edit_lock_$chkpage"])) { + $tikilib->semaphore_unset($chkpage, $_SESSION["edit_lock_$chkpage"]); + } + } + } } -*/ } else { $smarty->assign('beingEdited', 'n'); $smarty->assign('editpageconflict', 'n'); } + if (isset($_REQUEST["pollVote"])) { if ($tiki_p_vote_poll == 'y' && isset($_REQUEST["polls_optionId"])) { if( $feature_poll_anonymous == 'y' || $user ) |