diff --git a/admin/bm.php b/admin/bm.php index a7f0825..fea1598 100644 --- a/admin/bm.php +++ b/admin/bm.php @@ -57,8 +57,8 @@ if ($user->isAdmin()) { $_POST["description"] = addslashes($_POST["description"]); } - $_POST["title"] = removeBadTags($_POST["title"],true); - $_POST["description"] = removeBadTags($_POST["description"]); + $_POST["title"] = util::removeBadTags($_POST["title"],true); + $_POST["description"] = util::removeBadTags($_POST["description"]); if ($tumble->addPost($_POST)) { $input = array("{type}"); diff --git a/admin/css/style.css b/admin/css/style.css index 6119098..2604c42 100644 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -29,9 +29,9 @@ fieldset{ border:none; margin:0; padding:0;} /*********** LAYOUT *************/ -body{ background: #e0e0e0; text-align:center; font-family:"Trebuchet Ms", Verdana, Tahoma; font-size:1em;} +body{ background-color: #e0e0e0; text-align:center; font-family:"Trebuchet Ms", Verdana, Tahoma; font-size:1em;} -#cont{ width:600px; margin:30px auto 20px auto; text-align:left; border: 1px solid #999;} +#cont{ width:600px; margin:30px auto 20px auto; text-align:left; border: 1px solid #999; background-color: #FFF; padding:10px 0 0 0;} #head{ background: #fff url(images/head_bg.png) bottom center no-repeat; position: relative; padding:10px 0 20px 20px; height:73px;} h1 a{ display:block; height:77px; width:161px; background:#fff url(images/gelato-logo.png) top left no-repeat; text-indent:-9999px; overflow:hidden;} @@ -119,7 +119,7 @@ fieldset.install input.txt{width:468px;} .post .audio{} -#foot { border-top:1px solid #999999; color:#000000; font-size:10px; padding:5px 10px; text-align:center;} +#foot { border-top:1px solid #999999; color:#000000; font-size:10px; padding:5px 10px; text-align:center; background-color: #e0e0e0;} #footer a { color: #000; } diff --git a/admin/index.php b/admin/index.php index 24b565e..5110132 100644 --- a/admin/index.php +++ b/admin/index.php @@ -40,20 +40,20 @@ if ($user->isAuthenticated()) { if(isset($_POST["btnAdd"])){ unset($_POST["btnAdd"]); - $_POST['type'] = type2Number($_POST['type']); + $_POST['type'] = util::type2Number($_POST['type']); if ($_POST["type"]=="2") { // is Photo type if (isset($_POST["url"]) && $_POST["url"]!="") { - $photoName = getFileName($_POST["url"]); + $photoName = util::getFileName($_POST["url"]); if (!$tumble->savePhoto($_POST["url"])) { header("Location: ".$conf->urlGelato."/admin/index.php?photo=false"); die(); } - $_POST["url"] = "../uploads/".sanitizeName($photoName); + $_POST["url"] = "../uploads/".util::sanitizeName($photoName); } - if ( move_uploaded_file( $_FILES['photo']['tmp_name'], "../uploads/".sanitizeName($_FILES['photo']['name']) ) ) { - $_POST["url"] = "../uploads/".sanitizeName($_FILES['photo']['name']); + if ( move_uploaded_file( $_FILES['photo']['tmp_name'], "../uploads/".util::sanitizeName($_FILES['photo']['name']) ) ) { + $_POST["url"] = "../uploads/".util::sanitizeName($_FILES['photo']['name']); } unset($_POST["photo"]); @@ -62,7 +62,7 @@ if ($user->isAuthenticated()) { if ($_POST["type"]=="7") { // is MP3 type set_time_limit(300); - $mp3Name = getFileName($_POST["url"]); + $mp3Name = util::getFileName($_POST["url"]); if (!$tumble->saveMP3($_POST["url"])) { header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false"); die(); @@ -84,8 +84,8 @@ if ($user->isAuthenticated()) { $_POST["description"] = $textile->TextileThis(removeBadTags($_POST["description"])); */ - $_POST["title"] = removeBadTags($_POST["title"],true); - $_POST["description"] = removeBadTags($_POST["description"]); + $_POST["title"] = util::removeBadTags($_POST["title"],true); + $_POST["description"] = util::removeBadTags($_POST["description"]); if (isset($_POST["id_post"]) and is_numeric($_POST["id_post"]) and $_POST["id_post"]>0) { $tumble->modifyPost($_POST, $_POST["id_post"]); @@ -249,7 +249,7 @@ if ($user->isAuthenticated()) { $row['Body'] = $register["description"]; break; case "2": - $fileName = "../uploads/".getFileName($register["url"]); + $fileName = "../uploads/".util::getFileName($register["url"]); $x = @getimagesize($fileName); if ($x[0] > 100) @@ -270,7 +270,7 @@ if ($user->isAuthenticated()) { break; case "4": if($conf->shorten_links) - $register["url"] = _file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]); + $register["url"] = util::_file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]); $register["title"] = ($register["title"]=="")? $register["url"] : $register["title"]; $row['URL'] = $register["url"]; diff --git a/admin/settings.php b/admin/settings.php index 213f8dd..59d69d3 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -18,7 +18,7 @@ if ($user->isAdmin()) { if(isset($_POST["btnsubmit"])) { unset($_POST["btnsubmit"]); - $_POST["url_installation"] = (endsWith($_POST["url_installation"], "/")) ? substr($_POST["url_installation"], 0, strlen($_POST["url_installation"])-1) : $_POST["url_installation"] ; + $_POST["url_installation"] = (util::endsWith($_POST["url_installation"], "/")) ? substr($_POST["url_installation"], 0, strlen($_POST["url_installation"])-1) : $_POST["url_installation"] ; $tumble->saveSettings($_POST); } else { ?> diff --git a/admin/themes/admin/index.htm b/admin/themes/admin/index.htm index f2d7bc3..bb39a01 100644 --- a/admin/themes/admin/index.htm +++ b/admin/themes/admin/index.htm @@ -113,7 +113,7 @@ {if {$Posts_Number}} {block {$rows} as {$row}}
-
Link   +
Link  

{$row.Date_Added}

diff --git a/admin/themes/admin/template_add_photo.htm b/admin/themes/admin/template_add_photo.htm index 7ef810d..54fe97e 100644 --- a/admin/themes/admin/template_add_photo.htm +++ b/admin/themes/admin/template_add_photo.htm @@ -13,7 +13,7 @@
-
+
Use a upload form instead
diff --git a/classes/gelato.class.php b/classes/gelato.class.php index d57865a..119f81f 100644 --- a/classes/gelato.class.php +++ b/classes/gelato.class.php @@ -142,7 +142,7 @@ class gelato { } function saveMP3($remoteFileName) { - if (getMP3File($remoteFileName)) { + if (util::getMP3File($remoteFileName)) { return true; } else { return false; @@ -150,7 +150,7 @@ class gelato { } function savePhoto($remoteFileName) { - if (getPhotoFile($remoteFileName)) { + if (util::getPhotoFile($remoteFileName)) { return true; } else { return false; @@ -158,38 +158,38 @@ class gelato { } function getVideoPlayer($url) { - if (isYoutubeVideo($url)) { - $id_video = getYoutubeVideoUrl($url); + if (util::isYoutubeVideo($url)) { + $id_video = util::getYoutubeVideoUrl($url); return "\t\t\t\n"; - } elseif (isVimeoVideo($url)) { - $id_video = getVimeoVideoUrl($url); + } elseif (util::isVimeoVideo($url)) { + $id_video = util::getVimeoVideoUrl($url); return "\t\t\t\n"; - } elseif (isDailymotionVideo($url)) { - $id_video = getDailymotionVideoUrl($url); + } elseif (util::isDailymotionVideo($url)) { + $id_video = util::getDailymotionVideoUrl($url); return "\t\t\t\n"; - } elseif (isYahooVideo($url)) { - $id_video = getYahooVideoCode($url); + } elseif (util::isYahooVideo($url)) { + $id_video = util::getYahooVideoCode($url); return "\t\t\t\n"; - } elseif (isSlideSharePresentation($url)) { - $id_video = getSlideSharePresentationCode($url); + } elseif (util::isSlideSharePresentation($url)) { + $id_video = util::getSlideSharePresentationCode($url); return "\t\t\t\n"; - } elseif (isGoogleVideoUrl($url)) { - $id_video = getGoogleVideoCode($url); + } elseif (util::isGoogleVideoUrl($url)) { + $id_video = util::getGoogleVideoCode($url); return "\t\t\t\n"; - } elseif (isMTVVideoUrl($url)) { - $id_video = getMTVVideoCode($url); + } elseif (util::isMTVVideoUrl($url)) { + $id_video = util::getMTVVideoCode($url); return "\t\t\t\n"; } else { return "This URL is not a supported video (YouTube, Google Video, Vimeo, DailyMotion, Yahoo Video, MTV or SlideShare)"; } } function getMp3Player($url) { - if (isMP3($url)) { + if (util::isMP3($url)) { $playerUrl = $conf->urlGelato."/admin/scripts/player.swf?soundFile=".$url; return "\t\t\t\n"; - } elseif (isGoEar($url)) { + } elseif (util::isGoEar($url)) { return "\t\t\t\n"; - } elseif (isOdeo($url)) { + } elseif (util::isOdeo($url)) { return "\t\t\t\n"; } else { return "This URL is not an MP3 file."; diff --git a/index.php b/index.php index a7d49f8..bff0bd6 100644 --- a/index.php +++ b/index.php @@ -60,9 +60,9 @@ $theme = new themes; $register = $tumble->getPost($id_post); if (empty($register["title"])) { if (!empty($register["description"])) { - $page_title_data = trimString($register["description"], $page_title_len); + $page_title_data = util::trimString($register["description"], $page_title_len); } else { - $page_title_data = type2Text($register["type"]); + $page_title_data = util::type2Text($register["type"]); } } else { $page_title_data = $register["title"]; @@ -123,7 +123,7 @@ $theme = new themes; $row['Body'] = $register["description"]; break; case "2": - $fileName = "uploads/".getFileName($register["url"]); + $fileName = "uploads/".util::getFileName($register["url"]); $x = @getimagesize($fileName); if ($x[0] > 500) { $photoPath = $conf->urlGelato."/classes/imgsize.php?w=500&img=".$register["url"]; @@ -144,7 +144,7 @@ $theme = new themes; break; case "4": if($conf->shorten_links){ - $register["url"] = _file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]); + $register["url"] = util::_file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]); } $register["title"] = ($register["title"]=="")? $register["url"] : $register["title"]; @@ -219,7 +219,7 @@ $theme = new themes; $row['Body'] = $register["description"]; break; case "2": - $fileName = "uploads/".getFileName($register["url"]); + $fileName = "uploads/".util::getFileName($register["url"]); $x = @getimagesize($fileName); if ($x[0] > 500) { @@ -241,7 +241,7 @@ $theme = new themes; break; case "4": if($conf->shorten_links){ - $register["url"] = _file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]); + $register["url"] = util::_file_get_contents("http://api.abbrr.com/api.php?out=link&url=".$register["url"]); } $row['URL'] = $register["url"]; $row['Name'] = $register["title"]; @@ -268,9 +268,9 @@ $theme = new themes; if (empty($register["title"])) { if (!empty($register["description"])) { - $postTitle = trimString($register["description"]); + $postTitle = util::trimString($register["description"]); } else { - $postTitle = type2Text($register["type"]); + $postTitle = util::type2Text($register["type"]); } } else { $postTitle = $register["title"];