diff --git a/admin/editAppFamily.php b/admin/editAppFamily.php index 5e833e9..8871e5a 100644 --- a/admin/editAppFamily.php +++ b/admin/editAppFamily.php @@ -238,10 +238,11 @@ else echo html_table_end(); echo html_frame_end(); - + echo ""; // url edit form echo '
',"\n"; + echo ''; echo html_frame_start("Edit URL","90%","",0); echo '',"\n"; @@ -282,7 +283,7 @@ else echo '
',"\n"; echo html_frame_end(); - + echo "
"; echo html_back_link(1,BASE."appview.php?appId=$ob->appId"); } diff --git a/admin/editAppVersion.php b/admin/editAppVersion.php index 3412668..0028f09 100644 --- a/admin/editAppVersion.php +++ b/admin/editAppVersion.php @@ -21,7 +21,6 @@ if(!($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isMaintaine if(isset($_REQUEST['submit1'])) { if($_REQUEST['submit1'] == "Update Database") - { $statusMessage = ''; // Get the old values from the database @@ -29,16 +28,12 @@ if(isset($_REQUEST['submit1'])) $result = query_appdb($query); $ob = mysql_fetch_object($result); $old_versionName = $ob->versionName; - $old_keywords = $ob->keywords; $old_description = $ob->description; - $old_webPage = $ob->webPage; $old_rating = $ob->maintainer_rating; $old_release = $ob->maintainer_release; $versionName = $_REQUEST['versionName']; - $keywords = $_REQUEST['keywords']; $description = $_REQUEST['description']; - $webPage = $_REQUEST['webPage']; $maintainer_rating = $_REQUEST['maintainer_rating']; $maintainer_release = $_REQUEST['maintainer_release']; @@ -50,18 +45,6 @@ if(isset($_REQUEST['submit1'])) $WhatChanged .= " New Value: ".$versionName."\n"; $VersionChanged = true; } - if ($old_keywords <> $keywords) - { - $WhatChanged .= " Key Words: Old Value: ".stripslashes($old_keywords)."\n"; - $WhatChanged .= " New Value: ".$keywords."\n"; - $VersionChanged = true; - } - if ($old_webPage <> $webPage) - { - $WhatChanged .= " Web Page: Old Value: ".stripslashes($old_webPage)."\n"; - $WhatChanged .= " New Value: ".$webPage."\n"; - $VersionChanged = true; - } if ($old_description <> $description) { $WhatChanged .= " Description: Old Value:\n"; @@ -93,16 +76,17 @@ if(isset($_REQUEST['submit1'])) { $sUpdate = compile_update_string( array('versionName' => $versionName, 'description' => $description, - 'webPage' => $webPage, - 'keywords' => $keywords, 'maintainer_rating' => $maintainer_rating, 'maintainer_release' => $maintainer_release)); - $query = "UPDATE appVersion SET $sUpdate WHERE appId = ".$_REQUEST['appId']." and versionId = ".$_REQUEST['versionId']; + $sQuery = "UPDATE appVersion + SET $sUpdate + WHERE appId = '".$_REQUEST['appId']."' + AND versionId = '".$_REQUEST['versionId']."'"; // success - if (query_appdb($query)) + if (query_appdb($sQuery)) { - $sEmail = getNotifyEmailAddressList($_REQUEST['appId'], $_REQUEST['versionId']); + $sEmail = get_notify_email_address_list($_REQUEST['appId'], $_REQUEST['versionId']); if($sEmail) { $sFullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']); @@ -117,59 +101,183 @@ if(isset($_REQUEST['submit1'])) } addmsg("The Version was successfully updated in the database", "green"); redirect(apidb_fullurl("appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'])); - } - else - { - //error - redirect(apidb_fullurl("admin/editAppVersion.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'])); - } - + } else + { + //error + redirect(apidb_fullurl("admin/editAppVersion.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'])); + } } else { addmsg("Nothing changed", "red"); redirect(apidb_fullurl("admin/editAppVersion.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'])); } } + else if($_REQUEST['submit1'] == "Update URL") + { + + $sWhatChanged = ""; + $bAppChanged = false; + + if (!empty($_REQUEST['url_desc']) && !empty($_REQUEST['url']) ) + { + // process added URL + if($_SESSION['current']->showDebuggingInfos()) { echo "

{$_REQUEST['url']}: {$_REQUEST['url_desc']}

"; } + + $aInsert = compile_insert_string( array( 'appId' => $_REQUEST['appId'], + 'versionId' => $_REQUEST['versionId'], + 'type' => 'url', + 'description' => $_REQUEST['url_desc'], + 'url' => $_REQUEST['url'])); + + $sQuery = "INSERT INTO appData ({$aInsert['FIELDS']}) VALUES ({$aInsert['VALUES']})"; + + if($_SESSION['current']->showDebuggingInfos()) { echo "

query: $sQuery

"; } + + if (query_appdb($sQuery)) + { + addmsg("The URL was successfully added into the database", "green"); + $sWhatChanged .= " Added Url: Description: ".stripslashes($_REQUEST['url_desc'])."\n"; + $sWhatChanged .= " Url: ".stripslashes($_REQUEST['url'])."\n"; + $bAppChanged = true; + } + } + + // Process changed URLs + for($i = 0; $i < $_REQUEST['rows']; $i++) + { + if($_SESSION['current']->showDebuggingInfos()) { echo "

{$_REQUEST['adescription'][$i]}: {$_REQUEST['aURL'][$i]}: {$_REQUEST['adelete'][$i]} : {$_REQUEST['aId'][$i]} : .{$_REQUEST['aOldDesc'][$i]}. : {$_REQUEST['aOldURL'][$i]}

"; } + + if ($_REQUEST['adelete'][$i] == "on") + { + $hResult = query_appdb("DELETE FROM appData WHERE id = '{$_REQUEST['aId'][$i]}'"); + + if($hResult) + { + addmsg("

Successfully deleted URL ".$_REQUEST['aOldDesc'][$i]." (".$_REQUEST['aOldURL'][$i].")

\n",'green'); + $sWhatChanged .= "Deleted Url: Description: ".stripslashes($_REQUEST['aOldDesc'][$i])."\n"; + $sWhatChanged .= " url: ".stripslashes($_REQUEST['aOldURL'][$i])."\n"; + $bAppChanged = true; + } + + + } + else if( $_REQUEST['aURL'][$i] != $_REQUEST['aOldURL'][$i] || $_REQUEST['adescription'][$i] != $_REQUEST['aOldDesc'][$i]) + { + if(empty($_REQUEST['aURL'][$i]) || empty($_REQUEST['adescription'][$i])) + addmsg("The URL or description was blank. URL not changed in the database", "red"); + else + { + $sUpdate = compile_update_string( array( 'description' => $_REQUEST['adescription'][$i], + 'url' => $_REQUEST['aURL'][$i])); + if (query_appdb("UPDATE appData SET $sUpdate WHERE id = '{$_REQUEST['aId'][$i]}'")) + { + addmsg("

Successfully updated ".$_REQUEST['aOldDesc'][$i]." (".$_REQUEST['aOldURL'][$i].")

\n",'green'); + $sWhatChanged .= "Changed Url: Old Description: ".stripslashes($_REQUEST['aOldDesc'][$i])."\n"; + $sWhatChanged .= " Old Url: ".stripslashes($_REQUEST['aOldURL'][$i])."\n"; + $sWhatChanged .= " New Description: ".stripslashes($_REQUEST['adescription'][$i])."\n"; + $sWhatChanged .= " New url: ".stripslashes($_REQUEST['aURL'][$i])."\n"; + $bAppChanged = true; + } + } + } + } + } + if ($bAppChanged) + { + $sEmail = get_notify_email_address_list($_REQUEST['appId']); + if($sEmail) + { + $sFullAppName = "Application: ".lookupAppName($_REQUEST['appId']); + $sMsg = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."\r\n"; + $sMsg .= "\r\n"; + $sMsg .= $_SESSION['current']->realname." changed ".$sFullAppName." \r\n"; + $sMsg .= "\r\n"; + $sMsg .= $sWhatChanged."\r\n"; + $sMsg .= "\r\n"; + + mail_appdb($sEmail, $sFullAppName ,$sMsg); + } + } exit; } else { - $query = "SELECT versionName, keywords, ". - "description, webPage, maintainer_rating, maintainer_release from appVersion WHERE ". - "appId = '".$_REQUEST['appId']."' and versionId = '".$_REQUEST['versionId']."'"; - if(debugging()) { echo "

query: $query

"; } - - $result = query_appdb($query); - list($versionName, $keywords, $description, $webPage, $maintainer_rating, $maintainer_release) = mysql_fetch_row($result); + $sQuery = "SELECT * + FROM appVersion + WHERE appId = '".$_REQUEST['appId']."' + AND versionId = '".$_REQUEST['versionId']."'"; + $hResult = query_appdb($sQuery); + $oRow = mysql_fetch_object($hResult); apidb_header("Edit Application Version"); echo "
\n"; echo html_frame_start("Data for Application ID: ".$_REQUEST['appId']." Version ID: ".$_REQUEST['versionId'], "90%","",0); echo html_table_begin("width='100%' border=0 align=left cellpadding=6 cellspacing=0 class='box-body'"); - - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo 'Name'.lookupAppName($_REQUEST['appId']).'',"\n"; - echo 'Version',"\n"; - echo 'Keywords',"\n"; - echo 'Description', "\n"; - echo '',"\n"; - echo 'Web Page',"\n"; - echo 'Rating',"\n"; - make_maintainer_rating_list("maintainer_rating", $maintainer_rating); + echo 'Version',"\n"; + echo 'Version specific description', "\n"; + echo '',"\n"; + echo 'Rating',"\n"; + make_maintainer_rating_list("maintainer_rating", $oRow->maintainer_rating); echo '',"\n"; echo 'Release',"\n"; - make_bugzilla_version_list("maintainer_release", $maintainer_release); + make_bugzilla_version_list("maintainer_release", $oRow->maintainer_release); echo '',"\n"; echo '',"\n"; echo html_table_end(); echo html_frame_end(); + echo "
"; - echo html_back_link(1); + // url edit form + echo '
',"\n"; + echo ''; + echo ''; + echo html_frame_start("Edit URL","90%","",0); + echo '',"\n"; + + $i = 0; + $result = query_appdb("SELECT * FROM appData WHERE appId = ".$_REQUEST['appId']." AND versionId = ".$_REQUEST['versionId']." AND type = 'url'"); + if($result && mysql_num_rows($result) > 0) + { + echo '',"\n"; + while($ob = mysql_fetch_object($result)) + { + $temp0 = "adelete[".$i."]"; + $temp1 = "adescription[".$i."]"; + $temp2 = "aURL[".$i."]"; + $temp3 = "aId[".$i."]"; + $temp4 = "aOldDesc[".$i."]"; + $temp5 = "aOldURL[".$i."]"; + echo '',"\n"; + echo '',"\n"; + echo ''; + echo ''; + echo '',"\n"; + $i++; + } + } else + { + echo '',"\n"; + echo '',"\n"; + } + echo "\n"; + echo ""; + + echo '',"\n"; + echo '',"\n"; + + echo '',"\n"; + + echo '
Delete',"\n"; + echo 'DescriptionURL
',"\n"; + echo '
DescriptionURL
New
',"\n"; + echo html_frame_end(); + echo "
"; + echo html_back_link(1,BASE."appview.php?appId=$ob->appId&versionId=$ob->versionId"); apidb_footer(); } - ?> diff --git a/appview.php b/appview.php index ec508a3..218c286 100644 --- a/appview.php +++ b/appview.php @@ -7,15 +7,14 @@ * application environment */ include("path.php"); -require(BASE."include/"."incl.php"); -require(BASE."include/"."application.php"); -require(BASE."include/"."comments.php"); -require(BASE."include/"."appdb.php"); - -require(BASE."include/"."vote.php"); -require(BASE."include/"."category.php"); -require(BASE."include/"."screenshot.php"); -require(BASE."include/"."maintainer.php"); +require(BASE."include/incl.php"); +require(BASE."include/application.php"); +require(BASE."include/comments.php"); +require(BASE."include/appdb.php"); +require(BASE."include/vote.php"); +require(BASE."include/category.php"); +require(BASE."include/screenshot.php"); +require(BASE."include/maintainer.php"); /** @@ -224,24 +223,24 @@ if($appId && !$versionId) echo " \n"; echo ' ',"\n"; - echo " \n"; - echo " \n"; + echo " \n"; - echo " \n"; // main URL - echo " \n"; + echo " \n"; // optional links - $result = query_appdb("SELECT * FROM appData WHERE appId = $appId AND type = 'url'"); + $result = query_appdb("SELECT * FROM appData WHERE appId = $appId AND versionID = 0 AND type = 'url'"); if($result && mysql_num_rows($result) > 0) { - echo "
Name ".stripslashes($data->appName)."
Vendor ". + echo "
Name ".stripslashes($data->appName)."
Vendor ". " ".stripslashes($vendor->vendorName)."  \n"; - echo "
BUGS ". - " Check for bugs in bugzilla  \n"; + echo "
BUGS ". + " Check for bugs in bugzilla  \n"; echo "
Votes "; + echo "
Votes "; echo vote_count_app_total($data->appId); echo "
URL".$appLinkURL."
URL".$appLinkURL."
Links\n"; + echo "
Links\n"; while($ob = mysql_fetch_object($result)) { echo " ".substr(stripslashes($ob->description),0,30)."
\n"; @@ -376,11 +375,22 @@ else if($appId && $versionId) echo '',"\n"; echo "\n"; echo "\n"; - echo "\n"; + + // links + $result = query_appdb("SELECT * FROM appData WHERE appId = $appId AND versionID = $versionId AND type = 'url'"); + if($result && mysql_num_rows($result) > 0) + { + echo " \n"; + } // rating Area - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; // image $img = get_screenshot_img($appId, $versionId); diff --git a/include/category.php b/include/category.php index 087151d..6db45f2 100644 --- a/include/category.php +++ b/include/category.php @@ -200,10 +200,15 @@ function make_cat_path($path, $appId = '', $versionId = '') if(!empty($appId)) { - $str .= " > ".html_ahref(appIdToName($appId),"appview.php?appId=$appId"); - if(!empty($versionId)) - $str .= " > ".html_ahref(versionIdToName($versionId),"appview.php?appId=".$appId."&versionId=".$versionId); + { + $str .= " > ".html_ahref(appIdToName($appId),"appview.php?appId=$appId"); + $str .= " > ".versionIdToName($versionId); + } + else + { + $str .= " > ".appIdToName($appId); + } } return $str; diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index dc0902d..843ee8b 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -52,11 +52,7 @@ create table appVersion ( versionId int not null auto_increment, appId int not null, versionName varchar(100) not null, - keywords text, description text, - webPage varchar(100), - rating_windows float default 0.0, - rating_fake float default 0.0, maintainer_rating text, maintainer_release text, key(versionId)
Name".stripslashes($data->appName)."
Version".stripslashes($ver->versionName)."
URL".stripslashes($appLinkURL)."
Links\n"; + while($ob = mysql_fetch_object($result)) + { + echo " ".substr(stripslashes($ob->description),0,30)."
\n"; + } + echo "
Maintainer Rating".stripslashes($ver->maintainer_rating)."
Maintainers Version".stripslashes($ver->maintainer_release)."
Maintainer Rating".stripslashes($ver->maintainer_rating)."
Maintainers Version".stripslashes($ver->maintainer_release)."