diff --git a/.gitignore b/.gitignore
index ea8e5bd42facacb612876ac2d8588d3ac91a3d38..312dc0433aa21ca80a6d838e57ec8de77eb1df38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,7 @@ RCS/*
# netbeans
nbproject
-.DS_Store
\ No newline at end of file
+# geany
+*.geany
+
+.DS_Store
diff --git a/apps/calendar/ajax/getcal.php b/apps/calendar/ajax/getcal.php
index a65c6cf2602192808f0b0109e1cfb2400178a047..3d43677075f7da0871ab635d9a266f3aa26f1d0d 100644
--- a/apps/calendar/ajax/getcal.php
+++ b/apps/calendar/ajax/getcal.php
@@ -28,43 +28,674 @@ $select_year = $_GET["year"];
$user_timezone = OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone", "Europe/London");
foreach($events as $event)
{
- if ($select_year != substr($event['startdate'], 0, 4))
+ if($select_year != substr($event['startdate'], 0, 4) && $event["repeating"] == false)
continue;
- $object = Sabre_VObject_Reader::read($event['calendardata']);
- $vevent = $object->VEVENT;
- $dtstart = $vevent->DTSTART;
- $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
- $start_dt = $dtstart->getDateTime();
- $start_dt->setTimezone(new DateTimeZone($user_timezone));
- $end_dt = $dtend->getDateTime();
- $end_dt->setTimezone(new DateTimeZone($user_timezone));
- $year = $start_dt->format('Y');
- $month = $start_dt->format('n') - 1; // return is 0 based
- $day = $start_dt->format('j');
- $hour = $start_dt->format('G');
- if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
- $hour = 'allday';
- }
+ if($select_year == substr($event['startdate'], 0, 4) && $event["repeating"] == false){
+ $object = Sabre_VObject_Reader::read($event['calendardata']);
+ $vevent = $object->VEVENT;
+ $dtstart = $vevent->DTSTART;
+ $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+ $start_dt = $dtstart->getDateTime();
+ $start_dt->setTimezone(new DateTimeZone($user_timezone));
+ $end_dt = $dtend->getDateTime();
+ $end_dt->setTimezone(new DateTimeZone($user_timezone));
+ $year = $start_dt->format('Y');
+ $month = $start_dt->format('n') - 1; // return is 0 based
+ $day = $start_dt->format('j');
+ $hour = $start_dt->format('G');
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
- $return_event = array();
- foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop)
- {
- $return_event[$prop] = $event[$prop];
- }
- $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
- $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
- $return_event['description'] = $event['summary'];
- if ($hour == 'allday')
- {
- $return_event['allday'] = true;
- }
- if (isset($return[$year][$month][$day][$hour]))
- {
- $return[$year][$month][$day][$hour][] = $return_event;
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop)
+ {
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ if ($hour == 'allday')
+ {
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour]))
+ {
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }
+ else
+ {
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
}
- else
- {
- $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ if($event["repeating"] == 1){
+ $object = Sabre_VObject_Reader::read($event['calendardata']);
+ $vevent = $object->VEVENT;
+ //echo substr_count($event["calendardata"], "EXDATE");
+ $numofelements = substr_count($vevent->RRULE, ";");
+ $properties = array("FREQ"=>"false", "UNTIL"=>"false", "COUNT"=>"false", "INTERVAL"=>"false", "BYDAY"=>"false", "BYMONTHDAY"=>"false", "BYWEEKNO"=>"false", "BYMONTH"=>"false", "BYYEARDAY"=>"false", "BYSETPOS"=>"false");
+ $exruleproperties = array("FREQ"=>"false", "UNTIL"=>"false", "COUNT"=>"false", "INTERVAL"=>"false", "BYDAY"=>"false", "BYMONTHDAY"=>"false", "BYWEEKNO"=>"false", "BYMONTH"=>"false", "BYYEARDAY"=>"false", "BYSETPOS"=>"false");
+ $byday = array("MO"=>"false", "TU"=>"false", "WE"=>"false", "TH"=>"false", "FR"=>"false", "SA"=>"false", "SU"=>"false");
+ if($numofelements != 0){
+ $rrule = explode(";", $vevent->RRULE);
+ for($i = 0;$i <= $numofelements;$i++){
+ $rule = explode("=", $rrule[$i]);
+ $property = $rule[0];
+ $value = $rule[1];
+ $properties[$property] = $value;
+ }
+ if($properties["BYDAY"] != "false"){
+ $numofdays = substr_count($properties["BYDAY"], ",");
+ if($numofdays == 0){
+ if(strlen($properties["BYDAY"]) != 2){
+ $lenght = strlen($properties["BYDAY"]);
+ switch($lenght){
+ case "3":
+ $properties["BYSETPOS"] = substr($properties["BYDAY"],0,1);
+ $properties["BYDAY"] = substr($properties["BYDAY"],1,2);
+ break;
+ case "4":
+ $properties["BYSETPOS"] = substr($properties["BYDAY"],0,2);
+ $properties["BYDAY"] = substr($properties["BYDAY"],2,2);
+ break;
+ case "5":
+ $properties["BYSETPOS"] = substr($properties["BYDAY"],0,3);
+ $properties["BYDAY"] = substr($properties["BYDAY"],3,2);
+ break;
+ case "6":
+ $properties["BYSETPOS"] = substr($properties["BYDAY"],0,4);
+ $properties["BYDAY"] = substr($properties["BYDAY"],4,2);
+ break;
+ }
+ }
+ $byday[$properties["BYDAY"]] = true;
+
+ }else{
+ $days = explode(",", $properties["BYDAY"]);
+ for($i = 0;$i <= $numofdays;$i++){
+ $day = $days[$i];
+ $byday[$day] = true;
+ }
+ }
+ }
+ }else{
+ $rule = explode("=", $vevent->RRULE);
+ $properties[$rule[0]] = $rule[1];
+ }
+ if($properties["INTERVAL"] == "false"){
+ $properties["INTERVAL"] = 1;
+ }
+ $count = 0; //counts all loops
+ $countedoutputs = 0; //counts only the outputs
+ $countchecker = true;
+ $dtstart = $vevent->DTSTART;
+ $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
+ $start_dt = $dtstart->getDateTime();
+ $start_dt->setTimezone(new DateTimeZone($user_timezone));
+ $end_dt = $dtend->getDateTime();
+ $end_dt->setTimezone(new DateTimeZone($user_timezone));
+ $firststart_year = $start_dt->format('Y');
+ $firststart_month = $start_dt->format('n');
+ $firststart_day = $start_dt->format('j');
+ $hour = $start_dt->format('G');
+ $interval = 0;
+ if($properties["UNTIL"] != "false"){
+ $until = $properties["UNTIL"];
+ $until_year = substr($until, 0, 4);
+ $until_month = substr($until, 4, 2);
+ $until_day = substr($until, 6, 2);
+ }
+ //print_r($properties);
+ //print_r($byday);
+ if($properties["FREQ"] == "DAILY"){
+ if($properties["BYDAY"] == "false"){
+ $byday = array("MO"=>"1", "TU"=>"1", "WE"=>"1", "TH"=>"1", "FR"=>"1", "SA"=>"1", "SU"=>"1");
+ }
+ while(date("Y", mktime(0,0,0, $firststart_month, $firststart_day, $firststart_year) + ($count * 1 * 86400 * $interval)) <= $select_year && $countchecker == true){
+ if($byday[strtoupper(substr(date("D", mktime(0,0,0, $firststart_month, $firststart_day, $firststart_year) + ($count * 1 * 86400 * $interval)), 0, 2))] == "1"){
+ $newunixtime = mktime(0,0,0, $firststart_month, $firststart_day, $firststart_year) + ($count * 1 * 86400 * $interval);
+ $year = date("Y", $newunixtime);
+ $month = date("n", $newunixtime) - 1; // return is 0 based
+ $day = date("j", $newunixtime);
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ }
+ $count++;
+ }
+ }
+ if($properties["FREQ"] == "WEEKLY"){
+ if($properties["BYDAY"] == "false"){
+ $byday[strtoupper(substr(date("D", mktime(0,0,0, $firststart_month, $firststart_day, $firststart_year)), 0, 2))] = "1";
+ }
+ while(date("Y", mktime(0,0,0, $firststart_month, $firststart_day, $firststart_year) + ($count * 1 * 86400 * $interval)) <= $select_year && $countchecker == true){
+ if($byday[strtoupper(substr(date("D", mktime(0,0,0, $firststart_month, $firststart_day, $firststart_year) + ($count * 1 * 86400 * $interval)), 0, 2))] == "1"){
+ $newunixtime = mktime(0,0,0, $firststart_month, $firststart_day, $firststart_year) + ($count * 1 * 86400 * $interval);
+ $year = date("Y", $newunixtime);
+ $month = date("n", $newunixtime) - 1; // return is 0 based
+ $day = date("j", $newunixtime);
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ }
+ $count++;
+ }
+ }
+ if($properties["FREQ"] == "MONTHLY"){
+ if(substr_count($properties["BYMONTHDAY"], ",") != 0){
+ $numofBYMONTHDAY = substr_count($properties["BYMONTHDAY"], ",");
+ if($numofBYMONTHDAY == 0){
+ $BYMONTHDAY = array();
+ $BYMONTHDAY[0] = $properties["BYMONTHDAY"];
+ }else{
+ $BYMONTHDAY = explode(",", $properties["BYMONTHDAY"]);
+ }
+ while(date("Y", mktime(0,0,0, $firststart_month + ($count * $interval), $properties["BYMONTHDAY"], $firststart_year)) <= $select_year && $countchecker == true){
+ for($i = 0;$i <= $numofBYMONTHDAY;$i++){
+ $newunixtime = mktime(0,0,0, $firststart_month + ($count * $interval), $BYMONTHDAY[$i], $firststart_year);
+ $year = date("Y", $newunixtime);
+ $month = date("n", $newunixtime) - 1; // return is 0 based
+ $day = date("j", $newunixtime);
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ }
+ $count++;
+ }
+ }
+ //if($properties["BYMONTHDAY"] != "false"){
+ if($properties["BYSETPOS"] == "false"){
+ while(date("Y", mktime(0,0,0, $firststart_month + ($count * $interval), $properties["BYMONTHDAY"], $firststart_year)) <= $select_year && $countchecker == true){
+ $newunixtime = mktime(0,0,0, $firststart_month + ($count * $interval), $properties["BYMONTHDAY"], $firststart_year);
+ $year = date("Y", $newunixtime);
+ $month = date("n", $newunixtime) - 1; // return is 0 based
+ $day = date("j", $newunixtime);
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ $count++;
+ }
+ }else{
+ if(!is_nan($properties["BYSETPOS"]) && $properties["BYSETPOS"] >= 1){
+ while(date("Y", mktime(0,0,0, $firststart_month + ($count * $interval), $firststart_day, $firststart_year)) <= $select_year && $countchecker == true){
+ $lastdayofmonth = date("t", mktime(0,0,0, $firststart_month + ($count * $interval), $firststart_day, $firststart_year));
+ $matches = 0;
+ $matchedday = "";
+ for($i = 1;$i <= $lastdayofmonth;$i++){
+ $thisday = date("j", mktime(0,0,0, $firststart_month + ($count * $interval), $i, $firststart_year));
+ $thisdayname = strtoupper(substr(date("D", mktime(0,0,0, $firststart_month + ($count * $interval), $i, $firststart_year)),0,2));
+ //echo $thisdayname . " " . $thisday . "\n";
+ if($byday[$thisdayname] == 1){
+ $matches++;
+ }
+ if($matches == $properties["BYSETPOS"]){
+ $matchedday = $thisday;
+ $i = 32;
+ }
+ }
+ $newunixtime = mktime(0,0,0, $firststart_month + ($count * $interval), $firststart_day, $firststart_year);
+ $year = date("Y", $newunixtime);
+ $month = date("n", $newunixtime) - 1; // return is 0 based
+ $day = $matchedday;
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ $count++;
+ }
+ }elseif(!is_nan($properties["BYSETPOS"]) && $properties["BYSETPOS"] <= -1){
+ while(date("Y", mktime(0,0,0, $firststart_month + ($count * $interval), $firststart_day, $firststart_year)) <= $select_year && $countchecker == true){
+ $lastdayofmonth = date("t", mktime(0,0,0, $firststart_month + ($count * $interval), 1, $firststart_year));
+ $matches = 0;
+ $matchedday = "";
+ for($i = $lastdayofmonth;$i >= 1;$i--){
+ $thisday = date("j", mktime(0,0,0, $firststart_month + ($count * $interval), $i, $firststart_year));
+ $thisdayname = strtoupper(substr(date("D", mktime(0,0,0, $firststart_month + ($count * $interval), $i, $firststart_year)),0,2));
+ //echo $thisdayname . " " . $thisday . "\n";
+ if($byday[$thisdayname] == 1){
+ $matches++;
+ }
+ if($matches == $properties["BYSETPOS"]){
+ $matchedday = $thisday;
+ $i = 0;
+ }
+ }
+ $newunixtime = mktime(0,0,0, $firststart_month + ($count * $interval), $firststart_day, $firststart_year);
+ $year = date("Y", $newunixtime);
+ $month = date("n", $newunixtime) - 1; // return is 0 based
+ $day = $matchedday;
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ $count++;
+ }
+ //}
+ }
+ }
+ if(strlen($properties["BYDAY"]) == 2){
+ while(date("Y", mktime(0,0,0, $firststart_month + ($count * $interval), $firststart_day, $firststart_year)) <= $select_year && $countchecker == true){
+ if($byday[strtoupper(substr(date("D", mktime(0,0,0, $firststart_month + ($count * $interval), $firststart_day, $firststart_year)), 0, 2))] == "1"){
+ $newunixtime = mktime(0,0,0, $firststart_month + ($count * $interval), $firststart_day, $firststart_year);
+ $year = date("Y", $newunixtime);
+ $month = date("n", $newunixtime) - 1; // return is 0 based
+ $day = date("j", $newunixtime);
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ }
+ $count++;
+ }
+ }else{
+ while(date("Y", mktime(0,0,0, 0, 0, $firststart_year + ($count * $interval))) <= $select_year && $countchecker == true){
+ $newunixtime = mktime(0,0,0, $properties["BYMONTH"], $properties["BYMONTHDAY"], $firststart_year + ($count * $interval));
+ $year = date("Y", $newunixtime);
+ $month = $month - 1; // return is 0 based
+ $day = $dateofweekone;
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ $count++;
+ }
+ }
+ }
+ if($properties["FREQ"] == "YEARLY"){
+ if($properties["BYMONTH"] != "false"){
+ if($properties["BYMONTHDAY"] == false){
+ $properties["BYMONTHDAY"] = date("j", mktime(0,0,0, $firststart_month, $firststart_day, $firststart_year));
+ }
+ if($properties["BYDAY"] == "false"){
+ while(date("Y", mktime(0,0,0, $properties["BYMONTH"], $properties["BYMONTHDAY"], $firststart_year + ($count * $interval))) <= $select_year && $countchecker == true){
+ $newunixtime = mktime(0,0,0, $properties["BYMONTH"], $properties["BYMONTHDAY"], $firststart_year + ($count * $interval));
+ $year = date("Y", $newunixtime);
+ $month = date("n", $newunixtime) - 1; // return is 0 based
+ $day = date("j", $newunixtime);
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ $count++;
+ }
+ }
+ if(strlen($properties["BYDAY"]) == 2){
+ while(date("Y", mktime(0,0,0, $properties["BYMONTH"], $properties["BYMONTHDAY"], $firststart_year + ($count * $interval))) <= $select_year && $countchecker == true){
+ $newunixtime = mktime(0,0,0, $properties["BYMONTH"], $properties["BYMONTHDAY"], $firststart_year + ($count * $interval));
+ $year = date("Y", $newunixtime);
+ $month = date("n", $newunixtime) - 1; // return is 0 based
+ $day = date("j", $newunixtime);
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ $count++;
+ }
+ }else{
+ $number = substr($properties["BYDAY"],0,1);
+ $weekday = substr($properties["BYDAY"],1,2);
+ $month = $properties["BYMONTH"];
+ $dateofweekone = "";
+ for($i = 0; $i <= 7;$i++){
+ if(strtoupper(substr(date("D", mktime(0,0,0, $properties["BYMONTH"], $i, $select_year)), 0, 2)) == $weekday){
+ $dateofweekone = date("j", mktime(0,0,0, $properties["BYMONTH"], $i, $select_year));
+ $i = 8;
+ }
+ }
+ if($number != 1){
+ $dateofweekone = $dateofweekone + (7 * ($number - 1));
+ }
+ while(date("Y", mktime(0,0,0, 0, 0, $firststart_year + ($count * $interval))) <= $select_year && $countchecker == true){
+ $newunixtime = mktime(0,0,0, $properties["BYMONTH"], $properties["BYMONTHDAY"], $firststart_year + ($count * $interval));
+ $year = date("Y", $newunixtime);
+ $month = $month - 1; // return is 0 based
+ $day = $dateofweekone;
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ $count++;
+ }
+ }
+ }elseif($properties["BYYEARDAY"] != false){
+ $numofyeardays = substr_count($properties["BYYEARDAY"], ",");
+ if($numofyeardays == 0){
+ $yeardays = array();
+ $yeardays[0] = $properties["BYYEARDAY"];
+ }else{
+ $yeardays = explode(",", $properties["BYYEARDAY"]);
+ }
+ while(date("Y", mktime(0,0,0, 0, 0, $firststart_year + ($count * $interval)) + ($yeardays[$numofyeardays]-1) * 86400) <= $select_year && $countchecker == true){
+ for($i = 0;$i <= $numofyeardays;$i++){
+ $newunixtime = mktime(0,0,0, 1, 1, $firststart_year + ($count * $interval)) + ($yeardays[$i] -1) * 86400;
+ $year = date("Y", $newunixtime);
+ $month = date("n", $newunixtime) - 1; // return is 0 based
+ $day = date("j", $newunixtime);
+ if($properties["UNTIL"] != "false"){
+ if($year >= $until_year && $month + 1 >= $until_month && $day > $until_day){
+ break;
+ }
+ }
+ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
+ $hour = 'allday';
+ }
+ $return_event = array();
+ foreach(array('id', 'calendarid', 'objecttype', 'repeating') as $prop){
+ $return_event[$prop] = $event[$prop];
+ }
+ $return_event['startdate'] = explode('|', $start_dt->format('Y|m|d|H|i'));
+ $return_event['enddate'] = explode('|', $end_dt->format('Y|m|d|H|i'));
+ $return_event['description'] = $event['summary'];
+ $interval = $properties["INTERVAL"];
+ $countedoutputs++;
+ if($properties["COUNT"] != "false"){
+ if($countedoutputs == $properties["COUNT"]){
+ $countchecker = false;
+ }
+ }
+ if ($hour == 'allday'){
+ $return_event['allday'] = true;
+ }
+ if (isset($return[$year][$month][$day][$hour])){
+ $return[$year][$month][$day][$hour][] = $return_event;
+ }else{
+ $return[$year][$month][$day][$hour] = array(1 => $return_event);
+ }
+ }
+ $count++;
+ }
+ }
+ }
}
}
OC_JSON::encodedPrint($return);
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 5e19b88f55ad66e10bbcc8fcaf6dbc6acbea0d11..14b7d45523eac995920a4614e87efe0d87f727a7 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -5,7 +5,7 @@
* See the COPYING-README file.
*/
-#view {margin-left: 10px; float: left; font-size: 12px;}
+#view { float: left; font-size: 12px; height: 100%;}
#datecontrol {text-align: center;}
#datecontrol_left{font-size: 12px;}
#datecontrol_right{font-size: 12px;}
@@ -17,7 +17,6 @@
#editentry_dialog {display: none;}
#parsingfail_dialog{display: none;}
-#view {margin-left: 10px; float: left; font-size: 12px; height: 100%;}
#calendar_holder {height: 100%; width: 100%;}
#onedayview, #oneweekview, #fourweeksview, #onemonthview, #listview {display: none; position: absolute;bottom: 0; right: 0; left: 160px; top: 80px;}
#onedayview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;}
@@ -60,4 +59,4 @@ select#category{width:140px;}
button.category{margin:0 3px;}
.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;}
-.calendar-colorpicker-color.active{background-image:url("../../../core/img/jquery-ui/ui-icons_222222_256x240.png");background-position:-62px -143px;}
+.calendar-colorpicker-color.active{background-image:url("../../../core/img/actions/selected.svg");background-position:2px 2px;}
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 3bfda702e9b5a30bad72a10003bb373f599c908e..4f5092839392af8da45b6d740c094adca2fb5887 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -11,57 +11,36 @@ OC_UTIL::addStyle('', 'jquery.multiselect');
?>
<form id="calendar">
<fieldset class="personalblock">
- <table class="nostyle">
- <tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
+ <table class="nostyle">
+ <tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
<?php
- $continent = '';
- foreach($_['timezones'] as $timezone):
- if ( preg_match( '/^(America|Antartica|Arctic|Asia|Atlantic|Europe|Indian|Pacific)\//', $timezone ) ):
- $ex=explode('/', $timezone, 2);//obtain continent,city
- if ($continent!=$ex[0]):
- if ($continent!="") echo '</optgroup>';
- echo '<optgroup label="'.$ex[0].'">';
- endif;
- $city=$ex[1];
- $continent=$ex[0];
- echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
- endif;
+ $continent = '';
+ foreach($_['timezones'] as $timezone):
+ $ex=explode('/', $timezone, 2);//obtain continent,city
+ if (!isset($ex[1])) {
+ $ex[1] = $ex[0];
+ $ex[0] = "Other";
+ }
+ if ($continent!=$ex[0]):
+ if ($continent!="") echo '</optgroup>';
+ echo '<optgroup label="'.$ex[0].'">';
+ endif;
+ $city=strtr($ex[1], '_', ' ');
+ $continent=$ex[0];
+ echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
endforeach;?>
- </select></td></tr>
+ </select></td></tr>
- <tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
- <select style="display: none;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
- <option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
- <option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
- </select>
- </td></tr>
+ <tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
+ <select style="display: none;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
+ <option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
+ <option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
+ </select>
+ </td></tr>
- <tr><td><label for="firstdayofweek" class="bold"><?php echo $l->t('First day of the week');?></label></td><td>
- <select style="display: none;" id="firstdayofweek" name="firstdayofweek">
- <?php
- $weekdays = array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday");
- for($i = 0;$i <= 6;$i++){
- echo '<option value="'.$i.'" id="select_'.$i.'">' . $l->t($weekdays[$i]) . '</option>';
- }
- ?>
- </select>
- </td></tr>
+ </table>
- <tr><td><label for="weekend" class="bold"><?php echo $l->t('Days of weekend');?></label></td><td>
- <select id="weekend" name="weekend[]" style="width: 30em;" multiple="multiple" title="<?php echo $l->t("Weekend"); ?>">
- <?php
- $weekdays = array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday");
- for($i = 0;$i <= 6;$i++){
- echo '<option value="'.$weekdays[$i].'" id="selectweekend_' . $weekdays[$i] . '">' . $l->t($weekdays[$i]) . '</option>';
- }
- ?>
- </select>
- </td></tr>
-
- <tr><td><label for="duration" class="bold"><?php echo $l->t('Event duration');?></label></td><td><input type="text" maxlength="3" size="3" style="width: 2em;" id="duration" name="duration" /> <?php echo $l->t("Minutes");?></td></tr>
- </table>
-
- <?php echo $l->t('Calendar CalDAV syncing address:');?>
- <?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?><br />
+ <?php echo $l->t('Calendar CalDAV syncing address:');?>
+ <?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?><br />
</fieldset>
</form>
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index 083f48e1127c458e93456a63048d245a6e2a8c92..ca95a68c6ce940f0277c383cabd99eeafe20c477 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -30,8 +30,9 @@ if ($source !== false) {
foreach (OC_Files::getdirectorycontent($source) as $i) {
$i['date'] = OC_Util::formatDate($i['mtime'] );
if ($i['type'] == 'file') {
- $i['extention'] = substr($i['name'], strrpos($i['name'], "."));
- $i['basename'] = substr($i['name'], 0, strrpos($i['name'], "."));
+ $fileinfo = pathinfo($i['name']);
+ $i['basename'] = $fileinfo['filename'];
+ $i['extention'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
}
$i['directory'] = substr($i['directory'], $rootLength);
if ($i['directory'] == "/") {
@@ -70,7 +71,7 @@ if ($source !== false) {
header("Expires: 0");
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
header("Pragma: public");
- header("Content-Disposition: filename=".basename($source));
+ header('Content-Disposition: filename="'.basename($source).'"');
header("Content-Type: " . $mimetype);
header("Content-Length: " . OC_Filesystem::filesize($source));
//download the file
diff --git a/apps/gallery/ajax/cover.php b/apps/gallery/ajax/cover.php
index 375905ec52056d215353bec939c78129bf89cb85..d83f4daaa52ef0f0fac5f6b58b4aef2e9f33ec0e 100644
--- a/apps/gallery/ajax/cover.php
+++ b/apps/gallery/ajax/cover.php
@@ -1,5 +1,7 @@
<?php
require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('gallery');
function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height) { //$imgSrc is a FILE - Returns an image resource.
//getting the image dimensions
@@ -36,16 +38,11 @@ function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height) { //$imgSr
return $thumb;
}
-// Check if we are a user
-if( !OC_User::isLoggedIn()){
- echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => 'You need to log in.')));
- exit();
-}
$box_size = 200;
$album_name = $_GET['album'];
$x = $_GET['x'];
-$stmt = OC_DB::prepare('SELECT file_path FROM *PREFIX*gallery_photos,*PREFIX*gallery_albums WHERE *PREFIX*gallery_albums.uid_owner = ? AND album_name = ? AND *PREFIX*gallery_photos.album_id == *PREFIX*gallery_albums.album_id');
+$stmt = OC_DB::prepare('SELECT `file_path` FROM *PREFIX*gallery_photos,*PREFIX*gallery_albums WHERE *PREFIX*gallery_albums.`uid_owner` = ? AND `album_name` = ? AND *PREFIX*gallery_photos.`album_id` == *PREFIX*gallery_albums.`album_id`');
$result = $stmt->execute(array(OC_User::getUser(), $album_name));
$x = min((int)($x/($box_size/$result->numRows())), $result->numRows()-1); // get image to display
$result->seek($x); // never throws
diff --git a/apps/gallery/ajax/createAlbum.php b/apps/gallery/ajax/createAlbum.php
index 3a490bdc3bd35d83db91fd8c260202e978271f4f..610f761b72ac0d8f967fcf19ba1f6f4f353be1b3 100644
--- a/apps/gallery/ajax/createAlbum.php
+++ b/apps/gallery/ajax/createAlbum.php
@@ -1,14 +1,11 @@
<?php
require_once('../../../lib/base.php');
-
-if( !OC_User::isLoggedIn()){
- echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => 'You need to log in.')));
- exit();
-}
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('gallery');
$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_albums ("uid_owner", "album_name") VALUES ("'.OC_User::getUser().'", "'.$_GET['album_name'].'")');
$stmt->execute(array());
-echo json_encode(array( 'status' => 'success', 'name' => $_GET['album_name']));
+OC_JSON::success(array('name' => $_GET['album_name']));
?>
diff --git a/apps/gallery/ajax/getAlbums.php b/apps/gallery/ajax/getAlbums.php
index 6b551ac49d519d879dc911ffdc48747e56297edd..38bea74636fb0e0604e2ac624fbf61324d579ffa 100644
--- a/apps/gallery/ajax/getAlbums.php
+++ b/apps/gallery/ajax/getAlbums.php
@@ -1,22 +1,19 @@
<?php
require_once('../../../lib/base.php');
-
-if (!OC_User::IsLoggedIn()) {
- echo json_encode(array('status' => 'error', 'message' => 'You need to log in'));
- exit();
-}
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('gallery');
$a = array();
-$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ?');
+$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE `uid_owner` = ?');
$result = $stmt->execute(array(OC_User::getUser()));
while ($r = $result->fetchRow()) {
$album_name = $r['album_name'];
- $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE album_id = ?');
+ $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE `album_id` = ?');
$tmp_res = $stmt->execute(array($r['album_id']));
$a[] = array('name' => $album_name, 'numOfItems' => min($tmp_res->numRows(), 10));
}
-echo json_encode(array('status'=>'success', 'albums'=>$a));
+OC_JSON::success(array('albums'=>$a));
?>
diff --git a/apps/gallery/ajax/getCovers.php b/apps/gallery/ajax/getCovers.php
index ebda8d3e47ff2b369967cc1985c23b8035f209b1..d84bf2a7903dc77ddc7f413b472ceaf27d788814 100644
--- a/apps/gallery/ajax/getCovers.php
+++ b/apps/gallery/ajax/getCovers.php
@@ -1,5 +1,7 @@
<?php
require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('gallery');
function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $shift) {
//getting the image dimensions
@@ -38,15 +40,10 @@ function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $
imagedestroy($myImage);
}
-// Check if we are a user
-if( !OC_User::isLoggedIn()){
- echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => 'You need to log in.')));
- exit();
-}
$box_size = 200;
$album_name= $_GET['album_name'];
-$stmt = OC_DB::prepare('SELECT file_path FROM *PREFIX*gallery_photos,*PREFIX*gallery_albums WHERE *PREFIX*gallery_albums.uid_owner = ? AND album_name = ? AND *PREFIX*gallery_photos.album_id == *PREFIX*gallery_albums.album_id');
+$stmt = OC_DB::prepare('SELECT `file_path` FROM *PREFIX*gallery_photos,*PREFIX*gallery_albums WHERE *PREFIX*gallery_albums.`uid_owner` = ? AND `album_name` = ? AND *PREFIX*gallery_photos.`album_id` = *PREFIX*gallery_albums.`album_id`');
$result = $stmt->execute(array(OC_User::getUser(), $album_name));
$numOfItems = min($result->numRows(),10);
diff --git a/apps/gallery/ajax/scanForAlbums.php b/apps/gallery/ajax/scanForAlbums.php
index a04ad62b1bff2e7be927b50ff9aea6337416f3f7..de0b141a36709c32acc27c9f04e95dcc023c6f96 100644
--- a/apps/gallery/ajax/scanForAlbums.php
+++ b/apps/gallery/ajax/scanForAlbums.php
@@ -1,14 +1,11 @@
<?php
require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('gallery');
require_once('../lib_scanner.php');
-if (!OC_User::IsLoggedIn()) {
- echo json_encode(array('status' => 'error', 'message' => 'You need to log in'));
- exit();
-}
-
-echo json_encode(array( 'status' => 'success', 'albums' => OC_GALLERY_SCANNER::scan('')));
-//echo json_encode(array('status' => 'success', 'albums' => array(array('name' => 'test', 'imagesCount' => 1, 'images' => array('dupa')))));
+OC_JSON::success(array('albums' => OC_GALLERY_SCANNER::scan('')));
+//OC_JSON::success(array('albums' => array(array('name' => 'test', 'imagesCount' => 1, 'images' => array('dupa')))));
?>
diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
index db428eeff34983f6b6f3ad45bcfd668429712ef1..f24782390f68fd42de8e8d91e56e9429ab676f9a 100644
--- a/apps/gallery/ajax/thumbnail.php
+++ b/apps/gallery/ajax/thumbnail.php
@@ -1,5 +1,7 @@
<?php
require_once('../../../lib/base.php');
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('gallery');
function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height) { //$imgSrc is a FILE - Returns an image resource.
//getting the image dimensions
@@ -40,11 +42,6 @@ function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height) { //$imgSr
return $thumb;
}
-// Check if we are a user
-if( !OC_User::isLoggedIn()){
- echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => 'You need to log in.')));
- exit();
-}
$box_size = 200;
$img = $_GET['img'];
diff --git a/apps/gallery/appinfo/info.xml b/apps/gallery/appinfo/info.xml
index 154b5fcf7ae719f2804871029fa4efe2eb5139ec..054ddb6f1398b544ce01bf1d1d0b296252aacd36 100644
--- a/apps/gallery/appinfo/info.xml
+++ b/apps/gallery/appinfo/info.xml
@@ -7,5 +7,4 @@
<author>Bartosz Przybylski</author>
<require>2</require>
<description></description>
- <default_enable/>
-</info>
+</info>
\ No newline at end of file
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index c8d5892e5552f0c20995b806a6f656a9af99acbc..87fdafcf13c0a2f0341e3d2f11679e6186b2bfce 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -2,6 +2,7 @@
require_once('../../lib/base.php');
OC_Util::checkLoggedIn();
+OC_Util::checkAppEnabled('gallery');
OC_App::setActiveNavigationEntry( 'gallery_index' );
diff --git a/apps/gallery/lib_scanner.php b/apps/gallery/lib_scanner.php
index fe14b68add1345ae50384b888395024629ce531d..5490c4a55adda1a77fc7996e250cce3dc1b6e8c8 100644
--- a/apps/gallery/lib_scanner.php
+++ b/apps/gallery/lib_scanner.php
@@ -28,21 +28,21 @@ class OC_GALLERY_SCANNER {
}
$current_album['imagesCount'] = count($current_album['images']);
$albums[] = $current_album;
- $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE "uid_owner" = ? AND "album_name" = ?');
+ $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE `uid_owner` = ? AND `album_name` = ?');
$result = $stmt->execute(array(OC_User::getUser(), $current_album['name']));
if ($result->numRows() == 0 && count($current_album['images'])) {
- $stmt = OC_DB::prepare('INSERT OR REPLACE INTO *PREFIX*gallery_albums ("uid_owner", "album_name") VALUES (?, ?)');
+ $stmt = OC_DB::prepare('REPLACE INTO *PREFIX*gallery_albums (`uid_owner`, `album_name`) VALUES (?, ?)');
$stmt->execute(array(OC_User::getUser(), $current_album['name']));
}
- $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE "uid_owner" = ? AND "album_name" = ?');
+ $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE `uid_owner` = ? AND `album_name` = ?');
$result = $stmt->execute(array(OC_User::getUser(), $current_album['name']));
$albumId = $result->fetchRow();
$albumId = $albumId['album_id'];
foreach ($current_album['images'] as $img) {
- $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE "album_id" = ? AND "file_path" = ?');
+ $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE `album_id` = ? AND `file_path` = ?');
$result = $stmt->execute(array($albumId, $img));
if ($result->numRows() == 0) {
- $stmt = OC_DB::prepare('INSERT OR REPLACE INTO *PREFIX*gallery_photos ("album_id", "file_path") VALUES (?, ?)');
+ $stmt = OC_DB::prepare('REPLACE INTO *PREFIX*gallery_photos (`album_id`, `file_path`) VALUES (?, ?)');
$stmt->execute(array($albumId, $img));
}
}
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 8575e6334a5d0fcfbc910ec07966e08987597c96..67d56075194acdd3508870c930118896cc748dfa 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -1,6 +1,6 @@
#controls ul.jp-controls { padding:0; }
#controls ul.jp-controls li { display:inline; }
-#controls ul.jp-controls li a { position:absolute; padding:.8em 1em; }
+#controls ul.jp-controls li a { position:absolute; padding:.8em 1em .8em 0; }
a.jp-play, a.jp-pause { left:2.5em; }
a.jp-pause { display:none; }
a.jp-next { left:5em; }
@@ -39,7 +39,7 @@ tr.album td.artist { padding-left:1em; }
tr.song td.artist { padding-left:2em; }
.add {margin: 0 0.5em 0 0; }
-#scan { position:absolute; right:13em; top:0em; }
+#scan { position:absolute; right:13.5em; top:0em; }
#scan .start { position:relative; display:inline; float:right; }
#scan .stop { position:relative; display:inline; float:right; }
#scan #scanprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
diff --git a/apps/remoteStorage/lib_remoteStorage.php b/apps/remoteStorage/lib_remoteStorage.php
index 259efb0da690b02a12c7b8c26803fa366f01a114..5677ab3c6e0149d4b90becb885b71cd696207f55 100644
--- a/apps/remoteStorage/lib_remoteStorage.php
+++ b/apps/remoteStorage/lib_remoteStorage.php
@@ -3,7 +3,7 @@
class OC_remoteStorage {
public static function getValidTokens($ownCloudUser, $userAddress, $dataScope) {
$query=OC_DB::prepare("SELECT token,appUrl FROM *PREFIX*authtoken WHERE user=? AND userAddress=? AND dataScope=? LIMIT 100");
- $result=$query->execute(array($user,$userAddress,$dataScope));
+ $result=$query->execute(array($ownCloudUser,$userAddress,$dataScope));
if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.$result->getDebugInfo().'<br />';
diff --git a/core/css/styles.css b/core/css/styles.css
index 84a024f95b91f5375d0786251588424c7915db29..5d4df586a8e7419f5e8fb95976ce2f55ad172701 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -50,7 +50,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; }
/* CONTENT ------------------------------------------------------------------ */
-#controls { width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
+#controls { padding: 0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
#controls .button { display:inline-block; }
#content { margin:3.5em 0 0 12.5em; }
#leftcontent, .leftcontent { position:fixed; overflow: auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
@@ -117,7 +117,7 @@ tbody tr:hover, tr:active { background-color:#f8f8f8; }
#quotatext {padding: .6em 1em;}
div.jp-play-bar, div.jp-seek-bar { padding:0; }
-.pager { list-style:none; float:right; display:inline; margin:.7em 12.7em 0 0; }
+.pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; }
.pager li { display:inline-block; }
li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
diff --git a/core/img/actions/selected.png b/core/img/actions/selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..98c29df9cf5d612e21d8ab86bfa1b871c92064a8
Binary files /dev/null and b/core/img/actions/selected.png differ
diff --git a/core/img/actions/selected.svg b/core/img/actions/selected.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3294f68c68de151c60b0e3bc5f2ad7d9a3933693
--- /dev/null
+++ b/core/img/actions/selected.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg3875"
+ version="1.1"
+ inkscape:version="0.48.1 r9760"
+ sodipodi:docname="play.svg"
+ inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3877" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="25.345359"
+ inkscape:cx="10.565719"
+ inkscape:cy="5.327912"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1280"
+ inkscape:window-height="969"
+ inkscape:window-x="-2"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3883"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3880">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0, -1036.36)">
+ <path
+ style="fill:#000000;fill-opacity:1;stroke:none"
+ d="m 14,1038.3622 -6,12 -6,-12 6,6.9978 z"
+ id="path3086"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ </g>
+</svg>
diff --git a/files/css/files.css b/files/css/files.css
index 1766d03d967d2a35a9380298dbb095b0c2a4bcea..a8419e972ef2794463084afa5a8eaf95b6a0c73e 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -10,7 +10,7 @@
.file_upload_form, #file_newfolder_form { display:inline; float: left;}
#fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; }
-.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:.1em 1em;}
+.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:.1em 1em .1em 0em;}
.file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:normal; width:7em; }
diff --git a/lib/app.php b/lib/app.php
index cd4a7293e49019805624c05e488556d37102cc9b..b9eea483a557cd6b52421e4c6367a2860fe09843 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -200,23 +200,36 @@ class OC_App{
*/
public static function getSettingsNavigation(){
$l=new OC_L10N('core');
- $admin=array(
- array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" )),
- array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" )),
- );
- $settings=array(
- array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" )),
- array( "id" => "personal", "order" => 1, "href" => OC_Helper::linkTo( "settings", "personal.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" ))
- );
- if(count(self::$settingsForms)>0){
- $settings[]=array( "id" => "settings", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "settings.php" ), "name" => $l->t("Settings"), "icon" => OC_Helper::imagePath( "settings", "settings.svg" ));
- }
- if(count(self::$adminForms)>0){
- $admin[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
- }
- if( OC_Group::inGroup( $_SESSION["user_id"], "admin" )){
- $settings=array_merge($admin,$settings);
- }
+
+ // by default, settings only contain the help menu
+ $settings = array(
+ array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" ))
+ );
+
+ // if the user is logged-in
+ if (OC_User::isLoggedIn()) {
+ // personal menu
+ $settings[] = array( "id" => "personal", "order" => 1, "href" => OC_Helper::linkTo( "settings", "personal.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" ));
+
+ // if there're some settings forms
+ if(!empty(self::$settingsForms))
+ // settings menu
+ $settings[]=array( "id" => "settings", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "settings.php" ), "name" => $l->t("Settings"), "icon" => OC_Helper::imagePath( "settings", "settings.svg" ));
+
+ // if the user is an admin
+ if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
+ // admin users menu
+ $settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" ));
+ // admin apps menu
+ $settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
+
+ // if there're some admin forms
+ if(!empty(self::$adminForms))
+ // admins menu
+ $settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
+ }
+ }
+
$navigation = self::proceedNavigation($settings);
return $navigation;
}
@@ -237,7 +250,7 @@ class OC_App{
return $list;
}
-
+
/**
* @brief Read app metadata from the info.xml file
* @param string $appid id of the app or the path of the info.xml file
@@ -261,7 +274,7 @@ class OC_App{
}
return $data;
}
-
+
/**
* @brief Returns the navigation
* @returns associative array
@@ -277,7 +290,7 @@ class OC_App{
$navigation = self::proceedNavigation( self::$navigation );
return $navigation;
}
-
+
/**
* get the id of loaded app
* @return string
@@ -292,8 +305,8 @@ class OC_App{
return $topFolder;
}
}
-
-
+
+
/**
* get the forms for either settings, admin or personal
*/
@@ -315,28 +328,28 @@ class OC_App{
}
return $forms;
}
-
+
/**
* register a settings form to be shown
*/
public static function registerSettings($app,$page){
self::$settingsForms[]='apps/'.$app.'/'.$page.'.php';
}
-
+
/**
* register an admin form to be shown
*/
public static function registerAdmin($app,$page){
self::$adminForms[]='apps/'.$app.'/'.$page.'.php';
}
-
+
/**
* register a personal form to be shown
*/
public static function registerPersonal($app,$page){
self::$personalForms[]='apps/'.$app.'/'.$page.'.php';
}
-
+
/**
* get a list of all apps in the apps folder
*/