diff options
author | Don Seiler <rizzo@gentoo.org> | 2004-05-10 15:15:35 +0000 |
---|---|---|
committer | Don Seiler <rizzo@gentoo.org> | 2004-05-10 15:15:35 +0000 |
commit | 9f16ee9625e66aadea3b7178d86edd07ab9cf962 (patch) | |
tree | 499e40289a460c687b84474d27aae884645a2b26 /net-www | |
parent | Update to rc-scripts-1.4.12, which fixes the following issues that were intro... (diff) | |
download | historical-9f16ee9625e66aadea3b7178d86edd07ab9cf962.tar.gz historical-9f16ee9625e66aadea3b7178d86edd07ab9cf962.tar.bz2 historical-9f16ee9625e66aadea3b7178d86edd07ab9cf962.zip |
Removing unused files
Diffstat (limited to 'net-www')
-rw-r--r-- | net-www/phpwebsite/ChangeLog | 6 | ||||
-rw-r--r-- | net-www/phpwebsite/Manifest | 4 | ||||
-rw-r--r-- | net-www/phpwebsite/files/phpwebsite-0.9.3_p1-supplemental.patch | 176 | ||||
-rw-r--r-- | net-www/phpwebsite/files/update.php-0.9.3_p1 | 261 |
4 files changed, 6 insertions, 441 deletions
diff --git a/net-www/phpwebsite/ChangeLog b/net-www/phpwebsite/ChangeLog index f61575d5a9ef..58de6cbe8713 100644 --- a/net-www/phpwebsite/ChangeLog +++ b/net-www/phpwebsite/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/phpwebsite # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/ChangeLog,v 1.14 2004/04/21 19:19:54 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/ChangeLog,v 1.15 2004/05/10 15:15:35 rizzo Exp $ + + 10 May 2004; Don Seiler <rizzo@gentoo.org>; + -files/phpwebsite-0.9.3_p1-supplemental.patch, -files/update.php-0.9.3_p1: + Removing unused files 21 Apr 2004; Martin Holzer <mholzer@gentoo.org> phpwebsite-0.9.3_p2-r1.ebuild: diff --git a/net-www/phpwebsite/Manifest b/net-www/phpwebsite/Manifest index 4d131995734c..5142f39e8d98 100644 --- a/net-www/phpwebsite/Manifest +++ b/net-www/phpwebsite/Manifest @@ -1,6 +1,4 @@ MD5 546e22aee990d1df0ca441686452058b phpwebsite-0.9.3_p2-r1.ebuild 2087 +MD5 e299a825143a3559b1677a58f718ea95 ChangeLog 2357 MD5 ecbb5a02001856289bc050635b8d8394 metadata.xml 522 -MD5 d244e54fe7ef9f3ada52d6f576c7a959 ChangeLog 2211 -MD5 6900db4c93191d45ead777402606db12 files/phpwebsite-0.9.3_p1-supplemental.patch 6186 -MD5 a7257ff9063723778a81865e8ff9aba2 files/update.php-0.9.3_p1 7892 MD5 5d0bf869aca158f5d35948955a1aafee files/digest-phpwebsite-0.9.3_p2-r1 136 diff --git a/net-www/phpwebsite/files/phpwebsite-0.9.3_p1-supplemental.patch b/net-www/phpwebsite/files/phpwebsite-0.9.3_p1-supplemental.patch deleted file mode 100644 index 33acf0e260a4..000000000000 --- a/net-www/phpwebsite/files/phpwebsite-0.9.3_p1-supplemental.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff -ruN phpwebsite-0.9.3-1-full-orig/core/EZform.php phpwebsite-0.9.3-1-full/core/EZform.php ---- phpwebsite-0.9.3-1-full-orig/core/EZform.php 2003-08-19 14:16:28.000000000 -0500 -+++ phpwebsite-0.9.3-1-full/core/EZform.php 2003-10-22 12:44:41.000000000 -0500 -@@ -11,6 +11,7 @@ - define("MAX_IMAGE_SIZE", 80000); - - require_once PHPWS_SOURCE_DIR . "core/EZelement.php"; -+require_once("Date.php"); - - /** - * Creates HTML form elements and/or an entire form -@@ -410,7 +411,6 @@ - * @param string name Name of element to set the type - */ - function reindexValue($name){ -- // echo phpws_debug::testobject($this); - if (!$this->testName($name) - || ($this->_elements[$name]->type != "multiple" && $this->_elements[$name]->type != "select") - || !is_array($this->_elements[$name]->value)) -@@ -540,9 +540,9 @@ - - if (is_array($element)){ - foreach ($element as $data) -- $formElement .= $data; -- return $formElements; -- } else -+ $formElements[] = $data; -+ return implode("", $formElements); -+ } else - return $element; - } - -@@ -886,20 +886,23 @@ - $match_m = NULL; - $match_d = NULL; - if (is_null($match) && !$useBlanks) { -- $match = time(); -- $match_y = date("Y", $match); -- $match_m = date("n", $match); -- $match_d = date("j", $match); -+ $mdate = new Date(); -+ $match_y = $mdate->format("%Y"); -+ $match_m = $mdate->format("%m"); -+ $match_d = $mdate->format("%d"); - } elseif (is_null($match) && $useBlanks) { - $match_y = NULL; - $match_m = NULL; - $match_d = NULL; - } else { - if(empty($match)) -- $match = time(); -- $match_y = date("Y", $match); -- $match_m = date("n", $match); -- $match_d = date("j", $match); -+ $mdate = new Date(); -+ else -+ $mdate = new Date($match); -+ -+ $match_y = $mdate->format("%Y"); -+ $match_m = $mdate->format("%m"); -+ $match_d = $mdate->format("%d"); - } - - if(!$textYear) { -@@ -1000,16 +1003,17 @@ - $match_h = NULL; - $match_m = NULL; - $match_ampm = NULL; -- if (is_null($match) || empty($match)) { -- $match = time(); -- } -+ if(empty($match)) -+ $mtime = new Date(); -+ else -+ $mtime = new Date($match); - - if($military) -- $match_h = date("G", $match); -+ $match_h = $mtime->format("%H"); - else -- $match_h = date("g", $match); -- $match_m = date("i", $match); -- $match_ampm = date("A", $match); -+ $match_h = $mtime->format("%I"); -+ $match_m = $mtime->format("%M"); -+ $match_ampm = $mtime->format("%P"); - - $ampm = array(0=>"AM", 1=>"PM"); - if($match_ampm == "AM") -diff -ruN phpwebsite-0.9.3-1-full-orig/core/Template.php phpwebsite-0.9.3-1-full/core/Template.php ---- phpwebsite-0.9.3-1-full-orig/core/Template.php 2003-05-01 08:29:08.000000000 -0500 -+++ phpwebsite-0.9.3-1-full/core/Template.php 2003-10-29 10:08:00.000000000 -0600 -@@ -155,7 +155,7 @@ - /* If var $template is a string process the string as the template */ - /* var $template is a filename, so get path to the file */ - if ($defaultDir){ -- $templateDir = $this->getTemplateDir($module, $template); -+ $templateDir = PHPWS_Template::getTemplateDir($module, $template); - if($templateDir) { - $tpl = new HTML_Template_IT($templateDir); - $tpl->loadTemplatefile($template, TRUE, TRUE); -diff -ruN phpwebsite-0.9.3-1-full-orig/js/check_all.php phpwebsite-0.9.3-1-full/js/check_all.php ---- phpwebsite-0.9.3-1-full-orig/js/check_all.php 2003-05-08 14:41:52.000000000 -0500 -+++ phpwebsite-0.9.3-1-full/js/check_all.php 2003-10-31 14:01:40.000000000 -0600 -@@ -1,7 +1,7 @@ - <?php - //Code from SquirrelMail - --$this->js_func[] = " -+$GLOBALS["core"]->js_func[] = " - function CheckAll() { - for (var i = 0; i < document.$form_name.elements.length; i++) { - if( document.$form_name.elements[i].type == 'checkbox' ) { -@@ -13,4 +13,4 @@ - - $js = "<a href=\"#\" onclick=\"CheckAll()\" >Toggle All</a>"; - --?> -\ No newline at end of file -+?> -diff -ruN phpwebsite-0.9.3-1-full-orig/js/confirm.php phpwebsite-0.9.3-1-full/js/confirm.php ---- phpwebsite-0.9.3-1-full-orig/js/confirm.php 2003-02-04 10:10:47.000000000 -0600 -+++ phpwebsite-0.9.3-1-full/js/confirm.php 2003-10-31 14:01:53.000000000 -0600 -@@ -1,7 +1,7 @@ - <?php - - --$this->js_func[] = " -+$GLOBALS["core"]->js_func[] = " - function confirmData_" . $section_name . "() - { - if (confirm(\"$message\\nOK = YES, CANCEL = NO\")) -@@ -10,4 +10,4 @@ - - $js = $this->formButton($name, $value, "confirmData_" . $section_name . "();"); - --?> -\ No newline at end of file -+?> -diff -ruN phpwebsite-0.9.3-1-full-orig/js/wysiwyg.php phpwebsite-0.9.3-1-full/js/wysiwyg.php ---- phpwebsite-0.9.3-1-full-orig/js/wysiwyg.php 2003-03-17 14:57:33.000000000 -0600 -+++ phpwebsite-0.9.3-1-full/js/wysiwyg.php 2003-10-31 13:58:26.000000000 -0600 -@@ -1,6 +1,6 @@ - <?php - --$this->js_func[] = " -+$GLOBALS["core"]->js_func[] = " - - var body=0; - var opcode=''; -@@ -73,4 +73,4 @@ - $js .= "<a href=\"#".$section_name."\" onclick=\"".$section_name."_addLink()\">" . phpws_text::imageTag($this->source_http ."js/wysiwyg/link.gif", "Link", 21, 20) . "</a>\n"; - $js .= "<a href=\"#".$section_name."\" onclick=\"".$section_name."_addBreak()\">" . phpws_text::imageTag($this->source_http ."js/wysiwyg/break.gif", "Break", 20, 20) . "</a><br />\n"; - --?> -\ No newline at end of file -+?> -diff -ruN phpwebsite-0.9.3-1-full-orig/mod/calendar/class/Display.php phpwebsite-0.9.3-1-full/mod/calendar/class/Display.php ---- phpwebsite-0.9.3-1-full-orig/mod/calendar/class/Display.php 2003-07-01 12:52:07.000000000 -0500 -+++ phpwebsite-0.9.3-1-full/mod/calendar/class/Display.php 2003-10-22 12:45:41.000000000 -0500 -@@ -1,7 +1,7 @@ - <?php - - define("VIEW_TTL", 300); --require ("Date.php"); -+require_once("Date.php"); - class PHPWS_Calendar_Display{ - - var $startDate; -@@ -843,4 +843,4 @@ - - } - --?> -\ No newline at end of file -+?> diff --git a/net-www/phpwebsite/files/update.php-0.9.3_p1 b/net-www/phpwebsite/files/update.php-0.9.3_p1 deleted file mode 100644 index 45a1c943b016..000000000000 --- a/net-www/phpwebsite/files/update.php-0.9.3_p1 +++ /dev/null @@ -1,261 +0,0 @@ -<?php -define("UPDATE_BRANCHES", TRUE); - -if(is_file("../conf/pear_path.php")) - include("../conf/pear_path.php"); - -define("PHPWS_SOURCE_DIR", "../"); -require_once ("../core/Core.php"); - -$core = new PHPWS_Core(NULL, "../", TRUE); - -require_once("../mod/language/class/Language.php"); -require_once("../mod/boost/class/Boost.php"); -require_once("../mod/users/class/Users.php"); -require_once("../mod/layout/class/Layout.php"); -require_once("../mod/help/class/CLS_help.php"); - -$coreVersion = PHPWS_Boost::getVersionInfo("core"); -$currentVersion = $coreVersion['version']; -$match = "(\d)\.(\d)(\d)"; -$currentVersion = preg_replace("/$match/", "\\1.\\2.\\3", $currentVersion); - -session_start(); - -include("allow_setup.php"); - -if ($GLOBALS['core']->sqlTableExists("branch_sites", TRUE)) $GLOBALS['branchExists'] = TRUE; -else $GLOBALS['branchExists'] = FALSE; - -if (!isset($_SESSION["translate"])) - $_SESSION["translate"] = new PHPWS_Language; - -if (!isset($_SESSION["OBJ_user"])) - $_SESSION["OBJ_user"] = new PHPWS_User; - -if (!isset($_SESSION["OBJ_layout"])) - $_SESSION["OBJ_layout"] = new PHPWS_Layout(FALSE); - -$body[] = startpage($currentVersion); - -if (isset($_POST['checkPass'])){ - $_SESSION['OBJ_user']->setDeity(checkPassword($_POST['updatePass'])); -} - -if (!$_SESSION['OBJ_user']->isDeity()){ - $body[] = loginAdmin(); -} elseif (isset($_POST['updateModules'])){ - $body[] = "<h2>" . $_SESSION["translate"]->it("Updating modules") . "...</h2>"; - - if (isset($_POST['addModules'])){ - if ($updateMessage = updateModules($_POST['addModules'])){ - $body[] = $updateMessage; - - if ($GLOBALS['branchExists'] && UPDATE_BRANCHES) - $body[] = updateBranchModules($_POST['addModules']); - - $body[] = "<br />All Modules Updated!"; - } else - $body[] = "<br />No modules selected..."; - } - $body[] = "<br /><br /><a href=\"update.php\">Return to Update</a>"; -} else { - $body[] = updateCore($currentVersion); - $body[] = updateForm(); -} - -$body[] = "</body> -</html>"; - -echo implode("", $body); - - -/************************************************************************ -* Functions -*************************************************************************/ -function startpage($currentVersion){ - $content = "<html> -<head> -<meta name=\"robots\" content=\"noindex, nofollow\" /> -<script language=\"JavaScript\" type=\"text/javascript\"> -<!-- -function CheckAll() { - for (var i = 0; i < document.modules.elements.length; i++) { - if( document.modules.elements[i].type == 'checkbox' ) { - document.modules.elements[i].checked = !(document.modules.elements[i].checked); - } - } -} -//--> -</script> -<title>".$_SESSION["translate"]->it("phpWebSite Updater")."</title> -</head> -<body> -<img src=\"poweredby.jpg\" /><br /> -<h1>" . $_SESSION["translate"]->it("phpWebSite Updater"); - $coreVersion = $GLOBALS['core']->version; - - if ($currentVersion < $coreVersion) - $content .= ": " . $_SESSION["translate"]->it("Version [var1] to [var2]", $currentVersion, $GLOBALS['core']->version); - - $content .= "</h1>"; - - return $content; -} - - -function loginAdmin(){ - $content[] = "<h2>" . $_SESSION["translate"]->it("Welcome to the phpWebSite Updater") . "!</h2><b>" . $_SESSION["translate"]->it("Enter your Installation Password below") . "</b><br /><br />"; - $form = new EZForm; - $form->setAction("update.php"); - $form->add("checkPass", "hidden", 1); - $form->add("updatePass", "password"); - $template = $form->getTemplate(); - $content[] = implode("", $template); - return implode("", $content); -} - -function checkPassword($password){ - include("../conf/config.php"); - if ($install_pw == $password) - return TRUE; - else - return FALSE; - } - -function updateBranchCore($currentVersion){ - if ($GLOBALS['branchExists'] && $sql = $GLOBALS["core"]->sqlSelect("branch_sites")){ - foreach ($sql as $branch){ - if(!($GLOBALS["core"]->loadDatabase(PHPWS_SOURCE_DIR . "conf/branch/". $branch["configFile"], TRUE))){ - $content[] = "<b>" . $_SESSION["translate"]->it("Unable to connect to branch database for [var1]", $branch["branchName"]) . "</b><br /><br />"; - continue; - } - - $content [] = "<b>".$_SESSION["translate"]->it("Updating branch").": ".$branch["branchName"]."</b><br /><br />"; - updateCore($currentVersion, FALSE); - } - - $GLOBALS["core"]->loadDatabase(); - return implode("", $content); - } else - return NULL; -} - -function updateBranchModules($moduleList){ - if ($GLOBALS['branchExists'] && $sql = $GLOBALS["core"]->sqlSelect("branch_sites")){ - foreach ($sql as $branch){ - $branchConfig = PHPWS_SOURCE_DIR . "conf/branch/". $branch["configFile"]; - if (!is_file($branchConfig)){ - $content[] = "<b>" . $_SESSION["translate"]->it("Unable to load file [var1] for branch [var2]", $branchConfig, $branch['branchName']) . "</b><br /><br />"; - continue; - } - - if (!$GLOBALS["core"]->loadDatabase($branchConfig, TRUE)){ - $content[] = "<b>" . $_SESSION["translate"]->it("Unable to connect to branch database for [var1]", $branch["branchName"]) . "</b><br /><br />"; - continue; - } - - $content [] = "<b>".$_SESSION["translate"]->it("Updating branch modules").": " . $branch["branchName"] . "</b><br /><br />"; - updateModules($moduleList); - } - - $GLOBALS["core"]->loadDatabase(); - return implode("", $content); - } else - return NULL; -} - -function updateCore($currentVersion, $isHub=TRUE){ - include("defaultMods.php"); - $update = FALSE; - - if ($currentVersion < "0.9.1"){ - include ("core_updates/update_091.php"); - $update = TRUE; - } - - if ($currentVersion < "0.9.2"){ - include ("core_updates/update_092.php"); - $update = TRUE; - } - - if ($currentVersion < "0.9.3-1"){ - $update = TRUE; - } - - if ($update){ - phpws_boost::setVersionInfo(PHPWS_SOURCE_DIR . "conf/core_info.php", "update"); - $content[] = "<h2>Core Updated!</h2>"; - if ($isHub && $GLOBALS['branchExists'] && UPDATE_BRANCHES) - $content[] = updateBranchCore($currentVersion); - } - else - $content[] = "<h2>Core update not required</h2>"; - - foreach ($defaultMods as $mod_title){ - if (phpws_boost::needsUpdate($mod_title)) - $coreModList[] = $mod_title; - } - - if (isset($coreModList)) - $content[] = updateModules($coreModList); - - return implode("", $content); -} - - -function updateForm(){ - include("defaultMods.php"); - - $modules = $GLOBALS['core']->sqlSelect("modules"); - - foreach ($modules as $modInfo){ - if (phpws_boost::needsUpdate($modInfo['mod_title'])) - $mods[$modInfo['mod_title']] = $modInfo['mod_pname']; - } - - if (!isset($mods) || !count($mods)) - return "No mods currently require updating.<br />"; - - foreach ($defaultMods as $modRemove) - unset($mods[$modRemove]); - - - $content[] = "<b>You may update the following modules:</b>"; - $form = new EZForm("modules"); - $form->add("updateModules", "hidden", 1); - $form->setAction("update.php"); - $content[] = $form->getStart(); - $content[] = $form->get("updateModules"); - foreach($mods as $modDir=>$modpname){ - $form->add("addModules[" . $modDir . "]", "checkbox", $modDir); - $content[] = $form->get("addModules[" . $modDir . "]") . " " . $modpname . "<br />\n"; - } - $form->add("button", "submit", "Update Modules"); - $content[] = "<br />" . $form->get("button"); - $content[] = $GLOBALS['core']->formButton($_SESSION["translate"]->it("Check All"), "toggle", "CheckAll();"); - $content[] = "</form>"; - - return implode("", $content); -} - -function updateModules($moduleList){ - if (!isset($moduleList)){ - $content[] = "No modules selected<br />"; - return NULL; - } else { - foreach ($moduleList as $mod_title){ - if (PHPWS_Boost::updateModule($mod_title, NULL, TRUE)){ - $content[] = $GLOBALS["CNT_boost"]["content"] . "<hr />"; - unset($GLOBALS["CNT_boost"]["content"]); - } - } - } - - if (isset($content)) - return implode("", $content); - else - return NULL; -} - -?>
\ No newline at end of file |